All mission objectives achieved, outstanding work!", @@ -108,15 +117,15 @@ ///Operation name for hostile faction var/op_name_hostile ///Possible rewards for a major victory, used by Generate_rewards() - var/list/major_victory_reward_table = list() + var/list/major_victory_reward_table ///Possible rewards for a minor victory, used by Generate_rewards() - var/list/minor_victory_reward_table = list() + var/list/minor_victory_reward_table ///Possible rewards for a minor loss, used by Generate_rewards() - var/list/minor_loss_reward_table = list() + var/list/minor_loss_reward_table ///Possible rewards for a major loss, used by Generate_rewards() - var/list/major_loss_reward_table = list() + var/list/major_loss_reward_table ///Possible rewards for a draw, used by Generate_rewards() - var/list/draw_reward_table = list() + var/list/draw_reward_table /datum/campaign_mission/New(initiating_faction) . = ..() @@ -135,6 +144,7 @@ op_name_hostile = GLOB.operation_namepool[/datum/operation_namepool].get_random_name() load_mission_brief() //late loaded so we can ref the specific factions etc + set_loot_tables() /datum/campaign_mission/Destroy(force, ...) STOP_PROCESSING(SSslowprocess, src) @@ -148,6 +158,22 @@ end_mission() return PROCESS_KILL +///Sets up the loot tables for this mission, if required +/datum/campaign_mission/proc/set_loot_tables() + if(starting_faction == FACTION_TERRAGOV) + major_victory_reward_table = GLOB.campaign_tgmc_major_loot + minor_victory_reward_table = GLOB.campaign_tgmc_minor_loot + else if(starting_faction == FACTION_SOM) + major_victory_reward_table = GLOB.campaign_som_major_loot + minor_victory_reward_table = GLOB.campaign_som_minor_loot + + if(hostile_faction == FACTION_TERRAGOV) + minor_loss_reward_table = GLOB.campaign_tgmc_minor_loot + major_loss_reward_table = GLOB.campaign_tgmc_major_loot + else if(hostile_faction == FACTION_SOM) + minor_loss_reward_table = GLOB.campaign_som_minor_loot + major_loss_reward_table = GLOB.campaign_som_major_loot + ///Sets up the mission once it has been selected /datum/campaign_mission/proc/load_mission() play_selection_intro() @@ -181,7 +207,7 @@ if(max_time_reached) items += "Mission status: Mission complete" items += "" - else if(game_timer) + else items += "Mission time remaining: [mission_end_countdown()]" items += "" @@ -216,6 +242,9 @@ if(MISSION_OUTCOME_DRAW) reward_table = draw_reward_table + if(!length(reward_table)) + return + for(var/i = 1 to reward_amount) var/obj/reward = pickweight(reward_table) new reward(get_turf(pick(GLOB.campaign_reward_spawners[faction]))) @@ -226,16 +255,35 @@ ///sets up the timer for the mission /datum/campaign_mission/proc/set_mission_timer() - if(!iscampaigngamemode(SSticker.mode)) + if(game_timer) return - game_timer = addtimer(VARSET_CALLBACK(src, max_time_reached, TRUE), max_game_time, TIMER_STOPPABLE) +///Pauses the gametimer, recording the remaining time left in max_game_time +/datum/campaign_mission/proc/pause_mission_timer(trait_source = TRAIT_GENERIC) + if(!trait_source) + trait_source = TRAIT_GENERIC + ADD_TRAIT(src, CAMPAIGN_MISSION_TIMER_PAUSED, trait_source) + if(!game_timer) + return + max_game_time = timeleft(game_timer) + deltimer(game_timer) + game_timer = null + +///Attempts to resume the gametimer +/datum/campaign_mission/proc/resume_mission_timer(trait_source = TRAIT_GENERIC, forced = FALSE) + REMOVE_TRAIT(src, CAMPAIGN_MISSION_TIMER_PAUSED, trait_source) + if(!forced && HAS_TRAIT(src, CAMPAIGN_MISSION_TIMER_PAUSED)) + return + set_mission_timer() + ///accesses the timer for status panel /datum/campaign_mission/proc/mission_end_countdown() - if(max_time_reached) - return "Mission finished" - var/eta = timeleft(game_timer) * 0.1 + //if(max_time_reached) + // return "Mission finished" + if(!game_timer && HAS_TRAIT(src, CAMPAIGN_MISSION_TIMER_PAUSED)) + return "Timer paused" + var/eta = game_timer ? (timeleft(game_timer) * 0.1) : (max_game_time * 0.1) if(eta > 0) return "[(eta / 60) % 60]:[add_leading(num2text(eta % 60), 2, "0")]" @@ -276,6 +324,16 @@ for(var/i in GLOB.quick_loadouts) var/datum/outfit/quick/outfit = GLOB.quick_loadouts[i] outfit.quantity = initial(outfit.quantity) + for(var/job in GLOB.campaign_loadout_items_by_role) + for(var/datum/loadout_item/loadout_item AS in GLOB.campaign_loadout_items_by_role[job]) + loadout_item.quantity = initial(loadout_item.quantity) + for(var/mob/living/carbon/human/corpse AS in GLOB.dead_human_list) //clean up all the bodies and refund normal roles if required + if(corpse.z != mission_z_level.z_value) + continue + if(!HAS_TRAIT(corpse, TRAIT_UNDEFIBBABLE) && corpse.job.job_cost) + corpse.job.free_job_positions(1) + + qdel(corpse) ///Unregisters all signals when the mission finishes /datum/campaign_mission/proc/unregister_mission_signals() @@ -321,6 +379,7 @@ modify_attrition_points(attrition_point_rewards[outcome][1], attrition_point_rewards[outcome][2]) apply_victory_points(victory_point_rewards[outcome][1], victory_point_rewards[outcome][2]) + apply_cash_reward(cash_rewards[outcome][1], cash_rewards[outcome][2]) //reset attrition points - unused points are lost mode.stat_list[starting_faction].active_attrition_points = 0 @@ -356,6 +415,11 @@ mode.stat_list[starting_faction].total_attrition_points += start_team_points mode.stat_list[hostile_faction].total_attrition_points += hostile_team_points +///applies mission cash bonuses to both factions +/datum/campaign_mission/proc/apply_cash_reward(start_team_cash, hostile_team_cash) + mode.stat_list[starting_faction].apply_cash(start_team_cash) + mode.stat_list[hostile_faction].apply_cash(hostile_team_cash) + ///checks how many marines and SOM are still alive /datum/campaign_mission/proc/count_humans(list/z_levels = SSmapping.levels_by_trait(ZTRAIT_AWAY), count_flags) //todo: make new Z's not away levels, or ensure ground and away is consistant in behavior var/list/team_one_alive = list() @@ -437,7 +501,7 @@ GLOB.campaign_structures -= mission_obj ///spawns mechs for a faction -/datum/campaign_mission/proc/spawn_mech(mech_faction, heavy_mech, medium_mech, light_mech) +/datum/campaign_mission/proc/spawn_mech(mech_faction, heavy_mech, medium_mech, light_mech, override_message) if(!mech_faction) return var/total_count = (heavy_mech + medium_mech + light_mech) @@ -457,4 +521,11 @@ GLOB.campaign_structures += new_mech RegisterSignal(new_mech, COMSIG_QDELETING, TYPE_PROC_REF(/datum/campaign_mission, remove_mission_object)) - map_text_broadcast(mech_faction, "[total_count] mechs have been deployed for this mission.", "Mechs available") + map_text_broadcast(mech_faction, override_message ? override_message : "[total_count] mechs have been deployed for this mission.", "Mechs available") + +///Returns the current mission, if its the campaign gamemode +/proc/get_current_mission() + if(!iscampaigngamemode(SSticker.mode)) + return null + var/datum/game_mode/hvh/campaign/mode = SSticker.mode + return mode.current_mission diff --git a/code/datums/gamemodes/campaign/faction_stats.dm b/code/datums/gamemodes/campaign/faction_stats.dm index 6b058f9a8131c..49f01727408d8 100644 --- a/code/datums/gamemodes/campaign/faction_stats.dm +++ b/code/datums/gamemodes/campaign/faction_stats.dm @@ -45,14 +45,14 @@ GLOBAL_LIST_INIT(campaign_default_purchasable_assets, list( /datum/campaign_asset/teleporter_charges, /datum/campaign_asset/teleporter_enabled, /datum/campaign_asset/equipment/medkit_basic/som, - /datum/campaign_asset/equipment/materials_pack, + /datum/campaign_asset/equipment/materials_pack/som, /datum/campaign_asset/equipment/ballistic_som, /datum/campaign_asset/equipment/shotguns_som, /datum/campaign_asset/equipment/volkite, /datum/campaign_asset/equipment/heavy_armour_som, /datum/campaign_asset/equipment/shields_som, /datum/campaign_asset/equipment/grenades_som, - /datum/campaign_asset/equipment/at_mines, + /datum/campaign_asset/equipment/at_mines/som, /datum/campaign_asset/equipment/tac_bino_som, /datum/campaign_asset/tactical_reserves, ), @@ -66,9 +66,10 @@ GLOBAL_LIST_INIT(campaign_mission_pool, list( /datum/campaign_mission/tdm/mech_wars = 12, /datum/campaign_mission/destroy_mission/supply_raid = 15, /datum/campaign_mission/destroy_mission/base_rescue = 12, + /datum/campaign_mission/raiding_base = 6, ), FACTION_SOM = list( - /datum/campaign_mission/tdm/lv624 = 10, + /datum/campaign_mission/tdm/orion = 10, /datum/campaign_mission/destroy_mission/fire_support_raid/som = 15, /datum/campaign_mission/tdm/mech_wars/som = 12, /datum/campaign_mission/destroy_mission/supply_raid/som = 15, @@ -90,7 +91,7 @@ GLOBAL_LIST_INIT(campaign_mission_pool, list( var/active_attrition_points = 0 ///Multiplier on the passive attrition point gain for this faction var/attrition_gain_multiplier = 1 - ///cumulative loss bonus which is applied to attrition gain mult + ///cumulative loss bonus which is applied to attrition gain mult and player credit mission reward var/loss_bonus = 0 ///Future missions this faction can currently choose from var/list/datum/campaign_mission/available_missions = list() @@ -103,9 +104,13 @@ GLOBAL_LIST_INIT(campaign_mission_pool, list( ///Any special behavior flags for the faction var/stats_flags = NONE ///Portrait used for general screen text notifications - var/atom/movable/screen/text/screen_text/picture/faction_portrait + var/faction_portrait ///Faction-wide modifier to respawn delay var/respawn_delay_modifier = 0 + ///records how much currency has been earned from missions, for late join players + var/accumulated_mission_reward = 0 + ///list of individual stats by ckey + var/list/datum/individual_stats/individual_stat_list = list() /datum/faction_stats/New(new_faction) . = ..() @@ -118,6 +123,7 @@ GLOBAL_LIST_INIT(campaign_mission_pool, list( for(var/i = 1 to CAMPAIGN_STANDARD_MISSION_QUANTITY) generate_new_mission() RegisterSignal(SSdcs, COMSIG_GLOB_CAMPAIGN_MISSION_ENDED, PROC_REF(mission_end)) + RegisterSignals(SSdcs, list(COMSIG_GLOB_PLAYER_ROUNDSTART_SPAWNED, COMSIG_GLOB_PLAYER_LATE_SPAWNED), PROC_REF(register_faction_member)) faction_portrait = GLOB.faction_to_portrait[faction] ? GLOB.faction_to_portrait[faction] : /atom/movable/screen/text/screen_text/picture/potrait/unknown @@ -125,6 +131,32 @@ GLOBAL_LIST_INIT(campaign_mission_pool, list( GLOB.faction_stats_datums -= faction return ..() +///Sets up newly spawned players with the campaign status verb +/datum/faction_stats/proc/register_faction_member(datum/source, mob/living/carbon/human/new_member) + SIGNAL_HANDLER + if(!ishuman(new_member)) + return + if(new_member.faction != faction) + return + if(individual_stat_list[new_member.ckey]) + individual_stat_list[new_member.ckey].current_mob = new_member + individual_stat_list[new_member.ckey].apply_perks() + else + get_player_stats(new_member) + var/datum/action/campaign_loadout/loadouts = new + loadouts.give_action(new_member) + if(!(new_member.job.job_cost)) + return + loadouts.action_activate() + +///Returns a users individual stat datum, generating a new one if required +/datum/faction_stats/proc/get_player_stats(mob/user) + if(!user.ckey) + return + if(!individual_stat_list[user.ckey]) + individual_stat_list[user.ckey] = new /datum/individual_stats(user, faction, accumulated_mission_reward) + return individual_stat_list[user.ckey] + ///Randomly adds a new mission to the available pool /datum/faction_stats/proc/generate_new_mission() if(!length(GLOB.campaign_mission_pool[faction]) || (length(available_missions) >= CAMPAIGN_STANDARD_MISSION_QUANTITY)) @@ -158,6 +190,8 @@ GLOBAL_LIST_INIT(campaign_mission_pool, list( for(var/mob/living/carbon/human/candidate AS in possible_candidates) if(candidate.job.title != senior_rank) continue + if(!candidate.client) + continue senior_rank_list += candidate if(!length(senior_rank_list)) senior_rank_list.Cut() @@ -183,6 +217,11 @@ GLOBAL_LIST_INIT(campaign_mission_pool, list( faction_assets[new_asset] = new new_asset(src) RegisterSignals(faction_assets[new_asset], list(COMSIG_CAMPAIGN_ASSET_ACTIVATION, COMSIG_CAMPAIGN_DISABLER_ACTIVATION), PROC_REF(force_update_static_data)) +///Removes an asset from a faction entirely +/datum/faction_stats/proc/remove_asset(datum/campaign_asset/removed_asset) + if(faction_assets[removed_asset]) + QDEL_NULL(faction_assets[removed_asset]) + ///handles post mission wrap up for the faction /datum/faction_stats/proc/mission_end(datum/source, datum/campaign_mission/completed_mission, winning_faction) SIGNAL_HANDLER @@ -197,21 +236,38 @@ GLOBAL_LIST_INIT(campaign_mission_pool, list( generate_new_mission() update_static_data_for_all_viewers() - addtimer(CALLBACK(src, PROC_REF(return_to_base)), AFTER_MISSION_TELEPORT_DELAY) + addtimer(CALLBACK(src, PROC_REF(return_to_base), completed_mission), AFTER_MISSION_TELEPORT_DELAY) addtimer(CALLBACK(src, PROC_REF(get_selector)), AFTER_MISSION_LEADER_DELAY) //if the leader died, we load a new one after a bit to give respawns some time +///applies cash rewards to the faction and all individuals +/datum/faction_stats/proc/apply_cash(amount) + if(!amount) + return + amount *= 1 + loss_bonus + accumulated_mission_reward += amount + for(var/i in individual_stat_list) + var/datum/individual_stats/player_stats = individual_stat_list[i] + player_stats.give_funds(amount) + ///Returns all faction members back to base after the mission is completed -/datum/faction_stats/proc/return_to_base() +/datum/faction_stats/proc/return_to_base(datum/campaign_mission/completed_mission) for(var/mob/living/carbon/human/human_mob AS in GLOB.alive_human_list_faction[faction]) - if(!human_mob.job.job_cost) //asset based roles are one use - human_mob.ghostize() - qdel(human_mob) + if((human_mob.z && human_mob.z != completed_mission.mission_z_level.z_value) && human_mob.job.job_cost && human_mob.client) //why is byond so cursed that being inside something makes you z = 0 + human_mob.revive(TRUE) + human_mob.overlay_fullscreen_timer(0.5 SECONDS, 10, "roundstart1", /atom/movable/screen/fullscreen/black) + human_mob.overlay_fullscreen_timer(2 SECONDS, 20, "roundstart2", /atom/movable/screen/fullscreen/spawning_in) + human_mob.forceMove(pick(GLOB.spawns_by_job[human_mob.job.type])) + human_mob.Stun(1 SECONDS) //so you don't accidentally shoot your team etc continue - human_mob.revive(TRUE) - human_mob.overlay_fullscreen_timer(0.5 SECONDS, 10, "roundstart1", /atom/movable/screen/fullscreen/black) - human_mob.overlay_fullscreen_timer(2 SECONDS, 20, "roundstart2", /atom/movable/screen/fullscreen/spawning_in) - human_mob.forceMove(pick(GLOB.spawns_by_job[human_mob.job.type])) - human_mob.Stun(1 SECONDS) //so you don't accidentally shoot your team etc + + var/mob/dead/observer/ghost = human_mob.ghostize() + if(human_mob.job.job_cost) //We don't refund ally roles + human_mob.job.add_job_positions(1) + qdel(human_mob) + if(!ghost) //if they ghosted already + return + var/datum/game_mode/mode = SSticker.mode + mode.player_respawn(ghost) //auto open the respawn screen ///Generates status tab info for the mission /datum/faction_stats/proc/get_status_tab_items(mob/source, list/items) @@ -240,6 +296,8 @@ GLOBAL_LIST_INIT(campaign_mission_pool, list( update_static_data_for_all_viewers() //UI stuff// +/datum/faction_stats/ui_assets(mob/user) + return list(get_asset_datum(/datum/asset/spritesheet/campaign/missions), get_asset_datum(/datum/asset/spritesheet/campaign/assets)) /datum/faction_stats/ui_interact(mob/living/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) @@ -249,6 +307,8 @@ GLOBAL_LIST_INIT(campaign_mission_pool, list( ui.open() /datum/faction_stats/ui_state(mob/user) + if(isobserver(user)) + return GLOB.always_state return GLOB.conscious_state /datum/faction_stats/ui_static_data(mob/living/user) @@ -356,8 +416,6 @@ GLOBAL_LIST_INIT(campaign_mission_pool, list( data["victory_points"] = victory_points data["max_victory_points"] = CAMPAIGN_MAX_VICTORY_POINTS data["faction"] = faction - data["icons"] = GLOB.campaign_icons - data["mission_icons"] = GLOB.campaign_mission_icons return data @@ -371,6 +429,8 @@ GLOBAL_LIST_INIT(campaign_mission_pool, list( CRASH("campaign_mission loaded without campaign game mode") var/mob/living/user = usr + if(!istype(user)) + return switch(action) if("set_attrition_points") @@ -380,12 +440,11 @@ GLOBAL_LIST_INIT(campaign_mission_pool, list( if((current_mode.current_mission?.mission_state != MISSION_STATE_NEW) && (current_mode.current_mission?.mission_state != MISSION_STATE_LOADED)) to_chat(user, "Current mission already ongoing, unable to assign more personnel at this time.") return - total_attrition_points += active_attrition_points - active_attrition_points = 0 //reset, you can change your mind up until the mission starts - var/choice = tgui_input_number(user, "How much manpower would you like to dedicate to this mission?", "Attrition Point selection", 0, total_attrition_points, 0, 60 SECONDS) - if(!choice) - choice = 0 - total_attrition_points -= choice + var/combined_attrition = total_attrition_points + active_attrition_points + var/choice = tgui_input_number(user, "How much manpower would you like to dedicate to this mission?", "Attrition Point selection", 0, combined_attrition, 0, 60 SECONDS) + combined_attrition = total_attrition_points + active_attrition_points //we do it again in case the amount has changed + choice = clamp(choice, 0, combined_attrition) + total_attrition_points = combined_attrition - choice active_attrition_points = choice for(var/mob/living/carbon/human/faction_member AS in GLOB.alive_human_list_faction[faction]) faction_member.playsound_local(null, 'sound/effects/CIC_order.ogg', 30, 1) @@ -432,7 +491,8 @@ GLOBAL_LIST_INIT(campaign_mission_pool, list( return for(var/mob/living/carbon/human/faction_member AS in GLOB.alive_human_list_faction[faction]) faction_member.playsound_local(null, 'sound/effects/CIC_order.ogg', 30, 1) - faction_member.play_screen_text("OVERWATCH
" + "[choice.name] asset activated", faction_portrait) + var/portrait = choice.asset_portrait ? choice.asset_portrait : faction_portrait + faction_member.play_screen_text("OVERWATCH
" + "[choice.name] asset activated", portrait) to_chat(faction_member, "[user] has activated the [choice.name] campaign asset.") return TRUE @@ -455,3 +515,14 @@ GLOBAL_LIST_INIT(campaign_mission_pool, list( to_chat(faction_member, "[user] has purchased the [initial(selected_asset.name)] campaign asset.") update_static_data_for_all_viewers() return TRUE + +//overview for campaign gamemode +/datum/action/campaign_overview + name = "Campaign overview" + action_icon_state = "campaign_overview" + +/datum/action/campaign_overview/action_activate() + var/datum/faction_stats/your_faction = GLOB.faction_stats_datums[owner.faction] + if(!your_faction) + return + your_faction.interact(owner) diff --git a/code/datums/gamemodes/campaign/individual_stats.dm b/code/datums/gamemodes/campaign/individual_stats.dm new file mode 100644 index 0000000000000..57ae70628ea08 --- /dev/null +++ b/code/datums/gamemodes/campaign/individual_stats.dm @@ -0,0 +1,424 @@ +#define TAB_LOADOUT "Loadout" +#define TAB_PERKS "Perks" + +/datum/individual_stats + interaction_flags = INTERACT_UI_INTERACT + var/owner_ckey + ///currently occupied mob - if any + var/mob/living/carbon/current_mob + ///Credits. You buy stuff with it + var/currency = 450 + ///List of job types based on faction + var/list/valid_jobs = list() + ///Single list of unlocked perks for easy reference + var/list/unlocked_perks = list() + ///Unlocked perks organised by jobs effected + var/list/list/datum/perk/perks_by_job = list() + ///Unlocked items + var/list/list/datum/loadout_item/unlocked_items = list() + ///List of loadouts by role + var/list/datum/outfit_holder/loadouts = list() + ///The faction associated with these stats + var/faction + ///Currently selected UI category tab + var/selected_tab = TAB_LOADOUT + ///Currently selected UI job tab + var/selected_job + +/datum/individual_stats/New(mob/living/carbon/new_mob, new_faction, new_currency) + . = ..() + RegisterSignal(SSdcs, COMSIG_GLOB_CAMPAIGN_MISSION_ENDED, PROC_REF(post_mission_credits)) + owner_ckey = new_mob.ckey + current_mob = new_mob + faction = new_faction + currency += new_currency + for(var/datum/job/job_type AS in SSticker.mode.valid_job_types) + if(job_type::faction != faction) + continue + valid_jobs += job_type::title + loadouts[job_type::title] = new /datum/outfit_holder(job_type::title) + perks_by_job[job_type::title] = list() + unlocked_items[job_type::title] = list() + +/datum/individual_stats/Destroy(force, ...) + current_mob = null + unlocked_perks = null + perks_by_job = null + unlocked_items = null + return ..() + +///Pay each player additional credits based on individual performance during the mission +/datum/individual_stats/proc/post_mission_credits(datum/source) + SIGNAL_HANDLER + var/datum/personal_statistics/personal_statistics = GLOB.personal_statistics_list[owner_ckey] + give_funds(personal_statistics.get_mission_reward()) + +///Applies cash +/datum/individual_stats/proc/give_funds(amount) + currency += amount + if(!current_mob) + return + to_chat(current_mob, span_warning("You have received a cash bonus of [amount].")) + +///uses some funtokens, returns the amount missing, if insufficient funds +/datum/individual_stats/proc/use_funds(amount) + if(amount > currency) + return amount - currency + currency -= amount + +///Adds a perk if able +/datum/individual_stats/proc/purchase_perk(datum/perk/new_perk, mob/living/user) + . = TRUE + if(!istype(new_perk)) + return FALSE + if(new_perk in unlocked_perks) + to_chat(user, span_warning("Perk already purchased.")) + return FALSE + if(length(new_perk.prereq_perks)) + var/perk_found + for(var/prereq in new_perk.prereq_perks) + perk_found = FALSE + for(var/datum/perk/perk AS in unlocked_perks) + if(perk.type != prereq) + continue + perk_found = TRUE + if(!perk_found) + to_chat(user, span_warning("One or more prerequisites missing for this perk.")) + return FALSE + if(use_funds(new_perk.unlock_cost)) + to_chat(user, span_warning("Insufficient funds for this perk.")) + return FALSE + + new_perk.unlock_bonus(user, src) + unlocked_perks += new_perk + for(var/supported_job in new_perk.jobs_supported) + if(!perks_by_job[supported_job]) + continue + perks_by_job[supported_job] += new_perk + + if(!istype(user)) //we immediately apply the perk where possible + return + if(!(user.job.title in new_perk.jobs_supported)) + return + new_perk.apply_perk(user) + +///Unlocks a loadout item for use +/datum/individual_stats/proc/unlock_loadout_item(item_type, job_type_or_types, mob/user, cost_override, job_req_override = FALSE) + if(!islist(job_type_or_types)) + job_type_or_types = list(job_type_or_types) + var/datum/loadout_item/item = GLOB.campaign_loadout_item_type_list[item_type] + if(!istype(item)) + return FALSE + var/insufficient_credits = use_funds(isnum(cost_override) ? cost_override : item.unlock_cost) + if(insufficient_credits) + to_chat(user, span_warning("Requires [insufficient_credits] more credits.")) + return FALSE + for(var/job_type in job_type_or_types) + if(!job_req_override && !(job_type in item.jobs_supported)) + continue + loadouts[job_type]?.unlock_new_option(item) + return TRUE + +///Adds an item to the unlockable list for a job +/datum/individual_stats/proc/make_available_loadout_item(item_type, job_type_or_types, mob/user, job_req_override = FALSE) + if(!islist(job_type_or_types)) + job_type_or_types = list(job_type_or_types) + var/datum/loadout_item/item = GLOB.campaign_loadout_item_type_list[item_type] + if(!istype(item)) + return FALSE + for(var/job_type in job_type_or_types) + if(!job_req_override && !(job_type in item.jobs_supported)) + continue + loadouts[job_type]?.allow_new_option(item) + return TRUE + +///Adds and equips a loadout item, replacing another +/datum/individual_stats/proc/replace_loadout_option(new_item, removed_item, job_type_or_types, job_req_override = FALSE) + if(!islist(job_type_or_types)) + job_type_or_types = list(job_type_or_types) + var/datum/loadout_item/item = GLOB.campaign_loadout_item_type_list[new_item] + if(!istype(item)) + return FALSE + for(var/job_type in job_type_or_types) + if(!job_req_override && !(job_type in item.jobs_supported)) + continue + loadouts[job_type]?.unlock_new_option(item) + if(loadouts[job_type]?.remove_option(GLOB.campaign_loadout_item_type_list[removed_item])) + loadouts[job_type].attempt_equip_loadout_item(item) + return TRUE + +///Applies all perks to a mob +/datum/individual_stats/proc/apply_perks() + if(!current_mob || QDELETED(current_mob)) + return + for(var/datum/perk/perk AS in perks_by_job[current_mob.job.title]) + perk.apply_perk(current_mob) + +//UI stuff +/datum/individual_stats/ui_assets(mob/user) + return list(get_asset_datum(/datum/asset/spritesheet/campaign/perks), get_asset_datum(/datum/asset/spritesheet/campaign/loadout_items)) + +/datum/individual_stats/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(ui) + return + ui = new(user, src, "IndividualStats") + ui.open() + +/datum/individual_stats/ui_state(mob/user) + if(isobserver(user)) + return GLOB.always_state + return GLOB.conscious_state + +/datum/individual_stats/ui_data(mob/user) + var/datum/game_mode/hvh/campaign/current_mode = SSticker.mode + if(!istype(current_mode)) + CRASH("campaign_mission loaded without campaign game mode") + + var/list/data = list() + var/mob/living/living_user = user + data["current_job"] = istype(living_user) ? living_user.job.title : null + data["currency"] = currency + + if(selected_tab != TAB_LOADOUT) + return data + //This cannot be static data due to the limitations on how frequently static data can be updated, and clicking on loadout options requires a data update. + var/list/equipped_loadouts_data = list() //items currently equipped to ALL job outfits + var/list/available_loadouts_data = list() //all available AND purchasable loadout options + var/list/outfit_cost_data = list() //Current cost of all outfits + + var/datum/outfit_holder/outfit = loadouts[selected_job] + + var/list/outfit_cost_list = list() + outfit_cost_list["job"] = selected_job + outfit_cost_list["outfit_cost"] = outfit.loadout_cost + outfit_cost_data += list(outfit_cost_list) + + for(var/slot in outfit.equipped_things) + var/datum/loadout_item/loadout_item = outfit.equipped_things[slot] + if(!loadout_item) + continue + var/list/equipped_item_ui_data = list() //slot + equipped item data + var/list/current_loadout_item_data = list() //equipped item data + current_loadout_item_data["name"] = loadout_item.name + current_loadout_item_data["job"] = outfit.role + current_loadout_item_data["slot"] = GLOB.inventory_slots_to_string["[loadout_item.item_slot]"] + current_loadout_item_data["type"] = loadout_item.type + current_loadout_item_data["desc"] = loadout_item.desc + current_loadout_item_data["purchase_cost"] = loadout_item.purchase_cost + current_loadout_item_data["unlock_cost"] = loadout_item.unlock_cost + current_loadout_item_data["valid_choice"] = loadout_item.item_checks(outfit) + current_loadout_item_data["icon"] = loadout_item.ui_icon + current_loadout_item_data["quantity"] = loadout_item.quantity + current_loadout_item_data["requirements"] = loadout_item.req_desc + current_loadout_item_data["unlocked"] = TRUE + + equipped_item_ui_data["item_type"] = current_loadout_item_data + equipped_item_ui_data["slot"] = slot + equipped_item_ui_data["slot_text"] = GLOB.inventory_slots_to_string["[slot]"] + + equipped_loadouts_data += list(equipped_item_ui_data) + + for(var/slot in outfit.available_list) + for(var/datum/loadout_item/loadout_item AS in outfit.available_list[slot]) + var/list/available_loadout_item_data = list() + available_loadout_item_data["name"] = loadout_item.name + available_loadout_item_data["job"] = outfit.role + available_loadout_item_data["slot"] = GLOB.inventory_slots_to_string["[loadout_item.item_slot]"] + available_loadout_item_data["type"] = loadout_item.type + available_loadout_item_data["desc"] = loadout_item.desc + available_loadout_item_data["purchase_cost"] = loadout_item.purchase_cost + available_loadout_item_data["unlock_cost"] = loadout_item.unlock_cost + available_loadout_item_data["valid_choice"] = loadout_item.item_checks(outfit) + available_loadout_item_data["icon"] = loadout_item.ui_icon + available_loadout_item_data["quantity"] = loadout_item.quantity + available_loadout_item_data["requirements"] = loadout_item.req_desc + available_loadout_item_data["unlocked"] = TRUE + available_loadouts_data += list(available_loadout_item_data) + + for(var/slot in outfit.purchasable_list) + for(var/datum/loadout_item/loadout_item AS in outfit.purchasable_list[slot]) + var/list/purchasable_loadout_item_data = list() + purchasable_loadout_item_data["name"] = loadout_item.name + purchasable_loadout_item_data["job"] = outfit.role + purchasable_loadout_item_data["slot"] = GLOB.inventory_slots_to_string["[loadout_item.item_slot]"] + purchasable_loadout_item_data["type"] = loadout_item.type + purchasable_loadout_item_data["desc"] = loadout_item.desc + purchasable_loadout_item_data["purchase_cost"] = loadout_item.purchase_cost + purchasable_loadout_item_data["unlock_cost"] = loadout_item.unlock_cost + purchasable_loadout_item_data["valid_choice"] = loadout_item.item_checks(outfit) + purchasable_loadout_item_data["icon"] = loadout_item.ui_icon + purchasable_loadout_item_data["quantity"] = loadout_item.quantity + purchasable_loadout_item_data["requirements"] = loadout_item.req_desc + purchasable_loadout_item_data["unlocked"] = FALSE + available_loadouts_data += list(purchasable_loadout_item_data) + + data["equipped_loadouts_data"] = equipped_loadouts_data + data["available_loadouts_data"] = available_loadouts_data + data["outfit_cost_data"] = outfit_cost_data + + return data + +/datum/individual_stats/ui_static_data(mob/user) + var/datum/game_mode/hvh/campaign/current_mode = SSticker.mode + if(!istype(current_mode)) + CRASH("campaign_mission loaded without campaign game mode") + + var/list/data = list() + + var/ui_theme + switch(faction) + if(FACTION_SOM) + ui_theme = "som" + else + ui_theme = "ntos" + data["ui_theme"] = ui_theme + data["faction"] = faction + data["jobs"] = valid_jobs + + var/list/perks_data = list() + for(var/job in perks_by_job) + for(var/datum/perk/perk AS in GLOB.campaign_perks_by_role[job]) + var/list/perk_data = list() + perk_data["name"] = perk.name + perk_data["job"] = job + perk_data["type"] = perk.type + perk_data["desc"] = perk.desc + perk_data["requirements"] = perk.req_desc + perk_data["cost"] = perk.unlock_cost + perk_data["icon"] = perk.ui_icon + perk_data["currently_active"] = !!(perk in perks_by_job[job]) + perks_data += list(perk_data) + data["perks_data"] = perks_data + + return data + +/datum/individual_stats/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + if(.) + return + + var/datum/game_mode/hvh/campaign/current_mode = SSticker.mode + if(!istype(current_mode)) + CRASH("campaign_mission loaded without campaign game mode") + + var/mob/living/user = usr + + switch(action) + if("set_selected_tab") + var/new_tab = params["new_selected_tab"] + if(new_tab != TAB_LOADOUT && new_tab != TAB_PERKS) + return + selected_tab = new_tab + user.playsound_local(user, 'sound/effects/menu_click.ogg', 50) + return TRUE + if("set_selected_job") + var/new_job = params["new_selected_job"] + if(!new_job) + return + selected_job = new_job + user.playsound_local(user, 'sound/effects/menu_click.ogg', 50) + return TRUE + if("play_ding") + user.playsound_local(user, 'sound/effects/menu_click.ogg', 50) //just for the consistant experience + return TRUE + if("unlock_perk") + var/unlocked_perk = text2path(params["selected_perk"]) + if(!unlocked_perk) + return + if(!GLOB.campaign_perk_list[unlocked_perk]) + return + var/datum/perk/perk = GLOB.campaign_perk_list[unlocked_perk] + if(!purchase_perk(perk, user)) + return + ui.send_full_update() + user.playsound_local(user, 'sound/effects/menu_click.ogg', 50) + return TRUE + if("equip_item") + var/equipped_item_type = text2path(params["selected_item"]) + if(!equipped_item_type) + return + var/equipped_item_job = params["selected_job"] + if(!equipped_item_job) + return + for(var/datum/loadout_item/item AS in GLOB.campaign_loadout_items_by_role[equipped_item_job]) + if(!istype(item, equipped_item_type)) + continue + loadouts[equipped_item_job].equip_loadout_item(item) + user.playsound_local(user, 'sound/effects/menu_click.ogg', 50) + return TRUE + if("unlock_item") + var/equipped_item_type = text2path(params["unlocked_item"]) + if(!equipped_item_type) + return + var/equipped_item_job = params["selected_job"] + if(!equipped_item_job) + return + if(!unlock_loadout_item(equipped_item_type, equipped_item_job, user)) + return + user.playsound_local(user, 'sound/effects/menu_click.ogg', 50) + return TRUE + if("equip_outfit") + var/job = params["outfit_job"] + if(!job || !loadouts[job]) + return + if(!istype(user) || user.stat) + to_chat(user, span_warning("Must be alive to do this!")) + return + var/obj/item/card/id/user_id = user.get_idcard() + if(!(user_id.id_flags & CAN_BUY_LOADOUT)) + to_chat(user, span_warning("You have already selected a loadout for this mission.")) + return + if(user.job.title != job) + to_chat(user, span_warning("Invalid job. This outfit is for [job].")) + return + if(!is_mainship_level(user.z)) + to_chat(user, span_warning("You can't equip a new loadout in the field!")) + return + if(!loadouts[job].check_full_loadout()) + to_chat(user, span_warning("Invalid loadout.")) + return + var/insufficient_credits = use_funds(loadouts[job].loadout_cost) + if(insufficient_credits) + to_chat(user, span_warning("Requires [insufficient_credits] more credits.")) + return + loadouts[job].equip_loadout(user) + user.playsound_local(user, 'sound/effects/menu_click.ogg', 50) + user_id.id_flags &= ~CAN_BUY_LOADOUT + return TRUE + +//loadout/perk UI for campaign gamemode +/datum/action/campaign_loadout + name = "Loadout menu" + action_icon_state = "individual_stats" + +/datum/action/campaign_loadout/give_action(mob/M) + . = ..() + var/datum/faction_stats/your_faction = GLOB.faction_stats_datums[owner.faction] + if(!your_faction) + return + + var/datum/individual_stats/stats = your_faction.get_player_stats(owner) + if(!stats) + return + stats.current_mob = M + +/datum/action/campaign_loadout/action_activate() + var/datum/faction_stats/your_faction = GLOB.faction_stats_datums[owner.faction] + if(!your_faction) + return + var/datum/individual_stats/stats = your_faction.get_player_stats(owner) + if(!stats) + return + stats.current_mob = owner //taking over ssd's creates a mismatch + //we have to update selected tab/job so we load the correct data for the UI + if(!isliving(owner)) + stats.selected_job = stats.valid_jobs[1] + else + var/mob/living/living_owner = owner + stats.selected_job = living_owner.job.title + stats.selected_tab = TAB_LOADOUT + stats.interact(owner) + +#undef TAB_LOADOUT +#undef TAB_PERKS diff --git a/code/datums/gamemodes/campaign/loadout_items.dm b/code/datums/gamemodes/campaign/loadout_items.dm new file mode 100644 index 0000000000000..44b7748efa7bb --- /dev/null +++ b/code/datums/gamemodes/campaign/loadout_items.dm @@ -0,0 +1,96 @@ +///Available by default +#define LOADOUT_ITEM_ROUNDSTART_OPTION (1<<0) +///This is the default option for this slot +#define LOADOUT_ITEM_DEFAULT_CHOICE (1<<1) +///Available for unlock by default +#define LOADOUT_ITEM_ROUNDSTART_UNLOCKABLE (1<<2) + +GLOBAL_LIST_INIT(campaign_loadout_slots, list(ITEM_SLOT_OCLOTHING, ITEM_SLOT_ICLOTHING, ITEM_SLOT_GLOVES, ITEM_SLOT_EYES, ITEM_SLOT_EARS, \ +ITEM_SLOT_MASK, ITEM_SLOT_HEAD, ITEM_SLOT_FEET, ITEM_SLOT_ID, ITEM_SLOT_BELT, ITEM_SLOT_BACK, ITEM_SLOT_L_POCKET, ITEM_SLOT_R_POCKET, ITEM_SLOT_SUITSTORE)) + +//List of all loadout_item datums +GLOBAL_LIST_INIT_TYPED(campaign_loadout_item_type_list, /datum/loadout_item, init_glob_loadout_item_list()) + +/proc/init_glob_loadout_item_list() + . = list() + for(var/type in subtypesof(/datum/loadout_item)) + var/datum/loadout_item/item_type = new type + if(!length(item_type.jobs_supported)) + qdel(item_type) + continue + .[item_type.type] = item_type + +//List of all loadout_item datums by job, excluding ones that must be unlocked //now including those +GLOBAL_LIST_INIT(campaign_loadout_items_by_role, init_campaign_loadout_items_by_role()) + +/proc/init_campaign_loadout_items_by_role() + . = list() + for(var/job in GLOB.campaign_jobs) + .[job] = list() + for(var/i in GLOB.campaign_loadout_item_type_list) + var/datum/loadout_item/option = GLOB.campaign_loadout_item_type_list[i] + if(option.jobs_supported && !(job in option.jobs_supported)) + continue + .[job] += option + +//represents an equipable item +//Are singletons +/datum/loadout_item + ///Item name + var/name + ///Item desc + var/desc + ///Addition desc for special reqs such as black/whitelist + var/req_desc + ///Typepath of the actual item this datum represents + var/obj/item/item_typepath + ///UI icon for this item + var/ui_icon = "default" + ///inventory slot it is intended to go into + var/item_slot + ///Behavior flags for loadout items + var/loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION + ///Cost to unlock this option + var/unlock_cost = 0 + ///Cost to use this option + var/purchase_cost = 0 + ///The amount of this available per mission. -1 for unlimited + var/quantity = -1 + ///Job types that this perk is available to + var/list/jobs_supported + ///assoc list by slot of items required for this to be equipped. Requires only 1 out of the list + var/list/item_whitelist + ///assoc list by slot of items blacklisted for this to be equipped + var/list/item_blacklist + +///Attempts to add an item to a loadout +/datum/loadout_item/proc/item_checks(datum/outfit_holder/outfit_holder) + if(length(item_whitelist) && !whitelist_check(outfit_holder)) + return FALSE + if(length(item_blacklist) && !blacklist_check(outfit_holder)) + return FALSE + return TRUE + +///checks if a loadout has one or more whitelist items +/datum/loadout_item/proc/whitelist_check(datum/outfit_holder/outfit_holder) + for(var/whitelist_item in item_whitelist) + var/type_to_check = outfit_holder.equipped_things["[item_whitelist[whitelist_item]]"]?.item_typepath + if(type_to_check == whitelist_item) + return TRUE + return FALSE + +///Checks if a loadout has any blacklisted items +/datum/loadout_item/proc/blacklist_check(datum/outfit_holder/outfit_holder) + for(var/blacklist_item in item_blacklist) + var/type_to_check = outfit_holder.equipped_things["[item_blacklist[blacklist_item]]"]?.item_typepath + if(type_to_check == blacklist_item) + return FALSE + return TRUE + +///Any post equip things related to this item +/datum/loadout_item/proc/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + return role_post_equip(wearer, loadout) + +///A separate post equip proc for role specific code. Split for more flexible parent overriding +/datum/loadout_item/proc/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + return diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/back_slot.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/back_slot.dm new file mode 100644 index 0000000000000..ba3dde9517317 --- /dev/null +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/back_slot.dm @@ -0,0 +1,110 @@ +/datum/loadout_item/back/som_satchel + name = "Mining satchel" + desc = "A satchel with origins dating back to the mining colonies.. Carries less than a backpack, but items can be drawn instantly." + item_typepath = /obj/item/storage/backpack/satchel/som + jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_VETERAN, SOM_STAFF_OFFICER, SOM_COMMANDER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/back/som_combat_pack + name = "Mining rucksack" + desc = "A rucksack with origins dating back to the mining colonies. Has the storage capacity of a backpack but no draw delay." + purchase_cost = 25 + item_typepath = /obj/item/storage/backpack/lightpack/som + jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_VETERAN) + +/datum/loadout_item/back/som_combat_pack/free + purchase_cost = 0 + jobs_supported = list(SOM_SQUAD_CORPSMAN, SOM_SQUAD_ENGINEER, SOM_SQUAD_LEADER, SOM_FIELD_COMMANDER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/back/som_flamer_tank + name = "Flame tank" + desc = "A specialized fuel tank for use with the V-62 incinerator." + req_desc = "Requires a V-62 incinerator." + item_typepath = /obj/item/ammo_magazine/flamer_tank/backtank + jobs_supported = list(SOM_SQUAD_MARINE) + item_whitelist = list(/obj/item/weapon/gun/flamer/som/mag_harness = ITEM_SLOT_SUITSTORE) + +/datum/loadout_item/back/som_flamer_tank/x_fuel + name = "X-fuel tank" + desc = "A specialized fuel tank of ultra thick napthal type X, known for its extreme heat and slow burn rate, as well as it's distinct blue flames. For use with the V-62 incinerator." + item_typepath = /obj/item/ammo_magazine/flamer_tank/backtank/X + purchase_cost = 40 + unlock_cost = 200 + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_UNLOCKABLE + +/datum/loadout_item/back/blinkdrive + name = "Blink drive" + desc = "A portable Bluespace Displacement Drive, otherwise known as a blink drive. \ + Can teleport the user across short distances with a degree of unreliability, with potentially fatal results. \ + Teleporting past 5 tiles, to tiles out of sight or rapid use of the drive add variance to the teleportation destination." + req_desc = "Requires an energy sword or V-21 SMG." + item_typepath = /obj/item/blink_drive + jobs_supported = list(SOM_SQUAD_VETERAN) + quantity = 2 + item_whitelist = list( + /obj/item/weapon/energy/sword/som = ITEM_SLOT_SUITSTORE, + /obj/item/weapon/gun/smg/som/veteran = ITEM_SLOT_SUITSTORE, + ) + +/datum/loadout_item/back/som_shotgun + name = "V-51" + desc = "Equipped with a mag harness, bayonet and undebarrel flashlight. The V-51 is the main shotgun utilised by the Sons of Mars. \ + Semi automatic with great handling and mobility, it is less powerful than the SH-35 used by the TGMC, but makes up for it with a superior rate of fire. \ + Uses 12 gauge shells." + ui_icon = "shotgun" + purchase_cost = 25 + item_typepath = /obj/item/weapon/gun/shotgun/som/standard + jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER) + loadout_item_flags = NONE + +/datum/loadout_item/back/som_shotgun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/shotgun/buckshot, SLOT_R_HAND) + +/datum/loadout_item/back/som_rocket_bag + name = "RPG bag" + desc = "This backpack holds 4 RPGs, in addition to a V-71 RPG launcher. Equipped with radioactive and incendiary warheads, \ + the V-71 is incredibly effective at softening up or flushing out organic targets, making them easy prey to finish off. Has a draw delay." + req_desc = "Requires a suit with a Mithridatius environmental protection module." + ui_icon = "rpg" + purchase_cost = 50 + quantity = 2 + item_typepath = /obj/item/storage/holster/backholster/rpg/som/war_crimes + jobs_supported = list(SOM_SQUAD_VETERAN) + item_whitelist = list(/obj/item/clothing/suit/modular/som/heavy/mithridatius = ITEM_SLOT_OCLOTHING) + +/datum/loadout_item/back/som_heat_rocket_bag + name = "HEAT RPG bag" + desc = "Unlocked for free with the Heavy weapon specialisation perk. This backpack holds 4 high explosive anti armor RPGs, in addition to a V-71 RPG launcher. Deals significant damage against vehicles and mechs, but will also generally devastate human victims in a pinch. \ + Has a draw delay and has poor accuracy against human targets." + ui_icon = "rpg" + unlock_cost = 300 + purchase_cost = 100 + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_UNLOCKABLE + quantity = 2 + item_typepath = /obj/item/storage/holster/backholster/rpg/som/heat + jobs_supported = list(SOM_SQUAD_VETERAN) + +/datum/loadout_item/back/volkite_powerpack + name = "M-70 powerpack" + desc = "A heavy reinforced backpack with an array of ultradensity energy cells, linked to a miniature radioisotope thermoelectric generator for continuous power generation. \ + Used to power the largest man portable volkite weaponry. Click drag cells to the powerpack to recharge." + req_desc = "Requires a VX-42 culverin or VX-33 caliver." + item_typepath = /obj/item/cell/lasgun/volkite/powerpack + jobs_supported = list(SOM_SQUAD_VETERAN) + item_whitelist = list( + /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/culverin/magharness = ITEM_SLOT_SUITSTORE, + /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/caliver/tacsensor = ITEM_SLOT_SUITSTORE, + ) + +/datum/loadout_item/back/boarding_axe + name = "Boarding axe" + desc = "A SOM boarding axe, a monstrous two handed weapon that inflicts terrible damage even through heavy armor. \ + When wielded it can be used to block as well as attack, and can also be used to force unpowered airlocks open. \ + You'll kill pretty much anything you can hit with this - providing you can get close enough to use it." + ui_icon = "axe" + item_typepath = /obj/item/weapon/twohanded/fireaxe/som + jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_VETERAN, SOM_FIELD_COMMANDER) + item_blacklist = list(/obj/item/weapon/twohanded/fireaxe/som = ITEM_SLOT_SUITSTORE) + loadout_item_flags = NONE diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/belt.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/belt.dm new file mode 100644 index 0000000000000..15c53b6e0201a --- /dev/null +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/belt.dm @@ -0,0 +1,119 @@ +/datum/loadout_item/belt/som_ammo_belt + name = "Ammo belt" + desc = "A belt with origins traced to the M276 ammo belt and some old colony security. Holds 6 normal sized magazines." + item_typepath = /obj/item/storage/belt/marine/som + jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_ENGINEER, SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER, SOM_FIELD_COMMANDER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + item_blacklist = list( + /obj/item/weapon/gun/rifle/som_mg/standard = ITEM_SLOT_SUITSTORE, + /obj/item/weapon/twohanded/fireaxe/som = ITEM_SLOT_SUITSTORE, + /obj/item/weapon/gun/flamer/som/mag_harness = ITEM_SLOT_SUITSTORE, + /obj/item/weapon/gun/shotgun/som/standard = ITEM_SLOT_SUITSTORE, + /obj/item/weapon/gun/shotgun/som/support = ITEM_SLOT_SUITSTORE, + ) + +/datum/loadout_item/belt/som_sparepouch + name = "Utility pouch" + desc = "A small, lightweight pouch that can be clipped onto armor or your belt to provide additional storage for miscellaneous gear or box and drum magazines. Made from genuine SOM leather." + item_typepath = /obj/item/storage/belt/sparepouch/som + jobs_supported = list(SOM_SQUAD_MARINE) + +/datum/loadout_item/belt/som_shotgun_mixed + name = "Shotgun shell rig" + desc = "An ammunition belt designed to hold shotgun shells or individual bullets. Made with traditional SOM leather. Loaded full of buckshot and flechette shells." + item_typepath = /obj/item/storage/belt/shotgun/som/mixed + jobs_supported = list(SOM_SQUAD_MARINE) + +/datum/loadout_item/belt/som_shotgun_flechette + name = "Shotgun shell rig" + desc = "An ammunition belt designed to hold shotgun shells or individual bullets. Made with traditional SOM leather. Loaded full of flechette shells." + item_typepath = /obj/item/storage/belt/shotgun/som/flechette + jobs_supported = list(SOM_SQUAD_ENGINEER) + +/datum/loadout_item/belt/som_grenades + name = "Grenade rig" + desc = "A simple harness system available in many configurations. This version is designed to carry bulk quantities of grenades." + ui_icon = "grenade" + item_typepath = /obj/item/storage/belt/grenade/som + jobs_supported = list(SOM_SQUAD_VETERAN) + purchase_cost = 80 + quantity = 2 + +/datum/loadout_item/belt/som_grenades/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BELT) + +/datum/loadout_item/belt/som_burst_pistol + name = "V-11e" + desc = "The standard sidearm used by the Sons of Mars. A reliable and simple weapon that is often seen on the export market on the outer colonies. \ + Typically chambered in 9mm armor piercing rounds. This one is configures for burstfire, and loaded with extended mags." + ui_icon = "v11" + item_typepath = /obj/item/storage/holster/belt/pistol/m4a3/som + jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_VETERAN) + +/datum/loadout_item/belt/som_burst_pistol/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_HOLSTER) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/burst(wearer), SLOT_IN_HOLSTER) + +/datum/loadout_item/belt/sawn_off + name = "Sawn-off shotgun" + desc = "A double barreled shotgun whose barrel has been artificially shortened to reduce range for further CQC potiential. Extremely powerful at close range, but is very difficult to handle." + req_desc = "Requires a VX-42 culverin or VX-33 caliver with powerpack." + ui_icon = "sshotgun" + item_typepath = /obj/item/weapon/gun/shotgun/double/sawn + jobs_supported = list(SOM_SQUAD_VETERAN) + item_whitelist = list( + /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/culverin/magharness = ITEM_SLOT_SUITSTORE, + /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/caliver/tacsensor = ITEM_SLOT_SUITSTORE, + ) + +/datum/loadout_item/belt/energy_sword + name = "Energy sword" + desc = "A SOM energy sword. Designed to cut through armored plate. An uncommon primary weapon, typically seen wielded by so called 'blink assault' troops. \ + Can be used defensively to great effect, mainly against opponents trying to strike you in melee, although some users report varying levels of success in blocking ranged projectiles." + ui_icon = "machete" + item_typepath = /obj/item/weapon/energy/sword/som + loadout_item_flags = NONE + jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_ENGINEER, SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER) + +/datum/loadout_item/belt/som_lifesaver + name = "S17 lifesaver bag" + desc = "A belt with heavy origins from the belt used by paramedics and doctors in the old mining colonies." + ui_icon = "medkit" + item_typepath = /obj/item/storage/belt/lifesaver/som/quick + jobs_supported = list(SOM_SQUAD_CORPSMAN) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/belt/som_officer_pistol + name = "VX-12 Serpenta" + desc = "The 'serpenta' is a volkite energy pistol typically seen in the hands of SOM officers and some NCOs, and is quite dangerous for it's size. \ + Comes in a holster that fits on your waist or armor." + ui_icon = "pistol" + item_typepath = /obj/item/storage/holster/belt/pistol/m4a3/som/serpenta + jobs_supported = list(SOM_SQUAD_LEADER, SOM_STAFF_OFFICER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + item_blacklist = list(/obj/item/storage/holster/belt/pistol/m4a3/som/serpenta = ITEM_SLOT_SUITSTORE) + +/datum/loadout_item/belt/som_officer_pistol_custom + name = "VX-12c Serpenta" + desc = "The 'serpenta' is a volkite energy pistol typically seen in the hands of SOM officers and some NCOs, and is quite dangerous for it's size. \ + This particular weapon appears to be a custom model with improved performance. Comes in a fancy holster that fits on your waist or armor." + ui_icon = "pistol" + item_typepath = /obj/item/storage/holster/belt/pistol/m4a3/som/fancy/fieldcommander + jobs_supported = list(SOM_FIELD_COMMANDER, SOM_COMMANDER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + item_blacklist = list(/obj/item/storage/holster/belt/pistol/m4a3/som/fancy/fieldcommander = ITEM_SLOT_SUITSTORE) diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/ears.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/ears.dm new file mode 100644 index 0000000000000..ae9a3c46e3614 --- /dev/null +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/ears.dm @@ -0,0 +1,13 @@ +/datum/loadout_item/ears/som_standard + name = "Standard headset" + desc = "A headset, allowing for communication with your team and access to the tactical minimap. You're in for a bad time if you don't use this." + item_typepath = /obj/item/radio/headset/mainship/som + jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_CORPSMAN, SOM_SQUAD_ENGINEER, SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/ears/som_command + name = "Command headset" + desc = "A command headset, allowing for communication with all squads and access to the tactical minimap. You're in for a bad time if you don't use this." + item_typepath = /obj/item/radio/headset/mainship/som/command + jobs_supported = list(SOM_FIELD_COMMANDER, SOM_STAFF_OFFICER, SOM_COMMANDER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/feet.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/feet.dm new file mode 100644 index 0000000000000..07e24d77b20e2 --- /dev/null +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/feet.dm @@ -0,0 +1,13 @@ +/datum/loadout_item/feet/som_boots + name = "Combat shoes" + desc = "Shoes with origins dating back to the old mining colonies. These were made for more than just walking." + item_typepath = /obj/item/clothing/shoes/marine/som/knife + jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_CORPSMAN, SOM_SQUAD_ENGINEER, SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER, SOM_FIELD_COMMANDER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/feet/som_officer + name = "officer's boots" + desc = "A shiny pair of boots, normally seen on the feet of SOM officers." + item_typepath = /obj/item/clothing/shoes/marinechief/som + jobs_supported = list(SOM_STAFF_OFFICER, SOM_COMMANDER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/gloves.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/gloves.dm new file mode 100644 index 0000000000000..508e26911656f --- /dev/null +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/gloves.dm @@ -0,0 +1,28 @@ +/datum/loadout_item/gloves/som_gloves + name = "SOM gloves" + desc = "Gloves with origins dating back to the old mining colonies, they look pretty tough." + item_typepath = /obj/item/clothing/gloves/marine/som + jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_CORPSMAN) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/gloves/som_veteran_gloves + name = "Veteran gloves" + desc = "Gloves with origins dating back to the old mining colonies. These ones seem tougher than normal." + item_typepath = /obj/item/clothing/gloves/marine/som/veteran + jobs_supported = list(SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/gloves/som_insulated + name = "Insulated gloves" + desc = "Gloves with origins dating back to the old mining colonies. These ones appear to have an electrically insulating layer built into them." + item_typepath = /obj/item/clothing/gloves/marine/som/insulated + jobs_supported = list(SOM_SQUAD_ENGINEER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/gloves/som_officer_gloves + name = "Officer gloves" + desc = "Black gloves commonly worn by SOM officers." + item_typepath = /obj/item/clothing/gloves/marine/som/officer + jobs_supported = list(SOM_FIELD_COMMANDER, SOM_STAFF_OFFICER, SOM_COMMANDER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/head.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/head.dm new file mode 100644 index 0000000000000..3b69a4d64855a --- /dev/null +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/head.dm @@ -0,0 +1,70 @@ +/datum/loadout_item/helmet/som_standard + name = "Infantry helmet" + desc = "The standard combat helmet worn by SOM combat troops. Made using advanced polymers to provide very effective protection without compromising visibility." + item_typepath = /obj/item/clothing/head/modular/som + jobs_supported = list(SOM_SQUAD_MARINE) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/helmet/som_standard/medic + jobs_supported = list(SOM_SQUAD_CORPSMAN) + +/datum/loadout_item/helmet/som_standard/medic/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) + +/datum/loadout_item/helmet/som_veteran + name = "Veteran helmet" + desc = "The standard combat helmet worn by SOM combat specialists. State of the art materials provides more protection for more valuable brains." + item_typepath = /obj/item/clothing/head/modular/som/veteran + jobs_supported = list(SOM_SQUAD_VETERAN) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/helmet/gorgon + name = "Gorgon helmet" + desc = "Made for use with Gorgon pattern assault armor, providing superior protection. Typically seen on SOM leaders or their most elite combat units." + item_typepath = /obj/item/clothing/head/modular/som/leader + jobs_supported = list(SOM_SQUAD_LEADER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/helmet/gorgon/fc + name = "Gorgon helmet" + desc = "Made for use with Gorgon pattern assault armor, providing superior protection. This one has gold markings indicating it belongs to a high ranking field officer." + item_typepath = /obj/item/clothing/head/modular/som/leader/officer + jobs_supported = list(SOM_FIELD_COMMANDER) + +/datum/loadout_item/helmet/som_surt + name = "Hades Helmet" + desc = "A standard combat helmet with a Hades fireproof module." + req_desc = "Requires a suit with a Hades module." + item_typepath = /obj/item/clothing/head/modular/som/hades + jobs_supported = list(SOM_SQUAD_MARINE) + item_whitelist = list(/obj/item/clothing/suit/modular/som/heavy/pyro = ITEM_SLOT_OCLOTHING) + +/datum/loadout_item/helmet/som_tyr + name = "Lorica Helmet" + desc = "A bulky helmet paired with the 'Lorica' armor module, designed for outstanding protection at the cost of significant weight and reduced flexibility. \ + Substantial additional armor improves protection against all damage." + req_desc = "Requires a suit with a Lorica module." + ui_icon = "lorica" + item_typepath = /obj/item/clothing/head/modular/som/lorica + jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_VETERAN) + item_whitelist = list(/obj/item/clothing/suit/modular/som/heavy/lorica = ITEM_SLOT_OCLOTHING) + +/datum/loadout_item/helmet/som_mimir + name = "Biohazard helmet" + desc = "A standard combat helmet with a Mithridatius 'Mith' environmental protection module." + req_desc = "Requires a suit with a Mithridatius environmental protection module." + item_typepath = /obj/item/clothing/head/modular/som/bio + jobs_supported = list(SOM_SQUAD_VETERAN) + item_whitelist = list(/obj/item/clothing/suit/modular/som/heavy/mithridatius = ITEM_SLOT_OCLOTHING) + +/datum/loadout_item/helmet/som_engineer + name = "Engineer helmet" + desc = "A specialised helmet designed for use by combat engineers. Its main feature being an integrated welding mask." + item_typepath = /obj/item/clothing/head/modular/som/engineer + jobs_supported = list(SOM_SQUAD_ENGINEER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/helmet/som_engineer/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_HEAD) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_HEAD) diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/pockets.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/pockets.dm new file mode 100644 index 0000000000000..e19db1484355a --- /dev/null +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/pockets.dm @@ -0,0 +1,205 @@ +/datum/loadout_item/r_pocket/som_standard_first_aid + name = "First aid pouch" + desc = "Standard SOM first-aid pouch. Contains a basic set of medical supplies." + ui_icon = "medkit" + item_typepath = /obj/item/storage/pouch/firstaid/som/combat_patrol + jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_VETERAN) + +/datum/loadout_item/r_pocket/som_standard_first_aid/standard_improved + desc = "Standard SOM first-aid pouch. Contains a improved set of medical supplies." + item_typepath = /obj/item/storage/pouch/firstaid/som/combat_patrol_leader + loadout_item_flags = null + +/datum/loadout_item/r_pocket/som_standard_first_aid/improved + desc = "Standard SOM first-aid pouch. Contains a improved set of medical supplies." + item_typepath = /obj/item/storage/pouch/firstaid/som/combat_patrol_leader + jobs_supported = list(SOM_SQUAD_LEADER, SOM_FIELD_COMMANDER) + +/datum/loadout_item/r_pocket/som_support_grenades + name = "Support nades" + desc = "A pouch carrying a set of six standard support grenades. Includes smoke grenades of both lethal and nonlethal varieties, as well as stun grenades." + ui_icon = "grenade" + item_typepath = /obj/item/storage/pouch/grenade/som/combat_patrol + jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_CORPSMAN, SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER, SOM_FIELD_COMMANDER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/r_pocket/som_standard_grenades + name = "Standard nades" + desc = "A pouch carrying a set of six standard offensive grenades. Contains HE and incendiary grenades." + ui_icon = "grenade" + item_typepath = /obj/item/storage/pouch/grenade/som/standard + jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_CORPSMAN, SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER, SOM_FIELD_COMMANDER) + +/datum/loadout_item/r_pocket/war_crime_grenades + name = "Warcrime nades" + desc = "A pouch carrying a set of rad and satrapine grenades. Extremely hazardous." + ui_icon = "grenade" + req_desc = "Requires a suit with a Mithridatius environmental protection module." + item_typepath = /obj/item/storage/pouch/grenade/som + jobs_supported = list(SOM_SQUAD_VETERAN) + item_whitelist = list(/obj/item/clothing/suit/modular/som/heavy/mithridatius = ITEM_SLOT_OCLOTHING) + +/datum/loadout_item/r_pocket/war_crime_grenades/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_R_POUCH) + +/datum/loadout_item/r_pocket/som_shotgun + name = "Buckshot shells" + desc = "A pouch specialized for holding shotgun ammo. Contains buckshot shells." + ui_icon = "grenade" + item_typepath = /obj/item/storage/pouch/shotgun/som + jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER) + +/datum/loadout_item/r_pocket/som_shotgun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) + +/datum/loadout_item/r_pocket/som_construction + name = "Construction pouch" + desc = "A pouch containing an assortment of construction supplies. Allows for the rapid establishment of fortified positions." + ui_icon = "materials" + item_typepath = /obj/item/storage/pouch/construction/som + jobs_supported = list(SOM_SQUAD_MARINE) + +/datum/loadout_item/r_pocket/som_construction/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/tool/shovel/etool, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags_empty/half, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags/large_stack, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/full, SLOT_IN_R_POUCH) + +/datum/loadout_item/r_pocket/som_magazine + name = "Mag pouch-P" + desc = "A pouch containing three ammo magazines. Will contain a primary ammo type where applicable." + ui_icon = "grenade" + item_typepath = /obj/item/storage/pouch/magazine/large/som + jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_CORPSMAN, SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER, SOM_FIELD_COMMANDER) + item_blacklist = list( + /obj/item/weapon/gun/rifle/som_mg/standard = ITEM_SLOT_SUITSTORE, + /obj/item/weapon/twohanded/fireaxe/som = ITEM_SLOT_SUITSTORE, + /obj/item/weapon/gun/flamer/som/mag_harness = ITEM_SLOT_SUITSTORE, + /obj/item/weapon/gun/shotgun/som/standard = ITEM_SLOT_SUITSTORE, + /obj/item/weapon/gun/shotgun/som/support = ITEM_SLOT_SUITSTORE, + ) + +/datum/loadout_item/r_pocket/som_tools + name = "Tool pouch" + desc = "It's designed to hold maintenance tools - screwdriver, wrench, cable coil, etc. It also has a hook for an entrenching tool." + ui_icon = "construction" + item_typepath = /obj/item/storage/pouch/tools/som/full + jobs_supported = list(SOM_SQUAD_ENGINEER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/r_pocket/som_general + name = "General pouch" + desc = "A general purpose pouch used to carry small items." + ui_icon = "grenade" + item_typepath = /obj/item/storage/pouch/general/som + jobs_supported = list(SOM_STAFF_OFFICER, SOM_COMMANDER) + +//l_pocket +/datum/loadout_item/l_pocket/som_standard_first_aid + name = "First aid pouch" + desc = "Standard SOM first-aid pouch. Contains a basic set of medical supplies." + ui_icon = "medkit" + item_typepath = /obj/item/storage/pouch/firstaid/som/combat_patrol + jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_ENGINEER, SOM_SQUAD_VETERAN) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/l_pocket/som_standard_first_aid/standard_improved + desc = "Standard SOM first-aid pouch. Contains a improved set of medical supplies." + item_typepath = /obj/item/storage/pouch/firstaid/som/combat_patrol_leader + loadout_item_flags = null + +/datum/loadout_item/l_pocket/som_standard_first_aid/improved + desc = "Standard SOM first-aid pouch. Contains a improved set of medical supplies." + item_typepath = /obj/item/storage/pouch/firstaid/som/combat_patrol_leader + jobs_supported = list(SOM_SQUAD_LEADER, SOM_FIELD_COMMANDER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/l_pocket/som_support_grenades + name = "Support nades" + desc = "A pouch carrying a set of six standard support grenades. Includes smoke grenades of both lethal and nonlethal varieties, as well as stun grenades." + ui_icon = "grenade" + item_typepath = /obj/item/storage/pouch/grenade/som/combat_patrol + jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_CORPSMAN, SOM_SQUAD_ENGINEER, SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER, SOM_FIELD_COMMANDER) + +/datum/loadout_item/l_pocket/som_standard_grenades + name = "Standard nades" + desc = "A pouch carrying a set of six standard offensive grenades. Contains HE and incendiary grenades." + ui_icon = "grenade" + item_typepath = /obj/item/storage/pouch/grenade/som/standard + jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_CORPSMAN, SOM_SQUAD_ENGINEER, SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER, SOM_FIELD_COMMANDER) + +/datum/loadout_item/l_pocket/war_crime_grenades + name = "Warcrime nades" + desc = "A pouch carrying a set of rad and satrapine grenades. Extremely hazardous." + ui_icon = "grenade" + req_desc = "Requires a suit with a Mithridatius environmental protection module." + item_typepath = /obj/item/storage/pouch/grenade/som + jobs_supported = list(SOM_SQUAD_VETERAN) + item_whitelist = list(/obj/item/clothing/suit/modular/som/heavy/mithridatius = ITEM_SLOT_OCLOTHING) + +/datum/loadout_item/l_pocket/war_crime_grenades/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_L_POUCH) + +/datum/loadout_item/l_pocket/som_shotgun + name = "Flechette shells" + desc = "A pouch specialized for holding shotgun ammo. Contains Flechette shells." + ui_icon = "grenade" + item_typepath = /obj/item/storage/pouch/shotgun/som + jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_CORPSMAN, SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER) + +/datum/loadout_item/l_pocket/som_shotgun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_L_POUCH) + +/datum/loadout_item/l_pocket/som_construction + name = "Construction pouch" + desc = "A pouch containing an assortment of construction supplies. Allows for the rapid establishment of fortified positions." + ui_icon = "materials" + item_typepath = /obj/item/storage/pouch/construction/som + jobs_supported = list(SOM_SQUAD_MARINE) + +/datum/loadout_item/l_pocket/som_construction/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/tool/shovel/etool, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags_empty/half, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags/large_stack, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/full, SLOT_IN_L_POUCH) + +/datum/loadout_item/l_pocket/som_magazine + name = "Mag pouch-S" + desc = "A pouch containing three ammo magazines. Will contain a secondary ammo type where applicable." + ui_icon = "grenade" + item_typepath = /obj/item/storage/pouch/magazine/large/som + jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_ENGINEER, SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER, SOM_FIELD_COMMANDER) + item_blacklist = list( + /obj/item/weapon/gun/rifle/som_mg/standard = ITEM_SLOT_SUITSTORE, + /obj/item/weapon/twohanded/fireaxe/som = ITEM_SLOT_SUITSTORE, + /obj/item/weapon/gun/flamer/som/mag_harness = ITEM_SLOT_SUITSTORE, + /obj/item/weapon/gun/shotgun/som/standard = ITEM_SLOT_SUITSTORE, + ) + + +/datum/loadout_item/l_pocket/som_magazine/medic + jobs_supported = list(SOM_SQUAD_CORPSMAN) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/l_pocket/som_general + name = "General pouch" + desc = "A general purpose pouch used to carry small items." + ui_icon = "grenade" + item_typepath = /obj/item/storage/pouch/general/som + jobs_supported = list(SOM_STAFF_OFFICER, SOM_COMMANDER) diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/suit.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/suit.dm new file mode 100644 index 0000000000000..2a7519abb9b1a --- /dev/null +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/suit.dm @@ -0,0 +1,195 @@ +/datum/loadout_item/suit_slot/som_light_shield + name = "L Aegis armor" + desc = "M-11 scout armor with a Aegis shield module. Provides excellent mobility but lower protection." + ui_icon = "light_armour_shield" + item_typepath = /obj/item/clothing/suit/modular/som/light/shield + jobs_supported = list(SOM_SQUAD_MARINE) + +/datum/loadout_item/suit_slot/som_light_shield/veteran + jobs_supported = list(SOM_SQUAD_VETERAN) + req_desc = "Requires a blink drive." + item_whitelist = list(/obj/item/blink_drive = ITEM_SLOT_BACK) + +/datum/loadout_item/suit_slot/som_light_shield/overclocked + desc = "M-11 scout armor with a Aegis shield module. Provides excellent mobility but lower protection. The shield module has been overclocked for improved performance." + item_typepath = /obj/item/clothing/suit/modular/som/light/shield_overclocked + jobs_supported = list(SOM_SQUAD_MARINE) + loadout_item_flags = null + +/datum/loadout_item/suit_slot/som_light_shield/overclocked/medic + item_typepath = /obj/item/clothing/suit/modular/som/light/shield_overclocked/medic + jobs_supported = list(SOM_SQUAD_CORPSMAN) + +/datum/loadout_item/suit_slot/som_light_shield/overclocked/medic/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_SUIT) + +/datum/loadout_item/suit_slot/som_light_shield/overclocked/engineer + item_typepath = /obj/item/clothing/suit/modular/som/light/shield_overclocked/engineer + jobs_supported = list(SOM_SQUAD_ENGINEER) + +/datum/loadout_item/suit_slot/som_light_shield/overclocked/engineer/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/circuitboard/apc, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/cell/high, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/half_stack, SLOT_IN_SUIT) + +/datum/loadout_item/suit_slot/som_light_shield/overclocked/veteran + jobs_supported = list(SOM_SQUAD_VETERAN) + req_desc = "Requires a blink drive." + item_whitelist = list(/obj/item/blink_drive = ITEM_SLOT_BACK) + +/datum/loadout_item/suit_slot/som_medium_shield + name = "M Aegis armor" + desc = "M-21 battle armor with a Aegis shield module. Provides balanced mobility and protection." + ui_icon = "medium_armour_shield" + item_typepath = /obj/item/clothing/suit/modular/som/shield + jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER, SOM_FIELD_COMMANDER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/suit_slot/som_medium_shield/overclocked + desc = "M-21 battle armor with a Aegis shield module. Provides balanced mobility and protection. The shield module has been overclocked for improved performance." + item_typepath = /obj/item/clothing/suit/modular/som/shield_overclocked + jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER, SOM_FIELD_COMMANDER) + loadout_item_flags = null + +/datum/loadout_item/suit_slot/som_medium_shield/overclocked/medic + item_typepath = /obj/item/clothing/suit/modular/som/shield_overclocked/medic + jobs_supported = list(SOM_SQUAD_CORPSMAN) + +/datum/loadout_item/suit_slot/som_medium_shield/overclocked/medic/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_SUIT) + +/datum/loadout_item/suit_slot/som_medium_shield/overclocked/engineer + item_typepath = /obj/item/clothing/suit/modular/som/shield_overclocked/engineer + jobs_supported = list(SOM_SQUAD_ENGINEER) + +/datum/loadout_item/suit_slot/som_medium_shield/overclocked/engineer/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/circuitboard/apc, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/cell/high, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/half_stack, SLOT_IN_SUIT) + +/datum/loadout_item/suit_slot/som_heavy_shield + name = "H Aegis armor" + desc = "M-31 combat armor with a Aegis shield module. Provides excellent protection but lower mobility." + ui_icon = "heavy_armour_shield" + item_typepath = /obj/item/clothing/suit/modular/som/heavy/shield + jobs_supported = list(SOM_SQUAD_VETERAN) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/suit_slot/som_heavy_shield/overclocked + desc = "M-31 combat armor with a Aegis shield module. Provides excellent protection but lower mobility. The shield module has been overclocked for improved performance." + item_typepath = /obj/item/clothing/suit/modular/som/heavy/shield_overclocked + jobs_supported = list(SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER, SOM_FIELD_COMMANDER) + loadout_item_flags = null + +/datum/loadout_item/suit_slot/som_heavy_shield/breacher + jobs_supported = list(SOM_SQUAD_MARINE) + req_desc = "Requires a V-21 and boarding shield." + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION + item_whitelist = list( + /obj/item/weapon/gun/smg/som/one_handed = ITEM_SLOT_SUITSTORE, + ) + +/datum/loadout_item/suit_slot/som_heavy_shield/breacher/overclocked + desc = "M-31 combat armor with a Aegis shield module. Provides excellent protection but lower mobility. The shield module has been overclocked for improved performance." + item_typepath = /obj/item/clothing/suit/modular/som/heavy/shield_overclocked + loadout_item_flags = null + +/datum/loadout_item/suit_slot/som_heavy_surt + name = "H Hades armor" + desc = "M-31 combat armor with a Hades fireproof module. Provides excellent protection and almost total fire immunity, but has poor mobility." + ui_icon = "heavy_armour" + req_desc = "Requires a V-62 incinerator." + item_typepath = /obj/item/clothing/suit/modular/som/heavy/pyro + jobs_supported = list(SOM_SQUAD_MARINE) + item_whitelist = list(/obj/item/weapon/gun/flamer/som/mag_harness = ITEM_SLOT_SUITSTORE) + +/datum/loadout_item/suit_slot/som_heavy_tyr + name = "H Lorica armor" + desc = "M-31 combat armor with a Lorica extra armor module. Provides incredible protection at the cost of further reduced mobility." + ui_icon = "lorica" + req_desc = "Requires a boarding axe primary weapon." + item_typepath = /obj/item/clothing/suit/modular/som/heavy/lorica + jobs_supported = list(SOM_SQUAD_MARINE) + item_whitelist = list( + /obj/item/weapon/twohanded/fireaxe/som = ITEM_SLOT_SUITSTORE, + ) + +/datum/loadout_item/suit_slot/som_heavy_tyr/veteran + req_desc = "Requires a VX-32 charger and boarding shield." + jobs_supported = list(SOM_SQUAD_VETERAN) + item_whitelist = list(/obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/charger/somvet = ITEM_SLOT_SUITSTORE) + +/datum/loadout_item/suit_slot/gorgon + name = "Gorgon armor" + desc = "M-35 'Gorgon' armor with integrated Apollo automedical module. Provides outstanding protection without severely limiting mobility. \ + Typically seen on SOM leaders or their most elite combat units due to the significant construction and maintenance requirements." + ui_icon = "gorgon" + item_typepath = /obj/item/clothing/suit/modular/som/heavy/leader/valk + jobs_supported = list(SOM_SQUAD_LEADER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/suit_slot/gorgon/fc + name = "Gorgon armor" + desc = "M-35 'Gorgon' armor with integrated Apollo automedical module. Provides outstanding protection without severely limiting mobility. \ + Typically seen on SOM leaders or their most elite combat units due to the significant construction and maintenance requirements. \ + The gold markings on this one signify it is worn by a high ranking field officer" + item_typepath = /obj/item/clothing/suit/modular/som/heavy/leader/officer + jobs_supported = list(SOM_FIELD_COMMANDER) + +/datum/loadout_item/suit_slot/som_heavy_mimir + name = "H Mith armor" + desc = "M-31 combat armor with a Mithridatius 'Mith' environmental protection module. Provides excellent armor and total immunity to chemical attacks, and improved radiological protection. Has lower mobility." + req_desc = "Requires a helmet with a Mithridatius environmental protection module." + ui_icon = "heavy_armour" + item_typepath = /obj/item/clothing/suit/modular/som/heavy/mithridatius + jobs_supported = list(SOM_SQUAD_VETERAN) + item_whitelist = list(/obj/item/clothing/head/modular/som/bio = ITEM_SLOT_HEAD) + purchase_cost = 75 + quantity = 4 + +//engineer +/datum/loadout_item/suit_slot/som_engineer + name = "M armor" + desc = "M-21 battle armor with engineering storage. Provides balanced armor and mobility." + ui_icon = "medium_armour" + item_typepath = /obj/item/clothing/suit/modular/som/engineer + jobs_supported = list(SOM_SQUAD_ENGINEER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/suit_slot/som_engineer/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/circuitboard/apc, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/cell/high, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/half_stack, SLOT_IN_SUIT) + +/datum/loadout_item/suit_slot/som_engineer/light + name = "L armor" + desc = "M-11 scout armor with engineering storage. Provides excellent mobility but lower protection." + ui_icon = "light_armour" + item_typepath = /obj/item/clothing/suit/modular/som/light/engineer + +//medic +/datum/loadout_item/suit_slot/som_medic + name = "M armor" + desc = "M-21 battle armor with medical storage. Provides balanced armor and mobility." + ui_icon = "medium_armour" + item_typepath = /obj/item/clothing/suit/modular/som/medic + jobs_supported = list(SOM_SQUAD_CORPSMAN) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/suit_slot/som_medic/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_SUIT) + +/datum/loadout_item/suit_slot/som_medic/light + name = "L armor" + desc = "M-11 scout armor with medical storage. Provides excellent mobility but lower protection." + ui_icon = "light_armour" + item_typepath = /obj/item/clothing/suit/modular/som/light/medic diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/engineer.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/engineer.dm new file mode 100644 index 0000000000000..eb0b672426edd --- /dev/null +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/engineer.dm @@ -0,0 +1,204 @@ +/datum/loadout_item/suit_store/main_gun/som_engineer + jobs_supported = list(SOM_SQUAD_ENGINEER) + +/datum/loadout_item/suit_store/main_gun/som_engineer/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/som_engineer/standard_rifle + name = "V-31" + desc = "Equipped with a red dot sight, extended barrel, vertical grip and integrated micro rail launcher. The V-31 is the principal ballistic weapon for the SOM. \ + It has good mobility and handling and a good rate of fire, but tends to favour closer range fighting compared to many TGMC equivilents. \ + The rail launcher electromagnetically launches a variety of 10 gauge airbursting grenades. Extremely effective when used correctly, their fixed fuse time makes them entirely ineffective at very close or far ranges. \ + Managing engagement range is thus vital for maximising the effectiveness of this weapon. \ + Uses 10x24mm caseless ammunition and 10 gauge micro grenades." + ui_icon = "ballistic" + item_typepath = /obj/item/weapon/gun/rifle/som/standard + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/suit_store/main_gun/som_engineer/standard_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/assembly/signaler, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/cope, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_engineer/standard_rifle/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/som_engineer/standard_rifle/enhanced + name = "V-31+" + desc = "Equipped with a red dot sight, extended barrel, vertical grip and integrated micro rail launcher. The V-31 is the principal ballistic weapon for the SOM. \ + It has good mobility and handling and a good rate of fire, but tends to favour closer range fighting compared to many TGMC equivilents. \ + The rail launcher electromagnetically launches a variety of 10 gauge airbursting grenades. Extremely effective when used correctly, their fixed fuse time makes them entirely ineffective at very close or far ranges. \ + Managing engagement range is thus vital for maximising the effectiveness of this weapon. \ + Uses a mix of standard and AP 10x24mm caseless ammunition, and 10 gauge micro grenades." + loadout_item_flags = NONE + secondary_ammo_type = /obj/item/ammo_magazine/rifle/som/ap + +/datum/loadout_item/suit_store/main_gun/som_engineer/mpi + name = "MPi-KM" + desc = "Equipped with a mag harness and laser sight. The MPi-KM is a modern reproduction based off several variants of kalashnikov type rifles used during the original Martian rebellion. \ + These weapons were already ancient at that time, and their continued use by the SOM speaks more to their cultural legacy than any tactical benefits. \ + Despite having relatively poor mobility and handling, it never the less has fearsome firepower and good capacity, ensuring it stays a relevant weapon choice for the SOM. Uses 7.62x39mm ammunition." + ui_icon = "ak47" + item_typepath = /obj/item/weapon/gun/rifle/mpi_km/black/magharness + +/datum/loadout_item/suit_store/main_gun/som_engineer/mpi/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/assembly/signaler, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/cope, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_engineer/carbine + name = "V-34" + desc = "Equipped with a red dot sight and foldable stock. The V-34 is a modern redesign of an ancient weapon that saw extensive use in the Martian uprising. \ + It combines good mobility and managable handling with fearsome stopping power and a tremendous rate of fire, making the V-34 an exceptionally deadly weapon at close range. \ + With poor falloff and accuracy, it is a poor weapon outside of close range, and its mobility lacks compared to some other close range weapons like the V-21. \ + Uses 7.62x39mm ammunition." + ui_icon = "v34" + item_typepath = /obj/item/weapon/gun/rifle/som_carbine/black/standard + +/datum/loadout_item/suit_store/main_gun/som_engineer/carbine/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/assembly/signaler, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/cope, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_engineer/smg + name = "V-21" + desc = "Equipped with a mag harness, recoil compensator and vertical grip. The V-21 is the principal submachinegun used by the Sons of Mars, with a variable rate of fire. \ + Has outstanding mobility and handling and can be comfortably fired one handed on its lower fire rate mode. \ + When set to its higher rate of fire, it unleashes a staggering torrent of firepower, but is difficult to control even two handed, and quickly loses effectiveness at range. \ + At close range however, it will quickly obliterate most targets - as long as you don't run out of ammo. \ + It uses 10x20mm caseless rounds." + ui_icon = "smg" + item_typepath = /obj/item/weapon/gun/smg/som/support + +/datum/loadout_item/suit_store/main_gun/som_engineer/smg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/assembly/signaler, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/cope, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_engineer/smg/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/som_engineer/smg/enhanced + name = "V-21+" + desc = "Equipped with a mag harness, recoil compensator and vertical grip. The V-21 is the principal submachinegun used by the Sons of Mars, with a variable rate of fire. \ + Has outstanding mobility and handling and can be comfortably fired one handed on its lower fire rate mode. \ + When set to its higher rate of fire, it unleashes a staggering torrent of firepower, but is difficult to control even two handed, and quickly loses effectiveness at range. \ + At close range however, it will quickly obliterate most targets - as long as you don't run out of ammo. \ + Uses a mix of standard and AP 10x20mm caseless ammunition." + loadout_item_flags = NONE + secondary_ammo_type = /obj/item/ammo_magazine/smg/som/ap + +/datum/loadout_item/suit_store/main_gun/som_engineer/flechette_shotgun + name = "V-51" + desc = "Equipped with a mag harness and bayonet. The V-51 is the main shotgun utilised by the Sons of Mars. \ + Semi automatic with great handling and mobility, it is less powerful than the SH-35 used by the TGMC, but makes up for it with a superior rate of fire. \ + Uses 12 gauge shells." + ui_icon = "shotgun" + item_typepath = /obj/item/weapon/gun/shotgun/som/support + +/datum/loadout_item/suit_store/main_gun/som_engineer/flechette_shotgun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/assembly/signaler, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/cope, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_engineer/flechette_shotgun/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/som_engineer/volkite_charger + name = "VX-32 charger" + desc = "Unlocked for free with the Advanced rifle training perk. Equipped with a red dot sight and laser sight. The VX-32 is a sophisticated energy weapon capable of explosively deflagrated organic targets, horrifically burning and igniting the victim and anyone unfortunate enough to be near them. \ + Has excellent mobility and handling and is best used at close range. Can be used one handed relatively effectively with sufficient skill. \ + Its deflagrating ability works best against light armored targets, where it can quickly mow down and demoralise tightly packed enemies. Against heavily armored opponents, its effectiveness can quickly drop however. \ + Uses volkite power cells, shared with the VX-33." + ui_icon = "volkite" + item_typepath = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/charger/standard + unlock_cost = 300 + purchase_cost = 25 + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_UNLOCKABLE + +/datum/loadout_item/suit_store/main_gun/som_engineer/volkite_charger/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/assembly/signaler, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/cope, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/field_commander.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/field_commander.dm new file mode 100644 index 0000000000000..d5189ff12ac83 --- /dev/null +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/field_commander.dm @@ -0,0 +1,205 @@ +/datum/loadout_item/suit_store/main_gun/som_field_commander + jobs_supported = list(SOM_FIELD_COMMANDER) + +/datum/loadout_item/suit_store/main_gun/som_field_commander/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!ammo_type) + return + if(istype(wearer.back, /obj/item/storage)) + if(istype(wearer.belt, /obj/item/storage/holster/belt/pistol/m4a3/som)) //if we have a backpack and pistol belt, we just load more ammo in the back + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + else //else we put the sidearm in the bag + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/serpenta/custom(wearer), SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_field_commander/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign/som, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/som_field_commander/standard_rifle + name = "V-31" + desc = "Equipped with a red dot sight, extended barrel, vertical grip and integrated micro rail launcher. Also comes with light armor piercing ammunition. The V-31 is the principal ballistic weapon for the SOM. \ + It has good mobility and handling and a good rate of fire, but tends to favour closer range fighting compared to many TGMC equivilents. \ + The rail launcher electromagnetically launches a variety of 10 gauge airbursting grenades. Extremely effective when used correctly, their fixed fuse time makes them entirely ineffective at very close or far ranges. \ + Managing engagement range is thus vital for maximising the effectiveness of this weapon. \ + Uses 10x25mm caseless ammunition and 10 gauge micro grenades." + ui_icon = "ballistic" + item_typepath = /obj/item/weapon/gun/rifle/som/veteran + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/suit_store/main_gun/som_field_commander/standard_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_field_commander/smg + name = "V-21" + desc = "Equipped with a red dot sight, recoil compensator and vertical grip, along with armor piercing ammunition. The V-21 is the principal submachinegun used by the Sons of Mars, with a variable rate of fire. \ + Has outstanding mobility and handling and can be comfortably fired one handed on its lower fire rate mode. \ + When set to its higher rate of fire, it unleashes a staggering torrent of firepower, but is difficult to control even two handed, and quickly loses effectiveness at range. \ + At close range however, it will quickly obliterate most targets - as long as you don't run out of ammo. \ + It uses 10x20mm caseless rounds." + ui_icon = "smg" + item_typepath = /obj/item/weapon/gun/smg/som/veteran + +/datum/loadout_item/suit_store/main_gun/som_field_commander/smg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_field_commander/volkite_charger + name = "VX-32 charger" + desc = "Equipped with a motion sensor and gyroscopic stabiliser for effective one handed use. \ + The VX-32 is a sophisticated energy weapon capable of explosively deflagrated organic targets, horrifically burning and igniting the victim and anyone unfortunate enough to be near them. \ + Has excellent mobility and handling and is best used at close range. \ + Its deflagrating ability works best against light armored targets, where it can quickly mow down and demoralise tightly packed enemies. Against heavily armored opponents, its effectiveness can quickly drop however. \ + Uses volkite power cells, shared with the VX-33." + ui_icon = "volkite" + item_typepath = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/charger/scout + +/datum/loadout_item/suit_store/main_gun/som_field_commander/volkite_charger/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_field_commander/volkite_caliver + name = "VX-33 caliver" + desc = "Equipped with a red dot sight and laser sight. \ + The VX-33 is a sophisticated energy weapon capable of explosively deflagrated organic targets, horrifically burning and igniting the victim and anyone unfortunate enough to be near them. \ + Has middling mobility and handling, it is a long range rifle analogue, able to project strong damage even at long ranges. \ + Its deflagrating ability works best against light armored targets, where it can quickly mow down and demoralise tightly packed enemies. Against heavily armored opponents, its effectiveness can quickly drop however. \ + Uses volkite power cells, shared with the VX-32, and can also be linked to a volkite powerpack." + ui_icon = "volkite" + purchase_cost = 50 + item_typepath = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/caliver/tacsensor + +/datum/loadout_item/suit_store/main_gun/som_field_commander/volkite_caliver/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_field_commander/mpi + name = "MPi-KM" + desc = "Equipped with a mag harness and underbarrel grenade launcher. This MPi-KM is an original example of one of several variants of kalashnikov type rifles used during the original Martian rebellion. \ + Passed down the generations and lovingly maintained as a family heirloom, \ + its use on modern battlefields is an idiosyncratic example of the SOM's persistant desire to maintain a link to their cultural past, more than any possible tactical reason. \ + Despite having relatively poor mobility and handling, it never the less has fearsome firepower and good capacity, ensuring it stays a relevant weapon choice for the SOM. Uses 7.62x39mm ammunition." + ui_icon = "ak47" + item_typepath = /obj/item/weapon/gun/rifle/mpi_km/grenadier + +/datum/loadout_item/suit_store/main_gun/som_field_commander/mpi/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_field_commander/carbine + name = "V-34" + desc = "Equipped with a mag harness and foldable stock. This V-34 is refurbished and well maintained weapon passed down from its use during the original Martian rebellion, \ + more family heirloom than a battlefield weapon, it serves just as well regardless. \ + It combines good mobility and managable handling with fearsome stopping power and a tremendous rate of fire, making the V-34 an exceptionally deadly weapon at close range. \ + With poor falloff and accuracy, it is a poor weapon outside of close range, and its mobility lacks compared to some other close range weapons like the V-21. \ + Uses 7.62x39mm ammunition." + ui_icon = "v34" + item_typepath = /obj/item/weapon/gun/rifle/som_carbine/mag_harness + +/datum/loadout_item/suit_store/main_gun/som_field_commander/carbine/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/fc_boarding_axe + name = "Boarding axe" + desc = "A SOM boarding axe, a monstrous two handed weapon that inflicts terrible damage even through heavy armor. \ + When wielded it can be used to block as well as attack, and can also be used to force unpowered airlocks open. \ + You'll kill pretty much anything you can hit with this - providing you can get close enough to use it." + ui_icon = "axe" + item_typepath = /obj/item/weapon/twohanded/fireaxe/som + item_blacklist = list(/obj/item/weapon/twohanded/fireaxe/som = ITEM_SLOT_BACK) + jobs_supported = list(SOM_FIELD_COMMANDER) + +/datum/loadout_item/suit_store/fc_boarding_axe/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign/som, SLOT_IN_ACCESSORY) + + if(!isstorage(wearer.back)) + return + if(istype(wearer.belt, /obj/item/storage/holster/belt/pistol/m4a3/som)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) + else + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/serpenta/custom(wearer), SLOT_IN_BACKPACK) + + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BACKPACK) diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/medic.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/medic.dm new file mode 100644 index 0000000000000..7bbece10d3be4 --- /dev/null +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/medic.dm @@ -0,0 +1,175 @@ +/datum/loadout_item/suit_store/main_gun/som_medic + jobs_supported = list(SOM_SQUAD_CORPSMAN) + +/datum/loadout_item/suit_store/main_gun/som_medic/standard_rifle + name = "V-31" + desc = "Equipped with a red dot sight, extended barrel, vertical grip and integrated micro rail launcher. The V-31 is the principal ballistic weapon for the SOM. \ + It has good mobility and handling and a good rate of fire, but tends to favour closer range fighting compared to many TGMC equivilents. \ + The rail launcher electromagnetically launches a variety of 10 gauge airbursting grenades. Extremely effective when used correctly, their fixed fuse time makes them entirely ineffective at very close or far ranges. \ + Managing engagement range is thus vital for maximising the effectiveness of this weapon. \ + Uses 10x24mm caseless ammunition and 10 gauge micro grenades." + ui_icon = "ballistic" + item_typepath = /obj/item/weapon/gun/rifle/som/standard + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/suit_store/main_gun/som_medic/standard_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_medic/standard_rifle/enhanced + name = "V-31+" + desc = "Equipped with a red dot sight, extended barrel, vertical grip and integrated micro rail launcher. The V-31 is the principal ballistic weapon for the SOM. \ + It has good mobility and handling and a good rate of fire, but tends to favour closer range fighting compared to many TGMC equivilents. \ + The rail launcher electromagnetically launches a variety of 10 gauge airbursting grenades. Extremely effective when used correctly, their fixed fuse time makes them entirely ineffective at very close or far ranges. \ + Managing engagement range is thus vital for maximising the effectiveness of this weapon. \ + Uses a mix of standard and AP 10x24mm caseless ammunition, and 10 gauge micro grenades." + loadout_item_flags = NONE + secondary_ammo_type = /obj/item/ammo_magazine/rifle/som/ap + +/datum/loadout_item/suit_store/main_gun/som_medic/mpi + name = "MPi-KM" + desc = "Equipped with a mag harness and laser sight. The MPi-KM is a modern reproduction based off several variants of kalashnikov type rifles used during the original Martian rebellion. \ + These weapons were already ancient at that time, and their continued use by the SOM speaks more to their cultural legacy than any tactical benefits. \ + Despite having relatively poor mobility and handling, it never the less has fearsome firepower and good capacity, ensuring it stays a relevant weapon choice for the SOM. Uses 7.62x39mm ammunition." + ui_icon = "ak47" + item_typepath = /obj/item/weapon/gun/rifle/mpi_km/black/magharness + +/datum/loadout_item/suit_store/main_gun/som_medic/mpi/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_medic/carbine + name = "V-34" + desc = "Equipped with a red dot sight and foldable stock. The V-34 is a modern redesign of an ancient weapon that saw extensive use in the Martian uprising. \ + It combines good mobility and managable handling with fearsome stopping power and a tremendous rate of fire, making the V-34 an exceptionally deadly weapon at close range. \ + With poor falloff and accuracy, it is a poor weapon outside of close range, and its mobility lacks compared to some other close range weapons like the V-21. \ + Uses 7.62x39mm ammunition." + ui_icon = "v34" + item_typepath = /obj/item/weapon/gun/rifle/som_carbine/black/standard + +/datum/loadout_item/suit_store/main_gun/som_medic/carbine/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_medic/smg + name = "V-21" + desc = "Equipped with a mag harness, recoil compensator and vertical grip. The V-21 is the principal submachinegun used by the Sons of Mars, with a variable rate of fire. \ + Has outstanding mobility and handling and can be comfortably fired one handed on its lower fire rate mode. \ + When set to its higher rate of fire, it unleashes a staggering torrent of firepower, but is difficult to control even two handed, and quickly loses effectiveness at range. \ + At close range however, it will quickly obliterate most targets - as long as you don't run out of ammo. \ + It uses 10x20mm caseless rounds." + ui_icon = "smg" + item_typepath = /obj/item/weapon/gun/smg/som/support + +/datum/loadout_item/suit_store/main_gun/som_medic/smg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_marine/smg/enhanced + name = "V-21+" + desc = "Equipped with a mag harness, recoil compensator and vertical grip. The V-21 is the principal submachinegun used by the Sons of Mars, with a variable rate of fire. \ + Has outstanding mobility and handling and can be comfortably fired one handed on its lower fire rate mode. \ + When set to its higher rate of fire, it unleashes a staggering torrent of firepower, but is difficult to control even two handed, and quickly loses effectiveness at range. \ + At close range however, it will quickly obliterate most targets - as long as you don't run out of ammo. \ + Uses a mix of standard and AP 10x20mm caseless ammunition." + loadout_item_flags = NONE + secondary_ammo_type = /obj/item/ammo_magazine/smg/som/ap + +/datum/loadout_item/suit_store/main_gun/som_medic/flechette_shotgun + name = "V-51" + desc = "Equipped with a mag harness and bayonet, and solely loaded with flechette rounds. The V-51 is the main shotgun utilised by the Sons of Mars. \ + Semi automatic with great handling and mobility, it is less powerful than the SH-35 used by the TGMC, but makes up for it with a superior rate of fire. \ + Uses 12 gauge shells." + ui_icon = "shotgun" + item_typepath = /obj/item/weapon/gun/shotgun/som/support + +/datum/loadout_item/suit_store/main_gun/som_medic/flechette_shotgun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_medic/volkite_charger + name = "VX-32 charger" + desc = "Unlocked for free with the Advanced rifle training perk. Equipped with a red dot sight and laser sight. The VX-32 is a sophisticated energy weapon capable of explosively deflagrated organic targets, horrifically burning and igniting the victim and anyone unfortunate enough to be near them. \ + Has excellent mobility and handling and is best used at close range. Can be used one handed relatively effectively with sufficient skill. \ + Its deflagrating ability works best against light armored targets, where it can quickly mow down and demoralise tightly packed enemies. Against heavily armored opponents, its effectiveness can quickly drop however. \ + Uses volkite power cells, shared with the VX-33." + ui_icon = "volkite" + item_typepath = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/charger/standard + unlock_cost = 300 + purchase_cost = 25 + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_UNLOCKABLE + +/datum/loadout_item/suit_store/main_gun/som_medic/volkite_charger/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/squad_leader.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/squad_leader.dm new file mode 100644 index 0000000000000..97e19c10f09b5 --- /dev/null +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/squad_leader.dm @@ -0,0 +1,164 @@ +/datum/loadout_item/suit_store/main_gun/som_squad_leader + jobs_supported = list(SOM_SQUAD_LEADER) + +/datum/loadout_item/suit_store/main_gun/som_squad_leader/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!ammo_type) + return + if(istype(wearer.back, /obj/item/storage)) + if(istype(wearer.belt, /obj/item/storage/holster/belt/pistol/m4a3/som)) //if we have a backpack and pistol belt, we just load more ammo in the back + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + else //else we put the sidearm in the bag + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/serpenta(wearer), SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_squad_leader/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign/som, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/som_squad_leader/standard_rifle + name = "V-31" + desc = "Equipped with a red dot sight, extended barrel, vertical grip and integrated micro rail launcher. Also comes with light armor piercing ammunition. The V-31 is the principal ballistic weapon for the SOM. \ + It has good mobility and handling and a good rate of fire, but tends to favour closer range fighting compared to many TGMC equivilents. \ + The rail launcher electromagnetically launches a variety of 10 gauge airbursting grenades. Extremely effective when used correctly, their fixed fuse time makes them entirely ineffective at very close or far ranges. \ + Managing engagement range is thus vital for maximising the effectiveness of this weapon. \ + Uses 10x25mm caseless ammunition and 10 gauge micro grenades." + ui_icon = "ballistic" + item_typepath = /obj/item/weapon/gun/rifle/som/veteran + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/suit_store/main_gun/som_squad_leader/standard_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_squad_leader/smg + name = "V-21" + desc = "Equipped with a red dot sight, recoil compensator and vertical grip, along with armor piercing ammunition. The V-21 is the principal submachinegun used by the Sons of Mars, with a variable rate of fire. \ + Has outstanding mobility and handling and can be comfortably fired one handed on its lower fire rate mode. \ + When set to its higher rate of fire, it unleashes a staggering torrent of firepower, but is difficult to control even two handed, and quickly loses effectiveness at range. \ + At close range however, it will quickly obliterate most targets - as long as you don't run out of ammo. \ + It uses 10x20mm caseless rounds." + ui_icon = "smg" + item_typepath = /obj/item/weapon/gun/smg/som/veteran + +/datum/loadout_item/suit_store/main_gun/som_squad_leader/smg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_squad_leader/volkite_charger + name = "VX-32 charger" + desc = "Equipped with a motion sensor and gyroscopic stabiliser for effective one handed use. \ + The VX-32 is a sophisticated energy weapon capable of explosively deflagrated organic targets, horrifically burning and igniting the victim and anyone unfortunate enough to be near them. \ + Has excellent mobility and handling and is best used at close range. \ + Its deflagrating ability works best against light armored targets, where it can quickly mow down and demoralise tightly packed enemies. Against heavily armored opponents, its effectiveness can quickly drop however. \ + Uses volkite power cells, shared with the VX-33." + ui_icon = "volkite" + item_typepath = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/charger/scout + +/datum/loadout_item/suit_store/main_gun/som_squad_leader/volkite_charger/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_squad_leader/volkite_caliver + name = "VX-33 caliver" + desc = "Equipped with a motion sensor and laser sight. \ + The VX-33 is a sophisticated energy weapon capable of explosively deflagrated organic targets, horrifically burning and igniting the victim and anyone unfortunate enough to be near them. \ + Has middling mobility and handling, it is a long range rifle analogue, able to project strong damage even at long ranges. \ + Its deflagrating ability works best against light armored targets, where it can quickly mow down and demoralise tightly packed enemies. Against heavily armored opponents, its effectiveness can quickly drop however. \ + Uses volkite power cells, shared with the VX-32, and can also be linked to a volkite powerpack." + ui_icon = "volkite" + purchase_cost = 50 + item_typepath = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/caliver/tacsensor + +/datum/loadout_item/suit_store/main_gun/som_squad_leader/volkite_caliver/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_squad_leader/mpi + name = "MPi-KM" + desc = "Equipped with a mag harness and underbarrel grenade launcher. This MPi-KM is an original example of one of several variants of kalashnikov type rifles used during the original Martian rebellion. \ + Passed down the generations and lovingly maintained as a family heirloom, \ + its use on modern battlefields is an idiosyncratic example of the SOM's persistant desire to maintain a link to their cultural past, more than any possible tactical reason. \ + Despite having relatively poor mobility and handling, it never the less has fearsome firepower and good capacity, ensuring it stays a relevant weapon choice for the SOM. Uses 7.62x39mm ammunition." + ui_icon = "ak47" + item_typepath = /obj/item/weapon/gun/rifle/mpi_km/grenadier + +/datum/loadout_item/suit_store/main_gun/som_squad_leader/mpi/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_squad_leader/carbine + name = "V-34" + desc = "Equipped with a mag harness and foldable stock. This V-34 is refurbished and well maintained weapon passed down from its use during the original Martian rebellion, \ + more family heirloom than a battlefield weapon, it serves just as well regardless. \ + It combines good mobility and managable handling with fearsome stopping power and a tremendous rate of fire, making the V-34 an exceptionally deadly weapon at close range. \ + With poor falloff and accuracy, it is a poor weapon outside of close range, and its mobility lacks compared to some other close range weapons like the V-21. \ + Uses 7.62x39mm ammunition." + ui_icon = "v34" + item_typepath = /obj/item/weapon/gun/rifle/som_carbine/mag_harness + +/datum/loadout_item/suit_store/main_gun/som_squad_leader/carbine/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, SLOT_IN_BACKPACK) diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/standard.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/standard.dm new file mode 100644 index 0000000000000..da1de837f2261 --- /dev/null +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/standard.dm @@ -0,0 +1,414 @@ +/datum/loadout_item/suit_store/main_gun/som_marine + jobs_supported = list(SOM_SQUAD_MARINE) + +/datum/loadout_item/suit_store/main_gun/som_marine/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!ammo_type) + return + if(!isstorage(wearer.back)) + return + if(istype(wearer.belt, /obj/item/storage/holster/belt/pistol/m4a3/som)) //if we have a backpack and pistol belt, we just load more ammo in the back + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + else //else we put the sidearm in the bag + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/standard(wearer), SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_marine/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/som_marine/standard_rifle + name = "V-31" + desc = "Equipped with a red dot sight, extended barrel, vertical grip and integrated micro rail launcher. The V-31 is the principal ballistic weapon for the SOM. \ + It has good mobility and handling and a good rate of fire, but tends to favour closer range fighting compared to many TGMC equivilents. \ + The rail launcher electromagnetically launches a variety of 10 gauge airbursting grenades. Extremely effective when used correctly, their fixed fuse time makes them entirely ineffective at very close or far ranges. \ + Managing engagement range is thus vital for maximising the effectiveness of this weapon. \ + Uses 10x24mm caseless ammunition and 10 gauge micro grenades." + ui_icon = "ballistic" + item_typepath = /obj/item/weapon/gun/rifle/som/standard + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/suit_store/main_gun/som_marine/standard_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return + + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_marine/standard_rifle/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/som_marine/standard_rifle/enhanced + name = "V-31+" + desc = "Equipped with a red dot sight, extended barrel, vertical grip and integrated micro rail launcher. The V-31 is the principal ballistic weapon for the SOM. \ + It has good mobility and handling and a good rate of fire, but tends to favour closer range fighting compared to many TGMC equivilents. \ + The rail launcher electromagnetically launches a variety of 10 gauge airbursting grenades. Extremely effective when used correctly, their fixed fuse time makes them entirely ineffective at very close or far ranges. \ + Managing engagement range is thus vital for maximising the effectiveness of this weapon. \ + Uses a mix of standard and AP 10x24mm caseless ammunition, and 10 gauge micro grenades." + loadout_item_flags = NONE + secondary_ammo_type = /obj/item/ammo_magazine/rifle/som/ap + +/datum/loadout_item/suit_store/main_gun/som_marine/standard_rifle/enhanced/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + return ..() + +/datum/loadout_item/suit_store/main_gun/som_marine/mpi_grenadier + name = "MPi-KM" + desc = "Equipped with a red dot sight and underbarrel grenade launcher. The MPi-KM is a modern reproduction based off several variants of kalashnikov type rifles used during the original Martian rebellion. \ + These weapons were already ancient at that time, and their continued use by the SOM speaks more to their cultural legacy than any tactical benefits. \ + Despite having relatively poor mobility and handling, it never the less has fearsome firepower and good capacity, ensuring it stays a relevant weapon choice for the SOM. Uses 7.62x39mm ammunition." + ui_icon = "ak47" + item_typepath = /obj/item/weapon/gun/rifle/mpi_km/black/grenadier + +/datum/loadout_item/suit_store/main_gun/som_marine/mpi_grenadier/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_marine/carbine + name = "V-34" + desc = "Equipped with a red dot sight and foldable stock. The V-34 is a modern redesign of an ancient weapon that saw extensive use in the Martian uprising. \ + It combines good mobility and managable handling with fearsome stopping power and a tremendous rate of fire, making the V-34 an exceptionally deadly weapon at close range. \ + With poor falloff and accuracy, it is a poor weapon outside of close range, and its mobility lacks compared to some other close range weapons like the V-21. \ + Uses 7.62x39mm ammunition." + ui_icon = "v34" + item_typepath = /obj/item/weapon/gun/rifle/som_carbine/black/standard + +/datum/loadout_item/suit_store/main_gun/som_marine/carbine/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_marine/smg + name = "V-21" + desc = "Equipped with a motion sensor, recoil compensator and vertical grip. The V-21 is the principal submachinegun used by the Sons of Mars, with a variable rate of fire. \ + Has outstanding mobility and handling and can be comfortably fired one handed on its lower fire rate mode. \ + When set to its higher rate of fire, it unleashes a staggering torrent of firepower, but is difficult to control even two handed, and quickly loses effectiveness at range. \ + At close range however, it will quickly obliterate most targets - as long as you don't run out of ammo. \ + It uses 10x20mm caseless rounds." + req_desc = "Requires M-11 scout armor." + ui_icon = "smg" + item_typepath = /obj/item/weapon/gun/smg/som/scout + item_whitelist = list( + /obj/item/clothing/suit/modular/som/light/shield = ITEM_SLOT_OCLOTHING, + /obj/item/clothing/suit/modular/som/light/shield_overclocked = ITEM_SLOT_OCLOTHING, + ) + +/datum/loadout_item/suit_store/main_gun/som_marine/smg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_marine/smg/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/som_marine/smg/enhanced + name = "V-21+" + desc = "Equipped with a motion sensor, recoil compensator and vertical grip. The V-21 is the principal submachinegun used by the Sons of Mars, with a variable rate of fire. \ + Has outstanding mobility and handling and can be comfortably fired one handed on its lower fire rate mode. \ + When set to its higher rate of fire, it unleashes a staggering torrent of firepower, but is difficult to control even two handed, and quickly loses effectiveness at range. \ + At close range however, it will quickly obliterate most targets - as long as you don't run out of ammo. \ + Uses a mix of standard and AP 10x20mm caseless ammunition." + loadout_item_flags = NONE + secondary_ammo_type = /obj/item/ammo_magazine/smg/som/ap + +/datum/loadout_item/suit_store/main_gun/som_marine/smg/enhanced/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + return ..() + +/datum/loadout_item/suit_store/main_gun/som_marine/standard_shotgun + name = "V-51" + desc = "Equipped with a mag harness, bayonet and undebarrel flashlight. The V-51 is the main shotgun utilised by the Sons of Mars. \ + Semi automatic with great handling and mobility, it is less powerful than the SH-35 used by the TGMC, but makes up for it with a superior rate of fire. \ + Uses 12 gauge shells." + req_desc = "Requires M-11 scout armor." + ui_icon = "shotgun" + item_typepath = /obj/item/weapon/gun/shotgun/som/standard + item_whitelist = list( + /obj/item/clothing/suit/modular/som/light/shield = ITEM_SLOT_OCLOTHING, + /obj/item/clothing/suit/modular/som/light/shield_overclocked = ITEM_SLOT_OCLOTHING, + ) + +/datum/loadout_item/suit_store/main_gun/som_marine/standard_shotgun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_marine/smg/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/som_marine/flamer + name = "V-62 incinerator" + desc = "Equipped with a mag harness and wide nozzle. The V-62 is a deadly weapon employed in close quarter combat, favoured as much for the terror it inspires as the actual damage it inflicts. \ + It has good range for a flamer, able to effortly clear out enclosed or defensive positions but lacks the integrated extinguisher of its TGMC equivalent." + req_desc = "Requires M-31 combat armor with a Hades fireproof module." + ui_icon = "ballistic" + item_typepath = /obj/item/weapon/gun/flamer/som/mag_harness + item_whitelist = list(/obj/item/clothing/suit/modular/som/heavy/pyro = ITEM_SLOT_OCLOTHING) + +/datum/loadout_item/suit_store/main_gun/som_marine/flamer/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/som, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_marine/flamer/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som/extended, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/som_marine/smg_and_shield + name = "V-21 & riot shield" + desc = "Equipped with a red dot sight, recoil compensator and vertical grip, along with a S-144 boarding shield, intended for use with M-31 combat armor for boarding actions.. The V-21 is the principal submachinegun used by the Sons of Mars, with a variable rate of fire. \ + Has outstanding mobility and handling and can be comfortably fired one handed on its lower fire rate mode. \ + When set to its higher rate of fire, it unleashes a staggering torrent of firepower, but is difficult to control even two handed, and quickly loses effectiveness at range. \ + When used with the boarding shield, use of the higher rate of fire is highly unrecommended outside of anything but absolute point blank range. \ + It uses 10x20mm caseless rounds." + ui_icon = "riot_shield" + item_typepath = /obj/item/weapon/gun/smg/som/one_handed + +/datum/loadout_item/suit_store/main_gun/som_marine/smg_and_shield/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/som, SLOT_L_HAND) + if(!isstorage(wearer.back)) + return ..() + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/weldingtool/largetank, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + return ..() //we explicitly don't want a sidearm for this weapon choice + +/datum/loadout_item/suit_store/main_gun/som_marine/smg_and_shield/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/som_marine/smg_and_shield/enhanced + name = "V-21+ & riot shield" + desc = "Equipped with a red dot sight, recoil compensator and vertical grip, along with a S-144 boarding shield, intended for use with M-31 combat armor for boarding actions.. The V-21 is the principal submachinegun used by the Sons of Mars, with a variable rate of fire. \ + Has outstanding mobility and handling and can be comfortably fired one handed on its lower fire rate mode. \ + When set to its higher rate of fire, it unleashes a staggering torrent of firepower, but is difficult to control even two handed, and quickly loses effectiveness at range. \ + When used with the boarding shield, use of the higher rate of fire is highly unrecommended outside of anything but absolute point blank range. \ + Uses a mix of standard and AP 10x20mm caseless ammunition." + loadout_item_flags = NONE + secondary_ammo_type = /obj/item/ammo_magazine/smg/som/ap + +/datum/loadout_item/suit_store/main_gun/som_marine/machinegunner + name = "V-41" + desc = "Equipped with a red dot sight, extended barrel and bipod. The V-41 is a large man portable machine used by the SOM, allowing for sustained, accurate suppressive firepower at the cost of mobility and handling. \ + Commonly seen where their preferred tactics of fast, mobile aggression is ill suited. Has impressive ranged damage application as a static weapon. Uses 10x26mm Caseless ammunition." + ui_icon = "v41" + item_typepath = /obj/item/weapon/gun/rifle/som_mg/standard + +/datum/loadout_item/suit_store/main_gun/som_marine/machinegunner/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_marine/machinegunner/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/satrapine, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/som_marine/volkite_charger + name = "VX-32 charger" + desc = "Unlocked for free with the Advanced rifle training perk. Equipped with a motion detector and gyroscopic stabilizer. The VX-32 is a sophisticated energy weapon capable of explosively deflagrated organic targets, horrifically burning and igniting the victim and anyone unfortunate enough to be near them. \ + Has excellent mobility and handling and is best used at close range. Can be used one handed relatively effectively with sufficient skill. \ + Its deflagrating ability works best against light armored targets, where it can quickly mow down and demoralise tightly packed enemies. Against heavily armored opponents, its effectiveness can quickly drop however. \ + Uses volkite power cells, shared with the VX-33." + ui_icon = "volkite" + item_typepath = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/charger/scout + unlock_cost = 300 + purchase_cost = 35 + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_UNLOCKABLE + +/datum/loadout_item/suit_store/main_gun/som_marine/volkite_charger/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_marine/volkite_charger/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/boarding_axe + name = "Boarding axe" + desc = "A SOM boarding axe, a monstrous two handed weapon that inflicts terrible damage even through heavy armor. \ + When wielded it can be used to block as well as attack, and can also be used to force unpowered airlocks open. \ + You'll kill pretty much anything you can hit with this - providing you can get close enough to use it." + req_desc = "Requires M-31 combat armor with a Lorica extra armor module." + ui_icon = "axe" + item_typepath = /obj/item/weapon/twohanded/fireaxe/som + item_whitelist = list(/obj/item/clothing/suit/modular/som/heavy/lorica = ITEM_SLOT_OCLOTHING) + item_blacklist = list(/obj/item/weapon/twohanded/fireaxe/som = ITEM_SLOT_BACK) + jobs_supported = list(SOM_SQUAD_MARINE) + +/datum/loadout_item/suit_store/boarding_axe/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + + if(!isstorage(wearer.back)) + return + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_marine/suppressed_rifle + name = "V-31-suppressed" + desc = "Equipped with a mag harness, suppressor, vertical grip and integrated micro rail launcher. The V-31 is the principal ballistic weapon for the SOM. \ + It has good mobility and handling and a good rate of fire, but tends to favour closer range fighting compared to many TGMC equivilents. \ + The rail launcher electromagnetically launches a variety of 10 gauge airbursting grenades. Extremely effective when used correctly, their fixed fuse time makes them entirely ineffective at very close or far ranges. \ + Managing engagement range is thus vital for maximising the effectiveness of this weapon. \ + This particular example is a less common variant intended for stealthy operations, where its quietness and lack of muzzle flash can help get the jump on unsuspecting opponents. \ + Uses 10x24mm caseless ammunition and 10 gauge micro grenades." + ui_icon = "ballistic" + item_typepath = /obj/item/weapon/gun/rifle/som/suppressed + +/datum/loadout_item/suit_store/main_gun/som_marine/suppressed_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_marine/suppressed_rifle/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/som_marine/suppressed_rifle/enhanced + name = "V-31-suppressed+" + desc = "Equipped with a mag harness, suppressor, vertical grip and integrated micro rail launcher. The V-31 is the principal ballistic weapon for the SOM. \ + It has good mobility and handling and a good rate of fire, but tends to favour closer range fighting compared to many TGMC equivilents. \ + The rail launcher electromagnetically launches a variety of 10 gauge airbursting grenades. Extremely effective when used correctly, their fixed fuse time makes them entirely ineffective at very close or far ranges. \ + Managing engagement range is thus vital for maximising the effectiveness of this weapon. \ + This particular example is a less common variant intended for stealthy operations, where its quietness and lack of muzzle flash can help get the jump on unsuspecting opponents. \ + Uses a mix of standard and AP 10x24mm caseless ammunition, and 10 gauge micro grenades." + loadout_item_flags = NONE + secondary_ammo_type = /obj/item/ammo_magazine/rifle/som/ap + +/datum/loadout_item/suit_store/main_gun/som_marine/suppressed_rifle/enhanced/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + return ..() diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/veteran.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/veteran.dm new file mode 100644 index 0000000000000..83332e2d9fd1b --- /dev/null +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/veteran.dm @@ -0,0 +1,372 @@ +/datum/loadout_item/suit_store/main_gun/som_veteran + jobs_supported = list(SOM_SQUAD_VETERAN) + +/datum/loadout_item/suit_store/main_gun/som_veteran/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!ammo_type) + return + if(istype(wearer.back, /obj/item/storage)) + if(istype(wearer.belt, /obj/item/storage/holster/belt/pistol/m4a3/som)) //if we have a backpack and pistol belt, we just load more ammo in the back + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + else //else we put the sidearm in the bag + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/som/standard(wearer), SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_veteran/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/som_veteran/standard_rifle + name = "V-31" + desc = "Equipped with a red dot sight, extended barrel, vertical grip and integrated micro rail launcher. Also comes with light armor piercing ammunition. The V-31 is the principal ballistic weapon for the SOM. \ + It has good mobility and handling and a good rate of fire, but tends to favour closer range fighting compared to many TGMC equivilents. \ + The rail launcher electromagnetically launches a variety of 10 gauge airbursting grenades. Extremely effective when used correctly, their fixed fuse time makes them entirely ineffective at very close or far ranges. \ + Managing engagement range is thus vital for maximising the effectiveness of this weapon. \ + Uses 10x25mm caseless ammunition and 10 gauge micro grenades." + ui_icon = "ballistic" + item_typepath = /obj/item/weapon/gun/rifle/som/veteran + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/suit_store/main_gun/som_veteran/standard_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_veteran/standard_rifle/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/som_veteran/smg + name = "V-21" + desc = "Equipped with a red dot sight, recoil compensator and vertical grip, along with armor piercing ammunition. The V-21 is the principal submachinegun used by the Sons of Mars, with a variable rate of fire. \ + Has outstanding mobility and handling and can be comfortably fired one handed on its lower fire rate mode. \ + When set to its higher rate of fire, it unleashes a staggering torrent of firepower, but is difficult to control even two handed, and quickly loses effectiveness at range. \ + At close range however, it will quickly obliterate most targets - as long as you don't run out of ammo. \ + It uses 10x20mm caseless rounds." + ui_icon = "smg" + item_typepath = /obj/item/weapon/gun/smg/som/veteran + +/datum/loadout_item/suit_store/main_gun/som_veteran/smg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_veteran/smg/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/som_veteran/breacher + name = "VX-32B charger" + desc = "Equipped with a mag harness and gyroscopic stabiliser for effective one handed use, and comes with a S-144 boarding shield, intended for use with M-31 Lorica combat armor for boarding actions. \ + The VX-32 is a sophisticated energy weapon capable of explosively deflagrated organic targets, horrifically burning and igniting the victim and anyone unfortunate enough to be near them. \ + Has excellent mobility and handling and is best used at close range. \ + Its deflagrating ability works best against light armored targets, where it can quickly mow down and demoralise tightly packed enemies. Against heavily armored opponents, its effectiveness can quickly drop however. \ + Uses volkite power cells, shared with the VX-33." + ui_icon = "riot_shield" + item_typepath = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/charger/somvet + purchase_cost = 60 + +/datum/loadout_item/suit_store/main_gun/som_veteran/breacher/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/som, SLOT_L_HAND) + if(istype(wearer.back, /obj/item/storage)) + return ..() + + wearer.equip_to_slot_or_del(new /obj/item/tool/weldingtool/largetank, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + return ..() + +/datum/loadout_item/suit_store/main_gun/som_veteran/breacher/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/som_veteran/volkite_charger + name = "VX-32 charger" + desc = "Equipped with a motion sensor and gyroscopic stabiliser for effective one handed use. \ + The VX-32 is a sophisticated energy weapon capable of explosively deflagrated organic targets, horrifically burning and igniting the victim and anyone unfortunate enough to be near them. \ + Has excellent mobility and handling and is best used at close range. \ + Its deflagrating ability works best against light armored targets, where it can quickly mow down and demoralise tightly packed enemies. Against heavily armored opponents, its effectiveness can quickly drop however. \ + Uses volkite power cells, shared with the VX-33." + ui_icon = "volkite" + item_typepath = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/charger/scout + +/datum/loadout_item/suit_store/main_gun/som_veteran/volkite_charger/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_veteran/volkite_charger/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/som_veteran/volkite_caliver + name = "VX-33 caliver" + desc = "Equipped with a red dot sight and laser sight. \ + The VX-33 is a sophisticated energy weapon capable of explosively deflagrated organic targets, horrifically burning and igniting the victim and anyone unfortunate enough to be near them. \ + Has middling mobility and handling, it is a long range rifle analogue, able to project strong damage even at long ranges. \ + Its deflagrating ability works best against light armored targets, where it can quickly mow down and demoralise tightly packed enemies. Against heavily armored opponents, its effectiveness can quickly drop however. \ + Uses volkite power cells, shared with the VX-32, and can also be linked to a volkite powerpack." + ui_icon = "volkite" + item_typepath = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/caliver/standard + +/datum/loadout_item/suit_store/main_gun/som_veteran/volkite_caliver/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_veteran/volkite_caliver/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/som_veteran/mpi + name = "MPi-KM" + desc = "Equipped with a mag harness and underbarrel grenade launcher. This MPi-KM is an original example of one of several variants of kalashnikov type rifles used during the original Martian rebellion. \ + Passed down the generations and lovingly maintained as a family heirloom, \ + its use on modern battlefields is an idiosyncratic example of the SOM's persistant desire to maintain a link to their cultural past, more than any possible tactical reason. \ + Despite having relatively poor mobility and handling, it never the less has fearsome firepower and good capacity, ensuring it stays a relevant weapon choice for the SOM. Uses 7.62x39mm ammunition." + ui_icon = "ak47" + item_typepath = /obj/item/weapon/gun/rifle/mpi_km/grenadier + +/datum/loadout_item/suit_store/main_gun/som_veteran/mpi/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_veteran/carbine + name = "V-34" + desc = "Equipped with a mag harness and foldable stock. This V-34 is refurbished and well maintained weapon passed down from its use during the original Martian rebellion, \ + more family heirloom than a battlefield weapon, it serves just as well regardless. \ + It combines good mobility and managable handling with fearsome stopping power and a tremendous rate of fire, making the V-34 an exceptionally deadly weapon at close range. \ + With poor falloff and accuracy, it is a poor weapon outside of close range, and its mobility lacks compared to some other close range weapons like the V-21. \ + Uses 7.62x39mm ammunition." + ui_icon = "v34" + item_typepath = /obj/item/weapon/gun/rifle/som_carbine/mag_harness + +/datum/loadout_item/suit_store/main_gun/som_veteran/carbine/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_veteran/volkite_caliver_pack + name = "VX-33P Caliver" + desc = "Equipped with a motion sensor and laser sight, this one is intended to be used with a back worm powerpack. \ + The VX-33 is a sophisticated energy weapon capable of explosively deflagrated organic targets, horrifically burning and igniting the victim and anyone unfortunate enough to be near them. \ + Has middling mobility and handling, it is a long range rifle analogue, able to project strong damage even at long ranges. \ + Its deflagrating ability works best against light armored targets, where it can quickly mow down and demoralise tightly packed enemies. Against heavily armored opponents, its effectiveness can quickly drop however. \ + Uses volkite power cells, shared with the VX-32, and can also be linked to a volkite powerpack." + req_desc = "Requires a volkite powerback." + ui_icon = "volkite" + item_typepath = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/caliver/tacsensor + quantity = 2 + purchase_cost = 50 + item_whitelist = list(/obj/item/cell/lasgun/volkite/powerpack = ITEM_SLOT_BACK) + +/datum/loadout_item/suit_store/main_gun/som_veteran/volkite_caliver_pack/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + if(istype(wearer.belt, /obj/item/weapon/gun/shotgun/double/sawn)) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_ACCESSORY) + else + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/som_veteran/volkite_culverin + name = "VX-42 culverin" + desc = "Equipped with a mag harness. \ + The VX-42 is a massive and terrifying energy weapon capable of explosively deflagrated organic targets, horrifically burning and igniting the victim and anyone unfortunate enough to be near them. \ + It has poor mobility and handling and is somewhat inaccurate at range, especially on the move. Despite this, the VX-42 can unleash a blistering amount of firepower, making it one of the most feared weapons in the SOM arsenal. \ + Targets at close range are torn apart, and its high rate of fire more than makes up for its somewhat poor long range accuracy. \ + Its deflagrating ability works best against light armored targets, where it can quickly mow down and demoralise tightly packed enemies. Against heavily armored opponents, its effectiveness can quickly drop however. \ + It must be linked to a volkite powerpack, allowing for sustained fire, although its energy demands can quickly drain even the powerpack, leaving a trigger happy operate vulnerable while it recharges." + req_desc = "Requires a volkite powerback to operate." + ui_icon = "volkite" + item_typepath = /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/culverin/magharness + quantity = 2 + purchase_cost = 100 + item_whitelist = list(/obj/item/cell/lasgun/volkite/powerpack = ITEM_SLOT_BACK) + +/datum/loadout_item/suit_store/main_gun/som_veteran/volkite_culverin/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + if(istype(wearer.belt, /obj/item/weapon/gun/shotgun/double/sawn)) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_ACCESSORY) + else + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/som_veteran/radioactive_smg + name = "V-21R" + desc = "Equipped with a red dot sight, recoil compensator and vertical grip, along with radioactive and incendiary ammunition. The V-21 is the principal submachinegun used by the Sons of Mars, with a variable rate of fire. \ + Has outstanding mobility and handling and can be comfortably fired one handed on its lower fire rate mode. \ + When set to its higher rate of fire, it unleashes a staggering torrent of firepower, but is difficult to control even two handed, and quickly loses effectiveness at range. \ + At close range however, it will quickly obliterate most targets - as long as you don't run out of ammo. \ + It uses 10x20mm caseless rounds." + req_desc = "Requires a suit with a Mithridatius environmental protection module." + ui_icon = "smg" + item_typepath = /obj/item/weapon/gun/smg/som/support + item_whitelist = list(/obj/item/clothing/suit/modular/som/heavy/mithridatius = ITEM_SLOT_OCLOTHING) + +/datum/loadout_item/suit_store/main_gun/som_veteran/radioactive_smg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + + if(istype(wearer.belt, /obj/item/storage/belt)) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/rad, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/rad, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/rad, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/rad, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som, SLOT_IN_BELT) + if(istype(wearer.l_store, /obj/item/storage/pouch/magazine)) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/rad, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_L_POUCH) + if(istype(wearer.r_store, /obj/item/storage/pouch/magazine)) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/rad, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) + + if(!isstorage(wearer.back)) + return + + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/rad, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/rad, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/energy_sword + name = "Energy sword" + desc = "A SOM energy sword. Designed to cut through armored plate. An uncommon primary weapon, typically seen wielded by so called 'blink assault' troops. \ + Can be used defensively to great effect, mainly against opponents trying to strike you in melee, although some users report varying levels of success in blocking ranged projectiles." + ui_icon = "machete" + item_typepath = /obj/item/weapon/energy/sword/som + jobs_supported = list(SOM_SQUAD_VETERAN) + +/datum/loadout_item/suit_store/energy_sword/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) + + if(!isstorage(wearer.back)) + return + + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/uniform.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/uniform.dm new file mode 100644 index 0000000000000..6d0547e6422ec --- /dev/null +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/uniform.dm @@ -0,0 +1,67 @@ +/datum/loadout_item/uniform/som_standard + name = "SOM uniform" + desc = "The standard uniform of SOM military personnel. Its design shows a clear lineage from mining uniforms used in the old mining colonies." + item_typepath = /obj/item/clothing/under/som/webbing + jobs_supported = list(SOM_SQUAD_MARINE) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/uniform/som_veteran + name = "SOM veteran uniform" + desc = "The standard uniform of SOM military personnel. Its design shows a clear lineage from mining uniforms used in the old mining colonies. This one has markings indicating specialist status." + item_typepath = /obj/item/clothing/under/som/veteran/webbing + jobs_supported = list(SOM_SQUAD_VETERAN) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/uniform/som_leader + name = "SOM leader uniform" + desc = "The standard uniform of SOM military personnel. Its design shows a clear lineage from mining uniforms used in the old mining colonies. This one has leadership markings." + item_typepath = /obj/item/clothing/under/som/leader/webbing + jobs_supported = list(SOM_SQUAD_LEADER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +//corpsman +/datum/loadout_item/uniform/som_medic + name = "SOM medical uniform" + desc = "The standard uniform of SOM military personnel. Its design shows a clear lineage from mining uniforms used in the old mining colonies. This one has medical markings." + item_typepath = /obj/item/clothing/under/som/medic/vest + jobs_supported = list(SOM_SQUAD_CORPSMAN) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/uniform/som_medic/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/bodybag/cryobag, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tweezers_advanced, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/nanoblood, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/spaceacillin, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/combat_advanced, SLOT_IN_ACCESSORY) + +//engineer +/datum/loadout_item/uniform/som_engineer + name = "SOM uniform" + desc = "The standard uniform of SOM military personnel. Its design shows a clear lineage from mining uniforms used in the old mining colonies." + req_desc = "Requires a tool pouch. You ARE an engineer, right?" + item_typepath = /obj/item/clothing/under/som/webbing + jobs_supported = list(SOM_SQUAD_ENGINEER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/uniform/som_field_commander + name = "Officer uniform" + desc = "The distinct black uniform befitting a SOM field officer." + item_typepath = /obj/item/clothing/under/som/officer/webbing + jobs_supported = list(SOM_FIELD_COMMANDER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/uniform/som_officer + name = "Officer uniform" + desc = "The distinct black uniform of a SOM officer. Usually worn by junior officers." + item_typepath = /obj/item/clothing/under/som/officer + jobs_supported = list(SOM_STAFF_OFFICER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/uniform/som_senior_officer + name = "Officer uniform" + desc = "The distinct jacketed black uniform of a SOM officer. Usually worn by senior officers." + item_typepath = /obj/item/clothing/under/som/officer/senior + jobs_supported = list(SOM_COMMANDER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/back_slot.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/back_slot.dm new file mode 100644 index 0000000000000..cdf0e77cafa80 --- /dev/null +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/back_slot.dm @@ -0,0 +1,190 @@ +/datum/loadout_item/back + item_slot = ITEM_SLOT_BACK + +/datum/loadout_item/back/empty + name = "no backpack" + desc = "" + ui_icon = "empty" + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + jobs_supported = list( + SQUAD_MARINE, + SQUAD_CORPSMAN, + SQUAD_ENGINEER, + SQUAD_SMARTGUNNER, + SQUAD_LEADER, + FIELD_COMMANDER, + STAFF_OFFICER, + CAPTAIN, + SOM_SQUAD_MARINE, + SOM_SQUAD_CORPSMAN, + SOM_SQUAD_ENGINEER, + SOM_SQUAD_VETERAN, + SOM_SQUAD_LEADER, + SOM_FIELD_COMMANDER, + SOM_STAFF_OFFICER, + SOM_COMMANDER, + ) + +/datum/loadout_item/back/marine_satchel + name = "Satchel" + desc = "A heavy-duty satchel carried by some TGMC soldiers and support personnel. Carries less than a backpack, but items can be drawn instantly." + item_typepath = /obj/item/storage/backpack/marine/satchel + jobs_supported = list(SQUAD_MARINE, SQUAD_SMARTGUNNER, STAFF_OFFICER, CAPTAIN) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/back/marine_backpack + name = "Backpack" + desc = "The standard-issue pack of the TGMC forces. Designed to slug gear into the battlefield. Carries more than a satchel but has a draw delay." + item_typepath = /obj/item/storage/backpack/marine + jobs_supported = list(SQUAD_MARINE, SQUAD_SMARTGUNNER) + +/datum/loadout_item/back/combat_pack + name = "Combat pack" + desc = "A small lightweight pack for expeditions and short-range operations. Has the storage capacity of a backpack but no draw delay." + purchase_cost = 25 + item_typepath = /obj/item/storage/backpack/lightpack + jobs_supported = list(SQUAD_MARINE, SQUAD_SMARTGUNNER) + +/datum/loadout_item/back/combat_pack/free + purchase_cost = 0 + jobs_supported = list(SQUAD_LEADER, FIELD_COMMANDER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/back/flamer_tank + name = "Flame tank" + desc = "A specialized fuel tank for use with the FL-84 flamethrower and FL-240 incinerator unit." + req_desc = "Requires a FL-84 flamethrower." + item_typepath = /obj/item/ammo_magazine/flamer_tank/backtank + jobs_supported = list(SQUAD_MARINE) + item_whitelist = list(/obj/item/weapon/gun/flamer/big_flamer/marinestandard/wide = ITEM_SLOT_SUITSTORE) + +/datum/loadout_item/back/flamer_tank/x_fuel + name = "X-fuel tank" + desc = "A specialized fuel tank of ultra thick napthal type X, known for its extreme heat and slow burn rate, as well as it's distinct blue flames. For use with the FL-84 flamethrower and FL-240 incinerator unit." + item_typepath = /obj/item/ammo_magazine/flamer_tank/backtank/X + purchase_cost = 40 + unlock_cost = 200 + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_UNLOCKABLE + +/datum/loadout_item/back/jetpack + name = "Heavy jetpack" + desc = "An upgraded jetpack with enough fuel to send a person flying for a short while with extreme force. \ + It provides better mobility for heavy users and enough thrust to be used in an aggressive manner. \ + Alt right click or middleclick to fly to a destination when the jetpack is equipped. Will collide with hostiles" + req_desc = "Requires a SMG-25 or ALF-51B." + item_typepath = /obj/item/jetpack_marine/heavy + jobs_supported = list(SQUAD_MARINE) + item_whitelist = list( + /obj/item/weapon/gun/smg/m25/magharness = ITEM_SLOT_SUITSTORE, + /obj/item/weapon/gun/rifle/alf_machinecarbine/assault = ITEM_SLOT_SUITSTORE, + ) + +//special unlockable +/datum/loadout_item/back/marine_shotgun + name = "SH-35" + desc = "Equipped with a mag harness, bayonet, angled grip and foldable stock. \ + The SH-35 is the most commonly used shotgun of the TGMC. With good mobility and handling, it has unparalleled close range power when using buckshot. Able to kill or maim all but the most heavily armored targets with a single well aimmed blast. \ + When using flechette rounds, it can provide surprisingly powerful long range damage with good penetration, although its low rate of fire means its sustained damage is relatively poor. \ + Uses 12 gauge shells." + ui_icon = "t35" + purchase_cost = 25 + item_typepath = /obj/item/weapon/gun/shotgun/pump/t35/standard + jobs_supported = list(SQUAD_MARINE, SQUAD_LEADER) + loadout_item_flags = NONE + +/datum/loadout_item/back/marine_shotgun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/shotgun/buckshot, SLOT_R_HAND) + +/datum/loadout_item/back/tgmc_heam_rocket_bag + name = "HEAM rocket bag" + desc = "Unlocked for free with the Heavy weapon specialisation perk. This backpack holds 4 67mm high explosive anti mech shells, in addition to a recoiless rifle. \ + The recoiless rifle is a powerful support weapon that deals significant damage against heavily armored mechs or vehicles, \ + but will generally devastate any human target unfortunate enough to be hit in a pinch. Has a draw delay and has poor accuracy against human targets." + ui_icon = "t160" + unlock_cost = 300 + purchase_cost = 100 + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_UNLOCKABLE + quantity = 2 + item_typepath = /obj/item/storage/holster/backholster/rpg/heam + jobs_supported = list(SQUAD_MARINE) + +/datum/loadout_item/back/machete + name = "Machete" + desc = "A large leather scabbard carrying a M2132 machete. It can be strapped to the back, waist or armor. Extremely dangerous against human opponents - if you can get close enough." + ui_icon = "machete" + item_typepath = /obj/item/storage/holster/blade/machete/full + jobs_supported = list(SQUAD_MARINE, SQUAD_LEADER) + loadout_item_flags = NONE + +//corpsman +/datum/loadout_item/back/corpsman_satchel + name = "Medical satchel" + desc = "A heavy-duty satchel carried by some TGMC corpsmen. You can recharge defibrillators by plugging them in. Carries less than a backpack, but items can be drawn instantly." + item_typepath = /obj/item/storage/backpack/marine/corpsman/satchel + jobs_supported = list(SQUAD_CORPSMAN) + +/datum/loadout_item/back/corpsman_backpack + name = "Medical backpack" + desc = "The standard-issue backpack worn by TGMC corpsmen. You can recharge defibrillators by plugging them in. Carries more than a satchel but has a draw delay." + item_typepath = /obj/item/storage/backpack/marine/corpsman + jobs_supported = list(SQUAD_CORPSMAN) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +//engineer +/datum/loadout_item/back/engineerpack + name = "Sentry welderpack" + desc = "A specialized backpack worn by TGMC technicians. It carries a fueltank for quick welder refueling. Loaded with 2 point defense sentries, excellent for defending areas or establishing killboxes." + item_typepath = /obj/item/storage/backpack/marine/engineerpack + jobs_supported = list(SQUAD_ENGINEER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/back/engineerpack/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/sentry/mini/combat_patrol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/sentry/mini/combat_patrol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/minisentry, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/minisentry, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_BACKPACK) + +/datum/loadout_item/back/tgmc_rocket_bag + name = "Rocket bag" + desc = "This backpack holds 4 67mm shells, in addition to a recoiless rifle. \ + A powerful ranged weapon with a wide area of effect, the recoiless rifle is a powerful support weapon that can severely wound whole groups of opponents in a single shot. Has a draw delay." + ui_icon = "t160" + purchase_cost = 100 + quantity = 2 + item_typepath = /obj/item/storage/holster/backholster/rpg/low_impact + jobs_supported = list(SQUAD_ENGINEER) + +/datum/loadout_item/back/tech_backpack + name = "Demolition backpack" + desc = "The standard-issue backpack worn by TGMC technicians. Filled with a tremendous amount of detpacks, C4, claymores and grenades. Has a draw delay." + item_typepath = /obj/item/storage/backpack/marine/tech + jobs_supported = list(SQUAD_ENGINEER) + +/datum/loadout_item/back/tech_backpack/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new /obj/item/minelayer, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/explosive_mines/large, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/explosive_mines/large, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/assembly/signaler, SLOT_IN_BACKPACK) + +//smartgunner +/datum/loadout_item/back/sg_minigun_powerpack + name = "SG-85 powerpack" + desc = "A reinforced backpack heavy with the IFF altered ammunition, onboard micro generator, and extensive cooling system which enables the SG-85 gatling gun to operate. \ + Use the SG-85 on the backpack itself to connect them." + req_desc = "Requires an SG-85." + item_typepath = /obj/item/ammo_magazine/minigun_powerpack/smartgun + jobs_supported = list(SQUAD_SMARTGUNNER) + item_whitelist = list(/obj/item/weapon/gun/minigun/smart_minigun/motion_detector = ITEM_SLOT_SUITSTORE) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/belt.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/belt.dm new file mode 100644 index 0000000000000..a84775408f085 --- /dev/null +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/belt.dm @@ -0,0 +1,142 @@ +/datum/loadout_item/belt + item_slot = ITEM_SLOT_BELT + +/datum/loadout_item/belt/empty + name = "no belt" + desc = "" + ui_icon = "empty" + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + jobs_supported = list( + SQUAD_MARINE, + SQUAD_CORPSMAN, + SQUAD_ENGINEER, + SQUAD_SMARTGUNNER, + SQUAD_LEADER, + FIELD_COMMANDER, + STAFF_OFFICER, + CAPTAIN, + SOM_SQUAD_MARINE, + SOM_SQUAD_CORPSMAN, + SOM_SQUAD_ENGINEER, + SOM_SQUAD_VETERAN, + SOM_SQUAD_LEADER, + SOM_FIELD_COMMANDER, + SOM_STAFF_OFFICER, + SOM_COMMANDER, + ) + + +/datum/loadout_item/belt/ammo_belt + name = "Ammo belt" + desc = "The M276 is the standard load-bearing equipment of the TGMC. It consists of a modular belt with various clips. This version is the standard variant designed for bulk ammunition-carrying operations." + item_typepath = /obj/item/storage/belt/marine + jobs_supported = list(SQUAD_MARINE, SQUAD_ENGINEER, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + item_blacklist = list( + /obj/item/weapon/gun/rifle/standard_smartmachinegun/patrol = ITEM_SLOT_SUITSTORE, + /obj/item/weapon/gun/minigun/smart_minigun/motion_detector = ITEM_SLOT_SUITSTORE, + /obj/item/weapon/gun/flamer/big_flamer/marinestandard/wide = ITEM_SLOT_SUITSTORE, + /obj/item/weapon/gun/standard_mmg/machinegunner = ITEM_SLOT_SUITSTORE, + /obj/item/weapon/gun/rifle/standard_gpmg/machinegunner = ITEM_SLOT_SUITSTORE, + /obj/item/weapon/gun/shotgun/pump/t35/standard = ITEM_SLOT_SUITSTORE, + ) + +/datum/loadout_item/belt/sparepouch + name = "G8 pouch" + desc = "A small, lightweight pouch that can be clipped onto Armat Systems M3 Pattern armor or your belt to provide additional storage for miscellaneous gear or box and drum magazines." + item_typepath = /obj/item/storage/belt/sparepouch + jobs_supported = list(SQUAD_MARINE) + +/datum/loadout_item/belt/sparepouch/smartgunner + desc = "A general storage pouch. \ + Contains a MP-19 sidearm, and spare ammo for the SG-85, or addition drum magazines for the SG-29." //contents handled by the SG-85 + req_desc = "Requires an SG-85." + jobs_supported = list(SQUAD_SMARTGUNNER) + item_whitelist = list( + /obj/item/weapon/gun/minigun/smart_minigun/motion_detector = ITEM_SLOT_SUITSTORE, + /obj/item/weapon/gun/rifle/standard_smartmachinegun/patrol = ITEM_SLOT_SUITSTORE, + ) + +/datum/loadout_item/belt/shotgun_mixed + name = "Shotgun shell rig" + desc = "An ammunition belt designed to hold shotgun shells or individual bullets. Loaded full of buckshot and flechette shells." + item_typepath = /obj/item/storage/belt/shotgun/mixed + jobs_supported = list(SQUAD_MARINE) + +/datum/loadout_item/belt/smg_holster + name = "SMG-25 holster" + desc = "The M276 is the standard load-bearing equipment of the TGMC. It consists of a modular belt with various clips. \ + This version is designed for the SMG-25, and features a larger frame to support the gun. Due to its unorthodox design, it isn't a very common sight, and is only specially issued." + ui_icon = "m25" + item_typepath = /obj/item/storage/holster/m25 + jobs_supported = list(SQUAD_MARINE) + item_whitelist = list( + /obj/item/weapon/gun/smg/m25/magharness = ITEM_SLOT_SUITSTORE, + /obj/item/weapon/gun/flamer/big_flamer/marinestandard/wide = ITEM_SLOT_SUITSTORE, + /obj/item/weapon/gun/standard_mmg/machinegunner = ITEM_SLOT_SUITSTORE, + ) + +/datum/loadout_item/belt/smg_holster/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m25/holstered(wearer), SLOT_IN_HOLSTER) + +/datum/loadout_item/belt/machete + name = "Machete" + desc = "A large leather scabbard carrying a M2132 machete. It can be strapped to the back, waist or armor. Extremely dangerous against human opponents - if you can get close enough." + ui_icon = "machete" + item_typepath = /obj/item/storage/holster/blade/machete/full + jobs_supported = list(SQUAD_MARINE, SQUAD_LEADER) + +/datum/loadout_item/belt/belt_harness + name = "Belt harness" + desc = "A shoulder worn strap with clamps that can attach to most anything. Should keep you from losing your weapon, hopefully." + item_typepath = /obj/item/belt_harness/marine + jobs_supported = list(SQUAD_MARINE, SQUAD_ENGINEER, SQUAD_LEADER, FIELD_COMMANDER) + +/datum/loadout_item/belt/belt_harness/smart_gunner + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + jobs_supported = list(SQUAD_SMARTGUNNER) + +//medic +/datum/loadout_item/belt/lifesaver + name = "Lifesaver bag" + desc = "The M276 is the standard load-bearing equipment of the TGMC. This configuration mounts a duffel bag filled with a range of injectors and light medical supplies and is common among medics." + ui_icon = "medkit" + item_typepath = /obj/item/storage/belt/lifesaver/quick + jobs_supported = list(SQUAD_CORPSMAN) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +//FC +/datum/loadout_item/belt/officer_sword + name = "Officers sword" + desc = "This appears to be a rather old blade that has been well taken care of, it is probably a family heirloom. \ + Well made and extremely sharp, despite its probable non-combat purpose. Comes in a leather scabbard that an attached to your waist or armor." + ui_icon = "machete" + item_typepath = /obj/item/storage/holster/blade/officer/full + jobs_supported = list(FIELD_COMMANDER) + item_blacklist = list(/obj/item/storage/holster/blade/officer/full = ITEM_SLOT_SUITSTORE) + +/datum/loadout_item/belt/fc_pistol + name = "P-1911A1-C pistol" + desc = "The P-1911A1-C is a custom modified pistol with impressive stopping power for its size. \ + Light and easy to use one handed, it suffers from a small magazine size and no auto eject feature. Comes in a holster that fits on your waist or armor. Uses .45 ACP ammunition." + ui_icon = "m1911c" + item_typepath = /obj/item/storage/holster/belt/pistol/m4a3/fieldcommander + jobs_supported = list(FIELD_COMMANDER) + item_blacklist = list(/obj/item/storage/holster/belt/pistol/m4a3/fieldcommander = ITEM_SLOT_SUITSTORE) + +//staff officer +/datum/loadout_item/belt/so_pistol + name = "RT-3 pistol" + desc = "An RT-3 target pistol, a common sight throughout the bubble and the standard sidearm for noncombat roles in the TGMC. Comes in a holster to fit on your waist. uses 9mm caseless ammunition." + ui_icon = "rt3" + item_typepath = /obj/item/storage/holster/belt/pistol/m4a3/officer + jobs_supported = list(STAFF_OFFICER) + +//captain +/datum/loadout_item/belt/smart_pistol + name = "SP-13 pistol" + desc = "The SP-13 is a IFF-capable sidearm used by the TerraGov Marine Corps. Has good damage, penetration and magazine capacity. \ + Expensive to manufacture, this sophisticated pistol is only occassionally used by smartgunners, or some higher ranking officers who have the skills to use it. Uses 9x19mm Parabellum ammunition." + ui_icon = "pistol" + item_typepath = /obj/item/storage/holster/belt/pistol/smart_pistol/full + jobs_supported = list(CAPTAIN) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/ears.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/ears.dm new file mode 100644 index 0000000000000..86c8613a0f4a1 --- /dev/null +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/ears.dm @@ -0,0 +1,42 @@ +//ears +/datum/loadout_item/ears + item_slot = ITEM_SLOT_EARS + +/datum/loadout_item/ears/empty + name = "no headset" + desc = "" + ui_icon = "empty" + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + jobs_supported = list( + SQUAD_MARINE, + SQUAD_CORPSMAN, + SQUAD_ENGINEER, + SQUAD_SMARTGUNNER, + SQUAD_LEADER, + FIELD_COMMANDER, + STAFF_OFFICER, + CAPTAIN, + SOM_SQUAD_MARINE, + SOM_SQUAD_CORPSMAN, + SOM_SQUAD_ENGINEER, + SOM_SQUAD_VETERAN, + SOM_SQUAD_LEADER, + SOM_FIELD_COMMANDER, + SOM_STAFF_OFFICER, + SOM_COMMANDER, + ) + + +/datum/loadout_item/ears/marine_standard + name = "Standard headset" + desc = "A headset, allowing for communication with your team and access to the tactical minimap. You're in for a bad time if you don't use this." + item_typepath = /obj/item/radio/headset/mainship/marine + jobs_supported = list(SQUAD_MARINE, SQUAD_CORPSMAN, SQUAD_ENGINEER, SQUAD_SMARTGUNNER, SQUAD_LEADER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/ears/marine_command + name = "Command headset" + desc = "A command headset, allowing for communication with all squads and access to the tactical minimap. You're in for a bad time if you don't use this." + item_typepath = /obj/item/radio/headset/mainship/mcom + jobs_supported = list(FIELD_COMMANDER, STAFF_OFFICER, CAPTAIN) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/eyes.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/eyes.dm new file mode 100644 index 0000000000000..fdf9f54baa04b --- /dev/null +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/eyes.dm @@ -0,0 +1,61 @@ +/datum/loadout_item/eyes + item_slot = ITEM_SLOT_EYES + +/datum/loadout_item/eyes/empty + name = "no eyewear" + desc = "" + ui_icon = "empty" + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + jobs_supported = list( + SQUAD_MARINE, + SQUAD_CORPSMAN, + SQUAD_ENGINEER, + SQUAD_SMARTGUNNER, + SQUAD_LEADER, + FIELD_COMMANDER, + STAFF_OFFICER, + CAPTAIN, + SOM_SQUAD_MARINE, + SOM_SQUAD_CORPSMAN, + SOM_SQUAD_ENGINEER, + SOM_SQUAD_VETERAN, + SOM_SQUAD_LEADER, + SOM_FIELD_COMMANDER, + SOM_STAFF_OFFICER, + SOM_COMMANDER, + ) + + +/datum/loadout_item/eyes/ballistic_goggles + name = "Ballistic goggles" + desc = "Standard issue TGMC goggles. Mostly used to decorate one's helmet." + item_typepath = /obj/item/clothing/glasses/mgoggles + jobs_supported = list(SQUAD_MARINE, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER) + +/datum/loadout_item/eyes/health_hud + name = "HealthMate HUD" + desc = "A heads-up display that scans the humans in view and provides accurate data about their health status. The projector can be attached to compatable eyewear." + item_typepath = /obj/item/clothing/glasses/hud/health + jobs_supported = list(SQUAD_CORPSMAN, SQUAD_LEADER, FIELD_COMMANDER, STAFF_OFFICER, CAPTAIN, SOM_SQUAD_CORPSMAN, SOM_SQUAD_LEADER, SOM_FIELD_COMMANDER, SOM_STAFF_OFFICER, SOM_COMMANDER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/eyes/mesons + name = "Meson scanner" + desc = "Used to shield the user's eyes from harmful electromagnetic emissions, also used as general safety goggles. \ + Not adequate as welding protection. Allows the user to see structural information about their surroundings." + item_typepath = /obj/item/clothing/glasses/meson + jobs_supported = list(SQUAD_ENGINEER, SOM_SQUAD_ENGINEER, SOM_SQUAD_VETERAN) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/eyes/welding + name = "Welding goggles" + desc = "Protects the eyes from welders, approved by the mad scientist association." + item_typepath = /obj/item/clothing/glasses/welding + jobs_supported = list(SQUAD_MARINE, SQUAD_ENGINEER, SOM_SQUAD_MARINE, SOM_SQUAD_VETERAN) + +/datum/loadout_item/eyes/smartgun_imagers + name = "KTLD sight" + desc = "A headset and goggles system made to pair with any KTLD weapon, such as the SG type weapons. Has a low-res short range imager, allowing for view of terrain." + item_typepath = /obj/item/clothing/glasses/night/m56_goggles + jobs_supported = list(SQUAD_SMARTGUNNER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/feet.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/feet.dm new file mode 100644 index 0000000000000..235a1cce951e8 --- /dev/null +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/feet.dm @@ -0,0 +1,55 @@ +/datum/loadout_item/feet + item_slot = ITEM_SLOT_FEET + ui_icon = "boots" + +/datum/loadout_item/feet/empty + name = "no footwear" + desc = "" + ui_icon = "empty" + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + jobs_supported = list( + SQUAD_MARINE, + SQUAD_CORPSMAN, + SQUAD_ENGINEER, + SQUAD_SMARTGUNNER, + SQUAD_LEADER, + FIELD_COMMANDER, + STAFF_OFFICER, + CAPTAIN, + SOM_SQUAD_MARINE, + SOM_SQUAD_CORPSMAN, + SOM_SQUAD_ENGINEER, + SOM_SQUAD_VETERAN, + SOM_SQUAD_LEADER, + SOM_FIELD_COMMANDER, + SOM_STAFF_OFFICER, + SOM_COMMANDER, + ) + + +/datum/loadout_item/feet/marine_boots + name = "Combat boots" + desc = "Standard issue combat boots for combat scenarios or combat situations. All combat, all the time." + item_typepath = /obj/item/clothing/shoes/marine/full + jobs_supported = list(SQUAD_MARINE, SQUAD_CORPSMAN, SQUAD_ENGINEER, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER, STAFF_OFFICER, CAPTAIN) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/feet/marine_brown_boots + name = "Brown boots" + desc = "Standard issue combat boots for combat scenarios or combat situations. All combat, all the time." + item_typepath = /obj/item/clothing/shoes/marine/brown/full + jobs_supported = list(SQUAD_MARINE, SQUAD_CORPSMAN, SQUAD_ENGINEER, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER, STAFF_OFFICER, CAPTAIN) + +/datum/loadout_item/feet/white_dress + name = "Dress shoes" + desc = "Fancy white shoes to go with your white dress uniform. Do not come with a combat knife." + item_typepath = /obj/item/clothing/shoes/white + jobs_supported = list(SQUAD_MARINE, SQUAD_CORPSMAN, SQUAD_ENGINEER, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER, STAFF_OFFICER, CAPTAIN) + +//Captain +/datum/loadout_item/feet/captain + name = "Captain's shoes" + desc = "Has special soles for better trampling those underneath." + item_typepath = /obj/item/clothing/shoes/marinechief/captain + jobs_supported = list(CAPTAIN) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/gloves.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/gloves.dm new file mode 100644 index 0000000000000..a843259d36831 --- /dev/null +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/gloves.dm @@ -0,0 +1,84 @@ +/datum/loadout_item/gloves + item_slot = ITEM_SLOT_GLOVES + +/datum/loadout_item/gloves/empty + name = "no gloves" + desc = "" + ui_icon = "empty" + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + jobs_supported = list( + SQUAD_MARINE, + SQUAD_CORPSMAN, + SQUAD_ENGINEER, + SQUAD_SMARTGUNNER, + SQUAD_LEADER, + FIELD_COMMANDER, + STAFF_OFFICER, + CAPTAIN, + SOM_SQUAD_MARINE, + SOM_SQUAD_CORPSMAN, + SOM_SQUAD_ENGINEER, + SOM_SQUAD_VETERAN, + SOM_SQUAD_LEADER, + SOM_FIELD_COMMANDER, + SOM_STAFF_OFFICER, + SOM_COMMANDER, + ) + + +/datum/loadout_item/gloves/marine_gloves + name = "Combat gloves" + desc = "Standard issue marine tactical gloves. It reads: 'knit by Marine Widows Association'." + item_typepath = /obj/item/clothing/gloves/marine + jobs_supported = list(SQUAD_MARINE, SQUAD_CORPSMAN, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/gloves/marine_black_gloves + name = "Blk combat gloves" + desc = "Standard issue marine tactical gloves but black! It reads: 'knit by Marine Widows Association'." + item_typepath = /obj/item/clothing/gloves/marine/black + jobs_supported = list(SQUAD_MARINE, SQUAD_CORPSMAN, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER) + +/datum/loadout_item/gloves/marine_fingerless + name = "Fingerless gloves" + desc = "Standard issue marine tactical gloves but fingerless! It reads: 'knit by Marine Widows Association'." + item_typepath = /obj/item/clothing/gloves/marine/fingerless + jobs_supported = list(SQUAD_MARINE, SQUAD_CORPSMAN, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER) + +/datum/loadout_item/gloves/white_dress + name = "Dress gloves" + desc = "Fancy white gloves to go with your white dress uniform." + item_typepath = /obj/item/clothing/gloves/white + jobs_supported = list(SQUAD_MARINE, SQUAD_CORPSMAN, SQUAD_ENGINEER, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER, STAFF_OFFICER, CAPTAIN) + +//corpsman +/datum/loadout_item/gloves/defib_gloves + name = "Defib gloves" + desc = "Advanced medical gloves, these include small electrodes to defibrilate a patient No more bulky units!" + purchase_cost = 50 + item_typepath = /obj/item/clothing/gloves/defibrillator + jobs_supported = list(SQUAD_CORPSMAN) + +//engineer +/datum/loadout_item/gloves/insulated + name = "Insulated gloves" + desc = "Insulated marine tactical gloves that protect against electrical shocks." + item_typepath = /obj/item/clothing/gloves/marine/insulated + jobs_supported = list(SQUAD_ENGINEER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +//FC +/datum/loadout_item/gloves/officer_gloves + name = "Officer gloves" + desc = "Shiny and impressive. They look expensive." + item_typepath = /obj/item/clothing/gloves/marine/officer + jobs_supported = list(FIELD_COMMANDER, STAFF_OFFICER, CAPTAIN) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +//captain +/datum/loadout_item/gloves/captain_gloves + name = "Captain's gloves" + desc = "You may like these gloves, but THEY think you are unworthy of them." + item_typepath = /obj/item/clothing/gloves/marine/techofficer/captain + jobs_supported = list(CAPTAIN) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/head.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/head.dm new file mode 100644 index 0000000000000..1d8e31e44012e --- /dev/null +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/head.dm @@ -0,0 +1,118 @@ +/datum/loadout_item/helmet + item_slot = ITEM_SLOT_HEAD + ui_icon = "helmet" + +/datum/loadout_item/helmet/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_HEAD) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) + +/datum/loadout_item/helmet/empty + name = "no helmet" + desc = "" + ui_icon = "empty" + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + jobs_supported = list( + SQUAD_MARINE, + SQUAD_CORPSMAN, + SQUAD_ENGINEER, + SQUAD_SMARTGUNNER, + SQUAD_LEADER, + FIELD_COMMANDER, + STAFF_OFFICER, + CAPTAIN, + SOM_SQUAD_MARINE, + SOM_SQUAD_CORPSMAN, + SOM_SQUAD_ENGINEER, + SOM_SQUAD_VETERAN, + SOM_SQUAD_LEADER, + SOM_FIELD_COMMANDER, + SOM_STAFF_OFFICER, + SOM_COMMANDER, + ) + + +/datum/loadout_item/helmet/standard + name = "M10X helmet" + desc = "A standard TGMC combat helmet. Apply to head for best results." + item_typepath = /obj/item/clothing/head/modular/m10x + jobs_supported = list(SQUAD_MARINE, SQUAD_SMARTGUNNER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/helmet/leader + name = "M11X helmet" + desc = "An upgraded helmet for protecting upgraded brains." + item_typepath = /obj/item/clothing/head/modular/m10x/leader + jobs_supported = list(SQUAD_LEADER, FIELD_COMMANDER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/helmet/surt + name = "Surt helmet" + desc = "A standard combat helmet with a Surt fireproof module." + req_desc = "Requires a suit with a Surt module." + item_typepath = /obj/item/clothing/head/modular/m10x/surt + jobs_supported = list(SQUAD_MARINE) + item_whitelist = list(/obj/item/clothing/suit/modular/xenonauten/heavy/surt = ITEM_SLOT_OCLOTHING) + +/datum/loadout_item/helmet/tyr + name = "Tyr helmet" + desc = "A standard combat helmet with a Tyr extra armor module." + req_desc = "Requires a suit with a Tyr module." + ui_icon = "tyr" + item_typepath = /obj/item/clothing/head/modular/m10x/tyr + jobs_supported = list(SQUAD_MARINE) + item_whitelist = list(/obj/item/clothing/suit/modular/xenonauten/heavy/tyr_two = ITEM_SLOT_OCLOTHING) + + +/datum/loadout_item/helmet/tyr/smartgunner + jobs_supported = list(SQUAD_SMARTGUNNER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/helmet/white_dress + name = "Dress Cap" + desc = "The dress white cap for your dress uniform. Pride is your shield, because this isn't." + item_typepath = /obj/item/clothing/head/white_dress + jobs_supported = list(SQUAD_MARINE, SQUAD_CORPSMAN, SQUAD_ENGINEER, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER, STAFF_OFFICER, CAPTAIN) + +/datum/loadout_item/helmet/mimir + name = "Mimir helmet" + desc = "A standard combat helmet with a Mimir environmental protection module." + req_desc = "Requires a suit with a Mimir module." + item_typepath = /obj/item/clothing/head/modular/m10x/mimir + jobs_supported = list(SQUAD_CORPSMAN) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/helmet/mimir/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/neuraline, SLOT_IN_HEAD) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/neuraline, SLOT_IN_HEAD) + +/datum/loadout_item/helmet/engineer + name = "M10X-W helmet" + desc = "A standard combat helmet with a welding module." + item_typepath = /obj/item/clothing/head/modular/m10x/welding + jobs_supported = list(SQUAD_ENGINEER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/helmet/engineer/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_HEAD) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_HEAD) + +/datum/loadout_item/helmet/field_commander_beret + name = "FC beret" + desc = "A beret with the field commander insignia emblazoned on it. It commands loyalty and bravery in all who gaze upon it." + item_typepath = /obj/item/clothing/head/tgmcberet/fc + jobs_supported = list(FIELD_COMMANDER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/helmet/staff_officer_cap + name = "Officer cap" + desc = "A hat usually worn by officers in the TGMC. While it has limited combat functionality, some prefer to wear it instead of the standard issue helmet." + item_typepath = /obj/item/clothing/head/tgmccap/ro + jobs_supported = list(STAFF_OFFICER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/helmet/captain_beret + name = "Captain Beret" + desc = "A beret worn by ship's captains. You thought it would have been more fancy." + item_typepath = /obj/item/clothing/head/tgmcberet/tan + jobs_supported = list(CAPTAIN) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/mask.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/mask.dm new file mode 100644 index 0000000000000..48618d354d8c2 --- /dev/null +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/mask.dm @@ -0,0 +1,51 @@ +/datum/loadout_item/mask + item_slot = ITEM_SLOT_MASK + +/datum/loadout_item/mask/empty + name = "no mask" + desc = "" + ui_icon = "empty" + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + jobs_supported = list( + SQUAD_MARINE, + SQUAD_CORPSMAN, + SQUAD_ENGINEER, + SQUAD_SMARTGUNNER, + SQUAD_LEADER, + FIELD_COMMANDER, + STAFF_OFFICER, + CAPTAIN, + SOM_SQUAD_MARINE, + SOM_SQUAD_CORPSMAN, + SOM_SQUAD_ENGINEER, + SOM_SQUAD_VETERAN, + SOM_SQUAD_LEADER, + SOM_FIELD_COMMANDER, + SOM_STAFF_OFFICER, + SOM_COMMANDER, + ) + +/datum/loadout_item/mask/standard + name = "Std gas mask" + desc = "A face-covering mask that can be connected to an air supply. Filters harmful gases from the air." + item_typepath = /obj/item/clothing/mask/gas + jobs_supported = list(SQUAD_MARINE, SQUAD_CORPSMAN, SQUAD_ENGINEER, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER, SOM_SQUAD_MARINE, SOM_SQUAD_CORPSMAN, SOM_SQUAD_ENGINEER, SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER, SOM_FIELD_COMMANDER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/mask/tactical + name = "Tac gas mask" + desc = "A face-covering mask that can be connected to an air supply. Filters harmful gases from the air. This one is supposedly more tactical than the standard model." + item_typepath = /obj/item/clothing/mask/gas/tactical + jobs_supported = list(SQUAD_MARINE, SQUAD_CORPSMAN, SQUAD_ENGINEER, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER, SOM_SQUAD_MARINE, SOM_SQUAD_CORPSMAN, SOM_SQUAD_ENGINEER, SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER, SOM_FIELD_COMMANDER) + +/datum/loadout_item/mask/skimask + name = "Ski mask" + desc = "A stylish skimask, can be recolored. Makes you feel like an operator just looking at it." + item_typepath = /obj/item/clothing/mask/gas/modular/skimask + jobs_supported = list(SQUAD_MARINE, SQUAD_CORPSMAN, SQUAD_ENGINEER, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER) + +/datum/loadout_item/mask/coof + name = "Combat face mask" + desc = "The CFCC is a prime and readied, yet stylish facemask ready to... cover your face." + item_typepath = /obj/item/clothing/mask/gas/modular/coofmask + jobs_supported = list(SQUAD_MARINE, SQUAD_CORPSMAN, SQUAD_ENGINEER, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/pockets.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/pockets.dm new file mode 100644 index 0000000000000..6937dbcc02c19 --- /dev/null +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/pockets.dm @@ -0,0 +1,223 @@ +//r_pocket +/datum/loadout_item/r_pocket + item_slot = ITEM_SLOT_R_POCKET + +/datum/loadout_item/r_pocket/empty + name = "no right pocket" + desc = "" + ui_icon = "empty" + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + jobs_supported = list( + SQUAD_MARINE, + SQUAD_CORPSMAN, + SQUAD_ENGINEER, + SQUAD_SMARTGUNNER, + SQUAD_LEADER, + FIELD_COMMANDER, + STAFF_OFFICER, + CAPTAIN, + SOM_SQUAD_MARINE, + SOM_SQUAD_CORPSMAN, + SOM_SQUAD_ENGINEER, + SOM_SQUAD_VETERAN, + SOM_SQUAD_LEADER, + SOM_FIELD_COMMANDER, + SOM_STAFF_OFFICER, + SOM_COMMANDER, + ) + + +/datum/loadout_item/r_pocket/standard_first_aid + name = "First aid pouch" + desc = "Standard marine first-aid pouch. Contains a basic set of medical supplies." + ui_icon = "medkit" + item_typepath = /obj/item/storage/pouch/firstaid/combat_patrol + jobs_supported = list(SQUAD_MARINE, SQUAD_SMARTGUNNER) + +/datum/loadout_item/r_pocket/standard_first_aid/standard_improved + desc = "Standard marine first-aid pouch. Contains a improved set of medical supplies." + item_typepath = /obj/item/storage/pouch/firstaid/combat_patrol_leader + loadout_item_flags = null + +/datum/loadout_item/r_pocket/standard_first_aid/improved + desc = "Standard marine first-aid pouch. Contains a improved set of medical supplies." + item_typepath = /obj/item/storage/pouch/firstaid/combat_patrol_leader + jobs_supported = list(SQUAD_LEADER, FIELD_COMMANDER) + +/datum/loadout_item/r_pocket/marine_support_grenades + name = "Support nades" + desc = "A pouch carrying a set of six standard support grenades." + ui_icon = "grenade" + item_typepath = /obj/item/storage/pouch/grenade/combat_patrol + jobs_supported = list(SQUAD_MARINE, SQUAD_CORPSMAN, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/r_pocket/marine_standard_grenades + name = "Standard nades" + desc = "A pouch carrying a set of six standard offensive grenades. Contains HE, lasburster and incendiary grenades." + ui_icon = "grenade" + item_typepath = /obj/item/storage/pouch/grenade/standard + jobs_supported = list(SQUAD_MARINE, SQUAD_CORPSMAN, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER) + +/datum/loadout_item/r_pocket/shotgun + name = "Buckshot shells" + desc = "A pouch specialized for holding shotgun ammo. Contains buckshot shells." + ui_icon = "grenade" + item_typepath = /obj/item/storage/pouch/shotgun + jobs_supported = list(SQUAD_MARINE, SQUAD_LEADER) + +/datum/loadout_item/r_pocket/shotgun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/buckshot, SLOT_IN_R_POUCH) + +/datum/loadout_item/r_pocket/marine_construction + name = "Construction pouch" + desc = "A pouch containing an assortment of construction supplies. Allows for the rapid establishment of fortified positions." + ui_icon = "materials" + item_typepath = /obj/item/storage/pouch/construction + jobs_supported = list(SQUAD_MARINE) + +/datum/loadout_item/r_pocket/marine_construction/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/tool/shovel/etool, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags_empty/half, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags/large_stack, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/full, SLOT_IN_R_POUCH) + +/datum/loadout_item/r_pocket/magazine + name = "Mag pouch-P" + desc = "A pouch containing three ammo magazines. Will contain a primary ammo type where applicable." + ui_icon = "grenade" + item_typepath = /obj/item/storage/pouch/magazine/large + jobs_supported = list(SQUAD_MARINE, SQUAD_CORPSMAN, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER) + item_blacklist = list( + /obj/item/weapon/gun/rifle/standard_smartmachinegun/patrol = ITEM_SLOT_SUITSTORE, + /obj/item/weapon/gun/minigun/smart_minigun/motion_detector = ITEM_SLOT_SUITSTORE, + ) + +/datum/loadout_item/r_pocket/tools + name = "Tool pouch" + desc = "It's designed to hold maintenance tools - screwdriver, wrench, cable coil, etc. It also has a hook for an entrenching tool." + ui_icon = "construction" + item_typepath = /obj/item/storage/pouch/tools/full + jobs_supported = list(SQUAD_ENGINEER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/r_pocket/general + name = "General pouch" + desc = "A general purpose pouch used to carry small items." + ui_icon = "grenade" + item_typepath = /obj/item/storage/pouch/general/large + jobs_supported = list(STAFF_OFFICER, CAPTAIN) + +//l_pocket +/datum/loadout_item/l_pocket + item_slot = ITEM_SLOT_L_POCKET + +/datum/loadout_item/l_pocket/empty + name = "no left pocket" + desc = "" + ui_icon = "empty" + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + jobs_supported = list( + SQUAD_MARINE, + SQUAD_CORPSMAN, + SQUAD_ENGINEER, + SQUAD_SMARTGUNNER, + SQUAD_LEADER, + FIELD_COMMANDER, + STAFF_OFFICER, + CAPTAIN, + SOM_SQUAD_MARINE, + SOM_SQUAD_CORPSMAN, + SOM_SQUAD_ENGINEER, + SOM_SQUAD_VETERAN, + SOM_SQUAD_LEADER, + SOM_FIELD_COMMANDER, + SOM_STAFF_OFFICER, + SOM_COMMANDER, + ) + + +/datum/loadout_item/l_pocket/standard_first_aid + name = "First aid pouch" + desc = "Standard marine first-aid pouch. Contains a basic set of medical supplies." + ui_icon = "medkit" + item_typepath = /obj/item/storage/pouch/firstaid/combat_patrol + jobs_supported = list(SQUAD_MARINE, SQUAD_ENGINEER, SQUAD_SMARTGUNNER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/l_pocket/standard_first_aid/standard_improved + desc = "Standard marine first-aid pouch. Contains a improved set of medical supplies." + item_typepath = /obj/item/storage/pouch/firstaid/combat_patrol_leader + loadout_item_flags = null + +/datum/loadout_item/l_pocket/standard_first_aid/improved + desc = "Standard marine first-aid pouch. Contains a improved set of medical supplies." + item_typepath = /obj/item/storage/pouch/firstaid/combat_patrol_leader + jobs_supported = list(SQUAD_LEADER, FIELD_COMMANDER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/l_pocket/marine_support_grenades + name = "Support nades" + desc = "A pouch carrying a set of six standard support grenades. Includes smoke grenades of both lethal and nonlethal varieties, as well as stun grenades." + ui_icon = "grenade" + item_typepath = /obj/item/storage/pouch/grenade/combat_patrol + jobs_supported = list(SQUAD_MARINE, SQUAD_CORPSMAN, SQUAD_ENGINEER, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER) + +/datum/loadout_item/l_pocket/marine_standard_grenades + name = "Standard nades" + desc = "A pouch carrying a set of six standard offensive grenades. Contains HE, lasburster and incendiary grenades." + ui_icon = "grenade" + item_typepath = /obj/item/storage/pouch/grenade/standard + jobs_supported = list(SQUAD_MARINE, SQUAD_CORPSMAN, SQUAD_ENGINEER, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER) + +/datum/loadout_item/l_pocket/shotgun + name = "Flechette shells" + desc = "A pouch specialized for holding shotgun ammo. Contains Flechette shells." + ui_icon = "grenade" + item_typepath = /obj/item/storage/pouch/shotgun + jobs_supported = list(SQUAD_MARINE, SQUAD_LEADER) + +/datum/loadout_item/l_pocket/shotgun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/flechette, SLOT_IN_L_POUCH) + +/datum/loadout_item/l_pocket/marine_construction + name = "Construction pouch" + desc = "A pouch containing an assortment of construction supplies. Allows for the rapid establishment of fortified positions." + ui_icon = "materials" + item_typepath = /obj/item/storage/pouch/construction + jobs_supported = list(SQUAD_MARINE) + +/datum/loadout_item/l_pocket/marine_construction/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/tool/shovel/etool, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags_empty/half, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/stack/sandbags/large_stack, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/full, SLOT_IN_L_POUCH) + +/datum/loadout_item/l_pocket/magazine + name = "Mag pouch-S" + desc = "A pouch containing three ammo magazines. Will contain a secondary ammo type where applicable." + ui_icon = "grenade" + item_typepath = /obj/item/storage/pouch/magazine/large + jobs_supported = list(SQUAD_MARINE, SQUAD_ENGINEER, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER) + item_blacklist = list( + /obj/item/weapon/gun/rifle/standard_smartmachinegun/patrol = ITEM_SLOT_SUITSTORE, + /obj/item/weapon/gun/minigun/smart_minigun/motion_detector = ITEM_SLOT_SUITSTORE, + ) + + +/datum/loadout_item/l_pocket/magazine/medic + jobs_supported = list(SQUAD_CORPSMAN) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/l_pocket/general + name = "General pouch" + desc = "A general purpose pouch used to carry small items." + ui_icon = "grenade" + item_typepath = /obj/item/storage/pouch/general/large + jobs_supported = list(STAFF_OFFICER, CAPTAIN) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit.dm new file mode 100644 index 0000000000000..e384506ead8e7 --- /dev/null +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit.dm @@ -0,0 +1,188 @@ +/datum/loadout_item/suit_slot + item_slot = ITEM_SLOT_OCLOTHING + +/datum/loadout_item/suit_slot/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/isotonic, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclot, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_SUIT) + +/datum/loadout_item/suit_slot/empty + name = "no suit" + desc = "" + ui_icon = "empty" + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + jobs_supported = list( + SQUAD_MARINE, + SQUAD_CORPSMAN, + SQUAD_ENGINEER, + SQUAD_SMARTGUNNER, + SQUAD_LEADER, + FIELD_COMMANDER, + STAFF_OFFICER, + CAPTAIN, + SOM_SQUAD_MARINE, + SOM_SQUAD_CORPSMAN, + SOM_SQUAD_ENGINEER, + SOM_SQUAD_VETERAN, + SOM_SQUAD_LEADER, + SOM_FIELD_COMMANDER, + SOM_STAFF_OFFICER, + SOM_COMMANDER, + ) + + +/datum/loadout_item/suit_slot/light_shield + name = "L shield armor" + desc = "Light armor with a Svallin shield module. Provides excellent mobility but lower protection." + ui_icon = "light_armour_shield" + item_typepath = /obj/item/clothing/suit/modular/xenonauten/light/shield + jobs_supported = list(SQUAD_MARINE, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER) + +/datum/loadout_item/suit_slot/light_shield/overclocked + desc = "Light armor with a Svallin shield module. Provides excellent mobility but lower protection. The shield module has been overclocked for improved performance." + item_typepath = /obj/item/clothing/suit/modular/xenonauten/light/shield_overclocked + jobs_supported = list(SQUAD_MARINE, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER) + loadout_item_flags = null + +/datum/loadout_item/suit_slot/light_shield/overclocked/medic + item_typepath = /obj/item/clothing/suit/modular/xenonauten/light/shield_overclocked/medic + jobs_supported = list(SQUAD_CORPSMAN) + +/datum/loadout_item/suit_slot/light_shield/overclocked/medic/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_SUIT) + +/datum/loadout_item/suit_slot/light_shield/overclocked/engineer + item_typepath = /obj/item/clothing/suit/modular/xenonauten/light/shield_overclocked/engineer + jobs_supported = list(SQUAD_ENGINEER) + +/datum/loadout_item/suit_slot/light_shield/overclocked/engineer/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/circuitboard/apc, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/cell/high, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/half_stack, SLOT_IN_SUIT) + +/datum/loadout_item/suit_slot/medium_shield + name = "M shield armor" + desc = "Medium armor with a Svallin shield module. Provides balanced mobility and protection." + ui_icon = "medium_armour_shield" + item_typepath = /obj/item/clothing/suit/modular/xenonauten/shield + jobs_supported = list(SQUAD_MARINE, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER) + +/datum/loadout_item/suit_slot/medium_shield/overclocked + desc = "Medium armor with a Svallin shield module. Provides balanced mobility and protection." + item_typepath = /obj/item/clothing/suit/modular/xenonauten/shield_overclocked + jobs_supported = list(SQUAD_MARINE, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER) + loadout_item_flags = null + +/datum/loadout_item/suit_slot/medium_shield/overclocked/medic + item_typepath = /obj/item/clothing/suit/modular/xenonauten/shield_overclocked/medic + jobs_supported = list(SQUAD_CORPSMAN) + +/datum/loadout_item/suit_slot/medium_shield/overclocked/medic/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_SUIT) + +/datum/loadout_item/suit_slot/medium_shield/overclocked/engineer + item_typepath = /obj/item/clothing/suit/modular/xenonauten/shield_overclocked/engineer + jobs_supported = list(SQUAD_ENGINEER) + +/datum/loadout_item/suit_slot/medium_shield/overclocked/engineer/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/circuitboard/apc, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/cell/high, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/half_stack, SLOT_IN_SUIT) + +/datum/loadout_item/suit_slot/heavy_shield + name = "H shield armor" + desc = "Heavy armor with a Svallin shield module. Provides excellent protection but lower mobility. The shield module has been overclocked for improved performance." + ui_icon = "heavy_armour_shield" + item_typepath = /obj/item/clothing/suit/modular/xenonauten/heavy/shield + jobs_supported = list(SQUAD_MARINE, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/suit_slot/heavy_shield/overclocked + desc = "Heavy armor with a Svallin shield module. Provides excellent protection but lower mobility. The shield module has been overclocked for improved performance." + item_typepath = /obj/item/clothing/suit/modular/xenonauten/heavy/shield_overclocked + jobs_supported = list(SQUAD_MARINE, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER) + loadout_item_flags = null + +/datum/loadout_item/suit_slot/heavy_surt + name = "H Surt armor" + desc = "Heavy armor with a Surt fireproof module. Provides excellent protection and almost total fire immunity, but has poor mobility." + ui_icon = "heavy_armour" + req_desc = "Requires a FL-84 flamethrower." + item_typepath = /obj/item/clothing/suit/modular/xenonauten/heavy/surt + jobs_supported = list(SQUAD_MARINE) + item_whitelist = list(/obj/item/weapon/gun/flamer/big_flamer/marinestandard/wide = ITEM_SLOT_SUITSTORE) + +/datum/loadout_item/suit_slot/heavy_tyr + name = "H Tyr armor" + desc = "Heavy armor with a Tyr extra armor module. Provides incredible protection at the cost of with further reduced mobility." + req_desc = "Requires a ALF-51B or SMG-25." + ui_icon = "tyr" + item_typepath = /obj/item/clothing/suit/modular/xenonauten/heavy/tyr_two + jobs_supported = list(SQUAD_MARINE) + item_whitelist = list( + /obj/item/weapon/gun/rifle/alf_machinecarbine/assault = ITEM_SLOT_SUITSTORE, + /obj/item/weapon/gun/smg/m25/magharness = ITEM_SLOT_SUITSTORE, + ) + +/datum/loadout_item/suit_slot/heavy_tyr/smartgunner + jobs_supported = list(SQUAD_SMARTGUNNER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + item_whitelist = null + +/datum/loadout_item/suit_slot/medium_valk + name = "M Valkyrie armor" + desc = "Medium armor with a Valkyrie automedical module. Provides respectable protection, powerful automatic medical assistance, but modest mobility." + ui_icon = "medium_armour" + item_typepath = /obj/item/clothing/suit/modular/xenonauten/valk + jobs_supported = list(SQUAD_LEADER, FIELD_COMMANDER) + +/datum/loadout_item/suit_slot/heavy_valk + name = "H Valkyrie armor" + desc = "Heavy armor with a Valkyrie automedical module. Provides excellent protection, powerful automatic medical assistance, but reduced mobility." + ui_icon = "heavy_armour" + item_typepath = /obj/item/clothing/suit/modular/xenonauten/heavy/leader + jobs_supported = list(SQUAD_LEADER, FIELD_COMMANDER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/suit_slot/white_dress + name = "Dress jacket" + desc = "The perfect white jacket to go with your white dress uniform. WARNING: Incompatible with almost all weapons." + item_typepath = /obj/item/clothing/suit/white_dress_jacket + jobs_supported = list(SQUAD_MARINE, SQUAD_CORPSMAN, SQUAD_ENGINEER, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER, STAFF_OFFICER, CAPTAIN) + +//corpsman +/datum/loadout_item/suit_slot/medium_mimir + name = "M Mimir armor" + desc = "Medium armor with a Mimir environmental protection module. Provides respectable armor and total immunity to chemical attacks, and improved radiological protection. Has modest mobility." + ui_icon = "medium_armour" + item_typepath = /obj/item/clothing/suit/modular/xenonauten/mimir + jobs_supported = list(SQUAD_CORPSMAN) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/suit_slot/medium_mimir/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_SUIT) + +//engineer +/datum/loadout_item/suit_slot/medium_engineer + name = "M armor" + desc = "Medium armor with engineering storage. Provides balanced armor and mobility." + ui_icon = "medium_armour" + item_typepath = /obj/item/clothing/suit/modular/xenonauten/engineer + jobs_supported = list(SQUAD_ENGINEER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/suit_slot/medium_engineer/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/circuitboard/apc, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/cell/high, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_SUIT) + wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/half_stack, SLOT_IN_SUIT) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage.dm new file mode 100644 index 0000000000000..075ed95a295e2 --- /dev/null +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage.dm @@ -0,0 +1,61 @@ +/datum/loadout_item/suit_store + item_slot = ITEM_SLOT_SUITSTORE + +/datum/loadout_item/suit_store/empty + name = "no suit stored" + desc = "" + ui_icon = "empty" + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + jobs_supported = list( + SQUAD_MARINE, + SQUAD_CORPSMAN, + SQUAD_ENGINEER, + SQUAD_SMARTGUNNER, + SQUAD_LEADER, + FIELD_COMMANDER, + STAFF_OFFICER, + CAPTAIN, + SOM_SQUAD_MARINE, + SOM_SQUAD_CORPSMAN, + SOM_SQUAD_ENGINEER, + SOM_SQUAD_VETERAN, + SOM_SQUAD_LEADER, + SOM_FIELD_COMMANDER, + SOM_STAFF_OFFICER, + SOM_COMMANDER, + ) + + +/datum/loadout_item/suit_store/main_gun + ///Ammo type this gun will use + var/ammo_type + ///alt ammo type for this gun + var/secondary_ammo_type + +/datum/loadout_item/suit_store/main_gun/New() + . = ..() + var/obj/item/weapon/gun/weapon_type = item_typepath + if(!ammo_type) + ammo_type = weapon_type::default_ammo_type + if(!secondary_ammo_type) + secondary_ammo_type = weapon_type::default_ammo_type + +/datum/loadout_item/suit_store/main_gun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!ammo_type) + return + if(istype(wearer.belt, /obj/item/storage/belt)) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BELT) + if(istype(wearer.l_store, /obj/item/storage/pouch/magazine)) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_L_POUCH) + if(istype(wearer.r_store, /obj/item/storage/pouch/magazine)) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/corpsman.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/corpsman.dm new file mode 100644 index 0000000000000..61cbb778d5aa0 --- /dev/null +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/corpsman.dm @@ -0,0 +1,298 @@ +/datum/loadout_item/suit_store/main_gun/corpsman + jobs_supported = list(SQUAD_CORPSMAN) + +/datum/loadout_item/suit_store/main_gun/corpsman/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + if(loadout.l_store == /obj/item/storage/pouch/magazine/large) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_L_POUCH) + if(loadout.r_store == /obj/item/storage/pouch/magazine/large) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) + +/datum/loadout_item/suit_store/main_gun/corpsman/laser_carbine + name = "Laser carbine" + desc = "Equipped with a red dot sight and underbarrel grenade launcher. The TerraGov laser carbine is the high tech equivilent to the AR-18, with extremely good mobility and handling, and powerful medium range damage. \ + Variable firemodes gives it additional flexibility over its ballistic counterpart. Uses TE power cells that are shared across all TGMC laser weaponry." + ui_icon = "lasergun" + item_typepath = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_carbine/scout + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/suit_store/main_gun/corpsman/laser_carbine/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return ..() + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/marine/corpsman/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/corpsman/laser_rifle + name = "Laser rifle" + desc = "Equipped with amag harness, bayonet and miniflamer. The Terra Experimental laser rifle, is a powerful and flexible weapon thanks to a variety of firemodes. \ + Has good mobility and excellent falloff, although lacks the power offered by weapons with an underbarrel grenade launcher.\ + Uses TE power cells that are shared across all TGMC laser weaponry." + ui_icon = "lasergun" + item_typepath = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_rifle/medic + +/datum/loadout_item/suit_store/main_gun/corpsman/laser_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return ..() + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/marine/corpsman/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/corpsman/auto_shotgun + name = "SH-15" + desc = "Equipped with a mag harness and underbarrel grenade launcher. \ + The SH-15 automatic shotgun has excellent mobility and handling, and offers powerful damage per shot. Its comparatively slow rate of fire means in a straight gunfight its overall damage output is somewhat lacking.\ + Uses 12-round 16 gauge magazines with slugs and flechette." + ui_icon = "tx15" + item_typepath = /obj/item/weapon/gun/rifle/standard_autoshotgun/engineer + secondary_ammo_type = /obj/item/ammo_magazine/rifle/tx15_flechette + +/datum/loadout_item/suit_store/main_gun/corpsman/auto_shotgun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return ..() + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/marine/corpsman/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/corpsman/skirmish_rifle + name = "AR-21" + desc = "Equipped with red dot sight, extended barrel and underbarrel grenade launcher. \ + The AR-21 is an less common rifle in the TGMC, attempting to bridge the gap between lighter, lower calibre rifles and heavier rifles like the BR-64. \ + Its compromises between the two groups means it fails to particularly outshine any of them, but never the less is a respective and flexible rifle." + ui_icon = "ballistic" + item_typepath = /obj/item/weapon/gun/rifle/standard_skirmishrifle/standard + +/datum/loadout_item/suit_store/main_gun/corpsman/skirmish_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return ..() + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/marine/corpsman/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x25mm, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/corpsman/standard_smg + name = "SMG-25" + desc = "Equipped with a mag harness, recoil compensator and gyroscopic stabilizer. SMG-25 submachinegun, is a large capacity smg, able to be be used effectively one or two handed. \ + Like all smgs, it has excellent mobility and handling, but has poor damage application at longer ranges. Uses 10x20mm caseless ammunition." + ui_icon = "m25" + item_typepath = /obj/item/weapon/gun/smg/m25/magharness + +/datum/loadout_item/suit_store/main_gun/corpsman/standard_smg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return ..() + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/marine/corpsman/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/corpsman/standard_smg/enhanced + name = "SMG-25+" + desc = "Equipped with a mag harness, recoil compensator and gyroscopic stabilizer. SMG-25 submachinegun, is a large capacity smg, able to be be used effectively one or two handed. \ + Like all smgs, it has excellent mobility and handling, but has poor damage application at longer ranges. Uses a mix of standard and AP 10x20mm caseless ammunition." + loadout_item_flags = NONE + secondary_ammo_type = /obj/item/ammo_magazine/smg/m25/ap + +/datum/loadout_item/suit_store/main_gun/corpsman/carbine + name = "AR-18" + desc = "Equipped with red dot sight, extended barrel and underbarrel grenade launcher. The AR-18 is the main weapon of the TGMC, offering excellent mobility and impressive close to medium range damage output. \ + Compared to the AR-12, it suffers from a comparatively smaller magazine size, and is less effective at longer range. Uses 10x24mm caseless ammunition." + ui_icon = "t18" + item_typepath = /obj/item/weapon/gun/rifle/standard_carbine/standard + +/datum/loadout_item/suit_store/main_gun/corpsman/carbine/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return ..() + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/marine/corpsman/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/corpsman/carbine/enhanced + name = "AR-18+" + desc = "Equipped with mag harness, extended barrel and vertical grip. The AR-18 is the main weapon of the TGMC, offering excellent mobility and impressive close to medium range damage output. \ + Compared to the AR-12, it suffers from a comparatively smaller magazine size, and is less effective at longer range. It uses a mix of standard and AP 10x24mm caseless ammunition." + loadout_item_flags = NONE + secondary_ammo_type = /obj/item/ammo_magazine/rifle/standard_carbine/ap + +/datum/loadout_item/suit_store/main_gun/corpsman/assault_rifle + name = "AR-12" + desc = "Equipped with mag harness, extended barrel and underbarrel grenade launcher. The AR-12 is the former main weapon of the TGMC before it was superceded by the AR-18 for general issue. \ + A jack of all trades weapon, effect at close and long range, with good capacity and handling, making it a reliable all-rounder. \ + It does not particularly excel in any area however, and so is overshadowed by other weapons at particular tasks. It uses 10x24mm caseless ammunition." + ui_icon = "t12" + item_typepath = /obj/item/weapon/gun/rifle/standard_assaultrifle/medic + +/datum/loadout_item/suit_store/main_gun/corpsman/assault_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return ..() + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/marine/corpsman/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/corpsman/assault_rifle/enhanced + name = "AR-12+" + desc = "Equipped with mag harness, extended barrel and underbarrel grenade launcher. The AR-12 is the former main weapon of the TGMC before it was superceded by the AR-18 for general issue. \ + A jack of all trades weapon, effect at close and long range, with good capacity and handling, making it a reliable all-rounder. \ + It does not particularly excel in any area however, and so is overshadowed by other weapons at particular tasks. It uses a mix of standard and AP 10x24mm caseless ammunition." + loadout_item_flags = NONE + secondary_ammo_type = /obj/item/ammo_magazine/rifle/standard_assaultrifle/ap + +/datum/loadout_item/suit_store/main_gun/corpsman/combat_rifle + name = "AR-11" + desc = "Equipped with a red dot sight and laser sight. The AR-11 is an old rifle of the TGMC, but is now a relatively uncommon sight. \ + It has a very large magazine capacity, and can inflict incredible damage at long range with its HV ammo, making it particularly effective at well armored targets. \ + However it suffers from relatively poor handling and mobility, and lacks any underbarrel weapon attachments, making it an effective but less flexible weapon. It uses 4.92×34mm caseless HV ammunition." + ui_icon = "tx11" + item_typepath = /obj/item/weapon/gun/rifle/tx11/standard + +/datum/loadout_item/suit_store/main_gun/corpsman/combat_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return ..() + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/marine/corpsman/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/corpsman/plasma_smg + name = "PL-51" + desc = "Unlocked for free with the Advanced SMG training perk. Equipped with a red dot sight, bayonet and vertical grip. The PL-51 plasma SMG is a powerful close range weapon, with great mobility and handling. \ + Has two firemodes, with a standard reflecting shot, or a more powerful AOE overcharged shot. Like all plasma weapons, it can rapidly build up heat and overheat, rendering it inoperable for a period if used incorrectly." + ui_icon = "lasergun" + item_typepath = /obj/item/weapon/gun/energy/lasgun/lasrifle/plasma/smg/standard + unlock_cost = 400 + purchase_cost = 40 + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_UNLOCKABLE + +/datum/loadout_item/suit_store/main_gun/corpsman/plasma_smg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return ..() + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/marine/corpsman/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/corpsman/plasma_rifle + name = "PL-38" + desc = "Unlocked for free with the Advanced rifle training perk. Equipped with a red dot sight, bayonet and miniflamer. The PL-38 plasma rifle is a powerful heavy rifle, able to unleash significant damage at any range. \ + Has three firemodes, with a standard high ROF mode, a piercing shatter shot, or a melting blast mode. Like all plasma weapons, it can rapidly build up heat and overheat, rendering it inoperable for a period if used incorrectly." + ui_icon = "lasergun" + item_typepath = /obj/item/weapon/gun/energy/lasgun/lasrifle/plasma/rifle/standard + unlock_cost = 400 + purchase_cost = 50 + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_UNLOCKABLE + +/datum/loadout_item/suit_store/main_gun/corpsman/plasma_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return ..() + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/marine/corpsman/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/engineer.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/engineer.dm new file mode 100644 index 0000000000000..3bbd2479237ef --- /dev/null +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/engineer.dm @@ -0,0 +1,113 @@ +/datum/loadout_item/suit_store/main_gun/engineer + jobs_supported = list(SQUAD_ENGINEER) + +/datum/loadout_item/suit_store/main_gun/engineer/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/chem_grenade/razorburn_large, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/chem_grenade/razorburn_large, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/engineer/carbine + name = "AR-18" + desc = "Equipped with mag harness, extended barrel and vertical grip. The AR-18 is the main weapon of the TGMC, offering excellent mobility and impressive close to medium range damage output. \ + Compared to the AR-12, it suffers from a comparatively smaller magazine size, and is less effective at longer range. Uses 10x24mm caseless ammunition." + ui_icon = "t18" + item_typepath = /obj/item/weapon/gun/rifle/standard_carbine/engineer + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/suit_store/main_gun/engineer/carbine/enhanced + name = "AR-18+" + desc = "Equipped with mag harness, extended barrel and vertical grip. The AR-18 is the main weapon of the TGMC, offering excellent mobility and impressive close to medium range damage output. \ + Compared to the AR-12, it suffers from a comparatively smaller magazine size, and is less effective at longer range. It uses a mix of standard and AP 10x24mm caseless ammunition." + loadout_item_flags = NONE + secondary_ammo_type = /obj/item/ammo_magazine/rifle/standard_carbine/ap + +/datum/loadout_item/suit_store/main_gun/engineer/assault_rifle + name = "AR-12" + desc = "Equipped with mag harness, extended barrel and miniflamer. The AR-12 is the former main weapon of the TGMC before it was superceded by the AR-18 for general issue. \ + A jack of all trades weapon, effect at close and long range, with good capacity and handling, making it a reliable all-rounder. \ + It does not particularly excel in any area however, and so is overshadowed by other weapons at particular tasks. It uses 10x24mm caseless ammunition." + ui_icon = "t12" + item_typepath = /obj/item/weapon/gun/rifle/standard_assaultrifle/engineer + +/datum/loadout_item/suit_store/main_gun/engineer/assault_rifle/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/chem_grenade/razorburn_large, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/engineer/assault_rifle/enhanced + name = "AR-12+" + desc = "Equipped with mag harness, extended barrel and miniflamer. The AR-12 is the former main weapon of the TGMC before it was superceded by the AR-18 for general issue. \ + A jack of all trades weapon, effect at close and long range, with good capacity and handling, making it a reliable all-rounder. \ + It does not particularly excel in any area however, and so is overshadowed by other weapons at particular tasks. It uses a mix of standard and AP 10x24mm caseless ammunition." + loadout_item_flags = NONE + secondary_ammo_type = /obj/item/ammo_magazine/rifle/standard_assaultrifle/ap + +/datum/loadout_item/suit_store/main_gun/engineer/auto_shotgun + name = "SH-15" + desc = "Equipped with a mag harness and underbarrel grenade launcher. \ + The SH-15 automatic shotgun has excellent mobility and handling, and offers powerful damage per shot. Its comparatively slow rate of fire means in a straight gunfight its overall damage output is somewhat lacking.\ + Uses 12-round 16 gauge magazines with slugs and flechette." + ui_icon = "tx15" + item_typepath = /obj/item/weapon/gun/rifle/standard_autoshotgun/engineer + secondary_ammo_type = /obj/item/ammo_magazine/rifle/tx15_flechette + +/datum/loadout_item/suit_store/main_gun/engineer/auto_shotgun/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/engineer/combat_rifle + name = "AR-11" + desc = "Equipped with a red dot sight and laser sight. The AR-11 is an old rifle of the TGMC, but is now a relatively uncommon sight. \ + It has a very large magazine capacity, and can inflict incredible damage at long range with its HV ammo, making it particularly effective at well armored targets. \ + However it suffers from relatively poor handling and mobility, and lacks any underbarrel weapon attachments, making it an effective but less flexible weapon. It uses 4.92×34mm caseless HV ammunition." + ui_icon = "tx11" + item_typepath = /obj/item/weapon/gun/rifle/tx11/standard + +/datum/loadout_item/suit_store/main_gun/engineer/laser_carbine + name = "Laser carbine" + desc = "Equipped with a red dot sight and gyroscopic stabilizer. The TerraGov laser carbine is the high tech equivilent to the AR-18, with extremely good mobility and handling, and powerful medium range damage. \ + Variable firemodes gives it additional flexibility over its ballistic counterpart. Uses TE power cells that are shared across all TGMC laser weaponry." + ui_icon = "lasergun" + item_typepath = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_carbine/gyro + +/datum/loadout_item/suit_store/main_gun/engineer/standard_smg + name = "SMG-25" + desc = "Equipped with a mag harness, recoil compensator and vertical grip. SMG-25 submachinegun, is a large capacity smg, able to be be used effectively one or two handed. \ + Like all smgs, it has excellent mobility and handling, but has poor damage application at longer ranges. Uses 10x20mm caseless ammunition." + ui_icon = "m25" + item_typepath = /obj/item/weapon/gun/smg/m25/vgrip + +/datum/loadout_item/suit_store/main_gun/engineer/standard_smg/enhanced + name = "SMG-25+" + desc = "Equipped with a mag harness, recoil compensator and vertical grip. SMG-25 submachinegun, is a large capacity smg, able to be be used effectively one or two handed. \ + Like all smgs, it has excellent mobility and handling, but has poor damage application at longer ranges. Uses a mix of standard and AP 10x20mm caseless ammunition." + loadout_item_flags = NONE + secondary_ammo_type = /obj/item/ammo_magazine/smg/m25/ap + +/datum/loadout_item/suit_store/main_gun/engineer/plasma_smg + name = "PL-51" + desc = "Unlocked for free with the Advanced SMG training perk. Equipped with a red dot sight, bayonet and vertical grip. The PL-51 plasma SMG is a powerful close range weapon, with great mobility and handling. \ + Has two firemodes, with a standard reflecting shot, or a more powerful AOE overcharged shot. Like all plasma weapons, it can rapidly build up heat and overheat, rendering it inoperable for a period if used incorrectly." + ui_icon = "lasergun" + item_typepath = /obj/item/weapon/gun/energy/lasgun/lasrifle/plasma/smg/standard + unlock_cost = 400 + purchase_cost = 40 + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_UNLOCKABLE + +/datum/loadout_item/suit_store/main_gun/engineer/plasma_rifle + name = "PL-38" + desc = "Unlocked for free with the Advanced rifle training perk. Equipped with a red dot sight, bayonet and vertical grip. The PL-38 plasma rifle is a powerful heavy rifle, able to unleash significant damage at any range. \ + Has three firemodes, with a standard high ROF mode, a piercing shatter shot, or a melting blast mode. Like all plasma weapons, it can rapidly build up heat and overheat, rendering it inoperable for a period if used incorrectly." + ui_icon = "lasergun" + item_typepath = /obj/item/weapon/gun/energy/lasgun/lasrifle/plasma/rifle/v_grip + unlock_cost = 400 + purchase_cost = 50 + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_UNLOCKABLE diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/field_commander.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/field_commander.dm new file mode 100644 index 0000000000000..472fe01842a03 --- /dev/null +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/field_commander.dm @@ -0,0 +1,333 @@ +/datum/loadout_item/suit_store/officer_sword + name = "Officers sword" + desc = "This appears to be a rather old blade that has been well taken care of, it is probably a family heirloom. \ + Well made and extremely sharp, despite its probable non-combat purpose. Comes in a leather scabbard that an attached to your waist or armor." + ui_icon = "machete" + item_typepath = /obj/item/storage/holster/blade/officer/full + jobs_supported = list(FIELD_COMMANDER) + item_blacklist = list(/obj/item/storage/holster/blade/officer/full = ITEM_SLOT_BELT) + +/datum/loadout_item/suit_store/officer_sword/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + + if(!isstorage(wearer.back)) + return + + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/hud_tablet/fieldcommand, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/fc_pistol + name = "P-1911A1-C pistol" + desc = "The P-1911A1-C is a custom modified pistol with impressive stopping power for its size. \ + Light and easy to use one handed, it suffers from a small magazine size and no auto eject feature. Comes in a holster that fits on your waist or armor. Uses .45 ACP ammunition." + ui_icon = "m1911c" + item_typepath = /obj/item/storage/holster/belt/pistol/m4a3/fieldcommander + jobs_supported = list(FIELD_COMMANDER) + item_blacklist = list(/obj/item/storage/holster/belt/pistol/m4a3/fieldcommander = ITEM_SLOT_BELT) + +/datum/loadout_item/suit_store/fc_pistol/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + + if(!isstorage(wearer.back)) + return + + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/hud_tablet/fieldcommand, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/field_commander + jobs_supported = list(FIELD_COMMANDER) + +/datum/loadout_item/suit_store/main_gun/field_commander/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(loadout.belt == /obj/item/storage/belt/marine) + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/hud_tablet/fieldcommand, SLOT_IN_BACKPACK) + else + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) +/datum/loadout_item/suit_store/main_gun/field_commander/pulse_rifle + name = "PR-11" + desc = "Equipped with a red dot sight, extended barrel and integrated underbarrel grenade launcher. The PR-11 is a relic from an earlier time. \ + Larger and more cumbersome than modern rifles and lacking any precision aimming, it makes up for this with its tremendous magazine capacity, making it more akin to a light machinegun that a rifle. Uses 10x24mm caseless ammunition." + ui_icon = "ballistic" + item_typepath = /obj/item/weapon/gun/rifle/m41a/field_commander + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/suit_store/main_gun/field_commander/pulse_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + + if(!isstorage(wearer.back)) + return + + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/field_commander/combat_rifle + name = "AR-11" + desc = "Equipped with a red dot sight and laser sight. The AR-11 is an old rifle of the TGMC, but is now a relatively uncommon sight. \ + It has a very large magazine capacity, and can inflict incredible damage at long range with its HV ammo, making it particularly effective at well armored targets. \ + However it suffers from relatively poor handling and mobility, and lacks any underbarrel weapon attachments, making it an effective but less flexible weapon. It uses 4.92×34mm caseless HV ammunition." + ui_icon = "tx11" + item_typepath = /obj/item/weapon/gun/rifle/tx11/standard + +/datum/loadout_item/suit_store/main_gun/field_commander/combat_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + + if(!isstorage(wearer.back)) + return + + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/field_commander/laser_rifle + name = "Laser rifle" + desc = "Equipped with a red dot sight, bayonet and miniflamer. The Terra Experimental laser rifle, is a powerful and flexible weapon thanks to a variety of firemodes. \ + Has good mobility and excellent falloff, although lacks the power offered by weapons with an underbarrel grenade launcher.\ + Uses TE power cells that are shared across all TGMC laser weaponry." + ui_icon = "lasergun" + item_typepath = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_rifle/rifleman + +/datum/loadout_item/suit_store/main_gun/field_commander/laser_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + + if(!isstorage(wearer.back)) + return + + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/field_commander/laser_mg + name = "Laser machinegun" + desc = "Equipped with a mag harness, bayonet and underbarrel grenade launcher. The Terra Experimental machine laser gun is a more flexible weapon than its ballistic counterparts. \ + It has better mobility and handling than ballistic machineguns, which combined with its variable firemodes and underbarrel weaponry makes it effective in a variety of situations, \ + but still ultimately excels at apply sustained supporting fire. Uses TE power cells that are shared across all TGMC laser weaponry." + ui_icon = "lasergun" + item_typepath = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_mlaser/patrol + +/datum/loadout_item/suit_store/main_gun/field_commander/laser_mg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + + if(!isstorage(wearer.back)) + return + + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/field_commander/standard_rifle + name = "AR-12" + desc = "Equipped with red dot sight, extended barrel and underbarrel grenade launcher. The AR-12 is the former main weapon of the TGMC before it was superceded by the AR-18 for general issue. \ + A jack of all trades weapon, effect at close and long range, with good capacity and handling, making it a reliable all-rounder. \ + It does not particularly excel in any area however, and so is overshadowed by other weapons at particular tasks. It uses 10x24mm caseless ammunition." + ui_icon = "t12" + item_typepath = /obj/item/weapon/gun/rifle/standard_assaultrifle/rifleman + +/datum/loadout_item/suit_store/main_gun/field_commander/standard_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + + if(!isstorage(wearer.back)) + return + + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/hud_tablet(wearer, /datum/job/terragov/squad/leader, wearer.assigned_squad), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/field_commander/standard_rifle/enhanced + name = "AR-12+" + desc = "Equipped with red dot sight, extended barrel and underbarrel grenade launcher. The AR-12 is the former main weapon of the TGMC before it was superceded by the AR-18 for general issue. \ + A jack of all trades weapon, effect at close and long range, with good capacity and handling, making it a reliable all-rounder. \ + It does not particularly excel in any area however, and so is overshadowed by other weapons at particular tasks. It uses a mix of standard and AP 10x24mm caseless ammunition." + loadout_item_flags = NONE + secondary_ammo_type = /obj/item/ammo_magazine/rifle/standard_assaultrifle/ap + +/datum/loadout_item/suit_store/main_gun/field_commander/carbine + name = "AR-18" + desc = "Equipped with red dot sight, extended barrel and plasma pistol. The AR-18 is the main weapon of the TGMC, offering excellent mobility and impressive close to medium range damage output. \ + Compared to the AR-12, it suffers from a comparatively smaller magazine size, and is less effective at longer range. Uses 10x24mm caseless ammunition." + ui_icon = "t18" + item_typepath = /obj/item/weapon/gun/rifle/standard_carbine/plasma_pistol + +/datum/loadout_item/suit_store/main_gun/field_commander/carbine/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + + if(!isstorage(wearer.back)) + return + + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/field_commander/carbine/enhanced + name = "AR-18+" + desc = "Equipped with red dot sight, extended barrel and plasma pistol. The AR-18 is the main weapon of the TGMC, offering excellent mobility and impressive close to medium range damage output. \ + Compared to the AR-12, it suffers from a comparatively smaller magazine size, and is less effective at longer range. It uses a mix of standard and AP 10x24mm caseless ammunition." + loadout_item_flags = NONE + secondary_ammo_type = /obj/item/ammo_magazine/rifle/standard_carbine/ap + +/datum/loadout_item/suit_store/main_gun/field_commander/plasma_smg + name = "PL-51" + desc = "Unlocked for free with the Advanced SMG training perk. Equipped with a motion sensor, bayonet and vertical grip. The PL-51 plasma SMG is a powerful close range weapon, with great mobility and handling. \ + Has two firemodes, with a standard reflecting shot, or a more powerful AOE overcharged shot. Like all plasma weapons, it can rapidly build up heat and overheat, rendering it inoperable for a period if used incorrectly." + ui_icon = "lasergun" + item_typepath = /obj/item/weapon/gun/energy/lasgun/lasrifle/plasma/smg/motion_sensor + unlock_cost = 400 + purchase_cost = 50 + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_UNLOCKABLE + +/datum/loadout_item/suit_store/main_gun/field_commander/plasma_smg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + + if(!isstorage(wearer.back)) + return + + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/field_commander/plasma_rifle + name = "PL-38" + desc = "Unlocked for free with the Advanced rifle training perk. Equipped with a red dot sight, bayonet and miniflamer. The PL-38 plasma rifle is a powerful heavy rifle, able to unleash significant damage at any range. \ + Has three firemodes, with a standard high ROF mode, a piercing shatter shot, or a melting blast mode. Like all plasma weapons, it can rapidly build up heat and overheat, rendering it inoperable for a period if used incorrectly." + ui_icon = "lasergun" + item_typepath = /obj/item/weapon/gun/energy/lasgun/lasrifle/plasma/rifle/standard + unlock_cost = 400 + purchase_cost = 50 + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_UNLOCKABLE + +/datum/loadout_item/suit_store/main_gun/field_commander/plasma_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + + if(!isstorage(wearer.back)) + return + + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/marine.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/marine.dm new file mode 100644 index 0000000000000..0875eb5b715ca --- /dev/null +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/marine.dm @@ -0,0 +1,815 @@ +/datum/loadout_item/suit_store/main_gun/marine + jobs_supported = list(SQUAD_MARINE) + +/datum/loadout_item/suit_store/main_gun/marine/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/marine/standard_rifle + name = "AR-12" + desc = "Equipped with red dot sight, extended barrel and underbarrel grenade launcher. The AR-12 is the former main weapon of the TGMC before it was superceded by the AR-18 for general issue. \ + A jack of all trades weapon, effect at close and long range, with good capacity and handling, making it a reliable all-rounder. \ + It does not particularly excel in any area however, and so is overshadowed by other weapons at particular tasks. It uses 10x24mm caseless ammunition." + ui_icon = "t12" + item_typepath = /obj/item/weapon/gun/rifle/standard_assaultrifle/rifleman + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/suit_store/main_gun/marine/standard_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return ..() + wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/marine/standard_rifle/enhanced + name = "AR-12+" + desc = "Equipped with red dot sight, extended barrel and underbarrel grenade launcher. The AR-12 is the former main weapon of the TGMC before it was superceded by the AR-18 for general issue. \ + A jack of all trades weapon, effect at close and long range, with good capacity and handling, making it a reliable all-rounder. \ + It does not particularly excel in any area however, and so is overshadowed by other weapons at particular tasks. It uses a mix of standard and AP 10x24mm caseless ammunition." + loadout_item_flags = NONE + secondary_ammo_type = /obj/item/ammo_magazine/rifle/standard_assaultrifle/ap + +/datum/loadout_item/suit_store/main_gun/marine/standard_rifle/enhanced/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + return ..() + +/datum/loadout_item/suit_store/main_gun/marine/laser_rifle + name = "Laser rifle" + desc = "Equipped with a red dot sight, bayonet and miniflamer. The Terra Experimental laser rifle, is a powerful and flexible weapon thanks to a variety of firemodes. \ + Has good mobility and excellent falloff, although lacks the power offered by weapons with an underbarrel grenade launcher.\ + Uses TE power cells that are shared across all TGMC laser weaponry." + ui_icon = "lasergun" + item_typepath = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_rifle/rifleman + +/datum/loadout_item/suit_store/main_gun/marine/laser_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_pistol/tactical(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/marine/standard_laser_rifle/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/marine/standard_carbine + name = "AR-18" + desc = "Equipped with red dot sight, extended barrel and underbarrel grenade launcher. The AR-18 is the main weapon of the TGMC, offering excellent mobility and impressive close to medium range damage output. \ + Compared to the AR-12, it suffers from a comparatively smaller magazine size, and is less effective at longer range. Uses 10x24mm caseless ammunition." + ui_icon = "t18" + item_typepath = /obj/item/weapon/gun/rifle/standard_carbine/standard + +/datum/loadout_item/suit_store/main_gun/marine/standard_carbine/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return ..() + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/marine/standard_carbine/enhanced + name = "AR-18+" + desc = "Equipped with red dot sight, extended barrel and underbarrel grenade launcher. The AR-18 is the main weapon of the TGMC, offering excellent mobility and impressive close to medium range damage output. \ + Compared to the AR-12, it suffers from a comparatively smaller magazine size, and is less effective at longer range. It uses a mix of standard and AP 10x24mm caseless ammunition." + loadout_item_flags = NONE + secondary_ammo_type = /obj/item/ammo_magazine/rifle/standard_carbine/ap + +/datum/loadout_item/suit_store/main_gun/marine/standard_carbine/enhanced/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + return ..() + +/datum/loadout_item/suit_store/main_gun/marine/combat_rifle + name = "AR-11" + desc = "Equipped with a red dot sight and laser sight. The AR-11 is an old rifle of the TGMC, but is now a relatively uncommon sight. \ + It has a very large magazine capacity, and can inflict incredible damage at long range with its HV ammo, making it particularly effective at well armored targets. \ + However it suffers from relatively poor handling and mobility, and lacks any underbarrel weapon attachments, making it an effective but less flexible weapon. It uses 4.92×34mm caseless HV ammunition." + ui_icon = "tx11" + item_typepath = /obj/item/weapon/gun/rifle/tx11/standard + +/datum/loadout_item/suit_store/main_gun/marine/combat_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return ..() + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p492x34mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p492x34mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/marine/combat_rifle/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/marine/battle_rifle + name = "BR-64" + desc = "Equipped with red dot sight, extended barrel and underbarrel grenade launcher. \ + The BR-64 is considered a 'light' marksmen rifle, with good stopping power it can apply effective damage at any range, while still having respectible handling and mobility. Uses 10x26.5smm caseless ammunition." + ui_icon = "ballistic" + item_typepath = /obj/item/weapon/gun/rifle/standard_br/standard + +/datum/loadout_item/suit_store/main_gun/marine/battle_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return ..() + wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x265mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/marine/skirmish_rifle + name = "AR-21" + desc = "Equipped with red dot sight, extended barrel and underbarrel grenade launcher. \ + The AR-21 is an less common rifle in the TGMC, attempting to bridge the gap between lighter, lower calibre rifles and heavier rifles like the BR-64. \ + Its compromises between the two groups means it fails to particularly outshine any of them, but never the less is a respective and flexible rifle." + ui_icon = "ballistic" + item_typepath = /obj/item/weapon/gun/rifle/standard_skirmishrifle/standard + +/datum/loadout_item/suit_store/main_gun/marine/skirmish_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return ..() + wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x25mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/marine/alf + name = "ALF-51B" + desc = "Equipped with a mag harness, bayonet and vertical grip. The ALF-51B is an unusual weapon, being a heavily modified AR-18 modified to SMG length of barrel, rechambered for a larger caliber, and belt fed. \ + Combining its powerful close range damage that can slow targets, impressive mobility and huge capacity, it is a devastating close range weapon. \ + However it suffers from appaling falloff making it highly ineffective at range, and its belt fed nature means it cannot be reloaded quickly, often leaving careless users exposed. Uses 10x25mm caseless ammunition." + ui_icon = "alf51b" + item_typepath = /obj/item/weapon/gun/rifle/alf_machinecarbine/assault + +/datum/loadout_item/suit_store/main_gun/marine/alf/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return ..() + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/marine/alf/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/marine/standard_gpmg + name = "MG-60" + desc = "Equipped with a mag harness, extended barrel and bipod. The MG-60 is a powerful machinegun, combining a tremendous capacity good stopping power and blistering rate of fire, it is extremely deadly at any range. \ + It has terrible mobility and poor accuracy on the move, so is generally used as a static weapon where it can lay down blistering firepower for team mates. It uses 10x26mm caseless ammunition." + ui_icon = "t60" + item_typepath = /obj/item/weapon/gun/rifle/standard_gpmg/machinegunner + +/datum/loadout_item/suit_store/main_gun/marine/standard_gpmg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return ..() + wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/marine/standard_gpmg/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + if(!isstorage(wearer.back)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + return + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/marine/standard_mmg + name = "MG-27" + desc = "Equipped with an unremovable miniscope and tripod. The MG-27 is large, unwieldy machinegun, with terrible mobility and effectively unmanagable handling outside of point blank range. \ + However the MG-27 is primary used as a deployed weapon, where it offers devastatingly powerful, accurate and long range damage that far exceeds the lighter MG-60. \ + Can quickly mow down any target caught out in the open, it is the final word in static weaponry. It uses 10x27mm caseless ammunition." + ui_icon = "ballistic" + item_typepath = /obj/item/weapon/gun/standard_mmg/machinegunner + +/datum/loadout_item/suit_store/main_gun/marine/standard_mmg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return ..() + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + if(istype(wearer.belt, /obj/item/storage/holster/m25)) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + else + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/standard_machinepistol/compact(wearer), SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/marine/standard_mmg/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) + if(istype(wearer.belt, /obj/item/storage/holster/m25)) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, SLOT_IN_ACCESSORY) + else if(isstorage(wearer.back)) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + else + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/marine/laser_mg + name = "Laser machinegun" + desc = "Equipped with a mag harness, bayonet and underbarrel grenade launcher. The Terra Experimental machine laser gun is a more flexible weapon than its ballistic counterparts. \ + It has better mobility and handling than ballistic machineguns, which combined with its variable firemodes and underbarrel weaponry makes it effective in a variety of situations, \ + but still ultimately excels at apply sustained supporting fire. Uses TE power cells that are shared across all TGMC laser weaponry." + ui_icon = "lasergun" + item_typepath = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_mlaser/patrol + +/datum/loadout_item/suit_store/main_gun/marine/laser_mg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return ..() + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_pistol/tactical(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/marine/laser_mg/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/marine/flamer + name = "FL-84" + desc = "Equipped with a mag harness, wide nozzle and hydrocannon. The FL-84 flamethrower is a simple and unsubtle weapon, used for area control and urban combat. \ + Excels at clearing out enclosed or fortified positions, but suffers from poor mobility and relatively limited range, making it of questionable use in open combat. \ + Uses back or gun mounted fuel tanks." + req_desc = "Requires a suit with a Surt module." + ui_icon = "m240" + item_typepath = /obj/item/weapon/gun/flamer/big_flamer/marinestandard/wide + item_whitelist = list(/obj/item/clothing/suit/modular/xenonauten/heavy/surt = ITEM_SLOT_OCLOTHING) + +/datum/loadout_item/suit_store/main_gun/marine/flamer/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return ..() + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + if(istype(wearer.belt, /obj/item/storage/holster/m25)) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + else + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/standard_machinepistol/compact(wearer), SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/marine/flamer/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) + if(istype(wearer.belt, /obj/item/storage/holster/m25)) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, SLOT_IN_ACCESSORY) + else if(isstorage(wearer.back)) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + else + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + + +/datum/loadout_item/suit_store/main_gun/marine/shotgun + name = "SH-35" + desc = "Equipped with a mag harness, bayonet, angled grip and foldable stock. \ + The SH-35 is the most commonly used shotgun of the TGMC. With good mobility and handling, it has unparalleled close range power when using buckshot. Able to kill or maim all but the most heavily armored targets with a single well aimmed blast. \ + When using flechette rounds, it can provide surprisingly powerful long range damage with good penetration, although its low rate of fire means its sustained damage is relatively poor. \ + Uses 12 gauge shells." + ui_icon = "t35" + item_typepath = /obj/item/weapon/gun/shotgun/pump/t35/standard + +/datum/loadout_item/suit_store/main_gun/marine/shotgun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return ..() + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/standard_machinepistol/compact(wearer), SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/marine/shotgun/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/marine/auto_shotgun + name = "SH-15" + desc = "Equipped with a mag harness, barrel charger and underbarrel grenade launcher. \ + The SH-15 automatic shotgun has excellent mobility and handling, and offers powerful damage per shot. Its comparatively slow rate of fire means in a straight gunfight its overall damage output is somewhat lacking.\ + Uses 12-round 16 gauge magazines with slugs and flechette." + ui_icon = "tx15" + item_typepath = /obj/item/weapon/gun/rifle/standard_autoshotgun/standard + secondary_ammo_type = /obj/item/ammo_magazine/rifle/tx15_flechette + +/datum/loadout_item/suit_store/main_gun/marine/auto_shotgun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return ..() + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/marine/laser_carbine + name = "Laser carbine" + desc = "Equipped with a red dot sight and underbarrel grenade launcher. The TerraGov laser carbine is the high tech equivilent to the AR-18, with extremely good mobility and handling, and powerful medium range damage. \ + Variable firemodes gives it additional flexibility over its ballistic counterpart. Uses TE power cells that are shared across all TGMC laser weaponry." + req_desc = "Requires a light armour suit." + ui_icon = "lasergun" + item_typepath = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_carbine/scout + +/datum/loadout_item/suit_store/main_gun/marine/laser_carbine/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return ..() + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_pistol/tactical(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/marine/laser_carbine/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/marine/scout_carbine + name = "AR-18-scout" + desc = "Equipped with motion detector, extended barrel and underbarrel grenade launcher. The AR-18 is the main weapon of the TGMC, offering excellent mobility and impressive close to medium range damage output. \ + Compared to the AR-12, it suffers from a comparatively smaller magazine size, and is less effective at longer range. \ + The motion detector on this example makes it excellent for scouting out enemy positions and tracking down hidden enemies. Uses 10x24mm caseless ammunition." + req_desc = "Requires a light armour suit." + ui_icon = "t18" + item_typepath = /obj/item/weapon/gun/rifle/standard_carbine/scout + item_whitelist = list( + /obj/item/clothing/suit/modular/xenonauten/light/shield = ITEM_SLOT_OCLOTHING, + /obj/item/clothing/suit/modular/xenonauten/light/shield_overclocked = ITEM_SLOT_OCLOTHING, + ) + +/datum/loadout_item/suit_store/main_gun/marine/scout_carbine/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return ..() + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/marine/scout_carbine/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) + if(istype(wearer.back, /obj/item/storage)) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_ACCESSORY) + else + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/marine/scout_carbine/enhanced + name = "AR-18-S+" + desc = "Equipped with motion detector, extended barrel and underbarrel grenade launcher. The AR-18 is the main weapon of the TGMC, offering excellent mobility and impressive close to medium range damage output. \ + Compared to the AR-12, it suffers from a comparatively smaller magazine size, and is less effective at longer range. \ + The motion detector on this example makes it excellent for scouting out enemy positions and tracking down hidden enemies. It uses a mix of standard and AP 10x24mm caseless ammunition." + loadout_item_flags = NONE + secondary_ammo_type = /obj/item/ammo_magazine/rifle/standard_carbine/ap + +/datum/loadout_item/suit_store/main_gun/marine/smg_and_shield + name = "SMG-25 & shield" + desc = "Equipped with a mag harness, recoil compensator and gyroscopic stabilizer, and comes with a TL-172 defensive shield. SMG-25 submachinegun, is a large capacity smg, able to be be used effectively one or two handed. \ + Like all smgs, it has excellent mobility and handling, but has poor damage application at longer ranges. \ + The defensive shield provides incredible resilience, allowing the user to soak up tremendous amounts of damage while they or their team mates push the enemy. \ + Generally used with Tyr heavy armor for maximum survivability. Uses 10x20mm caseless ammunition." + ui_icon = "riot_shield" + item_typepath = /obj/item/weapon/gun/smg/m25/magharness + item_blacklist = list(/obj/item/jetpack_marine/heavy = ITEM_SLOT_BACK) + +/datum/loadout_item/suit_store/main_gun/marine/smg_and_shield/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine, SLOT_L_HAND) + if(!isstorage(wearer.back)) + return + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/weldingtool/largetank, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/marine/smg_and_shield/enhanced + name = "SMG-25+ & riot shield" + desc = "Equipped with a mag harness, recoil compensator and gyroscopic stabilizer, and comes with a TL-172 defensive shield. SMG-25 submachinegun, is a large capacity smg, able to be be used effectively one or two handed. \ + Like all smgs, it has excellent mobility and handling, but has poor damage application at longer ranges. \ + The defensive shield provides incredible resilience, allowing the user to soak up tremendous amounts of damage while they or their team mates push the enemy. \ + Generally used with Tyr heavy armor for maximum survivability. Uses standard and AP 10x20mm caseless ammunition." + loadout_item_flags = NONE + secondary_ammo_type = /obj/item/ammo_magazine/smg/m25/ap + +/datum/loadout_item/suit_store/main_gun/marine/standard_smg + name = "SMG-25" + desc = "Equipped with a mag harness, recoil compensator and gyroscopic stabilizer. SMG-25 submachinegun, is a large capacity smg, able to be be used effectively one or two handed. \ + Like all smgs, it has excellent mobility and handling, but has poor damage application at longer ranges. Uses 10x20mm caseless ammunition." + ui_icon = "m25" + item_typepath = /obj/item/weapon/gun/smg/m25/magharness + +/datum/loadout_item/suit_store/main_gun/marine/standard_smg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/marine/standard_smg/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + if(istype(wearer.belt, /obj/item/storage/belt)) + return ..() + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/marine/standard_smg/enhanced + name = "SMG-25+" + desc = "Equipped with a mag harness, recoil compensator and gyroscopic stabilizer. SMG-25 submachinegun, is a large capacity smg, able to be be used effectively one or two handed. \ + Like all smgs, it has excellent mobility and handling, but has poor damage application at longer ranges. Uses standard and AP 10x20mm caseless ammunition." + loadout_item_flags = NONE + secondary_ammo_type = /obj/item/ammo_magazine/smg/m25/ap + +/datum/loadout_item/suit_store/main_gun/marine/scout_rifle + name = "BR-8" + desc ="Equipped with a red dot sight, extended barrel and vertical grip. The BR-8 is a light specialized scout rifle, mostly used by light infantry and scouts. \ + It has great mobility and handling, excellent accuracy and perfect damage application at range. Combined with innate IFF and a variety of high powered ammo types, the BR-8 is a weapon to be feared. \ + Takes specialized overpressured 10x28mm rounds." + req_desc = "Requires a light armour suit." + ui_icon = "scout" + item_typepath = /obj/item/weapon/gun/rifle/tx8/scout + item_whitelist = list( + /obj/item/clothing/suit/modular/xenonauten/light/shield = ITEM_SLOT_OCLOTHING, + /obj/item/clothing/suit/modular/xenonauten/light/shield_overclocked = ITEM_SLOT_OCLOTHING, + ) + purchase_cost = 100 + quantity = 2 + +/datum/loadout_item/suit_store/main_gun/marine/scout_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return ..() + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/standard_machinepistol/scanner(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/marine/scout_rifle/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + if(istype(wearer.belt, /obj/item/storage/belt)) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx8/incendiary, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx8/incendiary, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx8/impact, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx8/impact, SLOT_IN_BELT) + + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/marine/suppressed_carbine + name = "AR-18-Suppressed" + desc = "Equipped with red dot sight, suppressor and underbarrel grenade launcher. The AR-18 is the main weapon of the TGMC, offering excellent mobility and impressive close to medium range damage output. \ + Compared to the AR-12, it suffers from a comparatively smaller magazine size, and is less effective at longer range. \ + This suppressed variant is typically used for stealth operations, where its quiet firing and lack of tracers can give the user an edge over unsuspecting opponents. Uses 10x24mm caseless ammunition." + ui_icon = "t18" + item_typepath = /obj/item/weapon/gun/rifle/standard_carbine/suppressed + +/datum/loadout_item/suit_store/main_gun/marine/suppressed_carbine/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return ..() + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/marine/suppressed_carbine/enhanced + name = "AR-18-Suppressed+" + desc = "Equipped with red dot sight, suppressor and underbarrel grenade launcher. The AR-18 is the main weapon of the TGMC, offering excellent mobility and impressive close to medium range damage output. \ + Compared to the AR-12, it suffers from a comparatively smaller magazine size, and is less effective at longer range. \ + This suppressed variant is typically used for stealth operations, where its quiet firing and lack of tracers can give the user an edge over unsuspecting opponents. It uses a mix of standard and AP 10x24mm caseless ammunition." + loadout_item_flags = NONE + secondary_ammo_type = /obj/item/ammo_magazine/rifle/standard_carbine/ap + +/datum/loadout_item/suit_store/main_gun/marine/suppressed_carbine/enhanced/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + return ..() + +/datum/loadout_item/suit_store/main_gun/marine/mag_gl + name = "GL-54" + desc = "Equipped with a motion sensor. The GL-54 is a magazine fed, semi-automatic grenade launcher designed to shoot airbursting smart grenades. \ + A powerful support weapon, but unwieldy at close range where it can be easily overwhelmed. \ + Comes with a variety of 20mm grenade types." + ui_icon = "ballistic" + purchase_cost = 75 + quantity = 2 + item_typepath = /obj/item/weapon/gun/rifle/tx54/motion_sensor + +/datum/loadout_item/suit_store/main_gun/marine/mag_gl/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return ..() + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/standard_machinepistol/compact(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/smoke/dense, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/smoke/acid, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/razor, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/marine/mag_gl/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + if(istype(wearer.belt, /obj/item/storage/belt)) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/smoke/acid, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, SLOT_IN_BELT) + + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/marine/plasma_smg + name = "PL-51" + desc = "Unlocked for free with the Advanced SMG training perk. Equipped with a motion sensor, bayonet and vertical grip. The PL-51 plasma SMG is a powerful close range weapon, with great mobility and handling. \ + Has two firemodes, with a standard reflecting shot, or a more powerful AOE overcharged shot. Like all plasma weapons, it can rapidly build up heat and overheat, rendering it inoperable for a period if used incorrectly." + ui_icon = "lasergun" + item_typepath = /obj/item/weapon/gun/energy/lasgun/lasrifle/plasma/smg/motion_sensor + unlock_cost = 400 + purchase_cost = 50 + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_UNLOCKABLE + +/datum/loadout_item/suit_store/main_gun/marine/plasma_smg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/marine/plasma_smg/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/marine/plasma_rifle + name = "PL-38" + desc = "Unlocked for free with the Advanced rifle training perk. Equipped with a red dot sight, bayonet and miniflamer. The PL-38 plasma rifle is a powerful heavy rifle, able to unleash significant damage at any range. \ + Has three firemodes, with a standard high ROF mode, a piercing shatter shot, or a melting blast mode. Like all plasma weapons, it can rapidly build up heat and overheat, rendering it inoperable for a period if used incorrectly." + ui_icon = "lasergun" + item_typepath = /obj/item/weapon/gun/energy/lasgun/lasrifle/plasma/rifle/standard + unlock_cost = 400 + purchase_cost = 50 + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_UNLOCKABLE + +/datum/loadout_item/suit_store/main_gun/marine/plasma_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/marine/plasma_rifle/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/marine/plasma_cannon + name = "PL-96" + desc = "Unlocked for free with the Heavy weapon specialisation perk. Equipped with a magharness. The PL-96 plasma cannon is massive, cumbersome weapon, designed to unleash devastating damage against all targets. \ + Has three firemodes, with a plasma wave mode, that scales in damage against larger targets, a shatter blast mode, or an incendiary blast mode. Like all plasma weapons, it can rapidly build up heat and overheat, rendering it inoperable for a period if used incorrectly." + ui_icon = "lasergun" + item_typepath = /obj/item/weapon/gun/energy/lasgun/lasrifle/plasma/cannon/mag_harness + unlock_cost = 400 + purchase_cost = 80 + quantity = 3 + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_UNLOCKABLE + +/datum/loadout_item/suit_store/main_gun/marine/plasma_cannon/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/marine/plasma_cannon/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/smartgunner.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/smartgunner.dm new file mode 100644 index 0000000000000..44c72d3d4d543 --- /dev/null +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/smartgunner.dm @@ -0,0 +1,95 @@ +/datum/loadout_item/suit_store/main_gun/smartgunner + jobs_supported = list(SQUAD_SMARTGUNNER) + +/datum/loadout_item/suit_store/main_gun/smartgunner/smartmachinegun + name = "SG-29" + desc = "Equipped with a motion sensor and laser sight. The SG-29 is the TGMC's current standard IFF-capable medium machine gun. \ + It has good mobility for a machinegun, and is extremely effective on the move. Its innate IFF, good damage application and attached motion sensor makes it a powerful support weapon. \ + Has somewhat poor falloff however, and although it has an excellent capacity, has slow reloading. It uses 10x26mm caseless ammunition. \ + Requires special training and it cannot turn off IFF. It uses 10x26mm ammunition." + ui_icon = "sg29" + item_typepath = /obj/item/weapon/gun/rifle/standard_smartmachinegun/patrol + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/suit_store/main_gun/smartgunner/smartmachinegun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) + + if(!isstorage(wearer.back)) + return + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), SLOT_IN_BACKPACK) + + if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/smartgunner/smart_minigun + name = "SG-85" + desc = "Equipped with a motion sensor. The SG-85 is a monstrous IFF minigun, able to unleash an incredible torrent of bullets with a tremendous capacity thanks to its back mounted ammo supply. \ + With excellent armor penetration and minimal falloff, the SG-85 is a supreme support weapon, able to effective apply damage at any range, causing hideous amounts of shrapnel to anyone it doesn't kill." + req_desc = "Requires a powerback for power and ammo. It uses 10x26mm caseless ammunition" + ui_icon = "smartgun" + item_typepath = /obj/item/weapon/gun/minigun/smart_minigun/motion_detector + item_whitelist = list(/obj/item/ammo_magazine/minigun_powerpack/smartgun = ITEM_SLOT_BACK) + +/datum/loadout_item/suit_store/main_gun/smartgunner/smart_minigun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(loadout.belt == /obj/item/storage/belt/sparepouch) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/smart_minigun, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/smart_minigun, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/standard_machinepistol/compact(wearer), SLOT_IN_BELT) + + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_ACCESSORY) + + else + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/smartgunner/smarttargetrifle + name = "SG-62" + desc = "Equipped with a motio sensor and spotting rifle. The SG-62 is a IFF precision rifle that has accurate, long range stopping power combined with the utility of its attached spotting rifle. \ + The spotting rifle can use a variety of ammo types to suit a variety of situations, but the gun has relatively poor mobility and handling. Good for the smartgunner that favors precision over volume of fire. \ + It uses high velocity 10x27mm caseless ammunition and 12x66mm ammunition for the underslung rifle." + ui_icon = "smartgun" + item_typepath = /obj/item/weapon/gun/rifle/standard_smarttargetrifle/motion + +/datum/loadout_item/suit_store/main_gun/smartgunner/smarttargetrifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/highimpact, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/highimpact, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/incendiary, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/tungsten, SLOT_IN_ACCESSORY) + + if(!isstorage(wearer.back)) + return + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/incendiary, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/tungsten, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/highimpact, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/highimpact, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), SLOT_IN_BACKPACK) + + if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/incendiary, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/tungsten, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/squad_leader.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/squad_leader.dm new file mode 100644 index 0000000000000..f35179cace5d9 --- /dev/null +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/squad_leader.dm @@ -0,0 +1,368 @@ +/datum/loadout_item/suit_store/main_gun/squad_leader + jobs_supported = list(SQUAD_LEADER) + +/datum/loadout_item/suit_store/main_gun/squad_leader/standard_rifle + name = "AR-12" + desc = "Equipped with red dot sight, extended barrel and underbarrel grenade launcher. The AR-12 is the former main weapon of the TGMC before it was superceded by the AR-18 for general issue. \ + A jack of all trades weapon, effect at close and long range, with good capacity and handling, making it a reliable all-rounder. \ + It does not particularly excel in any area however, and so is overshadowed by other weapons at particular tasks. It uses 10x24mm caseless ammunition." + ui_icon = "t12" + item_typepath = /obj/item/weapon/gun/rifle/standard_assaultrifle/rifleman + +/datum/loadout_item/suit_store/main_gun/squad_leader/standard_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + + if(!isstorage(wearer.back)) + return + + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/hud_tablet(wearer, /datum/job/terragov/squad/leader, wearer.assigned_squad), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/squad_leader/standard_rifle/enhanced + name = "AR-12+" + desc = "Equipped with red dot sight, extended barrel and underbarrel grenade launcher. The AR-12 is the former main weapon of the TGMC before it was superceded by the AR-18 for general issue. \ + A jack of all trades weapon, effect at close and long range, with good capacity and handling, making it a reliable all-rounder. \ + It does not particularly excel in any area however, and so is overshadowed by other weapons at particular tasks. It uses a mix of standard and AP 10x24mm caseless ammunition." + loadout_item_flags = NONE + secondary_ammo_type = /obj/item/ammo_magazine/rifle/standard_assaultrifle/ap + +/datum/loadout_item/suit_store/main_gun/squad_leader/laser_rifle + name = "Laser rifle" + desc = "Equipped with a red dot sight, bayonet and miniflamer. The Terra Experimental laser rifle, is a powerful and flexible weapon thanks to a variety of firemodes. \ + Has good mobility and excellent falloff, although lacks the power offered by weapons with an underbarrel grenade launcher.\ + Uses TE power cells that are shared across all TGMC laser weaponry." + ui_icon = "lasergun" + item_typepath = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_rifle/rifleman + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/suit_store/main_gun/squad_leader/laser_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + + if(!isstorage(wearer.back)) + return + + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/hud_tablet(wearer, /datum/job/terragov/squad/leader, wearer.assigned_squad), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/squad_leader/carbine + name = "AR-18" + desc = "Equipped with red dot sight, extended barrel and plasma pistol. The AR-18 is the main weapon of the TGMC, offering excellent mobility and impressive close to medium range damage output. \ + Compared to the AR-12, it suffers from a comparatively smaller magazine size, and is less effective at longer range. Uses 10x24mm caseless ammunition." + ui_icon = "t18" + item_typepath = /obj/item/weapon/gun/rifle/standard_carbine/plasma_pistol + +/datum/loadout_item/suit_store/main_gun/squad_leader/carbine/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + + if(!isstorage(wearer.back)) + return + + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/squad_leader/carbine/enhanced + name = "AR-18+" + desc = "Equipped with red dot sight, extended barrel and plasma pistol. The AR-18 is the main weapon of the TGMC, offering excellent mobility and impressive close to medium range damage output. \ + Compared to the AR-12, it suffers from a comparatively smaller magazine size, and is less effective at longer range. It uses a mix of standard and AP 10x24mm caseless ammunition." + loadout_item_flags = NONE + secondary_ammo_type = /obj/item/ammo_magazine/rifle/standard_carbine/ap + +/datum/loadout_item/suit_store/main_gun/squad_leader/combat_rifle + name = "AR-11" + desc = "Equipped with a red dot sight and laser sight. The AR-11 is an old rifle of the TGMC, but is now a relatively uncommon sight. \ + It has a very large magazine capacity, and can inflict incredible damage at long range with its HV ammo, making it particularly effective at well armored targets. \ + However it suffers from relatively poor handling and mobility, and lacks any underbarrel weapon attachments, making it an effective but less flexible weapon. It uses 4.92×34mm caseless HV ammunition." + ui_icon = "tx11" + item_typepath = /obj/item/weapon/gun/rifle/tx11/standard + +/datum/loadout_item/suit_store/main_gun/squad_leader/combat_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + + if(!isstorage(wearer.back)) + return + + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/hud_tablet(wearer, /datum/job/terragov/squad/leader, wearer.assigned_squad), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p492x34mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/squad_leader/battle_rifle + name = "BR-64" + desc = "Equipped with red dot sight, extended barrel and underbarrel grenade launcher. \ + The BR-64 is considered a 'light' marksmen rifle, with good stopping power it can apply effective damage at any range, while still having respectible handling and mobility. Uses 10x26.5smm caseless ammunition." + ui_icon = "ballistic" + item_typepath = /obj/item/weapon/gun/rifle/standard_br/standard + +/datum/loadout_item/suit_store/main_gun/squad_leader/battle_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + + if(!isstorage(wearer.back)) + return + + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x265mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x265mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/squad_leader/auto_shotgun + name = "SH-15" + desc = "Equipped with a motion sensor, extended barrel and plasma pistol. \ + The SH-15 automatic shotgun has excellent mobility and handling, and offers powerful damage per shot. Its comparatively slow rate of fire means in a straight gunfight its overall damage output is somewhat lacking.\ + Uses 12-round 16 gauge magazines with slugs and flechette." + ui_icon = "tx15" + item_typepath = /obj/item/weapon/gun/rifle/standard_autoshotgun/plasma_pistol + secondary_ammo_type = /obj/item/ammo_magazine/rifle/tx15_flechette + +/datum/loadout_item/suit_store/main_gun/squad_leader/auto_shotgun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + + if(!isstorage(wearer.back)) + return + + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/squad_leader/oicw + name = "AR-55" + desc = "Equipped with a motion sensor, recoil compensator, vertical grip and integrated GL-54. \ + The AR-55 is effectively a GL-54 with a simplified AR-18 strapped to the bottom. It has all the flexible airbursting power of the GL-54 combined with the reliable damage of an assault rifle. \ + While even more bulky and cumbersome than just the GL-54 alone, and the rifle component is inferior to the AR-18 it is derived from, the AR-55 is a far more effective weapon than the sum of its parts. \ + Uses 10x24mm caseless ammunition and 20mm airburst grenades." + ui_icon = "tx55" + item_typepath = /obj/item/weapon/gun/rifle/tx55/combat_patrol + purchase_cost = 100 + quantity = 2 + +/datum/loadout_item/suit_store/main_gun/squad_leader/oicw/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + + if(!isstorage(wearer.back)) + return + + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/squad_leader/oicw/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + if(loadout.belt == /obj/item/storage/belt/marine) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54/incendiary, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BELT) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_BELT) + if(loadout.l_store == /obj/item/storage/pouch/magazine/large) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_L_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_L_POUCH) + if(loadout.r_store == /obj/item/storage/pouch/magazine/large) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx54, SLOT_IN_R_POUCH) + +/datum/loadout_item/suit_store/main_gun/squad_leader/standard_smg + name = "SMG-25" + desc = "Equipped with a mag harness, recoil compensator and plasma pistol. SMG-25 submachinegun, is a large capacity smg, intended to be used two handed to take advantage of the attached plasma pistol. \ + Like all smgs, it has excellent mobility and handling, but has poor damage application at longer ranges. Uses 10x20mm caseless ammunition, and comes with multiple ammo types." + ui_icon = "m25" + item_typepath = /obj/item/weapon/gun/smg/m25/plasma + +/datum/loadout_item/suit_store/main_gun/squad_leader/standard_smg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) //bruh + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + return + + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/squad_leader/standard_smg/enhanced + name = "SMG-25+" + desc = "Equipped with a mag harness, recoil compensator and plasma pistol. SMG-25 submachinegun, is a large capacity smg, intended to be used two handed to take advantage of the attached plasma pistol. \ + Like all smgs, it has excellent mobility and handling, but has poor damage application at longer ranges. Uses standard and AP 10x20mm caseless ammunition." + loadout_item_flags = NONE + secondary_ammo_type = /obj/item/ammo_magazine/smg/m25/ap + +/datum/loadout_item/suit_store/main_gun/squad_leader/plasma_smg + name = "PL-51" + desc = "Unlocked for free with the Advanced SMG training perk. Equipped with a motion sensor, bayonet and vertical grip. The PL-51 plasma SMG is a powerful close range weapon, with great mobility and handling. \ + Has two firemodes, with a standard reflecting shot, or a more powerful AOE overcharged shot. Like all plasma weapons, it can rapidly build up heat and overheat, rendering it inoperable for a period if used incorrectly." + ui_icon = "lasergun" + item_typepath = /obj/item/weapon/gun/energy/lasgun/lasrifle/plasma/smg/motion_sensor + unlock_cost = 400 + purchase_cost = 50 + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_UNLOCKABLE + +/datum/loadout_item/suit_store/main_gun/squad_leader/plasma_smg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + + if(!isstorage(wearer.back)) + return + + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/hud_tablet(wearer, /datum/job/terragov/squad/leader, wearer.assigned_squad), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p492x34mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/squad_leader/plasma_rifle + name = "PL-38" + desc = "Unlocked for free with the Advanced rifle training perk. Equipped with a red dot sight, bayonet and miniflamer. The PL-38 plasma rifle is a powerful heavy rifle, able to unleash significant damage at any range. \ + Has three firemodes, with a standard high ROF mode, a piercing shatter shot, or a melting blast mode. Like all plasma weapons, it can rapidly build up heat and overheat, rendering it inoperable for a period if used incorrectly." + ui_icon = "lasergun" + item_typepath = /obj/item/weapon/gun/energy/lasgun/lasrifle/plasma/rifle/standard + unlock_cost = 400 + purchase_cost = 50 + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_UNLOCKABLE + +/datum/loadout_item/suit_store/main_gun/squad_leader/plasma_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) + + if(!isstorage(wearer.back)) + return + + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/hud_tablet(wearer, /datum/job/terragov/squad/leader, wearer.assigned_squad), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p492x34mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/tactical(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/uniform.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/uniform.dm new file mode 100644 index 0000000000000..61b4991c8c929 --- /dev/null +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/uniform.dm @@ -0,0 +1,120 @@ +/datum/loadout_item/uniform + item_slot = ITEM_SLOT_ICLOTHING + +/datum/loadout_item/uniform/empty + name = "no uniform" + desc = "" + ui_icon = "empty" + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + jobs_supported = list( + SQUAD_MARINE, + SQUAD_CORPSMAN, + SQUAD_ENGINEER, + SQUAD_SMARTGUNNER, + SQUAD_LEADER, + FIELD_COMMANDER, + STAFF_OFFICER, + CAPTAIN, + SOM_SQUAD_MARINE, + SOM_SQUAD_CORPSMAN, + SOM_SQUAD_ENGINEER, + SOM_SQUAD_VETERAN, + SOM_SQUAD_LEADER, + SOM_FIELD_COMMANDER, + SOM_STAFF_OFFICER, + SOM_COMMANDER, + ) + + +/datum/loadout_item/uniform/marine_standard + name = "TGMC uniform" + desc = "A standard-issue, kevlar-weaved, hazmat-tested, EMF-augmented marine uniform. You suspect it's not as robust-proof as advertised." + item_typepath = /obj/item/clothing/under/marine/black_vest + jobs_supported = list(SQUAD_MARINE, SQUAD_SMARTGUNNER, SQUAD_LEADER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/uniform/red_fatigue + name = "Big Red fatigues" + desc = "Originated from Big Red. Designed for dry, low humid, and Mars-eqse environments, they're meant for recon, stealth, and evac operations. \ + They come with a built in cassette player hearable only to the user to help pass time, during any possible long waits. They make you feel like one with the desert, \ + forged by the beating Sun. Rumors had it that it can recycle your sweat and urine for drinkable water!" + item_typepath = /obj/item/clothing/under/marine/red_fatigue/black_vest + jobs_supported = list(SQUAD_MARINE, SQUAD_SMARTGUNNER, SQUAD_LEADER) + +/datum/loadout_item/uniform/striped_fatigue + name = "Striped fatigues" + desc = "A simple set of camo pants and a striped shirt." + item_typepath = /obj/item/clothing/under/marine/striped/black_vest + jobs_supported = list(SQUAD_MARINE, SQUAD_SMARTGUNNER, SQUAD_LEADER) + +/datum/loadout_item/uniform/lv_fatigue + name = "LV-624 fatigues" + desc = "Originated from LV-624. Designed for wet, high humid, and jungle environments, they're meant for recon, stealth, and evac operations. \ + They come with a built in cassette player hearable only to the user to help pass time, during any possible long waits. \ + Somewhere, someone is playing 'Fortunate Sons' in the background, and you can smell napalm and Agent Orange in the air..." + item_typepath = /obj/item/clothing/under/marine/lv_fatigue/black_vest + jobs_supported = list(SQUAD_MARINE, SQUAD_SMARTGUNNER, SQUAD_LEADER) + +/datum/loadout_item/uniform/orion_fatigue + name = "Orion fatigues" + desc = "Originated from Orion Military Outpost. Designed for ship and urban environments, they're meant for recon, stealth, and evac operations. \ + They come with a built in cassette player hearable only to the user to help pass time, during any possible long waits. They're the definition of over-funded ideas, \ + least they look neat. It is very likely that a boot fresh from boot camp to buy this at the BX with his E-1 pay because of how tacticool it looks." + item_typepath = /obj/item/clothing/under/marine/orion_fatigue/black_vest + jobs_supported = list(SQUAD_MARINE, SQUAD_SMARTGUNNER, SQUAD_LEADER) + +/datum/loadout_item/uniform/white_dress + name = "white dress uniform" + desc = "A standard-issue TerraGov Marine Corps white dress uniform. \ + The starch in the fabric chafes a small amount but it pales in comparison to the pride you feel when you first put it on during graduation from boot camp. Doesn't seem to fit perfectly around the waist though." + item_typepath = /obj/item/clothing/under/marine/whites + jobs_supported = list(SQUAD_MARINE, SQUAD_CORPSMAN, SQUAD_ENGINEER, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER, STAFF_OFFICER, CAPTAIN) + +//corpsman +/datum/loadout_item/uniform/marine_corpsman + name = "corpsman fatigues" + desc = "A standard-issue, kevlar-weaved, hazmat-tested, EMF-augmented combat corpsman fatigues. You suspect it's not as robust-proof as advertised." + item_typepath = /obj/item/clothing/under/marine/corpsman/corpman_vest + jobs_supported = list(SQUAD_CORPSMAN) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +/datum/loadout_item/uniform/marine_corpsman/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/bodybag/cryobag, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/tweezers_advanced, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/nanoblood, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/spaceacillin, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/combat_advanced, SLOT_IN_ACCESSORY) + +//engineer +/datum/loadout_item/uniform/marine_engineer + name = "Engineer fatigues" + desc = "A standard-issue, kevlar-weaved, hazmat-tested, EMF-augmented combat engineer fatigues. You suspect it's not as robust-proof as advertised." + req_desc = "Requires a tool pouch. You ARE an engineer, right?" + item_typepath = /obj/item/clothing/under/marine/engineer/black_vest + jobs_supported = list(SQUAD_ENGINEER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +//FC +/datum/loadout_item/uniform/field_commander + name = "FC uniform" + desc = "A special-issue, kevlar-weaved, hazmat-tested, EMF-augmented worn by a field-grade officer of the TGMC. You suspect it's not as robust-proof as advertised." + item_typepath = /obj/item/clothing/under/marine/officer/exec/webbing + jobs_supported = list(FIELD_COMMANDER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +//Staff officer +/datum/loadout_item/uniform/staff_officer + name = "SO uniform" + desc = "A standard-issue, kevlar-weaved, hazmat-tested, EMF-augmented staff officer uniform. Do the navy proud." + item_typepath = /obj/item/clothing/under/marine/officer/bridge + jobs_supported = list(STAFF_OFFICER) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE + +//Captain +/datum/loadout_item/uniform/captain_officer + name = "Captain uniform" + desc = "A special-issue, well-ironed, kevlar-weaved, hazmat-tested, EMF-augmented uniform worth of a TerraGov Naval Captain. Even looking at it the wrong way could result in being court-martialed." + item_typepath = /obj/item/clothing/under/marine/officer/command + jobs_supported = list(CAPTAIN) + loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE diff --git a/code/datums/gamemodes/campaign/missions/airbase_raid.dm b/code/datums/gamemodes/campaign/missions/airbase_raid.dm index 166d180f1a9f4..c9427b83fc7eb 100644 --- a/code/datums/gamemodes/campaign/missions/airbase_raid.dm +++ b/code/datums/gamemodes/campaign/missions/airbase_raid.dm @@ -26,8 +26,6 @@ ) starting_faction_additional_rewards = "Disrupt enemy air support for a moderate period of time." hostile_faction_additional_rewards = "Ensure continued access to close air support. Recon mech and gorgon armor available if you successfully protect this depot." - ///The mech spawner type to create a mech for the defending team - var/mech_type = /obj/effect/landmark/campaign/mech_spawner/som /datum/campaign_mission/destroy_mission/airbase/play_start_intro() intro_message = list( @@ -62,13 +60,13 @@ /datum/campaign_mission/destroy_mission/airbase/apply_minor_loss() winning_faction = hostile_faction var/datum/faction_stats/winning_team = mode.stat_list[hostile_faction] - winning_team.add_asset(/obj/effect/landmark/campaign/mech_spawner/som/light) + winning_team.add_asset(/datum/campaign_asset/mech/light/som) winning_team.add_asset(/datum/campaign_asset/equipment/gorgon_armor) /datum/campaign_mission/destroy_mission/airbase/apply_major_loss() winning_faction = hostile_faction var/datum/faction_stats/winning_team = mode.stat_list[hostile_faction] - winning_team.add_asset(/obj/effect/landmark/campaign/mech_spawner/som/light) + winning_team.add_asset(/datum/campaign_asset/mech/light/som) winning_team.add_asset(/datum/campaign_asset/equipment/gorgon_armor) /datum/campaign_mission/destroy_mission/airbase/som @@ -80,5 +78,4 @@ map_light_levels = list(225, 150, 100, 75) objectives_total = 8 min_destruction_amount = 5 - mech_type = /obj/effect/landmark/campaign/mech_spawner hostile_faction_additional_rewards = "Ensure continued access to close air support. B18 power armour available if you successfully protect this depot." diff --git a/code/datums/gamemodes/campaign/missions/asat_capture.dm b/code/datums/gamemodes/campaign/missions/asat_capture.dm index b34b6c29f1bae..a295e1a7411cb 100644 --- a/code/datums/gamemodes/campaign/missions/asat_capture.dm +++ b/code/datums/gamemodes/campaign/missions/asat_capture.dm @@ -2,11 +2,13 @@ /datum/campaign_mission/capture_mission/asat name = "ASAT capture" mission_icon = "asat_capture" - map_name = "Lawanka outpost" + map_name = "Lawanka Outpost" map_file = '_maps/map_files/Lawanka_Outpost/LawankaOutpost.dmm' map_traits = list(ZTRAIT_AWAY = TRUE, ZTRAIT_RAIN = TRUE) map_light_colours = list(LIGHT_COLOR_PALE_GREEN, LIGHT_COLOR_PALE_GREEN, LIGHT_COLOR_PALE_GREEN, LIGHT_COLOR_PALE_GREEN) mission_flags = MISSION_DISALLOW_TELEPORT + max_game_time = 9 MINUTES + game_timer_delay = 90 SECONDS shutter_open_delay = list( MISSION_STARTING_FACTION = 90 SECONDS, MISSION_HOSTILE_FACTION = 0, @@ -39,17 +41,44 @@ starting_faction_additional_rewards = "Additional ICC support, ability to counteract TGMC drop pod usage" hostile_faction_additional_rewards = "Preserve the ability to use drop pods uncontested" - objectives_total = 5 - min_capture_amount = 3 + objectives_total = 6 + min_capture_amount = 5 /datum/campaign_mission/capture_mission/asat/load_pre_mission_bonuses() . = ..() - spawn_mech(hostile_faction, 0, 0, 3) - spawn_mech(starting_faction, 0, 2) + spawn_mech(hostile_faction, 0, 0, 5) + spawn_mech(starting_faction, 0, 1, 1) + + var/datum/faction_stats/attacking_team = mode.stat_list[starting_faction] + attacking_team.add_asset(/datum/campaign_asset/asset_disabler/som_cas/instant) /datum/campaign_mission/capture_mission/asat/load_objective_description() starting_faction_objective_description = "Major Victory:Capture all [objectives_total] ASAT systems.[min_capture_amount ? " Minor Victory: Capture at least [min_capture_amount] ASAT systems." : ""]" - hostile_faction_objective_description = "Major Victory:Prevent the capture of all [objectives_total] ASAT systems.[min_capture_amount ? " Minor Victory: Prevent the capture of atleast [min_capture_amount] ASAT systems." : ""]" + hostile_faction_objective_description = "Major Victory:Prevent the capture of all [objectives_total] ASAT systems.[min_capture_amount ? " Minor Victory: Prevent the capture of atleast [objectives_total - min_capture_amount + 1] ASAT systems." : ""]" + +/datum/campaign_mission/capture_mission/asat/check_mission_progress() + if(outcome) + return TRUE + + if(!game_timer) + return FALSE + + if(!max_time_reached && objectives_remaining) + return FALSE + + if(capture_count[MISSION_STARTING_FACTION] >= objectives_total) + message_admins("Mission finished: [MISSION_OUTCOME_MAJOR_VICTORY]") + outcome = MISSION_OUTCOME_MAJOR_VICTORY + else if(min_capture_amount && (capture_count[MISSION_STARTING_FACTION] >= min_capture_amount)) + message_admins("Mission finished: [MISSION_OUTCOME_MINOR_VICTORY]") + outcome = MISSION_OUTCOME_MINOR_VICTORY + else if(capture_count[MISSION_STARTING_FACTION] > 0) + message_admins("Mission finished: [MISSION_OUTCOME_MINOR_LOSS]") + outcome = MISSION_OUTCOME_MINOR_LOSS + else + message_admins("Mission finished: [MISSION_OUTCOME_MAJOR_LOSS]") + outcome = MISSION_OUTCOME_MAJOR_LOSS + return TRUE /datum/campaign_mission/capture_mission/asat/apply_major_victory() . = ..() diff --git a/code/datums/gamemodes/campaign/missions/base_rescue.dm b/code/datums/gamemodes/campaign/missions/base_rescue.dm index d1c53b6c19ce5..a801811de73a8 100644 --- a/code/datums/gamemodes/campaign/missions/base_rescue.dm +++ b/code/datums/gamemodes/campaign/missions/base_rescue.dm @@ -3,13 +3,14 @@ name = "NT base rescue" mission_icon = "nt_rescue" mission_flags = MISSION_DISALLOW_TELEPORT - map_name = "NT site B-403" + map_name = "NT Site B-403" map_file = '_maps/map_files/Campaign maps/nt_base/nt_base.dmm' map_traits = list(ZTRAIT_AWAY = TRUE, ZTRAIT_SNOWSTORM = TRUE) map_light_colours = list(COLOR_MISSION_BLUE, COLOR_MISSION_BLUE, COLOR_MISSION_BLUE, COLOR_MISSION_BLUE) map_light_levels = list(225, 150, 100, 75) objectives_total = 1 min_destruction_amount = 1 + max_game_time = 15 MINUTES shutter_open_delay = list( MISSION_STARTING_FACTION = 60 SECONDS, MISSION_HOSTILE_FACTION = 0, @@ -41,6 +42,8 @@ /datum/campaign_mission/destroy_mission/base_rescue/load_mission() . = ..() RegisterSignal(SSdcs, COMSIG_GLOB_CAMPAIGN_NT_OVERRIDE_CODE, PROC_REF(override_code_received)) + RegisterSignal(SSdcs, COMSIG_GLOB_CAMPAIGN_NT_OVERRIDE_RUNNING, PROC_REF(computer_running)) + RegisterSignal(SSdcs, COMSIG_GLOB_CAMPAIGN_NT_OVERRIDE_STOP_RUNNING, PROC_REF(computer_stop_running)) /datum/campaign_mission/destroy_mission/base_rescue/set_factions() attacking_faction = hostile_faction @@ -48,7 +51,7 @@ /datum/campaign_mission/destroy_mission/base_rescue/unregister_mission_signals() . = ..() - UnregisterSignal(SSdcs, COMSIG_GLOB_CAMPAIGN_NT_OVERRIDE_CODE) + UnregisterSignal(SSdcs, list(COMSIG_GLOB_CAMPAIGN_NT_OVERRIDE_CODE, COMSIG_GLOB_CAMPAIGN_NT_OVERRIDE_RUNNING, COMSIG_GLOB_CAMPAIGN_NT_OVERRIDE_STOP_RUNNING)) /datum/campaign_mission/destroy_mission/base_rescue/play_start_intro() intro_message = list( @@ -59,8 +62,12 @@ /datum/campaign_mission/destroy_mission/base_rescue/load_pre_mission_bonuses() . = ..() - for(var/i = 1 to objectives_total) - new /obj/item/storage/box/explosive_mines(get_turf(pick(GLOB.campaign_reward_spawners[defending_faction]))) + spawn_mech(attacking_faction, 0, 0, 4) + spawn_mech(defending_faction, 0, 0, 2) + + var/datum/faction_stats/defending_team = mode.stat_list[defending_faction] + defending_team.add_asset(/datum/campaign_asset/asset_disabler/tgmc_cas/instant) + defending_team.add_asset(/datum/campaign_asset/asset_disabler/tgmc_mortar) /datum/campaign_mission/destroy_mission/base_rescue/load_mission_brief() starting_faction_mission_brief = "NanoTrasen has issues an emergency request for assistance at an isolated medical facility located in the Western Ayolan Ranges. \ @@ -69,30 +76,40 @@ hostile_faction_mission_brief = "Recon forces have led us to this secure Nanotrasen facility in the Western Ayolan Ranges. Sympathetic native elements suggest NT have been conducting secret research here to the detriment of the local ecosystem and human settlements. \ Find the security override terminals to override the facility's emergency lockdown. \ Once the lockdown is lifted, destroy what they're working on inside." + starting_faction_mission_parameters = "Fire support is unavailable due to the sensitive and costly nature of this NT installation." + hostile_faction_mission_parameters = "Teleportation is unavailable in this area due to unknown interference from beneath the NT compound." /datum/campaign_mission/destroy_mission/base_rescue/load_objective_description() starting_faction_objective_description = "Major Victory:Protect the NT base from SOM attack. Do not allow them to override the security lockdown and destroy NT's sensitive equipment" hostile_faction_objective_description = "Major Victory: Override the security lockdown on the NT facility and destroy whatever secrets they are working on" +/datum/campaign_mission/destroy_mission/base_rescue/start_mission() + . = ..() + //We do this when the mission starts to stop nerds from wasting the militia roles pregame + var/datum/faction_stats/attacking_team = mode.stat_list[attacking_faction] + attacking_team.add_asset(/datum/campaign_asset/bonus_job/colonial_militia) + attacking_team.faction_assets[/datum/campaign_asset/bonus_job/colonial_militia].attempt_activatation(attacking_team.faction_leader, TRUE) + + /datum/campaign_mission/destroy_mission/base_rescue/apply_major_victory() . = ..() - var/datum/faction_stats/winning_team = mode.stat_list[starting_faction] + var/datum/faction_stats/winning_team = mode.stat_list[defending_faction] winning_team.add_asset(/datum/campaign_asset/bonus_job/pmc) winning_team.add_asset(/datum/campaign_asset/attrition_modifier/corporate_approval) /datum/campaign_mission/destroy_mission/base_rescue/apply_minor_victory() . = ..() - var/datum/faction_stats/winning_team = mode.stat_list[starting_faction] + var/datum/faction_stats/winning_team = mode.stat_list[defending_faction] winning_team.add_asset(/datum/campaign_asset/bonus_job/pmc) /datum/campaign_mission/destroy_mission/base_rescue/apply_minor_loss() . = ..() - var/datum/faction_stats/winning_team = mode.stat_list[hostile_faction] + var/datum/faction_stats/winning_team = mode.stat_list[attacking_faction] winning_team.add_asset(/datum/campaign_asset/bonus_job/colonial_militia) /datum/campaign_mission/destroy_mission/base_rescue/apply_major_loss() . = ..() - var/datum/faction_stats/winning_team = mode.stat_list[hostile_faction] + var/datum/faction_stats/winning_team = mode.stat_list[attacking_faction] winning_team.add_asset(/datum/campaign_asset/bonus_job/colonial_militia) winning_team.add_asset(/datum/campaign_asset/attrition_modifier/local_approval) @@ -103,6 +120,15 @@ map_text_broadcast(attacking_faction, message_to_play, "[color] override broadcast", /atom/movable/screen/text/screen_text/picture/potrait/unknown) map_text_broadcast(defending_faction, message_to_play, "[color] override broadcast", /atom/movable/screen/text/screen_text/picture/potrait/unknown) +///Code computer is actively running a segment +/datum/campaign_mission/destroy_mission/base_rescue/proc/computer_running(datum/source, obj/machinery/computer/nt_access/code_computer) + SIGNAL_HANDLER + pause_mission_timer(REF(code_computer)) + +///Code computer stops running a segment +/datum/campaign_mission/destroy_mission/base_rescue/proc/computer_stop_running(datum/source, obj/machinery/computer/nt_access/code_computer) + SIGNAL_HANDLER + resume_mission_timer(REF(code_computer)) /obj/effect/landmark/campaign_structure/weapon_x name = "weapon X spawner" @@ -140,13 +166,14 @@ return ..() /obj/structure/weapon_x_pod/update_icon_state() + . = ..() if(occupant) icon_state = initial(icon_state) else icon_state = "[initial(icon_state)]_open" -/obj/structure/weapon_x_pod/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) - if(X != occupant) +/obj/structure/weapon_x_pod/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) + if(xeno_attacker != occupant) return release_occupant() diff --git a/code/datums/gamemodes/campaign/missions/destroy_mission.dm b/code/datums/gamemodes/campaign/missions/destroy_mission.dm index 99445561bbdd6..13d541a36d861 100644 --- a/code/datums/gamemodes/campaign/missions/destroy_mission.dm +++ b/code/datums/gamemodes/campaign/missions/destroy_mission.dm @@ -101,7 +101,7 @@ if(mode.stat_list[attacking_faction].active_attrition_points) return FALSE //attacking team still has more bodies to throw into the fight var/list/player_list = count_humans(count_flags = COUNT_IGNORE_ALIVE_SSD) - if(length(player_list[attacking_faction == starting_faction ? 1 : 3])) + if(length(player_list[attacking_faction == starting_faction ? 1 : 2])) return FALSE //attacking team still has living guys if(min_destruction_amount && objectives_destroyed >= min_destruction_amount) //Destroyed at least the minimum required diff --git a/code/datums/gamemodes/campaign/missions/fire_support_raid.dm b/code/datums/gamemodes/campaign/missions/fire_support_raid.dm index fe806aceb2fd9..ef1943b6e9213 100644 --- a/code/datums/gamemodes/campaign/missions/fire_support_raid.dm +++ b/code/datums/gamemodes/campaign/missions/fire_support_raid.dm @@ -3,11 +3,13 @@ name = "Fire support raid" mission_icon = "mortar_raid" mission_flags = MISSION_DISALLOW_DROPPODS - map_name = "Jungle outpost SR-422" + map_name = "Jungle Outpost SR-422" map_file = '_maps/map_files/Campaign maps/jungle_outpost/jungle_outpost.dmm' map_traits = list(ZTRAIT_AWAY = TRUE, ZTRAIT_RAIN = TRUE) map_light_colours = list(LIGHT_COLOR_PALE_GREEN, LIGHT_COLOR_PALE_GREEN, LIGHT_COLOR_PALE_GREEN, LIGHT_COLOR_PALE_GREEN) - objectives_total = 10 + max_game_time = 10 MINUTES + game_timer_delay = 90 SECONDS + objectives_total = 9 min_destruction_amount = 7 shutter_open_delay = list( MISSION_STARTING_FACTION = 90 SECONDS, @@ -43,6 +45,12 @@ for(var/i = 1 to objectives_total) new /obj/item/storage/box/explosive_mines(get_turf(pick(GLOB.campaign_reward_spawners[defending_faction]))) + var/datum/faction_stats/attacking_team = mode.stat_list[starting_faction] + if(starting_faction == FACTION_TERRAGOV) + attacking_team.add_asset(/datum/campaign_asset/asset_disabler/tgmc_cas/instant) + else if(starting_faction == FACTION_SOM) + attacking_team.add_asset(/datum/campaign_asset/asset_disabler/som_cas/instant) + /datum/campaign_mission/destroy_mission/fire_support_raid/load_mission_brief() starting_faction_mission_brief = "A [hostile_faction] fire support position has been identified in this area. This key location provides fire support to [hostile_faction] forces across the region. \ By destroying this outpost we can silence their guns and greatly weaken the enemy's forces. \ @@ -95,6 +103,6 @@ map_traits = list(ZTRAIT_AWAY = TRUE) map_light_colours = list(COLOR_MISSION_RED, COLOR_MISSION_RED, COLOR_MISSION_RED, COLOR_MISSION_RED) map_light_levels = list(225, 150, 100, 75) - objectives_total = 8 - min_destruction_amount = 6 + objectives_total = 5 + min_destruction_amount = 4 hostile_faction_additional_rewards = "Protect our fire support options to ensure continued access to mortar support. Combat robots and fire support is available if you successfully defend this outpost." diff --git a/code/datums/gamemodes/campaign/missions/mech_wars.dm b/code/datums/gamemodes/campaign/missions/mech_wars.dm index 9c34a2a8ac380..558bb7b7d6eb5 100644 --- a/code/datums/gamemodes/campaign/missions/mech_wars.dm +++ b/code/datums/gamemodes/campaign/missions/mech_wars.dm @@ -9,7 +9,7 @@ map_light_levels = list(225, 150, 100, 75) starting_faction_objective_description = "Major Victory: Wipe out all hostiles in the area of operation. Minor Victory: Eliminate more hostiles than you lose." hostile_faction_objective_description = "Major Victory: Wipe out all hostiles in the area of operation. Minor Victory: Eliminate more hostiles than you lose." - mission_start_delay = 5 MINUTES //since there is actual mech prep time required + mission_start_delay = 3 MINUTES //since there is actual mech prep time required starting_faction_additional_rewards = "Mechanised units will be allocated to your battalion for use in future missions." hostile_faction_additional_rewards = "Mechanised units will be allocated to your battalion for use in future missions." @@ -39,7 +39,7 @@ spawner = pick(GLOB.campaign_mech_spawners[faction]) new_mech = spawner.spawn_mech() GLOB.campaign_structures += new_mech - RegisterSignal(new_mech, COMSIG_QDELETING, TYPE_PROC_REF(/datum/campaign_mission, remove_mission_object)) + RegisterSignal(new_mech, COMSIG_QDELETING, PROC_REF(on_mech_destruction)) //anti mech infantry weapons if(i % 2) @@ -75,54 +75,16 @@ winning_team.add_asset(/datum/campaign_asset/mech/heavy/som) winning_team.add_asset(/datum/campaign_asset/mech/som) -//mech spawn points -/obj/effect/landmark/campaign/mech_spawner - name = "tgmc med mech spawner" - icon_state = "mech" - var/faction = FACTION_TERRAGOV - var/list/colors = list(ARMOR_PALETTE_SPACE_CADET, ARMOR_PALETTE_GREYISH_TURQUOISE, VISOR_PALETTE_MAGENTA) - var/obj/vehicle/sealed/mecha/combat/greyscale/mech_type = /obj/vehicle/sealed/mecha/combat/greyscale/assault/noskill - -/obj/effect/landmark/campaign/mech_spawner/Initialize(mapload) - . = ..() - GLOB.campaign_mech_spawners[faction] += list(src) - -/obj/effect/landmark/campaign/mech_spawner/Destroy() - GLOB.campaign_mech_spawners[faction] -= src - return ..() - -/obj/effect/landmark/campaign/mech_spawner/proc/spawn_mech() - var/obj/vehicle/sealed/mecha/combat/greyscale/new_mech = new mech_type(loc) - for(var/i in new_mech.limbs) - var/datum/mech_limb/limb = new_mech.limbs[i] - limb.update_colors(arglist(colors)) - new_mech.update_icon() - return new_mech - -/obj/effect/landmark/campaign/mech_spawner/heavy - name = "tgmc heavy mech spawner" - icon_state = "mech_heavy" - mech_type = /obj/vehicle/sealed/mecha/combat/greyscale/vanguard/noskill - -/obj/effect/landmark/campaign/mech_spawner/light - name = "tgmc light mech spawner" - icon_state = "mech_light" - mech_type = /obj/vehicle/sealed/mecha/combat/greyscale/recon/noskill - -/obj/effect/landmark/campaign/mech_spawner/som - name = "som med mech spawner" - faction = FACTION_SOM - colors = list(ARMOR_PALETTE_GINGER, ARMOR_PALETTE_BLACK, VISOR_PALETTE_SYNDIE_GREEN) - -/obj/effect/landmark/campaign/mech_spawner/som/heavy - name = "som heavy mech spawner" - icon_state = "mech_heavy" - mech_type = /obj/vehicle/sealed/mecha/combat/greyscale/vanguard/noskill - -/obj/effect/landmark/campaign/mech_spawner/som/light - name = "som light mech spawner" - icon_state = "mech_light" - mech_type = /obj/vehicle/sealed/mecha/combat/greyscale/recon/noskill +///Cleans up after a mech is destroyed +/datum/campaign_mission/tdm/mech_wars/proc/on_mech_destruction(obj/vehicle/sealed/mecha/combat/greyscale/dead_mech) + SIGNAL_HANDLER + remove_mission_object(dead_mech) + if(outcome) + return + if(dead_mech.faction == hostile_faction) + start_team_cap_points += 10 + else if(dead_mech.faction == starting_faction) + hostile_team_cap_points += 10 /datum/campaign_mission/tdm/mech_wars/som name = "Mech war" diff --git a/code/datums/gamemodes/campaign/missions/patrol_mission.dm b/code/datums/gamemodes/campaign/missions/patrol_mission.dm index 0cb5f18bcd12c..62306fc261272 100644 --- a/code/datums/gamemodes/campaign/missions/patrol_mission.dm +++ b/code/datums/gamemodes/campaign/missions/patrol_mission.dm @@ -9,7 +9,7 @@ starting_faction_objective_description = "Major Victory: Wipe out all hostiles in the AO or capture and hold the sensor towers for a points victory. Minor Victory: Eliminate more hostiles than you lose." hostile_faction_objective_description = "Major Victory: Wipe out all hostiles in the AO or capture and hold the sensor towers for a points victory. Minor Victory: Eliminate more hostiles than you lose." max_game_time = 15 MINUTES - game_timer_delay = 5 MINUTES + game_timer_delay = 3 MINUTES victory_point_rewards = list( MISSION_OUTCOME_MAJOR_VICTORY = list(2, 0), MISSION_OUTCOME_MINOR_VICTORY = list(1, 0), @@ -35,40 +35,6 @@ starting_faction_additional_rewards = "If the enemy force is wiped out entirely, additional supplies can be diverted to your battalion." hostile_faction_additional_rewards = "If the enemy force is wiped out entirely, additional supplies can be diverted to your battalion." - major_victory_reward_table = list( - /obj/effect/supply_drop/medical_basic = 7, - /obj/effect/supply_drop/marine_sentry = 5, - /obj/effect/supply_drop/recoilless_rifle = 3, - /obj/effect/supply_drop/armor_upgrades = 5, - /obj/effect/supply_drop/mmg = 4, - /obj/effect/supply_drop/zx_shotgun = 3, - /obj/effect/supply_drop/minigun = 3, - /obj/effect/supply_drop/scout = 3, - ) - minor_victory_reward_table = list( - /obj/effect/supply_drop/medical_basic = 7, - /obj/effect/supply_drop/marine_sentry = 5, - /obj/effect/supply_drop/recoilless_rifle = 3, - /obj/effect/supply_drop/armor_upgrades = 5, - /obj/effect/supply_drop/mmg = 4, - ) - minor_loss_reward_table = list( - /obj/effect/supply_drop/medical_basic = 7, - /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/cope = 5, - /obj/effect/supply_drop/som_rpg = 3, - /obj/effect/supply_drop/som_armor_upgrades = 5, - /obj/effect/supply_drop/charger = 4, - ) - major_loss_reward_table = list( - /obj/effect/supply_drop/medical_basic = 7, - /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/cope = 5, - /obj/effect/supply_drop/som_rpg = 3, - /obj/effect/supply_drop/som_armor_upgrades = 5, - /obj/effect/supply_drop/charger = 4, - /obj/effect/supply_drop/culverin = 3, - /obj/effect/supply_drop/blink_kit = 3, - /obj/effect/supply_drop/som_shotgun_burst = 3, - ) ///Point limit to win the game via objectives var/capture_point_target = 400 ///starting team's point count @@ -81,6 +47,7 @@ RegisterSignal(SSdcs, COMSIG_GLOB_CAMPAIGN_CAPTURE_OBJECTIVE_CAPTURED, PROC_REF(objective_captured)) RegisterSignal(SSdcs, COMSIG_GLOB_CAMPAIGN_CAPTURE_OBJECTIVE_CAP_STARTED, PROC_REF(objective_cap_started)) + /datum/campaign_mission/tdm/unregister_mission_signals() . = ..() UnregisterSignal(SSdcs, list(COMSIG_GLOB_CAMPAIGN_CAPTURE_OBJECTIVE_CAPTURED, COMSIG_GLOB_CAMPAIGN_CAPTURE_OBJECTIVE_CAP_STARTED)) @@ -90,7 +57,7 @@ MISSION_STARTING_FACTION = "[map_name]
" + "[GAME_YEAR]-[time2text(world.realtime, "MM-DD")] [stationTimestamp("hh:mm")]
" + "Eliminate all [hostile_faction] resistance in the AO. Reinforcements are limited so preserve your forces as best you can. Good hunting!", MISSION_HOSTILE_FACTION = "[map_name]
" + "[GAME_YEAR]-[time2text(world.realtime, "MM-DD")] [stationTimestamp("hh:mm")]
" + "Eliminate all [starting_faction] resistance in the AO. Reinforcements are limited so preserve your forces as best you can. Good hunting!", ) - . = ..() + return ..() /datum/campaign_mission/tdm/get_status_tab_items(mob/source, list/items) . = ..() @@ -215,20 +182,21 @@ map_text_broadcast(losing_team, "[objective] was activated by the enemy. Get it offline!", "Activation cancelled") ///test missions -/datum/campaign_mission/tdm/lv624 +/datum/campaign_mission/tdm/orion name = "Combat patrol 2" - map_name = "Orion outpost" + map_name = "Orion Outpost" map_file = '_maps/map_files/Orion_Military_Outpost/orionoutpost.dmm' map_light_colours = list(COLOR_MISSION_YELLOW, COLOR_MISSION_YELLOW, COLOR_MISSION_YELLOW, COLOR_MISSION_YELLOW) map_light_levels = list(225, 150, 100, 75) /datum/campaign_mission/tdm/first_mission name = "First Contact" - map_name = "Jungle outpost SR-422" + map_name = "Jungle Outpost SR-422" map_file = '_maps/map_files/Campaign maps/jungle_outpost/jungle_outpost.dmm' map_traits = list(ZTRAIT_AWAY = TRUE, ZTRAIT_RAIN = TRUE) map_light_colours = list(LIGHT_COLOR_PALE_GREEN, LIGHT_COLOR_PALE_GREEN, LIGHT_COLOR_PALE_GREEN, LIGHT_COLOR_PALE_GREEN) map_light_levels = list(200, 100, 75, 50) + mission_start_delay = 3 MINUTES /datum/campaign_mission/tdm/first_mission/end_mission() . = ..() diff --git a/code/datums/gamemodes/campaign/missions/phoron_capture.dm b/code/datums/gamemodes/campaign/missions/phoron_capture.dm index 82e948d4e5054..9fb6074dfffe0 100644 --- a/code/datums/gamemodes/campaign/missions/phoron_capture.dm +++ b/code/datums/gamemodes/campaign/missions/phoron_capture.dm @@ -2,7 +2,7 @@ /datum/campaign_mission/capture_mission/phoron_capture name = "Phoron retrieval" mission_icon = "phoron_raid" - map_name = "Jungle outpost SR-422" + map_name = "Jungle Outpost SR-422" map_file = '_maps/map_files/Campaign maps/jungle_outpost/jungle_outpost.dmm' map_traits = list(ZTRAIT_AWAY = TRUE, ZTRAIT_RAIN = TRUE) map_light_colours = list(LIGHT_COLOR_PALE_GREEN, LIGHT_COLOR_PALE_GREEN, LIGHT_COLOR_PALE_GREEN, LIGHT_COLOR_PALE_GREEN) diff --git a/code/datums/gamemodes/campaign/missions/raiding_base.dm b/code/datums/gamemodes/campaign/missions/raiding_base.dm index d035a7e3c4a34..e68fba26316a4 100644 --- a/code/datums/gamemodes/campaign/missions/raiding_base.dm +++ b/code/datums/gamemodes/campaign/missions/raiding_base.dm @@ -1,97 +1,180 @@ -//placeholder /datum/campaign_mission/raiding_base - name = "Combat patrol" + name = "Raiding Base" mission_icon = "raiding_base" - map_name = "Orion Outpost" - map_file = '_maps/map_files/Campaign maps/jungle_outpost/jungle_outpost.dmm' - starting_faction_objective_description = null - hostile_faction_objective_description = null - max_game_time = 20 MINUTES + map_name = "Raiding base Zulu" + map_file = '_maps/map_files/Campaign maps/som_raid_base/som_raiding_base.dmm' + map_traits = list(ZTRAIT_AWAY = TRUE, ZTRAIT_RAIN = TRUE) + map_light_colours = list(LIGHT_COLOR_PALE_GREEN, LIGHT_COLOR_PALE_GREEN, COLOR_MISSION_RED, COLOR_MISSION_RED) + starting_faction_objective_description = "Major Victory: Set and defend an orbital beacon inside the facility until a precision orbital strike can be called in." + hostile_faction_objective_description = "Major Victory: Prevent the enemy from activating an orbital beacon inside the facility." + intro_message = list( + MISSION_STARTING_FACTION = "Infiltrate the SOM base, then plant and defend an orbital beacon until we can drop the hammer on them from orbit!", + MISSION_HOSTILE_FACTION = "Stop TGMC forces from infiltrating the base. Prevent them from activating an orbital beacon at all costs!", + ) + mission_flags = MISSION_DISALLOW_DROPPODS + max_game_time = 12 MINUTES + mission_start_delay = 90 SECONDS + shutter_open_delay = list( + MISSION_STARTING_FACTION = 90 SECONDS, + MISSION_HOSTILE_FACTION = 0, + ) victory_point_rewards = list( - MISSION_OUTCOME_MAJOR_VICTORY = list(3, 0), + MISSION_OUTCOME_MAJOR_VICTORY = list(2, 0), MISSION_OUTCOME_MINOR_VICTORY = list(1, 0), MISSION_OUTCOME_DRAW = list(0, 0), MISSION_OUTCOME_MINOR_LOSS = list(0, 1), - MISSION_OUTCOME_MAJOR_LOSS = list(0, 3), + MISSION_OUTCOME_MAJOR_LOSS = list(0, 2), ) attrition_point_rewards = list( - MISSION_OUTCOME_MAJOR_VICTORY = list(20, 5), - MISSION_OUTCOME_MINOR_VICTORY = list(15, 10), - MISSION_OUTCOME_DRAW = list(10, 10), - MISSION_OUTCOME_MINOR_LOSS = list(10, 15), - MISSION_OUTCOME_MAJOR_LOSS = list(5, 20), + MISSION_OUTCOME_MAJOR_VICTORY = list(20, 20), + MISSION_OUTCOME_MINOR_VICTORY = list(0, 0), + MISSION_OUTCOME_DRAW = list(0, 0), + MISSION_OUTCOME_MINOR_LOSS = list(0, 0), + MISSION_OUTCOME_MAJOR_LOSS = list(10, 30), ) - starting_faction_mission_brief = null - hostile_faction_mission_brief = null - starting_faction_additional_rewards = null - hostile_faction_additional_rewards = null - -/datum/campaign_mission/raiding_base/play_start_intro() - intro_message = list( - MISSION_STARTING_FACTION = "[map_name]
" + "[GAME_YEAR]-[time2text(world.realtime, "MM-DD")] [stationTimestamp("hh:mm")]
" + "Eliminate all [hostile_faction] resistance in the AO. Reinforcements are limited so preserve your forces as best you can. Good hunting!", - MISSION_HOSTILE_FACTION = "[map_name]
" + "[GAME_YEAR]-[time2text(world.realtime, "MM-DD")] [stationTimestamp("hh:mm")]
" + "Eliminate all [starting_faction] resistance in the AO. Reinforcements are limited so preserve your forces as best you can. Good hunting!", + starting_faction_mission_brief = "We have finally been able to track down a hidden SOM outpost which they have been using as a base of operations to raid our supply lines, wrecking havoc on our logistics. \ + Your unit has been tasked with ensuring the complete and utter destruction of this base and everything within it. \ + Infiltrate the facility, then deploy one of the orbital beacons you have been supplied with. \ + Defend the beacon until the TGS Horizon can secure a target lock and deploy a thermobaric bunker buster to wipe the outpost off the face of the planet." + hostile_faction_mission_brief = "Intelligence has picked up a TGMC plan to assault Raiding base Zulu. This base has been key to our sabotage and disruption efforts, significantly degrading TGMC supply lines. \ + Intel suggests that the TGMC are seeking to infiltrate the base to deploy a orbital beacon, in order to call down an orbital strike. \ + Prevent TGMC forces from entering the base, and destroy any orbital beacon they try to deploy." + starting_faction_additional_rewards = "Remove negative effects on our logistics" + hostile_faction_additional_rewards = "Allow us to continue degrading TGMC logistics" + outro_message = list( + MISSION_OUTCOME_MAJOR_VICTORY = list( + MISSION_STARTING_FACTION = "Major victory
Confirming good hit. Successful destruction of target facility. Outstanding marines!", + MISSION_HOSTILE_FACTION = "Major loss
We've lost Zulu, any survivors, fallback to exfil point Charlie, retreat!", + ), + MISSION_OUTCOME_MAJOR_LOSS = list( + MISSION_STARTING_FACTION = "Major loss
SOM interceptors are inbound, all forces fallback, this operation is a loss.", + MISSION_HOSTILE_FACTION = "Major victory
Reinforcements are almost here and enemy forces are falling back, you've done Mars proud today marines.", + ), ) + ///Records whether the OB has been called + var/ob_called = FALSE + ///Count of beacons still in play + var/beacons_remaining = 4 + +/datum/campaign_mission/raiding_base/get_status_tab_items(mob/source, list/items) . = ..() + items += "Beacons remaining: [beacons_remaining]" + +/datum/campaign_mission/raiding_base/load_pre_mission_bonuses() + spawn_mech(starting_faction, 0, 0, 3) + spawn_mech(hostile_faction, 0, 2) + new /obj/item/storage/box/crate/loot/materials_pack(get_turf(pick(GLOB.campaign_reward_spawners[hostile_faction]))) + for(var/i = 1 to beacons_remaining) + new /obj/item/explosive/plastique(get_turf(pick(GLOB.campaign_reward_spawners[hostile_faction]))) + new /obj/item/explosive/plastique(get_turf(pick(GLOB.campaign_reward_spawners[hostile_faction]))) + new /obj/item/campaign_beacon/bunker_buster(get_turf(pick(GLOB.campaign_reward_spawners[starting_faction]))) + +/datum/campaign_mission/raiding_base/start_mission() + . = ..() + RegisterSignal(SSdcs, COMSIG_GLOB_CAMPAIGN_OB_BEACON_ACTIVATION, PROC_REF(beacon_placed)) + RegisterSignal(SSdcs, COMSIG_GLOB_CAMPAIGN_OB_BEACON_TRIGGERED, PROC_REF(beacon_triggered)) /datum/campaign_mission/raiding_base/check_mission_progress() if(outcome) return TRUE if(!game_timer) - return + return FALSE - ///pulls the number of both factions, dead or alive - var/list/player_list = count_humans(count_flags = COUNT_IGNORE_ALIVE_SSD) - var/num_team_one = length(player_list[1]) - var/num_team_two = length(player_list[2]) - var/num_dead_team_one = length(player_list[3]) - var/num_dead_team_two = length(player_list[4]) - - if(num_team_two && num_team_one && !max_time_reached) - return //fighting is ongoing - - //major victor for wiping out the enemy, or draw if both sides wiped simultaneously somehow - if(!num_team_two) - if(!num_team_one) - message_admins("Mission finished: [MISSION_OUTCOME_DRAW]") //everyone died at the same time, no one wins - outcome = MISSION_OUTCOME_DRAW - return TRUE - message_admins("Mission finished: [MISSION_OUTCOME_MAJOR_VICTORY]") //starting team wiped the hostile team + if(ob_called) + message_admins("Mission finished: [MISSION_OUTCOME_MAJOR_VICTORY]") //Attackers dropped the hammer outcome = MISSION_OUTCOME_MAJOR_VICTORY return TRUE - if(!num_team_one) - message_admins("Mission finished: [MISSION_OUTCOME_MAJOR_LOSS]") //hostile team wiped the starting team - outcome = MISSION_OUTCOME_MAJOR_LOSS - return TRUE + var/attacker_lost - //minor victories for more kills or draw for equal kills - if(num_dead_team_two > num_dead_team_one) - message_admins("Mission finished: [MISSION_OUTCOME_MINOR_VICTORY]") //starting team got more kills - outcome = MISSION_OUTCOME_MINOR_VICTORY - return TRUE - if(num_dead_team_one > num_dead_team_two) - message_admins("Mission finished: [MISSION_OUTCOME_MINOR_LOSS]") //hostile team got more kills - outcome = MISSION_OUTCOME_MINOR_LOSS - return TRUE + if(!length(GLOB.campaign_objectives) || max_time_reached) + attacker_lost = TRUE + else + var/list/player_list = count_humans(count_flags = COUNT_IGNORE_ALIVE_SSD) + var/num_team_one = length(player_list[1]) + var/datum/faction_stats/attacker_stats = mode.stat_list[starting_faction] + if(!num_team_one && !attacker_stats.active_attrition_points) + attacker_lost = TRUE - message_admins("Mission finished: [MISSION_OUTCOME_DRAW]") //equal number of kills, or any other edge cases - outcome = MISSION_OUTCOME_DRAW + if(!attacker_lost) + return FALSE + message_admins("Mission finished: [MISSION_OUTCOME_MAJOR_LOSS]") //Attackers run out of beacons, time or bodies + outcome = MISSION_OUTCOME_MAJOR_LOSS return TRUE -//todo: remove these if nothing new is added -/datum/campaign_mission/raiding_base/apply_major_victory() +/datum/campaign_mission/raiding_base/unregister_mission_signals() . = ..() + UnregisterSignal(SSdcs, list(COMSIG_GLOB_CAMPAIGN_OB_BEACON_ACTIVATION, COMSIG_GLOB_CAMPAIGN_OB_BEACON_TRIGGERED)) -/datum/campaign_mission/raiding_base/apply_minor_victory() +/datum/campaign_mission/raiding_base/apply_major_victory() . = ..() + winning_faction = starting_faction + var/datum/faction_stats/winning_team = mode.stat_list[starting_faction] + winning_team.remove_asset(/datum/campaign_asset/attrition_modifier/malus_strong) + winning_team.remove_asset(/datum/campaign_asset/attrition_modifier/malus_standard) + //We don't have enough missions in the pool yet to activate this + //GLOB.campaign_mission_pool[hostile_faction] -= /datum/campaign_mission/destroy_mission/supply_raid/som + //GLOB.campaign_mission_pool[hostile_faction] -= /datum/campaign_mission/destroy_mission/supply_raid -/datum/campaign_mission/raiding_base/apply_draw() - winning_faction = pick(starting_faction, hostile_faction) - -/datum/campaign_mission/raiding_base/apply_minor_loss() - . = ..() /datum/campaign_mission/raiding_base/apply_major_loss() . = ..() + winning_faction = hostile_faction + var/datum/faction_stats/winning_team = mode.stat_list[hostile_faction] + if(hostile_faction == FACTION_TERRAGOV) + winning_team.add_asset(/datum/campaign_asset/equipment/power_armor) + else if(hostile_faction == FACTION_SOM) + winning_team.add_asset(/datum/campaign_asset/mech/light/som) + winning_team.add_asset(/datum/campaign_asset/equipment/gorgon_armor) + +///Returns a list of areas in which the beacon can be deployed +/datum/campaign_mission/raiding_base/proc/get_valid_beacon_areas() + return list( + /area/campaign/som_raiding/outpost/command, + /area/campaign/som_raiding/outpost/command/captain, + /area/campaign/som_raiding/outpost/command/telecom, + /area/campaign/som_raiding/outpost/command/cic, + /area/campaign/som_raiding/outpost/command/north, + /area/campaign/som_raiding/outpost/command/living, + /area/campaign/som_raiding/outpost/medbay, + /area/campaign/som_raiding/outpost/central_corridor, + ) + +///Reacts to an OB beacon being successfully triggered +/datum/campaign_mission/raiding_base/proc/beacon_placed(datum/source, obj/structure/campaign_objective/destruction_objective/bunker_buster/beacon) + SIGNAL_HANDLER + RegisterSignal(beacon, COMSIG_QDELETING, PROC_REF(beacon_destroyed)) + pause_mission_timer(REF(beacon)) + var/area/deployed_area = get_area(beacon) + map_text_broadcast(starting_faction, "Confirming beacon deployed in [deployed_area]. Defend it until we can secure a target lock marines!", "TGS Horizon", /atom/movable/screen/text/screen_text/picture/potrait/pod_officer, "sound/effects/alert.ogg") + map_text_broadcast(hostile_faction, "Orbital beacon detected in [deployed_area]. Destroy that beacon before they can secure a target lock!", "Overwatch", sound_effect = "sound/effects/alert.ogg") + +///Handles a beacon being destroyed. Separate from normal objective destruction for convenience as we want the specific beacon ref +/datum/campaign_mission/raiding_base/proc/beacon_destroyed(obj/structure/campaign_objective/destruction_objective/bunker_buster/beacon) + SIGNAL_HANDLER + UnregisterSignal(beacon, COMSIG_QDELETING) + resume_mission_timer(REF(beacon)) + beacons_remaining -- + if(outcome) + return + var/beacons_destroyed = initial(beacons_remaining) - beacons_remaining + map_text_broadcast(starting_faction, "We've lost [beacons_destroyed] beacon[beacons_destroyed > 1 ? "s" : null], get it together!", "Overwatch") + map_text_broadcast(hostile_faction, "[beacons_destroyed] beacon[beacons_destroyed > 1 ? "s" : null] destroyed, keep up the good work!", "Overwatch") + +///Reacts to an OB beacon being successfully triggered +/datum/campaign_mission/raiding_base/proc/beacon_triggered(datum/source, obj/structure/campaign_objective/destruction_objective/bunker_buster/beacon, activation_delay) + SIGNAL_HANDLER + pause_mission_timer() //stops the game from ending if it comes down to the wire + addtimer(CALLBACK(src, PROC_REF(beacon_effect), beacon, beacon.loc), activation_delay) + +///Handles the actual detonation effects +/datum/campaign_mission/raiding_base/proc/beacon_effect(obj/structure/campaign_objective/destruction_objective/bunker_buster/beacon, turf/location) + ob_called = TRUE + resume_mission_timer(src, TRUE) + //We handle this here instead of the beacon structure because it could be destroyed before this triggers + explosion(location, 45, flame_range = 45) + if(QDELETED(beacon)) + return + qdel(beacon) diff --git a/code/datums/gamemodes/campaign/missions/supply_raid.dm b/code/datums/gamemodes/campaign/missions/supply_raid.dm index 3ceb9bea15922..45b1843d8f4de 100644 --- a/code/datums/gamemodes/campaign/missions/supply_raid.dm +++ b/code/datums/gamemodes/campaign/missions/supply_raid.dm @@ -3,7 +3,7 @@ name = "Supply Depot raid" mission_icon = "supply_depot" mission_flags = MISSION_DISALLOW_DROPPODS - map_name = "Rocinante base" + map_name = "Rocinante Base" map_file = '_maps/map_files/Campaign maps/som_base/sombase.dmm' map_traits = list(ZTRAIT_AWAY = TRUE, ZTRAIT_SNOWSTORM = TRUE) map_light_colours = list(COLOR_MISSION_BLUE, COLOR_MISSION_BLUE, COLOR_MISSION_BLUE, COLOR_MISSION_BLUE) @@ -45,6 +45,11 @@ /datum/campaign_mission/destroy_mission/supply_raid/load_pre_mission_bonuses() . = ..() spawn_mech(defending_faction, 0, 1) + var/datum/faction_stats/attacking_team = mode.stat_list[starting_faction] + if(starting_faction == FACTION_TERRAGOV) + attacking_team.add_asset(/datum/campaign_asset/asset_disabler/tgmc_cas/instant) + else if(starting_faction == FACTION_SOM) + attacking_team.add_asset(/datum/campaign_asset/asset_disabler/som_cas/instant) /datum/campaign_mission/destroy_mission/supply_raid/apply_major_victory() winning_faction = starting_faction @@ -62,7 +67,7 @@ if(hostile_faction == FACTION_TERRAGOV) winning_team.add_asset(/datum/campaign_asset/equipment/power_armor) else if(hostile_faction == FACTION_SOM) - winning_team.add_asset(/obj/effect/landmark/campaign/mech_spawner/som/light) + winning_team.add_asset(/datum/campaign_asset/mech/light/som) winning_team.add_asset(/datum/campaign_asset/equipment/gorgon_armor) /datum/campaign_mission/destroy_mission/supply_raid/apply_major_loss() @@ -71,16 +76,16 @@ if(hostile_faction == FACTION_TERRAGOV) winning_team.add_asset(/datum/campaign_asset/equipment/power_armor) else if(hostile_faction == FACTION_SOM) - winning_team.add_asset(/obj/effect/landmark/campaign/mech_spawner/som/light) + winning_team.add_asset(/datum/campaign_asset/mech/light/som) winning_team.add_asset(/datum/campaign_asset/equipment/gorgon_armor) /datum/campaign_mission/destroy_mission/supply_raid/som mission_flags = MISSION_DISALLOW_TELEPORT - map_name = "Orion outpost" + map_name = "Orion Outpost" map_file = '_maps/map_files/Campaign maps/orion_2/orionoutpost_2.dmm' map_light_colours = list(COLOR_MISSION_RED, COLOR_MISSION_RED, COLOR_MISSION_RED, COLOR_MISSION_RED) map_traits = list(ZTRAIT_AWAY = TRUE) map_light_levels = list(225, 150, 100, 75) objectives_total = 8 - min_destruction_amount = 5 + min_destruction_amount = 6 hostile_faction_additional_rewards = "Prevent the degradation of our attrition generation. B18 power armour available if you successfully protect this depot." diff --git a/code/datums/gamemodes/campaign/outfit_holder.dm b/code/datums/gamemodes/campaign/outfit_holder.dm new file mode 100644 index 0000000000000..97f6233f440c7 --- /dev/null +++ b/code/datums/gamemodes/campaign/outfit_holder.dm @@ -0,0 +1,138 @@ +//holds a record of loadout_item datums, and the actual loadout itself +/datum/outfit_holder + var/role + ///Assoc list of loadout_items by slot + var/list/datum/loadout_item/equipped_things = list() + ///The actual loadout to be equipped + var/datum/outfit/quick/loadout + ///Cost of the loadout to equip + var/loadout_cost = 0 + ///Items available to be equipped + var/list/list/datum/loadout_item/available_list = list() + ///Items available to be purchased + var/list/list/datum/loadout_item/purchasable_list = list() + +/datum/outfit_holder/New(new_role) + . = ..() + role = new_role + loadout = new /datum/outfit/quick + for(var/slot in GLOB.campaign_loadout_slots) + available_list["[slot]"] = list() + purchasable_list["[slot]"] = list() + for(var/datum/loadout_item/loadout_item AS in GLOB.campaign_loadout_items_by_role[role]) + if(!loadout_item.name) //various parent types + continue + if(loadout_item.item_slot != slot) + continue + if(loadout_item.loadout_item_flags & LOADOUT_ITEM_DEFAULT_CHOICE) + equip_loadout_item(loadout_item) + if(loadout_item.loadout_item_flags & LOADOUT_ITEM_ROUNDSTART_OPTION) + available_list["[loadout_item.item_slot]"] += loadout_item + continue + if(loadout_item.loadout_item_flags & LOADOUT_ITEM_ROUNDSTART_UNLOCKABLE) + purchasable_list["[loadout_item.item_slot]"] += loadout_item + +/datum/outfit_holder/Destroy(force, ...) + equipped_things = null + available_list = null + purchasable_list = null + QDEL_NULL(loadout) + return ..() + +///Equips the loadout to a mob +/datum/outfit_holder/proc/equip_loadout(mob/living/carbon/human/owner) + loadout.equip(owner) + for(var/slot in equipped_things) + var/datum/loadout_item/thing_to_check = equipped_things["[slot]"] + if(!thing_to_check) + continue + if(thing_to_check.quantity > 0) + thing_to_check.quantity -- + thing_to_check.post_equip(owner, loadout) + +///Adds a new loadout_item to the available list +/datum/outfit_holder/proc/unlock_new_option(datum/loadout_item/new_item) + available_list["[new_item.item_slot]"] |= new_item + purchasable_list["[new_item.item_slot]"] -= new_item + +///Adds a new loadout_item to the purchasable list +/datum/outfit_holder/proc/allow_new_option(datum/loadout_item/new_item) + if(!istype(new_item)) + return + if(new_item in purchasable_list["[new_item.item_slot]"]) + return + if(new_item in available_list["[new_item.item_slot]"]) + return + purchasable_list["[new_item.item_slot]"] += new_item + +///Removes loadout_item entirely from being equipped +/datum/outfit_holder/proc/remove_option(datum/loadout_item/removed_item) + if(!istype(removed_item)) + return + var/removed_item_slot = "[removed_item.item_slot]" + available_list[removed_item_slot] -= removed_item + purchasable_list[removed_item_slot] -= removed_item + if(equipped_things[removed_item_slot] == removed_item) + equip_loadout_item(available_list[removed_item_slot][1]) + return TRUE + +///Tries to add a datum if valid +/datum/outfit_holder/proc/attempt_equip_loadout_item(datum/loadout_item/new_item) + if(!new_item.item_checks(src)) + return FALSE + equip_loadout_item(new_item) + return TRUE + +///Actually adds an item to a loadout +/datum/outfit_holder/proc/equip_loadout_item(datum/loadout_item/new_item) + var/slot_bit = "[new_item.item_slot]" + loadout_cost -= equipped_things[slot_bit]?.purchase_cost + equipped_things[slot_bit] = new_item //adds the datum + loadout_cost += equipped_things[slot_bit]?.purchase_cost + + switch(new_item.item_slot) //adds it to the loadout itself + if(ITEM_SLOT_OCLOTHING) + loadout.wear_suit = new_item?.item_typepath + if(ITEM_SLOT_ICLOTHING) + loadout.w_uniform = new_item?.item_typepath + if(ITEM_SLOT_GLOVES) + loadout.gloves = new_item?.item_typepath + if(ITEM_SLOT_EYES) + loadout.glasses = new_item?.item_typepath + if(ITEM_SLOT_EARS) + loadout.ears = new_item?.item_typepath + if(ITEM_SLOT_MASK) + loadout.mask = new_item?.item_typepath + if(ITEM_SLOT_HEAD) + loadout.head = new_item?.item_typepath + if(ITEM_SLOT_FEET) + loadout.shoes = new_item?.item_typepath + if(ITEM_SLOT_ID) + loadout.id = new_item?.item_typepath + if(ITEM_SLOT_BELT) + loadout.belt = new_item?.item_typepath + if(ITEM_SLOT_BACK) + loadout.back = new_item?.item_typepath + if(ITEM_SLOT_R_POCKET) + loadout.r_store = new_item?.item_typepath + if(ITEM_SLOT_L_POCKET) + loadout.l_store = new_item?.item_typepath + if(ITEM_SLOT_SUITSTORE) + loadout.suit_store = new_item?.item_typepath + else + CRASH("Invalid item slot specified [slot_bit]") + return TRUE + +///scans the entire loadout for validity +/datum/outfit_holder/proc/check_full_loadout() + . = TRUE + for(var/slot in equipped_things) + var/datum/loadout_item/thing_to_check = equipped_things["[slot]"] + if(!thing_to_check) + continue + if(thing_to_check.quantity == 0) + return FALSE + if(length(thing_to_check.item_whitelist) && !thing_to_check.whitelist_check(src)) + return FALSE + if(length(thing_to_check.item_blacklist) && !thing_to_check.blacklist_check(src)) + return FALSE diff --git a/code/datums/gamemodes/campaign/perks.dm b/code/datums/gamemodes/campaign/perks.dm new file mode 100644 index 0000000000000..53db3189653a3 --- /dev/null +++ b/code/datums/gamemodes/campaign/perks.dm @@ -0,0 +1,433 @@ +GLOBAL_LIST_INIT_TYPED(campaign_perk_list, /datum/perk, init_glob_perk_list()) //this may or may not be even needed + +/proc/init_glob_perk_list() + . = list() + for(var/perk_type in subtypesof(/datum/perk)) + var/datum/perk/perk = new perk_type + .[perk_type] = perk + +//List of all loadout_item datums by job, excluding ones that must be unlocked +GLOBAL_LIST_INIT(campaign_perks_by_role, init_campaign_perks_by_role()) + +/proc/init_campaign_perks_by_role() + . = list() + for(var/job in GLOB.campaign_jobs) + .[job] = list() + for(var/i in GLOB.campaign_perk_list) + var/datum/perk/perk = GLOB.campaign_perk_list[i] + if(!(job in perk.jobs_supported)) + continue + .[job] += perk + +/* +Will need a way to org perks (and other stuff) by faction and/or specific role. +Needed both for a purchase list and effected list (if one perk impacts multiple roles, unless we keep everything entirely separate) +**/ +/datum/perk + ///Name of the perk + var/name = "base perk name" + ///Brief description of the perk + var/desc = "desc here" + ///Addition desc for special reqs such as other perks + var/req_desc + ///UI icon for this perk + var/ui_icon + ///Cost to purchase this perk + var/unlock_cost = 0 + ///Job types that this perk is available to. no list implies this works for any job + var/list/jobs_supported + ///This applies to all campaign jobs + var/all_jobs = FALSE + ///Any perks required before this one can be obtained + var/list/datum/perk/prereq_perks + +/datum/perk/New() + . = ..() + if(all_jobs) + jobs_supported = GLOB.campaign_jobs + +///Any one off bonuses for unlocking this perk +/datum/perk/proc/unlock_bonus(mob/living/carbon/owner, datum/individual_stats/owner_stats) + return + +///Applies perk benefits +/datum/perk/proc/apply_perk(mob/living/carbon/owner) + return + +///Removes perk benefits +/datum/perk/proc/remove_perk(mob/living/carbon/owner) + return + +/datum/perk/shield_overclock + name = "Shield overlock" + desc = "Overclocking a shield module beyond manufacturing specifications results in a more powerful shield at that cost of burning out sensitive components after weeks of use instead of months. \ + May void the warranty. Also unlocks shield modules for roles that do not already have access to it." + ui_icon = "overclock" + all_jobs = TRUE + unlock_cost = 800 + +/datum/perk/shield_overclock/unlock_bonus(mob/living/carbon/owner, datum/individual_stats/owner_stats) + if(owner_stats.faction == FACTION_TERRAGOV) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_slot/light_shield/overclocked, /datum/loadout_item/suit_slot/light_shield, jobs_supported) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_slot/medium_shield/overclocked, /datum/loadout_item/suit_slot/medium_shield, jobs_supported) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_slot/heavy_shield/overclocked, /datum/loadout_item/suit_slot/heavy_shield, jobs_supported) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_slot/medium_shield/overclocked/engineer, /datum/loadout_item/suit_slot/medium_engineer, jobs_supported) + owner_stats.unlock_loadout_item(/datum/loadout_item/suit_slot/light_shield/overclocked/medic, SQUAD_CORPSMAN, owner) + owner_stats.unlock_loadout_item(/datum/loadout_item/suit_slot/medium_shield/overclocked/medic, SQUAD_CORPSMAN, owner) + owner_stats.unlock_loadout_item(/datum/loadout_item/suit_slot/light_shield/overclocked/engineer, SQUAD_ENGINEER, owner) + + else if(owner_stats.faction == FACTION_SOM) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_slot/som_light_shield/overclocked, /datum/loadout_item/suit_slot/som_light_shield, jobs_supported) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_slot/som_light_shield/overclocked/veteran, /datum/loadout_item/suit_slot/som_light_shield/veteran, jobs_supported) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_slot/som_medium_shield/overclocked, /datum/loadout_item/suit_slot/som_medium_shield, jobs_supported) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_slot/som_heavy_shield/overclocked, /datum/loadout_item/suit_slot/som_heavy_shield, jobs_supported) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_slot/som_heavy_shield/breacher/overclocked, /datum/loadout_item/suit_slot/som_heavy_shield/breacher, jobs_supported) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_slot/som_light_shield/overclocked/medic, /datum/loadout_item/suit_slot/som_medic/light, jobs_supported) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_slot/som_medium_shield/overclocked/medic, /datum/loadout_item/suit_slot/som_medic, jobs_supported) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_slot/som_light_shield/overclocked/engineer, /datum/loadout_item/suit_slot/som_engineer/light, jobs_supported) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_slot/som_medium_shield/overclocked/engineer, /datum/loadout_item/suit_slot/som_engineer, jobs_supported) + +//perks that give a trait +/datum/perk/trait + ///List of traits provided by this perk + var/list/traits + +/datum/perk/trait/apply_perk(mob/living/carbon/owner) + owner.add_traits(traits, type) + +/datum/perk/trait/remove_perk(mob/living/carbon/owner) + owner.remove_traits(traits, type) + +/datum/perk/trait/hp_boost + name = "Improved constitution" + desc = "Through disciplined training and hypno indoctrination, your body is able to tolerate higher levels of trauma. +25 max health, +25 pain resistance." + ui_icon = "health_1" + all_jobs = TRUE + unlock_cost = 800 + traits = list(TRAIT_LIGHT_PAIN_RESIST) + ///How much this perk increases your maxhp by + var/health_mod = 25 + +/datum/perk/trait/hp_boost/apply_perk(mob/living/carbon/owner) + . = ..() + owner.maxHealth += health_mod + +/datum/perk/trait/hp_boost/remove_perk(mob/living/carbon/owner) + . = ..() + owner.maxHealth -= health_mod + +/datum/perk/trait/hp_boost/two + name = "Extreme constitution" + desc = "Military grade biological augmentations are used to harden your body against grievous bodily harm. Provides an addition +25 max health and +10 pain resistance." + req_desc = "Requires Improved constitution." + ui_icon = "health_2" + prereq_perks = list(/datum/perk/trait/hp_boost) + traits = list(TRAIT_MEDIUM_PAIN_RESIST) + unlock_cost = 1000 + +/datum/perk/trait/quiet + name = "Light footed" + desc = "Quiet when running, silent when walking." + ui_icon = "soft_footed" + traits = list(TRAIT_LIGHT_STEP) + all_jobs = TRUE + unlock_cost = 300 + +/datum/perk/trait/axe_master + name = "Axe master" + desc = "You are able to wield a breaching axe with considerable skill. Grants access to a special sweep attack when wielded, and allows some roles to select an axe as a back stored weapon." + req_desc = "Requires Melee specialisation." + ui_icon = "axe" + traits = list(TRAIT_AXE_EXPERT) + jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER, SOM_FIELD_COMMANDER) + unlock_cost = 450 + prereq_perks = list(/datum/perk/skill_mod/melee/two) + +/datum/perk/trait/axe_master/unlock_bonus(mob/living/carbon/owner, datum/individual_stats/owner_stats) + if(!istype(owner_stats)) + return + owner_stats.unlock_loadout_item(/datum/loadout_item/back/boarding_axe, jobs_supported, owner, 0) + +/datum/perk/trait/sword_master + name = "Sword master" + desc = "You are able to wield a sword with considerable skill. Grants access to a special lunge attack when wielding any sword, and allows some roles to select a sword as a back or suit stored weapon." + req_desc = "Requires Melee specialisation." + ui_icon = "sword" + traits = list(TRAIT_SWORD_EXPERT) + jobs_supported = list(SQUAD_MARINE, SQUAD_LEADER, FIELD_COMMANDER, SOM_SQUAD_MARINE, SOM_SQUAD_ENGINEER, SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER, SOM_FIELD_COMMANDER) + unlock_cost = 450 + prereq_perks = list(/datum/perk/skill_mod/melee/two) + +/datum/perk/trait/sword_master/unlock_bonus(mob/living/carbon/owner, datum/individual_stats/owner_stats) + if(!istype(owner_stats)) + return + owner_stats.unlock_loadout_item(/datum/loadout_item/back/machete, jobs_supported, owner, 0) + owner_stats.unlock_loadout_item(/datum/loadout_item/belt/energy_sword, jobs_supported, owner, 0) + +//skill modifying perks +/datum/perk/skill_mod + var/cqc + var/melee_weapons + var/firearms + var/pistols + var/shotguns + var/rifles + var/smgs + var/heavy_weapons + var/smartgun + var/engineer + var/construction + var/leadership + var/medical + var/surgery + var/pilot + var/police + var/powerloader + var/large_vehicle + var/stamina + +/datum/perk/skill_mod/New() + . = ..() + +/datum/perk/skill_mod/apply_perk(mob/living/carbon/owner) + owner.set_skills(owner.skills.modifyRating(cqc, melee_weapons, firearms, pistols, shotguns, rifles, smgs, heavy_weapons, smartgun, \ + engineer, construction, leadership, medical, surgery, pilot, police, powerloader, large_vehicle, stamina)) + +/datum/perk/skill_mod/remove_perk(mob/living/carbon/owner) + owner.set_skills(owner.skills.modifyRating(-cqc, -melee_weapons, -firearms, -pistols, -shotguns, -rifles, -smgs, -heavy_weapons, -smartgun, \ + -engineer, -construction, -leadership, -medical, -surgery, -pilot, -police, -powerloader, -large_vehicle, -stamina)) + +/datum/perk/skill_mod/cqc + name = "Hand to hand expertise" + desc = "Advanced hand to hand combat training gives you an edge when you need to punch someone in the face. Improved unarmed damage and stun chance." + ui_icon = "cqc_1" + cqc = 1 + all_jobs = TRUE + unlock_cost = 250 + +/datum/perk/skill_mod/cqc/two + name = "Hand to hand specialisation" + desc = "Muscle augments combined with specialised hand to hand combat training turn your body into a lethal weapon. Greatly improved unarmed damage and stun chance." + req_desc = "Requires Hand to hand expertise." + ui_icon = "cqc_2" + unlock_cost = 350 + prereq_perks = list(/datum/perk/skill_mod/cqc) + +/datum/perk/skill_mod/melee + name = "Melee expertise" + desc = "Improved damage with melee weapons." + ui_icon = "melee_1" + melee_weapons = 1 + all_jobs = TRUE + unlock_cost = 300 + +/datum/perk/skill_mod/melee/two + name = "Melee specialisation" + desc = "Greatly improved damage with melee weapons." + req_desc = "Requires Melee expertise." + ui_icon = "melee_2" + prereq_perks = list(/datum/perk/skill_mod/melee) + unlock_cost = 400 + +/datum/perk/skill_mod/firearms + name = "Advanced firearm training" + desc = "Improved handling for all firearms. A prerequisite for all gun skills perks, and increases the speed of tactical reloads." + ui_icon = "firearms" + firearms = 1 + all_jobs = TRUE + unlock_cost = 400 + +/datum/perk/skill_mod/pistols + name = "Advanced pistol training" + desc = "Improved damage, accuracy and scatter with pistol type firearms." + req_desc = "Requires Advanced firearm training." + ui_icon = "pistols" + pistols = 1 + all_jobs = TRUE + prereq_perks = list(/datum/perk/skill_mod/firearms) + unlock_cost = 400 + +/datum/perk/skill_mod/shotguns + name = "Advanced shotgun training" + desc = "Improved damage, accuracy and scatter with shotgun type firearms. Unlocks access to a shotgun secondary weapon in the backslot for some roles." + req_desc = "Requires Advanced firearm training." + ui_icon = "shotguns" + shotguns = 1 + all_jobs = TRUE + prereq_perks = list(/datum/perk/skill_mod/firearms) + unlock_cost = 600 + +/datum/perk/skill_mod/shotguns/unlock_bonus(mob/living/carbon/owner, datum/individual_stats/owner_stats) + if(!istype(owner_stats)) + return + owner_stats.unlock_loadout_item(/datum/loadout_item/back/som_shotgun, jobs_supported, owner, 0) + owner_stats.unlock_loadout_item(/datum/loadout_item/back/marine_shotgun, jobs_supported, owner, 0) + +/datum/perk/skill_mod/rifles + name = "Advanced rifle training" + desc = "Improved damage, accuracy and scatter with rifle type firearms. Unlocks new weapons and ammo types for some roles." + req_desc = "Requires Advanced firearm training." + ui_icon = "rifles" + rifles = 1 + all_jobs = TRUE + prereq_perks = list(/datum/perk/skill_mod/firearms) + unlock_cost = 1000 + +/datum/perk/skill_mod/rifles/unlock_bonus(mob/living/carbon/owner, datum/individual_stats/owner_stats) + if(!istype(owner_stats)) + return + if(owner_stats.faction == FACTION_TERRAGOV) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_store/main_gun/marine/standard_rifle/enhanced, /datum/loadout_item/suit_store/main_gun/marine/standard_rifle, SQUAD_MARINE) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_store/main_gun/marine/standard_carbine/enhanced, /datum/loadout_item/suit_store/main_gun/marine/standard_carbine, SQUAD_MARINE) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_store/main_gun/marine/scout_carbine/enhanced, /datum/loadout_item/suit_store/main_gun/marine/scout_carbine, SQUAD_MARINE) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_store/main_gun/marine/suppressed_carbine/enhanced, /datum/loadout_item/suit_store/main_gun/marine/suppressed_carbine, SQUAD_MARINE) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_store/main_gun/corpsman/carbine/enhanced, /datum/loadout_item/suit_store/main_gun/corpsman/carbine, SQUAD_CORPSMAN) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_store/main_gun/corpsman/assault_rifle/enhanced, /datum/loadout_item/suit_store/main_gun/corpsman/assault_rifle, SQUAD_CORPSMAN) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_store/main_gun/engineer/carbine/enhanced, /datum/loadout_item/suit_store/main_gun/engineer/carbine, SQUAD_ENGINEER) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_store/main_gun/engineer/assault_rifle/enhanced, /datum/loadout_item/suit_store/main_gun/engineer/assault_rifle, SQUAD_ENGINEER) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_store/main_gun/squad_leader/carbine/enhanced, /datum/loadout_item/suit_store/main_gun/squad_leader/carbine, SQUAD_LEADER) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_store/main_gun/squad_leader/standard_rifle/enhanced, /datum/loadout_item/suit_store/main_gun/squad_leader/standard_rifle, SQUAD_LEADER) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_store/main_gun/field_commander/carbine/enhanced, /datum/loadout_item/suit_store/main_gun/field_commander/carbine, FIELD_COMMANDER) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_store/main_gun/field_commander/standard_rifle/enhanced, /datum/loadout_item/suit_store/main_gun/field_commander/standard_rifle, FIELD_COMMANDER) + + owner_stats.unlock_loadout_item(/datum/loadout_item/suit_store/main_gun/marine/plasma_rifle, SQUAD_MARINE, owner, 0) + owner_stats.unlock_loadout_item(/datum/loadout_item/suit_store/main_gun/corpsman/plasma_rifle, SQUAD_CORPSMAN, owner, 0) + owner_stats.unlock_loadout_item(/datum/loadout_item/suit_store/main_gun/engineer/plasma_rifle, SQUAD_ENGINEER, owner, 0) + owner_stats.unlock_loadout_item(/datum/loadout_item/suit_store/main_gun/squad_leader/plasma_rifle, SQUAD_LEADER, owner, 0) + owner_stats.unlock_loadout_item(/datum/loadout_item/suit_store/main_gun/field_commander/plasma_rifle, FIELD_COMMANDER, owner, 0) + + else if(owner_stats.faction == FACTION_SOM) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_store/main_gun/som_marine/standard_rifle/enhanced, /datum/loadout_item/suit_store/main_gun/som_marine/standard_rifle, SOM_SQUAD_MARINE) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_store/main_gun/som_marine/suppressed_rifle/enhanced, /datum/loadout_item/suit_store/main_gun/som_marine/suppressed_rifle, SOM_SQUAD_MARINE) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_store/main_gun/som_medic/standard_rifle/enhanced, /datum/loadout_item/suit_store/main_gun/som_medic/standard_rifle, SOM_SQUAD_CORPSMAN) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_store/main_gun/som_engineer/standard_rifle/enhanced, /datum/loadout_item/suit_store/main_gun/som_engineer/standard_rifle, SOM_SQUAD_ENGINEER) + + owner_stats.unlock_loadout_item(/datum/loadout_item/suit_store/main_gun/som_marine/volkite_charger, SOM_SQUAD_MARINE, owner, 0) + owner_stats.unlock_loadout_item(/datum/loadout_item/suit_store/main_gun/som_medic/volkite_charger, SOM_SQUAD_CORPSMAN, owner, 0) + owner_stats.unlock_loadout_item(/datum/loadout_item/suit_store/main_gun/som_engineer/volkite_charger, SOM_SQUAD_ENGINEER, owner, 0) + +/datum/perk/skill_mod/smgs + name = "Advanced SMG training" + desc = "Improved damage, accuracy and scatter with SMG type firearms. Unlocks new weapons and ammo types for some roles." + req_desc = "Requires Advanced firearm training." + ui_icon = "smgs" + smgs = 1 + all_jobs = TRUE + prereq_perks = list(/datum/perk/skill_mod/firearms) + unlock_cost = 500 + +/datum/perk/skill_mod/smgs/unlock_bonus(mob/living/carbon/owner, datum/individual_stats/owner_stats) + if(!istype(owner_stats)) + return + if(owner_stats.faction == FACTION_TERRAGOV) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_store/main_gun/marine/standard_smg/enhanced, /datum/loadout_item/suit_store/main_gun/marine/standard_smg, SQUAD_MARINE) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_store/main_gun/marine/smg_and_shield/enhanced, /datum/loadout_item/suit_store/main_gun/marine/smg_and_shield, SQUAD_MARINE) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_store/main_gun/corpsman/standard_smg/enhanced, /datum/loadout_item/suit_store/main_gun/corpsman/standard_smg, SQUAD_CORPSMAN) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_store/main_gun/engineer/standard_smg/enhanced, /datum/loadout_item/suit_store/main_gun/engineer/standard_smg, SQUAD_ENGINEER) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_store/main_gun/squad_leader/standard_smg/enhanced, /datum/loadout_item/suit_store/main_gun/squad_leader/standard_smg, SQUAD_LEADER) + + owner_stats.unlock_loadout_item(/datum/loadout_item/suit_store/main_gun/marine/plasma_smg, SQUAD_MARINE, owner, 0) + owner_stats.unlock_loadout_item(/datum/loadout_item/suit_store/main_gun/corpsman/plasma_smg, SQUAD_CORPSMAN, owner, 0) + owner_stats.unlock_loadout_item(/datum/loadout_item/suit_store/main_gun/engineer/plasma_smg, SQUAD_ENGINEER, owner, 0) + owner_stats.unlock_loadout_item(/datum/loadout_item/suit_store/main_gun/squad_leader/plasma_smg, SQUAD_LEADER, owner, 0) + owner_stats.unlock_loadout_item(/datum/loadout_item/suit_store/main_gun/field_commander/plasma_smg, FIELD_COMMANDER, owner, 0) + else if(owner_stats.faction == FACTION_SOM) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_store/main_gun/som_marine/smg/enhanced, /datum/loadout_item/suit_store/main_gun/som_marine/smg, SOM_SQUAD_MARINE) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_store/main_gun/som_marine/smg_and_shield/enhanced, /datum/loadout_item/suit_store/main_gun/som_marine/smg_and_shield, SOM_SQUAD_MARINE) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_store/main_gun/som_marine/smg/enhanced, /datum/loadout_item/suit_store/main_gun/som_marine/smg, SOM_SQUAD_CORPSMAN) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_store/main_gun/som_engineer/smg/enhanced, /datum/loadout_item/suit_store/main_gun/som_engineer/smg, SOM_SQUAD_ENGINEER) + +/datum/perk/skill_mod/heavy_weapons + name = "Heavy weapon specialisation" + desc = "Improved damage, accuracy and scatter with heavy weapon type firearms. Unlocks new weapons and ammo types for some roles." + req_desc = "Requires Advanced firearm training." + ui_icon = "heavy" + heavy_weapons = 1 + all_jobs = TRUE + prereq_perks = list(/datum/perk/skill_mod/firearms) + unlock_cost = 800 + +/datum/perk/skill_mod/heavy_weapons/unlock_bonus(mob/living/carbon/owner, datum/individual_stats/owner_stats) + if(!istype(owner_stats)) + return + if(owner_stats.faction == FACTION_TERRAGOV) + owner_stats.unlock_loadout_item(/datum/loadout_item/back/tgmc_heam_rocket_bag, SQUAD_MARINE, owner, 0) + owner_stats.unlock_loadout_item(/datum/loadout_item/suit_store/main_gun/marine/plasma_cannon, SQUAD_MARINE, owner, 0) + else if(owner_stats.faction == FACTION_SOM) + owner_stats.unlock_loadout_item(/datum/loadout_item/back/som_heat_rocket_bag, SOM_SQUAD_VETERAN, owner, 0) + +/datum/perk/skill_mod/smartgun + name = "Advanced smartgun training" + desc = "Improved damage, accuracy and scatter with smartguns type firearms." + req_desc = "Requires Advanced firearm training." + ui_icon = "smartguns" + smartgun = 1 + jobs_supported = list(SQUAD_SMARTGUNNER, CAPTAIN) + prereq_perks = list(/datum/perk/skill_mod/firearms) + unlock_cost = 800 + +/datum/perk/skill_mod/construction + name = "Advanced construction training" + desc = "Faster construction times when building. Some items may no longer have a penalty delay when constructing." + ui_icon = "construction" + construction = 2 + all_jobs = TRUE + unlock_cost = 300 + +/datum/perk/skill_mod/leadership + name = "Advanced leadership training" + desc = "Advanced leadership training and battlefield experience resulting in an improved ability to command and control the soldiers under your command. Improved effectiveness and range when issuing orders." + ui_icon = "leadership" + leadership = 1 + jobs_supported = list(SQUAD_LEADER, FIELD_COMMANDER, STAFF_OFFICER, CAPTAIN, SOM_SQUAD_LEADER, SOM_STAFF_OFFICER, SOM_FIELD_COMMANDER, SOM_COMMANDER) + unlock_cost = 1100 + +/datum/perk/skill_mod/medical + name = "Advanced medical training" + desc = "Faster at applying medical items. Some items may no longer have a penalty delay. Unlocks access to improved first aid pouches if not already available." + ui_icon = "medical" + medical = 2 + all_jobs = TRUE + unlock_cost = 300 + +/datum/perk/skill_mod/medical/unlock_bonus(mob/living/carbon/owner, datum/individual_stats/owner_stats) + if(!istype(owner_stats)) + return + if(owner_stats.faction == FACTION_TERRAGOV) + for(var/job_type in owner_stats.loadouts) + owner_stats.replace_loadout_option(/datum/loadout_item/r_pocket/standard_first_aid/standard_improved, /datum/loadout_item/r_pocket/standard_first_aid, job_type) + owner_stats.replace_loadout_option(/datum/loadout_item/l_pocket/standard_first_aid/standard_improved, /datum/loadout_item/l_pocket/standard_first_aid, job_type) + + else if(owner_stats.faction == FACTION_SOM) + for(var/job_type in owner_stats.loadouts) + owner_stats.replace_loadout_option(/datum/loadout_item/r_pocket/som_standard_first_aid/standard_improved, /datum/loadout_item/r_pocket/som_standard_first_aid, job_type) + owner_stats.replace_loadout_option(/datum/loadout_item/l_pocket/som_standard_first_aid/standard_improved, /datum/loadout_item/l_pocket/som_standard_first_aid, job_type) + +/datum/perk/skill_mod/stamina + name = "Improved stamina" + desc = "Superior physical conditioning results in overall improved stamina. Improved max stamina, stamina regen rate, and reduces the delay before stamina begins to regenerate after stamina loss." + ui_icon = "stamina_1" + stamina = 1 + all_jobs = TRUE + unlock_cost = 600 + ///How much this perk increases your max_stam by + var/stam_mod = 10 + +/datum/perk/skill_mod/stamina/apply_perk(mob/living/carbon/owner) + . = ..() + owner.max_stamina += stam_mod + owner.max_stamina_buffer += stam_mod + +/datum/perk/skill_mod/stamina/remove_perk(mob/living/carbon/owner) + . = ..() + owner.max_stamina -= stam_mod + owner.max_stamina_buffer -= stam_mod + +/datum/perk/skill_mod/stamina/two + name = "Extreme stamina" + desc = "Greatly stamina regen rate, and further reduces the delay before stamina begins to regenerate." + desc = "Mechanically augmented physical conditioning results in significantly enhanced overall stamina. Further improved max stamina, stamina regen rate, and reduced delay before stamina begins to regenerate after stamina loss." + req_desc = "Requires Improved stamina." + ui_icon = "stamina_2" + prereq_perks = list(/datum/perk/skill_mod/stamina) + unlock_cost = 800 diff --git a/code/datums/gamemodes/campaign/rewards/allies.dm b/code/datums/gamemodes/campaign/rewards/allies.dm index 1e8c0dbb69d0c..bdd861e0f816e 100644 --- a/code/datums/gamemodes/campaign/rewards/allies.dm +++ b/code/datums/gamemodes/campaign/rewards/allies.dm @@ -22,6 +22,7 @@ desc = "A colonial militia squad to augment our forces" detailed_desc = "A large number of militia job slots are opened at no attrition cost. \ A local colonial militia sympathetic to our cause has offered a squad to support our troops. Equipped with lesser arms and armor than our own troops, but fairly numerous." + asset_portrait = /atom/movable/screen/text/screen_text/picture/potrait/militia_reinforcement ui_icon = "militia" bonus_job_list = list( /datum/job/som/mercenary/militia/leader = 1, @@ -34,6 +35,7 @@ desc = "A squad of freelance guns for hire to support our forces" detailed_desc = "A moderate number of freelancer job slots are opened at no attrition cost. \ A contract has been bought for a squad of freelancers to augment our forces. With comparable equipment and training, they can help turn the tables when our forces are stretched thin." + asset_portrait = /atom/movable/screen/text/screen_text/picture/potrait/freelancer_reinforcement ui_icon = "freelancers" bonus_job_list = list( /datum/job/freelancer/leader/campaign_bonus = 1, @@ -47,6 +49,7 @@ desc = "A squad of ICC soldiers to support our forces" detailed_desc = "A moderate number of ICC job slots are opened at no attrition cost. \ The ICC have authorised a small, local detachment of their troops to aid us in our conflict. They are well armed and armored, and could prove a valuable advantage in a fight." + asset_portrait = /atom/movable/screen/text/screen_text/picture/potrait/icc_reinforcement ui_icon = "icc" bonus_job_list = list( /datum/job/icc/leader/campaign_bonus = 1, @@ -60,6 +63,7 @@ desc = "An elite PMC team to assist in a joint operation" detailed_desc = "A small number of PMC job slots are opened at no attrition cost. \ NanoTrasen have authorised a small team of their PMC contractors to assist us in combat. With superior arms and armor, they a powerful tactical asset." + asset_portrait = /atom/movable/screen/text/screen_text/picture/potrait/pmc_reinforcement ui_icon = "pmc" bonus_job_list = list( /datum/job/pmc/leader/campaign_bonus = 1, @@ -72,6 +76,7 @@ desc = "A shipment of combat robots to bolster your forces" detailed_desc = "A four combat robot job slots are opened at no attrition cost. \ Combat robots are tough to kill, being immune to pain and chemicals, and resist both fire and radiation. They suffer from low mobility however." + asset_portrait = /atom/movable/screen/text/screen_text/picture/potrait/robot_reinforcement ui_icon = "combat_robots" cost = 6 bonus_job_list = list( diff --git a/code/datums/gamemodes/campaign/rewards/campaign_asset_jobs.dm b/code/datums/gamemodes/campaign/rewards/campaign_asset_jobs.dm index 1c7ff3d727c0a..bdd7ad68fd62e 100644 --- a/code/datums/gamemodes/campaign/rewards/campaign_asset_jobs.dm +++ b/code/datums/gamemodes/campaign/rewards/campaign_asset_jobs.dm @@ -444,20 +444,20 @@ What you lack in equipment and military training you make up in bravery and conv job_flags = JOB_FLAG_LATEJOINABLE|JOB_FLAG_BOLD_NAME_ON_SELECTION|JOB_FLAG_PROVIDES_SQUAD_HUD|JOB_FLAG_CAN_SEE_ORDERS job_cost = 0 outfits = list( - /datum/outfit/job/freelancer/standard/campaign, /datum/outfit/job/freelancer/standard/one/campaign, /datum/outfit/job/freelancer/standard/two/campaign, + /datum/outfit/job/freelancer/standard/three/campaign, ) -/datum/outfit/job/freelancer/standard/campaign - ears = /obj/item/radio/headset/mainship - /datum/outfit/job/freelancer/standard/one/campaign ears = /obj/item/radio/headset/mainship /datum/outfit/job/freelancer/standard/two/campaign ears = /obj/item/radio/headset/mainship +/datum/outfit/job/freelancer/standard/three/campaign + ears = /obj/item/radio/headset/mainship + /datum/job/freelancer/medic/campaign_bonus faction = FACTION_TERRAGOV @@ -474,15 +474,15 @@ What you lack in equipment and military training you make up in bravery and conv comm_title = "FL" job_flags = JOB_FLAG_LATEJOINABLE|JOB_FLAG_BOLD_NAME_ON_SELECTION|JOB_FLAG_PROVIDES_SQUAD_HUD|JOB_FLAG_CAN_SEE_ORDERS outfits = list( - /datum/outfit/job/freelancer/grenadier/campaign, /datum/outfit/job/freelancer/grenadier/one/campaign, + /datum/outfit/job/freelancer/grenadier/two/campaign, ) job_cost = 0 -/datum/outfit/job/freelancer/grenadier/campaign +/datum/outfit/job/freelancer/grenadier/one/campaign ears = /obj/item/radio/headset/mainship -/datum/outfit/job/freelancer/grenadier/one/campaign +/datum/outfit/job/freelancer/grenadier/two/campaign ears = /obj/item/radio/headset/mainship /datum/job/freelancer/leader/campaign_bonus @@ -490,15 +490,15 @@ What you lack in equipment and military training you make up in bravery and conv comm_title = "FL" job_flags = JOB_FLAG_LATEJOINABLE|JOB_FLAG_BOLD_NAME_ON_SELECTION|JOB_FLAG_PROVIDES_SQUAD_HUD|JOB_FLAG_CAN_SEE_ORDERS outfits = list( - /datum/outfit/job/freelancer/leader/campaign, /datum/outfit/job/freelancer/leader/one/campaign, + /datum/outfit/job/freelancer/leader/two/campaign, ) job_cost = 0 -/datum/outfit/job/freelancer/leader/campaign +/datum/outfit/job/freelancer/leader/one/campaign ears = /obj/item/radio/headset/mainship -/datum/outfit/job/freelancer/leader/one/campaign +/datum/outfit/job/freelancer/leader/two/campaign ears = /obj/item/radio/headset/mainship //PMC @@ -652,7 +652,6 @@ Fight for TGMC, and attempt to achieve all objectives given to you."}) H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_HEAD) /datum/outfit/job/tgmc/campaign_robot/machine_gunner - r_store = /obj/item/storage/pouch/pistol belt = /obj/item/storage/belt/sparepouch suit_store = /obj/item/weapon/gun/rifle/standard_gpmg/machinegunner @@ -674,12 +673,10 @@ Fight for TGMC, and attempt to achieve all objectives given to you."}) H.equip_to_slot_or_del(new /obj/item/stack/cable_coil, SLOT_IN_BACKPACK) H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BACKPACK) H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, SLOT_IN_BACKPACK) H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK) /datum/outfit/job/tgmc/campaign_robot/guardian - r_store = /obj/item/storage/pouch/pistol - belt = /obj/item/storage/belt/marine/te_cells suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_carbine/gyro r_hand = /obj/item/weapon/shield/riot/marine @@ -703,9 +700,8 @@ Fight for TGMC, and attempt to achieve all objectives given to you."}) /datum/outfit/job/tgmc/campaign_robot/jetpack wear_suit = /obj/item/clothing/suit/modular/robot/heavy/shield r_store = /obj/item/storage/pouch/magazine/large - belt = /obj/item/storage/belt/marine/te_cells suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_carbine/mag_harness - back = /obj/item/jetpack_marine + back = /obj/item/jetpack_marine/heavy /datum/outfit/job/tgmc/campaign_robot/jetpack/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -720,8 +716,6 @@ Fight for TGMC, and attempt to achieve all objectives given to you."}) H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_R_POUCH) /datum/outfit/job/tgmc/campaign_robot/laser_mg - r_store = /obj/item/storage/pouch/pistol - belt = /obj/item/storage/belt/marine/te_cells suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_mlaser/patrol /datum/outfit/job/tgmc/campaign_robot/laser_mg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) diff --git a/code/datums/gamemodes/campaign/rewards/disablers.dm b/code/datums/gamemodes/campaign/rewards/disablers.dm index 9091d2f4b5c93..4baca3435c22e 100644 --- a/code/datums/gamemodes/campaign/rewards/disablers.dm +++ b/code/datums/gamemodes/campaign/rewards/disablers.dm @@ -9,18 +9,28 @@ var/list/types_disabled ///Rewards currently disabled. Recorded to reenable later var/list/types_currently_disabled = list() + ///Does this apply instantly? + var/instant_use = FALSE /datum/campaign_asset/asset_disabler/immediate_effect() - RegisterSignal(SSdcs, COMSIG_GLOB_CAMPAIGN_MISSION_LOADED, PROC_REF(trigger_disabler)) + if(instant_use) + trigger_disabler() + else + RegisterSignal(SSdcs, COMSIG_GLOB_CAMPAIGN_MISSION_LOADED, PROC_REF(trigger_disabler)) + + RegisterSignal(faction, COMSIG_CAMPAIGN_NEW_ASSET, PROC_REF(disable_asset)) /datum/campaign_asset/asset_disabler/deactivate() + if(!uses) + UnregisterSignal(SSdcs, list(COMSIG_GLOB_CAMPAIGN_MISSION_LOADED, COMSIG_CAMPAIGN_NEW_ASSET)) + asset_flags &= ~ASSET_DEBUFF for(var/datum/campaign_asset/asset_type AS in types_currently_disabled) asset_type.asset_flags &= ~ASSET_DISABLED types_currently_disabled.Cut() UnregisterSignal(SSdcs, COMSIG_GLOB_CAMPAIGN_MISSION_ENDED) ///Handles the actual disabling activation -/datum/campaign_asset/asset_disabler/proc/trigger_disabler() +/datum/campaign_asset/asset_disabler/proc/trigger_disabler(datum/source) SIGNAL_HANDLER var/datum/game_mode/hvh/campaign/mode = SSticker.mode var/datum/campaign_mission/current_mission = mode.current_mission @@ -28,20 +38,23 @@ return for(var/i in faction.faction_assets) - var/datum/campaign_asset/asset_type = faction.faction_assets[i] - if(!asset_type) - continue - if(asset_type.type in types_disabled) - asset_type.asset_flags |= ASSET_DISABLED - types_currently_disabled += asset_type + disable_asset(asset = faction.faction_assets[i]) RegisterSignal(SSdcs, COMSIG_GLOB_CAMPAIGN_MISSION_ENDED, TYPE_PROC_REF(/datum/campaign_asset, deactivate)) uses -- - if(!uses) - UnregisterSignal(SSdcs, COMSIG_GLOB_CAMPAIGN_MISSION_LOADED) - asset_flags &= ~ASSET_DEBUFF SEND_SIGNAL(src, COMSIG_CAMPAIGN_DISABLER_ACTIVATION) + +///Actually disables an asset +/datum/campaign_asset/asset_disabler/proc/disable_asset(datum/source, datum/campaign_asset/asset) + SIGNAL_HANDLER + if(!istype(asset)) + return + if(!(asset.type in types_disabled)) + return + asset.asset_flags |= ASSET_DISABLED + types_currently_disabled += asset + /datum/campaign_asset/asset_disabler/tgmc_cas name = "CAS disabled" desc = "CAS fire support temporarily disabled" @@ -50,6 +63,11 @@ types_disabled = list(/datum/campaign_asset/fire_support) blacklist_mission_flags = MISSION_DISALLOW_FIRESUPPORT +/datum/campaign_asset/asset_disabler/tgmc_cas/instant + uses = 1 + instant_use = TRUE + detailed_desc = "Hostile assets in the AO are preventing the use of close air support during this mission." + /datum/campaign_asset/asset_disabler/som_cas name = "CAS disabled" desc = "CAS fire support temporarily disabled" @@ -58,6 +76,11 @@ types_disabled = list(/datum/campaign_asset/fire_support/som_cas) blacklist_mission_flags = MISSION_DISALLOW_FIRESUPPORT +/datum/campaign_asset/asset_disabler/som_cas/instant + uses = 1 + instant_use = TRUE + detailed_desc = "Hostile assets in the AO are preventing the use of close air support during this mission." + /datum/campaign_asset/asset_disabler/tgmc_mortar name = "Mortar support disabled" desc = "Mortar fire support temporarily disabled" diff --git a/code/datums/gamemodes/campaign/rewards/drop_pods.dm b/code/datums/gamemodes/campaign/rewards/drop_pods.dm index 18fd7896e164d..5977d47439fd2 100644 --- a/code/datums/gamemodes/campaign/rewards/drop_pods.dm +++ b/code/datums/gamemodes/campaign/rewards/drop_pods.dm @@ -2,6 +2,7 @@ name = "Enable drop pods" desc = "Enables the use of drop pods for the current or next mission" detailed_desc = "Repositions the ship to allow for orbital drop pod insertion during the current or next mission." + asset_portrait = /atom/movable/screen/text/screen_text/picture/potrait/pod_officer ui_icon = "droppod_active" uses = 3 cost = 9 @@ -28,6 +29,7 @@ name = "Rearm drop pod bays" desc = "replace all used drop pods" detailed_desc = "Replace all drop pods that have been previously deployed with refurbished units or ones from fleet storage, ready for immediate use." + asset_portrait = /atom/movable/screen/text/screen_text/picture/potrait/pod_officer ui_icon = "droppod_refresh" uses = 1 cost = 10 @@ -51,6 +53,7 @@ name = "Disable drop pods" desc = "Prevents the enemy from using drop pods in the current or next mission" detailed_desc = "Ground to Space weapon systems are activated to prevent TGMC close orbit support ships from positioning themselves for drop pod orbital assaults during the current or next mission." + asset_portrait = /atom/movable/screen/text/screen_text/picture/potrait/pod_officer ui_icon = "droppod_broken" uses = 2 asset_flags = ASSET_ACTIVATED_EFFECT|ASSET_ACTIVE_MISSION_ONLY diff --git a/code/datums/gamemodes/campaign/rewards/equipment.dm b/code/datums/gamemodes/campaign/rewards/equipment.dm index 5c03d0408d58a..6744713d215c0 100644 --- a/code/datums/gamemodes/campaign/rewards/equipment.dm +++ b/code/datums/gamemodes/campaign/rewards/equipment.dm @@ -1,5 +1,6 @@ //Parent for all 'spawn stuff' assets /datum/campaign_asset/equipment + asset_portrait = /atom/movable/screen/text/screen_text/picture/potrait/tgmc_req asset_flags = ASSET_ACTIVATED_EFFECT|ASSET_SL_AVAILABLE ///list of objects to spawn when this asset is activated var/list/obj/equipment_to_spawn = list() @@ -27,6 +28,7 @@ name = "Gorgon consignment" desc = "Five sets of Gorgon power armor" detailed_desc = "Activatable by squad leaders. Your battalion has been assigned a number of Gorgon power armor sets, available at your request. Gorgon armor is the SOM's elite infantry armor, providing superior protection and an automedical system without significantly compromising on speed." + asset_portrait = /atom/movable/screen/text/screen_text/picture/potrait/som_req ui_icon = "gorgon" uses = 5 cost = 12 @@ -56,6 +58,7 @@ ) /datum/campaign_asset/equipment/medkit_basic/som + asset_portrait = /atom/movable/screen/text/screen_text/picture/potrait/som_req equipment_to_spawn = list( /obj/item/storage/pouch/firstaid/som/full, /obj/item/storage/pouch/firstaid/som/full, @@ -80,6 +83,9 @@ /obj/item/storage/box/crate/loot/materials_pack, ) +/datum/campaign_asset/equipment/materials_pack/som + asset_portrait = /atom/movable/screen/text/screen_text/picture/potrait/som_req + /datum/campaign_asset/equipment/ballistic_tgmc name = "ballistic weapon cache" desc = "Ballistic weapons and ammo" @@ -101,6 +107,7 @@ name = "ballistic weapon cache" desc = "Ballistic weapons and ammo" detailed_desc = "A number of standard ballistic weapons and ammo to match." + asset_portrait = /atom/movable/screen/text/screen_text/picture/potrait/som_req ui_icon = "ballistic" uses = 1 cost = 3 @@ -132,6 +139,7 @@ name = "Volkite weapon cache" desc = "Volkite weapon cache and ammo" detailed_desc = "A volkite caliver and charger, with accompanying ammo. Able to deflagrate targets, making them deadly against tightly packed opponents." + asset_portrait = /atom/movable/screen/text/screen_text/picture/potrait/som_req ui_icon = "volkite" uses = 1 cost = 4 @@ -188,6 +196,7 @@ name = "Shotgun cache" desc = "Shotgun and ammo" detailed_desc = "A V-51 and ammo to match." + asset_portrait = /atom/movable/screen/text/screen_text/picture/potrait/som_req ui_icon = "shotgun" uses = 1 cost = 2 @@ -247,6 +256,7 @@ name = "Lorica heavy armour" desc = "Heavy armor upgrades" detailed_desc = "A pair of heavy armor suits equipped with 'Lorica' armour upgrades. Premier protection, but somewhat cumbersome." + asset_portrait = /atom/movable/screen/text/screen_text/picture/potrait/som_req ui_icon = "lorica" uses = 2 cost = 4 @@ -259,6 +269,7 @@ name = "Defensive shields" desc = "Heavy shields to hide behind" detailed_desc = "A pair of heavy riot shields. Able to withstand a tremendous amount of punishment at the cost of occupying a hand and slowing you down." + asset_portrait = /atom/movable/screen/text/screen_text/picture/potrait/som_req ui_icon = "riot_shield" uses = 2 cost = 3 @@ -271,6 +282,7 @@ name = "Grenade resupply" desc = "An assortment of grenades" detailed_desc = "A variety of different grenade types. Throw towards enemy." + asset_portrait = /atom/movable/screen/text/screen_text/picture/potrait/som_req ui_icon = "grenade" uses = 2 cost = 6 @@ -291,10 +303,14 @@ /obj/item/storage/box/explosive_mines/antitank, ) +/datum/campaign_asset/equipment/at_mines/som + asset_portrait = /atom/movable/screen/text/screen_text/picture/potrait/som_req + /datum/campaign_asset/equipment/tac_bino_som name = "Tactical binoculars" desc = "One set of tactical binoculars" detailed_desc = "Tactical binoculars for seeing into the distance and calling down air support." + asset_portrait = /atom/movable/screen/text/screen_text/picture/potrait/som_req ui_icon = "binoculars" uses = 1 cost = 3 diff --git a/code/datums/gamemodes/campaign/rewards/fire_support.dm b/code/datums/gamemodes/campaign/rewards/fire_support.dm index af20acbe2f719..e7b0be6429883 100644 --- a/code/datums/gamemodes/campaign/rewards/fire_support.dm +++ b/code/datums/gamemodes/campaign/rewards/fire_support.dm @@ -37,6 +37,7 @@ name = "Mortar support" desc = "Mortar teams are activated to provide firesupport for this mission" detailed_desc = "Activatable by squad leaders. A limited number of mortar strikes are available via tactical binoculars for this mission. Excellent for disrupting dug in enemy positions." + asset_portrait = /atom/movable/screen/text/screen_text/picture/potrait/tgmc_mortar ui_icon = "mortar" asset_flags = ASSET_ACTIVATED_EFFECT|ASSET_ACTIVE_MISSION_ONLY|ASSET_DISABLE_ON_MISSION_END|ASSET_SL_AVAILABLE cost = 6 diff --git a/code/datums/gamemodes/campaign/rewards/mechs.dm b/code/datums/gamemodes/campaign/rewards/mechs.dm index 06b21376ae52d..716fede63b57c 100644 --- a/code/datums/gamemodes/campaign/rewards/mechs.dm +++ b/code/datums/gamemodes/campaign/rewards/mechs.dm @@ -35,3 +35,65 @@ /datum/campaign_asset/mech/heavy/som spawner_type = /obj/effect/landmark/campaign/mech_spawner/som/heavy + +//mech spawn points +/obj/effect/landmark/campaign/mech_spawner + name = "tgmc med mech spawner" + icon_state = "mech" + ///Faction associated with this spawner + var/faction = FACTION_TERRAGOV + ///Colours to paint mechs from this spawner + var/list/colors = list(ARMOR_PALETTE_SPACE_CADET, ARMOR_PALETTE_GREYISH_TURQUOISE) + ///Colours to paint mech heads from this spawner for better visual clarity + var/list/head_colors = list(ARMOR_PALETTE_STORM, ARMOR_PALETTE_GREYISH_TURQUOISE, VISOR_PALETTE_SYNDIE_GREEN) + ///Mech type for this spawner + var/obj/vehicle/sealed/mecha/combat/greyscale/mech_type = /obj/vehicle/sealed/mecha/combat/greyscale/assault/noskill + +/obj/effect/landmark/campaign/mech_spawner/Initialize(mapload) + . = ..() + GLOB.campaign_mech_spawners[faction] += list(src) + +/obj/effect/landmark/campaign/mech_spawner/Destroy() + GLOB.campaign_mech_spawners[faction] -= src + return ..() + +///Creates and sets up the mech +/obj/effect/landmark/campaign/mech_spawner/proc/spawn_mech() + var/obj/vehicle/sealed/mecha/combat/greyscale/new_mech = new mech_type(loc) + for(var/i in new_mech.limbs) + var/datum/mech_limb/limb = new_mech.limbs[i] + limb.update_colors(arglist(istype(limb, /datum/mech_limb/head) ? head_colors : colors)) + new_mech.update_icon() + return new_mech + +/obj/effect/landmark/campaign/mech_spawner/heavy + name = "tgmc heavy mech spawner" + icon_state = "mech_heavy" + head_colors = list(ARMOR_PALETTE_RED, ARMOR_PALETTE_GREYISH_TURQUOISE, VISOR_PALETTE_SYNDIE_GREEN) + mech_type = /obj/vehicle/sealed/mecha/combat/greyscale/vanguard/noskill + +/obj/effect/landmark/campaign/mech_spawner/light + name = "tgmc light mech spawner" + icon_state = "mech_light" + head_colors = list(ARMOR_PALETTE_SPACE_CADET, ARMOR_PALETTE_GREYISH_TURQUOISE, VISOR_PALETTE_SYNDIE_GREEN) + mech_type = /obj/vehicle/sealed/mecha/combat/greyscale/recon/noskill + +/obj/effect/landmark/campaign/mech_spawner/som + name = "som med mech spawner" + faction = FACTION_SOM + colors = list(ARMOR_PALETTE_GINGER, ARMOR_PALETTE_ANGELIC) + head_colors = list(ARMOR_PALETTE_ANGELIC, ARMOR_PALETTE_GREY, VISOR_PALETTE_SYNDIE_GREEN) + +/obj/effect/landmark/campaign/mech_spawner/som/heavy + name = "som heavy mech spawner" + icon_state = "mech_heavy" + colors = list(ARMOR_PALETTE_GINGER, ARMOR_PALETTE_MAGENTA) + head_colors = list(ARMOR_PALETTE_MAGENTA, ARMOR_PALETTE_GRAPE, VISOR_PALETTE_ELITE_ORANGE) + mech_type = /obj/vehicle/sealed/mecha/combat/greyscale/vanguard/noskill + +/obj/effect/landmark/campaign/mech_spawner/som/light + name = "som light mech spawner" + icon_state = "mech_light" + colors = list(ARMOR_PALETTE_GINGER, ARMOR_PALETTE_BLACK) + head_colors = list(ARMOR_PALETTE_GINGER, ARMOR_PALETTE_BLACK, VISOR_PALETTE_SYNDIE_GREEN) + mech_type = /obj/vehicle/sealed/mecha/combat/greyscale/recon/noskill diff --git a/code/datums/gamemodes/campaign/rewards/reserves.dm b/code/datums/gamemodes/campaign/rewards/reserves.dm index 6c6151c0a219f..558c4e2d9db7f 100644 --- a/code/datums/gamemodes/campaign/rewards/reserves.dm +++ b/code/datums/gamemodes/campaign/rewards/reserves.dm @@ -52,7 +52,13 @@ for(var/mob/candidate AS in GLOB.player_list) if(candidate.faction != faction.faction) continue - mode.player_death_times -= candidate.key + if(candidate.stat != DEAD) + continue + mode.player_death_times -= candidate.ckey + deltimer(mode.respawn_timers[candidate.ckey]) + mode.respawn_timers[candidate.ckey] = null + mode.player_respawn(candidate) + to_chat(candidate, "Tactical reserves mobilised. You can now respawn immediately if possible.
Detailed Information
") - to_chat(M, {"[num_som] SOM alive. + to_chat(M, "Detailed Information") + to_chat(M, {"[num_som] SOM alive. [num_tgmc] Marine\s alive."}) message_admins("Bioscan - Marines: [num_tgmc] active TGMC personnel[tgmc_location ? " .Location:[tgmc_location]":""]") diff --git a/code/datums/gamemodes/infestation.dm b/code/datums/gamemodes/infestation.dm index de2e61a0d4d26..f0cb0c4b90148 100644 --- a/code/datums/gamemodes/infestation.dm +++ b/code/datums/gamemodes/infestation.dm @@ -23,7 +23,7 @@ weed_type = pickweight(GLOB.weed_prob_list) new weed_type(T) for(var/turf/T AS in GLOB.xeno_resin_wall_turfs) - T.ChangeTurf(/turf/closed/wall/resin, T.type) + T.ChangeTurf(/turf/closed/wall/resin/regenerating, T.type) for(var/i in GLOB.xeno_resin_door_turfs) new /obj/structure/mineral_door/resin(i) for(var/i in GLOB.xeno_tunnel_spawn_turfs) @@ -52,9 +52,8 @@ /datum/game_mode/infestation/announce_bioscans(show_locations = TRUE, delta = 2, ai_operator = FALSE, announce_humans = TRUE, announce_xenos = TRUE, send_fax = TRUE) if(ai_operator) - var/mob/living/silicon/ai/bioscanning_ai = usr #ifndef TESTING - + var/mob/living/silicon/ai/bioscanning_ai = usr if((bioscanning_ai.last_ai_bioscan + COOLDOWN_AI_BIOSCAN) > world.time) to_chat(bioscanning_ai, "Bioscan instruments are still recalibrating from their last use.") return @@ -108,15 +107,19 @@ for(var/i in GLOB.alive_xeno_list_hive[XENO_HIVE_NORMAL]) var/mob/M = i SEND_SOUND(M, S) - to_chat(M, span_xenoannounce("The Queen Mother reaches into your mind from worlds away.")) - to_chat(M, span_xenoannounce("To my children and their Queen. I sense [numHostsShipr ? "approximately [numHostsShipr]":"no"] host[numHostsShipr > 1 ? "s":""] in the metal hive[BIOSCAN_LOCATION(show_locations, hostLocationS)], [numHostsPlanet || "none"] scattered elsewhere[BIOSCAN_LOCATION(show_locations, hostLocationP)] and [numHostsTransitr ? "approximately [numHostsTransitr]":"no"] host[numHostsTransitr > 1 ? "s":""] on the metal bird in transit.")) + to_chat(M, assemble_alert( + title = "Queen Mother Report", + subtitle = "The Queen Mother reaches into your mind...", + message = "To my children and their Queen,I sense [numHostsShipr ? "approximately [numHostsShipr]":"no"] host[numHostsShipr > 1 ? "s":""] in the metal hive[BIOSCAN_LOCATION(show_locations, hostLocationS)], [numHostsPlanet || "none"] scattered elsewhere[BIOSCAN_LOCATION(show_locations, hostLocationP)] and [numHostsTransitr ? "approximately [numHostsTransitr]":"no"] host[numHostsTransitr > 1 ? "s":""] on the metal bird in transit.", + color_override = "purple" + )) var/name = "[MAIN_AI_SYSTEM] Bioscan Status" var/input = {"Bioscan complete. Sensors indicate [numXenosShip || "no"] unknown lifeform signature[numXenosShip > 1 ? "s":""] present on the ship[BIOSCAN_LOCATION(show_locations, xenoLocationS)], [numXenosPlanetr ? "approximately [numXenosPlanetr]":"no"] signature[numXenosPlanetr > 1 ? "s":""] located elsewhere[BIOSCAN_LOCATION(show_locations, xenoLocationP)] and [numXenosTransit || "no"] unknown lifeform signature[numXenosTransit > 1 ? "s":""] in transit."} var/ai_name = "[usr] Bioscan Status" if(ai_operator) - priority_announce(input, ai_name, sound = 'sound/AI/bioscan.ogg') + priority_announce(input, ai_name, sound = 'sound/AI/bioscan.ogg', color_override = "grey", receivers = (GLOB.alive_human_list + GLOB.ai_list)) log_game("Bioscan. Humans: [numHostsPlanet] on the planet[hostLocationP ? " Location:[hostLocationP]":""] and [numHostsShip] on the ship.[hostLocationS ? " Location: [hostLocationS].":""] Xenos: [numXenosPlanetr] on the planet and [numXenosShip] on the ship[xenoLocationP ? " Location:[xenoLocationP]":""] and [numXenosTransit] in transit.") switch(GLOB.current_orbit) @@ -131,7 +134,7 @@ return if(announce_humans) - priority_announce(input, name, sound = 'sound/AI/bioscan.ogg') + priority_announce(input, name, sound = 'sound/AI/bioscan.ogg', color_override = "grey", receivers = (GLOB.alive_human_list + GLOB.ai_list)) // Hide this from observers, they have their own detailed alert. if(send_fax) var/fax_message = generate_templated_fax("Combat Information Center", "[MAIN_AI_SYSTEM] Bioscan Status", "", input, "", MAIN_AI_SYSTEM) @@ -141,13 +144,18 @@ for(var/i in GLOB.observer_list) var/mob/M = i - to_chat(M, "
Detailed Information
") - to_chat(M, {"[numXenosPlanet] xeno\s on the planet. + to_chat(M, assemble_alert( + title = "Detailed Bioscan", + message = {"[numXenosPlanet] xeno\s on the planet. [numXenosShip] xeno\s on the ship. +[numXenosTransit] xeno\s in transit. + [numHostsPlanet] human\s on the planet. [numHostsShip] human\s on the ship. -[numHostsTransit] human\s in transit. -[numXenosTransit] xeno\s in transit."}) +[numHostsTransit] human\s in transit."}, + color_override = "purple", + minor = TRUE + )) message_admins("Bioscan - Humans: [numHostsPlanet] on the planet[hostLocationP ? ". Location:[hostLocationP]":""]. [numHostsShipr] on the ship.[hostLocationS ? " Location: [hostLocationS].":""]. [numHostsTransitr] in transit.") message_admins("Bioscan - Xenos: [numXenosPlanetr] on the planet[numXenosPlanetr > 0 && xenoLocationP ? ". Location:[xenoLocationP]":""]. [numXenosShip] on the ship.[xenoLocationS ? " Location: [xenoLocationS].":""] [numXenosTransitr] in transit.") @@ -289,7 +297,12 @@ if(!SSmapping.configs[GROUND_MAP].announce_text) return - priority_announce(SSmapping.configs[GROUND_MAP].announce_text, SSmapping.configs[SHIP_MAP].map_name) + priority_announce( + title = "High Command Update", + subtitle = "Good morning, marines.", + message = "Cryosleep disengaged by TGMC High Command.ATTN: [SSmapping.configs[SHIP_MAP].map_name].
[SSmapping.configs[GROUND_MAP].announce_text]", + color_override = "red" + ) /datum/game_mode/infestation/announce() @@ -306,7 +319,7 @@ /datum/game_mode/infestation/proc/on_nuclear_diffuse(obj/machinery/nuclearbomb/bomb, mob/living/carbon/xenomorph/X) SIGNAL_HANDLER - priority_announce("WARNING. WARNING. Planetary Nuke deactivated. WARNING. WARNING. Self destruct failed. WARNING. WARNING.", "Priority Alert") + priority_announce("WARNING. WARNING. Planetary Nuke deactivated. WARNING. WARNING. Self destruct failed. WARNING. WARNING.", "Planetary Warhead Disengaged", type = ANNOUNCEMENT_PRIORITY) /datum/game_mode/infestation/proc/on_nuclear_explosion(datum/source, z_level) SIGNAL_HANDLER @@ -322,7 +335,7 @@ /datum/game_mode/infestation/proc/play_cinematic(z_level) GLOB.enter_allowed = FALSE - priority_announce("DANGER. DANGER. Planetary Nuke Activated. DANGER. DANGER. Self destruct in progress. DANGER. DANGER.", "Priority Alert") + priority_announce("DANGER. DANGER. Planetary Nuke Activated. DANGER. DANGER. Self destruct in progress. DANGER. DANGER.", "Planetary Warhead Detonation Confirmed", type = ANNOUNCEMENT_PRIORITY) var/sound/S = sound(pick('sound/theme/nuclear_detonation1.ogg','sound/theme/nuclear_detonation2.ogg'), channel = CHANNEL_CINEMATIC) SEND_SOUND(world, S) diff --git a/code/datums/gamemodes/nuclear_war.dm b/code/datums/gamemodes/nuclear_war.dm index 3d958f2d56077..fe68e8d2676e8 100644 --- a/code/datums/gamemodes/nuclear_war.dm +++ b/code/datums/gamemodes/nuclear_war.dm @@ -2,13 +2,14 @@ name = "Nuclear War" config_tag = "Nuclear War" silo_scaling = 1.5 - flags_round_type = MODE_INFESTATION|MODE_LATE_OPENING_SHUTTER_TIMER|MODE_XENO_RULER|MODE_PSY_POINTS|MODE_PSY_POINTS_ADVANCED|MODE_DEAD_GRAB_FORBIDDEN|MODE_HIJACK_POSSIBLE|MODE_SILO_RESPAWN|MODE_SILOS_SPAWN_MINIONS|MODE_ALLOW_XENO_QUICKBUILD - flags_xeno_abilities = ABILITY_NUCLEARWAR + round_type_flags = MODE_INFESTATION|MODE_LATE_OPENING_SHUTTER_TIMER|MODE_XENO_RULER|MODE_PSY_POINTS|MODE_PSY_POINTS_ADVANCED|MODE_DEAD_GRAB_FORBIDDEN|MODE_HIJACK_POSSIBLE|MODE_SILO_RESPAWN|MODE_SILOS_SPAWN_MINIONS|MODE_ALLOW_XENO_QUICKBUILD|MODE_FORCE_CUSTOMSQUAD_UI + xeno_abilities_flags = ABILITY_NUCLEARWAR valid_job_types = list( /datum/job/terragov/command/captain = 1, /datum/job/terragov/command/fieldcommander = 1, /datum/job/terragov/command/staffofficer = 4, - /datum/job/terragov/command/pilot = 2, + /datum/job/terragov/command/pilot = 1, + /datum/job/terragov/command/transportofficer = 1, /datum/job/terragov/engineering/chief = 1, /datum/job/terragov/engineering/tech = 2, /datum/job/terragov/requisitions/officer = 1, @@ -18,6 +19,7 @@ /datum/job/terragov/civilian/liaison = 1, /datum/job/terragov/silicon/synthetic = 1, /datum/job/terragov/command/mech_pilot = 0, + /datum/job/terragov/command/assault_crewman = 0, /datum/job/terragov/silicon/ai = 1, /datum/job/terragov/squad/engineer = 1, /datum/job/terragov/squad/corpsman = 1, @@ -37,7 +39,8 @@ /datum/game_mode/infestation/nuclear_war/post_setup() . = ..() - SSpoints.add_psy_points(XENO_HIVE_NORMAL, 1400) + SSpoints.add_strategic_psy_points(XENO_HIVE_NORMAL, 1400) + SSpoints.add_tactical_psy_points(XENO_HIVE_NORMAL, 300) for(var/obj/effect/landmark/corpsespawner/corpse AS in GLOB.corpse_landmarks_list) corpse.create_mob() diff --git a/code/datums/gamemodes/zombie_crash.dm b/code/datums/gamemodes/zombie_crash.dm index d18175954f145..b5de055ee3d5d 100644 --- a/code/datums/gamemodes/zombie_crash.dm +++ b/code/datums/gamemodes/zombie_crash.dm @@ -1,7 +1,7 @@ /datum/game_mode/infestation/crash/zombie name = "Zombie Crash" config_tag = "Zombie Crash" - flags_round_type = MODE_XENO_SPAWN_PROTECTION + round_type_flags = MODE_XENO_SPAWN_PROTECTION valid_job_types = list( /datum/job/terragov/squad/standard = -1, /datum/job/terragov/squad/engineer = 8, diff --git a/code/datums/greyscale/_greyscale_config.dm b/code/datums/greyscale/_greyscale_config.dm index 1bc56a5d524bd..667adc751b1c2 100644 --- a/code/datums/greyscale/_greyscale_config.dm +++ b/code/datums/greyscale/_greyscale_config.dm @@ -30,9 +30,6 @@ /// Flags that can be used to modify use var/greyscale_flags = NONE - ///If an icon_state is in this list, it wont be generated. - var/list/ignore_states = list() - // There's more sanity checking here than normal because this is designed for spriters to work with // Sensible error messages that tell you exactly what's wrong is the best way to make this easy to use /datum/greyscale_config/New() @@ -73,8 +70,6 @@ if(!length(raw_layers)) stack_trace("The json configuration [DebugName()] for icon state '[state]' is missing any layers.") continue - if(state in ignore_states) - continue if(icon_states[state]) stack_trace("The json configuration [DebugName()] has a duplicate icon state '[state]' and is being overriden.") icon_states[state] = ReadLayersFromJson(raw_layers) diff --git a/code/datums/greyscale/greyscale_configs.dm b/code/datums/greyscale/greyscale_configs.dm index ca9e02ab3e05e..bde58cd53a04e 100644 --- a/code/datums/greyscale/greyscale_configs.dm +++ b/code/datums/greyscale/greyscale_configs.dm @@ -97,15 +97,6 @@ /datum/greyscale_config/armor_mk1/skirmisher icon_file = 'icons/mob/modular/mark_one/skirmisher.dmi' -/datum/greyscale_config/armor_mk1/kabuto - icon_file = 'icons/mob/modular/mark_one/kabuto.dmi' - -/datum/greyscale_config/armor_mk1/hotaru - icon_file = 'icons/mob/modular/mark_one/hotaru.dmi' - -/datum/greyscale_config/armor_mk1/dashe - icon_file = 'icons/mob/modular/mark_one/dashe.dmi' - //Hardsuits /datum/greyscale_config/hardsuit_variant @@ -159,9 +150,6 @@ /datum/greyscale_config/armor_mk2/trooper icon_file = 'icons/mob/modular/mark_two/trooper.dmi' -/datum/greyscale_config/armor_mk2/hotaru - icon_file = 'icons/mob/modular/mark_two/hotaru.dmi' - /datum/greyscale_config/xenonaut icon_file = 'icons/mob/modular/xenonauten.dmi' json_config = 'code/datums/greyscale/json_configs/xenonaut.json' @@ -262,336 +250,6 @@ json_config = 'code/datums/greyscale/json_configs/projectiles.json' icon_file = 'icons/obj/items/projectiles.dmi' - -/datum/greyscale_config/gun - json_config = 'code/datums/greyscale/json_configs/gun.json' - icon_file ='icons/Marine/greyscale_gun/gun.dmi' - prefix = "t18_" - ignore_states = list("loaded_fire", "belt", "loaded_l", "loaded_a", "unloaded_a") - -/datum/greyscale_config/gun/tx11 - prefix = "tx11_" -/datum/greyscale_config/gun/tx15 - prefix = "tx15_" - -/datum/greyscale_config/gun/t90 - prefix = "t90_" - -/datum/greyscale_config/gun/sg29 - prefix = "sg29_" - -//Pistols -/datum/greyscale_config/gun/pistol - ignore_states = list("loaded_fire", "loaded_l", "loaded_a", "unloaded_a") - prefix = "tp14_" - -/datum/greyscale_config/gun/pistol/tp23 - prefix = "tp23_" - -/datum/greyscale_config/gun/pistol/tx7 - ignore_states = list("loaded_fire", "loaded_l") - prefix = "tx7_" - -/datum/greyscale_config/gun/pistol/tep - icon_file ='icons/Marine/greyscale_gun/gun_64.dmi' - ignore_states = list("loaded_fire", "loaded_a", "unloaded_a") - prefix = "tep_" - -//Revolvers -/datum/greyscale_config/gun/revolver - json_config = 'code/datums/greyscale/json_configs/gun_revolver.json' - ignore_states = list() - prefix = "tp44_" - -//64 pixel guns -/datum/greyscale_config/gun/gun64 - icon_file ='icons/Marine/greyscale_gun/gun_64.dmi' - prefix = "t12_" -/datum/greyscale_config/gun/gun64/t42 - prefix = "t42_" -/datum/greyscale_config/gun/gun64/t81 - prefix = "t81_" -/datum/greyscale_config/gun/gun64/t21 - prefix = "t21_" - -/datum/greyscale_config/gun/gun64/t60 - ignore_states = list("belt", "loaded_l", "loaded_a", "unloaded_a") - prefix = "t60_" - -/datum/greyscale_config/gun/gun64/t37 - prefix = "t37_" - -/datum/greyscale_config/gun/gun64/lasgun - ignore_states = list("loaded_fire", "belt", "loaded_a", "unloaded_a") - prefix = "ter_" - -/datum/greyscale_config/gun/gun64/lasgun/tec - prefix = "tec_" - -/datum/greyscale_config/gun/gun64/lasgun/tem - prefix = "tem_" - -/datum/greyscale_config/gun/gun64/lasgun/tes - prefix = "tes_" - - -/datum/greyscale_config/gun/gun64/shotgun - json_config = 'code/datums/greyscale/json_configs/gun_shotgun.json' - ignore_states = list() - prefix = "t35_" - -/datum/greyscale_config/gun/gun64/shotgun/tl127 - prefix = "tl127_" - -//Mob Sprites for guns - -/datum/greyscale_config/worn_gun - json_config = 'code/datums/greyscale/json_configs/gun_mob.json' - icon_file = 'icons/Marine/greyscale_gun/back.dmi' - prefix = "t12_" - -/datum/greyscale_config/worn_gun/t42 - prefix = "t42_" - -/datum/greyscale_config/worn_gun/t18 - prefix = "t18_" - -/datum/greyscale_config/worn_gun/t81 - prefix = "t81_" - -/datum/greyscale_config/worn_gun/t21 - prefix = "t21_" - -/datum/greyscale_config/worn_gun/t35 - prefix = "t35_" - -/datum/greyscale_config/worn_gun/tx11 - prefix = "tx11_" - -/datum/greyscale_config/worn_gun/tx15 - prefix = "tx15_" - -/datum/greyscale_config/worn_gun/t90 - prefix = "t90_" - -/datum/greyscale_config/worn_gun/t37 - prefix = "t37_" - -/datum/greyscale_config/worn_gun/ter - prefix = "ter_" - -/datum/greyscale_config/worn_gun/tec - prefix = "tec_" - -/datum/greyscale_config/worn_gun/tem - prefix = "tem_" - -/datum/greyscale_config/worn_gun/tes - prefix = "tes_" - -/datum/greyscale_config/worn_gun/t60 - prefix = "t60_" - -/datum/greyscale_config/worn_gun/sg29 - prefix = "sg29_" - -/datum/greyscale_config/worn_gun/tl127 - prefix = "tl127_" - -/datum/greyscale_config/worn_gun/suit - icon_file = 'icons/Marine/greyscale_gun/suit.dmi' - -/datum/greyscale_config/worn_gun/suit/t42 - prefix = "t42_" - -/datum/greyscale_config/worn_gun/suit/t18 - prefix = "t18_" - -/datum/greyscale_config/worn_gun/suit/t81 - prefix = "t81_" - -/datum/greyscale_config/worn_gun/suit/t21 - prefix = "t21_" - -/datum/greyscale_config/worn_gun/suit/t35 - prefix = "t35_" - -/datum/greyscale_config/worn_gun/suit/tx11 - prefix = "tx11_" - -/datum/greyscale_config/worn_gun/suit/tx15 - prefix = "tx15_" - -/datum/greyscale_config/worn_gun/suit/t90 - prefix = "t90_" - -/datum/greyscale_config/worn_gun/suit/t37 - prefix = "t37_" - -/datum/greyscale_config/worn_gun/suit/ter - prefix = "ter_" -/datum/greyscale_config/worn_gun/suit/tec - prefix = "tec_" -/datum/greyscale_config/worn_gun/suit/tem - prefix = "tem_" -/datum/greyscale_config/worn_gun/suit/tes - prefix = "tes_" - -/datum/greyscale_config/worn_gun/suit/t60 - prefix = "t60_" - -/datum/greyscale_config/worn_gun/suit/tl127 - prefix = "tl127_" - -/datum/greyscale_config/worn_gun/suit/sg29 - prefix = "sg29_" - -/datum/greyscale_config/gun_inhand - json_config = 'code/datums/greyscale/json_configs/gun_hands.json' - icon_file = 'icons/Marine/greyscale_gun/l_hand.dmi' - prefix = "t12_" - -/datum/greyscale_config/gun_inhand/t42 - icon_file = 'icons/Marine/greyscale_gun/l_hand_64.dmi' - prefix = "t42_" - -/datum/greyscale_config/gun_inhand/t18 - prefix = "t18_" - -/datum/greyscale_config/gun_inhand/t81 - prefix = "t81_" - -/datum/greyscale_config/gun_inhand/t21 - icon_file = 'icons/Marine/greyscale_gun/l_hand_64.dmi' - prefix = "t21_" - -/datum/greyscale_config/gun_inhand/t35 - prefix = "t35_" - -/datum/greyscale_config/gun_inhand/tx11 - prefix = "tx11_" - -/datum/greyscale_config/gun_inhand/tx15 - prefix = "tx15_" - -/datum/greyscale_config/gun_inhand/tp14 - prefix = "tp14_" - -/datum/greyscale_config/gun_inhand/tp23 - prefix = "tp23_" - -/datum/greyscale_config/gun_inhand/tp44 - prefix = "tp44_" - -/datum/greyscale_config/gun_inhand/t90 - prefix = "t90_" - -/datum/greyscale_config/gun_inhand/t37 - icon_file = 'icons/Marine/greyscale_gun/l_hand_64.dmi' - prefix = "t37_" - -/datum/greyscale_config/gun_inhand/ter - prefix = "ter_" -/datum/greyscale_config/gun_inhand/tep - prefix = "tep_" -/datum/greyscale_config/gun_inhand/tec - prefix = "tec_" -/datum/greyscale_config/gun_inhand/tem - prefix = "tem_" -/datum/greyscale_config/gun_inhand/tes - prefix = "tes_" - -/datum/greyscale_config/gun_inhand/tx7 - prefix = "tx7_" - -/datum/greyscale_config/gun_inhand/t60 - icon_file = 'icons/Marine/greyscale_gun/l_hand_64.dmi' - prefix = "t60_" - -/datum/greyscale_config/gun_inhand/tl127 - icon_file = 'icons/Marine/greyscale_gun/l_hand_64.dmi' - prefix = "tl127_" - -/datum/greyscale_config/gun_inhand/sg29 - prefix = "sg29_" - -/datum/greyscale_config/gun_inhand/r_hand - icon_file = 'icons/Marine/greyscale_gun/r_hand.dmi' - -/datum/greyscale_config/gun_inhand/r_hand/t42 - icon_file = 'icons/Marine/greyscale_gun/r_hand_64.dmi' - prefix = "t42_" - -/datum/greyscale_config/gun_inhand/r_hand/t18 - prefix = "t18_" - -/datum/greyscale_config/gun_inhand/r_hand/t81 - prefix = "t81_" - -/datum/greyscale_config/gun_inhand/r_hand/t21 - icon_file = 'icons/Marine/greyscale_gun/r_hand_64.dmi' - prefix = "t21_" - -/datum/greyscale_config/gun_inhand/r_hand/t35 - prefix = "t35_" - -/datum/greyscale_config/gun_inhand/r_hand/tx11 - prefix = "tx11_" - -/datum/greyscale_config/gun_inhand/r_hand/tx15 - prefix = "tx15_" - -/datum/greyscale_config/gun_inhand/r_hand/tp14 - prefix = "tp14_" - -/datum/greyscale_config/gun_inhand/r_hand/tp23 - prefix = "tp23_" - -/datum/greyscale_config/gun_inhand/r_hand/tp44 - prefix = "tp44_" - -/datum/greyscale_config/gun_inhand/r_hand/t90 - prefix = "t90_" - -/datum/greyscale_config/gun_inhand/r_hand/t37 - icon_file = 'icons/Marine/greyscale_gun/r_hand_64.dmi' - prefix = "t37_" - -/datum/greyscale_config/gun_inhand/r_hand/ter - prefix = "ter_" -/datum/greyscale_config/gun_inhand/r_hand/tep - prefix = "tep_" -/datum/greyscale_config/gun_inhand/r_hand/tec - prefix = "tec_" -/datum/greyscale_config/gun_inhand/r_hand/tem - prefix = "tem_" -/datum/greyscale_config/gun_inhand/r_hand/tes - prefix = "tes_" - -/datum/greyscale_config/gun_inhand/r_hand/tx7 - prefix = "tx7_" - -/datum/greyscale_config/gun_inhand/r_hand/t60 - icon_file = 'icons/Marine/greyscale_gun/r_hand_64.dmi' - prefix = "t60_" - -/datum/greyscale_config/gun_inhand/r_hand/tl127 - icon_file = 'icons/Marine/greyscale_gun/r_hand_64.dmi' - prefix = "tl127_" - -/datum/greyscale_config/gun_inhand/r_hand/sg29 - prefix = "sg29_" - -//Attachments -/datum/greyscale_config/gun_attachment - json_config = 'code/datums/greyscale/json_configs/attachments.json' - icon_file = 'icons/Marine/greyscale_gun/attachments.dmi' - -/datum/greyscale_config/gun_attachment_64 - json_config = 'code/datums/greyscale/json_configs/attachments_64.json' - icon_file = 'icons/Marine/greyscale_gun/attachments_64.dmi' - - /* * MECHS */ diff --git a/code/datums/greyscale/json_configs/attachments.json b/code/datums/greyscale/json_configs/attachments.json deleted file mode 100644 index 40f151503a0d0..0000000000000 --- a/code/datums/greyscale/json_configs/attachments.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "verticalgrip":[ - { - "type":"hyperscale", - "icon_state":"verticalgrip" - } - ], - "verticalgrip_a":[ - { - "type":"hyperscale", - "icon_state":"verticalgrip_a" - } - ], - "angledgrip":[ - { - "type":"hyperscale", - "icon_state":"angledgrip" - } - ], - "angledgrip_a":[ - { - "type":"hyperscale", - "icon_state":"angledgrip_a" - } - ], - "t60stock_a":[ - { - "type":"hyperscale", - "icon_state":"t60stock_a" - }, - { - "type":"icon_state", - "icon_state":"t60stock_no_color_a", - "blend_mode":"overlay" - } - ], - "tl127stock_a":[ - { - "type":"hyperscale", - "icon_state":"tl127stock_a" - }, - { - "type":"icon_state", - "icon_state":"tl127stock_no_color_a", - "blend_mode":"overlay" - } - ], - "sg29stock_a":[ - { - "type":"hyperscale", - "icon_state":"sg29stock_a" - } - ] -} diff --git a/code/datums/greyscale/json_configs/attachments_64.json b/code/datums/greyscale/json_configs/attachments_64.json deleted file mode 100644 index 34434035f02d8..0000000000000 --- a/code/datums/greyscale/json_configs/attachments_64.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "t35stock":[ - { - "type":"hyperscale", - "icon_state":"t35stock_color" - }, - { - "type":"icon_state", - "icon_state":"t35stock", - "blend_mode":"overlay" - } - ], - "t35stock_a":[ - { - "type":"hyperscale", - "icon_state":"t35stock_color" - }, - { - "type":"icon_state", - "icon_state":"t35stock_a", - "blend_mode":"overlay" - } - ], - "t35stock_open":[ - { - "type":"hyperscale", - "icon_state":"t35stock_color" - }, - { - "type":"icon_state", - "icon_state":"t35stock_open", - "blend_mode":"overlay" - } - ], - "t35stock_open_a":[ - { - "type":"hyperscale", - "icon_state":"t35stock_color" - }, - { - "type":"icon_state", - "icon_state":"t35stock_open_a", - "blend_mode":"overlay" - } - ] -} diff --git a/code/datums/greyscale/json_configs/cape.json b/code/datums/greyscale/json_configs/cape.json index c675cfb642e81..c048444da34e6 100644 --- a/code/datums/greyscale/json_configs/cape.json +++ b/code/datums/greyscale/json_configs/cape.json @@ -155,24 +155,6 @@ "icon_state": "cover_2" } ], - "cape_overlord": [ - { - "type": "hyperscale", - "icon_state": "overlord" - } - ], - "cape_overlord (alt 1)": [ - { - "type": "hyperscale", - "icon_state": "overlord_2" - } - ], - "cape_overlord (alt 2)": [ - { - "type": "hyperscale", - "icon_state": "overlord_3" - } - ], "cape_shoal": [ { "type": "hyperscale", @@ -185,12 +167,6 @@ "icon_state": "shoal_back" } ], - "cape_star": [ - { - "type": "hyperscale", - "icon_state": "star" - } - ], "cape_shoal (alt)": [ { "type": "hyperscale", @@ -209,12 +185,6 @@ "icon_state": "rapier_left" } ], - "cape_jacket": [ - { - "type": "hyperscale", - "icon_state": "jacket" - } - ], "cape_kama": [ { "type": "hyperscale", diff --git a/code/datums/greyscale/json_configs/cape_highlight.json b/code/datums/greyscale/json_configs/cape_highlight.json index b1372c924ac2a..e59b1c2f7e34e 100644 --- a/code/datums/greyscale/json_configs/cape_highlight.json +++ b/code/datums/greyscale/json_configs/cape_highlight.json @@ -120,24 +120,6 @@ "icon_state": "cover_2" } ], - "highlight_overlord":[ - { - "type": "hyperscale", - "icon_state": "overlord" - } - ], - "highlight_overlord (alt)":[ - { - "type": "hyperscale", - "icon_state": "overlord_2" - } - ], - "highlight_overlord (alt 2)":[ - { - "type": "hyperscale", - "icon_state": "overlord_3" - } - ], "highlight_shoal":[ { "type": "hyperscale", @@ -156,12 +138,6 @@ "icon_state": "shoal_back" } ], - "highlight_star":[ - { - "type": "hyperscale", - "icon_state": "star" - } - ], "highlight_rapier left":[ { "type": "hyperscale", @@ -173,11 +149,5 @@ "type": "hyperscale", "icon_state": "rapier_right" } - ], - "highlight_jacket":[ - { - "type": "hyperscale", - "icon_state": "jacket" - } ] } diff --git a/code/datums/greyscale/json_configs/gun.json b/code/datums/greyscale/json_configs/gun.json deleted file mode 100644 index f36537ef47a8e..0000000000000 --- a/code/datums/greyscale/json_configs/gun.json +++ /dev/null @@ -1,79 +0,0 @@ -{ - "loaded":[ - { - "type":"hyperscale", - "icon_state":"colored" - }, - { - "type":"icon_state", - "icon_state":"loaded", - "blend_mode":"overlay" - } - ], - "loaded_fire":[ - { - "type":"hyperscale", - "icon_state":"colored" - }, - { - "type":"icon_state", - "icon_state":"fire", - "blend_mode":"overlay" - } - ], - "unloaded":[ - { - "type":"hyperscale", - "icon_state":"colored" - }, - { - "type":"icon_state", - "icon_state":"unloaded", - "blend_mode":"overlay" - } - ], - "belt":[ - { - "type":"hyperscale", - "icon_state":"belt_color" - }, - { - "type":"icon_state", - "icon_state":"belt_no_color", - "blend_mode":"overlay" - } - ], - "loaded_l":[ - { - "type":"hyperscale", - "icon_state":"colored" - }, - { - "type":"icon_state", - "icon_state":"linked", - "blend_mode":"overlay" - } - ], - "loaded_a":[ - { - "type":"hyperscale", - "icon_state":"colored_a" - }, - { - "type":"icon_state", - "icon_state":"loaded_a", - "blend_mode":"overlay" - } - ], - "unloaded_a":[ - { - "type":"hyperscale", - "icon_state":"colored_a" - }, - { - "type":"icon_state", - "icon_state":"unloaded_a", - "blend_mode":"overlay" - } - ] -} diff --git a/code/datums/greyscale/json_configs/gun_fire.json b/code/datums/greyscale/json_configs/gun_fire.json deleted file mode 100644 index af62066e45a8c..0000000000000 --- a/code/datums/greyscale/json_configs/gun_fire.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "loaded":[ - { - "type":"hyperscale", - "icon_state":"colored" - }, - { - "type":"icon_state", - "icon_state":"loaded", - "blend_mode":"overlay" - } - ], - "loaded_fire":[ - { - "type":"hyperscale", - "icon_state":"colored" - }, - { - "type":"icon_state", - "icon_state":"fire", - "blend_mode":"overlay" - } - ], - "unloaded":[ - { - "type":"hyperscale", - "icon_state":"colored" - }, - { - "type":"icon_state", - "icon_state":"unloaded", - "blend_mode":"overlay" - } - ] -} diff --git a/code/datums/greyscale/json_configs/gun_hands.json b/code/datums/greyscale/json_configs/gun_hands.json deleted file mode 100644 index 9cdfc6e047a3a..0000000000000 --- a/code/datums/greyscale/json_configs/gun_hands.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "loaded":[ - { - "type":"hyperscale", - "icon_state":"color" - }, - { - "type":"icon_state", - "icon_state":"no_color", - "blend_mode":"overlay" - } - ], - "loaded_w":[ - { - "type":"hyperscale", - "icon_state":"color_w" - }, - { - "type":"icon_state", - "icon_state":"no_color_w", - "blend_mode":"overlay" - } - ] -} diff --git a/code/datums/greyscale/json_configs/gun_mob.json b/code/datums/greyscale/json_configs/gun_mob.json deleted file mode 100644 index ec50949534661..0000000000000 --- a/code/datums/greyscale/json_configs/gun_mob.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "loaded":[ - { - "type":"hyperscale", - "icon_state":"color" - }, - { - "type":"icon_state", - "icon_state":"no_color", - "blend_mode":"overlay" - } - ] -} diff --git a/code/datums/greyscale/json_configs/gun_revolver.json b/code/datums/greyscale/json_configs/gun_revolver.json deleted file mode 100644 index 68e4f0c444175..0000000000000 --- a/code/datums/greyscale/json_configs/gun_revolver.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "loaded":[ - { - "type":"hyperscale", - "icon_state":"colored" - }, - { - "type":"icon_state", - "icon_state":"loaded", - "blend_mode":"overlay" - } - ], - "unloaded":[ - { - "type":"hyperscale", - "icon_state":"colored" - }, - { - "type":"icon_state", - "icon_state":"unloaded", - "blend_mode":"overlay" - } - - ], - "open":[ - { - "type":"hyperscale", - "icon_state":"colored" - }, - { - "type":"icon_state", - "icon_state":"open", - "blend_mode":"overlay" - } - ], - "belt":[ - { - "type":"hyperscale", - "icon_state":"belt_color" - }, - { - "type":"icon_state", - "icon_state":"belt_no_color", - "blend_mode":"overlay" - } - ] -} diff --git a/code/datums/greyscale/json_configs/gun_shotgun.json b/code/datums/greyscale/json_configs/gun_shotgun.json deleted file mode 100644 index 5a52f581fceb3..0000000000000 --- a/code/datums/greyscale/json_configs/gun_shotgun.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "loaded":[ - { - "type":"hyperscale", - "icon_state":"colored" - }, - { - "type":"icon_state", - "icon_state":"loaded", - "blend_mode":"overlay" - } - ], - "unloaded":[ - { - "type":"hyperscale", - "icon_state":"colored_unloaded" - }, - { - "type":"icon_state", - "icon_state":"unloaded", - "blend_mode":"overlay" - } - ], - "unracked":[ - { - "type":"hyperscale", - "icon_state":"colored" - }, - { - "type":"icon_state", - "icon_state":"unprimed", - "blend_mode":"overlay" - } - ], - "pump":[ - { - "type":"hyperscale", - "icon_state":"colored_pump" - }, - { - "type":"icon_state", - "icon_state":"pump", - "blend_mode":"overlay" - } - ] -} diff --git a/code/datums/greyscale/json_configs/visors.json b/code/datums/greyscale/json_configs/visors.json index 1941449c37d8c..95e7812e2af1d 100644 --- a/code/datums/greyscale/json_configs/visors.json +++ b/code/datums/greyscale/json_configs/visors.json @@ -41,24 +41,6 @@ "icon_state": "trooper" } ], - "kabuto_visor": [ - { - "type": "hyperscale", - "icon_state": "kabuto" - } - ], - "hotaru_visor": [ - { - "type": "hyperscale", - "icon_state": "hotaru" - } - ], - "dashe_visor": [ - { - "type": "hyperscale", - "icon_state": "dashe" - } - ], "eva_visor": [ { "type": "hyperscale", diff --git a/code/datums/interior/_interior.dm b/code/datums/interior/_interior.dm new file mode 100644 index 0000000000000..1dd8d0bd6cf04 --- /dev/null +++ b/code/datums/interior/_interior.dm @@ -0,0 +1,106 @@ +#define INTERIOR_BUFFER_TILES 1 + +/datum/interior + ///map template to load as the interior + var/template = /datum/map_template + ///container that this interior is attached to; what we are the inside of + var/atom/container + ///callback to execute when we want to eject the mob + var/datum/callback/exit_callback + ///occupants that entered this interior through the intended way + var/list/mob/occupants = list() + ///turf reservation where we will load our interior + var/datum/turf_reservation/reservation + ///list of all loaded turfs. we keep this around in case we need to update linkages or similar + var/list/turf/loaded_turfs = list() + /// the interior area. you should only be using 1 area for the whole thing, if you're not, make this support it lol + var/area/this_area + +/datum/interior/New(atom/container, datum/callback/exit_callback) + ..() + src.container = container + src.exit_callback = exit_callback + RegisterSignal(container, COMSIG_QDELETING, PROC_REF(handle_container_del)) + RegisterSignal(container, COMSIG_ATOM_ENTERED, PROC_REF(on_container_enter)) + INVOKE_NEXT_TICK(src, PROC_REF(init_map)) + +///actual inits the map, seperate proc because otherwise it fails linter due to "sleep in new" +/datum/interior/proc/init_map() + var/datum/map_template/map = new template + reservation = SSmapping.RequestBlockReservation(map.width + (INTERIOR_BUFFER_TILES*2), map.height + (INTERIOR_BUFFER_TILES*2)) + + var/list/load_coords = reservation.bottom_left_coords.Copy() + load_coords[1] = load_coords[1] + INTERIOR_BUFFER_TILES + load_coords[2] = load_coords[2] + INTERIOR_BUFFER_TILES + var/turf/load_loc = locate(load_coords[1], load_coords[2], load_coords[3]) + var/list/bounds = map.load(load_loc) + this_area = load_loc.loc + + loaded_turfs = block( + locate(bounds[MAP_MINX], bounds[MAP_MINY], bounds[MAP_MINZ]), + locate(bounds[MAP_MAXX], bounds[MAP_MAXY], bounds[MAP_MAXZ]) + ) + + connect_atoms() + +/datum/interior/Destroy(force, ...) + for(var/mob/occupant AS in occupants) + mob_leave(occupant) + exit_callback = null + this_area = null + loaded_turfs = null + QDEL_NULL(reservation) //all the turfs/objs are deleted past this point + container = null + return ..() + +///connects all atoms as needed to the interior. seperate so it can be used in debugging +/datum/interior/proc/connect_atoms() + for(var/turf/tile AS in loaded_turfs) + for(var/atom/subject AS in tile.GetAllContents()) + subject.link_interior(src) + CHECK_TICK + +///called when someone enters the container +/datum/interior/proc/on_container_enter(datum/source, atom/movable/moved_in, direction) + SIGNAL_HANDLER + if(ismob(moved_in)) + mob_enter(moved_in) + +///called when we want to move a mob into the interior +/datum/interior/proc/mob_enter(mob/enterer) + RegisterSignal(enterer, COMSIG_QDELETING, PROC_REF(handle_occupant_del)) + RegisterSignal(enterer, COMSIG_EXIT_AREA, PROC_REF(handle_area_leave)) + for(var/datum/action/minimap/user_map in enterer.actions) + user_map.override_locator(container) + occupants += enterer + //teleporting the mob is on a case-by-case basis + +///called when we want to remove a mob from the interior +/datum/interior/proc/mob_leave(mob/leaver, teleport = TRUE) + UnregisterSignal(leaver, list(COMSIG_QDELETING, COMSIG_EXIT_AREA)) + occupants -= leaver + exit_callback?.Invoke(leaver, src, teleport) + for(var/datum/action/minimap/user_map in leaver.actions) + user_map.clear_locator_override() + +///called when a mob gets deleted while an occupant +/datum/interior/proc/handle_occupant_del(mob/source) + SIGNAL_HANDLER + mob_leave(source, FALSE) + +///called when parent container is deleted +/datum/interior/proc/handle_container_del(atom/source) + SIGNAL_HANDLER + qdel(src) + +///when someone who entered the "proper" way leaves the area, remove them as an occupant without teleporting +/datum/interior/proc/handle_area_leave(mob/source, area/oldarea, direction) + SIGNAL_HANDLER + if(get_area(source) != this_area) + mob_leave(source, FALSE) + +#undef INTERIOR_BUFFER_TILES + +/area/interior + name = "ERROR AREA DO NOT USE" + base_lighting_alpha = 128 diff --git a/code/datums/interior/interior_tank.dm b/code/datums/interior/interior_tank.dm new file mode 100644 index 0000000000000..2001ef28ba910 --- /dev/null +++ b/code/datums/interior/interior_tank.dm @@ -0,0 +1,142 @@ +/datum/interior/armored + template = /datum/map_template/interior/medium_tank + ///main cannon ammo management + var/obj/structure/gun_breech/breech + ///secondary gun ammo management + var/obj/structure/gun_breech/secondary_breech + ///driver seat that allows driving + var/obj/structure/bed/chair/vehicle_driver_seat/drive_seat + //gunner seat that allows weapon control + var/obj/structure/bed/chair/vehicle_gunner_seat/gun_seat + ///door to enter and leave the tank. TODO: make this support multiple doors + var/turf/closed/interior/tank/door/door + +/datum/interior/armored/Destroy(force, ...) + breech = null + secondary_breech = null + drive_seat = null + gun_seat = null + door = null + return ..() + +/datum/interior/armored/mob_enter(mob/enterer) + if(door) + enterer.forceMove(door.get_enter_location()) + enterer.setDir(EAST) + return ..() + to_chat(enterer, span_userdanger("AN ERROR OCCURED PUTTING YOU INTO AN INTERIOR")) + stack_trace("a [enterer.type] could not find a door when entering an interior") + enterer.forceMove(pick(loaded_turfs)) + return ..() + +/turf/closed/interior + resistance_flags = RESIST_ALL + +/turf/closed/interior/tank + name = "\improper Ares tank interior" + icon = 'icons/obj/armored/3x3/tank_interior.dmi' + +/turf/closed/interior/tank/one + icon_state = "tank_interior_1" +/turf/closed/interior/tank/two + icon_state = "tank_interior_2" +/turf/closed/interior/tank/three + icon_state = "tank_interior_3" +/turf/closed/interior/tank/four + icon_state = "tank_interior_4" +/turf/closed/interior/tank/five + icon_state = "tank_interior_5" +/turf/closed/interior/tank/six + icon_state = "tank_interior_6" +/turf/closed/interior/tank/twelve + icon_state = "tank_interior_12" +/turf/closed/interior/tank/thirteen + icon_state = "tank_interior_13" +/turf/closed/interior/tank/seventeen + icon_state = "tank_interior_17" +/turf/closed/interior/tank/eighteen + icon_state = "tank_interior_18" +/turf/closed/interior/tank/nineteen + icon_state = "tank_interior_19" + layer = ABOVE_ALL_MOB_LAYER +/turf/closed/interior/tank/twenty + icon_state = "tank_interior_20" + layer = ABOVE_ALL_MOB_LAYER +/turf/closed/interior/tank/twentyone + icon_state = "tank_interior_21" + layer = ABOVE_ALL_MOB_LAYER +/turf/closed/interior/tank/twentythree + icon_state = "tank_interior_23" +/turf/closed/interior/tank/twentyfour + icon_state = "tank_interior_24" +/turf/closed/interior/tank/twentyfive + icon_state = "tank_interior_25" + layer = ABOVE_ALL_MOB_LAYER +/turf/closed/interior/tank/twentysix + icon_state = "tank_interior_26" + layer = ABOVE_ALL_MOB_LAYER +/turf/closed/interior/tank/twentyseven + icon_state = "tank_interior_27" + layer = ABOVE_ALL_MOB_LAYER +/turf/closed/interior/tank/twentyeight + icon_state = "tank_interior_28" + +/turf/closed/interior/tank/door + name = "exit hatch" + icon = 'icons/obj/armored/3x3/tank_interior.dmi' + icon_state = "tank_interior_7" + resistance_flags = RESIST_ALL + ///owner of this object, assigned during interior linkage + var/obj/vehicle/sealed/armored/owner + +/turf/closed/interior/tank/door/Destroy() + owner = null + return ..() + +/turf/closed/interior/tank/door/link_interior(datum/interior/link) + if(!istype(link, /datum/interior/armored)) + CRASH("invalid interior [link.type] passed to [name]") + var/datum/interior/armored/inside = link + inside.door = src + owner = inside.container + +/turf/closed/interior/tank/door/attack_hand(mob/living/user) + . = ..() + owner.interior.mob_leave(user) + +/turf/closed/interior/tank/door/attack_ghost(mob/dead/observer/user) + . = ..() + owner.interior.mob_leave(user) + +///returns where we want to spit out new enterers +/turf/closed/interior/tank/door/proc/get_enter_location() + return get_step(src, EAST) + + +/turf/open/interior + resistance_flags = RESIST_ALL + +/turf/open/interior/tank + name = "\improper Ares tank interior" + icon = 'icons/obj/armored/3x3/tank_interior.dmi' + +/turf/open/interior/tank/eight + icon_state = "tank_interior_8" +/turf/open/interior/tank/nine + icon_state = "tank_interior_9" +/turf/open/interior/tank/ten + icon_state = "tank_interior_10" +/turf/open/interior/tank/eleven + icon_state = "tank_interior_11" +/turf/open/interior/tank/fourteen + icon_state = "tank_interior_14" +/turf/open/interior/tank/fifteen + icon_state = "tank_interior_15" +/turf/open/interior/tank/sixteen + icon_state = "tank_interior_16" +/turf/open/interior/tank/twentytwo + icon_state = "tank_interior_22" + +/area/interior/tank + name = "Tank Interior" + icon_state = "shuttle" diff --git a/code/datums/interior/link_interior.dm b/code/datums/interior/link_interior.dm new file mode 100644 index 0000000000000..f91ac65286cdf --- /dev/null +++ b/code/datums/interior/link_interior.dm @@ -0,0 +1,3 @@ +///generic linkage proc for atoms to an interior. e.g loading the tank +/atom/proc/link_interior(datum/interior/link) + return diff --git a/code/datums/interior/map_templates.dm b/code/datums/interior/map_templates.dm new file mode 100644 index 0000000000000..7172a7f1ef40a --- /dev/null +++ b/code/datums/interior/map_templates.dm @@ -0,0 +1,14 @@ +/datum/map_template/interior + name = "Base Interior Template" + ///just the prefix so we dont need to fill in the entire thing + var/prefix = "_maps/interiors/" + ///filename without file type for the map + var/filename + +/datum/map_template/interior/New() + mappath = "[prefix][filename].dmm" + return ..() + +/datum/map_template/interior/medium_tank + name = "medium tank interior template" + filename = "tank" diff --git a/code/datums/jobs/access.dm b/code/datums/jobs/access.dm index 67d7f55f3e494..6eb19703ccf23 100644 --- a/code/datums/jobs/access.dm +++ b/code/datums/jobs/access.dm @@ -39,7 +39,7 @@ if(0) return ALL_ACCESS if(1) - return list(ACCESS_MARINE_CAPTAIN, ACCESS_MARINE_COMMANDER, ACCESS_MARINE_LOGISTICS, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_PILOT, ACCESS_MARINE_MECH, ACCESS_MARINE_BRIDGE)//command + return list(ACCESS_MARINE_CAPTAIN, ACCESS_MARINE_COMMANDER, ACCESS_MARINE_LOGISTICS, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_TADPOLE, ACCESS_MARINE_PILOT, ACCESS_MARINE_MECH, ACCESS_MARINE_BRIDGE, ACCESS_MARINE_ARMORED)//command if(2) return list(ACCESS_MARINE_CE, ACCESS_MARINE_ENGINEERING, ACCESS_MARINE_REMOTEBUILD)//engineering and maintenance if(3) @@ -49,7 +49,7 @@ if(5) return list(ACCESS_MARINE_WO, ACCESS_MARINE_ARMORY, ACCESS_MARINE_BRIG)//security if(6) - return list(ACCESS_MARINE_PREP, ACCESS_MARINE_MEDPREP, ACCESS_MARINE_ENGPREP, ACCESS_MARINE_SMARTPREP, ACCESS_MARINE_LEADER,)//spess mahreens + return list(ACCESS_MARINE_PREP, ACCESS_MARINE_MEDPREP, ACCESS_MARINE_ENGPREP, ACCESS_MARINE_SMARTPREP, ACCESS_MARINE_LEADER)//spess mahreens if(7) return list(ACCESS_MARINE_ALPHA, ACCESS_MARINE_BRAVO, ACCESS_MARINE_CHARLIE, ACCESS_MARINE_DELTA)//squads if(8) @@ -132,10 +132,14 @@ return "Requisitions" if(ACCESS_MARINE_DROPSHIP) return "Dropship Piloting" + if(ACCESS_MARINE_TADPOLE) + return "Tadpole Piloting" if(ACCESS_MARINE_PILOT) return "Pilot Gear" if(ACCESS_MARINE_MECH) return "Mech" + if(ACCESS_MARINE_ARMORED) + return "Armored Vehicle Bay" if(ACCESS_CIVILIAN_RESEARCH) return "Civilian Research" if(ACCESS_CIVILIAN_LOGISTICS) @@ -234,13 +238,17 @@ if("E6") . = size ? "SSGT" : "Staff Sergeant" if("E7") + . = size ? "SFC" : "Sergeant First Class" + if("E7E") . = size ? "GYSGT" : "Gunnery Sergeant" if("E8") . = size ? "MSGT" : "Master Sergeant" if("E8E") . = size ? "FSGT" : "First Sergeant" if("E9") - . = size ? "SGM" : "Sergeant Major" + . = size ? "MGYSGT" : "Master Gunnery Sergeant" + if("E9A") + . = size ? "SGM" : "Sergeant Major" //above master gunnery sergeant, below command sergeant major if("E9E") . = size ? "CSGM" : "Command Sergeant Major" if("O1") @@ -281,6 +289,10 @@ . = size ? "MAJ" : "Major" if("MO5") . = size ? "LtCol" : "Lieutenant Colonel" + if("MO6") + . = size ? "Col" : "Colonel" + if("M10") + . = size ? "Gen" : "General" if("UPP1") . = size ? "UGNR" : "USL Gunner" if("UPP2") diff --git a/code/datums/jobs/job/clf.dm b/code/datums/jobs/job/clf.dm index 1cb5cbc7d5c78..6587ecf76c53f 100644 --- a/code/datums/jobs/job/clf.dm +++ b/code/datums/jobs/job/clf.dm @@ -298,6 +298,7 @@ outfits = list( /datum/outfit/job/clf/specialist/dpm, /datum/outfit/job/clf/specialist/clf_heavyrifle, + /datum/outfit/job/clf/specialist/clf_heavymachinegun, ) //The base loadout for all CLF Specialists @@ -370,6 +371,23 @@ H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) +/datum/outfit/job/clf/specialist/clf_heavymachinegun + suit_store = /obj/item/weapon/gun/icc_hmg + belt = /obj/item/storage/belt/sparepouch + back = /obj/item/storage/backpack/lightpack + +/datum/outfit/job/clf/specialist/clf_heavymachinegun/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/icc_hmg, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/icc_hmg, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/icc_hmg, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/stick, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) + //CLF Leader /datum/job/clf/leader diff --git a/code/datums/jobs/job/fallen.dm b/code/datums/jobs/job/fallen.dm index 29433b4546131..8ed0a3ccec654 100644 --- a/code/datums/jobs/job/fallen.dm +++ b/code/datums/jobs/job/fallen.dm @@ -62,8 +62,8 @@ /datum/job/fallen/marine/leader title = ROLE_FALLEN(SQUAD_LEADER) skills_type = /datum/skills/sl - access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP) - minimal_access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP) + access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_TADPOLE) + minimal_access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_TADPOLE) outfit = /datum/outfit/job/marine/leader /datum/job/fallen/marine/mechpilot diff --git a/code/datums/jobs/job/icc.dm b/code/datums/jobs/job/icc.dm index 4dcdf975614b4..1bb8ca8da9d0a 100644 --- a/code/datums/jobs/job/icc.dm +++ b/code/datums/jobs/job/icc.dm @@ -48,8 +48,8 @@ /datum/outfit/job/icc/standard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcardine, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcardine, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcaridine, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcaridine, SLOT_IN_SUIT) H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) @@ -130,6 +130,7 @@ outfits = list( /datum/outfit/job/icc/guard/coilgun, /datum/outfit/job/icc/guard/icc_autoshotgun, + /datum/outfit/job/icc/guard/icc_bagmg, ) /datum/outfit/job/icc/guard @@ -144,8 +145,8 @@ /datum/outfit/job/icc/guard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcardine, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcardine, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcaridine, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcaridine, SLOT_IN_SUIT) H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) @@ -211,6 +212,24 @@ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_autoshotgun/frag, SLOT_IN_L_POUCH) H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_autoshotgun/frag, SLOT_IN_L_POUCH) +/datum/outfit/job/icc/guard/icc_bagmg + wear_suit = /obj/item/clothing/suit/storage/marine/icc/guard/heavy + head = /obj/item/clothing/head/helmet/marine/icc/guard/heavy + suit_store = /obj/item/weapon/gun/rifle/icc_coilgun + back = /obj/item/storage/holster/icc_mg/full + belt = /obj/item/ammo_magazine/icc_mg/belt + l_store = /obj/item/storage/pouch/magazine/large/icc + r_store = /obj/item/storage/pouch/magazine/large/icc + +/datum/outfit/job/icc/guard/icc_bagmg/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_R_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/icc_coilgun, SLOT_IN_R_POUCH) + //ICC Medic /datum/job/icc/medic @@ -236,8 +255,8 @@ /datum/outfit/job/icc/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcardine, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcardine, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcaridine, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcaridine, SLOT_IN_SUIT) H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) @@ -317,8 +336,8 @@ /datum/outfit/job/icc/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcardine, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcardine, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcaridine, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/wrapped/barcaridine, SLOT_IN_SUIT) H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK) H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) diff --git a/code/datums/jobs/job/job.dm b/code/datums/jobs/job/job.dm index 2d14d82542574..5edf59c5d6fee 100644 --- a/code/datums/jobs/job/job.dm +++ b/code/datums/jobs/job/job.dm @@ -163,15 +163,13 @@ GLOBAL_PROTECT(exp_specialmap) /datum/job/proc/radio_help_message(mob/M) to_chat(M, {" -[span_role_body("|______________________|")] -[span_role_header("You are \an [title]!")] -[span_role_body("As \an [title] you answer to [supervisors]. Special circumstances may change this.")] -[span_role_body("|______________________|")] +[span_role_header("You are the [title].")] +[span_role_body("As the [title] you answer to [supervisors]. Special circumstances may change this.")] "}) if(!(job_flags & JOB_FLAG_NOHEADSET)) - to_chat(M, "Prefix your message with ; to speak on the default radio channel. To see other prefixes, look closely at your headset.") + to_chat(M, "Prefix your message with ; to speak on the default radio channel. To see other prefixes, look closely at your headset.") if(req_admin_notify) - to_chat(M, "You are playing a job that is important for game progression. If you have to disconnect, please head to hypersleep, if you can't make it there, notify the admins via adminhelp.") + to_chat(M, "You are playing a job that is important for game progression. If you have to disconnect, please head to hypersleep, if you can't make it there, notify the admins via adminhelp.") /datum/outfit/job var/jobtype @@ -215,7 +213,7 @@ GLOBAL_PROTECT(exp_specialmap) if(!(index in SSticker.mode.valid_job_types)) continue if(isxenosjob(scaled_job)) - if(respawn && (SSticker.mode?.flags_round_type & MODE_SILO_RESPAWN)) + if(respawn && (SSticker.mode?.round_type_flags & MODE_SILO_RESPAWN)) continue GLOB.round_statistics.larva_from_marine_spawning += jobworth[index] / scaled_job.job_points_needed scaled_job.add_job_points(jobworth[index]) @@ -231,8 +229,9 @@ GLOBAL_PROTECT(exp_specialmap) var/datum/job/scaled_job = SSjob.GetJobType(index) if(!(scaled_job in SSjob.active_joinable_occupations)) continue - scaled_job.add_job_points(-jobworth[index]) + scaled_job.remove_job_points(jobworth[index]) +///Adds to job points, adding a new slot if threshold reached /datum/job/proc/add_job_points(amount) job_points += amount if(total_positions >= max_positions) @@ -241,11 +240,22 @@ GLOBAL_PROTECT(exp_specialmap) job_points -= job_points_needed add_job_positions(1) +///Removes job points, and if needed, job positions +/datum/job/proc/remove_job_points(amount) + if(job_points_needed == INFINITY || total_positions == -1) + return + if(job_points >= amount) + job_points -= amount + return + var/job_slots_removed = ROUND_UP((amount - job_points) / job_points_needed) + remove_job_positions(job_slots_removed) + job_points += (job_slots_removed * job_points_needed) - amount + /datum/job/proc/add_job_positions(amount) if(!(job_flags & (JOB_FLAG_LATEJOINABLE|JOB_FLAG_ROUNDSTARTJOINABLE))) - CRASH("add_job_positions called for a non-joinable job") + return if(total_positions == -1) - CRASH("add_job_positions called with [amount] amount for a job set to overflow") + return TRUE var/previous_amount = total_positions total_positions += amount manage_job_lists(previous_amount) diff --git a/code/datums/jobs/job/marines.dm b/code/datums/jobs/job/marines.dm index d5be9dbed7531..1cb6e4c48d600 100644 --- a/code/datums/jobs/job/marines.dm +++ b/code/datums/jobs/job/marines.dm @@ -17,7 +17,15 @@ CRASH("after_spawn called for a marine without an assigned_squad") to_chat(M, {"\nYou have been assigned to: [lowertext(human_spawn.assigned_squad.name)] squad. Make your way to the cafeteria for some post-cryosleep chow, and then get equipped in your squad's prep room."}) - + ///yes i know istype(src) is gross but we literally have 1 child type we would want to ignore so + if(ismarineleaderjob(src)) + return + if(!(SSticker.mode.round_type_flags & MODE_FORCE_CUSTOMSQUAD_UI)) + return + if(world.time < SSticker.round_start_time + SSticker.mode.deploy_time_lock) + human_spawn.RegisterSignal(SSdcs, COMSIG_GLOB_DEPLOY_TIMELOCK_ENDED, TYPE_PROC_REF(/mob/living/carbon/human, suggest_squad_assign)) + return + addtimer(CALLBACK(GLOB.squad_selector, TYPE_PROC_REF(/datum, interact), human_spawn), 2 SECONDS) //Squad Marine /datum/job/terragov/squad/standard @@ -37,6 +45,7 @@ Make your way to the cafeteria for some post-cryosleep chow, and then get equipp /datum/job/terragov/squad/engineer = SMARTIE_POINTS_REGULAR, /datum/job/terragov/silicon/synthetic = SYNTH_POINTS_REGULAR, /datum/job/terragov/command/mech_pilot = MECH_POINTS_REGULAR, + /datum/job/terragov/command/assault_crewman = ARMORED_VEHICLE_POINTS_REGULAR, ) html_description = {" Difficulty: Easy
@@ -99,6 +108,7 @@ What you lack alone, you gain standing shoulder to shoulder with the men and wom /datum/job/terragov/squad/corpsman = SMARTIE_POINTS_REGULAR, /datum/job/terragov/silicon/synthetic = SYNTH_POINTS_REGULAR, /datum/job/terragov/command/mech_pilot = MECH_POINTS_REGULAR, + /datum/job/terragov/command/assault_crewman = ARMORED_VEHICLE_POINTS_REGULAR, ) job_points_needed = 5 html_description = {" @@ -137,10 +147,12 @@ Your squaddies will look to you when it comes to construction in the field of ba new_human.wear_id.paygrade = "E3" if(1501 to 6000) // 25 hrs new_human.wear_id.paygrade = "E4" - if(6001 to 60000) // 100 hrs + if(6001 to 18000) // 100 hrs new_human.wear_id.paygrade = "E5" + if(18001 to 60000) // 300 hrs + new_human.wear_id.paygrade = "E6" if(60001 to INFINITY) // 1000 hrs - new_human.wear_id.paygrade = "E9" //If you play way too much TGMC. 1000 hours. + new_human.wear_id.paygrade = "E9A" //If you play way too much TGMC. 1000 hours. //Squad Corpsman /datum/job/terragov/squad/corpsman @@ -157,6 +169,7 @@ Your squaddies will look to you when it comes to construction in the field of ba jobworth = list( /datum/job/terragov/silicon/synthetic = SYNTH_POINTS_REGULAR, /datum/job/terragov/command/mech_pilot = MECH_POINTS_REGULAR, + /datum/job/terragov/command/assault_crewman = ARMORED_VEHICLE_POINTS_REGULAR, /datum/job/xenomorph = LARVA_POINTS_REGULAR, /datum/job/terragov/squad/smartgunner = SMARTIE_POINTS_MEDIUM, /datum/job/terragov/squad/engineer = SMARTIE_POINTS_REGULAR, @@ -197,10 +210,12 @@ You may not be a fully-fledged doctor, but you stand between life and death when new_human.wear_id.paygrade = "E3" if(1501 to 6000) // 25 hrs new_human.wear_id.paygrade = "E4" - if(6001 to 60000) // 100 hrs + if(6001 to 18000) // 100 hrs new_human.wear_id.paygrade = "E5" + if(18001 to 60000) // 300 hrs + new_human.wear_id.paygrade = "E6" if(60001 to INFINITY) // 1000 hrs - new_human.wear_id.paygrade = "E9" //If you play way too much TGMC. 1000 hours. + new_human.wear_id.paygrade = "E9A" //If you play way too much TGMC. 1000 hours. //Squad Smartgunner /datum/job/terragov/squad/smartgunner @@ -248,10 +263,12 @@ You may not be a fully-fledged doctor, but you stand between life and death when new_human.wear_id.paygrade = "E3" if(1501 to 6000) // 25 hrs new_human.wear_id.paygrade = "E4" - if(6001 to 60000) // 100 hrs + if(6001 to 18000) // 100 hrs new_human.wear_id.paygrade = "E5" + if(18001 to 60000) // 300 hrs + new_human.wear_id.paygrade = "E6" if(60001 to INFINITY) // 1000 hrs - new_human.wear_id.paygrade = "E9" //If you play way too much TGMC. 1000 hours. + new_human.wear_id.paygrade = "E9A" //If you play way too much TGMC. 1000 hours. /datum/outfit/job/marine/smartgunner name = SQUAD_SMARTGUNNER @@ -275,7 +292,7 @@ You may not be a fully-fledged doctor, but you stand between life and death when exp_type = EXP_TYPE_REGULAR_ALL job_flags = JOB_FLAG_ALLOWS_PREFS_GEAR|JOB_FLAG_PROVIDES_BANK_ACCOUNT|JOB_FLAG_ADDTOMANIFEST|JOB_FLAG_PROVIDES_SQUAD_HUD|JOB_FLAG_CAN_SEE_ORDERS jobworth = list( - /datum/job/xenomorph = LARVA_POINTS_STRONG, + /datum/job/xenomorph = LARVA_POINTS_REGULAR, ) job_points_needed = 10 //Redefined via config. @@ -301,8 +318,8 @@ You can serve a variety of roles, so choose carefully."}) comm_title = JOB_COMM_TITLE_SQUAD_LEADER total_positions = 4 supervisors = "the acting field commander" - access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP) - minimal_access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP) + access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_TADPOLE) + minimal_access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_TADPOLE) skills_type = /datum/skills/sl display_order = JOB_DISPLAY_ORDER_SQUAD_LEADER outfit = /datum/outfit/job/marine/leader @@ -316,6 +333,7 @@ You can serve a variety of roles, so choose carefully."}) /datum/job/terragov/squad/engineer = SMARTIE_POINTS_REGULAR, /datum/job/terragov/silicon/synthetic = SYNTH_POINTS_REGULAR, /datum/job/terragov/command/mech_pilot = MECH_POINTS_REGULAR, + /datum/job/terragov/command/assault_crewman = ARMORED_VEHICLE_POINTS_REGULAR, ) html_description = {" Difficulty: Hard
@@ -347,13 +365,17 @@ You are also in charge of communicating with command and letting them know about var/playtime_mins = user?.client?.get_exp(title) switch(playtime_mins) if(0 to 1500) // starting - new_human.wear_id.paygrade = "E5" - if(1501 to 7500) // 25 hrs - new_human.wear_id.paygrade = "E6" - if(7501 to 60000) // 125 hrs new_human.wear_id.paygrade = "E7" + if(1501 to 6000) // 25 hrs + new_human.wear_id.paygrade = "E7E" + if(6001 to 18000) // 100 hrs + new_human.wear_id.paygrade = "E8E" + if(18001 to 60000) // 300 hrs + new_human.wear_id.paygrade = "E9" if(60001 to INFINITY) // 1000 hrs new_human.wear_id.paygrade = "E9E" //If you play way too much TGMC. 1000 hours. + if(SSticker.mode.round_type_flags & MODE_FORCE_CUSTOMSQUAD_UI) + addtimer(CALLBACK(GLOB.squad_manager, TYPE_PROC_REF(/datum, interact), new_human), 2 SECONDS) if(!latejoin) return if(!new_human.assigned_squad) @@ -364,7 +386,6 @@ You are also in charge of communicating with command and letting them know about new_human.assigned_squad.promote_leader(new_human) - /datum/job/terragov/squad/vatgrown title = SQUAD_MARINE paygrade = "VM" @@ -379,6 +400,7 @@ You are also in charge of communicating with command and letting them know about /datum/job/xenomorph = LARVA_POINTS_REGULAR, /datum/job/terragov/silicon/synthetic = SYNTH_POINTS_REGULAR, /datum/job/terragov/command/mech_pilot = MECH_POINTS_REGULAR, + /datum/job/terragov/command/assault_crewman = ARMORED_VEHICLE_POINTS_REGULAR, ) minimap_icon = "private" diff --git a/code/datums/jobs/job/other.dm b/code/datums/jobs/job/other.dm index f3cab152069df..9dd2384eeffbf 100644 --- a/code/datums/jobs/job/other.dm +++ b/code/datums/jobs/job/other.dm @@ -64,7 +64,7 @@ belt = /obj/item/storage/belt/utility/full shoes = /obj/item/clothing/shoes/marinechief/sa gloves = /obj/item/clothing/gloves/marine/officer/chief/sa - glasses = /obj/item/clothing/glasses/sunglasses/sa/nodrop + glasses = /obj/item/clothing/glasses/hud/sa/nodrop back = /obj/item/storage/backpack/marine/satchel /datum/job/spatial_agent/galaxy_red diff --git a/code/datums/jobs/job/retired.dm b/code/datums/jobs/job/retired.dm new file mode 100644 index 0000000000000..be876519abc05 --- /dev/null +++ b/code/datums/jobs/job/retired.dm @@ -0,0 +1,89 @@ +/datum/job/retired + title = "TGMC retired veteran" + job_category = JOB_CAT_MARINE + paygrade = "MSGT" + access = ALL_ANTAGONIST_ACCESS + minimal_access = ALL_ANTAGONIST_ACCESS + skills_type = /datum/skills/veteran //they're old, they know their stuff + faction = FACTION_TERRAGOV + outfit = /datum/outfit/job/retired + +/datum/outfit/job/retired + name = "TGMC retired veteran" + jobtype = /datum/job/retired + + id = /obj/item/card/id/dogtag + wear_suit = /obj/item/clothing/suit/storage/marine/officer/req //it's pas + glasses = /obj/item/clothing/glasses/eyepatch + w_uniform = /obj/item/clothing/under/marine/service + mask = /obj/item/clothing/mask/cigarette/pipe + head = /obj/item/clothing/head/servicecap + back = /obj/item/storage/backpack/satchel + belt = /obj/item/storage/belt/marine + gloves = /obj/item/clothing/gloves/marine/black + l_store = /obj/item/storage/pouch/medkit/firstaid + r_store = /obj/item/storage/holster/flarepouch/full + suit_store = /obj/item/weapon/gun/rifle/m41a/magharness + ears = /obj/item/radio/headset/distress/retired + +/datum/outfit/job/retired/post_equip(mob/living/carbon/human/H, visualsOnly) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41a, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41a, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41a, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41a, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41a, SLOT_IN_BELT) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41a, SLOT_IN_BELT) + + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/burger/tofu, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/drinks/flask/marine, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/storage/fancy/chemrettes, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_SUIT) + +/datum/job/retired/leader + title = "TGMC retired veteran expedition leader" + paygrade = "LtCol" + skills_type = /datum/skills/veteran_captain //The leader gets even more skills + outfit = /datum/outfit/job/retired/leader + +/datum/outfit/job/retired/leader + name = "TGMC retired veteran expedition leader" + jobtype = /datum/job/retired/leader + + id = /obj/item/card/id/dogtag/fc + head = /obj/item/clothing/head/tgmcberet/fc + gloves = /obj/item/clothing/gloves/marine/officer + w_uniform = /obj/item/clothing/under/marine/officer/exec + belt = /obj/item/storage/holster/blade/officer/full + suit_store = /obj/item/storage/holster/belt/mateba/full + back = /obj/item/ammo_magazine/minigun_wheelchair + +/datum/outfit/job/retired/leader/post_equip(mob/living/carbon/human/H, visualsOnly) + H.equip_to_slot_or_del(new /obj/item/storage/fancy/chemrettes, SLOT_IN_SUIT) + H.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_SUIT) + + H.amputate_limb(BODY_ZONE_L_LEG) + H.amputate_limb(BODY_ZONE_R_LEG) + var/obj/vehicle/ridden/wheelchair/weaponized/wheelchair = new(H.drop_location()) + wheelchair.buckle_mob(H, TRUE) + +/datum/job/retired/augmented + title = "TGMC augmented veteran" + outfit = /datum/outfit/job/retired/augmented + +/datum/outfit/job/retired/augmented + name = "TGMC augmented veteran" + jobtype = /datum/job/retired/augmented + +/datum/outfit/job/retired/augmented/post_equip(mob/living/carbon/human/H, visualsOnly) + . = ..() // Same gear as the regular outfit, but we give them some robot limbs + for(var/i in 1 to 2) + var/datum/limb/picked_limb = H.get_limb(pick_n_take(list(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG))) + picked_limb.robotize() + diff --git a/code/datums/jobs/job/sectoid.dm b/code/datums/jobs/job/sectoid.dm index 22781b0444373..56aa01e20edb9 100644 --- a/code/datums/jobs/job/sectoid.dm +++ b/code/datums/jobs/job/sectoid.dm @@ -4,23 +4,11 @@ minimal_access = ALL_ANTAGONIST_ACCESS skills_type = /datum/skills/sectoid faction = FACTION_SECTOIDS + outfit = /datum/outfit/job/sectoid -/datum/outfit/job/sectoid/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.set_species("Sectoid") - - H.name = GLOB.namepool[/datum/namepool/sectoid].random_name(H) - H.real_name = H.name - -//Sectoid Grunt -/datum/job/sectoid/grunt - title = "Sectoid Grunt" - outfit = /datum/outfit/job/sectoid/grunt - - -/datum/outfit/job/sectoid/grunt +/datum/outfit/job/sectoid name = "Sectoid Grunt" - jobtype = /datum/job/sectoid/grunt + jobtype = /datum/job/sectoid id = /obj/item/card/id belt = /obj/item/storage/belt/marine/sectoid @@ -35,8 +23,22 @@ l_store = /obj/item/explosive/grenade/sectoid back = /obj/item/weapon/gun/rifle/sectoid_rifle + var/list/abilities = list( + /datum/action/ability/activable/sectoid/mindmeld, + /datum/action/ability/activable/sectoid/mindfray, + ) -/datum/outfit/job/sectoid/grunt/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/job/sectoid/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.set_species("Sectoid") + + H.name = GLOB.namepool[/datum/namepool/sectoid].random_name(H) + H.real_name = H.name + + for(var/ability in abilities) + H.add_ability(ability) + +/datum/outfit/job/sectoid/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/sectoid_rifle, SLOT_IN_BELT) H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/sectoid_rifle, SLOT_IN_BELT) @@ -45,6 +47,22 @@ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/sectoid_rifle, SLOT_IN_BELT) H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BELT) +//Sectoid Grunt +/datum/job/sectoid/grunt + title = "Sectoid Grunt" + +//Sectoid psionic +/datum/job/sectoid/psionic + title = "Sectoid psionic" + outfit = /datum/outfit/job/sectoid/psionic + +/datum/outfit/job/sectoid/psionic + abilities = list( + /datum/action/ability/activable/sectoid/mindmeld, + /datum/action/ability/activable/sectoid/mindfray, + /datum/action/ability/activable/sectoid/reknit_form, + /datum/action/ability/activable/sectoid/stasis, + ) //Sectoid Leader /datum/job/sectoid/leader @@ -52,30 +70,16 @@ title = "Sectoid Leader" outfit = /datum/outfit/job/sectoid/leader - /datum/outfit/job/sectoid/leader name = "Sectoid Leader" jobtype = /datum/job/sectoid/leader - - id = /obj/item/card/id - belt = /obj/item/storage/belt/marine/sectoid - head = /obj/item/clothing/head/helmet/sectoid - ears = /obj/item/radio/headset/distress/sectoid - w_uniform = /obj/item/clothing/under/sectoid - glasses = /obj/item/clothing/glasses/night/sectoid - shoes = /obj/item/clothing/shoes/sectoid wear_suit = /obj/item/clothing/suit/armor/sectoid/shield - gloves = /obj/item/clothing/gloves/sectoid - r_store = /obj/item/stack/medical/heal_pack/gauze/sectoid - l_store = /obj/item/explosive/grenade/sectoid - back = /obj/item/weapon/gun/rifle/sectoid_rifle - - -/datum/outfit/job/sectoid/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/sectoid_rifle, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/sectoid_rifle, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/sectoid_rifle, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/sectoid_rifle, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/sectoid_rifle, SLOT_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BELT) + abilities = list( + /datum/action/ability/activable/sectoid/mindmeld/greater, + /datum/action/ability/activable/sectoid/mindfray, + /datum/action/ability/activable/sectoid/reknit_form/greater, + /datum/action/ability/activable/sectoid/stasis, + /datum/action/ability/activable/sectoid/fuse, + /datum/action/ability/activable/psionic_interact, + /datum/action/ability/activable/sectoid/reanimate, + ) diff --git a/code/datums/jobs/job/shipside.dm b/code/datums/jobs/job/shipside.dm index a44e1317b68a3..ca597e9c0b393 100644 --- a/code/datums/jobs/job/shipside.dm +++ b/code/datums/jobs/job/shipside.dm @@ -32,6 +32,7 @@ /datum/job/terragov/squad/smartgunner = SMARTIE_POINTS_REGULAR, /datum/job/terragov/silicon/synthetic = SYNTH_POINTS_REGULAR, /datum/job/terragov/command/mech_pilot = MECH_POINTS_REGULAR, + /datum/job/terragov/command/assault_crewman = ARMORED_VEHICLE_POINTS_REGULAR, ) html_description = {" Difficulty: Hard
@@ -69,7 +70,7 @@ Godspeed, captain! And remember, you are not above the law."}) new_human.wear_id.paygrade = "O8" /datum/job/terragov/command/captain/campaign - outfit = /datum/outfit/job/command/captain/campaign + outfit = /datum/outfit/job/command/captain_campaign multiple_outfits = FALSE /datum/outfit/job/command/captain @@ -96,9 +97,11 @@ Godspeed, captain! And remember, you are not above the law."}) r_store = /obj/item/storage/pouch/general/large/command l_store = /obj/item/hud_tablet/leadership -/datum/outfit/job/command/captain/campaign - r_store = /obj/item/storage/pouch/general/large - l_store = /obj/item/binoculars/fire_support/campaign +/datum/outfit/job/command/captain_campaign + name = CAPTAIN + jobtype = /datum/job/terragov/command/captain + + id = /obj/item/card/id/gold //Field Commander /datum/job/terragov/command/fieldcommander @@ -121,10 +124,11 @@ Godspeed, captain! And remember, you are not above the law."}) exp_type = EXP_TYPE_REGULAR_ALL job_flags = JOB_FLAG_LATEJOINABLE|JOB_FLAG_ROUNDSTARTJOINABLE|JOB_FLAG_ALLOWS_PREFS_GEAR|JOB_FLAG_PROVIDES_BANK_ACCOUNT|JOB_FLAG_ADDTOMANIFEST|JOB_FLAG_ISCOMMAND|JOB_FLAG_BOLD_NAME_ON_SELECTION|JOB_FLAG_PROVIDES_SQUAD_HUD|JOB_FLAG_CAN_SEE_ORDERS|JOB_FLAG_ALWAYS_VISIBLE_ON_MINIMAP|JOB_FLAG_LOUDER_TTS jobworth = list( - /datum/job/xenomorph = LARVA_POINTS_SHIPSIDE, + /datum/job/xenomorph = LARVA_POINTS_REGULAR, /datum/job/terragov/squad/smartgunner = SMARTIE_POINTS_REGULAR, /datum/job/terragov/silicon/synthetic = SYNTH_POINTS_REGULAR, /datum/job/terragov/command/mech_pilot = MECH_POINTS_REGULAR, + /datum/job/terragov/command/assault_crewman = ARMORED_VEHICLE_POINTS_REGULAR, ) html_description = {" Difficulty:Very Hard
@@ -152,12 +156,16 @@ Make the TGMC proud!"}) if(!playtime_mins || playtime_mins < 1 ) return switch(playtime_mins) - if(0 to 1500) //starting + if(0 to 1500) // starting new_human.wear_id.paygrade = "O3" - if(1500 to 7500) // 25 hrs + if(1501 to 6000) // 25hrs new_human.wear_id.paygrade = "MO4" - if(7501 to INFINITY) // 125 hrs + if(6001 to 18000) // 100 hrs new_human.wear_id.paygrade = "MO5" + if(18001 to 60000) // 300 hrs + new_human.wear_id.paygrade = "MO6" + if(60001 to INFINITY) // 1000 hrs + new_human.wear_id.paygrade = "M10" //If you play way too much TGMC. 1000 hours. /datum/outfit/job/command/fieldcommander @@ -190,52 +198,14 @@ Make the TGMC proud!"}) //Campaign version with specific loadout /datum/job/terragov/command/fieldcommander/campaign - outfit = /datum/outfit/job/command/fieldcommander/campaign + outfit = /datum/outfit/job/command/fieldcommander_campaign multiple_outfits = FALSE -/datum/outfit/job/command/fieldcommander/campaign +/datum/outfit/job/command/fieldcommander_campaign name = FIELD_COMMANDER jobtype = /datum/job/terragov/command/fieldcommander/campaign id = /obj/item/card/id/dogtag/fc - belt = /obj/item/storage/holster/blade/officer/full - ears = /obj/item/radio/headset/mainship/mcom - glasses = /obj/item/clothing/glasses/hud/health - w_uniform = /obj/item/clothing/under/marine/officer/exec/webbing - wear_suit = /obj/item/clothing/suit/modular/xenonauten/valk - shoes = /obj/item/clothing/shoes/marine/full - gloves = /obj/item/clothing/gloves/marine/officer - mask = /obj/item/clothing/mask/rebreather - head = /obj/item/clothing/head/tgmcberet/fc - r_store = /obj/item/storage/pouch/firstaid/combat_patrol_leader - l_store = /obj/item/storage/pouch/grenade/combat_patrol - suit_store = /obj/item/storage/holster/belt/pistol/m4a3/fieldcommander - -/datum/outfit/job/command/fieldcommander/campaign/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/isotonic, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclot, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/acp, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/acp, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) - //Staff Officer /datum/job/terragov/command/staffofficer @@ -261,6 +231,7 @@ Make the TGMC proud!"}) /datum/job/terragov/squad/smartgunner = SMARTIE_POINTS_REGULAR, /datum/job/terragov/silicon/synthetic = SYNTH_POINTS_REGULAR, /datum/job/terragov/command/mech_pilot = MECH_POINTS_REGULAR, + /datum/job/terragov/command/assault_crewman = ARMORED_VEHICLE_POINTS_REGULAR, ) html_description = {" Difficulty: Medium
@@ -294,7 +265,7 @@ You are in charge of logistics and the overwatch system. You are also in line to new_human.wear_id.paygrade = "O5" /datum/job/terragov/command/staffofficer/campaign - outfit = /datum/outfit/job/command/staffofficer/campaign + outfit = /datum/outfit/job/command/staffofficer_campaign multiple_outfits = FALSE /datum/outfit/job/command/staffofficer @@ -321,15 +292,97 @@ You are in charge of logistics and the overwatch system. You are also in line to r_store = /obj/item/storage/pouch/general/large l_store = /obj/item/binoculars/tactical -/datum/outfit/job/command/staffofficer/campaign - l_store = /obj/item/binoculars/fire_support/campaign +/datum/outfit/job/command/staffofficer_campaign + name = STAFF_OFFICER + jobtype = /datum/job/terragov/command/staffofficer + + id = /obj/item/card/id/silver + +//Transport Officer +/datum/job/terragov/command/transportofficer + title = TRANSPORT_OFFICER + paygrade = "WO" + comm_title = "TO" + total_positions = 1 + access = list(ACCESS_MARINE_BRIDGE, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_PILOT, ACCESS_MARINE_TADPOLE) + minimal_access = list(ACCESS_MARINE_BRIDGE, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_PILOT, ACCESS_MARINE_TADPOLE, ACCESS_MARINE_LOGISTICS, ACCESS_MARINE_CARGO, ACCESS_MARINE_RO, ACCESS_MARINE_MEDBAY) + skills_type = /datum/skills/transportofficer + display_order = JOB_DISPLAY_ORDER_TRANSPORT_OFFICER + outfit = /datum/outfit/job/command/transportofficer + exp_requirements = XP_REQ_EXPERT + exp_type = EXP_TYPE_REGULAR_ALL + job_flags = JOB_FLAG_LATEJOINABLE|JOB_FLAG_ROUNDSTARTJOINABLE|JOB_FLAG_ALLOWS_PREFS_GEAR|JOB_FLAG_PROVIDES_BANK_ACCOUNT|JOB_FLAG_ADDTOMANIFEST|JOB_FLAG_PROVIDES_SQUAD_HUD + jobworth = list( + /datum/job/xenomorph = LARVA_POINTS_SHIPSIDE_STRONG, + /datum/job/terragov/squad/smartgunner = SMARTIE_POINTS_REGULAR, + /datum/job/terragov/silicon/synthetic = SYNTH_POINTS_REGULAR, + /datum/job/terragov/command/mech_pilot = MECH_POINTS_REGULAR, + /datum/job/terragov/command/assault_crewman = ARMORED_VEHICLE_POINTS_REGULAR, + ) + html_description = {" + Difficulty: Hard
+ You answer to the acting Command Staff
+ Unlock Requirement: 100 hours
+ Gamemode Availability: Nuclear War
+ Duty: Pilot the Tadpole, a versatile dropship capable of fulfilling roles ranging from ambulance to mobile bunker. + "} + minimap_icon = "transportofficer" + +/datum/job/terragov/command/transportofficer/after_spawn(mob/living/carbon/new_mob, mob/user, latejoin = FALSE) + . = ..() + if(!ishuman(new_mob)) + return + var/mob/living/carbon/human/new_human = new_mob + var/playtime_mins = user?.client?.get_exp(title) + if(!playtime_mins || playtime_mins < 1 ) + return + switch(playtime_mins) + if(0 to 600) // starting + new_human.wear_id.paygrade = "WO" + if(601 to 3000) // 10 hrs + new_human.wear_id.paygrade = "CWO" + if(3001 to 6000) // 50 hrs + new_human.wear_id.paygrade = "O1" + if(6001 to INFINITY) // 100 hrs + new_human.wear_id.paygrade = "O2" + +/datum/job/terragov/command/transportofficer/radio_help_message(mob/M) + . = ..() + to_chat(M, {"Your job is to support marines mobile dropship support with the Tadpole. +You are to ensure the Tadpole's survival and to transport marines around, acting as a mobile bunker. In the case of it's death, you may perform the role of Combat Engineer. +"}) + +/datum/outfit/job/command/transportofficer + name = TRANSPORT_OFFICER + jobtype = /datum/job/terragov/command/transportofficer + + id = /obj/item/card/id/silver + belt = /obj/item/storage/belt/utility/full + ears = /obj/item/radio/headset/mainship/mcom + w_uniform = /obj/item/clothing/under/marine/officer/pilot + wear_suit = /obj/item/clothing/suit/modular/xenonauten/pilot + shoes = /obj/item/clothing/shoes/marine/full + gloves = /obj/item/clothing/gloves/marine/insulated + glasses = /obj/item/clothing/glasses/welding/superior + head = /obj/item/clothing/head/helmet/marine/pilot + r_store = /obj/item/storage/pouch/construction + l_store = /obj/item/hud_tablet/transportofficer + back = /obj/item/storage/backpack/marine/engineerpack + suit_store = /obj/item/storage/holster/belt/pistol/m4a3/vp70 + +/datum/outfit/job/command/transportofficer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_hand(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_R_POUCH) + H.equip_to_slot_or_hand(new /obj/item/stack/sheet/plasteel/large_stack, SLOT_IN_R_POUCH) + H.equip_to_slot_or_hand(new /obj/item/stack/sandbags/large_stack, SLOT_IN_R_POUCH) + H.equip_to_slot_or_hand(new /obj/item/stack/barbed_wire/full, SLOT_IN_R_POUCH) //Pilot Officer /datum/job/terragov/command/pilot title = PILOT_OFFICER paygrade = "WO" comm_title = "PO" - total_positions = 2 + total_positions = 1 access = list(ACCESS_MARINE_BRIDGE, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_PILOT) minimal_access = list(ACCESS_MARINE_BRIDGE, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_PILOT, ACCESS_MARINE_LOGISTICS, ACCESS_MARINE_CARGO, ACCESS_MARINE_RO, ACCESS_MARINE_MEDBAY) skills_type = /datum/skills/pilot @@ -343,13 +396,14 @@ You are in charge of logistics and the overwatch system. You are also in line to /datum/job/terragov/squad/smartgunner = SMARTIE_POINTS_REGULAR, /datum/job/terragov/silicon/synthetic = SYNTH_POINTS_REGULAR, /datum/job/terragov/command/mech_pilot = MECH_POINTS_REGULAR, + /datum/job/terragov/command/assault_crewman = ARMORED_VEHICLE_POINTS_REGULAR, ) html_description = {" Difficulty: Medium
You answer to the acting Command Staff
Unlock Requirement: Starting Role
Gamemode Availability: Nuclear War
- Duty: Choose between the Condor, a modular attack aircraft that provides close air support with a variety of weapons ranging from the inbuilt gatling to wing mounted rockets; or the Tadpole, a versatile dropship capable of fulfilling roles ranging from ambulance to mobile bunker. + Duty: Pilot the Condor, a modular attack aircraft that provides close air support with a variety of weapons ranging from the inbuilt gatling to wing mounted rockets. "} minimap_icon = "pilot" @@ -374,9 +428,9 @@ You are in charge of logistics and the overwatch system. You are also in line to /* RUTGMC DELETION /datum/job/terragov/command/pilot/radio_help_message(mob/M) . = ..() - to_chat(M, {"Your job is to support marines with either close air support via the Condor, or mobile dropship support with the Tadpole. -While you are in charge of all aerial crafts the Alamo does not require supervision outside of turning automatic mode on or off at crucial times, and you are expected to choose between the Condor and Tadpole. -Though you are a warrant officer, your authority is limited to the dropship and your chosen aerial craft, where you have authority over the enlisted personnel. + to_chat(M, {"Your job is to support marines with either close air support via the Condor. +You are expected to use the Condor as the Alamo is able to be ran automatically, though at some points you will be required to take control of the Alamo for the operation's success, though highly unlikey. +Though you are a warrant officer, your authority is limited to the dropship and the Condor, where you have authority over the enlisted personnel. "}) */ @@ -415,6 +469,7 @@ Though you are a warrant officer, your authority is limited to the dropship and jobworth = list( /datum/job/xenomorph = LARVA_POINTS_REGULAR, /datum/job/terragov/squad/smartgunner = SMARTIE_POINTS_REGULAR, + /datum/job/terragov/command/assault_crewman = ARMORED_VEHICLE_POINTS_REGULAR, ) html_description = {" Difficulty:Very Hard
@@ -439,12 +494,16 @@ You can serve your Division in a variety of roles, so choose carefully."}) if(!playtime_mins || playtime_mins < 1 ) return switch(playtime_mins) - if(0 to 1500) //starting + if(0 to 1500) // starting new_human.wear_id.paygrade = "E3" - if(1500 to 7500) // 25 hrs + if(1501 to 6000) // 25 hrs new_human.wear_id.paygrade = "E4" - if(7501 to INFINITY) // 125 hrs + if(6001 to 18000) // 100 hrs new_human.wear_id.paygrade = "E5" + if(18001 to 60000) // 300 hrs + new_human.wear_id.paygrade = "E6" + if(60001 to INFINITY) // 1000 hrs + new_human.wear_id.paygrade = "E9A" //If you play way too much TGMC. 1000 hours. /datum/outfit/job/command/mech_pilot name = MECH_PILOT @@ -460,6 +519,146 @@ You can serve your Division in a variety of roles, so choose carefully."}) shoes = /obj/item/clothing/shoes/marine/full gloves = /obj/item/clothing/gloves/marine +//tank/arty driver+gunner +/datum/job/terragov/command/assault_crewman + title = ASSAULT_CREWMAN + req_admin_notify = TRUE + paygrade = "E3" + comm_title = "AC" + total_positions = 0 + skills_type = /datum/skills/assault_crewman + access = list(ACCESS_MARINE_WO, ACCESS_MARINE_PREP, ACCESS_MARINE_ARMORED, ACCESS_CIVILIAN_PUBLIC) + minimal_access = list(ACCESS_MARINE_WO, ACCESS_MARINE_PREP, ACCESS_MARINE_ARMORED, ACCESS_CIVILIAN_PUBLIC, ACCESS_MARINE_BRIDGE, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_LOGISTICS, ACCESS_MARINE_CARGO) + display_order = JOB_DISPLAY_ORDER_MECH_PILOT + outfit = /datum/outfit/job/command/assault_crewman + exp_requirements = XP_REQ_EXPERT + exp_type = EXP_TYPE_REGULAR_ALL + job_flags = JOB_FLAG_LATEJOINABLE|JOB_FLAG_ROUNDSTARTJOINABLE|JOB_FLAG_ALLOWS_PREFS_GEAR|JOB_FLAG_PROVIDES_BANK_ACCOUNT|JOB_FLAG_ADDTOMANIFEST|JOB_FLAG_PROVIDES_SQUAD_HUD|JOB_FLAG_CAN_SEE_ORDERS|JOB_FLAG_ALWAYS_VISIBLE_ON_MINIMAP + job_points_needed = 999 //50 + jobworth = list( + /datum/job/xenomorph = LARVA_POINTS_REGULAR, + /datum/job/terragov/squad/smartgunner = SMARTIE_POINTS_REGULAR, + ) + html_description = {" + Difficulty:Very Hard
+ You answer to the acting Command Staff
+ Unlock Requirement: Starting Role
+ Gamemode Availability: Nuclear War
+ Duty: Provide heavy fire support + "} + minimap_icon = "assault_crew" + +/datum/job/terragov/command/assault_crewman/add_job_points(amount) + . = ..() + if(total_positions % 2) + add_job_positions(1) //always 2 there are, a master and an apprentice + +/datum/job/terragov/command/assault_crewman/radio_help_message(mob/M) + . = ..() + to_chat(M, {"You are an Assault Crewman. You operate the TGMC's armored assault vehicles along with your partner, and in some cases a \"willing\" loader. Make sure that you work as a team to advance the front!"}) + +/datum/job/terragov/command/assault_crewman/after_spawn(mob/living/carbon/new_mob, mob/user, latejoin = FALSE) + . = ..() + if(!ishuman(new_mob)) + return + var/mob/living/carbon/human/new_human = new_mob + var/playtime_mins = user?.client?.get_exp(title) + if(!playtime_mins || playtime_mins < 1 ) + return + switch(playtime_mins) + if(0 to 1500) // starting + new_human.wear_id.paygrade = "E3" + if(1501 to 6000) // 25 hrs + new_human.wear_id.paygrade = "E4" + if(6001 to 18000) // 100 hrs + new_human.wear_id.paygrade = "E5" + if(18001 to 60000) // 300 hrs + new_human.wear_id.paygrade = "E6" + if(60001 to INFINITY) // 1000 hrs + new_human.wear_id.paygrade = "E9A" //If you play way too much TGMC. 1000 hours. + +/datum/outfit/job/command/assault_crewman + name = ASSAULT_CREWMAN + jobtype = /datum/job/terragov/command/assault_crewman + + id = /obj/item/card/id/dogtag + belt = /obj/item/storage/belt/utility/full + glasses = /obj/item/clothing/glasses/welding + ears = /obj/item/radio/headset/mainship/mcom + w_uniform = /obj/item/clothing/under/marine/officer/assault_crewman + wear_suit = /obj/item/clothing/suit/storage/marine/assault_crewman + head = /obj/item/clothing/head/helmet/marine/assault_crewman + shoes = /obj/item/clothing/shoes/marine/full + gloves = /obj/item/clothing/gloves/marine + + +//apc/jeep driver +/datum/job/terragov/command/transport_crewman + title = TRANSPORT_CREWMAN + req_admin_notify = TRUE + paygrade = "E3" + comm_title = "TC" + total_positions = 0 + skills_type = /datum/skills/transport_crewman + access = list(ACCESS_MARINE_WO, ACCESS_MARINE_PREP, ACCESS_MARINE_ARMORED, ACCESS_CIVILIAN_PUBLIC) + minimal_access = list(ACCESS_MARINE_WO, ACCESS_MARINE_PREP, ACCESS_MARINE_ARMORED, ACCESS_CIVILIAN_PUBLIC, ACCESS_MARINE_BRIDGE, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_LOGISTICS, ACCESS_MARINE_CARGO) + display_order = JOB_DISPLAY_ORDER_MECH_PILOT + outfit = /datum/outfit/job/command/transport_crewman + exp_requirements = XP_REQ_EXPERT + exp_type = EXP_TYPE_REGULAR_ALL + job_flags = JOB_FLAG_LATEJOINABLE|JOB_FLAG_ROUNDSTARTJOINABLE|JOB_FLAG_ALLOWS_PREFS_GEAR|JOB_FLAG_PROVIDES_BANK_ACCOUNT|JOB_FLAG_ADDTOMANIFEST|JOB_FLAG_PROVIDES_SQUAD_HUD|JOB_FLAG_CAN_SEE_ORDERS|JOB_FLAG_ALWAYS_VISIBLE_ON_MINIMAP + job_points_needed = 40 + jobworth = list( + /datum/job/xenomorph = LARVA_POINTS_REGULAR, + /datum/job/terragov/squad/smartgunner = SMARTIE_POINTS_REGULAR, + ) + html_description = {" + Difficulty:Very Hard
+ You answer to the acting Command Staff
+ Unlock Requirement: Starting Role
+ Gamemode Availability: Nuclear War
+ Duty: Transport and support the frontline troops + "} + minimap_icon = "transport_crew" + +/datum/job/terragov/command/transport_crewman/radio_help_message(mob/M) + . = ..() + to_chat(M, {"You are a Transport Crewman. You operate the TGMC's transport vehciles to ensure that marines and equipment gets to the front in a timely and safe manner."}) + +/datum/job/terragov/command/transport_crewman/after_spawn(mob/living/carbon/new_mob, mob/user, latejoin = FALSE) + . = ..() + if(!ishuman(new_mob)) + return + var/mob/living/carbon/human/new_human = new_mob + var/playtime_mins = user?.client?.get_exp(title) + if(!playtime_mins || playtime_mins < 1 ) + return + switch(playtime_mins) + if(0 to 1500) // starting + new_human.wear_id.paygrade = "E3" + if(1501 to 6000) // 25 hrs + new_human.wear_id.paygrade = "E4" + if(6001 to 18000) // 100 hrs + new_human.wear_id.paygrade = "E5" + if(18001 to 60000) // 300 hrs + new_human.wear_id.paygrade = "E6" + if(60001 to INFINITY) // 1000 hrs + new_human.wear_id.paygrade = "E9A" //If you play way too much TGMC. 1000 hours. + +/datum/outfit/job/command/transport_crewman + name = TRANSPORT_CREWMAN + jobtype = /datum/job/terragov/command/transport_crewman + + id = /obj/item/card/id/dogtag + belt = /obj/item/storage/belt/utility/full + glasses = /obj/item/clothing/glasses/welding + ears = /obj/item/radio/headset/mainship/mcom + w_uniform = /obj/item/clothing/under/marine/officer/transport_crewman + wear_suit = /obj/item/clothing/suit/storage/marine/transport_crewman + head = /obj/item/clothing/head/helmet/marine/transport_crewman + shoes = /obj/item/clothing/shoes/marine/full + gloves = /obj/item/clothing/gloves/marine + /datum/job/terragov/engineering job_category = JOB_CAT_ENGINEERING selection_color = "#fff5cc" @@ -487,6 +686,7 @@ You can serve your Division in a variety of roles, so choose carefully."}) /datum/job/terragov/squad/smartgunner = SMARTIE_POINTS_REGULAR, /datum/job/terragov/silicon/synthetic = SYNTH_POINTS_REGULAR, /datum/job/terragov/command/mech_pilot = MECH_POINTS_REGULAR, + /datum/job/terragov/command/assault_crewman = ARMORED_VEHICLE_POINTS_REGULAR, ) html_description = {" Difficulty: Hard
@@ -561,6 +761,7 @@ You are also next in the chain of command, should the bridge crew fall in the li /datum/job/terragov/squad/smartgunner = SMARTIE_POINTS_REGULAR, /datum/job/terragov/silicon/synthetic = SYNTH_POINTS_REGULAR, /datum/job/terragov/command/mech_pilot = MECH_POINTS_REGULAR, + /datum/job/terragov/command/assault_crewman = ARMORED_VEHICLE_POINTS_REGULAR, ) html_description = {" Difficulty: Medium
@@ -639,6 +840,7 @@ requisitions line and later on to be ready to send supplies for marines who are /datum/job/terragov/squad/smartgunner = SMARTIE_POINTS_REGULAR, /datum/job/terragov/silicon/synthetic = SYNTH_POINTS_REGULAR, /datum/job/terragov/command/mech_pilot = MECH_POINTS_REGULAR, + /datum/job/terragov/command/assault_crewman = ARMORED_VEHICLE_POINTS_REGULAR, ) html_description = {" Difficulty: Medium
@@ -690,6 +892,10 @@ A happy ship is a well-functioning ship."}) head = /obj/item/clothing/head/tgmccap/req r_store = /obj/item/storage/pouch/general/large +/datum/outfit/job/requisitions/officer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + H.equip_to_slot_or_hand(new /obj/item/supplytablet, SLOT_IN_R_POUCH) + /datum/job/terragov/medical job_category = JOB_CAT_MEDICAL selection_color = "#BBFFBB" @@ -722,6 +928,7 @@ A happy ship is a well-functioning ship."}) /datum/job/terragov/squad/smartgunner = SMARTIE_POINTS_REGULAR, /datum/job/terragov/silicon/synthetic = SYNTH_POINTS_REGULAR, /datum/job/terragov/command/mech_pilot = MECH_POINTS_REGULAR, + /datum/job/terragov/command/assault_crewman = ARMORED_VEHICLE_POINTS_REGULAR, ) html_description = {" Difficulty: Hard
@@ -806,6 +1013,7 @@ Make sure that the doctors and nurses are doing their jobs and keeping the marin /datum/job/terragov/squad/smartgunner = SMARTIE_POINTS_REGULAR, /datum/job/terragov/silicon/synthetic = SYNTH_POINTS_REGULAR, /datum/job/terragov/command/mech_pilot = MECH_POINTS_REGULAR, + /datum/job/terragov/command/assault_crewman = ARMORED_VEHICLE_POINTS_REGULAR, ) html_description = {" Difficulty: Medium
@@ -892,6 +1100,7 @@ You are also an expert when it comes to medication and treatment. If you do not /datum/job/terragov/squad/smartgunner = SMARTIE_POINTS_REGULAR, /datum/job/terragov/silicon/synthetic = SYNTH_POINTS_REGULAR, /datum/job/terragov/command/mech_pilot = MECH_POINTS_REGULAR, + /datum/job/terragov/command/assault_crewman = ARMORED_VEHICLE_POINTS_REGULAR, ) html_description = {" Difficulty: Medium
@@ -978,6 +1187,7 @@ It is also recommended that you gear up like a regular marine, or your 'internsh /datum/job/terragov/squad/smartgunner = SMARTIE_POINTS_REGULAR, /datum/job/terragov/silicon/synthetic = SYNTH_POINTS_REGULAR, /datum/job/terragov/command/mech_pilot = MECH_POINTS_REGULAR, + /datum/job/terragov/command/assault_crewman = ARMORED_VEHICLE_POINTS_REGULAR, ) html_description = {" Difficulty: Hard (varies)
@@ -1052,6 +1262,7 @@ Use your office fax machine to communicate with corporate headquarters or to acq /datum/job/xenomorph = LARVA_POINTS_SHIPSIDE_STRONG, /datum/job/terragov/squad/smartgunner = SMARTIE_POINTS_REGULAR, /datum/job/terragov/command/mech_pilot = MECH_POINTS_REGULAR, + /datum/job/terragov/command/assault_crewman = ARMORED_VEHICLE_POINTS_REGULAR, ) html_description = {" Difficulty: Soul Crushing
@@ -1132,6 +1343,7 @@ In addition, being a Synthetic gives you knowledge in every field and specializa /datum/job/terragov/squad/smartgunner = SMARTIE_POINTS_REGULAR, /datum/job/terragov/silicon/synthetic = SYNTH_POINTS_REGULAR, /datum/job/terragov/command/mech_pilot = MECH_POINTS_REGULAR, + /datum/job/terragov/command/assault_crewman = ARMORED_VEHICLE_POINTS_REGULAR, ) html_description = {" Difficulty: Easy
diff --git a/code/datums/jobs/job/sons_of_mars_shipside.dm b/code/datums/jobs/job/sons_of_mars_shipside.dm index e0145fab067a7..f20430dcb229e 100644 --- a/code/datums/jobs/job/sons_of_mars_shipside.dm +++ b/code/datums/jobs/job/sons_of_mars_shipside.dm @@ -49,12 +49,6 @@ Godspeed, commander! And remember, you are not above the law."}) jobtype = /datum/job/som/command/commander id = /obj/item/card/id/gold - belt = /obj/item/storage/holster/belt/pistol/m4a3/som/fancy/fieldcommander - ears = /obj/item/radio/headset/mainship/som/command - w_uniform = /obj/item/clothing/under/som/officer/senior - shoes = /obj/item/clothing/shoes/marinechief/som - gloves = /obj/item/clothing/gloves/marine/som/officer - r_store = /obj/item/storage/pouch/general/large/som /datum/outfit/job/som/command/commander/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -135,43 +129,6 @@ Make the SOM proud!"}) jobtype = /datum/job/som/command/fieldcommander id = /obj/item/card/id/dogtag/fc - belt = /obj/item/storage/holster/belt/pistol/m4a3/som/fancy/fieldcommander - ears = /obj/item/radio/headset/mainship/som/command - w_uniform = /obj/item/clothing/under/som/officer/webbing - wear_suit = /obj/item/clothing/suit/modular/som/heavy/leader/officer - shoes = /obj/item/clothing/shoes/marine/som/knife - gloves = /obj/item/clothing/gloves/marine/som/officer - mask = /obj/item/clothing/mask/gas - head = /obj/item/clothing/head/modular/som/leader/officer - glasses = /obj/item/clothing/glasses/hud/health - r_store = /obj/item/storage/pouch/firstaid/som/combat_patrol_leader - l_store = /obj/item/storage/pouch/grenade/som/combat_patrol - suit_store = /obj/item/weapon/twohanded/fireaxe/som - back = /obj/item/storage/backpack/satchel/som - -/datum/outfit/job/som/command/fieldcommander/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_HEAD) - - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/isotonic, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclot, SLOT_IN_SUIT) - H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_SUIT) - - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/small, SLOT_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign/som, SLOT_IN_ACCESSORY) //Staff Officer /datum/job/som/command/staffofficer @@ -227,13 +184,6 @@ You are in charge of logistics and the overwatch system. You are also in line to jobtype = /datum/job/som/command/staffofficer id = /obj/item/card/id/silver - belt = /obj/item/storage/holster/belt/pistol/m4a3/som/serpenta - ears = /obj/item/radio/headset/mainship/som/command - w_uniform = /obj/item/clothing/under/som/officer - shoes = /obj/item/clothing/shoes/marinechief/som - gloves = /obj/item/clothing/gloves/marine/som/officer - r_store = /obj/item/storage/pouch/general/large/som - l_store = /obj/item/binoculars/fire_support/campaign/som //Pilot Officer /datum/job/som/command/pilot diff --git a/code/datums/jobs/job/special_forces.dm b/code/datums/jobs/job/special_forces.dm index aeb95a49372ca..30ceb9899ad24 100644 --- a/code/datums/jobs/job/special_forces.dm +++ b/code/datums/jobs/job/special_forces.dm @@ -19,10 +19,10 @@ id = /obj/item/card/id/silver belt = /obj/item/storage/belt/marine ears = /obj/item/radio/headset/distress/dutch - mask = /obj/item/clothing/mask/gas/swat - w_uniform = /obj/item/clothing/under/syndicate/tacticool/holster + mask = /obj/item/clothing/mask/gas/specops + w_uniform = /obj/item/clothing/under/marine/specops shoes = /obj/item/clothing/shoes/combat - wear_suit = /obj/item/clothing/suit/armor/bulletproof + wear_suit = /obj/item/clothing/suit/storage/marine/specops gloves = /obj/item/clothing/gloves/marine/veteran/pmc head = /obj/item/clothing/head/modular/m10x suit_store = /obj/item/weapon/gun/smg/m25/elite/suppressed @@ -78,10 +78,10 @@ id = /obj/item/card/id/silver belt = /obj/item/storage/belt/marine ears = /obj/item/radio/headset/distress/dutch - mask = /obj/item/clothing/mask/gas/swat - w_uniform = /obj/item/clothing/under/syndicate/tacticool/holster + mask = /obj/item/clothing/mask/gas/specops + w_uniform = /obj/item/clothing/under/marine/specops shoes = /obj/item/clothing/shoes/combat - wear_suit = /obj/item/clothing/suit/armor/bulletproof + wear_suit = /obj/item/clothing/suit/storage/marine/specops/support gloves = /obj/item/clothing/gloves/marine/veteran/pmc head = /obj/item/clothing/head/modular/m10x suit_store = /obj/item/weapon/gun/smg/m25/elite/suppressed/breacher @@ -133,10 +133,10 @@ id = /obj/item/card/id/silver belt = /obj/item/storage/belt/marine ears = /obj/item/radio/headset/distress/dutch - mask = /obj/item/clothing/mask/gas/swat - w_uniform = /obj/item/clothing/under/syndicate/tacticool/holster + mask = /obj/item/clothing/mask/gas/specops + w_uniform = /obj/item/clothing/under/marine/specops shoes = /obj/item/clothing/shoes/combat - wear_suit = /obj/item/clothing/suit/armor/bulletproof + wear_suit = /obj/item/clothing/suit/storage/marine/specops/support gloves = /obj/item/clothing/gloves/marine/veteran/pmc head = /obj/item/clothing/head/modular/m10x/welding suit_store = /obj/item/weapon/gun/smg/m25/elite/suppressed @@ -179,6 +179,51 @@ H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_R_POUCH) +//Special forces Medic +/datum/job/special_forces/medic + title = "Special Response Force Medic" + outfit = /datum/outfit/job/special_forces/medic + skills_type = /datum/skills/combat_medic/special_forces +/datum/outfit/job/special_forces/medic + name = "Special Response Force Medic" + jobtype = /datum/job/special_forces/medic + + glasses = /obj/item/clothing/glasses/night + id = /obj/item/card/id/silver + ears = /obj/item/radio/headset/distress/dutch + w_uniform = /obj/item/clothing/under/marine/specops + belt = /obj/item/storage/belt/lifesaver/full + wear_suit = /obj/item/clothing/suit/storage/marine/specops/medic + head = /obj/item/clothing/head/modular/m10x + shoes = /obj/item/clothing/shoes/combat + gloves = /obj/item/clothing/gloves/marine/veteran/pmc + glasses = /obj/item/clothing/glasses/hud/health + suit_store = /obj/item/weapon/gun/smg/m25/elite/suppressed + r_store = /obj/item/storage/pouch/medical_injectors/medic + l_store = /obj/item/storage/pouch/magazine/large + back = /obj/item/storage/backpack/lightpack + + +/datum/outfit/job/special_forces/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + + H.equip_to_slot_or_del(new /obj/item/clothing/glasses/mgoggles, SLOT_IN_HEAD) + + H.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/healthanalyzer, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tweezers, SLOT_IN_BACKPACK) + H.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_BACKPACK) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/g22, SLOT_IN_ACCESSORY) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/g22(H), SLOT_IN_ACCESSORY) + + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_L_POUCH) + H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_L_POUCH) + //Special forces Leader /datum/job/special_forces/leader title = "Special Response Force Leader" @@ -193,11 +238,11 @@ id = /obj/item/card/id/silver belt = /obj/item/storage/belt/marine ears = /obj/item/radio/headset/distress/dutch - mask = /obj/item/clothing/mask/gas/swat - w_uniform = /obj/item/clothing/under/syndicate/tacticool/holster + mask = /obj/item/clothing/mask/gas/specops + w_uniform = /obj/item/clothing/under/marine/specops glasses = /obj/item/clothing/glasses/night shoes = /obj/item/clothing/shoes/combat - wear_suit = /obj/item/clothing/suit/armor/bulletproof + wear_suit = /obj/item/clothing/suit/storage/marine/specops/leader gloves = /obj/item/clothing/gloves/marine/veteran/pmc head = /obj/item/clothing/head/beret/sec suit_store = /obj/item/weapon/gun/rifle/m16/spec_op diff --git a/code/datums/jobs/job/terragov.dm b/code/datums/jobs/job/terragov.dm index 57b1e7326d4cd..787a27bb8cda2 100644 --- a/code/datums/jobs/job/terragov.dm +++ b/code/datums/jobs/job/terragov.dm @@ -16,7 +16,7 @@ /datum/job/terragov/return_spawn_type(datum/preferences/prefs) switch(prefs?.species) if("Combat Robot") - if(!(SSticker.mode?.flags_round_type & MODE_HUMAN_ONLY)) + if(!(SSticker.mode?.round_type_flags & MODE_HUMAN_ONLY)) switch(prefs?.robot_type) if("Basic") return /mob/living/carbon/human/species/robot diff --git a/code/datums/jobs/job/xenomorph.dm b/code/datums/jobs/job/xenomorph.dm index fc911cd953246..017b58ae89389 100644 --- a/code/datums/jobs/job/xenomorph.dm +++ b/code/datums/jobs/job/xenomorph.dm @@ -41,7 +41,7 @@ return TRUE /datum/job/xenomorph/add_job_positions(amount) - if(!(SSticker.mode.flags_round_type & MODE_XENO_SPAWN_PROTECT)) + if(!(SSticker.mode.round_type_flags & MODE_XENO_SPAWN_PROTECT)) if(free_xeno_at_start > 0) free_xeno_at_start-- return diff --git a/code/datums/jobs/squads.dm b/code/datums/jobs/squads.dm index dec013864a24b..b61225e7a5e9f 100644 --- a/code/datums/jobs/squads.dm +++ b/code/datums/jobs/squads.dm @@ -298,7 +298,7 @@ R.use_command = FALSE var/obj/item/card/id/ID = squad_leader.get_idcard() if(istype(ID)) - ID.access -= list(ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP) + ID.access -= list(ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_TADPOLE) to_chat(squad_leader, "You're no longer the Squad Leader for [src]!") var/mob/living/carbon/human/H = squad_leader @@ -323,7 +323,7 @@ squad_leader.comm_title = "aSL" var/obj/item/card/id/ID = squad_leader.get_idcard() if(istype(ID)) - ID.access += list(ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP) + ID.access += list(ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_TADPOLE) if(istype(squad_leader.wear_ear, /obj/item/radio/headset/mainship/marine)) var/obj/item/radio/headset/mainship/marine/R = squad_leader.wear_ear @@ -421,8 +421,8 @@ GLOBAL_LIST_EMPTY_TYPED(custom_squad_radio_freqs, /datum/squad) var/freq = FREQ_CUSTOM_SQUAD_MIN + 2 * length(GLOB.custom_squad_radio_freqs) if(freq > FREQ_CUSTOM_SQUAD_MAX) return - - var/new_id = lowertext(squad_name) + "_squad" + var/lowertext_name = lowertext(squad_name) + var/new_id = lowertext_name + "_squad" if(SSjob.squads[new_id]) return @@ -436,6 +436,21 @@ GLOBAL_LIST_EMPTY_TYPED(custom_squad_radio_freqs, /datum/squad) LAZYADDASSOCSIMPLE(GLOB.radiochannels, "[radio_channel_name]", freq) LAZYADDASSOCSIMPLE(GLOB.reverseradiochannels, "[freq]", radio_channel_name) new_squad.faction = squad_faction + var/key_prefix = lowertext_name[1] + if(GLOB.department_radio_keys[key_prefix]) + for(var/letter in splittext(lowertext_name, "")) + if(!GLOB.department_radio_keys[letter]) + key_prefix = letter + break + //okay... mustve been a very short name, randomly pick things from the alphabet now + for(var/letter in shuffle(GLOB.alphabet)) + if(!GLOB.department_radio_keys[letter]) + key_prefix = letter + break + key_prefix = "ERROR" + GLOB.department_radio_keys[key_prefix] = radio_channel_name + GLOB.channel_tokens[radio_channel_name] = ":[key_prefix]" + if(new_squad.faction == FACTION_TERRAGOV) var/list/terragov_server_freqs = GLOB.telecomms_freq_listening_list[/obj/machinery/telecomms/server/presets/alpha] var/list/terragov_bus_freqs = GLOB.telecomms_freq_listening_list[/obj/machinery/telecomms/bus/preset_three] diff --git a/code/datums/keybinding/admin.dm b/code/datums/keybinding/admin.dm index 64e05d7f453ec..e44901b091bed 100644 --- a/code/datums/keybinding/admin.dm +++ b/code/datums/keybinding/admin.dm @@ -44,3 +44,17 @@ return user.get_togglebuildmode() return TRUE + +/datum/keybinding/admin/view_tags + hotkey_keys = list("F9") + name = "view_tags" + full_name = "View Tags" + description = "Open the View-Tags menu" + keybind_signal = COMSIG_KB_ADMIN_VIEWTAGS_DOWN + +/datum/keybinding/admin/view_tags/down(client/user) + . = ..() + if(.) + return + user.holder?.display_tags() + return TRUE diff --git a/code/datums/keybinding/carbon.dm b/code/datums/keybinding/carbon.dm index a7252c331e3b5..474aebe916595 100644 --- a/code/datums/keybinding/carbon.dm +++ b/code/datums/keybinding/carbon.dm @@ -55,7 +55,7 @@ if(.) return var/mob/living/carbon/C = user.mob - C.lay_down() + C.toggle_resting() return TRUE /datum/keybinding/carbon/select_help_intent @@ -116,32 +116,3 @@ return user.mob?.a_intent_change(INTENT_HARM) return TRUE - -/datum/keybinding/carbon/specialclick - hotkey_keys = list("Ctrl") - name = "specialclick" - full_name = "Special Click" - description = "Hold this hotkey_keys and click to trigger special object interactions." - keybind_signal = COMSIG_KB_CARBON_SPECIALCLICK_DOWN - - -/datum/keybinding/carbon/specialclick/down(client/user) - . = ..() - if(.) - return - RegisterSignals(user.mob, list(COMSIG_MOB_CLICKON), PROC_REF(specialclicky)) - RegisterSignals(user.mob, list(COMSIG_MOB_MOUSEDOWN, COMSIG_MOB_MOUSEUP), TYPE_PROC_REF(/datum/keybinding, intercept_mouse_special)) - return TRUE - - -/datum/keybinding/carbon/specialclick/up(client/user) - UnregisterSignal(user.mob, list(COMSIG_MOB_MOUSEDOWN, COMSIG_MOB_MOUSEUP, COMSIG_MOB_CLICKON)) - return TRUE - -/datum/keybinding/carbon/specialclick/proc/specialclicky(datum/source, atom/A, params) - SIGNAL_HANDLER - var/mob/living/carbon/user = source - if(!user.client || !(user.client.eye == user || user.client.eye == user.loc)) - UnregisterSignal(user, (COMSIG_MOB_CLICKON)) - return - A.specialclick(user) diff --git a/code/datums/keybinding/human.dm b/code/datums/keybinding/human.dm index e2e7d0bfe02a1..2ec9c4f109bec 100644 --- a/code/datums/keybinding/human.dm +++ b/code/datums/keybinding/human.dm @@ -36,7 +36,7 @@ quick_equip_slot = 5 /datum/keybinding/human/unique_action - hotkey_keys = list("Space") + hotkey_keys = list("C") name = "unique_action" full_name = "Perform unique action" keybind_signal = COMSIG_KB_UNIQUEACTION diff --git a/code/datums/keybinding/item_toggles.dm b/code/datums/keybinding/item_toggles.dm new file mode 100644 index 0000000000000..0fbbe17c03d29 --- /dev/null +++ b/code/datums/keybinding/item_toggles.dm @@ -0,0 +1,17 @@ +/datum/keybinding/item + category = CATEGORY_ITEM + weight = WEIGHT_MOB + +/datum/keybinding/item/jetpack + name = "Jetpack" + full_name = "Toggle jetpack" + description = "Toggles your jetpack on, allowing you to fly a short distance." + keybind_signal = COMSIG_ITEM_TOGGLE_JETPACK + hotkey_keys = list("G") + +/datum/keybinding/item/blinkdrive + name = "Blink drive" + full_name = "Toggle blink drive" + description = "Toggles your blink drive on, allowing you to instantly teleport short distances." + keybind_signal = COMSIG_ITEM_TOGGLE_BLINKDRIVE + hotkey_keys = list("G") diff --git a/code/datums/keybinding/mecha.dm b/code/datums/keybinding/mecha.dm index 566b70d8ca4f7..6f4d765dd1357 100644 --- a/code/datums/keybinding/mecha.dm +++ b/code/datums/keybinding/mecha.dm @@ -50,3 +50,16 @@ description = "Bombard an area with rockets" keybind_signal = COMSIG_MECHABILITY_STRIKE hotkey_keys = list("F") + +/datum/keybinding/mecha/mech_reload_weapons + name = "mech_reload_weapons" + full_name = "Mech Reload Weapons" + description = "Reload any equipped weapons" + keybind_signal = COMSIG_MECHABILITY_RELOAD + hotkey_keys = list("R") +/datum/keybinding/mecha/mech_toggle_actuators + name = "mech_toggle_actuators" + full_name = "Mecha Toggle Actuators" + description = "Toggle leg actuator overload for your mecha" + keybind_signal = COMSIG_MECHABILITY_TOGGLE_ACTUATORS + hotkey_keys = list("X") diff --git a/code/datums/keybinding/mob.dm b/code/datums/keybinding/mob.dm index d5719bfc50267..282b398ef387a 100644 --- a/code/datums/keybinding/mob.dm +++ b/code/datums/keybinding/mob.dm @@ -176,35 +176,6 @@ return TRUE */ - -/datum/keybinding/mob/examine - hotkey_keys = list("Shift") - name = "examine_kb" - full_name = "Examine" - description = "Hold this hotkey_keys and click to examine things." - keybind_signal = COMSIG_KB_MOB_EXAMINE_DOWN - - -/datum/keybinding/mob/examine/down(client/user) - . = ..() - if(.) - return - RegisterSignals(user.mob, list(COMSIG_MOB_CLICKON, COMSIG_OBSERVER_CLICKON), PROC_REF(examinate)) - RegisterSignals(user.mob, list(COMSIG_MOB_MOUSEDOWN, COMSIG_MOB_MOUSEUP), TYPE_PROC_REF(/datum/keybinding, intercept_mouse_special)) - return TRUE - - -/datum/keybinding/mob/examine/up(client/user) - UnregisterSignal(user.mob, list(COMSIG_MOB_MOUSEDOWN, COMSIG_MOB_MOUSEUP, COMSIG_MOB_CLICKON, COMSIG_OBSERVER_CLICKON)) - return TRUE - - -/datum/keybinding/mob/examine/proc/examinate(datum/source, atom/A, params) - SIGNAL_HANDLER - var/mob/user = source - user.examinate(A) - return COMSIG_MOB_CLICK_HANDLED - /datum/keybinding/mob/toggle_move_intent hotkey_keys = list("5") name = "toggle_move_intent" @@ -343,3 +314,32 @@ return user.mob.do_self_harm = !user.mob.do_self_harm user.mob.balloon_alert(user.mob, "You can [user.mob.do_self_harm ? "now" : "no longer"] hit yourself") + +/datum/keybinding/mob/interactive_emote + name = "interactive_emote" + full_name = "Do interactive emote" + description = "Perform an interactive emote with another player." + keybind_signal = COMSIG_KB_INTERACTIVE_EMOTE + +/datum/keybinding/mob/interactive_emote/down(client/user) + . = ..() + if(. || !isliving(user.mob) || CHECK_BITFIELD(user.mob.status_flags, INCORPOREAL) || !user.mob.can_interact(user.mob)) + return + + var/list/adjacent_mobs = cheap_get_living_near(user.mob, 1) + adjacent_mobs.Remove(user.mob) //Get rid of self + for(var/mob/M AS in adjacent_mobs) + if(!M.client) + adjacent_mobs.Remove(M) //Get rid of non-players + + if(!length(adjacent_mobs)) + return + + if(length(adjacent_mobs) == 1) + user.mob.interaction_emote(adjacent_mobs[1]) + return + + var/mob/target = tgui_input_list(user, "Who do you want to interact with?", "Select a target", adjacent_mobs) + if(!target || !user.mob.Adjacent(target)) //In case the target moved away while selecting them + return + user.mob.interaction_emote(target) diff --git a/code/datums/keybinding/sectoid.dm b/code/datums/keybinding/sectoid.dm new file mode 100644 index 0000000000000..f3a4195e651ef --- /dev/null +++ b/code/datums/keybinding/sectoid.dm @@ -0,0 +1,52 @@ +/datum/keybinding/sectoid + category = CATEGORY_PSIONIC + weight = WEIGHT_MOB + +/datum/keybinding/sectoid/mindmeld + name = "Mindmeld" + full_name = "Sectoid: Mindmeld" + description = "We merge minds with another of our kind, strengthening us both." + keybind_signal = COMSIG_ABILITY_MINDMELD + hotkey_keys = list("U") + +/datum/keybinding/sectoid/mindfray + name = "Mindfray" + full_name = "Sectoid: Mindfray" + description = "We attack the mind of our foe, greatly weakening them for a time." + keybind_signal = COMSIG_ABILITY_MINDFRAY + hotkey_keys = list("Q") + +/datum/keybinding/sectoid/reknit_form + name = "Reknit form" + full_name = "Sectoid: Reknit form" + description = "Flesh and bone runs like water at our will, healing horrendous damage with the power of our mind." + keybind_signal = COMSIG_ABILITY_REKNIT_FORM + hotkey_keys = list("F") + +/datum/keybinding/sectoid/fuse + name = "Fuse" + full_name = "Sectoid: Fuse" + description = "We reach out with our mind to trigger an explosive device." + keybind_signal = COMSIG_ABILITY_FUSE + hotkey_keys = list("R") + +/datum/keybinding/sectoid/stasis + name = "Stasis" + full_name = "Sectoid: Stasis" + description = "We surround a living thing with a powerful psionic field, temporarily disabling them and protecting them from all harm." + keybind_signal = COMSIG_ABILITY_STASIS + hotkey_keys = list("H") + +/datum/keybinding/sectoid/telekinesis + name = "Telekinesis" + full_name = "Sectoid: Telekinesis" + description = "We manipulate things from a distance." + keybind_signal = COMSIG_ABILITY_TELEKINESIS + hotkey_keys = list("G") + +/datum/keybinding/sectoid/reanimate + name = "Reanimate" + full_name = "Sectoid: Reanimate" + description = "With our psionic strength we turn the dead into our puppet, or revive a fallen ally." + keybind_signal = COMSIG_ABILITY_REANIMATE + hotkey_keys = list("B") diff --git a/code/datums/keybinding/weapons.dm b/code/datums/keybinding/weapons.dm new file mode 100644 index 0000000000000..5a5077bf42e57 --- /dev/null +++ b/code/datums/keybinding/weapons.dm @@ -0,0 +1,17 @@ +/datum/keybinding/weapon + category = CATEGORY_WEAPON + weight = WEIGHT_MOB + +/datum/keybinding/weapon/axe_sweep + name = "Axe sweep" + full_name = "Breaching axe: Axe sweep" + description = "A powerful sweeping blow that hits foes in the direction you are facing. Cannot stun." + keybind_signal = COMSIG_WEAPONABILITY_AXESWEEP + hotkey_keys = list("G") + +/datum/keybinding/weapon/sword_lunge + name = "Lunging strike" + full_name = "Sword: Lunging strike" + description = "Dash a short distance to inflict a staggering blow on an opponent. Cannot stun." + keybind_signal = COMSIG_WEAPONABILITY_SWORDLUNGE + hotkey_keys = list("G") diff --git a/code/datums/keybinding/xeno.dm b/code/datums/keybinding/xeno.dm index 249a171555408..9a2418d492bf1 100644 --- a/code/datums/keybinding/xeno.dm +++ b/code/datums/keybinding/xeno.dm @@ -47,6 +47,13 @@ keybind_signal = COMSIG_XENOABILITY_SECRETE_RESIN hotkey_keys = list("R") +/datum/keybinding/xeno/secrete_special_resin + name = "secrete_special_resin" + full name = "Secrete Special Resin" + description = "Builds whatever special resin you have selected." + keybind_signal = COMSIG_XENOABILITY_SECRETE_SPECIAL_RESIN + hotkey_keys = list("ShiftR") + /datum/keybinding/xeno/recycle name = "Recycle" full_name = "Recycle xenomorph" @@ -103,6 +110,13 @@ keybind_signal = COMSIG_XENOABILITY_XENO_SPIT hotkey_keys = list("Q") +/datum/keybinding/xeno/long_range_sight + name = "long_range_sight" + full_name = "Long Range Sight" + description = "Toggles the zoom in." + keybind_signal = COMSIG_XENOABILITY_LONG_RANGE_SIGHT + hotkey_keys = list("E") + /datum/keybinding/xeno/xenohide name = "xenohide" full_name = "Hide" @@ -225,13 +239,6 @@ keybind_signal = COMSIG_XENOABILITY_CREATE_BOMB hotkey_keys = list("F") -/datum/keybinding/xeno/root - name = "root" - full_name = "Boiler: Root in place" - description = "Begin rooting in place." - keybind_signal = COMSIG_XENOABILITY_ROOT - hotkey_keys = list("C") - /datum/keybinding/xeno/bombard name = "bombard" full_name = "Boiler: Bombard" @@ -251,7 +258,7 @@ full_name = "Bull: Headbutt Charge" description = "A charge that tosses the victim forward." keybind_signal = COMSIG_XENOABILITY_BULLHEADBUTT - hotkey_keys = list("E") + hotkey_keys = list("F") /datum/keybinding/xeno/gore_charge name = "gore_charge" @@ -481,11 +488,11 @@ keybind_signal = COMSIG_XENOABILITY_TRANSFUSION hotkey_keys = list("H") -/datum/keybinding/xeno/rejuvenate - name = "rejuvenate" - full_name = "Gorger: Rejuvenate" - description = "Drains blood continuosly, slows you down and reduces damage taken, while restoring some health over time. Cancel by activating again." - keybind_signal = COMSIG_XENOABILITY_REJUVENATE +/datum/keybinding/xeno/oppose + name = "oppose" + full_name = "Gorger: Oppose" + description = "Violently suffuse the nearby ground with stored blood, staggering nearby marines and healing nearby xenomorphs." + keybind_signal = COMSIG_XENOABILITY_OPPOSE hotkey_keys = list("R") /datum/keybinding/xeno/psychic_link diff --git a/code/datums/loadout/item_representation/armor_representation.dm b/code/datums/loadout/item_representation/armor_representation.dm index 5eb07acab1a95..6a0440b01a951 100644 --- a/code/datums/loadout/item_representation/armor_representation.dm +++ b/code/datums/loadout/item_representation/armor_representation.dm @@ -173,6 +173,8 @@ if(!.) return var/obj/item/armor_module/module = . + if(colors && CHECK_BITFIELD(module.attach_features_flags, ATTACH_GREYSCALE_PARENT_COPY)) + module.set_greyscale_colors(colors) for(var/datum/item_representation/armor_module/armor_attachement AS in attachments) armor_attachement.install_on_armor(seller, module, user) @@ -182,7 +184,7 @@ //if(!item_type) // return var/obj/item/armor_module/module_type = item_type - if(!CHECK_BITFIELD(initial(module_type.flags_attach_features), ATTACH_REMOVABLE)) + if(!CHECK_BITFIELD(initial(module_type.attach_features_flags), ATTACH_REMOVABLE)) bypass_vendor_check = TRUE var/obj/item/armor_module/module = instantiate_object(seller, null, user) if(!module) diff --git a/code/datums/loadout/loadout.dm b/code/datums/loadout/loadout.dm index a5954cd48c7dd..89f3570107461 100644 --- a/code/datums/loadout/loadout.dm +++ b/code/datums/loadout/loadout.dm @@ -21,40 +21,40 @@ ///Check if the item can go to the specified slot /datum/loadout/proc/can_equip_to_slot(item_type, slot) var/obj/item/item = item_type - var/flags_equip_slot = initial(item.flags_equip_slot) + var/equip_slot_flags = initial(item.equip_slot_flags) var/w_class = initial(item.w_class) switch(slot) if(slot_wear_mask_str) - return (flags_equip_slot & ITEM_SLOT_MASK) + return (equip_slot_flags & ITEM_SLOT_MASK) if(slot_back_str) - return (flags_equip_slot & ITEM_SLOT_BACK) + return (equip_slot_flags & ITEM_SLOT_BACK) if(slot_wear_suit_str) - return (flags_equip_slot & ITEM_SLOT_OCLOTHING) + return (equip_slot_flags & ITEM_SLOT_OCLOTHING) if(slot_gloves_str) - return (flags_equip_slot & ITEM_SLOT_GLOVES) + return (equip_slot_flags & ITEM_SLOT_GLOVES) if(slot_shoes_str) - return (flags_equip_slot & ITEM_SLOT_FEET) + return (equip_slot_flags & ITEM_SLOT_FEET) if(slot_belt_str) - if(!(flags_equip_slot & ITEM_SLOT_BELT)) + if(!(equip_slot_flags & ITEM_SLOT_BELT)) return FALSE if(!item_list[SLOT_W_UNIFORM]) return FALSE return TRUE if(slot_glasses_str) - return (flags_equip_slot & ITEM_SLOT_EYES) + return (equip_slot_flags & ITEM_SLOT_EYES) if(slot_head_str) - return (flags_equip_slot & ITEM_SLOT_HEAD) + return (equip_slot_flags & ITEM_SLOT_HEAD) if(slot_w_uniform_str) - return (flags_equip_slot & ITEM_SLOT_ICLOTHING) + return (equip_slot_flags & ITEM_SLOT_ICLOTHING) if(slot_l_store_str) if(!item_list[SLOT_W_UNIFORM]) return FALSE - if(w_class <= 2 || (flags_equip_slot & ITEM_SLOT_POCKET)) + if(w_class <= 2 || (equip_slot_flags & ITEM_SLOT_POCKET)) return TRUE if(slot_r_store_str) if(!item_list[SLOT_W_UNIFORM]) return FALSE - if(w_class <= 2 || (flags_equip_slot & ITEM_SLOT_POCKET)) + if(w_class <= 2 || (equip_slot_flags & ITEM_SLOT_POCKET)) return TRUE if(slot_s_store_str) if(!item_list[SLOT_W_UNIFORM]) @@ -66,9 +66,9 @@ return TRUE return FALSE if(slot_ear_str) - return (flags_equip_slot & ITEM_SLOT_EARS) + return (equip_slot_flags & ITEM_SLOT_EARS) if(slot_wear_id_str) - return (flags_equip_slot & ITEM_SLOT_ID) + return (equip_slot_flags & ITEM_SLOT_ID) if(slot_r_hand_str) return TRUE if(slot_l_hand_str) diff --git a/code/datums/looping_sounds/machinery_sounds.dm b/code/datums/looping_sounds/machinery_sounds.dm old mode 100644 new mode 100755 index 7c0838e9b4014..8de9dbe882d02 --- a/code/datums/looping_sounds/machinery_sounds.dm +++ b/code/datums/looping_sounds/machinery_sounds.dm @@ -24,6 +24,13 @@ range = 8 falloff = 1 +/datum/looping_sound/flickeringambient + mid_sounds = list('sound/effects/lightbuzzloop6.ogg' = 1) + mid_length = 5 SECONDS + volume = 50 + range = 6 + falloff = 2 + /datum/looping_sound/geiger mid_sounds = list( list('sound/effects/geiger/low1.ogg'=1, 'sound/effects/geiger/low2.ogg'=1, 'sound/effects/geiger/low3.ogg'=1, 'sound/effects/geiger/low4.ogg'=1), diff --git a/code/datums/marine_main_ship.dm b/code/datums/marine_main_ship.dm index 06749955ab862..dff77022f389c 100644 --- a/code/datums/marine_main_ship.dm +++ b/code/datums/marine_main_ship.dm @@ -14,11 +14,11 @@ GLOBAL_DATUM_INIT(marine_main_ship, /datum/marine_main_ship, new) /datum/marine_main_ship/proc/make_maint_all_access() maint_all_access = TRUE - priority_announce("The maintenance access requirement has been revoked on all airlocks.", "Attention!", sound = 'sound/misc/notice1.ogg') + priority_announce("The maintenance access requirement has been revoked on all airlocks.", "Attention!", "Shipside emergency declared.", sound = 'sound/misc/notice1.ogg', color_override = "grey") /datum/marine_main_ship/proc/revoke_maint_all_access() maint_all_access = FALSE - priority_announce("The maintenance access requirement has been readded on all maintenance airlocks.", "Attention!", sound = 'sound/misc/notice2.ogg') + priority_announce("The maintenance access requirement has been readded on all maintenance airlocks.", "Attention!", "Shipside emergency revoked.", sound = 'sound/misc/notice2.ogg', color_override = "grey") /datum/marine_main_ship/proc/set_security_level(level, announce = TRUE) switch(level) @@ -79,7 +79,7 @@ GLOBAL_DATUM_INIT(marine_main_ship, /datum/marine_main_ship, new) switch(level) if(SEC_LEVEL_GREEN) if(announce) - priority_announce("Attention: Security level lowered to GREEN - all clear.", "Priority Alert", sound = 'sound/AI/code_green.ogg') + priority_announce("Attention: Security level lowered to GREEN - all clear.", title = "Security Level Lowered", subtitle = "All Clear", sound = 'sound/AI/code_green.ogg', color_override = "green") security_level = SEC_LEVEL_GREEN for(var/obj/machinery/status_display/SD in GLOB.machines) if(is_mainship_level(SD.z)) @@ -87,10 +87,10 @@ GLOBAL_DATUM_INIT(marine_main_ship, /datum/marine_main_ship, new) if(SEC_LEVEL_BLUE) if(security_level < SEC_LEVEL_BLUE) if(announce) - priority_announce("Attention: Security level elevated to BLUE - potentially hostile activity on board.", "Priority Alert", sound = 'sound/AI/code_blue_elevated.ogg') + priority_announce("Attention: Security level elevated to BLUE - potentially hostile activity on board.", title = "Security Level Elevated", sound = 'sound/AI/code_blue_elevated.ogg') else if(announce) - priority_announce("Attention: Security level lowered to BLUE - potentially hostile activity on board.", "Priority Alert", sound = 'sound/AI/code_blue_lowered.ogg') + priority_announce("Attention: Security level lowered to BLUE - potentially hostile activity on board.", title = "Security Level Lowered", sound = 'sound/AI/code_blue_lowered.ogg') security_level = SEC_LEVEL_BLUE for(var/obj/machinery/status_display/SD in GLOB.machines) if(is_mainship_level(SD.z)) @@ -98,10 +98,10 @@ GLOBAL_DATUM_INIT(marine_main_ship, /datum/marine_main_ship, new) if(SEC_LEVEL_RED) if(security_level < SEC_LEVEL_RED) if(announce) - priority_announce("Attention: Security level elevated to RED - there is an immediate threat to the ship.", "Priority Alert", sound = 'sound/AI/code_red_elevated.ogg') + priority_announce("Attention: Security level elevated to RED - there is an immediate threat to the ship.", title = "Security Level Elevated", sound = 'sound/AI/code_red_elevated.ogg', color_override = "red") else if(announce) - priority_announce("Attention: Security level lowered to RED - there is an immediate threat to the ship.", "Priority Alert", sound = 'sound/AI/code_red_lowered.ogg') + priority_announce("Attention: Security level lowered to RED - there is an immediate threat to the ship.", title = "Ship Destruction Averted", type = ANNOUNCEMENT_PRIORITY, sound = 'sound/AI/code_red_lowered.ogg', color_override = "red") /* var/area/A for(var/obj/machinery/power/apc/O in machines) @@ -117,7 +117,7 @@ GLOBAL_DATUM_INIT(marine_main_ship, /datum/marine_main_ship, new) SD.set_picture("redalert") if(SEC_LEVEL_DELTA) if(announce) - priority_announce("Attention! Delta security level reached! " + CONFIG_GET(string/alert_delta), "Priority Alert") + priority_announce("Attention! Delta security level reached! " + CONFIG_GET(string/alert_delta), title = "Ship Destruction Imminent", type = ANNOUNCEMENT_PRIORITY, color_override = "purple") security_level = SEC_LEVEL_DELTA for(var/obj/machinery/door/poddoor/shutters/mainship/D in GLOB.machines) if(D.id == "sd_lockdown") diff --git a/code/datums/outfit.dm b/code/datums/outfit.dm index 192f03f281a56..de78fee190302 100644 --- a/code/datums/outfit.dm +++ b/code/datums/outfit.dm @@ -246,3 +246,19 @@ id = human_mob.wear_id?.type l_store = human_mob.l_store?.type r_store = human_mob.r_store?.type + +/datum/outfit/vv_get_dropdown() + . = ..() + VV_DROPDOWN_OPTION("", "---------") + VV_DROPDOWN_OPTION(VV_HK_TO_OUTFIT_EDITOR, "Outfit Editor") + +/datum/outfit/vv_do_topic(list/href_list) + . = ..() + + if(!.) + return + + if(href_list[VV_HK_TO_OUTFIT_EDITOR]) + if(!check_rights(NONE)) + return + usr.client.open_outfit_editor(src) diff --git a/code/datums/personal_statistics.dm b/code/datums/personal_statistics.dm index 88f9bead146ef..e34ad294eaba7 100644 --- a/code/datums/personal_statistics.dm +++ b/code/datums/personal_statistics.dm @@ -38,6 +38,8 @@ GLOBAL_LIST_EMPTY(personal_statistics_list) var/projectile_damage = 0 var/melee_damage = 0 + var/mechs_destroyed = 0 + //We are watching var/friendly_fire_damage = 0 @@ -62,6 +64,7 @@ GLOBAL_LIST_EMPTY(personal_statistics_list) var/times_revived = 0 var/deaths = 0 + var/shrapnel_removed = 0 //Downtime var/time_resting = 0 @@ -105,6 +108,26 @@ GLOBAL_LIST_EMPTY(personal_statistics_list) var/war_crimes = 0 var/tactical_unalives = 0 //Someone should add a way to determine if you died to a grenade in your hand and add it to this + //campaign specific vars + var/mission_projectile_damage = 0 + var/mission_friendly_fire_damage = 0 + var/mission_melee_damage = 0 + var/mission_revives = 0 + var/mission_times_revived = 0 + var/mission_structures_built = 0 + var/mission_objective_destroyed = 0 + var/mission_blocker_destroyed = 0 + var/mission_objective_captured = 0 + var/mission_objective_decaptured = 0 + var/mission_mechs_destroyed = 0 + var/mission_shrapnel_removed = 0 + var/mission_traps_created = 0 + var/mission_grenades_primed = 0 + +/datum/personal_statistics/New() + . = ..() + RegisterSignal(SSdcs, COMSIG_GLOB_CAMPAIGN_MISSION_STARTED, PROC_REF(reset_mission_stats)) + ///Calculated from the chemicals_ingested list, returns a string: "[chemical name], [amount] units" /datum/personal_statistics/proc/get_most_ingested_chemical() var/list/winner = list("none", 0) @@ -153,6 +176,9 @@ GLOBAL_LIST_EMPTY(personal_statistics_list) if(internal_injuries_inflicted) stats += "Inflicted [internal_injuries_inflicted] internal injur[internal_injuries_inflicted > 1 ? "ies" : "y"] on [internal_injuries_inflicted > 1 ? "others" : "somebody"]." + if(mechs_destroyed) + stats += "[mechs_destroyed] hostile mechs destroyed." + //Medical stats += "
" if(self_heals) @@ -166,6 +192,8 @@ GLOBAL_LIST_EMPTY(personal_statistics_list) if(times_revived) stats += "You were revived [times_revived] time\s." stats += deaths ? "You died [deaths] time\s." : "You survived the whole round." + if(shrapnel_removed) + stats += "Removed [shrapnel_removed] piece\s of shrapnel." //Downtime var/list/downtime_stats = list() @@ -264,7 +292,46 @@ GLOBAL_LIST_EMPTY(personal_statistics_list) //Replace any instances of line breaks after horizontal rules to prevent unneeded empty spaces return replacetext(jointext(stats, "
"), "
", "
") - +/** + * Resets stats recorded for the current mission + * Used for Campaign + */ +/datum/personal_statistics/proc/reset_mission_stats() + SIGNAL_HANDLER + mission_projectile_damage = 0 + mission_friendly_fire_damage = 0 + mission_revives = 0 + mission_times_revived = 0 + mission_structures_built = 0 + mission_melee_damage = 0 + mission_objective_destroyed = 0 + mission_blocker_destroyed = 0 + mission_objective_captured = 0 + mission_objective_decaptured = 0 + mission_mechs_destroyed = 0 + mission_shrapnel_removed = 0 + mission_traps_created = 0 + mission_grenades_primed = 0 + +///Returns the credit bonus based on stats from the current mission +/datum/personal_statistics/proc/get_mission_reward() + var/credit_bonus = 0 + credit_bonus += mission_projectile_damage * 0.1 + credit_bonus -= mission_friendly_fire_damage * 0.2 + credit_bonus += mission_melee_damage * 0.2 + credit_bonus += mission_revives * 15 + credit_bonus += mission_times_revived * 5 //purple heart + credit_bonus += mission_structures_built * 6 + credit_bonus += mission_objective_destroyed * 50 + credit_bonus += mission_blocker_destroyed * 30 + credit_bonus += mission_objective_captured * 20 + credit_bonus += mission_objective_decaptured * 20 + credit_bonus += mission_mechs_destroyed * 20 + credit_bonus += mission_shrapnel_removed * 3 + credit_bonus += mission_traps_created * 4 + credit_bonus += mission_grenades_primed * 2 + + return max(floor(credit_bonus), 0) /* Not sure what folder to put a file of just record keeping procs, so just leaving them here The alternative is scattering them everywhere under their respective objects which is a bit messy */ @@ -276,6 +343,9 @@ The alternative is scattering them everywhere under their respective objects whi var/datum/personal_statistics/personal_statistics = GLOB.personal_statistics_list[user.ckey] personal_statistics.melee_hits++ personal_statistics.melee_damage += damage + personal_statistics.mission_melee_damage += damage + if(faction == user.faction) + personal_statistics.mission_friendly_fire_damage += damage return TRUE /mob/living/carbon/human/record_melee_damage(mob/living/user, damage, delimbed) @@ -310,17 +380,17 @@ The alternative is scattering them everywhere under their respective objects whi return ..() ///Tally to personal_statistics that a successful shot was made and record the damage dealt -/mob/living/proc/record_projectile_damage(mob/shooter, damage) - //Check if a ckey exists; the check for victim aliveness is handled before the proc call - if(!shooter.ckey) +/mob/living/proc/record_projectile_damage(damage, mob/living/victim) + if(!ckey) return FALSE - var/datum/personal_statistics/personal_statistics = GLOB.personal_statistics_list[shooter.ckey] + var/datum/personal_statistics/personal_statistics = GLOB.personal_statistics_list[ckey] personal_statistics.projectiles_hit++ personal_statistics.projectile_damage += damage - if(faction && isliving(shooter)) //See if any friendly fire was made - var/mob/living/L = shooter - if(faction == L.faction) - personal_statistics.friendly_fire_damage += damage //FF multiplier already included by the way + personal_statistics.mission_projectile_damage += damage + + if(faction == victim.faction) //See if any friendly fire was made + personal_statistics.friendly_fire_damage += damage //FF multiplier already included by the way + personal_statistics.mission_friendly_fire_damage += damage return TRUE ///Record what reagents and how much of them were transferred to a mob into their ckey's /datum/personal_statistics @@ -422,7 +492,8 @@ The alternative is scattering them everywhere under their respective objects whi if(!ckey) return FALSE var/datum/personal_statistics/personal_statistics = GLOB.personal_statistics_list[ckey] - personal_statistics.recycle_points_denied += trash.get_export_value() + var/list/exported_value = trash.get_export_value() + personal_statistics.recycle_points_denied += exported_value[1] return TRUE ///Separate record keeping proc to reduce copy pasta @@ -524,6 +595,7 @@ The alternative is scattering them everywhere under their respective objects whi return FALSE var/datum/personal_statistics/personal_statistics = GLOB.personal_statistics_list[ckey] personal_statistics.traps_created++ + personal_statistics.mission_traps_created++ return TRUE ///Tally up bullets caught/reflected @@ -542,6 +614,7 @@ The alternative is scattering them everywhere under their respective objects whi return FALSE var/datum/personal_statistics/personal_statistics = GLOB.personal_statistics_list[ckey] personal_statistics.structures_built++ + personal_statistics.mission_structures_built++ return TRUE /mob/proc/record_war_crime() diff --git a/code/datums/quick_load_beginners.dm b/code/datums/quick_load_beginners.dm new file mode 100644 index 0000000000000..c2554da595670 --- /dev/null +++ b/code/datums/quick_load_beginners.dm @@ -0,0 +1,673 @@ +//Any loadout that is intended for the new player loadout vendor +///When making new loadouts, remember to also add the typepath to the list under init_beginner_loadouts() or else it won't show up in the vendor + + +/datum/outfit/quick/beginner + name = "Beginner loadout base" + desc = "The base loadout for beginners. You shouldn't be able to see this" + jobtype = "Squad Marine" + + w_uniform = /obj/item/clothing/under/marine + shoes = /obj/item/clothing/shoes/marine/full + wear_suit = /obj/item/clothing/suit/modular/xenonauten + gloves = /obj/item/clothing/gloves/marine/black + mask = /obj/item/clothing/mask/bandanna + head = /obj/item/clothing/head/modular/m10x + r_store = /obj/item/storage/pouch/medkit/firstaid + l_store = /obj/item/storage/holster/flarepouch/full + back = /obj/item/storage/backpack/marine/satchel + belt = /obj/item/storage/belt/marine + ears = /obj/item/radio/headset/mainship/marine + +/datum/outfit/quick/beginner/post_equip(mob/living/carbon/human/human, visualsOnly) + . = ..() + human.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/protein_pack, SLOT_IN_HEAD) + human.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/protein_pack, SLOT_IN_HEAD) + +/datum/outfit/quick/beginner/marine/rifleman + name = "Rifleman" + desc = "A typical rifleman for the marines. \ + Wields the AR-12, a versatile all-rounder assault rifle with a powerful underbarrel grenade launcher attached. \ + Also carries the strong P-23 sidearm and a variety of flares, medical equipment, and more for every situation." + + wear_suit = /obj/item/clothing/suit/modular/xenonauten/hodgrenades + head = /obj/item/clothing/head/modular/m10x/hod + w_uniform = /obj/item/clothing/under/marine/holster + suit_store = /obj/item/weapon/gun/rifle/standard_assaultrifle/medic + l_hand = /obj/item/paper/tutorial/beginner_rifleman + +/datum/outfit/quick/beginner/marine/rifleman/post_equip(mob/living/carbon/human/human, visualsOnly) + . = ..() + human.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_assaultrifle, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_assaultrifle, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_assaultrifle, SLOT_IN_BACKPACK) + + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_assaultrifle, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_assaultrifle, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_assaultrifle, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_assaultrifle, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_assaultrifle, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_assaultrifle, SLOT_IN_BELT) + + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/beginner(human), SLOT_IN_ACCESSORY) + + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_SUIT) + +/datum/outfit/quick/beginner/marine/machinegunner + name = "Machinegunner" + desc = "The king of suppressive fire. Uses the MG-60, a fully automatic 200 round machine gun with a bipod attached. \ + Excels at denying large areas to the enemy and eliminating those who refuse to leave." + + wear_suit = /obj/item/clothing/suit/modular/xenonauten/heavy/tyr_onegeneral + head = /obj/item/clothing/head/modular/m10x/tyr + w_uniform = /obj/item/clothing/under/marine/black_vest + back = /obj/item/storage/backpack/marine/standard + belt = /obj/item/storage/belt/sparepouch + suit_store = /obj/item/weapon/gun/rifle/standard_gpmg/beginner + mask = /obj/item/clothing/mask/rebreather + l_hand = /obj/item/paper/tutorial/beginner_machinegunner + +/datum/outfit/quick/beginner/marine/machinegunner/post_equip(mob/living/carbon/human/human, visualsOnly) + . = ..() + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BACKPACK) + + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BELT) + + human.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_ACCESSORY) + + human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/plasma_pistol, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/plasma_pistol, SLOT_IN_SUIT) + + +/datum/outfit/quick/beginner/marine/marksman + name = "Marksman" + desc = "Quality over quantity. Equipped with the DMR-37, an accurate long-range designated marksman rifle with a scope attached. \ + While subpar in close quarters, the precision of the DMR is unmatched, exceeding at taking out threats from afar." + + wear_suit = /obj/item/clothing/suit/modular/xenonauten/lightmedical + head = /obj/item/clothing/head/modular/style/boonie + w_uniform = /obj/item/clothing/under/marine/holster + belt = /obj/item/belt_harness/marine + l_store = /obj/item/storage/pouch/magazine/large + r_store = /obj/item/storage/pouch/magazine/large + suit_store = /obj/item/weapon/gun/rifle/standard_dmr/beginner + mask = /obj/item/clothing/mask/breath + l_hand = /obj/item/paper/tutorial/beginner_marksman + +/datum/outfit/quick/beginner/marine/marksman/post_equip(mob/living/carbon/human/human, visualsOnly) + . = ..() + human.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_dmr, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_dmr, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_dmr, SLOT_IN_BACKPACK) + + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_dmr, SLOT_IN_L_POUCH) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_dmr, SLOT_IN_L_POUCH) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_dmr, SLOT_IN_L_POUCH) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_dmr, SLOT_IN_R_POUCH) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_dmr, SLOT_IN_R_POUCH) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_dmr, SLOT_IN_R_POUCH) + + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70/beginner(human), SLOT_IN_ACCESSORY) + + human.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/bicaridine, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/kelotane, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/tricordrazine, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/tramadol, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dylovene, SLOT_IN_SUIT) + +/datum/outfit/quick/beginner/marine/shotgunner + name = "Shotgunner" + desc = "Up close and personal. Wields the SH-39, a semi-automatic shotgun loaded with slugs. \ + An absolute monster at short to mid range, the shotgun will do heavy damage to any target hit, as well as stunning them briefly, staggering them, and knocking them back." + + w_uniform = /obj/item/clothing/under/marine/holster + wear_suit = /obj/item/clothing/suit/modular/xenonauten/lightgeneral + suit_store = /obj/item/weapon/gun/shotgun/combat/standardmarine/beginner + belt = /obj/item/storage/belt/shotgun + head = /obj/item/clothing/head/modular/m10x/freyr + gloves = /obj/item/clothing/gloves/marine/fingerless + mask = /obj/item/clothing/mask/gas/tactical/coif + l_hand = /obj/item/paper/tutorial/beginner_shotgunner + +/datum/outfit/quick/beginner/marine/shotgunner/post_equip(mob/living/carbon/human/human, visualsOnly) + . = ..() + human.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, SLOT_IN_BACKPACK) + + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BELT) + + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/plasma_pistol/beginner(human), SLOT_IN_ACCESSORY) + + human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_SUIT) + +/datum/outfit/quick/beginner/marine/shocktrooper + name = "Shocktrooper" + desc = "The bleeding edge of the corps. \ + Equipped with the experimental battery-fed laser rifle, featuring four different modes that can be freely swapped between, with an underbarrel flamethrower for area denial and clearing mazes." + + suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_rifle/medic + glasses = /obj/item/clothing/glasses/sunglasses/fake/big + wear_suit = /obj/item/clothing/suit/modular/xenonauten/lightgeneral + head = /obj/item/clothing/head/modular/style/cap + mask = /obj/item/clothing/mask/gas/modular/skimask + r_store = /obj/item/cell/lasgun/volkite/powerpack/marine + w_uniform = /obj/item/clothing/under/marine/corpman_vest + shoes = /obj/item/clothing/shoes/marine + l_hand = /obj/item/paper/tutorial/beginner_shocktrooper + +/datum/outfit/quick/beginner/marine/shocktrooper/post_equip(mob/living/carbon/human/human, visualsOnly) + . = ..() + human.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BELT) + + human.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BOOT) + + human.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/dylovene, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, SLOT_IN_BACKPACK) + + human.equip_to_slot_or_del(new /obj/item/cell/lasgun/volkite/powerpack/marine, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_SUIT) + + human.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/bicaridine, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/kelotane, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/tricordrazine, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/tramadol, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_ACCESSORY) + +/datum/outfit/quick/beginner/marine/hazmat + name = "Hazmat" + desc = "Designed for danger. \ + Wields the AR-11, a powerful yet innacurate assault rifle with high magazine size and an equipped tactical sensor that detects enemies through smoke and walls. \ + Wears Mimir combat armor, rendering the user immune to the dangerous toxic gas possessed by many xenomorphs." + + head = /obj/item/clothing/head/modular/m10x/mimir + suit_store = /obj/item/weapon/gun/rifle/tx11/freelancertwo + back = /obj/item/storage/backpack/marine/standard + w_uniform = /obj/item/clothing/under/marine/black_vest + wear_suit = /obj/item/clothing/suit/modular/xenonauten/mimir + mask = /obj/item/clothing/mask/rebreather/scarf + belt = /obj/item/belt_harness/marine + l_hand = /obj/item/paper/tutorial/beginner_hazmat + +/datum/outfit/quick/beginner/marine/hazmat/post_equip(mob/living/carbon/human/human, visualsOnly) + . = ..() + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_BACKPACK) + + human.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_ACCESSORY) + + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx11, SLOT_IN_SUIT) + +/datum/outfit/quick/beginner/marine/cqc + name = "CQC" + desc = "Swift and lethal. \ + Equipped with the AR-18, a lightweight carbine with a rapid-fire burst mode. Designed for maximum mobility, soldiers are able to rush in, assault the enemy, and retreat before they can respond." + + suit_store = /obj/item/weapon/gun/rifle/standard_carbine/beginner + wear_suit = /obj/item/clothing/suit/modular/xenonauten/lightgeneral + w_uniform = /obj/item/clothing/under/marine/black_vest + head = /obj/item/clothing/head/modular/style/beret + glasses = /obj/item/clothing/glasses/mgoggles + l_hand = /obj/item/paper/tutorial/beginner_cqc + +/datum/outfit/quick/beginner/marine/cqc/post_equip(mob/living/carbon/human/human, visualsOnly) + . = ..() + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BELT) + + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_BACKPACK) + + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_carbine, SLOT_IN_SUIT) + + human.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_ACCESSORY) + +/datum/outfit/quick/beginner/marine/chad //Ya gotta be if you pick this loadout + name = "Grenadier" + desc = "Explosive area denial. \ + Uses the GL-70, a six shot semi-automatic grenade launcher, loaded with HEDP high explosive grenades. \ + Boasts unmatched power, though heavy caution is advised to avoid harming friendlies." + + wear_suit = /obj/item/clothing/suit/modular/xenonauten/heavy/grenadier + suit_store = /obj/item/weapon/gun/grenade_launcher/multinade_launcher/beginner + l_store = /obj/item/storage/pouch/grenade + r_store = /obj/item/storage/pouch/grenade + belt = /obj/item/storage/belt/grenade + mask = /obj/item/clothing/mask/gas + w_uniform = /obj/item/clothing/under/marine/corpman_vest + head = /obj/item/clothing/head/modular/m10x/hod + shoes = /obj/item/clothing/shoes/marine + l_hand = /obj/item/paper/tutorial/beginner_chad + +/datum/outfit/quick/beginner/marine/chad/post_equip(mob/living/carbon/human/human, visualsOnly) + . = ..() + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BELT) + + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_L_POUCH) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_L_POUCH) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_L_POUCH) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_L_POUCH) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_L_POUCH) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_L_POUCH) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_R_POUCH) + + human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_SUIT) + + human.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/bicaridine, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/kelotane, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/tricordrazine, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/tramadol, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_ACCESSORY) + + human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/double/derringer, SLOT_IN_BOOT) //So you can kill yourself when you run out of grenades + +/datum/outfit/quick/beginner/engineer + jobtype = "Squad Engineer" + + w_uniform = /obj/item/clothing/under/marine/brown_vest + shoes = /obj/item/clothing/shoes/marine + gloves = /obj/item/clothing/gloves/marine/insulated + l_store = /obj/item/storage/pouch/tools + +/datum/outfit/quick/beginner/engineer/post_equip(mob/living/carbon/human/human, visualsOnly) + . = ..() + human.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BOOT) + + human.equip_to_slot_or_del(new /obj/item/tool/screwdriver, SLOT_IN_L_POUCH) + human.equip_to_slot_or_del(new /obj/item/tool/wirecutters, SLOT_IN_L_POUCH) + human.equip_to_slot_or_del(new /obj/item/tool/wrench, SLOT_IN_L_POUCH) + human.equip_to_slot_or_del(new /obj/item/tool/crowbar, SLOT_IN_L_POUCH) + human.equip_to_slot_or_del(new /obj/item/tool/weldingtool/hugetank, SLOT_IN_L_POUCH) + + human.equip_to_slot_or_del(new /obj/item/explosive/grenade/chem_grenade/razorburn_small, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/circuitboard/apc, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/tool/handheld_charger/hicapcell, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_ACCESSORY) + + human.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_SUIT) + +/datum/outfit/quick/beginner/engineer/builder + name = "Engineer Standard" + desc = "Born to build. Equipped with a metric ton of metal, you can be certain that a lack of barricades is not a possibility with you around." + + suit_store = /obj/item/weapon/gun/rifle/standard_lmg/beginner + wear_suit = /obj/item/clothing/suit/modular/xenonauten/heavy/mimirengi + mask = /obj/item/clothing/mask/gas/tactical + head = /obj/item/clothing/head/modular/m10x/mimir + back = /obj/item/storage/backpack/marine/radiopack + belt = /obj/item/belt_harness/marine + glasses = /obj/item/clothing/glasses/welding/superior + l_hand = /obj/item/paper/tutorial/builder + +/datum/outfit/quick/beginner/engineer/builder/post_equip(mob/living/carbon/human/human, visualsOnly) + . = ..() + human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_SUIT) + + human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/small_stack, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/stack/sandbags_empty/full, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/tool/shovel/etool, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_lmg, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_lmg, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_lmg, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_lmg, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_lmg, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + +/datum/outfit/quick/beginner/engineer/burnitall + name = "Flamethrower" + desc = "For those who truly love to watch the world burn. Equipped with a laser carbine and a flamethrower, you can be certain that none of your enemies will be left un-burnt." + + suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_carbine/beginner + wear_suit = /obj/item/clothing/suit/modular/xenonauten/engineer + mask = /obj/item/clothing/mask/gas/tactical/coif + head = /obj/item/clothing/head/modular/m10x/superiorwelding + back = /obj/item/storage/holster/backholster/flamer + glasses = /obj/item/clothing/glasses/meson + l_hand = /obj/item/paper/tutorial/flamer + +/datum/outfit/quick/beginner/engineer/burnitall/post_equip(mob/living/carbon/human/human, visualsOnly) + . = ..() + human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/circuitboard/apc, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/tool/multitool, SLOT_IN_SUIT) + + human.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BELT) + human.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BELT) + + human.equip_to_slot_or_del(new /obj/item/weapon/gun/flamer/big_flamer/marinestandard/engineer/beginner(human), SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/storage/box/explosive_mines/large, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/tool/shovel/etool, SLOT_IN_BACKPACK) + +/datum/outfit/quick/beginner/engineer/pcenjoyer + name = "Plasma Cutter" + desc = "For the open-air enjoyers. Equipped with a plasma cutter, you will be able to cut down all types of walls and obstacles that dare exist within your vicinity." + + suit_store = /obj/item/tool/pickaxe/plasmacutter + wear_suit = /obj/item/clothing/suit/modular/xenonauten/engineer + mask = /obj/item/clothing/mask/gas + head = /obj/item/clothing/head/modular/m10x/superiorwelding + back = /obj/item/storage/backpack/marine/engineerpack + belt = /obj/item/belt_harness/marine + glasses = /obj/item/clothing/glasses/meson + l_hand = /obj/item/paper/tutorial/plasmacutter + +/datum/outfit/quick/beginner/engineer/pcenjoyer/post_equip(mob/living/carbon/human/human, visualsOnly) + . = ..() + human.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_HEAD) + + human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/small_stack, SLOT_IN_SUIT) + + human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/standard_machinepistol/compact(human), SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) + +/datum/outfit/quick/beginner/corpsman + jobtype = "Squad Corpsman" + + shoes = /obj/item/clothing/shoes/marine + w_uniform = /obj/item/clothing/under/marine/corpsman/corpman_vest + glasses = /obj/item/clothing/glasses/hud/health + r_hand = /obj/item/medevac_beacon + +/datum/outfit/quick/beginner/corpsman/post_equip(mob/living/carbon/human/human, visualsOnly) + . = ..() + human.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BOOT) + +/datum/outfit/quick/beginner/corpsman/lifesaver + name = "Standard Lifesaver" + desc = "Miracle in progress. \ + Wields the bolt action Leicaster Repeater, and is equipped with a large variety of medicine for keeping the entire corps topped up and in the fight." + + suit_store = /obj/item/weapon/gun/shotgun/pump/lever/repeater/beginner + wear_suit = /obj/item/clothing/suit/modular/xenonauten/mimirinjector + gloves = /obj/item/clothing/gloves/defibrillator + mask = /obj/item/clothing/mask/gas + head = /obj/item/clothing/head/modular/m10x/mimir + r_store = /obj/item/storage/pouch/medkit/medic + l_store = /obj/item/storage/pouch/shotgun + back = /obj/item/storage/backpack/marine/corpsman + belt = /obj/item/storage/belt/lifesaver/beginner + l_hand = /obj/item/paper/tutorial/lifesaver + +/datum/outfit/quick/beginner/corpsman/lifesaver/post_equip(mob/living/carbon/human/human, visualsOnly) + . = ..() + human.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/bodybag/cryobag, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/oxycodone, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/nanoblood, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/roller/medevac, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/tweezers, SLOT_IN_ACCESSORY) + + human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/dexalinplus, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_SUIT) + + human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p4570, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p4570, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p4570, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p4570, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p4570, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p4570, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p4570, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/repeater, SLOT_IN_L_POUCH) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/repeater, SLOT_IN_L_POUCH) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/repeater, SLOT_IN_L_POUCH) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/repeater, SLOT_IN_L_POUCH) + +/datum/outfit/quick/beginner/corpsman/hypobelt + name = "Standard Hypobelt" + desc = "Putting the combat in combat medic. \ + Wields the pump action SH-35 shotgun, and is equipped with a belt full of hyposprays for rapidly treating patients in bad condition." + + suit_store = /obj/item/weapon/gun/shotgun/pump/t35/beginner + wear_suit = /obj/item/clothing/suit/modular/xenonauten/light/lightmedical + gloves = /obj/item/healthanalyzer/gloves + mask = /obj/item/clothing/mask/gas/modular/coofmask + head = /obj/item/clothing/head/modular/m10x/antenna + r_store = /obj/item/storage/pouch/medkit/medic + l_store = /obj/item/storage/pouch/shotgun + back = /obj/item/storage/backpack/marine/corpsman + belt = /obj/item/storage/belt/hypospraybelt/beginner + l_hand = /obj/item/paper/tutorial/hypobelt + +/datum/outfit/quick/beginner/corpsman/hypobelt/post_equip(mob/living/carbon/human/human, visualsOnly) + . = ..() + human.equip_to_slot_or_del(new /obj/item/stack/medical/splint, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/stack/medical/splint, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/stack/medical/splint, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/stack/medical/splint, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/stack/medical/splint, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/stack/medical/splint, SLOT_IN_ACCESSORY) + + human.equip_to_slot_or_del(new /obj/item/roller, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/bodybag/cryobag, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/oxycodone, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/roller/medevac, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/tweezers, SLOT_IN_SUIT) + + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_L_POUCH) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_L_POUCH) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_L_POUCH) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_L_POUCH) + + human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/protein_pack, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/slug, SLOT_IN_BACKPACK) + +/datum/outfit/quick/beginner/smartgunner + jobtype = "Squad Smartgunner" + + w_uniform = /obj/item/clothing/under/marine/black_vest + shoes = /obj/item/clothing/shoes/marine + wear_suit = /obj/item/clothing/suit/modular/xenonauten/lightgeneral + mask = /obj/item/clothing/mask/gas + head = /obj/item/clothing/head/modular/m10x/antenna + belt = /obj/item/belt_harness/marine + glasses = /obj/item/clothing/glasses/night/m56_goggles + +/datum/outfit/quick/beginner/smartgunner/post_equip(mob/living/carbon/human/human, visualsOnly) + . = ..() + human.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BOOT) + +/datum/outfit/quick/beginner/smartgunner/sg29 + name = "Standard Smartmachinegun" + desc = "Tactical support fire. \ + Uses the SG-29, a specialist light machine gun that will shoot through your allies, \ + equipped with a tactical sensor to detect enemies through smoke, walls, and darkness." + + suit_store = /obj/item/weapon/gun/rifle/standard_smartmachinegun/pmc + l_hand = /obj/item/paper/tutorial/smartmachinegunner + +/datum/outfit/quick/beginner/smartgunner/sg29/post_equip(mob/living/carbon/human/human, visualsOnly) + . = ..() + human.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_SUIT) + + human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_ACCESSORY) + + human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/plasma_pistol, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) + +/datum/outfit/quick/beginner/smartgunner/sg85 + name = "Standard Smartminigun" + desc = "Lead wall! Wields the SG-85, a specialist minigun that holds one thousand rounds and can shoot through your allies, \ + equipped with a tactical sensor to detect enemies through smoke, walls, and darkness." + + suit_store = /obj/item/weapon/gun/minigun/smart_minigun/motion_detector + back = /obj/item/ammo_magazine/minigun_powerpack/smartgun + l_hand = /obj/item/paper/tutorial/smartminigunner + +/datum/outfit/quick/beginner/smartgunner/sg85/post_equip(mob/living/carbon/human/human, visualsOnly) + . = ..() + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/smart_minigun, SLOT_IN_SUIT) + human.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/smart_minigun, SLOT_IN_SUIT) + + human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/gauze, SLOT_IN_ACCESSORY) + human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_ACCESSORY) + diff --git a/code/datums/quick_load_outfits.dm b/code/datums/quick_load_outfits.dm index c2e5626782bca..3963455b05762 100644 --- a/code/datums/quick_load_outfits.dm +++ b/code/datums/quick_load_outfits.dm @@ -388,7 +388,6 @@ name = "SH-35 Scout" desc = "For getting too close for comfort. Equipped with a SH-35 shotgun with buckshot and flechette rounds, a MP-19 sidearm, a good amount of grenades and light armor with a cutting edge 'svallin' shield module. Provides for excellent mobility and devestating close range firepower, but will falter against sustained firepower." - belt = /obj/item/storage/belt/shotgun wear_suit = /obj/item/clothing/suit/modular/xenonauten/light/shield suit_store = /obj/item/weapon/gun/shotgun/pump/t35/standard belt = /obj/item/storage/belt/shotgun/mixed @@ -760,10 +759,6 @@ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx15_flechette, SLOT_IN_R_POUCH) H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/tx15_slug, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_R_POUCH) - H.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_R_POUCH) - /datum/outfit/quick/tgmc/corpsman/laser_medic name = "Laser Rifle Corpsman" desc = "Keeping everone else in the fight. Armed with an laser rifle with miniflamer, an impressive array of tools for healing your team, and a 'Mimir' biological protection module to allow you to continue operating in hazardous environments. With medivacs out of the question, you are the only thing standing between your buddies and an early grave." diff --git a/code/datums/round_statistics.dm b/code/datums/round_statistics.dm index 02bb1ff416c33..53a41816ee04d 100644 --- a/code/datums/round_statistics.dm +++ b/code/datums/round_statistics.dm @@ -61,6 +61,7 @@ GLOBAL_DATUM_INIT(round_statistics, /datum/round_statistics, new) var/mortar_shells_fired = 0 var/howitzer_shells_fired = 0 var/rocket_shells_fired = 0 + var/obs_fired = 0 var/queen_screech = 0 var/now_pregnant = 0 var/sentinel_drain_stings = 0 diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index 4468122b11479..3fbbc3e31695a 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -143,18 +143,13 @@ display_name = "Tadpole NK-Haul Model" /datum/map_template/shuttle/minidropship/mobile_bar - suffix = "_mobile_bar" + suffix = "_mobile_bar" description = "A Tadpole modified to provide drinks and disservices. God dammit it's him again, I thought we got rid of him." display_name = "Tadpole Mobile-Bar Model" admin_enable = FALSE -/datum/map_template/shuttle/minidropship/combat_tad - suffix = "_combat_tad" - description = "A Tadpole model modified to have three weapon hardpoints instead of just one, the majority of the other standard features had to be scrapped to fit all three of them on." - display_name = "Tadpole Combat Model" - /datum/map_template/shuttle/minidropship/umbilical - suffix = "_umbilical" + suffix = "_umbilical" description = "A high-point orbital shuttle with a tactical umbilical airlock for insertion of ground troops." display_name = "Tadpole Umbilical Model" diff --git a/code/datums/skills.dm b/code/datums/skills.dm index be7d9ad26c1a2..25c6a0df117f3 100644 --- a/code/datums/skills.dm +++ b/code/datums/skills.dm @@ -257,8 +257,8 @@ engineer, construction, leadership, medical, surgery, pilot, police, powerloader firearms = SKILL_FIREARMS_DEFAULT medical = SKILL_MEDICAL_EXPERT surgery = SKILL_SURGERY_EXPERT - construction = SKILL_CONSTRUCTION_MASTER - engineer = SKILL_ENGINEER_MASTER + construction = SKILL_CONSTRUCTION_EXPERT + engineer = SKILL_ENGINEER_EXPERT powerloader = SKILL_POWERLOADER_MASTER police = SKILL_POLICE_FLASH @@ -285,8 +285,8 @@ engineer, construction, leadership, medical, surgery, pilot, police, powerloader /datum/skills/civilian/survivor/atmos name = "Survivor Atmos Tech" - engineer = SKILL_ENGINEER_MASTER - construction = SKILL_CONSTRUCTION_MASTER + engineer = SKILL_ENGINEER_EXPERT + construction = SKILL_CONSTRUCTION_EXPERT /datum/skills/civilian/survivor/marshal name = "Survivor Marshal" @@ -314,6 +314,12 @@ engineer, construction, leadership, medical, surgery, pilot, police, powerloader construction = SKILL_CONSTRUCTION_METAL engineer = SKILL_ENGINEER_METAL +/datum/skills/combat_medic/special_forces + name = "Special Operations Medic" + construction = SKILL_CONSTRUCTION_METAL + engineer = SKILL_ENGINEER_METAL + smgs = SKILL_SMGS_TRAINED + /datum/skills/doctor name = "Doctor" cqc = SKILL_CQC_WEAK @@ -342,8 +348,8 @@ engineer, construction, leadership, medical, surgery, pilot, police, powerloader /datum/skills/ai name = "AI" - engineer = SKILL_ENGINEER_MASTER - construction = SKILL_CONSTRUCTION_MASTER + engineer = SKILL_ENGINEER_EXPERT + construction = SKILL_CONSTRUCTION_EXPERT firearms = SKILL_FIREARMS_UNTRAINED medical = SKILL_MEDICAL_EXPERT leadership = SKILL_LEAD_MASTER @@ -354,8 +360,8 @@ engineer, construction, leadership, medical, surgery, pilot, police, powerloader /datum/skills/synthetic name = SYNTHETIC - engineer = SKILL_ENGINEER_MASTER - construction = SKILL_CONSTRUCTION_MASTER + engineer = SKILL_ENGINEER_EXPERT + construction = SKILL_CONSTRUCTION_EXPERT firearms = SKILL_FIREARMS_UNTRAINED medical = SKILL_MEDICAL_EXPERT cqc = SKILL_CQC_MASTER @@ -368,10 +374,10 @@ engineer, construction, leadership, medical, surgery, pilot, police, powerloader /datum/skills/early_synthetic name = "Early Synthetic" - engineer = SKILL_ENGINEER_INHUMAN - construction = SKILL_CONSTRUCTION_INHUMAN + engineer = SKILL_ENGINEER_MASTER + construction = SKILL_CONSTRUCTION_MASTER firearms = SKILL_FIREARMS_UNTRAINED - medical = SKILL_SURGERY_PROFESSIONAL + medical = SKILL_MEDICAL_COMPETENT cqc = SKILL_CQC_MASTER surgery = SKILL_SURGERY_PROFESSIONAL pilot = SKILL_PILOT_TRAINED @@ -404,12 +410,40 @@ engineer, construction, leadership, medical, surgery, pilot, police, powerloader powerloader = SKILL_POWERLOADER_TRAINED cqc = SKILL_CQC_TRAINED +/datum/skills/veteran + name = "TGMC Retired Veteran" + engineer = SKILL_ENGINEER_ENGI //to fix CIC apc. + construction = SKILL_CONSTRUCTION_PLASTEEL + leadership = SKILL_LEAD_MASTER + medical = SKILL_MEDICAL_PRACTICED + surgery = SKILL_SURGERY_AMATEUR + police = SKILL_POLICE_MP + powerloader = SKILL_POWERLOADER_TRAINED + cqc = SKILL_CQC_TRAINED + firearms = SKILL_FIREARMS_TRAINED + rifles = SKILL_RIFLES_TRAINED + +/datum/skills/veteran_captain + name = "TGMC Retired Veteran Expedition Leader" + leadership = SKILL_LEAD_MASTER + police = SKILL_POLICE_MP + medical = SKILL_MEDICAL_COMPETENT + surgery = SKILL_SURGERY_AMATEUR + engineer = SKILL_ENGINEER_ENGI + construction = SKILL_CONSTRUCTION_ADVANCED + powerloader = SKILL_POWERLOADER_MASTER + firearms = SKILL_FIREARMS_TRAINED + rifles = SKILL_RIFLES_TRAINED + smartgun = SKILL_SMART_TRAINED + /datum/skills/so name = STAFF_OFFICER + engineer = SKILL_ENGINEER_ENGI construction = SKILL_CONSTRUCTION_PLASTEEL leadership = SKILL_LEAD_EXPERT medical = SKILL_MEDICAL_PRACTICED surgery = SKILL_SURGERY_AMATEUR + powerloader = SKILL_POWERLOADER_TRAINED police = SKILL_POLICE_MP /datum/skills/pilot @@ -418,18 +452,39 @@ engineer, construction, leadership, medical, surgery, pilot, police, powerloader powerloader = SKILL_POWERLOADER_PRO leadership = SKILL_LEAD_TRAINED +/datum/skills/transportofficer + name = TRANSPORT_OFFICER + construction = SKILL_CONSTRUCTION_ADVANCED + powerloader = SKILL_POWERLOADER_PRO + engineer = SKILL_ENGINEER_ENGI + leadership = SKILL_LEAD_TRAINED + /datum/skills/mech_pilot name = MECH_PILOT engineer = SKILL_ENGINEER_METAL construction = SKILL_CONSTRUCTION_METAL powerloader = SKILL_POWERLOADER_PRO - large_vehicle = SKILL_LARGE_VEHICLE_TRAINED + large_vehicle = SKILL_LARGE_VEHICLE_VETERAN + +/datum/skills/assault_crewman + name = ASSAULT_CREWMAN + engineer = SKILL_ENGINEER_METAL + construction = SKILL_CONSTRUCTION_METAL + powerloader = SKILL_POWERLOADER_PRO + large_vehicle = SKILL_LARGE_VEHICLE_VETERAN + +/datum/skills/transport_crewman + name = TRANSPORT_CREWMAN + engineer = SKILL_ENGINEER_METAL + construction = SKILL_CONSTRUCTION_METAL + powerloader = SKILL_POWERLOADER_PRO + large_vehicle = SKILL_LARGE_VEHICLE_EXPERIENCED /datum/skills/ce name = CHIEF_SHIP_ENGINEER engineer = SKILL_ENGINEER_MASTER construction = SKILL_CONSTRUCTION_MASTER - leadership = SKILL_LEAD_EXPERT + leadership = SKILL_LEAD_TRAINED police = SKILL_POLICE_MP powerloader = SKILL_POWERLOADER_MASTER @@ -442,8 +497,8 @@ engineer, construction, leadership, medical, surgery, pilot, police, powerloader /datum/skills/st name = SHIP_TECH - engineer = SKILL_ENGINEER_MASTER - construction = SKILL_CONSTRUCTION_MASTER + engineer = SKILL_ENGINEER_EXPERT + construction = SKILL_CONSTRUCTION_EXPERT powerloader = SKILL_POWERLOADER_MASTER /datum/skills/pmc @@ -462,10 +517,11 @@ engineer, construction, leadership, medical, surgery, pilot, police, powerloader engineer = SKILL_ENGINEER_ENGI /datum/skills/special_forces_standard - name = "Special Force Standard" + name = "Special Response Force Standard" construction = SKILL_CONSTRUCTION_METAL engineer = SKILL_ENGINEER_METAL police = SKILL_POLICE_MP + smgs = SKILL_SMGS_TRAINED /datum/skills/sl name = SQUAD_LEADER @@ -505,6 +561,7 @@ engineer, construction, leadership, medical, surgery, pilot, police, powerloader /datum/skills/sl/pmc/special_forces name = "Special Force Leader" police = SKILL_POLICE_MP + smgs = SKILL_SMGS_TRAINED /datum/skills/sl/icc name = "ICC Leader" @@ -624,7 +681,7 @@ engineer, construction, leadership, medical, surgery, pilot, police, powerloader heavy_weapons = SKILL_HEAVY_WEAPONS_TRAINED police = SKILL_POLICE_MP powerloader = SKILL_POWERLOADER_MASTER - large_vehicle = SKILL_LARGE_VEHICLE_TRAINED + large_vehicle = SKILL_LARGE_VEHICLE_VETERAN /* Deathsquad */ /datum/skills/deathsquad diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index c4587bf9e5847..a6e44d48f83e3 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -144,24 +144,24 @@ return ..() /datum/status_effect/incapacitating/sleeping/tick() - if(owner.maxHealth) - var/health_ratio = owner.health / owner.maxHealth - var/healing = BASE_HEAL_RATE //set for a base of 0.25 healed per 2-second interval asleep in a bed with covers. - if((locate(/obj/structure/bed) in owner.loc)) - healing += (2 * BASE_HEAL_RATE) - else if((locate(/obj/structure/table) in owner.loc)) - healing += BASE_HEAL_RATE - for(var/obj/item/bedsheet/bedsheet in range(owner.loc,0)) - if(bedsheet.loc != owner.loc) //bedsheets in your backpack/neck don't give you comfort - continue - healing += BASE_HEAL_RATE - break //Only count the first bedsheet - if(health_ratio > -0.5) - owner.adjustBruteLoss(healing) - owner.adjustFireLoss(healing) - owner.adjustToxLoss(healing * 0.5, TRUE, TRUE) - owner.adjustStaminaLoss(healing * 100) - owner.adjustCloneLoss(healing * health_ratio * 0.8) + if(!owner.maxHealth) + return + var/health_ratio = owner.health / owner.maxHealth + var/healing = BASE_HEAL_RATE //set for a base of 0.25 healed per 2-second interval asleep in a bed with covers. + if((locate(/obj/structure/bed) in owner.loc)) + healing += (2 * BASE_HEAL_RATE) + else if((locate(/obj/structure/table) in owner.loc)) + healing += BASE_HEAL_RATE + if(locate(/obj/item/bedsheet) in owner.loc) + healing += BASE_HEAL_RATE + if((locate(/obj/item/toy/plush) in owner.loc)) // plushie bonus in bed with a blanket + healing += 0.75 * BASE_HEAL_RATE // plushie bonus in bed with a blanket + if(health_ratio > -0.5) + owner.adjustBruteLoss(healing) + owner.adjustFireLoss(healing) + owner.adjustToxLoss(healing * 0.5, TRUE, TRUE) + owner.adjustStaminaLoss(healing * 100) + owner.adjustCloneLoss(healing * health_ratio * 0.8) if(human_owner?.drunkenness) human_owner.drunkenness *= 0.997 //reduce drunkenness by 0.3% per tick, 6% per 2 seconds if(prob(20)) @@ -426,6 +426,7 @@ return ..() /datum/status_effect/spacefreeze + alert_type = /atom/movable/screen/alert/status_effect/spacefreeze id = "spacefreeze" /datum/status_effect/spacefreeze/on_creation(mob/living/new_owner) @@ -820,3 +821,8 @@ scale = generator(GEN_VECTOR, list(0.6, 0.6), list(1, 1), NORMAL_RAND) friction = -0.05 color = "#818181" + +/atom/movable/screen/alert/status_effect/spacefreeze + name = "Freezing" + desc = "Space is very very cold, who would've thought?" + icon_state = "cold3" diff --git a/code/datums/status_effects/sectoid.dm b/code/datums/status_effects/sectoid.dm new file mode 100644 index 0000000000000..40351afc84835 --- /dev/null +++ b/code/datums/status_effects/sectoid.dm @@ -0,0 +1,137 @@ +/datum/status_effect/mindmeld + id = "mindmeld" + duration = -1 + tick_interval = 2 SECONDS + alert_type = null + /// Used to track who is the owner of this buff. + var/mob/living/carbon/link_target + /// Used to track who is giving this buff to the owner. + var/mob/living/carbon/link_partner + /// Used for particles. Holds the particles instead of the mob. See particle_holder for documentation. + var/obj/effect/abstract/particle_holder/particle_holder + /// If the target xeno was within range. + var/was_within_range = TRUE + ///Range the linkees must be to each other to benefit + var/max_range = 6 + ///Projectile accuracy buff + var/accuracy_mod = 0 + ///Max health buff + var/health_mod = 0 + ///Movement speed buff + var/speed_mod = 0 + ///% chance to ignore stuns + var/stun_resistance = 0 + +/datum/status_effect/mindmeld/on_creation(mob/living/new_owner, mob/living/carbon/partner, new_max_range, new_accuracy_mod, new_health_mod, new_speed_mod, new_stun_resistance) + link_target = new_owner + link_partner = partner + ADD_TRAIT(link_target, TRAIT_MINDMELDED, TRAIT_STATUS_EFFECT(id)) + max_range = new_max_range + accuracy_mod = new_accuracy_mod + health_mod = new_health_mod + speed_mod = new_speed_mod + if(new_stun_resistance) + stun_resistance = new_stun_resistance + RegisterSignals(link_target, list( + COMSIG_LIVING_STATUS_STUN, + COMSIG_LIVING_STATUS_KNOCKDOWN, + COMSIG_LIVING_STATUS_PARALYZE, + COMSIG_LIVING_STATUS_UNCONSCIOUS, + COMSIG_LIVING_STATUS_CONFUSED, + COMSIG_LIVING_STATUS_STAGGER, + ), PROC_REF(handle_stun)) + INVOKE_ASYNC(link_target, TYPE_PROC_REF(/mob, emote), "roar2") + toggle_buff(TRUE) + return ..() + +/datum/status_effect/mindmeld/on_remove() + link_target.balloon_alert(link_target, "mindmeld inactive") + REMOVE_TRAIT(link_target, TRAIT_MINDMELDED, TRAIT_STATUS_EFFECT(id)) + link_target.UnregisterSignal(link_target, list( + COMSIG_LIVING_STATUS_STUN, + COMSIG_LIVING_STATUS_KNOCKDOWN, + COMSIG_LIVING_STATUS_PARALYZE, + COMSIG_LIVING_STATUS_UNCONSCIOUS, + COMSIG_LIVING_STATUS_CONFUSED, + COMSIG_LIVING_STATUS_STAGGER, + )) + check_range() + return ..() + +/datum/status_effect/mindmeld/tick() + check_range() + +///Checks if mob is in buff range and toggles as required +/datum/status_effect/mindmeld/proc/check_range() + var/within_range = get_dist(link_target, link_partner) <= max_range + if(within_range != was_within_range) + was_within_range = within_range + toggle_buff(was_within_range) + +/// Toggles the buff on or off. +/datum/status_effect/mindmeld/proc/toggle_buff(toggle) + if(!toggle) + link_target.adjust_mob_accuracy(-accuracy_mod) + link_target.maxHealth -= health_mod + link_target.remove_movespeed_modifier(MOVESPEED_ID_MINDMELD) + toggle_particles(FALSE) + return + link_target.adjust_mob_accuracy(accuracy_mod) + link_target.maxHealth += health_mod + link_target.add_movespeed_modifier(MOVESPEED_ID_MINDMELD, TRUE, 0, NONE, FALSE, speed_mod) + toggle_particles(TRUE) + +/// Toggles particles on or off, adjusting their positioning to fit the buff's owner. +/datum/status_effect/mindmeld/proc/toggle_particles(toggle) + if(toggle) + link_target.add_filter("[id]", 3, outline_filter(1, LIGHT_COLOR_BLUE)) + else + link_target.remove_filter("[id]") + +/// Removes the status effect on death. +/datum/status_effect/mindmeld/proc/handle_stun(datum/source, amount, ignore_canstun) + SIGNAL_HANDLER + if(amount >= 3) + return + if(prob(stun_resistance)) + return COMPONENT_NO_STUN + +// *************************************** +// *********** Reknit form +// *************************************** +/datum/status_effect/reknit_form + id = "reknit_form" + tick_interval = 0.5 SECONDS + alert_type = /atom/movable/screen/alert/status_effect/reknit_form + +/datum/status_effect/reknit_form/on_creation(mob/living/new_owner, set_duration) + owner = new_owner + duration = set_duration + owner.add_filter("[id]", 0, outline_filter(2, LIGHT_COLOR_EMISSIVE_GREEN)) + return ..() + +/datum/status_effect/reknit_form/on_remove() + . = ..() + owner.remove_filter("[id]") + +/datum/status_effect/reknit_form/tick() + if(ishuman(owner)) + var/mob/living/carbon/human/human_owner = owner + human_owner.reagent_shock_modifier -= PAIN_REDUCTION_VERY_HEAVY //oof ow ouch + for(var/datum/limb/limb_to_fix AS in human_owner.limbs) + if(limb_to_fix.limb_status & (LIMB_BROKEN | LIMB_SPLINTED | LIMB_STABILIZED)) + if((prob(50) || limb_to_fix.brute_dam > limb_to_fix.min_broken_damage)) + continue + limb_to_fix.remove_limb_flags(LIMB_BROKEN | LIMB_SPLINTED | LIMB_STABILIZED) + limb_to_fix.add_limb_flags(LIMB_REPAIRED) + break + + owner.adjustCloneLoss(-3) + owner.adjustOxyLoss(-5) + owner.heal_overall_damage(5, 5) + owner.adjustToxLoss(-3) + +/atom/movable/screen/alert/status_effect/reknit_form + name = "Reknit form" + desc = "Your health is being restored." + icon_state = "xeno_rejuvenate" diff --git a/code/datums/status_effects/xeno_buffs.dm b/code/datums/status_effects/xeno_buffs.dm index cfa6d290f998d..c701129c79dda 100644 --- a/code/datums/status_effects/xeno_buffs.dm +++ b/code/datums/status_effects/xeno_buffs.dm @@ -331,64 +331,8 @@ enhancement_action.end_ability() // *************************************** -// *********** Rejuvenate +// *********** Psychic Link // *************************************** -/atom/movable/screen/alert/status_effect/xeno_rejuvenate - name = "Rejuvenation" - desc = "Your health is being restored." - icon_state = "xeno_rejuvenate" - -/datum/status_effect/xeno_rejuvenate - id = "xeno_rejuvenate" - tick_interval = 2 SECONDS - alert_type = /atom/movable/screen/alert/status_effect/xeno_rejuvenate - ///Amount of damage taken before reduction kicks in - var/tick_damage_limit - ///Amount of damage taken this tick - var/tick_damage - -/datum/status_effect/xeno_rejuvenate/on_creation(mob/living/new_owner, set_duration, tick_damage_limit) - owner = new_owner - duration = set_duration - src.tick_damage_limit = tick_damage_limit - RegisterSignals(owner, list(COMSIG_XENOMORPH_BRUTE_DAMAGE, COMSIG_XENOMORPH_BURN_DAMAGE), PROC_REF(handle_damage_taken)) - owner.add_movespeed_modifier(MOVESPEED_ID_GORGER_REJUVENATE, TRUE, 0, NONE, TRUE, GORGER_REJUVENATE_SLOWDOWN) - owner.add_filter("[id]m", 0, outline_filter(2, "#455d5762")) - return ..() - -/datum/status_effect/xeno_rejuvenate/on_remove() - . = ..() - UnregisterSignal(owner, list(COMSIG_XENOMORPH_BRUTE_DAMAGE, COMSIG_XENOMORPH_BURN_DAMAGE)) - owner.remove_movespeed_modifier(MOVESPEED_ID_GORGER_REJUVENATE) - owner.remove_filter("[id]m") - -/datum/status_effect/xeno_rejuvenate/tick() - var/mob/living/carbon/xenomorph/owner_xeno = owner - if(owner_xeno.plasma_stored < GORGER_REJUVENATE_COST) - to_chat(owner_xeno, span_notice("Not enough substance to sustain ourselves...")) - owner_xeno.remove_status_effect(STATUS_EFFECT_XENO_REJUVENATE) - return - - owner_xeno.plasma_stored -= GORGER_REJUVENATE_COST - new /obj/effect/temp_visual/telekinesis(get_turf(owner_xeno)) - to_chat(owner_xeno, span_notice("We feel our wounds close up.")) - - var/amount = owner_xeno.maxHealth * GORGER_REJUVENATE_HEAL - HEAL_XENO_DAMAGE(owner_xeno, amount, FALSE) - tick_damage = 0 - -///Handles damage received when the status effect is active -/datum/status_effect/xeno_rejuvenate/proc/handle_damage_taken(datum/source, amount, list/amount_mod) - SIGNAL_HANDLER - if(amount <= 0) - return - - tick_damage += amount - if(tick_damage < tick_damage_limit) - return - - amount_mod += min(amount * 0.75, 40) - #define PSYCHIC_LINK_COLOR "#2a888360" #define CALC_DAMAGE_REDUCTION(amount, amount_mod) \ if(amount <= 0) { \ @@ -398,9 +342,6 @@ amount = min(amount * redirect_mod, remaining_health); \ amount_mod += amount -// *************************************** -// *********** Psychic Link -// *************************************** /datum/status_effect/xeno_psychic_link id = "xeno_psychic_link" tick_interval = 2 SECONDS diff --git a/code/datums/weakrefs.dm b/code/datums/weakrefs.dm index 9827cd556a3fe..3c1e90f3d20b2 100644 --- a/code/datums/weakrefs.dm +++ b/code/datums/weakrefs.dm @@ -1,3 +1,5 @@ +/// Creates a weakref to the given input. +/// See /datum/weakref's documentation for more information. /proc/WEAKREF(datum/input) if(istype(input) && !QDELETED(input)) if(istype(input, /datum/weakref)) @@ -7,9 +9,49 @@ input.weak_reference = new /datum/weakref(input) return input.weak_reference -/datum/proc/create_weakref() //Forced creation for admin proccalls +/datum/proc/create_weakref() //Forced creation for admin proccalls return WEAKREF(src) +/** + * A weakref holds a non-owning reference to a datum. + * The datum can be referenced again using `resolve()`. + * + * To figure out why this is important, you must understand how deletion in + * BYOND works. + * + * Imagine a datum as a TV in a living room. When one person enters to watch + * TV, they turn it on. Others can come into the room and watch the TV. + * When the last person leaves the room, they turn off the TV because it's + * no longer being used. + * + * A datum being deleted tells everyone who's watching the TV to stop. + * If everyone leaves properly (AKA cleaning up their references), then the + * last person will turn off the TV, and everything is well. + * However, if someone is resistant (holds a hard reference after deletion), + * then someone has to walk in, drag them away, and turn off the TV forecefully. + * This process is very slow, and it's known as hard deletion. + * + * This is where weak references come in. Weak references don't count as someone + * watching the TV. Thus, when what it's referencing is destroyed, it will + * hopefully clean up properly, and limit hard deletions. + * + * A common use case for weak references is holding onto what created itself. + * For example, if a machine wanted to know what its last user was, it might + * create a `var/mob/living/last_user`. However, this is a strong reference to + * the mob, and thus will force a hard deletion when that mob is deleted. + * It is often better in this case to instead create a weakref to the user, + * meaning this type definition becomes `var/datum/weakref/last_user`. + * + * A good rule of thumb is that you should hold strong references to things + * that you *own*. For example, a dog holding a chew toy would be the owner + * of that chew toy, and thus a `var/obj/item/chew_toy` reference is fine + * (as long as it is cleaned up properly). + * However, a chew toy does not own its dog, so a `var/mob/living/dog/owner` + * might be inferior to a weakref. + * This is also a good rule of thumb to avoid circular references, such as the + * chew toy example. A circular reference that doesn't clean itself up properly + * will always hard delete. + */ /datum/weakref var/reference @@ -25,7 +67,46 @@ target?.weak_reference = null return ..() +/** + * Retrieves the datum that this weakref is referencing. + * + * This will return `null` if the datum was deleted. This MUST be respected. + */ /datum/weakref/proc/resolve() var/datum/D = locate(reference) return (!QDELETED(D) && D.weak_reference == src) ? D : null +/** + * SERIOUSLY READ THE AUTODOC COMMENT FOR THIS PROC BEFORE EVEN THINKING ABOUT USING IT + * + * Like resolve, but doesn't care if the datum is being qdeleted but hasn't been deleted yet. + * + * The return value of this proc leaves hanging references if the datum is being qdeleted but hasn't been deleted yet. + * + * Do not do anything that would create a lasting reference to the return value, such as giving it a tag, putting it on the map, + * adding it to an atom's contents or vis_contents, giving it a key (if it's a mob), attaching it to an atom (if it's an image), + * or assigning it to a datum or list referenced somewhere other than a temporary value. + * + * Unless you're resolving a weakref to a datum in a COMSIG_QDELETING signal handler registered on that very same datum, + * just use resolve instead. + */ +/datum/weakref/proc/hard_resolve() + var/datum/D = locate(reference) + return (D?.weak_reference == src) ? D : null + +/datum/weakref/vv_get_dropdown() + . = ..() + VV_DROPDOWN_OPTION(VV_HK_WEAKREF_RESOLVE, "Go to reference") + +/datum/weakref/vv_do_topic(list/href_list) + . = ..() + + if(!.) + return + + if(href_list[VV_HK_WEAKREF_RESOLVE]) + if(!check_rights(NONE)) + return + var/datum/R = resolve() + if(R) + usr.client.debug_variables(R) diff --git a/code/game/alternate_appearance.dm b/code/game/alternate_appearance.dm new file mode 100644 index 0000000000000..2e66443154b9b --- /dev/null +++ b/code/game/alternate_appearance.dm @@ -0,0 +1,134 @@ +GLOBAL_LIST_EMPTY(active_alternate_appearances) + +/atom/proc/remove_alt_appearance(key) + if(alternate_appearances) + for(var/K in alternate_appearances) + var/datum/atom_hud/alternate_appearance/AA = alternate_appearances[K] + if(AA.appearance_key == key) + AA.remove_from_hud(src) + break + +/atom/proc/add_alt_appearance(type, key, ...) + if(!type || !key) + return + if(alternate_appearances && alternate_appearances[key]) + return + if(!ispath(type, /datum/atom_hud/alternate_appearance)) + CRASH("Invalid type passed in: [type]") + var/list/arguments = args.Copy(2) + return new type(arglist(arguments)) + +/datum/atom_hud/alternate_appearance + var/appearance_key + var/transfer_overlays = FALSE + +/datum/atom_hud/alternate_appearance/New(key) + ..() + GLOB.active_alternate_appearances += src + appearance_key = key + + for(var/mob AS in GLOB.player_list) + if(mobShouldSee(mob)) + add_hud_to(mob) + +/datum/atom_hud/alternate_appearance/Destroy() + GLOB.active_alternate_appearances -= src + return ..() + +/datum/atom_hud/alternate_appearance/proc/onNewMob(mob/M) + if(mobShouldSee(M)) + add_hud_to(M) + +/datum/atom_hud/alternate_appearance/proc/mobShouldSee(mob/M) + return FALSE + +/datum/atom_hud/alternate_appearance/add_to_hud(atom/A, image/I) + . = ..() + if(.) + LAZYINITLIST(A.alternate_appearances) + A.alternate_appearances[appearance_key] = src + +/datum/atom_hud/alternate_appearance/remove_from_hud(atom/A) + . = ..() + if(.) + LAZYREMOVE(A.alternate_appearances, appearance_key) + +/datum/atom_hud/alternate_appearance/proc/copy_overlays(atom/other, cut_old) + return + +//an alternate appearance that attaches a single image to a single atom +/datum/atom_hud/alternate_appearance/basic + var/atom/target + var/image/image + var/add_ghost_version = FALSE + var/ghost_appearance + +/datum/atom_hud/alternate_appearance/basic/New(key, image/I, options = AA_TARGET_SEE_APPEARANCE) + ..() + transfer_overlays = options & AA_MATCH_TARGET_OVERLAYS + image = I + target = I.loc + if(transfer_overlays) + I.copy_overlays(target) + + hud_icons = list(appearance_key) + add_to_hud(target, I) + if((options & AA_TARGET_SEE_APPEARANCE) && ismob(target)) + add_hud_to(target) + if(add_ghost_version) + var/image/ghost_image = image(icon = I.icon , icon_state = I.icon_state, loc = I.loc) + ghost_image.override = FALSE + ghost_image.alpha = 128 + ghost_appearance = new /datum/atom_hud/alternate_appearance/basic/observers(key + "_observer", ghost_image, NONE) + +/datum/atom_hud/alternate_appearance/basic/Destroy() + . = ..() + QDEL_NULL(image) + target = null + if(ghost_appearance) + QDEL_NULL(ghost_appearance) + +/datum/atom_hud/alternate_appearance/basic/add_to_hud(atom/A) + LAZYINITLIST(A.hud_list) + A.hud_list[appearance_key] = image + . = ..() + +/datum/atom_hud/alternate_appearance/basic/remove_from_hud(atom/A) + . = ..() + A.hud_list -= appearance_key + if(. && !QDELETED(src)) + qdel(src) + +/datum/atom_hud/alternate_appearance/basic/copy_overlays(atom/other, cut_old) + image.copy_overlays(other, cut_old) + +/datum/atom_hud/alternate_appearance/basic/everyone + add_ghost_version = TRUE + +/datum/atom_hud/alternate_appearance/basic/everyone/mobShouldSee(mob/M) + return !isdead(M) + +/datum/atom_hud/alternate_appearance/basic/silicons + +/datum/atom_hud/alternate_appearance/basic/silicons/mobShouldSee(mob/M) + if(issilicon(M)) + return TRUE + return FALSE + +/datum/atom_hud/alternate_appearance/basic/observers + add_ghost_version = FALSE //just in case, to prevent infinite loops + +/datum/atom_hud/alternate_appearance/basic/observers/mobShouldSee(mob/M) + return isobserver(M) + +/datum/atom_hud/alternate_appearance/basic/one_person + var/mob/seer + +/datum/atom_hud/alternate_appearance/basic/one_person/mobShouldSee(mob/M) + if(M == seer) + return TRUE + return FALSE + +/datum/atom_hud/alternate_appearance/basic/one_person/New(key, image/I, mob/living/M) + ..(key, I, FALSE) + seer = M diff --git a/code/game/area/area.dm b/code/game/area/area.dm index 78637fd5e7b49..abccdde33f3d9 100644 --- a/code/game/area/area.dm +++ b/code/game/area/area.dm @@ -9,7 +9,7 @@ invisibility = INVISIBILITY_LIGHTING minimap_color = null - var/flags_alarm_state = NONE + var/alarm_state_flags = NONE var/unique = TRUE @@ -45,7 +45,7 @@ ///Is this area considered inside or outside var/outside = TRUE - var/flags_area = NONE + var/area_flags = NONE ///Cameras in this area var/list/cameras ///Keeps a lit of adjacent firelocks, used for alarms/ZAS @@ -206,8 +206,8 @@ /area/proc/firealert() if(name == "Space") //no fire alarms in space return - if(!(flags_alarm_state & ALARM_WARNING_FIRE)) - flags_alarm_state |= ALARM_WARNING_FIRE + if(!(alarm_state_flags & ALARM_WARNING_FIRE)) + alarm_state_flags |= ALARM_WARNING_FIRE update_icon() mouse_opacity = MOUSE_OPACITY_TRANSPARENT for(var/obj/machinery/door/firedoor/D in all_fire_doors) @@ -222,8 +222,8 @@ /area/proc/firereset() - if(flags_alarm_state & ALARM_WARNING_FIRE) - flags_alarm_state &= ~ALARM_WARNING_FIRE + if(alarm_state_flags & ALARM_WARNING_FIRE) + alarm_state_flags &= ~ALARM_WARNING_FIRE mouse_opacity = MOUSE_OPACITY_TRANSPARENT update_icon() @@ -238,16 +238,23 @@ a.cancelAlarm("Fire", src, src) -/area/update_icon() +/area/update_icon_state() + . = ..() var/I //More important == bottom. Fire normally takes priority over everything. - if(flags_alarm_state && (!requires_power || power_environ)) //It either doesn't require power or the environment is powered. And there is an alarm. - if(flags_alarm_state & ALARM_WARNING_READY) I = "alarm_ready" //Area is ready for something. - if(flags_alarm_state & ALARM_WARNING_EVAC) I = "alarm_evac" //Evacuation happening. - if(flags_alarm_state & ALARM_WARNING_ATMOS) I = "alarm_atmos" //Atmos breach. - if(flags_alarm_state & ALARM_WARNING_FIRE) I = "alarm_fire" //Fire happening. - if(flags_alarm_state & ALARM_WARNING_DOWN) I = "alarm_down" //Area is shut down. - - if(icon_state != I) icon_state = I //If the icon state changed, change it. Otherwise do nothing. + if(alarm_state_flags && (!requires_power || power_environ)) //It either doesn't require power or the environment is powered. And there is an alarm. + if(alarm_state_flags & ALARM_WARNING_READY) + I = "alarm_ready" //Area is ready for something. + if(alarm_state_flags & ALARM_WARNING_EVAC) + I = "alarm_evac" //Evacuation happening. + if(alarm_state_flags & ALARM_WARNING_ATMOS) + I = "alarm_atmos" //Atmos breach. + if(alarm_state_flags & ALARM_WARNING_FIRE) + I = "alarm_fire" //Fire happening. + if(alarm_state_flags & ALARM_WARNING_DOWN) + I = "alarm_down" //Area is shut down. + + if(icon_state != I) + icon_state = I //If the icon state changed, change it. Otherwise do nothing. /area/proc/powered(chan) diff --git a/code/game/area/areas/shuttles.dm b/code/game/area/areas/shuttles.dm index 9feee726edcbe..18983064390b1 100644 --- a/code/game/area/areas/shuttles.dm +++ b/code/game/area/areas/shuttles.dm @@ -27,7 +27,7 @@ /area/shuttle/dropship/Initialize(mapload, ...) . = ..() var/area/area = get_area(src) - area.flags_area |= MARINE_BASE + area.area_flags |= MARINE_BASE /area/shuttle/dropship/alamo name = "Dropship Alamo" @@ -47,7 +47,7 @@ /area/shuttle/minidropship/Initialize(mapload, ...) . = ..() var/area/area = get_area(src) - area.flags_area |= MARINE_BASE + area.area_flags |= MARINE_BASE /area/shuttle/ert name = "Emergency Response Team" @@ -183,7 +183,7 @@ /area/shuttle/canterbury/Initialize(mapload, ...) . = ..() var/area/area = get_area(src) - area.flags_area |= MARINE_BASE + area.area_flags |= MARINE_BASE /area/shuttle/canterbury/cic name = "Combat Information Center" diff --git a/code/game/area/bigred.dm b/code/game/area/bigred.dm index 0041d05b6f69b..7334736aa3ed9 100644 --- a/code/game/area/bigred.dm +++ b/code/game/area/bigred.dm @@ -248,12 +248,15 @@ outside = FALSE /area/bigredv2/outside/engineering - name = "Engineering Complex" + name = "West Engineering Complex" icon_state = "engine" ceiling = CEILING_METAL minimap_color = MINIMAP_AREA_ENGI outside = FALSE +/area/bigredv2/outside/engineering/east + name = "East Engineering Complex" + /area/bigredv2/outside/storage name = "Storage" icon_state = "storage" diff --git a/code/game/area/campaign_maps/jungle_outpost.dm b/code/game/area/campaign_maps/jungle_outpost.dm index f70ef395e3e12..1d29e76ca7af3 100644 --- a/code/game/area/campaign_maps/jungle_outpost.dm +++ b/code/game/area/campaign_maps/jungle_outpost.dm @@ -71,6 +71,10 @@ outside = FALSE minimap_color = MINIMAP_AREA_COLONY +/area/campaign/jungle_outpost/outpost/bar + name = "\improper Bar" + icon_state = "bar" + /area/campaign/jungle_outpost/outpost/medbay name = "\improper Medbay" icon_state = "medbay" diff --git a/code/game/area/campaign_maps/som_base.dm b/code/game/area/campaign_maps/som_base.dm index 535eb62f6692d..2afe7a03fb9cb 100644 --- a/code/game/area/campaign_maps/som_base.dm +++ b/code/game/area/campaign_maps/som_base.dm @@ -2,7 +2,7 @@ /area/rocinante_base name = "rocinante Polar Base" icon_state = "dark" - flags_area = ALWAYS_RADIO + area_flags = ALWAYS_RADIO /area/rocinante_base/ground name = "Ground" diff --git a/code/game/area/campaign_maps/som_raiding_base.dm b/code/game/area/campaign_maps/som_raiding_base.dm new file mode 100644 index 0000000000000..206dbb0e5c3ce --- /dev/null +++ b/code/game/area/campaign_maps/som_raiding_base.dm @@ -0,0 +1,223 @@ + +/area/campaign/som_raiding + icon_state = "lv-626" + area_flags = ALWAYS_RADIO + ambience = list('sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg') + +/area/campaign/som_raiding/ground + name = "Ground" + icon_state = "green" + always_unpowered = TRUE + ambience = list('sound/ambience/jungle_amb1.ogg') + +//Jungle +/area/campaign/som_raiding/ground/jungle + name = "Central Jungle" + icon_state = "central" + minimap_color = MINIMAP_AREA_JUNGLE + +/area/campaign/som_raiding/ground/jungle/south_west + name = "Southwestern Jungle" + icon_state = "southwest" + +/area/campaign/som_raiding/ground/jungle/south_east + name = "Southeastern Jungle" + icon_state = "southeast" + +/area/campaign/som_raiding/ground/jungle/north_west + name = "Northwestern Jungle" + icon_state = "northwest" + +/area/campaign/som_raiding/ground/jungle/north_east + name = "Northeastern Jungle" + icon_state = "northeast" + +/area/campaign/som_raiding/ground/jungle/west + name = "Western Jungle" + icon_state = "west" + +/area/campaign/som_raiding/ground/jungle/south + name = "Southern Jungle" + icon_state = "south" + +/area/campaign/som_raiding/ground/jungle/east + name = "Eastern Jungle" + icon_state = "east" + +/area/campaign/som_raiding/ground/jungle/north + name = "Northern Jungle" + icon_state = "north" + +//river +/area/campaign/som_raiding/ground/river + name = "\improper Southern River" + icon_state = "blueold" + +/area/campaign/som_raiding/ground/river/north + name = "\improper Northern River" + +/area/campaign/som_raiding/ground/river/west + name = "\improper Western River" + +/area/campaign/som_raiding/ground/river/east + name = "\improper Eastern River" + +/area/campaign/som_raiding/ground/river/lake + name = "\improper Southern Lake" + +//outpost +/area/campaign/som_raiding/cave + name = "\improper Mountain" + icon_state = "cave" + ceiling = CEILING_UNDERGROUND + outside = FALSE + minimap_color = MINIMAP_AREA_CAVES + +/area/campaign/som_raiding/cave/tunnel + name = "\improper Old tunnels" + icon_state = "explored" + +//outpost +/area/campaign/som_raiding/outpost + name = "\improper Outpost" + icon_state = "green" + ceiling = CEILING_UNDERGROUND_METAL + outside = FALSE + minimap_color = MINIMAP_AREA_COLONY + +/area/campaign/som_raiding/outpost/firing_range + name = "\improper Firing range" + +/area/campaign/som_raiding/outpost/construction + name = "\improper Construction site" + +/area/campaign/som_raiding/outpost/central_corridor + name = "\improper Central corridor" + +/area/campaign/som_raiding/outpost/maintenance + name = "\improper Southwest maintenance" + minimap_color = MINIMAP_AREA_CAVES + icon_state = "maint_security_starboard" + +/area/campaign/som_raiding/outpost/maintenance/engie + name = "\improper Engineering maintenance" + icon_state = "maint_engine" + +/area/campaign/som_raiding/outpost/maintenance/operation + name = "\improper Operations maintenance" + icon_state = "apmaint" + +/area/campaign/som_raiding/outpost/maintenance/cic + name = "\improper CIC maintenance" + icon_state = "fpmaint" + +/area/campaign/som_raiding/outpost/maintenance/req + name = "\improper Requisitions maintenance" + icon_state = "maint_cargo" + +/area/campaign/som_raiding/outpost/maintenance/med + name = "\improper medbay maintenance" + icon_state = "maint_medbay" + +/area/campaign/som_raiding/outpost/medbay + name = "\improper Medbay" + icon_state = "medbay" + minimap_color = MINIMAP_AREA_MEDBAY + +/area/campaign/som_raiding/outpost/security + name = "\improper Armoury" + icon_state = "security" + minimap_color = MINIMAP_AREA_SEC + +/area/campaign/som_raiding/outpost/security/south_post + name = "\improper South security checkpoint" + +/area/campaign/som_raiding/outpost/security/southeast_post + name = "\improper Southeast security checkpoint" + +/area/campaign/som_raiding/outpost/security/west_post + name = "\improper West security checkpoint" + +/area/campaign/som_raiding/outpost/security/north_post + name = "\improper North security checkpoint" + +/area/campaign/som_raiding/outpost/security/cargo_post + name = "\improper Caro security checkpoint" + +/area/campaign/som_raiding/outpost/command + name = "\improper Operations" + icon_state = "bridge" + minimap_color = MINIMAP_AREA_COMMAND + +/area/campaign/som_raiding/outpost/command/captain + name = "\improper Executive Office" + icon_state = "captain" + +/area/campaign/som_raiding/outpost/command/telecom + name = "\improper Telecommunications" + icon_state = "tcomms" + +/area/campaign/som_raiding/outpost/command/cic + name = "\improper Combat Information Centre" + +/area/campaign/som_raiding/outpost/command/north + name = "\improper North offices" + +/area/campaign/som_raiding/outpost/command/living + name = "\improper Officer's quarters" + +/area/campaign/som_raiding/outpost/engineering + name = "\improper Engineering" + icon_state = "engine_smes" + minimap_color = MINIMAP_AREA_ENGI + +/area/campaign/som_raiding/outpost/living + name = "\improper Barracks" + icon_state = "Sleep" + minimap_color = MINIMAP_AREA_LIVING + +/area/campaign/som_raiding/outpost/living/briefing + name = "\improper Briefing room" + icon_state = "conference" + +/area/campaign/som_raiding/outpost/living/bathroom + name = "\improper Bathrooms" + icon_state = "restrooms" + +/area/campaign/som_raiding/outpost/living/canteen + name = "\improper Canteen" + icon_state = "cafeteria" + +/area/campaign/som_raiding/outpost/living/kitchen + name = "\improper Kitchen" + icon_state = "kitchen" + +/area/campaign/som_raiding/outpost/req + name = "\improper Main cargo bay" + icon_state = "quart" + minimap_color = MINIMAP_AREA_REQ + +/area/campaign/som_raiding/outpost/req/north + name = "\improper North cargo bay" + +/area/campaign/som_raiding/outpost/req/aux + name = "\improper North auxiliary storage" + icon_state = "quart" + minimap_color = MINIMAP_AREA_REQ + +/area/campaign/som_raiding/outpost/req/secure + name = "\improper Secure storage" + icon_state = "quart" + minimap_color = MINIMAP_AREA_REQ + +/area/campaign/som_raiding/outpost/req/qm + name = "\improper Quartermaster's Office" + icon_state = "quartoffice" + +/area/campaign/som_raiding/outpost/tunnel + name = "\improper South tunnel" + icon_state = "explored" + ceiling = CEILING_UNDERGROUND + +/area/campaign/som_raiding/outpost/tunnel/west + name = "\improper West tunnel" diff --git a/code/game/area/daedalusprison.dm b/code/game/area/daedalusprison.dm new file mode 100644 index 0000000000000..ba9fb7c836859 --- /dev/null +++ b/code/game/area/daedalusprison.dm @@ -0,0 +1,414 @@ +// Daedalus Prison Areas + +//Caves +/area/daedalusprison/caves + name = "Caves" + icon_state = "cave" + ambience = list('sound/ambience/ambimine.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambisin4.ogg') + ceiling = CEILING_DEEP_UNDERGROUND + outside = FALSE + minimap_color = MINIMAP_AREA_CAVES + always_unpowered = TRUE + +/area/daedalusprison/caves/rock + name = "Enclosed Area" + icon_state = "transparent" + +/area/daedalusprison/caves/northwest + name = "Northwestern Caves" + icon_state = "northwest2" + +/area/daedalusprison/caves/northwest/garbledradio + ceiling = CEILING_UNDERGROUND + +/area/daedalusprison/caves/north + name = "Northern Caves" + icon_state = "north2" + +/area/daedalusprison/caves/north/garbledradio + ceiling = CEILING_UNDERGROUND + +/area/daedalusprison/caves/nukestorage + name = "Nuclear Storage" + icon_state = "nuke_storage" + ceiling = CEILING_DEEP_UNDERGROUND_METAL + minimap_color = MINIMAP_AREA_ENGI_CAVE + always_unpowered = FALSE + +/area/daedalusprison/caves/research + name = "Biologcal Research Facility" + icon_state = "research" + ceiling = CEILING_DEEP_UNDERGROUND_METAL + minimap_color = MINIMAP_AREA_RESEARCH_CAVE + always_unpowered = FALSE + +/area/daedalusprison/caves/northeast + name = "Northeastern Caves" + icon_state = "northeast2" + +/area/daedalusprison/caves/northeast/garbledradio + ceiling = CEILING_UNDERGROUND + +/area/daedalusprison/caves/southwest + name = "Southwestern Caves" + icon_state = "southwest2" + +/area/daedalusprison/caves/southwest/garbledradio + ceiling = CEILING_UNDERGROUND + +/area/daedalusprison/caves/south + name = "Southern Tunnel" + icon_state = "south2" + ceiling = CEILING_UNDERGROUND + +/area/daedalusprison/caves/east + name = "Eastern Tunnel" + icon_state = "east2" + +//Outside Area +/area/daedalusprison/outside + name = "Colony Grounds" + icon_state = "cliff_blocked" + ceiling = CEILING_NONE + outside = TRUE + minimap_color = MINIMAP_AREA_COLONY + always_unpowered = TRUE + temperature = ICE_COLONY_TEMPERATURE + +/area/daedalusprison/outside/southeast + name = "Southeastern Colony" + icon_state = "southeast" + +/area/daedalusprison/outside/south + name = "Southern Colony" + icon_state = "south" + +/area/daedalusprison/outside/southwest + name = "Southwestern Colony" + icon_state = "southeast" + +/area/daedalusprison/outside/east + name = "Eastern Grounds" + icon_state = "east" + +/area/daedalusprison/outside/northeast + name = "Northeastern Grounds" + icon_state = "northeast" + +/area/daedalusprison/outside/north + name = "Northern Grounds" + icon_state = "north" + +//Inside area parent, not used. +/area/daedalusprison/inside + name = "Inside" + icon_state = "red" + ceiling = CEILING_METAL + outside = FALSE + +/area/daedalusprison/inside/engineering + name = "Engineering" + icon_state = "engine" + minimap_color = MINIMAP_AREA_ENGI + +/area/daedalusprison/inside/colonydorms + name = "Colony Dorms" + icon_state = "Sleep" + minimap_color = MINIMAP_AREA_LIVING + +/area/daedalusprison/inside/bar + name = "Colony Bar" + icon_state = "bar" + minimap_color = MINIMAP_AREA_LIVING + +/area/daedalusprison/inside/cargo + name = "Colony Cargo" + icon_state = "primarystorage" + minimap_color = MINIMAP_AREA_REQ + +/area/daedalusprison/inside/colonyauxstorage + name = "Colony Auxillary Storage" + icon_state = "storage" + always_unpowered = TRUE + minimap_color = MINIMAP_AREA_REQ + +/area/daedalusprison/inside/bunker + name = "Landing Zone Bunker" + icon_state = "shuttlered" + minimap_color = MINIMAP_AREA_SEC + +/area/daedalusprison/inside/bunker/west + name = "Western Bunker" + +/area/daedalusprison/inside/bunker/center + name = "Central Bunker" + +/area/daedalusprison/inside/bunker/east + name = "Eastern Bunker" + +/area/daedalusprison/inside/prisonshower + name = "Prison Showers" + icon_state = "decontamination" + minimap_color = MINIMAP_AREA_CELL_MED + +/area/daedalusprison/inside/habitationnorth + name = "Prison North Habitation" + icon_state = "cells_med_n" + minimap_color = MINIMAP_AREA_CELL_MED + +/area/daedalusprison/inside/habitationsouth + name = "Prison South Habitation" + icon_state = "cells_med_s" + minimap_color = MINIMAP_AREA_CELL_MED + +/area/daedalusprison/inside/studyroom + name = "Prison Study Room" + icon_state = "library" + minimap_color = MINIMAP_AREA_LIVING + +/area/daedalusprison/inside/mining + name = "Prison Mineral Processing" + icon_state = "mining" + ceiling = CEILING_OBSTRUCTED + minimap_color = MINIMAP_AREA_CELL_MED + +/area/daedalusprison/inside/westernbooth + name = "Prison Western Security Booth" + icon_state = "brig" + minimap_color = MINIMAP_AREA_SEC + +/area/daedalusprison/inside/westcomputerlab + name = "Prison Western Computer Lab" + icon_state = "server" + minimap_color = MINIMAP_AREA_LIVING + +/area/daedalusprison/inside/substation + name = "Prison Substation" + icon_state = "substation" + minimap_color = MINIMAP_AREA_ENGI + +/area/daedalusprison/inside/prisongarden + name = "Prison Garden" + icon_state = "garden" + minimap_color = MINIMAP_AREA_LIVING + +/area/daedalusprison/inside/centralhalls + name = "Prison Central Halls" + icon_state = "hallC1" + +/area/daedalusprison/inside/laundromat + name = "Prison Laundromat" + icon_state = "LP" + minimap_color = MINIMAP_AREA_LIVING + +/area/daedalusprison/inside/laundromat/collapsedroof + outside = TRUE + ceiling = CEILING_NONE + always_unpowered = TRUE + +/area/daedalusprison/inside/mechanicshop + name = "Prison Mechanical Shop" + icon_state = "engine" + minimap_color = MINIMAP_AREA_ENGI + +/area/daedalusprison/inside/staffrestroom + name = "Prison Staff Restroom" + icon_state = "toilet" + minimap_color = MINIMAP_AREA_LIVING + +/area/daedalusprison/inside/auxstorage + name = "Prison Auxillary Storage" + icon_state = "storage" + minimap_color = MINIMAP_AREA_REQ + +/area/daedalusprison/inside/staffbreakroom + name = "Prison Staff Breakroom" + icon_state = "Holodeck" + minimap_color = MINIMAP_AREA_LIVING + +/area/daedalusprison/inside/northclass + name = "Prison Northern Classroom" + icon_state = "law" + minimap_color = MINIMAP_AREA_RESEARCH + +/area/daedalusprison/inside/southclass + name = "Prison Southern Classroom" + icon_state = "law" + minimap_color = MINIMAP_AREA_RESEARCH + +/area/daedalusprison/inside/centralbooth + name = "Prison Central Security Booth" + icon_state = "brig" + minimap_color = MINIMAP_AREA_SEC + +/area/daedalusprison/inside/recreation + name = "Prison Recreation" + icon_state = "showroom" + minimap_color = MINIMAP_AREA_LIVING + +/area/daedalusprison/inside/janitorial + name = "Prison Janitorial Room" + icon_state = "janitor" + minimap_color = MINIMAP_AREA_RESEARCH + +/area/daedalusprison/inside/freezer + name = "Prison Freezer" + icon_state = "kitchen" + minimap_color = MINIMAP_AREA_ESCAPE + +/area/daedalusprison/inside/kitchen + name = "Prison Kitchen" + icon_state = "kitchen" + minimap_color = MINIMAP_AREA_ESCAPE + +/area/daedalusprison/inside/cafeteria + name = "Prison Cafeteria" + icon_state = "cafeteria" + minimap_color = MINIMAP_AREA_ESCAPE + +/area/daedalusprison/inside/sportstorage + name = "Prison Sports Storage" + icon_state = "auxstorage" + minimap_color = MINIMAP_AREA_REQ + +/area/daedalusprison/inside/northmeetingroom + name = "Prison Meeting Room" + icon_state = "conference" + minimap_color = MINIMAP_AREA_ESCAPE + +/area/daedalusprison/inside/library + name = "Prison Library" + icon_state = "library" + minimap_color = MINIMAP_AREA_LIVING + +/area/daedalusprison/inside/execution + name = "Prison Execution" + icon_state = "sec_backroom" + minimap_color = MINIMAP_AREA_LIVING + +/area/daedalusprison/inside/basketball + name = "Prison Basketball Court" + icon_state = "anog" + minimap_color = MINIMAP_AREA_ESCAPE + +/area/daedalusprison/inside/lobby + name = "Prison Lobby" + icon_state = "red" + minimap_color = MINIMAP_AREA_LIVING + +/area/daedalusprison/inside/corporateoffice + name = "Liason Office" + icon_state = "blueold" + minimap_color = MINIMAP_AREA_ESCAPE + +/area/daedalusprison/inside/southmeetingroom + name = "Corporate Meeting Room" + icon_state = "party" + minimap_color = MINIMAP_AREA_ESCAPE + +/area/daedalusprison/inside/garage + name = "Prison Garage" + icon_state = "garage" + minimap_color = MINIMAP_AREA_REQ + +/area/daedalusprison/inside/easternhalls + name = "Prison Eastern Hallways" + icon_state = "hallS" + +/area/daedalusprison/inside/gym + name = "Prison Gym" + icon_state = "bluenew" + minimap_color = MINIMAP_AREA_ESCAPE + +/area/daedalusprison/inside/chapel + name = "Prison Chapel" + icon_state = "chapel" + minimap_color = MINIMAP_AREA_LIVING + +/area/daedalusprison/inside/security + name = "Security" + icon_state = "brig" + minimap_color = MINIMAP_AREA_SEC + +/area/daedalusprison/inside/security/easternbooth + name = "Prison Eastern Security Booth" + +/area/daedalusprison/inside/security/secbreakroom + name = "Prison Security Break Room" + +/area/daedalusprison/inside/security/cameras + name = "Prison Camera Center" + +/area/daedalusprison/inside/security/warden + name = "Prison Warden Office" + +/area/daedalusprison/inside/security/office + name = "Prison Security Office" + +/area/daedalusprison/inside/security/interrogation + name = "Prison Interrogation" + icon_state = "interrogation" + +/area/daedalusprison/inside/security/medsec + name = "Prison Medbay Security" + ceiling = CEILING_OBSTRUCTED + +/area/daedalusprison/inside/medical + name = "Prison Infirmary" + icon_state = "medbay" + minimap_color = MINIMAP_AREA_MEDBAY + ceiling = CEILING_OBSTRUCTED + +/area/daedalusprison/inside/medical/chemistry + name = "Prison Chemistry" + +/area/daedalusprison/inside/medical/treatment + name = "Prison Infirmary Treatment" + +/area/daedalusprison/inside/barracks + name = "Prison Security Barracks" + icon_state = "armory" + minimap_color = MINIMAP_AREA_SEC_CAVE + +/area/daedalusprison/inside/garden + name = "Hydroponics Garden" + icon_state = "garden" + minimap_color = MINIMAP_AREA_LIVING + +/area/daedalusprison/inside/hydroponics + name = "Hydroponics" + icon_state = "hydro" + minimap_color = MINIMAP_AREA_LIVING + +/area/daedalusprison/inside/hydroponicstesting + name = "Hydroponics Testing" + icon_state = "hydro_north" + minimap_color = MINIMAP_AREA_LIVING + +/area/daedalusprison/inside/seccheckpoint + name = "Security Checkpoint" + icon_state = "brig" + minimap_color = MINIMAP_AREA_SEC + +/area/daedalusprison/inside/secoffices + name = "Security Checkpoint Offices" + icon_state = "brig" + minimap_color = MINIMAP_AREA_SEC + +/area/daedalusprison/inside/pmcdropship + name = "Crashed PMC Dropship" + icon_state = "shuttle" + minimap_color = MINIMAP_AREA_COLONY + always_unpowered = TRUE + +/area/daedalusprison/inside/landingzoneone + name = "Landing Zone One" + icon_state = "landingzone1" + area_flags = NO_DROPPOD + minimap_color = MINIMAP_AREA_LZ + +/area/daedalusprison/inside/telecomms + name = "Telecomms" + icon_state = "tcomsatcham" + area_flags = NO_DROPPOD + requires_power = FALSE diff --git a/code/game/area/desertdam.dm b/code/game/area/desertdam.dm index 29b33c187f82c..26de7e7b3ee19 100644 --- a/code/game/area/desertdam.dm +++ b/code/game/area/desertdam.dm @@ -1004,13 +1004,13 @@ name = "LZ1 'Admin'" icon_state = "tcomsatcham" requires_power = 0 - flags_area = NO_DROPPOD + area_flags = NO_DROPPOD /area/desert_dam/landing/console2 name = "LZ2 'Supply'" icon_state = "tcomsatcham" requires_power = 0 - flags_area = NO_DROPPOD + area_flags = NO_DROPPOD //Transit Shuttle /area/shuttle/tri_trans1/alpha diff --git a/code/game/area/general.dm b/code/game/area/general.dm index 51f7079f48816..ba712738435ab 100644 --- a/code/game/area/general.dm +++ b/code/game/area/general.dm @@ -10,7 +10,7 @@ ambience = list('sound/ambience/ambispace.ogg') temperature = TCMB pressure = 0 - flags_area = NO_DROPPOD + area_flags = NO_DROPPOD ///What type of debuff do we apply when someone enters this area? var/debuff_type = /datum/status_effect/spacefreeze @@ -42,7 +42,7 @@ /area/shuttle //DO NOT TURN THE dynamic_lighting STUFF ON FOR SHUTTLES. IT BREAKS THINGS. requires_power = FALSE outside = FALSE - flags_area = OB_CAS_IMMUNE + area_flags = OB_CAS_IMMUNE minimap_color = MINIMAP_AREA_LZ /area/shuttle/arrival @@ -1201,7 +1201,7 @@ requires_power = 0 name = "Abandoned Test Room" icon_state = "storage" - flags_area = NO_DROPPOD + area_flags = NO_DROPPOD //DJSTATION diff --git a/code/game/area/lawankaoutpost.dm b/code/game/area/lawankaoutpost.dm index 4284779ac0317..e547c2ad08d24 100644 --- a/code/game/area/lawankaoutpost.dm +++ b/code/game/area/lawankaoutpost.dm @@ -210,11 +210,11 @@ /area/lawankaoutpost/colony/landingzoneone name = "Landing Zone One" icon_state = "landingzone1" - flags_area = NO_DROPPOD + area_flags = NO_DROPPOD minimap_color = MINIMAP_AREA_LZ /area/lawankaoutpost/colony/landingzonetwo name = "Landing Zone Two" icon_state = "landingzone2" - flags_area = NO_DROPPOD + area_flags = NO_DROPPOD minimap_color = MINIMAP_AREA_LZ diff --git a/code/game/area/lv624.dm b/code/game/area/lv624.dm index b7519f1bce350..1d51f20e1870c 100644 --- a/code/game/area/lv624.dm +++ b/code/game/area/lv624.dm @@ -477,17 +477,17 @@ /area/lv624/lazarus/console name = "\improper Shuttle Console" icon_state = "tcomsatcham" - flags_area = NO_DROPPOD + area_flags = NO_DROPPOD requires_power = FALSE /area/lv624/lazarus/spaceport name = "\improper Eastern Space Port" icon_state = "landingzone1" - flags_area = NO_DROPPOD + area_flags = NO_DROPPOD minimap_color = MINIMAP_AREA_LZ /area/lv624/lazarus/spaceport2 name = "\improper Western Space Port" icon_state = "landingzone2" - flags_area = NO_DROPPOD + area_flags = NO_DROPPOD minimap_color = MINIMAP_AREA_LZ diff --git a/code/game/area/magmoor_digsite.dm b/code/game/area/magmoor_digsite.dm index ea23beff76252..aa128e504788a 100644 --- a/code/game/area/magmoor_digsite.dm +++ b/code/game/area/magmoor_digsite.dm @@ -22,7 +22,7 @@ /area/magmoor/volcano name = "Magmoor Central Fissure" ceiling = CEILING_DEEP_UNDERGROUND - flags_area = NO_DROPPOD + area_flags = NO_DROPPOD always_unpowered = TRUE //Caves diff --git a/code/game/area/mainship.dm b/code/game/area/mainship.dm index 5c9cc6b3af9cb..7ea34503b97b9 100644 --- a/code/game/area/mainship.dm +++ b/code/game/area/mainship.dm @@ -157,6 +157,11 @@ icon_state = "livingspace" minimap_color = MINIMAP_AREA_COMMAND +/area/mainship/living/mechpilotquarters + name = "Mech Pilot Quarters" + icon_state = "blueold" + minimap_color = MINIMAP_AREA_COMMAND + /area/mainship/hallways/exoarmor name = "Vehicle Armor Storage" icon_state = "exoarmor" diff --git a/code/game/area/orion_outpost.dm b/code/game/area/orion_outpost.dm index 76830cb9f7e99..b13109feb1feb 100644 --- a/code/game/area/orion_outpost.dm +++ b/code/game/area/orion_outpost.dm @@ -30,7 +30,7 @@ /area/orion_outpost/surface/landing_pad name = "Landing Pad 1" icon_state = "landing_pad" - flags_area = NO_DROPPOD + area_flags = NO_DROPPOD ceiling = CEILING_METAL outside = FALSE minimap_color = MINIMAP_AREA_LZ @@ -46,7 +46,7 @@ /area/orion_outpost/surface/landing_pad_2 name = "Landing Pad 2" icon_state = "landing_pad" - flags_area = NO_DROPPOD + area_flags = NO_DROPPOD ceiling = CEILING_METAL outside = FALSE minimap_color = MINIMAP_AREA_LZ diff --git a/code/game/area/patricks_rest.dm b/code/game/area/patricks_rest.dm index 6e3942ab9f534..f0d3c28c581b0 100644 --- a/code/game/area/patricks_rest.dm +++ b/code/game/area/patricks_rest.dm @@ -30,7 +30,7 @@ /area/patricks_rest/surface/landing_pad name = "Landing Pad 1" icon_state = "landing_pad" - flags_area = NO_DROPPOD + area_flags = NO_DROPPOD ceiling = CEILING_METAL outside = FALSE minimap_color = MINIMAP_AREA_LZ @@ -45,7 +45,7 @@ /area/patricks_rest/surface/landing_pad_2 name = "Landing Pad 2" icon_state = "landing_pad" - flags_area = NO_DROPPOD + area_flags = NO_DROPPOD ceiling = CEILING_METAL outside = FALSE minimap_color = MINIMAP_AREA_LZ diff --git a/code/game/area/slumbridge.dm b/code/game/area/slumbridge.dm index f0b9884935b49..c3d75e0723ebe 100644 --- a/code/game/area/slumbridge.dm +++ b/code/game/area/slumbridge.dm @@ -331,17 +331,17 @@ /area/slumbridge/landingzoneone name = "Landing Zone One" icon_state = "landingzone1" - flags_area = NO_DROPPOD + area_flags = NO_DROPPOD minimap_color = MINIMAP_AREA_LZ /area/slumbridge/landingzonetwo name = "Landing Zone Two" icon_state = "landingzone2" - flags_area = NO_DROPPOD + area_flags = NO_DROPPOD minimap_color = MINIMAP_AREA_LZ /area/slumbridge/console name = "\improper Shuttle Console" icon_state = "tcomsatcham" - flags_area = NO_DROPPOD + area_flags = NO_DROPPOD requires_power = FALSE diff --git a/code/game/area/sulaco.dm b/code/game/area/sulaco.dm index fbe0db09b7690..904520db7757b 100644 --- a/code/game/area/sulaco.dm +++ b/code/game/area/sulaco.dm @@ -338,7 +338,7 @@ /area/shuttle/drop1/lz1 name = "Alamo Landing Zone" icon_state = "away1" - flags_area = NONE + area_flags = NONE /area/shuttle/drop2/Enter(atom/movable/arrived, direction) if(istype(arrived, /obj/structure/barricade)) @@ -376,7 +376,7 @@ /area/shuttle/drop2/lz2 name = "Normandy Landing Zone" icon_state = "away2" - flags_area = NONE + area_flags = NONE diff --git a/code/game/atoms.dm b/code/game/atoms/_atom.dm similarity index 83% rename from code/game/atoms.dm rename to code/game/atoms/_atom.dm index e5aa3e93f3ee2..49666d6277de7 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms/_atom.dm @@ -4,7 +4,7 @@ appearance_flags = TILE_BOUND var/level = 2 - var/flags_atom = NONE + var/atom_flags = NONE var/datum/reagents/reagents = null var/list/fingerprints @@ -39,9 +39,6 @@ ///How much does this atom block the explosion's shock wave. var/explosion_block = 0 - ///overlays managed by update_overlays() to prevent removing overlays that weren't added by the same proc - var/list/managed_overlays - var/datum/component/orbiter/orbiters var/datum/proximity_monitor/proximity_monitor @@ -122,6 +119,11 @@ ///Cooldown for telling someone they're buckled COOLDOWN_DECLARE(buckle_message_cooldown) + ///vis overlays managed by SSvis_overlays to automaticaly turn them like other overlays. + var/list/managed_vis_overlays + ///The list of alternate appearances for this atom + var/list/alternate_appearances + /* We actually care what this returns, since it can return different directives. Not specifically here, but in other variations of this. As a general safety, @@ -142,6 +144,11 @@ directive is properly returned. if(isturf(loc)) loc.fingerprints = fingerprints + if(alternate_appearances) + for(var/K in alternate_appearances) + var/datum/atom_hud/alternate_appearance/AA = alternate_appearances[K] + AA.remove_from_hud(src) + return ..() //=========================================================================== @@ -228,6 +235,7 @@ directive is properly returned. /atom/proc/emp_act(severity) + SEND_SIGNAL(src, COMSIG_ATOM_EMP_ACT, severity) return @@ -356,32 +364,6 @@ directive is properly returned. SEND_SIGNAL(src, COMSIG_ATOM_EXAMINE, user, .) - -/// Updates the icon of the atom -/atom/proc/update_icon() - var/signalOut = SEND_SIGNAL(src, COMSIG_ATOM_UPDATE_ICON) - - if(!(signalOut & COMSIG_ATOM_NO_UPDATE_ICON_STATE)) - update_icon_state() - - if(!(signalOut & COMSIG_ATOM_NO_UPDATE_OVERLAYS)) - var/list/new_overlays = update_overlays() - if(managed_overlays) - cut_overlay(managed_overlays) - managed_overlays = null - if(length(new_overlays)) - managed_overlays = new_overlays - add_overlay(new_overlays) - -/// Updates the icon state of the atom -/atom/proc/update_icon_state() - -/// Updates the overlays of the atom -/atom/proc/update_overlays() - SHOULD_CALL_PARENT(TRUE) - . = list() - SEND_SIGNAL(src, COMSIG_ATOM_UPDATE_OVERLAYS, .) - /// Checks if the colors given are different and if so causes a greyscale icon update /// The colors argument can be either a list or the full color string /atom/proc/set_greyscale_colors(list/colors, update=TRUE) @@ -434,7 +416,7 @@ directive is properly returned. */ /* RUTGMC DELETION /atom/proc/ex_act(severity, epicenter_dist, impact_range) - if(!(flags_atom & PREVENT_CONTENTS_EXPLOSION)) + if(!(atom_flags & PREVENT_CONTENTS_EXPLOSION)) contents_explosion(severity, epicenter_dist, impact_range) SEND_SIGNAL(src, COMSIG_ATOM_EX_ACT, severity, epicenter_dist, impact_range) */ @@ -442,12 +424,21 @@ directive is properly returned. /atom/proc/fire_act() return +///Effects of lava. Return true where we want the lava to keep processing +/atom/proc/lava_act() + if(resistance_flags & INDESTRUCTIBLE) + return FALSE + fire_act() + return TRUE /atom/proc/hitby(atom/movable/AM, speed = 5) if(density) AM.stop_throw() return TRUE +///Psionic interaction with this atom +/atom/proc/psi_act(psi_power, mob/living/user) + return /atom/proc/GenerateTag() return @@ -647,9 +638,9 @@ directive is properly returned. /atom/proc/Initialize(mapload, ...) SHOULD_CALL_PARENT(TRUE) SHOULD_NOT_SLEEP(TRUE) - if(flags_atom & INITIALIZED) + if(atom_flags & INITIALIZED) stack_trace("Warning: [src]([type]) initialized multiple times!") - flags_atom |= INITIALIZED + atom_flags |= INITIALIZED update_greyscale() @@ -695,17 +686,138 @@ directive is properly returned. SEND_SIGNAL(src, COMSIG_ATOM_DIR_CHANGE, dir, newdir) dir = newdir - /atom/vv_get_dropdown() . = ..() - . += "---" - var/turf/curturf = get_turf(src) - if(curturf) - .["Jump to"] = "?_src_=holder;[HrefToken()];observecoordjump=1;X=[curturf.x];Y=[curturf.y];Z=[curturf.z]" - .["Modify Transform"] = "?_src_=vars;[HrefToken()];modtransform=[REF(src)]" - .["Add reagent"] = "?_src_=vars;[HrefToken()];addreagent=[REF(src)]" - .["Modify Filters"] = "?_src_=vars;[HrefToken()];filteredit=[REF(src)]" - .["Modify Greyscale Colors"] = "?_src_=vars;[HrefToken()];modify_greyscale=[REF(src)]" + VV_DROPDOWN_OPTION("", "---------") + VV_DROPDOWN_OPTION(VV_HK_ATOM_JUMP_TO, "Jump To") + VV_DROPDOWN_OPTION(VV_HK_MODIFY_TRANSFORM, "Modify Transform") + VV_DROPDOWN_OPTION(VV_HK_ADD_REAGENT, "Add reagent") + VV_DROPDOWN_OPTION(VV_HK_MODIFY_FILTERS, "Modify Filters") + VV_DROPDOWN_OPTION(VV_HK_MODIFY_GREYSCALE_COLORS, "Modify Greyscale Colors") + VV_DROPDOWN_OPTION(VV_HK_EDIT_COLOR_MATRIX, "Edit Color as Matrix") + VV_DROPDOWN_OPTION(VV_HK_TEST_MATRIXES, "Test Matrices") + +/atom/vv_do_topic(list/href_list) + . = ..() + + if(!.) + return + + if(href_list[VV_HK_ATOM_JUMP_TO]) + if(!check_rights(NONE)) + return + var/x = text2num(href_list["X"]) + var/y = text2num(href_list["Y"]) + var/z = text2num(href_list["Z"]) + var/client/C = usr.client + + if(x == 0 && y == 0 && z == 0) + return + + var/message + if(!isobserver(usr)) + usr.client.holder.admin_ghost() + message = TRUE + + var/mob/dead/observer/O = C.mob + var/turf/T = locate(x, y, z) + O.forceMove(T) + + if(message) + log_admin("[key_name(O)] jumped to coordinates [AREACOORD(T)].") + message_admins("[ADMIN_TPMONTY(O)] jumped to coordinates [ADMIN_VERBOSEJMP(T)].") + + if(href_list[VV_HK_MODIFY_TRANSFORM]) + if(!check_rights(R_DEBUG)) + return + if(!istype(src)) + return + var/result = input(usr, "Choose the transformation to apply", "Modify Transform") as null|anything in list("Scale","Translate","Rotate") + var/matrix/M = src.transform + switch(result) + if("Scale") + var/x = input(usr, "Choose x mod", "Modify Transform") as null|num + var/y = input(usr, "Choose y mod", "Modify Transform") as null|num + if(x == 0 || y == 0) + if(alert("You've entered 0 as one of the values, are you sure?", "Modify Transform", "Yes", "No") != "Yes") + return + if(!isnull(x) && !isnull(y)) + src.transform = M.Scale(x,y) + if("Translate") + var/x = input(usr, "Choose x mod", "Modify Transform") as null|num + var/y = input(usr, "Choose y mod", "Modify Transform") as null|num + if(x == 0 && y == 0) + return + if(!isnull(x) && !isnull(y)) + src.transform = M.Translate(x,y) + if("Rotate") + var/angle = input(usr, "Choose angle to rotate", "Modify Transform") as null|num + if(angle == 0) + if(alert("You've entered 0 as one of the values, are you sure?", "Warning", "Yes", "No") != "Yes") + return + if(!isnull(angle)) + src.transform = M.Turn(angle) + log_admin("[key_name(usr)] has used [result] transformation on [src].") + message_admins("[ADMIN_TPMONTY(usr)] has used [result] transformation on [src].") + + if(href_list[VV_HK_ADD_REAGENT]) + if(!check_rights(R_VAREDIT)) + return + if(!reagents) + var/amount = input(usr, "Specify the reagent size of [src]", "Set Reagent Size", 50) as num + if(amount) + create_reagents(amount) + if(reagents) + var/chosen_id + var/list/reagent_options = sortList(GLOB.chemical_reagents_list) + switch(alert(usr, "Choose a method.", "Add Reagents", "Enter ID", "Choose ID")) + if("Enter ID") + var/valid_id + while(!valid_id) + chosen_id = stripped_input(usr, "Enter the ID of the reagent you want to add.") + if(!chosen_id) //Get me out of here! + break + for(var/ID in reagent_options) + if(ID == chosen_id) + valid_id = TRUE + if(!valid_id) + to_chat(usr, span_warning("A reagent with that ID doesn't exist!")) + if("Choose ID") + chosen_id = input(usr, "Choose a reagent to add.", "Add Reagent") as null|anything in reagent_options + if(chosen_id) + var/amount = input(usr, "Choose the amount to add.", "Add Reagent", reagents.maximum_volume) as num + if(amount) + reagents.add_reagent(chosen_id, amount) + log_admin("[key_name(usr)] has added [amount] units of [chosen_id] to [src].") + message_admins("[ADMIN_TPMONTY(usr)] has added [amount] units of [chosen_id] to [src].") + + if(href_list[VV_HK_MODIFY_FILTERS]) + if(!check_rights(R_VAREDIT)) + return + var/client/C = usr.client + C?.open_filter_editor(src) + + if(href_list[VV_HK_MODIFY_GREYSCALE_COLORS]) + if(!check_rights(R_DEBUG)) + return + var/datum/greyscale_modify_menu/menu = new(usr) + menu.ui_interact(usr) + + if(href_list[VV_HK_EDIT_COLOR_MATRIX]) + if(!check_rights(R_VAREDIT)) + return + usr.client?.open_color_matrix_editor(src) + + if(href_list[VV_HK_TEST_MATRIXES]) + if(!check_rights(R_VAREDIT)) + return + usr.client?.open_matrix_tester(src) + +/atom/vv_get_header() + . = ..() + var/refid = REF(src) + . += "[VV_HREF_TARGETREF(refid, VV_HK_AUTO_RENAME, "[src]")]" + . += "
<< [dir2text(dir) || dir] >>" /atom/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) SEND_SIGNAL(src, COMSIG_ATOM_ENTERED, arrived, old_loc, old_locs) @@ -881,17 +993,17 @@ directive is properly returned. return TRUE - -// For special click interactions (take first item out of container, quick-climb, etc.) -/atom/proc/specialclick(mob/living/carbon/user) - return - /atom/proc/prepare_huds() hud_list = new for(var/hud in hud_possible) //Providing huds. - var/image/new_hud = image('icons/mob/hud.dmi', src, "") - new_hud.appearance_flags = KEEP_APART - hud_list[hud] = new_hud + var/hint = hud_possible[hud] + switch(hint) + if(HUD_LIST_LIST) + hud_list[hud] = list() + else + var/image/I = image('icons/mob/hud.dmi', src, "") + I.appearance_flags = RESET_COLOR|RESET_TRANSFORM|KEEP_APART + hud_list[hud] = I /** * If this object has lights, turn it on/off. @@ -980,3 +1092,7 @@ directive is properly returned. ///Returns the hard armor for the given atom. If human and a limb is specified, gets the armor for that specific limb. /atom/proc/get_hard_armor(armor_type, proj_def_zone) return + +///Interaction for using a grab on an atom +/atom/proc/grab_interact(obj/item/grab/grab, mob/user, base_damage = BASE_OBJ_SLAM_DAMAGE, is_sharp = FALSE) + return diff --git a/code/game/atoms/atom_appearance.dm b/code/game/atoms/atom_appearance.dm new file mode 100644 index 0000000000000..76a8268a932a1 --- /dev/null +++ b/code/game/atoms/atom_appearance.dm @@ -0,0 +1,112 @@ +/atom + ///overlays managed by [update_overlays][/atom/proc/update_overlays] to prevent removing overlays that weren't added by the same proc. Single items are stored on their own, not in a list. + var/list/managed_overlays + +/** + * Updates the appearence of the icon + * + * Mostly delegates to update_name, update_desc, and update_icon + * + * Arguments: + * - updates: A set of bitflags dictating what should be updated. Defaults to [ALL] + */ +/atom/proc/update_appearance(updates=ALL) + SHOULD_NOT_SLEEP(TRUE) + SHOULD_CALL_PARENT(TRUE) + + . = NONE + updates &= ~SEND_SIGNAL(src, COMSIG_ATOM_UPDATE_APPEARANCE, updates) + if(updates & UPDATE_NAME) + . |= update_name(updates) + if(updates & UPDATE_DESC) + . |= update_desc(updates) + if(updates & UPDATE_ICON) + . |= update_icon(updates) + +/// Updates the name of the atom +/atom/proc/update_name(updates=ALL) + SHOULD_CALL_PARENT(TRUE) + return SEND_SIGNAL(src, COMSIG_ATOM_UPDATE_NAME, updates) + +/// Updates the description of the atom +/atom/proc/update_desc(updates=ALL) + SHOULD_CALL_PARENT(TRUE) + return SEND_SIGNAL(src, COMSIG_ATOM_UPDATE_DESC, updates) + +/// Updates the icon of the atom +/atom/proc/update_icon(updates=ALL) + SHOULD_CALL_PARENT(TRUE) + + . = NONE + updates &= ~SEND_SIGNAL(src, COMSIG_ATOM_UPDATE_ICON, updates) + if(updates & UPDATE_ICON_STATE) + SEND_SIGNAL(src, COMSIG_ATOM_UPDATE_ICON_STATE) + update_icon_state() + . |= UPDATE_ICON_STATE + + if(updates & UPDATE_OVERLAYS) + if(LAZYLEN(managed_vis_overlays)) + SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays) + + var/list/new_overlays = update_overlays(updates) + var/nulls = 0 + for(var/i in 1 to length(new_overlays)) + var/atom/maybe_not_an_atom = new_overlays[i] + if(isnull(maybe_not_an_atom)) + nulls++ + continue + if(istext(maybe_not_an_atom) || isicon(maybe_not_an_atom)) + continue + new_overlays[i] = maybe_not_an_atom.appearance + if(nulls) + for(var/i in 1 to nulls) + new_overlays -= null + + var/identical = FALSE + var/new_length = length(new_overlays) + if(!managed_overlays && !new_length) + identical = TRUE + else if(!islist(managed_overlays)) + if(new_length == 1 && managed_overlays == new_overlays[1]) + identical = TRUE + else if(length(managed_overlays) == new_length) + identical = TRUE + for(var/i in 1 to length(managed_overlays)) + if(managed_overlays[i] != new_overlays[i]) + identical = FALSE + break + + if(!identical) + var/full_control = FALSE + if(managed_overlays) + full_control = length(overlays) == (islist(managed_overlays) ? length(managed_overlays) : 1) + if(full_control) + overlays = null + else + cut_overlay(managed_overlays) + + switch(length(new_overlays)) + if(0) + if(full_control) + POST_OVERLAY_CHANGE(src) + managed_overlays = null + if(1) + add_overlay(new_overlays) + managed_overlays = new_overlays[1] + else + add_overlay(new_overlays) + managed_overlays = new_overlays + + . |= UPDATE_OVERLAYS + + . |= SEND_SIGNAL(src, COMSIG_ATOM_UPDATED_ICON, updates, .) + +/// Updates the icon state of the atom +/atom/proc/update_icon_state() + + +/// Updates the overlays of the atom +/atom/proc/update_overlays() + SHOULD_CALL_PARENT(TRUE) + . = list() + SEND_SIGNAL(src, COMSIG_ATOM_UPDATE_OVERLAYS, .) diff --git a/code/game/atoms_movable.dm b/code/game/atoms/atom_movable.dm old mode 100755 new mode 100644 similarity index 89% rename from code/game/atoms_movable.dm rename to code/game/atoms/atom_movable.dm index 0c4d920b43cdd..c95ee7c19f95f --- a/code/game/atoms_movable.dm +++ b/code/game/atoms/atom_movable.dm @@ -231,7 +231,7 @@ RU TGMC EDIT */ var/can_pass_diagonally = NONE if (direction & (direction - 1)) //Check if the first part of the diagonal move is possible moving_diagonally = TRUE - if(!(flags_atom & DIRLOCK)) + if(!(atom_flags & DIRLOCK)) setDir(direction) //We first set the direction to prevent going through dir sensible object if((direction & NORTH) && loc.Exit(src, NORTH) && get_step(loc, NORTH).Enter(src)) can_pass_diagonally = NORTH @@ -247,13 +247,13 @@ RU TGMC EDIT */ moving_diagonally = FALSE if(!get_step(loc, can_pass_diagonally)?.Exit(src, direction & ~can_pass_diagonally)) return Move(get_step(loc, can_pass_diagonally), can_pass_diagonally) - if(!(flags_atom & DIRLOCK)) //We want to set the direction to be the one of the "second" diagonal move, aka not can_pass_diagonally + if(!(atom_flags & DIRLOCK)) //We want to set the direction to be the one of the "second" diagonal move, aka not can_pass_diagonally setDir(direction &~ can_pass_diagonally) else if(!loc.Exit(src, direction)) return - if(!(flags_atom & DIRLOCK)) + if(!(atom_flags & DIRLOCK)) setDir(direction) var/enter_return_value = newloc.Enter(src) @@ -368,12 +368,12 @@ RU TGMC EDIT */ /atom/movable/proc/Moved(atom/old_loc, movement_dir, forced = FALSE, list/old_locs) - SEND_SIGNAL(src, COMSIG_MOVABLE_MOVED, old_loc, movement_dir, forced, old_locs) + SEND_SIGNAL(src, COMSIG_MOVABLE_MOVED, old_loc, movement_dir, forced, locs) if(client_mobs_in_contents) update_parallax_contents() if(pulledby) - SEND_SIGNAL(src, COMSIG_MOVABLE_PULL_MOVED, old_loc, movement_dir, forced, old_locs) + SEND_SIGNAL(src, COMSIG_MOVABLE_PULL_MOVED, old_loc, movement_dir, forced, locs) //Cycle through the light sources on this atom and tell them to update. for(var/datum/dynamic_light_source/light AS in hybrid_light_sources) light.source_atom.update_light() @@ -491,7 +491,7 @@ RU TGMC EDIT */ return if(!isturf(loc)) return - var/dir_to_proj = get_dir(hit_atom, old_throw_source) + var/dir_to_proj = angle_to_cardinal_dir(Get_Angle(hit_atom, old_throw_source)) if(ISDIAGONALDIR(dir_to_proj)) var/list/cardinals = list(turn(dir_to_proj, 45), turn(dir_to_proj, -45)) for(var/direction in cardinals) @@ -500,8 +500,8 @@ RU TGMC EDIT */ cardinals -= direction dir_to_proj = pick(cardinals) - var/perpendicular_angle = Get_Angle(hit_atom, get_step(hit_atom, dir_to_proj)) - var/new_angle = (perpendicular_angle + (perpendicular_angle - Get_Angle(old_throw_source, src) - 180) + rand(-10, 10)) + var/perpendicular_angle = Get_Angle(hit_atom, get_step(hit_atom, ISDIAGONALDIR(dir_to_proj) ? get_dir(hit_atom, old_throw_source) - dir_to_proj : dir_to_proj)) + var/new_angle = (perpendicular_angle + (perpendicular_angle - Get_Angle(old_throw_source, (loc == old_throw_source ? hit_atom : src)) - 180) + rand(-10, 10)) if(new_angle < -360) new_angle += 720 //north is 0 instead of 360 @@ -542,10 +542,10 @@ RU TGMC EDIT */ if(flying) set_flying(TRUE, FLY_LAYER) - var/originally_dir_locked = flags_atom & DIRLOCK + var/originally_dir_locked = atom_flags & DIRLOCK if(!originally_dir_locked) setDir(get_dir(src, target)) - flags_atom |= DIRLOCK + atom_flags |= DIRLOCK throw_source = get_turf(src) //store the origin turf @@ -574,7 +574,8 @@ RU TGMC EDIT */ var/atom/step = get_step(src, dy) if(!step) // going off the edge of the map makes get_step return null, don't let things go off the edge break - Move(step) + if(!Move(step)) + throwing = FALSE error += dist_x dist_since_sleep++ if(dist_since_sleep >= speed) @@ -584,7 +585,8 @@ RU TGMC EDIT */ var/atom/step = get_step(src, dx) if(!step) // going off the edge of the map makes get_step return null, don't let things go off the edge break - Move(step) + if(!Move(step)) + throwing = FALSE error -= dist_y dist_since_sleep++ if(dist_since_sleep >= speed) @@ -598,7 +600,8 @@ RU TGMC EDIT */ var/atom/step = get_step(src, dx) if(!step) // going off the edge of the map makes get_step return null, don't let things go off the edge break - Move(step) + if(!Move(step)) + throwing = FALSE error += dist_y dist_since_sleep++ if(dist_since_sleep >= speed) @@ -608,7 +611,8 @@ RU TGMC EDIT */ var/atom/step = get_step(src, dy) if(!step) // going off the edge of the map makes get_step return null, don't let things go off the edge break - Move(step) + if(!Move(step)) + throwing = FALSE error -= dist_x dist_since_sleep++ if(dist_since_sleep >= speed) @@ -617,16 +621,16 @@ RU TGMC EDIT */ //done throwing, either because it hit something or it finished moving if(!originally_dir_locked) - flags_atom &= ~DIRLOCK + atom_flags &= ~DIRLOCK if(isobj(src) && throwing) throw_impact(get_turf(src), speed) - if(loc) - stop_throw(flying, original_layer) - SEND_SIGNAL(loc, COMSIG_TURF_THROW_ENDED_HERE, src) - SEND_SIGNAL(src, COMSIG_MOVABLE_POST_THROW) + stop_throw(flying, original_layer) -/// Annul all throw var to ensure a clean exit out of throw state +///Clean up all throw vars /atom/movable/proc/stop_throw(flying = FALSE, original_layer) + SEND_SIGNAL(src, COMSIG_MOVABLE_POST_THROW) + if(loc) + SEND_SIGNAL(loc, COMSIG_TURF_THROW_ENDED_HERE, src) set_throwing(FALSE) if(flying) set_flying(FALSE, original_layer) @@ -731,17 +735,135 @@ RU TGMC EDIT */ // And animate the attack! animate(I, alpha = 175, pixel_x = 0, pixel_y = 0, pixel_z = 0, time = 3) - /atom/movable/vv_get_dropdown() . = ..() - . += "---" - .["Follow"] = "?_src_=holder;[HrefToken()];observefollow=[REF(src)]" - .["Get"] = "?_src_=vars;[HrefToken()];getatom=[REF(src)]" - .["Send"] = "?_src_=vars;[HrefToken()];sendatom=[REF(src)]" - .["Delete All Instances"] = "?_src_=vars;[HrefToken()];delall=[REF(src)]" - .["Update Icon"] = "?_src_=vars;[HrefToken()];updateicon=[REF(src)]" - .["Edit Particles"] = "?_src_=vars;[HrefToken()];modify_particles=[REF(src)]" + VV_DROPDOWN_OPTION("", "---------") + VV_DROPDOWN_OPTION(VV_HK_FOLLOW, "Follow") + VV_DROPDOWN_OPTION(VV_HK_GET, "Get") + VV_DROPDOWN_OPTION(VV_HK_SEND, "Send") + VV_DROPDOWN_OPTION(VV_HK_DELETE_ALL_INSTANCES, "Delete All Instances") + VV_DROPDOWN_OPTION(VV_HK_UPDATE_ICONS, "Update Icon") + VV_DROPDOWN_OPTION(VV_HK_EDIT_PARTICLES, "Edit Particles") + +/atom/movable/vv_do_topic(list/href_list) + . = ..() + + if(!.) + return + + if(href_list[VV_HK_FOLLOW]) + if(!check_rights(NONE)) + return + var/client/C = usr.client + if(isnewplayer(C.mob) || isnewplayer(src)) + return + var/message + if(!isobserver(C.mob)) + usr.client.holder.admin_ghost() + message = TRUE + var/mob/dead/observer/O = C.mob + O.ManualFollow(src) + if(message) + log_admin("[key_name(O)] jumped to follow [key_name(src)].") + message_admins("[ADMIN_TPMONTY(O)] jumped to follow [ADMIN_TPMONTY(src)].") + + if(href_list[VV_HK_GET]) + if(!check_rights(R_DEBUG)) + return + if(!istype(src)) + return + var/turf/T = get_turf(usr) + if(!istype(T)) + return + forceMove(T) + log_admin("[key_name(usr)] has sent atom [src] to themselves.") + message_admins("[ADMIN_TPMONTY(usr)] has sent atom [src] to themselves.") + if(href_list[VV_HK_SEND]) + if(!check_rights(R_DEBUG)) + return + if(!istype(src)) + return + var/atom/target + switch(input("Where do you want to send it to?", "Send Mob") as null|anything in list("Area", "Mob", "Key", "Coords")) + if("Area") + var/area/AR = input("Pick an area.", "Pick an area") as null|anything in GLOB.sorted_areas + if(!AR || !src) + return + target = pick(get_area_turfs(AR)) + if("Mob") + var/mob/N = input("Pick a mob.", "Pick a mob") as null|anything in sortList(GLOB.mob_list) + if(!N || !src) + return + target = get_turf(N) + if("Key") + var/client/C = input("Pick a key.", "Pick a key") as null|anything in sortKey(GLOB.clients) + if(!C || !src) + return + target = get_turf(C.mob) + if("Coords") + var/X = input("Select coordinate X", "Coordinate X") as null|num + var/Y = input("Select coordinate Y", "Coordinate Y") as null|num + var/Z = input("Select coordinate Z", "Coordinate Z") as null|num + if(isnull(X) || isnull(Y) || isnull(Z) || !src) + return + target = locate(X, Y, Z) + if(!target) + return + forceMove(target) + log_admin("[key_name(usr)] has sent atom [src] to [AREACOORD(target)].") + message_admins("[ADMIN_TPMONTY(usr)] has sent atom [src] to [ADMIN_VERBOSEJMP(target)].") + + if(href_list[VV_HK_DELETE_ALL_INSTANCES]) + if(!check_rights(R_DEBUG|R_SERVER)) + return + var/obj/O = src + if(!isobj(O)) + return + var/action_type = alert("Strict type ([O.type]) or type and all subtypes?", "Type", "Strict type", "Type and subtypes", "Cancel") + if(action_type == "Cancel" || !action_type) + return + if(alert("Are you really sure you want to delete all objects of type [O.type]?", "Warning", "Yes", "No") != "Yes") + return + if(alert("Second confirmation required. Delete?", "Warning", "Yes", "No") != "Yes") + return + var/O_type = O.type + var/i = 0 + var/strict + switch(action_type) + if("Strict type") + strict = TRUE + for(var/obj/Obj in world) + if(Obj.type == O_type) + i++ + qdel(Obj) + CHECK_TICK + if(!i) + to_chat(usr, "No objects of this type exist") + return + if("Type and subtypes") + for(var/obj/Obj in world) + if(istype(Obj,O_type)) + i++ + qdel(Obj) + CHECK_TICK + if(!i) + to_chat(usr, "No objects of this type exist") + return + log_admin("[key_name(usr)] deleted all objects of type[strict ? "" : " and subtypes"] of [O_type] ([i] objects deleted).") + message_admins("[ADMIN_TPMONTY(usr)] deleted all objects of type[strict ? "" : " and subtypes"] of [O_type] ([i] objects deleted).") + + if(href_list[VV_HK_UPDATE_ICONS]) + if(!check_rights(R_DEBUG)) + return + update_icon() + log_admin("[key_name(usr)] updated the icon of [src].") + + if(href_list[VV_HK_EDIT_PARTICLES]) + if(!check_rights(R_VAREDIT)) + return + var/client/C = usr.client + C?.open_particle_editor(src) /atom/movable/proc/get_language_holder(shadow = TRUE) if(language_holder) @@ -1086,10 +1208,7 @@ RU TGMC EDIT */ grab_state = newstate ///Toggles AM between throwing states -/atom/movable/proc/set_throwing(new_throwing, flying) - if(new_throwing == throwing) - return - . = throwing +/atom/movable/proc/set_throwing(new_throwing) throwing = new_throwing if(throwing) pass_flags |= PASS_THROW diff --git a/code/game/blood.dm b/code/game/blood.dm index 70c4ffd411fe8..4b61630d9e35e 100644 --- a/code/game/blood.dm +++ b/code/game/blood.dm @@ -27,7 +27,7 @@ /obj/add_blood(b_color) - if(flags_atom & NOBLOODY) + if(atom_flags & NOBLOODY) return FALSE if(b_color) blood_color = b_color @@ -145,24 +145,24 @@ var/washears = TRUE var/washglasses = TRUE if(wear_suit) - washgloves = !(wear_suit.flags_inv_hide & HIDEGLOVES) - washshoes = !(wear_suit.flags_inv_hide & HIDESHOES) + washgloves = !(wear_suit.inv_hide_flags & HIDEGLOVES) + washshoes = !(wear_suit.inv_hide_flags & HIDESHOES) if(wear_suit.clean_blood()) update_inv_wear_suit() else if(w_uniform) if(w_uniform.clean_blood()) update_inv_w_uniform() if(head) - washmask = !(head.flags_inv_hide & HIDEMASK) - washglasses = !(head.flags_inv_hide & HIDEEYES) - washears = !(head.flags_inv_hide & HIDEEARS) + washmask = !(head.inv_hide_flags & HIDEMASK) + washglasses = !(head.inv_hide_flags & HIDEEYES) + washears = !(head.inv_hide_flags & HIDEEARS) if(head.clean_blood()) update_inv_head() if(wear_mask) if(washears) - washears = !(wear_mask.flags_inv_hide & HIDEEARS) + washears = !(wear_mask.inv_hide_flags & HIDEEARS) if(washglasses) - washglasses = !(wear_mask.flags_inv_hide & HIDEEYES) + washglasses = !(wear_mask.inv_hide_flags & HIDEEYES) if(washmask && wear_mask.clean_blood()) update_inv_wear_mask() if(gloves && washgloves) diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm index 6927da95a7ed9..723ea4be388e0 100644 --- a/code/game/data_huds.dm +++ b/code/game/data_huds.dm @@ -108,6 +108,14 @@ /mob/living/carbon/xenomorph/med_hud_set_health() + if(hud_used?.healths) + var/bucket + if(stat == DEAD) + bucket = "critical" + else + bucket = get_bucket(XENO_HUD_ICON_BUCKETS, maxHealth, health, get_crit_threshold(), list("full", "critical")) + hud_used.healths.icon_state = "health[bucket]" + var/image/holder = hud_list[HEALTH_HUD_XENO] if(!holder) return @@ -176,7 +184,6 @@ /mob/living/carbon/xenomorph/med_hud_set_status() - hud_set_plasma() hud_set_pheromone() @@ -262,14 +269,19 @@ simple_status_hud.icon_state = "" if(stat != DEAD) status_hud.icon_state = "hudsynth" + else if(HAS_TRAIT(src, TRAIT_UNDEFIBBABLE)) + status_hud.icon_state = "hudsynthdnr" + return TRUE else - if(!client) - var/mob/dead/observer/G = get_ghost(FALSE, TRUE) + if(!mind) + var/mob/dead/observer/G = get_ghost(TRUE) if(!G) status_hud.icon_state = "hudsynthdnr" else status_hud.icon_state = "hudsynthdead" - return + else + status_hud.icon_state = "hudsynthdead" + return TRUE infection_hud.icon_state = "hudsynth" //Xenos can feel synths are not human. return TRUE @@ -306,8 +318,8 @@ hud_list[HEART_STATUS_HUD].icon_state = "still_heart" status_hud.icon_state = "huddead" return TRUE - if(!client) - var/mob/dead/observer/ghost = get_ghost() + if(!mind) + var/mob/dead/observer/ghost = get_ghost(TRUE) if(!ghost?.can_reenter_corpse) status_hud.icon_state = "huddead" return TRUE @@ -401,7 +413,6 @@ return TRUE */ - //infection status that appears on humans and monkeys, viewed by xenos only. /datum/atom_hud/xeno_infection hud_icons = list(XENO_EMBRYO_HUD) @@ -466,8 +477,16 @@ /mob/living/carbon/xenomorph/proc/hud_set_plasma() - if(!xeno_caste) // usually happens because hud ticks before New() finishes. + if(!xeno_caste) //this is cringe that we need this but currently its called before caste is set on init return + if(hud_used?.alien_plasma_display) + var/bucket + if(stat == DEAD) + bucket = "empty" + else + bucket = get_bucket(XENO_HUD_ICON_BUCKETS, xeno_caste.plasma_max, plasma_stored, 0, list("full", "empty")) + hud_used.alien_plasma_display.icon_state = "power_display_[bucket]" + var/image/holder = hud_list[PLASMA_HUD] if(!holder) return @@ -518,7 +537,7 @@ if(hive?.living_xeno_queen) if(hive.living_xeno_queen.observed_xeno == src) holder.icon_state = "queen_overwatch" - if(queen_chosen_lead) + if(xeno_flags & XENO_LEADER) var/image/I = image('modular_RUtgmc/icons/mob/hud.dmi',src, "hudxenoleader") //RUTGMC EDIT .dmi holder.overlays += I hud_list[QUEEN_OVERWATCH_HUD] = holder diff --git a/code/game/objects/effects/acid_hole.dm b/code/game/objects/effects/acid_hole.dm index 8689ce2f83248..4c14af8cfd327 100644 --- a/code/game/objects/effects/acid_hole.dm +++ b/code/game/objects/effects/acid_hole.dm @@ -50,7 +50,7 @@ use_wall_hole(user) -/obj/effect/acid_hole/specialclick(mob/living/carbon/user) +/obj/effect/acid_hole/CtrlClick(mob/living/carbon/user) if(!isxeno(user)) return if(!user.CanReach(src)) @@ -125,6 +125,8 @@ //Throwing Shiet /obj/effect/acid_hole/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return var/mob_dir = get_dir(user, src) var/crawl_dir = dir & mob_dir diff --git a/code/game/objects/effects/countdown.dm b/code/game/objects/effects/countdown.dm index 9067443aeaf8d..7faaa75f4d8c1 100644 --- a/code/game/objects/effects/countdown.dm +++ b/code/game/objects/effects/countdown.dm @@ -86,5 +86,52 @@ /obj/effect/countdown/campaign_objective/get_value() if(QDELETED(attached_to)) return - var/obj/structure/campaign_objective/capture_objective/objective = attached_to + var/obj/structure/campaign_objective/objective = attached_to return objective.get_time_left() + +/obj/effect/countdown/action_cooldown + name = "cooldown" + color = "#d1d1d1" + invisibility = SEE_INVISIBLE_LIVING + mouse_opacity = MOUSE_OPACITY_TRANSPARENT + layer = ABOVE_HUD_LAYER + plane = HUD_PLANE + pixel_x = 5 + pixel_y = 8 + appearance_flags = KEEP_APART|RESET_COLOR + ///The action this countdown is associated with + var/datum/action/ability/attached_action + +/obj/effect/countdown/action_cooldown/Destroy() + attached_action = null + return ..() + +/obj/effect/countdown/action_cooldown/attach(atom/A) + var/atom/movable/screen/action_button/button = A + if(!istype(button)) + qdel(src) + return + attached_to = button + button.vis_contents += src + attached_action = button.source_action + +/obj/effect/countdown/action_cooldown/start() + if(!started) + START_PROCESSING(SSfastprocess, src) + started = TRUE + +/obj/effect/countdown/action_cooldown/process() + if(QDELETED(attached_to)) + qdel(src) + return + var/new_val = round(attached_action.cooldown_remaining(), 0.1) + if(new_val == displayed_text) + return + if(new_val >= 10) //avoid cropping, and deciseconds don't really matter if you're 10+ seconds away + new_val = floor(new_val) + displayed_text = new_val + + if(displayed_text) + maptext = "[displayed_text]" + else + maptext = null diff --git a/code/game/objects/effects/decals/Cleanable/aliens.dm b/code/game/objects/effects/decals/Cleanable/aliens.dm index b5af9a359fdf3..4fe964eb2a049 100644 --- a/code/game/objects/effects/decals/Cleanable/aliens.dm +++ b/code/game/objects/effects/decals/Cleanable/aliens.dm @@ -16,9 +16,6 @@ basecolor = "#dffc00" amount = 0 -/obj/effect/decal/cleanable/blood/gibs/xeno/update_icon() - color = "#FFFFFF" - /obj/effect/decal/cleanable/blood/gibs/xeno/up random_icon_states = list("xgib1", "xgib2", "xgib3", "xgib4", "xgib5", "xgib6","xgibup1","xgibup1","xgibup1") diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index e9a20b8767350..322fc0fecf9ea 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -46,9 +46,8 @@ deltimer(drying_timer) return ..() - -/obj/effect/decal/cleanable/blood/update_icon() - if(basecolor == "rainbow") basecolor = "#[pick(list("FF0000","FF7F00","FFFF00","00FF00","0000FF","4B0082","8F00FF"))]" +/obj/effect/decal/cleanable/blood/update_icon_state() + . = ..() color = basecolor /obj/effect/decal/cleanable/blood/proc/on_cross(datum/source, mob/living/carbon/human/perp, oldloc, oldlocs) @@ -74,9 +73,6 @@ else if (hasfeet)//Or feet perp.feet_blood_color = basecolor perp.track_blood = max(amount,perp.track_blood) - else if (perp.buckled && istype(perp.buckled, /obj/structure/bed/chair/wheelchair)) - var/obj/structure/bed/chair/wheelchair/W = perp.buckled - W.bloodiness = 4 perp.update_inv_shoes(1) amount-- @@ -171,20 +167,22 @@ random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6") var/fleshcolor = "#FFC896" -/obj/effect/decal/cleanable/blood/gibs/update_icon() - - var/image/giblets = new(base_icon, "[icon_state]_flesh", dir) - if(!fleshcolor || fleshcolor == "rainbow") +/obj/effect/decal/cleanable/blood/gibs/update_icon_state() + . = ..() + if(!fleshcolor) fleshcolor = "#[pick(list("FF0000","FF7F00","FFFF00","00FF00","0000FF","4B0082","8F00FF"))]" - giblets.color = fleshcolor - var/icon/blood = new(base_icon,"[icon_state]",dir) - if(basecolor == "rainbow") basecolor = "#[pick(list("FF0000","FF7F00","FFFF00","00FF00","0000FF","4B0082","8F00FF"))]" - blood.Blend(basecolor,ICON_MULTIPLY) + if(basecolor == "rainbow") + basecolor = "#[pick(list("FF0000","FF7F00","FFFF00","00FF00","0000FF","4B0082","8F00FF"))]" + blood.Blend(basecolor, ICON_MULTIPLY) icon = blood - overlays.Cut() - overlays += giblets + +/obj/effect/decal/cleanable/blood/gibs/update_overlays() + . = ..() + var/image/giblets = new(base_icon, "[icon_state]_flesh", dir) + giblets.color = fleshcolor + . += giblets /obj/effect/decal/cleanable/blood/gibs/up random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6","gibup1","gibup1","gibup1") diff --git a/code/game/objects/effects/decals/Cleanable/robots.dm b/code/game/objects/effects/decals/Cleanable/robots.dm index d2a1b539f7870..1f8fa7aafd19e 100644 --- a/code/game/objects/effects/decals/Cleanable/robots.dm +++ b/code/game/objects/effects/decals/Cleanable/robots.dm @@ -6,9 +6,6 @@ basecolor="#030303" random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7") -/obj/effect/decal/cleanable/blood/gibs/robot/update_icon() - color = "#FFFFFF" - /obj/effect/decal/cleanable/blood/gibs/robot/dry() //pieces of robots do not dry up like return diff --git a/code/game/objects/effects/decals/Cleanable/tracks.dm b/code/game/objects/effects/decals/Cleanable/tracks.dm index 624fbcf6a50c6..5f71d971b94b7 100644 --- a/code/game/objects/effects/decals/Cleanable/tracks.dm +++ b/code/game/objects/effects/decals/Cleanable/tracks.dm @@ -116,9 +116,8 @@ if(updated) update_icon() -/obj/effect/decal/cleanable/blood/tracks/update_icon() - overlays.Cut() - color = "#FFFFFF" +/obj/effect/decal/cleanable/blood/tracks/update_overlays() + . = ..() var/truedir=0 // Update ONLY the overlays that have changed. @@ -131,14 +130,14 @@ truedir=truedir>>4 if(track.overlay) - track.overlay=null + track.overlay=null //todo, not handling track overlays properly. fuck this shitcode. var/image/I = image(icon, icon_state=state, dir=num2dir(truedir)) I.color = track.basecolor track.fresh=0 track.overlay=I stack[stack_idx]=track - overlays += I + . += I updatedtracks=0 // Clear our memory of updated tracks. /obj/effect/decal/cleanable/blood/tracks/footprints diff --git a/code/game/objects/effects/decals/contraband.dm b/code/game/objects/effects/decals/contraband.dm index 7e83d8f29c85a..65f9d965f07f1 100644 --- a/code/game/objects/effects/decals/contraband.dm +++ b/code/game/objects/effects/decals/contraband.dm @@ -36,6 +36,7 @@ /obj/structure/sign/poster/Initialize(mapload) . = ..() + icon = 'icons/obj/contraband.dmi' switch(dir) if(NORTH) pixel_y = 30 @@ -62,6 +63,8 @@ /obj/structure/sign/poster/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(iswirecutter(I)) playsound(loc, 'sound/items/wirecutter.ogg', 25, 1) if(ruined) diff --git a/code/game/objects/effects/effect.dm b/code/game/objects/effects/effect.dm index b650a43e53d70..092224cb4ed06 100644 --- a/code/game/objects/effects/effect.dm +++ b/code/game/objects/effects/effect.dm @@ -5,3 +5,6 @@ /obj/effect/add_debris_element() //they're not hittable, and prevents recursions return + +/obj/effect/grab_interact(obj/item/grab/grab, mob/user, base_damage = BASE_OBJ_SLAM_DAMAGE, is_sharp = FALSE) + return diff --git a/code/game/objects/effects/effect_system/smoke.dm b/code/game/objects/effects/effect_system/smoke.dm index 8e20164c335b5..8b153fb590a7e 100644 --- a/code/game/objects/effects/effect_system/smoke.dm +++ b/code/game/objects/effects/effect_system/smoke.dm @@ -13,13 +13,19 @@ pass_flags = PASS_AIR resistance_flags = UNACIDABLE|PLASMACUTTER_IMMUNE|PROJECTILE_IMMUNE|CRUSHER_IMMUNE var/amount = 3 + ///Duration in 2 second ticks var/lifetime = 5 ///time in decisecond for a smoke to spread one tile. var/expansion_speed = 1 + ///Special effect traits var/smoke_traits = NONE - var/strength = 1 // Effects scale with the emitter's bomb_strength upgrades. - var/bio_protection = 1 // how unefficient its effects are against protected target from 0 to 1. - var/datum/effect_system/smoke_spread/cloud // for associated chemical smokes. + ///Smoke effect strength mult + var/strength = 1 + ///Effect strength mult against bio protection + var/bio_protection = 1 + ///for associated chemical smoke + var/datum/effect_system/smoke_spread/cloud + ///Fraction used for chem touch effects var/fraction = 0.2 ///Delay in ticks before this smoke can affect a given mob again, applied in living's effect_smoke var/minimum_effect_delay = 1 SECONDS @@ -189,8 +195,11 @@ ///////////////////////////////////////////// /datum/effect_system/smoke_spread + ///Smoke range var/range = 3 + ///Type of smoke var/smoke_type = /obj/effect/particle_effect/smoke + ///Smoke duration in 2 sec ticks var/lifetime var/list/smokes var/list/smoked_mobs @@ -276,6 +285,23 @@ color = "#791697" smoke_traits = SMOKE_PLASMALOSS +/obj/effect/particle_effect/smoke/plasmaloss/effect_smoke(obj/effect/particle_effect/smoke/S) + . = ..() + if(!.) + return + if(S.smoke_traits & SMOKE_PURGER) + lifetime -= 4 + +////////////////////////////////////// +// ANTIGAS SMOKE +//////////////////////////////////// + +/obj/effect/particle_effect/smoke/antigas + alpha = 65 + opacity = FALSE + color = "#1b1b1b" + smoke_traits = SMOKE_PURGER + ////////////////////////////////////// // FLASHBANG SMOKE //////////////////////////////////// @@ -295,6 +321,13 @@ strength = 1.5 smoke_traits = SMOKE_SATRAPINE|SMOKE_GASP|SMOKE_COUGH +/obj/effect/particle_effect/smoke/satrapine/effect_smoke(obj/effect/particle_effect/smoke/S) + . = ..() + if(!.) + return + if(S.smoke_traits & SMOKE_PURGER) + lifetime -= 4 + ///////////////////////////////////////// // BOILER SMOKES ///////////////////////////////////////// @@ -311,40 +344,50 @@ return if(S.smoke_traits & SMOKE_PLASMALOSS) lifetime -= 2 + if(S.smoke_traits & SMOKE_PURGER) + lifetime -= 4 //Xeno acid smoke. /obj/effect/particle_effect/smoke/xeno/burn lifetime = 6 + alpha = 120 + opacity = FALSE color = "#86B028" //Mostly green? - smoke_traits = SMOKE_XENO|SMOKE_XENO_ACID|SMOKE_GASP|SMOKE_COUGH|SMOKE_HUGGER_PACIFY + smoke_traits = SMOKE_XENO|SMOKE_XENO_ACID|SMOKE_GASP|SMOKE_COUGH + +//Used for smokebomb nades. +/obj/effect/particle_effect/smoke/xeno/burn/opaque + alpha = 255 + opacity = TRUE //Xeno light acid smoke.for acid huggers /obj/effect/particle_effect/smoke/xeno/burn/light lifetime = 4 //Lasts for less time - alpha = 60 - opacity = FALSE - smoke_traits = SMOKE_XENO|SMOKE_XENO_ACID|SMOKE_GASP|SMOKE_COUGH //Xeno neurotox smoke. /obj/effect/particle_effect/smoke/xeno/neuro + alpha = 120 + opacity = FALSE color = "#ffbf58" //Mustard orange? - smoke_traits = SMOKE_XENO|SMOKE_XENO_NEURO|SMOKE_GASP|SMOKE_COUGH|SMOKE_EXTINGUISH|SMOKE_HUGGER_PACIFY + smoke_traits = SMOKE_XENO|SMOKE_XENO_NEURO|SMOKE_GASP|SMOKE_COUGH|SMOKE_EXTINGUISH ///Xeno neurotox smoke for Defilers; doesn't extinguish /obj/effect/particle_effect/smoke/xeno/neuro/medium + alpha = 255 + opacity = TRUE color = "#ffbf58" //Mustard orange? smoke_traits = SMOKE_XENO|SMOKE_XENO_NEURO|SMOKE_GASP|SMOKE_COUGH|SMOKE_HUGGER_PACIFY ///Xeno neurotox smoke for neurospit; doesn't extinguish or blind /obj/effect/particle_effect/smoke/xeno/neuro/light - alpha = 60 - opacity = FALSE smoke_traits = SMOKE_XENO|SMOKE_XENO_NEURO|SMOKE_GASP|SMOKE_COUGH|SMOKE_NEURO_LIGHT //Light neuro smoke doesn't extinguish /obj/effect/particle_effect/smoke/xeno/toxic lifetime = 2 + alpha = 60 + opacity = FALSE color = "#00B22C" - smoke_traits = SMOKE_XENO|SMOKE_XENO_TOXIC|SMOKE_GASP|SMOKE_COUGH|SMOKE_EXTINGUISH|SMOKE_HUGGER_PACIFY + smoke_traits = SMOKE_XENO|SMOKE_XENO_TOXIC|SMOKE_GASP|SMOKE_COUGH|SMOKE_EXTINGUISH /obj/effect/particle_effect/smoke/xeno/hemodile color = "#0287A1" @@ -389,6 +432,9 @@ /datum/effect_system/smoke_spread/satrapine smoke_type = /obj/effect/particle_effect/smoke/satrapine +/datum/effect_system/smoke_spread/antigas + smoke_type = /obj/effect/particle_effect/smoke/antigas + /datum/effect_system/smoke_spread/xeno smoke_type = /obj/effect/particle_effect/smoke/xeno var/strength = 1 @@ -404,6 +450,9 @@ /datum/effect_system/smoke_spread/xeno/acid smoke_type = /obj/effect/particle_effect/smoke/xeno/burn +/datum/effect_system/smoke_spread/xeno/acid/opaque + smoke_type = /obj/effect/particle_effect/smoke/xeno/burn/opaque + /datum/effect_system/smoke_spread/xeno/acid/light smoke_type = /obj/effect/particle_effect/smoke/xeno/burn/light diff --git a/code/game/objects/effects/landmarks/corpsespawner.dm b/code/game/objects/effects/landmarks/corpsespawner.dm index 245a912239bdf..c14526e6e5b37 100644 --- a/code/game/objects/effects/landmarks/corpsespawner.dm +++ b/code/game/objects/effects/landmarks/corpsespawner.dm @@ -34,7 +34,7 @@ var/corpsepocket2 = null var/corpseback = null var/corpseid = 0 //Just set to 1 if you want them to have an ID - var/corpseidjob = null // Needs to be in quotes, such as "Clown" or "Chef." This just determines what the ID reads as, not their access + var/corpseidjob = null //Needs to be in quotes, such as "Clown" or "Chef." This just determines what the ID reads as, not their access var/corpseidaccess = null //This is for access. See access.dm for which jobs give what access. Use CAPTAIN if you want it to be all access. var/corpseidicon = null //For setting it to be a gold, silver, centcom etc ID @@ -259,7 +259,7 @@ /obj/effect/landmark/corpsespawner/chef name = "Chef" corpseuniform = /obj/item/clothing/under/rank/chef - corpsesuit = /obj/item/clothing/suit/chef/classic + corpsesuit = /obj/item/clothing/suit/storage/chef/classic corpseshoes = /obj/item/clothing/shoes/black corpsehelmet = /obj/item/clothing/head/chefhat corpseback = /obj/item/storage/backpack diff --git a/code/game/objects/effects/landmarks/excavation_site_spawner.dm b/code/game/objects/effects/landmarks/excavation_site_spawner.dm index 300a60c4f5539..8fc61db071c8a 100644 --- a/code/game/objects/effects/landmarks/excavation_site_spawner.dm +++ b/code/game/objects/effects/landmarks/excavation_site_spawner.dm @@ -52,5 +52,5 @@ rewards_max = 4 map_icon = "excav_xeno" rewards = list( - /obj/item/research_resource/xeno/tier_one, + /obj/item/research_resource/xeno, ) diff --git a/code/game/objects/effects/landmarks/itemspawner.dm b/code/game/objects/effects/landmarks/itemspawner.dm index e555b97efa20f..4aa8ee1782386 100644 --- a/code/game/objects/effects/landmarks/itemspawner.dm +++ b/code/game/objects/effects/landmarks/itemspawner.dm @@ -87,7 +87,7 @@ /obj/effect/landmark/itemspawner/waiter items_to_spawn = list(\ /obj/item/clothing/under/waiter,\ - /obj/item/clothing/suit/apron) + /obj/item/clothing/suit/storage/apron) /obj/effect/landmark/itemspawner/pirate diff --git a/code/game/objects/effects/landmarks/landmarks.dm b/code/game/objects/effects/landmarks/landmarks.dm index a9a5ed498c97c..63136df51e9ab 100644 --- a/code/game/objects/effects/landmarks/landmarks.dm +++ b/code/game/objects/effects/landmarks/landmarks.dm @@ -171,7 +171,7 @@ /obj/effect/landmark/resin_jelly_pod name = "xeno jelly pod landmark" - icon = 'icons/Xeno/resinpod.dmi' + icon = 'icons/Xeno/resin_pod.dmi' icon_state = "resinpod" /obj/effect/landmark/resin_jelly_pod/Initialize(mapload) @@ -422,7 +422,7 @@ /obj/item/weapon/gun/minigun, /obj/item/weapon/gun/grenade_launcher/multinade_launcher, /obj/item/weapon/gun/energy/lasgun/pulse, - /obj/item/weapon/gun/tl102/death, // memes + /obj/item/weapon/gun/hsg_102/death, // memes ) /obj/effect/landmark/weapon_spawn/tier6_weapon_spawn @@ -436,7 +436,7 @@ /obj/effect/landmark/sensor_tower name = "Sensor tower" icon = 'icons/obj/structures/sensor.dmi' - icon_state = "sensor_loyalist" + icon_state = "sensor" /obj/effect/landmark/sensor_tower/Initialize(mapload) ..() @@ -477,7 +477,7 @@ . = ..() //adds the exit points to the glob, and the start points link to them in lateinit GLOB.patrol_point_list += src - if(!(SSticker?.mode?.flags_round_type & MODE_TWO_HUMAN_FACTIONS)) + if(!(SSticker?.mode?.round_type_flags & MODE_TWO_HUMAN_FACTIONS)) return SSminimaps.add_marker(src, GLOB.faction_to_minimap_flag[faction], image('icons/UI_icons/map_blips.dmi', null, minimap_icon)) diff --git a/code/game/objects/effects/landmarks/marine_spawns.dm b/code/game/objects/effects/landmarks/marine_spawns.dm index 4da10a96c4717..b25d11fe01904 100644 --- a/code/game/objects/effects/landmarks/marine_spawns.dm +++ b/code/game/objects/effects/landmarks/marine_spawns.dm @@ -34,6 +34,10 @@ icon_state = "PO" job = /datum/job/terragov/command/pilot +/obj/effect/landmark/start/job/transportofficer + icon_state = "TO" + job = /datum/job/terragov/command/transportofficer + /obj/effect/landmark/start/job/chiefshipengineer icon_state = "CSE" job = /datum/job/terragov/engineering/chief @@ -46,6 +50,14 @@ icon_state = "MP" job = /datum/job/terragov/command/mech_pilot +/obj/effect/landmark/start/job/assault_crewman + icon_state = "AC" + job = /datum/job/terragov/command/assault_crewman + +/obj/effect/landmark/start/job/transport_crewman + icon_state = "TC" + job = /datum/job/terragov/command/transport_crewman + /obj/effect/landmark/start/job/shiptech icon_state = "SE" job = /datum/job/terragov/engineering/tech diff --git a/code/game/objects/effects/landmarks/mode.dm b/code/game/objects/effects/landmarks/mode.dm index f6b7831b42e6b..7171ffaa43511 100644 --- a/code/game/objects/effects/landmarks/mode.dm +++ b/code/game/objects/effects/landmarks/mode.dm @@ -9,7 +9,7 @@ /obj/effect/landmark/lv624/fog_blocker/Initialize(mapload) . = ..() store_location() - flags_atom |= INITIALIZED + atom_flags |= INITIALIZED return INITIALIZE_HINT_QDEL /obj/effect/landmark/lv624/fog_blocker/proc/store_location() diff --git a/code/game/objects/effects/misc.dm b/code/game/objects/effects/misc.dm index 0e4845379a5b1..71530bb0f9724 100644 --- a/code/game/objects/effects/misc.dm +++ b/code/game/objects/effects/misc.dm @@ -93,8 +93,8 @@ return TRUE -/obj/effect/forcefield/fog/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) - return attack_hand(X) +/obj/effect/forcefield/fog/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) + return attack_hand(xeno_attacker) /obj/effect/forcefield/fog/attack_animal(M) diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm index 6ebd589ba19f0..cfb06dbc71570 100644 --- a/code/game/objects/effects/overlays.dm +++ b/code/game/objects/effects/overlays.dm @@ -105,6 +105,23 @@ /obj/effect/overlay/blinking_laser/napalm icon_state = "napalm_target" +/obj/effect/overlay/blinking_laser/monarch + icon_state = "monarch_target" + +/obj/effect/overlay/blinking_laser/swansong + icon_state = "swansong_target" + +// Bombs, then bomblets + +/obj/effect/overlay/blinking_laser/bomb + icon_state = "bomb_target" + +/obj/effect/overlay/blinking_laser/bomb_fat + icon_state = "fat_bomb_target" + +/obj/effect/overlay/blinking_laser/bomblet + icon_state = "bomblet_target" + //Marine-only visuals. Prediction HUD, etc. Does not show without marine headset /obj/effect/overlay/blinking_laser/marine name = "prediction matrix" @@ -373,3 +390,12 @@ icon_state = "spooky" pixel_x = 16 pixel_y = 16 + +/obj/effect/overlay/vis + mouse_opacity = MOUSE_OPACITY_TRANSPARENT + anchored = TRUE + vis_flags = VIS_INHERIT_DIR + /// When detected to be unused it gets set to world.time, after a while it gets removed + var/unused = 0 + /// Overlays which go unused for 2 minutes get cleaned up + var/cache_expiration = 2 MINUTES diff --git a/code/game/objects/effects/spawners/modularmappingspawner.dm b/code/game/objects/effects/spawners/modularmappingspawner.dm index 51b6010aa3091..565c56e0f9ba6 100644 --- a/code/game/objects/effects/spawners/modularmappingspawner.dm +++ b/code/game/objects/effects/spawners/modularmappingspawner.dm @@ -240,3 +240,29 @@ mapid = "EORG" spawner_height = 46 spawner_width = 46 + +/**********Jungle Outpost*******/ +/obj/effect/spawner/modularmap/jungle_outpost/westtower + mapid = "jowesttower" + spawner_width = 12 + spawner_height = 14 + +/obj/effect/spawner/modularmap/jungle_outpost/southcrates + mapid = "josouthcrates" + spawner_width = 12 + spawner_height = 14 + +/obj/effect/spawner/modularmap/jungle_outpost/hydroponics + mapid = "johydroponics" + spawner_width = 19 + spawner_height = 18 + +/obj/effect/spawner/modularmap/jungle_outpost/medbay + mapid = "jomedbay" + spawner_width = 16 + spawner_height = 24 + +/obj/effect/spawner/modularmap/jungle_outpost/engineering + mapid = "joengineering" + spawner_width = 21 + spawner_height = 21 diff --git a/code/game/objects/effects/spawners/random/clothing.dm b/code/game/objects/effects/spawners/random/clothing.dm index 6dec381cb74ab..69564dfbc9835 100644 --- a/code/game/objects/effects/spawners/random/clothing.dm +++ b/code/game/objects/effects/spawners/random/clothing.dm @@ -12,7 +12,7 @@ icon_state = "random_clothes" loot = list( /obj/item/clothing/suit/bio_suit, - /obj/item/clothing/suit/bomber, + /obj/item/clothing/suit/storage/bomber, /obj/item/clothing/suit/ianshirt, /obj/item/clothing/suit/radiation, /obj/item/clothing/suit/space, diff --git a/code/game/objects/effects/spawners/random/engineering.dm b/code/game/objects/effects/spawners/random/engineering.dm index 0c095d960dea5..e77c3daee2d94 100644 --- a/code/game/objects/effects/spawners/random/engineering.dm +++ b/code/game/objects/effects/spawners/random/engineering.dm @@ -20,8 +20,7 @@ /obj/effect/spawner/random/engineering/technology_scanner name = "Random Scanner" - icon = 'icons/obj/items/items.dmi' - icon_state = "atmos" + icon_state = "random_scanner" loot = list( /obj/item/t_scanner = 4, /obj/item/radio = 2, @@ -204,8 +203,8 @@ icon_state = "random_glass" spawn_loot_chance = 90 loot = list( - /obj/item/stack/sheet/glass = 25, - /obj/item/stack/sheet/glass/large_stack = 1, + /obj/item/stack/sheet/glass/glass = 25, + /obj/item/stack/sheet/glass/glass/large_stack = 1, ) /obj/effect/spawner/random/engineering/insulatedgloves diff --git a/code/game/objects/effects/spawners/random/food_or_drink.dm b/code/game/objects/effects/spawners/random/food_or_drink.dm index ce720e684ca68..3df1e31df6612 100644 --- a/code/game/objects/effects/spawners/random/food_or_drink.dm +++ b/code/game/objects/effects/spawners/random/food_or_drink.dm @@ -112,7 +112,7 @@ loot = list( /obj/item/reagent_containers/food/snacks/wrapped/booniebars = 26, /obj/item/reagent_containers/food/snacks/wrapped/chunk = 26, - /obj/item/reagent_containers/food/snacks/wrapped/barcardine = 26, + /obj/item/reagent_containers/food/snacks/wrapped/barcaridine = 26, /obj/item/reagent_containers/food/snacks/wrapped/proteinbar = 12, /obj/item/reagent_containers/food/snacks/candy = 5, /obj/item/reagent_containers/food/snacks/enrg_bar = 5, @@ -126,7 +126,7 @@ /obj/item/reagent_containers/food/snacks/wrapped/proteinbar = 10, /obj/item/reagent_containers/food/snacks/wrapped/booniebars = 5, /obj/item/reagent_containers/food/snacks/wrapped/chunk = 5, - /obj/item/reagent_containers/food/snacks/wrapped/barcardine = 5, + /obj/item/reagent_containers/food/snacks/wrapped/barcaridine = 5, ) /obj/effect/spawner/random/food_or_drink/cheesewedge @@ -257,7 +257,7 @@ /obj/item/reagent_containers/food/snacks/sosjerky, /obj/item/reagent_containers/food/snacks/donkpocket, /obj/item/reagent_containers/food/snacks/wrapped/booniebars, - /obj/item/reagent_containers/food/snacks/wrapped/barcardine, + /obj/item/reagent_containers/food/snacks/wrapped/barcaridine, /obj/item/reagent_containers/food/snacks/wrapped/chunk, /obj/item/reagent_containers/food/snacks/lollipop, /obj/item/reagent_containers/food/snacks/pastries/appletart, diff --git a/code/game/objects/effects/spawners/random/misc_item.dm b/code/game/objects/effects/spawners/random/misc_item.dm index d92513cf1a4fd..de1151e3ceab2 100644 --- a/code/game/objects/effects/spawners/random/misc_item.dm +++ b/code/game/objects/effects/spawners/random/misc_item.dm @@ -259,7 +259,7 @@ /obj/item/trash/tgmc_tray, /obj/item/trash/boonie, /obj/item/trash/chunk, - /obj/item/trash/barcardine, + /obj/item/trash/barcaridine, /obj/item/trash/mre, /obj/item/trash/berrybar, ) diff --git a/code/game/objects/effects/temporary_visuals/explosions.dm b/code/game/objects/effects/temporary_visuals/explosions.dm index 6ca16156905c3..175a2f14c940a 100644 --- a/code/game/objects/effects/temporary_visuals/explosions.dm +++ b/code/game/objects/effects/temporary_visuals/explosions.dm @@ -323,3 +323,63 @@ QDEL_NULL(falling_debris) QDEL_NULL(dirt_kickup) return ..() + +/obj/effect/temp_visual/rappel_dust + duration = 25 + ///smoke wave particle holder + var/obj/effect/abstract/particle_holder/smoke_wave + ///debris dirt kickup particle holder + var/obj/effect/abstract/particle_holder/dirt_kickup + ///falling debris particle holder + var/obj/effect/abstract/particle_holder/falling_debris + ///large dirt kickup particle holder + var/obj/effect/abstract/particle_holder/large_kickup + +/obj/effect/temp_visual/rappel_dust/Initialize(mapload, radius, small = FALSE, large = FALSE) + . = ..() + var/turf/turf_type = get_turf(src) + if(iswater(turf_type)) + smoke_wave = new(src, /particles/wave_water) + dirt_kickup = new(src, /particles/water_splash) + falling_debris = new(src, /particles/water_falling) + large_kickup = new(src, /particles/water_splash_large) + else + if(small) + smoke_wave = new(src, /particles/smoke_wave/small) + else + smoke_wave = new(src, /particles/smoke_wave) + + dirt_kickup = new(src, /particles/dirt_kickup) + if(small) + falling_debris = new(src, /particles/falling_debris/small) + else + falling_debris = new(src, /particles/falling_debris) + + if(large) + large_kickup = new(src, /particles/dirt_kickup_large/deva) + else + large_kickup = new(src, /particles/dirt_kickup_large) + + if(large) + smoke_wave.particles.velocity = generator(GEN_CIRCLE, 6 * radius, 6 * radius) + else if(small) + smoke_wave.particles.velocity = generator(GEN_CIRCLE, 3 * radius, 3 * radius) + else + smoke_wave.particles.velocity = generator(GEN_CIRCLE, 5 * radius, 5 * radius) + addtimer(CALLBACK(src, PROC_REF(set_count_short)), 5) + addtimer(CALLBACK(src, PROC_REF(set_count_long)), 10) + +/obj/effect/temp_visual/rappel_dust/proc/set_count_short() + smoke_wave.particles.count = 0 + large_kickup.particles.count = 0 + falling_debris.particles.count = 0 + +/obj/effect/temp_visual/rappel_dust/proc/set_count_long() + dirt_kickup.particles.count = 0 + +/obj/effect/temp_visual/rappel_dust/Destroy() + QDEL_NULL(smoke_wave) + QDEL_NULL(large_kickup) + QDEL_NULL(falling_debris) + QDEL_NULL(dirt_kickup) + return ..() diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm index 67db013e29dc1..78d19c0d857d9 100644 --- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm +++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm @@ -114,14 +114,21 @@ GLOBAL_LIST_EMPTY(blood_particles) opacity = FALSE anchored = FALSE animate_movement = SLIDE_STEPS + randomdir = FALSE + vis_flags = VIS_INHERIT_LAYER | VIS_INHERIT_PLANE | VIS_INHERIT_ID /obj/effect/temp_visual/xenomorph/afterimage/Initialize(mapload, atom/owner) . = ..() - appearance = owner.appearance - setDir(owner.dir) - alpha = initial(alpha) - layer = initial(layer) - mouse_opacity = MOUSE_OPACITY_TRANSPARENT + var/mutable_appearance/xeno_afterimage = new() + xeno_afterimage.appearance = owner.appearance + xeno_afterimage.render_target = null + xeno_afterimage.density = initial(density) + xeno_afterimage.alpha = initial(alpha) + xeno_afterimage.appearance_flags = RESET_COLOR|RESET_ALPHA|PASS_MOUSE + xeno_afterimage.setDir(owner.dir) + xeno_afterimage.pixel_x = owner.pixel_x + xeno_afterimage.pixel_y = owner.pixel_y + appearance = xeno_afterimage animate(src, alpha = 0, time = duration) /obj/effect/temp_visual/ob_impact @@ -168,7 +175,7 @@ GLOBAL_LIST_EMPTY(blood_particles) var/marker_flags = GLOB.faction_to_minimap_flag[faction] if(marker_flags) - SSminimaps.add_marker(src, marker_flags, image('modular_RUtgmc/icons/UI_icons/map_blips_large.dmi', null, icon_state_on, VERY_HIGH_FLOAT_LAYER)) + SSminimaps.add_marker(src, marker_flags, image('modular_RUtgmc/icons/UI_icons/map_blips_large.dmi', null, icon_state_on, VERY_HIGH_FLOAT_LAYER)) //RUTGMC EDIT set_visuals(faction) /obj/effect/temp_visual/order/attack_order diff --git a/code/game/objects/effects/temporary_visuals/temporary_visual.dm b/code/game/objects/effects/temporary_visuals/temporary_visual.dm index b0b1eb4b0cd99..ad1089e5e6f9b 100644 --- a/code/game/objects/effects/temporary_visuals/temporary_visual.dm +++ b/code/game/objects/effects/temporary_visuals/temporary_visual.dm @@ -4,9 +4,13 @@ anchored = TRUE layer = ABOVE_MOB_LAYER mouse_opacity = MOUSE_OPACITY_TRANSPARENT + ///How long before the temp_visual gets deleted var/duration = 1 SECONDS - var/randomdir = TRUE + ///Timer that our duration is stored in var/timerid + ///Gives our effect a random direction on init + var/randomdir = TRUE + /obj/effect/temp_visual/Initialize(mapload) diff --git a/code/game/objects/effects/weeds.dm b/code/game/objects/effects/weeds.dm index 1cea8b0dd0e3f..55fa140a8c8dc 100644 --- a/code/game/objects/effects/weeds.dm +++ b/code/game/objects/effects/weeds.dm @@ -190,6 +190,7 @@ icon_state = "weedwall" /obj/alien/weeds/weedwall/update_icon_state() + . = ..() var/turf/closed/wall/W = loc if(!istype(W)) icon_state = initial(icon_state) @@ -208,6 +209,7 @@ var/window_type = /obj/structure/window/framed /obj/alien/weeds/weedwall/window/update_icon_state() + . = ..() var/obj/structure/window/framed/F = locate() in loc icon_state = F?.smoothing_junction ? "weedwall-[F.smoothing_junction]" : initial(icon_state) if(color_variant == STICKY_COLOR) @@ -221,11 +223,11 @@ return ..() return window.MouseDrop_T(dropping, user) -/obj/alien/weeds/weedwall/window/specialclick(mob/living/carbon/user) +/obj/alien/weeds/weedwall/window/CtrlClick(mob/living/carbon/user) var/obj/structure/window = locate(window_type) in loc if(!window) return ..() - return window.specialclick(user) + return window.CtrlClick(user) /obj/alien/weeds/weedwall/window/attackby(obj/item/I, mob/user, params) //yes, this blocks attacking the weed itself, but if you destroy the frame you destroy the weed! var/obj/structure/window = locate(window_type) in loc @@ -233,11 +235,11 @@ return ..() return window.attackby(I, user, params) -/obj/alien/weeds/weedwall/window/attack_alien(mob/living/carbon/xenomorph/X, damage_amount, damage_type, damage_flag, effects, armor_penetration, isrightclick) +/obj/alien/weeds/weedwall/window/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) var/obj/structure/window = locate(window_type) in loc if(!window) return ..() - return window.attack_alien(X, damage_amount, damage_type, damage_flag, effects, armor_penetration, isrightclick) + return window.attack_alien(xeno_attacker, damage_amount, damage_type, armor_type, effects, armor_penetration, isrightclick) /obj/alien/weeds/weedwall/window/frame window_type = /obj/structure/window_frame diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 3e060d5c959a1..9254e86376784 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -10,8 +10,9 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan mouse_drag_pointer = MOUSE_ACTIVE_POINTER light_system = MOVABLE_LIGHT allow_pass_flags = PASS_LOW_STRUCTURE - flags_atom = PREVENT_CONTENTS_EXPLOSION + atom_flags = PREVENT_CONTENTS_EXPLOSION resistance_flags = PROJECTILE_IMMUNE + move_resist = MOVE_FORCE_WEAK var/image/blood_overlay = null //this saves our blood splatter overlay, which will be processed not to go over the edges of the sprite ///The iconstate that the items use for blood on blood.dmi when drawn on the mob. @@ -36,21 +37,21 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan var/hitsound = null var/w_class = WEIGHT_CLASS_NORMAL - var/flags_item = NONE //flags for item stuff that isn't clothing/equipping specific. - var/flags_equip_slot = NONE //This is used to determine on which slots an item can fit. + var/item_flags = NONE //flags for item stuff that isn't clothing/equipping specific. + var/equip_slot_flags = NONE //This is used to determine on which slots an item can fit. //Since any item can now be a piece of clothing, this has to be put here so all items share it. - var/flags_inventory = NONE //This flag is used for various clothing/equipment item stuff - var/flags_inv_hide = NONE //This flag is used to determine when items in someone's inventory cover others. IE helmets making it so you can't see glasses, etc. + var/inventory_flags = NONE //This flag is used for various clothing/equipment item stuff + var/inv_hide_flags = NONE //This flag is used to determine when items in someone's inventory cover others. IE helmets making it so you can't see glasses, etc. var/obj/item/master = null - var/flags_armor_protection = NONE //see setup.dm for appropriate bit flags - var/flags_heat_protection = NONE //flags which determine which body parts are protected from heat. Use the HEAD, CHEST, GROIN, etc. flags. See setup.dm - var/flags_cold_protection = NONE //flags which determine which body parts are protected from cold. Use the HEAD, CHEST, GROIN, etc. flags. See setup.dm + var/armor_protection_flags = NONE //see setup.dm for appropriate bit flags + var/heat_protection_flags = NONE //flags which determine which body parts are protected from heat. Use the HEAD, CHEST, GROIN, etc. flags. See setup.dm + var/cold_protection_flags = NONE //flags which determine which body parts are protected from cold. Use the HEAD, CHEST, GROIN, etc. flags. See setup.dm - var/max_heat_protection_temperature //Set this variable to determine up to which temperature (IN KELVIN) the item protects against heat damage. Keep at null to disable protection. Only protects areas set by flags_heat_protection flags - var/min_cold_protection_temperature //Set this variable to determine down to which temperature (IN KELVIN) the item protects against cold damage. 0 is NOT an acceptable number due to if(varname) tests!! Keep at null to disable protection. Only protects areas set by flags_cold_protection flags + var/max_heat_protection_temperature //Set this variable to determine up to which temperature (IN KELVIN) the item protects against heat damage. Keep at null to disable protection. Only protects areas set by heat_protection_flags flags + var/min_cold_protection_temperature //Set this variable to determine down to which temperature (IN KELVIN) the item protects against cold damage. 0 is NOT an acceptable number due to if(varname) tests!! Keep at null to disable protection. Only protects areas set by cold_protection_flags flags ///list of /datum/action's that this item has. var/list/actions @@ -123,7 +124,7 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan ///Worn inhand overlay will be shifted by this along y axis var/inhand_y_offset = 0 - var/flags_item_map_variant = NONE + var/item_map_variant_flags = NONE //TOOL RELATED VARS var/tool_behaviour = FALSE @@ -168,7 +169,7 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan else if(islist(embedding)) embedding = getEmbeddingBehavior(arglist(embedding)) - if(flags_item_map_variant) + if(item_map_variant_flags) update_item_sprites() if(current_variant) @@ -183,12 +184,22 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan master = null embedding = null embedded_into = null //Should have been removed by temporarilyRemoveItemFromInventory, but let's play it safe. - GLOB.cryoed_item_list -= src + GLOB.cryoed_item_list_gun -= src + GLOB.cryoed_item_list_ammo -= src + GLOB.cryoed_item_list_explosive -= src + GLOB.cryoed_item_list_melee -= src + GLOB.cryoed_item_list_clothing -= src + GLOB.cryoed_item_list_food -= src + GLOB.cryoed_item_list_drugs -= src + GLOB.cryoed_item_list_containers -= src + GLOB.cryoed_item_list_other -= src return ..() +/obj/item/grab_interact(obj/item/grab/grab, mob/user, base_damage = BASE_OBJ_SLAM_DAMAGE, is_sharp = FALSE) + return /obj/item/proc/update_item_state(mob/user) - item_state = "[initial(icon_state)][flags_item & WIELDED ? "_w" : ""]" + item_state = "[initial(icon_state)][item_flags & WIELDED ? "_w" : ""]" //user: The mob that is suiciding @@ -278,6 +289,8 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan // I have cleaned it up a little, but it could probably use more. -Sayu /obj/item/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/facepaint) && colorable_allowed != NONE) color_item(I, user) @@ -337,9 +350,9 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan // apparently called whenever an item is removed from a slot, container, or anything else. //the call happens after the item's potential loc change. /obj/item/proc/dropped(mob/user) - if((flags_item & DELONDROP) && !QDELETED(src)) + if((item_flags & DELONDROP) && !QDELETED(src)) qdel(src) - flags_item &= ~IN_INVENTORY + item_flags &= ~IN_INVENTORY SEND_SIGNAL(src, COMSIG_ITEM_DROPPED, user) ///Called whenever an item is unequipped to a new loc (IE, not when the item ends up in the hands) @@ -370,7 +383,7 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan limb_count++ UPDATEHEALTH(H) QDEL_NULL(current_acid) - flags_item |= IN_INVENTORY + item_flags |= IN_INVENTORY return ///Called to return an item to equip using the quick equip hotkey. Base proc returns the item itself, overridden for storage behavior. @@ -402,8 +415,8 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan SHOULD_CALL_PARENT(TRUE) // no exceptions SEND_SIGNAL(src, COMSIG_ITEM_EQUIPPED, user, slot) - var/equipped_to_slot = flags_equip_slot & slotdefine2slotbit(slot) - if(equipped_to_slot) // flags_equip_slot is a bitfield + var/equipped_to_slot = equip_slot_flags & slotdefine2slotbit(slot) + if(equipped_to_slot) // equip_slot_flags is a bitfield SEND_SIGNAL(src, COMSIG_ITEM_EQUIPPED_TO_SLOT, user, slot) else SEND_SIGNAL(src, COMSIG_ITEM_EQUIPPED_NOT_IN_SLOT, user, slot) @@ -412,17 +425,17 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan if(item_action_slot_check(user, slot)) //some items only give their actions buttons when in a specific slot. A.give_action(user) - flags_item |= IN_INVENTORY + item_flags |= IN_INVENTORY if(!equipped_to_slot) return if(ishuman(user)) var/mob/living/carbon/human/human_user = user - if(flags_armor_protection) + if(armor_protection_flags) human_user.add_limb_armor(src) if(slowdown) - human_user.add_movespeed_modifier(type, TRUE, 0, (flags_item & IMPEDE_JETPACK) ? SLOWDOWN_IMPEDE_JETPACK : NONE, TRUE, slowdown) + human_user.add_movespeed_modifier(type, TRUE, 0, (item_flags & IMPEDE_JETPACK) ? SLOWDOWN_IMPEDE_JETPACK : NONE, TRUE, slowdown) ///Called when an item is removed from an equipment slot. The loc should still be in the unequipper. @@ -430,7 +443,7 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan SHOULD_CALL_PARENT(TRUE) SEND_SIGNAL(src, COMSIG_ITEM_UNEQUIPPED, unequipper, slot) - var/equipped_from_slot = flags_equip_slot & slotdefine2slotbit(slot) + var/equipped_from_slot = equip_slot_flags & slotdefine2slotbit(slot) for(var/datum/action/A AS in actions) A.remove_action(unequipper) @@ -440,7 +453,7 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan if(ishuman(unequipper)) var/mob/living/carbon/human/human_unequipper = unequipper - if(flags_armor_protection) + if(armor_protection_flags) human_unequipper.remove_limb_armor(src) if(slowdown) human_unequipper.remove_movespeed_modifier(type) @@ -462,12 +475,12 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan ///Used to enable/disable an item's bump attack. Grouped in a proc to make sure the signal or flags aren't missed /obj/item/proc/toggle_item_bump_attack(mob/user, enable_bump_attack) SEND_SIGNAL(user, COMSIG_ITEM_TOGGLE_BUMP_ATTACK, enable_bump_attack) - if(flags_item & CAN_BUMP_ATTACK && enable_bump_attack) + if(item_flags & CAN_BUMP_ATTACK && enable_bump_attack) return if(enable_bump_attack) - flags_item |= CAN_BUMP_ATTACK + item_flags |= CAN_BUMP_ATTACK return - flags_item &= ~CAN_BUMP_ATTACK + item_flags &= ~CAN_BUMP_ATTACK /** * The mob M is attempting to equip this item into the slot passed through as 'slot'. Return 1 if it can do this and 0 if it can't. @@ -504,7 +517,7 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan if(!is_type_in_list(H.species, species_exception)) return FALSE - if(issynth(H) && CHECK_BITFIELD(flags_item, SYNTH_RESTRICTED) && !CONFIG_GET(flag/allow_synthetic_gun_use)) + if(issynth(H) && CHECK_BITFIELD(item_flags, SYNTH_RESTRICTED) && !CONFIG_GET(flag/allow_synthetic_gun_use)) to_chat(H, span_warning("Your programming prevents you from wearing this.")) return FALSE @@ -653,7 +666,7 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan return FALSE //Unsupported slot if(equip_to_slot) - if(!(flags_equip_slot & slotdefine2slotbit(slot))) + if(!(equip_slot_flags & slotdefine2slotbit(slot))) return FALSE return TRUE @@ -692,7 +705,7 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan /obj/item/proc/update_item_sprites() switch(SSmapping.configs[GROUND_MAP].armor_style) if(MAP_ARMOR_STYLE_JUNGLE) - if(flags_item_map_variant & ITEM_JUNGLE_VARIANT) + if(item_map_variant_flags & ITEM_JUNGLE_VARIANT) if(colorable_allowed & PRESET_COLORS_ALLOWED) greyscale_colors = ARMOR_PALETTE_BLACK //RUTGMC edit - black instead of default drab else if(colorable_allowed & ICON_STATE_VARIANTS_ALLOWED) @@ -701,7 +714,7 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan icon_state = "m_[icon_state]" item_state = "m_[item_state]" if(MAP_ARMOR_STYLE_ICE) - if(flags_item_map_variant & ITEM_ICE_VARIANT) + if(item_map_variant_flags & ITEM_ICE_VARIANT) if(colorable_allowed & PRESET_COLORS_ALLOWED) greyscale_colors = ARMOR_PALETTE_SNOW else if(colorable_allowed & ICON_STATE_VARIANTS_ALLOWED) @@ -710,7 +723,7 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan icon_state = "s_[icon_state]" item_state = "s_[item_state]" if(MAP_ARMOR_STYLE_PRISON) - if(flags_item_map_variant & ITEM_PRISON_VARIANT) + if(item_map_variant_flags & ITEM_PRISON_VARIANT) if(colorable_allowed & PRESET_COLORS_ALLOWED) greyscale_colors = ARMOR_PALETTE_BLACK else if(colorable_allowed & ICON_STATE_VARIANTS_ALLOWED) @@ -719,13 +732,13 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan icon_state = "k_[icon_state]" item_state = "k_[item_state]" if(MAP_ARMOR_STYLE_DESERT) - if(flags_item_map_variant & ITEM_DESERT_VARIANT) + if(item_map_variant_flags & ITEM_DESERT_VARIANT) if(colorable_allowed & PRESET_COLORS_ALLOWED) greyscale_colors = ARMOR_PALETTE_DESERT else if(colorable_allowed & ICON_STATE_VARIANTS_ALLOWED) current_variant = DESERT_VARIANT - if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD] && (flags_item_map_variant & ITEM_ICE_PROTECTION)) + if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD] && (item_map_variant_flags & ITEM_ICE_PROTECTION)) min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROTECTION_TEMPERATURE if(!greyscale_colors) @@ -824,7 +837,7 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan //The default action is attack_self(). //Checks before we get to here are: mob is alive, mob is not restrained, paralyzed, asleep, resting, laying, item is on the mob. /obj/item/proc/ui_action_click(mob/user, datum/action/item_action/action) - attack_self(user) + return attack_self(user) /obj/item/proc/toggle_item_state(mob/user) SHOULD_CALL_PARENT(TRUE) @@ -836,7 +849,7 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan set category = "Object" var/obj/item/I = get_active_held_item() - if(I && !(I.flags_item & ITEM_ABSTRACT)) + if(I && !(I.item_flags & ITEM_ABSTRACT)) visible_message("[src] holds up [I]. Take a closer look.") /* @@ -996,7 +1009,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. //This proc is here to prevent Xenomorphs from picking up objects (default attack_hand behaviour) //Note that this is overriden by every proc concerning a child of obj unless inherited -/obj/item/attack_alien(mob/living/carbon/xenomorph/X, isrightclick = FALSE) +/obj/item/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) return FALSE @@ -1011,7 +1024,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. return user.visible_message(span_danger("[user] sprays water from [src]!"), \ - span_warning("You spray water from [src]."),) + span_warning("You spray water from [src].")) playsound(user.loc, 'sound/effects/extinguish.ogg', 52, 1, 7) @@ -1238,16 +1251,14 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. return icon_override //2: species-specific sprite sheets. - var/icon = LAZYACCESS(sprite_sheets, species_type) - if(icon && !inhands) - return icon + . = LAZYACCESS(sprite_sheets, species_type) + if(. && !inhands) + return //3: slot-specific sprite sheets - icon = LAZYACCESS(item_icons, slot_name) - if(ispath(icon, /datum/greyscale_config)) - return SSgreyscale.GetColoredIconByType(icon, greyscale_colors) - if(icon) - return icon + . = LAZYACCESS(item_icons, slot_name) + if(.) + return //5: provided default_icon if(default_icon) @@ -1383,9 +1394,9 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. ///Handles registering if an item is flagged as deployed or not /obj/item/proc/toggle_deployment_flag(deployed) if(deployed) - ENABLE_BITFIELD(flags_item, IS_DEPLOYED) + ENABLE_BITFIELD(item_flags, IS_DEPLOYED) else - DISABLE_BITFIELD(flags_item, IS_DEPLOYED) + DISABLE_BITFIELD(item_flags, IS_DEPLOYED) ///Called by vendors when vending an item. Allows the item to specify what happens when it is given to the player. /obj/item/proc/on_vend(mob/user, faction, fill_container = FALSE, auto_equip = FALSE) diff --git a/code/game/objects/items/ashtray.dm b/code/game/objects/items/ashtray.dm index 1304a5f2dd228..537932d6c71f9 100644 --- a/code/game/objects/items/ashtray.dm +++ b/code/game/objects/items/ashtray.dm @@ -14,6 +14,8 @@ /obj/item/ashtray/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/trash/cigbutt) || istype(I, /obj/item/clothing/mask/cigarette) || istype(I, /obj/item/tool/match)) if(length(contents) >= max_butts) @@ -43,22 +45,29 @@ AM.forceMove(loc) return ..() - -/obj/item/ashtray/update_icon() +/obj/item/ashtray/update_desc(updates) + . = ..() if(length(contents) >= max_butts) - icon_state = icon_full desc = empty_desc + " It's stuffed full." return if(length(contents) >= max_butts / 2) - icon_state = icon_half desc = empty_desc + " It's half-filled." return - icon_state = icon_empty desc = empty_desc +/obj/item/ashtray/update_icon_state() + . = ..() + if(length(contents) >= max_butts) + icon_state = icon_full + return + if(length(contents) >= max_butts / 2) + icon_state = icon_half + return + + icon_state = icon_empty /obj/item/ashtray/plastic name = "plastic ashtray" diff --git a/code/game/objects/items/autopsy_scanner.dm b/code/game/objects/items/autopsy_scanner.dm index f4231813c6e4f..07ba8d87c6908 100644 --- a/code/game/objects/items/autopsy_scanner.dm +++ b/code/game/objects/items/autopsy_scanner.dm @@ -2,5 +2,5 @@ name = "autopsy scanner" desc = "Extracts information on wounds." icon_state = "autopsy_scanner" - flags_atom = CONDUCT + atom_flags = CONDUCT w_class = WEIGHT_CLASS_SMALL diff --git a/code/game/objects/items/binoculars.dm b/code/game/objects/items/binoculars.dm index aec8800e7bd1c..55b7033bf6465 100644 --- a/code/game/objects/items/binoculars.dm +++ b/code/game/objects/items/binoculars.dm @@ -7,7 +7,7 @@ slot_l_hand_str = 'icons/mob/inhands/equipment/binoculars_left.dmi', slot_r_hand_str = 'icons/mob/inhands/equipment/binoculars_right.dmi', ) - flags_atom = CONDUCT + atom_flags = CONDUCT force = 5 w_class = WEIGHT_CLASS_SMALL throwforce = 5 @@ -225,7 +225,7 @@ to_chat(user, span_notice("INITIATING LASER TARGETING. Stand still.")) if(!do_after(user, max(1.5 SECONDS, target_acquisition_delay - (2.5 SECONDS * user.skills.getRating(SKILL_LEADERSHIP))), NONE, TU, BUSY_ICON_GENERIC) || world.time < laser_cooldown || laser) return - if(targ_area.flags_area & OB_CAS_IMMUNE) + if(targ_area.area_flags & OB_CAS_IMMUNE) to_chat(user, span_warning("Our payload won't reach this target!")) return switch(mode) @@ -250,7 +250,7 @@ mortar.recieve_target(TU,user) return if(MODE_RAILGUN) - if(SSticker?.mode?.flags_round_type & MODE_DISALLOW_RAILGUN) + if(SSticker?.mode?.round_type_flags & MODE_DISALLOW_RAILGUN) to_chat(user, span_notice("ERROR. NO LINKED RAILGUN DETECTED. UNABLE TO FIRE.")) return to_chat(user, span_notice("ACQUIRING TARGET. RAILGUN TRIANGULATING. DON'T MOVE.")) diff --git a/code/game/objects/items/blink_drive.dm b/code/game/objects/items/blink_drive.dm index 4d5f031511e5e..5592cc1a24dc0 100644 --- a/code/game/objects/items/blink_drive.dm +++ b/code/game/objects/items/blink_drive.dm @@ -12,21 +12,25 @@ ) icon_state = "bluespace_pack" w_class = WEIGHT_CLASS_BULKY - flags_equip_slot = ITEM_SLOT_BACK + equip_slot_flags = ITEM_SLOT_BACK obj_flags = CAN_BE_HIT light_range = 0.1 light_power = 0.1 light_color = LIGHT_COLOR_BLUE ///Number of teleport charges you currently have var/charges = 3 - ///True if you can use shift click/middle click to use it - var/selected = FALSE ///The timer for recharging the drive var/charge_timer ///The mob wearing the blink drive. Needed for item updates. var/mob/equipped_user + ///Controlling action + var/datum/action/ability/activable/item_toggle/blink_drive/blink_action COOLDOWN_DECLARE(blink_stability_cooldown) +/obj/item/blink_drive/Initialize(mapload) + . = ..() + blink_action = new(src) + /obj/item/blink_drive/update_icon() . = ..() equipped_user?.update_inv_back() @@ -52,68 +56,28 @@ . = ..() equipped_user = user if(slot == SLOT_BACK) - RegisterSignal(user, COMSIG_MOB_CLICK_ALT_RIGHT, PROC_REF(can_use)) - var/datum/action/item_action/toggle/action = new(src) - action.give_action(user) + blink_action.give_action(user) /obj/item/blink_drive/dropped(mob/user) . = ..() - UnregisterSignal(user, list(COMSIG_MOB_CLICK_ALT_RIGHT, COMSIG_MOB_MIDDLE_CLICK)) - UnregisterSignal(user, COMSIG_ITEM_EXCLUSIVE_TOGGLE) - selected = FALSE + blink_action.remove_action(user) equipped_user = null - LAZYCLEARLIST(actions) -/obj/item/blink_drive/ui_action_click(mob/user, datum/action/item_action/action) - if(selected) - UnregisterSignal(user, COMSIG_MOB_MIDDLE_CLICK) - action.set_toggle(FALSE) - UnregisterSignal(user, COMSIG_ITEM_EXCLUSIVE_TOGGLE) - else - RegisterSignal(user, COMSIG_MOB_MIDDLE_CLICK, PROC_REF(can_use)) - action.set_toggle(TRUE) - SEND_SIGNAL(user, COMSIG_ITEM_EXCLUSIVE_TOGGLE, user) - RegisterSignal(user, COMSIG_ITEM_EXCLUSIVE_TOGGLE, PROC_REF(unselect)) - selected = !selected /obj/item/blink_drive/apply_custom(mutable_appearance/standing, inhands, icon_used, state_used) . = ..() var/mutable_appearance/emissive_overlay = emissive_appearance(icon_used, "[state_used]_emissive") standing.overlays.Add(emissive_overlay) -///Signal handler for making it impossible to use middleclick to use the blink drive -/obj/item/blink_drive/proc/unselect(datum/source, mob/user) - SIGNAL_HANDLER - if(!selected) - return - selected = FALSE - UnregisterSignal(user, COMSIG_MOB_MIDDLE_CLICK) - UnregisterSignal(user, COMSIG_ITEM_EXCLUSIVE_TOGGLE) - - for(var/action in user.actions) - if(!istype(action, /datum/action/item_action)) - continue - var/datum/action/item_action/iaction = action - if(iaction?.holder_item == src) - iaction.set_toggle(FALSE) - -///Check if we can use the blink drive and give feedback to the user -/obj/item/blink_drive/proc/can_use(datum/source, atom/A) - SIGNAL_HANDLER - var/mob/living/carbon/human/human_user = usr - if(human_user.incapacitated() || human_user.lying_angle) - return - if(is_mainship_level(human_user.z)) - human_user.balloon_alert(human_user, "can't use here") - return - if(charges <= 0) - human_user.balloon_alert(human_user, "no charge") - playsound(src, 'sound/items/blink_empty.ogg', 25, 1) - return - INVOKE_ASYNC(src, PROC_REF(teleport), A, human_user) +/obj/item/blink_drive/ui_action_click(mob/user, datum/action/item_action/action, target) + return teleport(target, user) ///Handles the actual teleportation /obj/item/blink_drive/proc/teleport(atom/A, mob/user) + if(charges <= 0) + user.balloon_alert(user, "no charge") + playsound(src, 'sound/items/blink_empty.ogg', 25, 1) + return var/turf/target_turf = get_turf(A) if(target_turf == user.loc) @@ -165,6 +129,7 @@ deltimer(charge_timer) charge_timer = addtimer(CALLBACK(src, PROC_REF(recharge)), BLINK_DRIVE_CHARGE_TIME * 2, TIMER_STOPPABLE) update_icon() + return TRUE ///Recharges the drive, and sets another timer if not maxed out /obj/item/blink_drive/proc/recharge() @@ -219,3 +184,19 @@ traits += "Shared use:
If the user has grabbed another mob when activating the drive, the grabbed mob will be teleported with them.
" . += jointext(traits, "
") + +/datum/action/ability/activable/item_toggle/blink_drive + name = "Use Blink Drive" + action_icon_state = "axe_sweep" + desc = "Teleport a short distance instantly." + use_state_flags = ABILITY_USE_STAGGERED|ABILITY_USE_BUSY + keybinding_signals = list(KEYBINDING_NORMAL = COMSIG_ITEM_TOGGLE_BLINKDRIVE) + +/datum/action/ability/activable/item_toggle/blink_drive/can_use_ability(silent, override_flags, selecting) + var/mob/living/carbon/carbon_owner = owner + if(carbon_owner.incapacitated() || carbon_owner.lying_angle) + return FALSE + if(is_mainship_level(carbon_owner.z)) + carbon_owner.balloon_alert(carbon_owner, "can't use here") + return FALSE + return ..() diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index d0b930b3f098d..0b802f8bdf236 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -68,6 +68,8 @@ var/obj/item/bodybag/foldedbag_instance = null var/obj/structure/bed/roller/roller_buckled //the roller bed this bodybag is attached to. var/mob/living/bodybag_occupant + ///Should the name of the person inside be displayed? + var/display_name = TRUE /obj/structure/closet/bodybag/Initialize(mapload, foldedbag) @@ -94,7 +96,10 @@ return ..() -/obj/structure/closet/bodybag/proc/update_name() +/obj/structure/closet/bodybag/update_name(updates) + . = ..() + if(!display_name) + return if(opened) name = bag_name else @@ -106,6 +111,8 @@ /obj/structure/closet/bodybag/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/tool/pen)) var/t = stripped_input(user, "What would you like the label to be?", name, null, MAX_MESSAGE_LEN) @@ -145,7 +152,7 @@ var/mob/living/carbon/human/new_guest = locate() in contents if(new_guest) bodybag_occupant = new_guest - update_name() + update_appearance() return TRUE return FALSE @@ -154,7 +161,7 @@ . = ..() if(bodybag_occupant) bodybag_occupant = null - update_name() + update_appearance() /obj/structure/closet/bodybag/MouseDrop(over_object, src_location, over_location) @@ -188,7 +195,8 @@ return ..() -/obj/structure/closet/bodybag/update_icon() +/obj/structure/closet/bodybag/update_icon_state() + . = ..() if(!opened) icon_state = icon_closed for(var/mob/living/L in contents) @@ -198,15 +206,15 @@ icon_state = icon_opened -/obj/structure/closet/bodybag/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) - if(X.status_flags & INCORPOREAL) +/obj/structure/closet/bodybag/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) + if(xeno_attacker.status_flags & INCORPOREAL) return FALSE if(opened) return FALSE // stop xeno closing things - X.do_attack_animation(src, ATTACK_EFFECT_CLAW) - bodybag_occupant?.attack_alien(X) + xeno_attacker.do_attack_animation(src, ATTACK_EFFECT_CLAW) + bodybag_occupant?.attack_alien(xeno_attacker) open() - X.visible_message(span_danger("\The [X] slashes \the [src] open!"), \ + xeno_attacker.visible_message(span_danger("\The [xeno_attacker] slashes \the [src] open!"), \ span_danger("We slash \the [src] open!"), null, 5) return TRUE @@ -326,19 +334,34 @@ /obj/structure/closet/bodybag/cryobag/examine(mob/living/user) . = ..() - if(!ishuman(bodybag_occupant)) + var/mob/living/carbon/human/occupant = bodybag_occupant + if(!ishuman(occupant)) return if(!hasHUD(user,"medical")) return for(var/datum/data/record/medical_record AS in GLOB.datacore.medical) - if(medical_record.fields["name"] != bodybag_occupant.real_name) + if(medical_record.fields["name"] != occupant.real_name) continue if(!(medical_record.fields["last_scan_time"])) . += "No scan report on record" else . += "Scan from [medical_record.fields["last_scan_time"]]" break - + if(occupant.stat != DEAD) + return + var/timer = 0 // variable for DNR timer check + timer = (TIME_BEFORE_DNR-(occupant.dead_ticks))*2 //Time to DNR left in seconds + if(!occupant.mind && !occupant.get_ghost(TRUE) || occupant.dead_ticks > TIME_BEFORE_DNR || occupant.suiciding) //We couldn't find a suitable ghost or patient has passed their DNR timer or suicided, this means the person is not returning + . += span_scanner("Patient is DNR") + else if(!occupant.mind && occupant.get_ghost(TRUE)) // Ghost is available but outside of the body + . += span_scanner("Defib patient to check departed status") + . += span_scanner("Patient have [timer] seconds left before DNR") + else if(!occupant.client) //Mind is in the body but no client, most likely currently disconnected. + . += span_scanner("Patient is almost departed") + . += span_scanner("Patient have [timer] seconds left before DNR") + else + . += span_scanner("Patient have [timer] seconds left before DNR") + /obj/structure/closet/bodybag/cryobag/Topic(href, href_list) . = ..() @@ -416,6 +439,7 @@ close_sound = 'sound/effects/vegetation_walk_2.ogg' foldedbag_path = /obj/item/bodybag/tarp closet_stun_delay = 0.5 SECONDS //Short delay to prevent ambushes from being too degenerate. + display_name = FALSE var/serial_number //Randomized serial number used to stop point macros and such. @@ -453,11 +477,6 @@ SIGNAL_HANDLER open() - -/obj/structure/closet/bodybag/tarp/update_name() - return //Shouldn't be revealing who's inside. - - /obj/structure/closet/bodybag/tarp/MouseDrop(over_object, src_location, over_location) . = ..() var/obj/item/bodybag/tarp/folded_tarp = foldedbag_instance diff --git a/code/game/objects/items/books/book.dm b/code/game/objects/items/books/book.dm index 9b5b08a224639..383cc39b5bc2b 100644 --- a/code/game/objects/items/books/book.dm +++ b/code/game/objects/items/books/book.dm @@ -45,6 +45,8 @@ /obj/item/book/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/tool/pen)) if(unique) diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index fc123ad2594a2..945a3c36d0671 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -67,7 +67,7 @@ desc = "It's a card with a magnetic strip attached to some circuitry." name = "cryptographic sequencer" icon_state = "emag" - flags_item = NOBLUDGEON + item_flags = NOBLUDGEON /obj/item/card/id @@ -76,7 +76,9 @@ icon_state = "id" var/access = list() var/registered_name = "Unknown" // The name registered_name on the card - flags_equip_slot = ITEM_SLOT_ID + equip_slot_flags = ITEM_SLOT_ID + ///Miscelaneous ID flags + var/id_flags = CAN_BUY_LOADOUT var/blood_type = "\[UNSET\]" @@ -86,8 +88,6 @@ ///What category of items can you buy - used for armor and poucehs var/marine_buy_choices = list() - var/can_buy_loadout = TRUE - //alt titles are handled a bit weirdly in order to unobtrusively integrate into existing ID system var/assignment = null //can be alt title or the actual job var/rank = null //actual job @@ -251,6 +251,7 @@ var/dogtag_taken = FALSE /obj/item/card/id/dogtag/update_icon_state() + . = ..() if(dogtag_taken) icon_state = initial(icon_state) + "_taken" return @@ -340,6 +341,8 @@ /obj/item/dogtag/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/dogtag)) var/obj/item/dogtag/D = I diff --git a/code/game/objects/items/circuitboards/circuitboard.dm b/code/game/objects/items/circuitboards/circuitboard.dm index 93954a07aa4b9..9a99c8da7e7af 100644 --- a/code/game/objects/items/circuitboards/circuitboard.dm +++ b/code/game/objects/items/circuitboards/circuitboard.dm @@ -8,7 +8,7 @@ slot_r_hand_str = 'icons/mob/inhands/equipment/engineering_right.dmi', ) item_state = "electronic" - flags_atom = CONDUCT + atom_flags = CONDUCT var/build_path = null //Called when the circuitboard is used to contruct a new machine. diff --git a/code/game/objects/items/circuitboards/computer.dm b/code/game/objects/items/circuitboards/computer.dm index 65e8a0371e7b8..0eb2433e62348 100644 --- a/code/game/objects/items/circuitboards/computer.dm +++ b/code/game/objects/items/circuitboards/computer.dm @@ -175,6 +175,8 @@ /obj/item/circuitboard/computer/security/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/card/id)) if(!check_access(I)) diff --git a/code/game/objects/items/circuitboards/machine.dm b/code/game/objects/items/circuitboards/machine.dm index 044e5626dfbc9..581ab737e0895 100644 --- a/code/game/objects/items/circuitboards/machine.dm +++ b/code/game/objects/items/circuitboards/machine.dm @@ -88,6 +88,8 @@ to destroy them and players will be able to make replacements. /obj/item/circuitboard/machine/unary_atmos/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(isscrewdriver(I)) machine_dir = turn(machine_dir, 90) diff --git a/code/game/objects/items/cloaking.dm b/code/game/objects/items/cloaking.dm index 0b33c71291553..f7c8e8acbd487 100644 --- a/code/game/objects/items/cloaking.dm +++ b/code/game/objects/items/cloaking.dm @@ -6,8 +6,8 @@ name = "chameleon-projector" icon = 'icons/obj/device.dmi' icon_state = "shield0" - flags_atom = CONDUCT - flags_equip_slot = ITEM_SLOT_BELT + atom_flags = CONDUCT + equip_slot_flags = ITEM_SLOT_BELT item_icons = list( slot_l_hand_str = 'icons/mob/inhands/equipment/engineering_left.dmi', slot_r_hand_str = 'icons/mob/inhands/equipment/engineering_right.dmi', diff --git a/code/game/objects/items/cocoon.dm b/code/game/objects/items/cocoon.dm index 46dfd2b7b3b4f..3e9cbcd756b8d 100644 --- a/code/game/objects/items/cocoon.dm +++ b/code/game/objects/items/cocoon.dm @@ -42,11 +42,12 @@ /obj/structure/cocoon/process() var/psych_points_output = COCOON_PSY_POINTS_REWARD_MIN + ((HIGH_PLAYER_POP - SSmonitor.maximum_connected_players_count) / HIGH_PLAYER_POP * (COCOON_PSY_POINTS_REWARD_MAX - COCOON_PSY_POINTS_REWARD_MIN)) psych_points_output = clamp(psych_points_output, COCOON_PSY_POINTS_REWARD_MIN, COCOON_PSY_POINTS_REWARD_MAX) - SSpoints.add_psy_points(hivenumber, psych_points_output) + SSpoints.add_strategic_psy_points(hivenumber, psych_points_output) + SSpoints.add_tactical_psy_points(hivenumber, psych_points_output*0.25) //Gives marine cloneloss for a total of 30. victim.adjustCloneLoss(0.5) -/obj/structure/cocoon/take_damage(damage_amount, damage_type, damage_flag, effects, attack_dir, armour_penetration) +/obj/structure/cocoon/take_damage(damage_amount, damage_type = BRUTE, armor_type = null, effects = TRUE, attack_dir, armour_penetration = 0, mob/living/blame_mob) . = ..() if(anchored && obj_integrity < max_integrity / 2) unanchor_from_nest() @@ -115,6 +116,7 @@ return ..() /obj/structure/cocoon/update_icon_state() + . = ..() if(anchored) icon_state = "xeno_cocoon" return diff --git a/code/game/objects/items/coins.dm b/code/game/objects/items/coins.dm index a6cc0074219db..bb1a2c1f017ce 100644 --- a/code/game/objects/items/coins.dm +++ b/code/game/objects/items/coins.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/items/items.dmi' name = "Coin" icon_state = "coin" - flags_atom = CONDUCT + atom_flags = CONDUCT w_class = WEIGHT_CLASS_TINY var/string_attached var/sides = 2 @@ -49,6 +49,8 @@ /obj/item/coin/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/CC = I diff --git a/code/game/objects/items/cosmetics.dm b/code/game/objects/items/cosmetics.dm index e1a48cd55d424..44cc2c3024f7c 100644 --- a/code/game/objects/items/cosmetics.dm +++ b/code/game/objects/items/cosmetics.dm @@ -31,33 +31,33 @@ icon_state = "full_camo" -/obj/item/facepaint/attack(mob/M as mob, mob/user as mob) - if(!ismob(M)) return +/obj/item/facepaint/attack(mob/M, mob/user) + . = ..() + if(!ishuman(M)) + to_chat(user, span_warning("Foiled!")) + return - if(ishuman(M)) - var/mob/living/carbon/human/H = M - if(H.lip_style) //if they already have lipstick on - to_chat(user, span_warning("You need to wipe the old paint off with paper first!")) - return - if(H == user) - paint_face(H, user) - return 1 - else - to_chat(user, span_notice("You attempt to apply [src] on [H]...")) - to_chat(H, span_notice("[user] is trying to apply [src] on your face...")) - if(tgui_alert(H, "Will you allow [user] to paint your face?", null, list("Sure","No")) == "Sure") - if( user && loc == user && (user in range(1,H)) ) //Have to be close and hold the thing. - paint_face(H, user) - return 1 + var/mob/living/carbon/human/attacked_human = M + if(attacked_human.makeup_style) //if they already have lipstick on + to_chat(user, span_warning("You need to wipe the old paint off with paper first!")) + return - to_chat(user, span_warning("Foiled!")) + if(attacked_human != user && attacked_human.client) + user.visible_message(span_notice("[user] is trying to apply [src] on [attacked_human]'s face..."), span_notice("You attempt to apply [src] on [attacked_human]...")) + if(tgui_alert(attacked_human, "Apply makeup", "Will you allow [user] to paint your face?", list("Yes","No")) != "Yes") + return + if(!user || loc != user || !user.Adjacent(attacked_human)) + return + paint_face(attacked_human, user) +///Handles applying the makeup /obj/item/facepaint/proc/paint_face(mob/living/carbon/human/H, mob/user) - if(!H || !user) return //In case they're passed as null. + if(!H || !user) + return //In case they're passed as null. user.visible_message(span_notice("[user] carefully applies [src] on [H]'s face."), \ span_notice("You apply [src].")) - H.lip_style = colour + H.makeup_style = colour H.alpha = max(0, initial(H.alpha) - 1) // decreases your alpha by 1 H.update_body() uses-- @@ -66,5 +66,3 @@ user.update_inv_l_hand(0) user.update_inv_r_hand() qdel(src) - -//you can wipe off lipstick with paper! see code/modules/paperwork/paper.dm, paper/attack() diff --git a/code/game/objects/items/defibrillator.dm b/code/game/objects/items/defibrillator.dm index e5572f75c6ae5..45be80a9d6097 100644 --- a/code/game/objects/items/defibrillator.dm +++ b/code/game/objects/items/defibrillator.dm @@ -4,9 +4,9 @@ icon = 'icons/obj/items/defibrillator.dmi' icon_state = "defib_full" item_state = "defib" - flags_atom = CONDUCT - flags_item = NOBLUDGEON - flags_equip_slot = ITEM_SLOT_BELT + atom_flags = CONDUCT + item_flags = NOBLUDGEON + equip_slot_flags = ITEM_SLOT_BELT force = 5 throwforce = 6 w_class = WEIGHT_CLASS_NORMAL @@ -44,6 +44,7 @@ /obj/item/defibrillator/update_icon_state() + . = ..() icon_state = "defib" if(ready) icon_state += "_out" @@ -126,7 +127,7 @@ stack_trace("Powercell deleted while powering the defib, this isn't supposed to happen normally.") set_dcell(null) -/mob/living/proc/get_ghost() +/mob/living/proc/get_ghost(bypass_client_check = FALSE) if(client) //Let's call up the correct ghost! return null for(var/mob/dead/observer/ghost AS in GLOB.observer_list) @@ -136,7 +137,7 @@ continue if(ghost.can_reenter_corpse.resolve() != src) continue - if(ghost.client) + if(ghost.client || bypass_client_check) return ghost return null @@ -196,17 +197,20 @@ user.visible_message(span_warning("[icon2html(src, viewers(user))] \The [src] buzzes: Patient's organs are too damaged to sustain life. Deliver patient to a MD for surgical intervention.")) return - if((H.wear_suit && H.wear_suit.flags_atom & CONDUCT)) + if((H.wear_suit && H.wear_suit.atom_flags & CONDUCT)) user.visible_message(span_warning("[icon2html(src, viewers(user))] \The [src] buzzes: Paddles registering >100,000 ohms, Possible cause: Suit or Armor interferring.")) return var/mob/dead/observer/G = H.get_ghost() if(G) G.reenter_corpse() - else if(!H.client) + else if(!H.mind && !H.get_ghost(TRUE)) //We couldn't find a suitable ghost, this means the person is not returning user.visible_message(span_warning("[icon2html(src, viewers(user))] \The [src] buzzes: Patient has a DNR.")) return + else if(!H.client) //Currently disconnected. + user.visible_message(span_warning("[icon2html(src, viewers(user))] \The [src] buzzes: Patient's soul has almost departed. Please try again.")) + return user.visible_message(span_notice("[user] starts setting up the paddles on [H]'s chest."), span_notice("You start setting up the paddles on [H]'s chest.")) @@ -230,7 +234,7 @@ H.visible_message(span_danger("[H]'s body convulses a bit.")) defib_cooldown = world.time + 10 //1 second cooldown before you can shock again - if(H.wear_suit && H.wear_suit.flags_atom & CONDUCT) + if(H.wear_suit && H.wear_suit.atom_flags & CONDUCT) user.visible_message(span_warning("[icon2html(src, viewers(user))] \The [src] buzzes: Defibrillation failed: Paddles registering >100,000 ohms, Possible cause: Suit or Armor interferring.")) return @@ -252,19 +256,19 @@ user.visible_message("[icon2html(src, viewers(user))] \The [src] buzzes: Positronic brain missing, cannot reboot.") return - if(!H.client) //Freak case, no client at all. This is a braindead mob (like a colonist) + if(!H.client) //Either client disconnected after being dragged in, ghosted, or this mob isn't a player (but that is caught way earlier). user.visible_message(span_warning("[icon2html(src, viewers(user))] \The [src] buzzes: No soul detected, Attempting to revive...")) - if(H.mind && !H.client) //Let's call up the correct ghost! Also, bodies with clients only, thank you. - G = H.get_ghost() + if(!H.mind) //Check if their ghost still exists if they aren't in their body. + G = H.get_ghost(TRUE) if(istype(G)) user.visible_message(span_warning("[icon2html(src, viewers(user))] \The [src] buzzes: Defibrillation failed. Patient's soul has almost departed, please try again.")) return - //We couldn't find a suitable ghost, this means the person is not returning + //No mind and no associated ghost exists. This one is DNR. user.visible_message(span_warning("[icon2html(src, viewers(user))] \The [src] buzzes: Patient has a DNR.")) return - if(!H.client) //Freak case, no client at all. This is a braindead mob (like a colonist) or someone who didn't enter their body in time. + if(!H.client) //No client, but has a mind. This means the player was in their body, but potentially disconnected. user.visible_message(span_warning("[icon2html(src, viewers(user))] \The [src] buzzes: Defibrillation failed. No soul detected. Please try again.")) playsound(get_turf(src), 'sound/items/defib_failed.ogg', 35, 0) return @@ -310,10 +314,18 @@ H.updatehealth() //One more time, so it doesn't show the target as dead on HUDs H.dead_ticks = 0 //We reset the DNR time H.initial_stage = 0 // RUTGMC ADDITION + + //Checks if our "patient" is wearing a camera. Then it turns it on if it's off. + if(istype(H.wear_ear, /obj/item/radio/headset/mainship)) + var/obj/item/radio/headset/mainship/cam_headset = H.wear_ear + if(!(cam_headset?.camera?.status)) + cam_headset.camera.toggle_cam(null, FALSE) + REMOVE_TRAIT(H, TRAIT_PSY_DRAINED, TRAIT_PSY_DRAINED) if(user.client) var/datum/personal_statistics/personal_statistics = GLOB.personal_statistics_list[user.ckey] personal_statistics.revives++ + personal_statistics.mission_revives++ GLOB.round_statistics.total_human_revives[H.faction]++ SSblackbox.record_feedback("tally", "round_statistics", 1, "total_human_revives[H.faction]") to_chat(H, span_notice("You suddenly feel a spark and your consciousness returns, dragging you back to the mortal plane.")) @@ -330,47 +342,74 @@ icon_state = "civ_defib_full" item_state = "defib" +/obj/item/defibrillator/internal + icon = 'icons/obj/clothing/gloves.dmi' //even though you'll never see this directly, it shows up in the chat panel due to icon2html + ready = TRUE + ready_needed = FALSE + ///Parent item containing this defib + var/obj/parent_obj + +/obj/item/defibrillator/internal/Initialize(mapload, obj/new_parent) + if(!istype(new_parent)) + return INITIALIZE_HINT_QDEL + parent_obj = new_parent + return ..() + +/obj/item/defibrillator/internal/Destroy() + parent_obj = null + return ..() -/obj/item/defibrillator/gloves +/obj/item/defibrillator/internal/update_icon() + . = ..() + parent_obj.update_icon() + +/obj/item/clothing/gloves/defibrillator name = "advanced medical combat gloves" - desc = "Advanced medical gloves, these include small electrodes to defibrilate a patiant. No more bulky units!" - icon_state = "defib_gloves" + desc = "Advanced medical gloves, these include small electrodes to defibrilate a patient No more bulky units!" + icon_state = "defib_out_full" item_state = "defib_gloves" - ready = TRUE - ready_needed = FALSE - flags_equip_slot = ITEM_SLOT_GLOVES - w_class = WEIGHT_CLASS_SMALL - icon = 'icons/obj/clothing/gloves.dmi' - item_state_worn = TRUE - siemens_coefficient = 0.50 - blood_sprite_state = "bloodyhands" - flags_armor_protection = HANDS - flags_equip_slot = ITEM_SLOT_GLOVES - attack_verb = "zaps" soft_armor = list(MELEE = 25, BULLET = 15, LASER = 10, ENERGY = 15, BOMB = 15, BIO = 5, FIRE = 15, ACID = 15) - flags_cold_protection = HANDS - flags_heat_protection = HANDS + cold_protection_flags = HANDS + heat_protection_flags = HANDS min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE + ///The internal defib item + var/obj/item/defibrillator/internal/internal_defib -/obj/item/defibrillator/gloves/equipped(mob/living/carbon/human/user, slot) +/obj/item/clothing/gloves/defibrillator/Initialize(mapload) + . = ..() + internal_defib = new(src, src) + update_icon() + +/obj/item/clothing/gloves/defibrillator/Destroy() + internal_defib = null + return ..() + +/obj/item/clothing/gloves/defibrillator/equipped(mob/living/carbon/human/user, slot) . = ..() if(user.gloves == src) RegisterSignal(user, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, PROC_REF(on_unarmed_attack)) else UnregisterSignal(user, COMSIG_HUMAN_MELEE_UNARMED_ATTACK) -/obj/item/defibrillator/gloves/unequipped(mob/living/carbon/human/user, slot) +/obj/item/clothing/gloves/defibrillator/unequipped(mob/living/carbon/human/user, slot) . = ..() UnregisterSignal(user, COMSIG_HUMAN_MELEE_UNARMED_ATTACK) //Unregisters in the case of getting delimbed +/obj/item/clothing/gloves/defibrillator/examine(mob/user) + . = ..() + . += internal_defib.maybe_message_recharge_hint() + +/obj/item/clothing/gloves/defibrillator/update_icon_state() + . = ..() + if(!internal_defib) //should only happen on init + return + icon_state = internal_defib.icon_state + //when you are wearing these gloves, this will call the normal attack code to begin defibing the target -/obj/item/defibrillator/gloves/proc/on_unarmed_attack(mob/living/carbon/human/user, mob/living/carbon/human/target) +/obj/item/clothing/gloves/defibrillator/proc/on_unarmed_attack(mob/living/carbon/human/user, mob/living/carbon/human/target) + SIGNAL_HANDLER if(user.a_intent != INTENT_HELP) return if(istype(user) && istype(target)) - defibrillate(target, user) - -/obj/item/defibrillator/gloves/update_icon_state() - return - + INVOKE_ASYNC(internal_defib, TYPE_PROC_REF(/obj/item/defibrillator, defibrillate), target, user) diff --git a/code/game/objects/items/devices/squad_transfer_tablet.dm b/code/game/objects/items/devices/squad_transfer_tablet.dm index 7099a4b6a72d3..bbcc5fa7cccad 100644 --- a/code/game/objects/items/devices/squad_transfer_tablet.dm +++ b/code/game/objects/items/devices/squad_transfer_tablet.dm @@ -3,7 +3,7 @@ desc = "A tablet for quickly transfering the squaddies from under one incompetent squad leader to another." icon = 'icons/Marine/marine-navigation.dmi' icon_state = "req_tablet_off" - flags_equip_slot = ITEM_SLOT_POCKET + equip_slot_flags = ITEM_SLOT_POCKET w_class = WEIGHT_CLASS_SMALL interaction_flags = INTERACT_MACHINE_TGUI /// REF()s for all currently active transfering marines diff --git a/code/game/objects/items/devices/tablets.dm b/code/game/objects/items/devices/tablets.dm index 53140f52d5904..297ae718e807a 100644 --- a/code/game/objects/items/devices/tablets.dm +++ b/code/game/objects/items/devices/tablets.dm @@ -4,7 +4,7 @@ icon = 'icons/Marine/marine-navigation.dmi' icon_state = "req_tablet_off" req_access = list(ACCESS_NT_CORPORATE) - flags_equip_slot = ITEM_SLOT_POCKET + equip_slot_flags = ITEM_SLOT_POCKET w_class = WEIGHT_CLASS_SMALL interaction_flags = INTERACT_MACHINE_TGUI @@ -50,6 +50,11 @@ dat += " delta" network = list("delta") req_access = list(ACCESS_MARINE_LEADER, ACCESS_MARINE_DELTA) + else + var/lowername = lowertext(squad.name) + dat = dat + " " + lowername + network = list(lowername) + req_access = list(ACCESS_MARINE_LEADER) dat += " squad leader's" if(/datum/job/terragov/command/captain) dat += " captain's" @@ -61,8 +66,12 @@ req_access = list(ACCESS_MARINE_BRIDGE, ACCESS_MARINE_LEADER) if(/datum/job/terragov/command/pilot) dat += " pilot's" - network = list("dropship1", "dropship2") + network = list("dropship1") req_access = list(ACCESS_MARINE_PILOT, ACCESS_MARINE_DROPSHIP) + if(/datum/job/terragov/command/transportofficer) + dat += " transport officer's" + network = list("dropship2") + req_access = list(ACCESS_MARINE_PILOT, ACCESS_MARINE_TADPOLE) name = dat + " hud tablet" // Convert networks to lowercase for(var/i in network) @@ -252,10 +261,15 @@ /obj/item/hud_tablet/pilot name = "pilot officers's hud tablet" - network = list("dropship1", "dropship2") + network = list("dropship1") req_access = list(ACCESS_MARINE_PILOT, ACCESS_MARINE_DROPSHIP) max_view_dist = WORLD_VIEW_NUM +/obj/item/hud_tablet/transportofficer + name = "transport officer's hud tablet" + network = list("dropship2") + req_access = list(ACCESS_MARINE_PILOT, ACCESS_MARINE_TADPOLE) + max_view_dist = WORLD_VIEW_NUM /obj/item/hud_tablet/artillery name = "artillery impact hud tablet" diff --git a/code/game/objects/items/devices/tweezers.dm b/code/game/objects/items/devices/tweezers.dm index d004f056f8a56..f4e4349e5cbed 100644 --- a/code/game/objects/items/devices/tweezers.dm +++ b/code/game/objects/items/devices/tweezers.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/items/surgery_tools.dmi' icon_state = "tweezers" item_state = "tweezers" - flags_item = NOBLUDGEON + item_flags = NOBLUDGEON w_class = WEIGHT_CLASS_SMALL /* RUTGMC REMOVAL @@ -19,7 +19,7 @@ icon = 'icons/obj/items/surgery_tools.dmi' icon_state = "predator_bone-gel" item_state = "predator_bone-gel" - flags_item = NOBLUDGEON + item_flags = NOBLUDGEON w_class = WEIGHT_CLASS_SMALL /obj/item/tweezers_advanced/Initialize(mapload) diff --git a/code/game/objects/items/embedding.dm b/code/game/objects/items/embedding.dm index 7d5d84cd68ce5..4eb47cd666cdf 100644 --- a/code/game/objects/items/embedding.dm +++ b/code/game/objects/items/embedding.dm @@ -79,7 +79,7 @@ stack_trace("limb_embed called for QDELETED [embedding]") embedding?.unembed_ourself() return FALSE - if(HAS_TRAIT(embedding, TRAIT_NODROP) || (embedding.flags_item & DELONDROP)) + if(HAS_TRAIT(embedding, TRAIT_NODROP) || (embedding.item_flags & DELONDROP)) stack_trace("limb_embed called for TRAIT_NODROP or DELONDROP [embedding]") embedding.unembed_ourself() return FALSE diff --git a/code/game/objects/items/explosives/bombvest.dm b/code/game/objects/items/explosives/bombvest.dm index 0afe25235fc1c..a69f9ff911813 100644 --- a/code/game/objects/items/explosives/bombvest.dm +++ b/code/game/objects/items/explosives/bombvest.dm @@ -4,8 +4,8 @@ icon_state = "boom_vest" soft_armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 0, ACID = 0) slowdown = 0 - flags_item_map_variant = NONE - flags_armor_features = NONE + item_map_variant_flags = NONE + armor_features_flags = NONE ///Warcry to yell upon detonation var/bomb_message ///List of warcries that are not allowed. diff --git a/code/game/objects/items/explosives/grenades/bullet_grenade.dm b/code/game/objects/items/explosives/grenades/bullet_grenade.dm new file mode 100644 index 0000000000000..58cd11676fb71 --- /dev/null +++ b/code/game/objects/items/explosives/grenades/bullet_grenade.dm @@ -0,0 +1,69 @@ +///bullet grenade: shoots bullets out from itself in a ring +/obj/item/explosive/grenade/bullet + name = "\improper M90 leadburster grenade" + desc = "Leadburster grenades release a short burst of projectiles after detonation. Keep far away from friendlies. Or don't. I'm just a label." + icon_state = "grenade_rad" + item_state = "grenade_rad" + icon_state_mini = "grenade_red" + det_time = 40 + arm_sound = 'sound/weapons/armbomb.ogg' + hud_state = "grenade_he" + + /// amount of rotations that we will do with these bullets + var/rotations = 2 + ///whether we randomly emit or in equal intervals + var/randomized = FALSE + ///sound to play while shooting + var/fire_sound = 'sound/weapons/burst_phaser2.ogg' + /// total amount of bullets to fire, split evenly between rotations + var/projectile_count = 30 + /// range of the bullets + var/range = 7 + /// speed of the bullets + var/speed = 2 + /// ammo type to shoot out: can be ANY ammo type + var/datum/ammo/ammo_type = /datum/ammo/energy/lasgun/marine/heavy_laser + +/obj/item/explosive/grenade/bullet/prime() + var/list/bullets = list() + var/proj_type = /obj/projectile + if(initial(ammo_type.ammo_behavior_flags) & AMMO_HITSCAN) + proj_type = /obj/projectile/hitscan + for(var/i=1 to projectile_count) + var/obj/projectile/proj = new proj_type(src, initial(ammo_type.hitscan_effect_icon)) + proj.generate_bullet(ammo_type) + bullets += proj + + bullet_burst(src, bullets, null, fire_sound, range, speed, randomized, rotations) + qdel(src) + + +/obj/item/explosive/grenade/bullet/laser + name = "\improper M80 lasburster grenade" + desc = "Lasburster grenades are supercharged to scatter a beam around them when detonating. Keep far away from friendlies. Or don't. I'm just a label." + icon_state = "grenade_lasburster" + item_state = "grenade_lasburster" + icon_state_mini = "grenade_lasburster" + det_time = 40 + hud_state = "grenade_lasburster" + + rotations = -1 + fire_sound = 'sound/weapons/burst_phaser2.ogg' + projectile_count = 20 + ammo_type = /datum/ammo/energy/lasburster + +/obj/item/explosive/grenade/bullet/hefa + name = "\improper M25 HEFA grenade" + desc = "High explosive fragmentation grenades cause a powerful yet very small explosion combined with a scattering ring of buckshot shrapnel, please throw very, very, VERY far away." + icon_state = "grenade_hefa2" + item_state = "grenade_hefa2" + icon_state_mini = "grenade_hefa" + hud_state = "grenade_hefa2" + rotations = -1 + fire_sound = null + projectile_count = 50 + ammo_type = /datum/ammo/bullet/hefa_buckshot + +/obj/item/explosive/grenade/bullet/hefa/prime() + explosion(loc, light_impact_range = 2, heavy_impact_range = 1) + return ..() diff --git a/code/game/objects/items/explosives/grenades/chem_grenade.dm b/code/game/objects/items/explosives/grenades/chem_grenade.dm index 45e48dfd03a88..4b01313956619 100644 --- a/code/game/objects/items/explosives/grenades/chem_grenade.dm +++ b/code/game/objects/items/explosives/grenades/chem_grenade.dm @@ -40,7 +40,7 @@ else return ..() -/obj/item/explosive/grenade/chem_grenade/razorburn_smol/attackby(obj/item/I, mob/user, params) +/obj/item/explosive/grenade/chem_grenade/razorburn_small/attackby(obj/item/I, mob/user, params) to_chat(user, span_notice("The [initial(name)] is hermetically sealed, and does not open.")) return @@ -237,7 +237,7 @@ icon_state = initial(icon_state) +"_locked" -/obj/item/explosive/grenade/chem_grenade/razorburn_smol +/obj/item/explosive/grenade/chem_grenade/razorburn_small name = "Razorburn Grenade" desc = "Contains construction nanites ready to turn a small area into razorwire after a few seconds. DO NOT ENTER AREA WHILE ACTIVE." icon_state = "grenade_razorburn" @@ -247,7 +247,7 @@ icon_state_mini = "grenade_chem_yellow" -/obj/item/explosive/grenade/chem_grenade/razorburn_smol/Initialize(mapload, ...) +/obj/item/explosive/grenade/chem_grenade/razorburn_small/Initialize(mapload, ...) . = ..() var/obj/item/reagent_containers/glass/beaker/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/B2 = new(src) diff --git a/code/game/objects/items/explosives/grenades/grenade.dm b/code/game/objects/items/explosives/grenades/grenade.dm index 1e4f136a485e3..71ef9d7067783 100644 --- a/code/game/objects/items/explosives/grenades/grenade.dm +++ b/code/game/objects/items/explosives/grenades/grenade.dm @@ -11,8 +11,8 @@ item_state = "grenade" throw_speed = 3 throw_range = 7 - flags_atom = CONDUCT - flags_equip_slot = ITEM_SLOT_BELT + atom_flags = CONDUCT + equip_slot_flags = ITEM_SLOT_BELT hitsound = 'sound/weapons/smash.ogg' icon_state_mini = "grenade_red" ///if launched from a UGL/grenade launcher @@ -61,9 +61,10 @@ /obj/item/explosive/grenade/afterattack(atom/target, mob/user, has_proximity, click_parameters) . = ..() - if(!active) + if(!active || user.next_move > world.time) return - user.throw_item(target) + if(user.throw_item(target)) + user.changeNext_move(CLICK_CD_THROWING) /obj/item/explosive/grenade/proc/activate(mob/user) if(active) @@ -72,7 +73,8 @@ if(user) log_bomber(user, "primed", src) var/datum/personal_statistics/personal_statistics = GLOB.personal_statistics_list[user.ckey] - personal_statistics.grenades_primed++ + personal_statistics.grenades_primed ++ + personal_statistics.mission_grenades_primed ++ icon_state = initial(icon_state) + "_active" active = TRUE @@ -125,7 +127,7 @@ ///The range range for the grenade's weak effect var/outer_range = 7 ///The potency of the grenade - var/rad_strength = 20 + var/rad_strength = 16 /obj/item/explosive/grenade/rad/prime() var/turf/impact_turf = get_turf(src) diff --git a/code/game/objects/items/explosives/grenades/marines.dm b/code/game/objects/items/explosives/grenades/marines.dm index 93d1350e079a2..6f617f5d1dab5 100644 --- a/code/game/objects/items/explosives/grenades/marines.dm +++ b/code/game/objects/items/explosives/grenades/marines.dm @@ -220,18 +220,14 @@ qdel(src) -/proc/flame_radius(radius = 1, turf/epicenter, burn_intensity = 25, burn_duration = 25, burn_damage = 25, fire_stacks = 15, int_var = 0.5, dur_var = 0.5, colour = "red") //~Art updated fire. +/proc/flame_radius(radius = 1, turf/epicenter, burn_intensity = 25, burn_duration = 25, burn_damage = 25, fire_stacks = 15, colour = "red") //~Art updated fire. if(!isturf(epicenter)) CRASH("flame_radius used without a valid turf parameter") radius = clamp(radius, 1, 50) //Sanitize inputs - int_var = clamp(int_var, 0.1,0.5) - dur_var = clamp(int_var, 0.1,0.5) - fire_stacks = randfloat(burn_damage*(0.5-int_var),burn_damage*(0.5+int_var) ) + randfloat(burn_damage*(0.5-int_var),burn_damage*(0.5+int_var) ) - burn_damage = randfloat(burn_damage*(0.5-int_var),burn_damage*(0.5+int_var) ) + randfloat(burn_damage*(0.5-int_var),burn_damage*(0.5+int_var) ) for(var/t in filled_turfs(epicenter, radius, "circle", air_pass = TRUE)) var/turf/turf_to_flame = t - turf_to_flame.ignite(randfloat(burn_intensity*(0.5-int_var), burn_intensity*(0.5+int_var)) + randfloat(burn_intensity*(0.5-int_var), burn_intensity*(0.5+int_var)), randfloat(burn_duration*(0.5-int_var), burn_duration*(0.5-int_var)) + randfloat(burn_duration*(0.5-int_var), burn_duration*(0.5-int_var)), colour, burn_damage, fire_stacks) + turf_to_flame.ignite(randfloat(burn_duration*0.75, burn_duration), burn_intensity, colour, burn_damage, fire_stacks) /obj/item/explosive/grenade/incendiary/som name = "\improper S30-I incendiary grenade" @@ -287,7 +283,7 @@ /// smoke type created when the grenade is primed var/datum/effect_system/smoke_spread/smoketype = /datum/effect_system/smoke_spread/bad ///radius this smoke grenade will encompass - var/smokeradius = 7 + var/smokeradius = 6 ///The duration of the smoke var/smoke_duration = 11 @@ -316,7 +312,6 @@ det_time = 4 SECONDS dangerous = TRUE smoketype = /datum/effect_system/smoke_spread/xeno/neuro/medium - smokeradius = 6 /obj/item/explosive/grenade/smokebomb/acid name = "\improper M40-A Acid smoke grenade" @@ -326,7 +321,7 @@ hud_state = "grenade_acid" det_time = 4 SECONDS dangerous = TRUE - smoketype = /datum/effect_system/smoke_spread/xeno/acid + smoketype = /datum/effect_system/smoke_spread/xeno/acid/opaque smokeradius = 5 /obj/item/explosive/grenade/smokebomb/satrapine @@ -338,7 +333,6 @@ det_time = 4 SECONDS dangerous = TRUE smoketype = /datum/effect_system/smoke_spread/satrapine - smokeradius = 6 /obj/item/explosive/grenade/smokebomb/satrapine/activate(mob/user) . = ..() @@ -354,6 +348,7 @@ hud_state = "grenade_hide" icon_state_mini = "grenade_green" smoketype = /datum/effect_system/smoke_spread/tactical + smokeradius = 7 /obj/item/explosive/grenade/smokebomb/cloak/ags name = "\improper AGLS-37 SCDP smoke grenade" @@ -371,6 +366,19 @@ icon_state_mini = "grenade_blue" dangerous = TRUE smoketype = /datum/effect_system/smoke_spread/plasmaloss + smokeradius = 7 + +/obj/item/explosive/grenade/smokebomb/antigas + name = "\improper M40-AG smoke grenade" + desc = "A gas grenade originally designed to remove any contaminants in the air for the purpose of cleaning, now repurposed to remove hostile gases." + icon_state = "grenade_agas" + item_state = "grenade_agas" + hud_state = "grenade_antigas" + det_time = 3 SECONDS + icon_state_mini = "grenade_antigas" + dangerous = TRUE + smoketype = /datum/effect_system/smoke_spread/antigas + smokeradius = 7 /obj/item/explosive/grenade/smokebomb/drain/agls name = "\improper AGLS-T smoke grenade" @@ -402,7 +410,7 @@ smoke.set_up(6, loc, 7) smoke.start() flame_radius(4, get_turf(src)) - flame_radius(1, get_turf(src), burn_intensity = 45, burn_duration = 75, burn_damage = 15, fire_stacks = 75) //The closer to the middle you are the more it hurts + flame_radius(1, get_turf(src), burn_intensity = 75, burn_duration = 45, burn_damage = 15, fire_stacks = 75) //The closer to the middle you are the more it hurts qdel(src) /obj/item/explosive/grenade/phosphorus/activate(mob/user) @@ -439,7 +447,7 @@ qdel(src) */ - +#define FLARE_FIRE_STACKS 5 /obj/item/explosive/grenade/flare name = "\improper M40 FLDP grenade" desc = "A TGMC standard issue flare utilizing the standard DP canister chassis. Capable of being loaded in any grenade launcher, or thrown by hand." @@ -482,39 +490,36 @@ if(!fuel || !active) turn_off() -/obj/item/explosive/grenade/flare/proc/turn_off() - active = FALSE - fuel = 0 - heat = 0 - item_fire_stacks = 0 - force = initial(force) - damtype = initial(damtype) - update_brightness() - icon_state = "[initial(icon_state)]_empty" // override icon state set by update_brightness - STOP_PROCESSING(SSobj, src) +/obj/item/explosive/grenade/flare/throw_impact(atom/hit_atom, speed) + if(isopenturf(hit_atom)) + var/obj/alien/weeds/node/N = locate() in loc + if(N) + qdel(N) + turn_off() + . = ..() + if(!.) + return + if(!active) + return -/obj/item/explosive/grenade/flare/proc/turn_on() - active = TRUE - force = 5 - throwforce = 10 - ENABLE_BITFIELD(resistance_flags, ON_FIRE) - item_fire_stacks = 5 - heat = 1500 - damtype = BURN - update_brightness() - playsound(src,'sound/items/flare.ogg', 15, 1) - START_PROCESSING(SSobj, src) + if(isliving(hit_atom)) + var/mob/living/living_target = hit_atom + living_target.fire_stacks += FLARE_FIRE_STACKS + living_target.IgniteMob() -/obj/item/explosive/grenade/flare/attack_self(mob/user) + var/target_zone = check_zone(living_target.zone_selected) + if(!target_zone || rand(40)) + target_zone = "chest" + if(launched && CHECK_BITFIELD(resistance_flags, ON_FIRE) && !living_target.on_fire) + living_target.apply_damage(randfloat(throwforce * 0.75, throwforce * 1.25), BURN, target_zone, FIRE, updating_health = TRUE) //Do more damage if launched from a proper launcher and active - // Usual checks +/obj/item/explosive/grenade/flare/attack_self(mob/user) if(!fuel) to_chat(user, span_notice("It's out of fuel.")) return if(active) return - // All good, turn it on. user.visible_message(span_notice("[user] activates the flare."), span_notice("You depress the ignition button, activating it!")) turn_on(user) @@ -522,48 +527,46 @@ if(!active) turn_on(user) -/obj/item/explosive/grenade/flare/on/Initialize(mapload) - . = ..() - active = TRUE - heat = 1500 - update_brightness() - force = 5 - throwforce = 10 - ENABLE_BITFIELD(resistance_flags, ON_FIRE) - item_fire_stacks = 5 - damtype = BURN - START_PROCESSING(SSobj, src) - -/obj/item/explosive/grenade/flare/proc/update_brightness() +/obj/item/explosive/grenade/flare/update_icon_state() if(active && fuel > 0) icon_state = "[initial(icon_state)]_active" item_state = "[initial(item_state)]_active" - set_light_on(TRUE) + else if(!fuel) + icon_state = "[initial(icon_state)]_empty" + item_state = "[initial(item_state)]_empty" else icon_state = initial(icon_state) item_state = initial(item_state) - set_light_on(FALSE) -/obj/item/explosive/grenade/flare/throw_impact(atom/hit_atom, speed) - if(isopenturf(hit_atom)) - var/obj/alien/weeds/node/N = locate() in loc - if(N) - qdel(N) - turn_off() - . = ..() - if(!.) - return - if(!active) - return - if(isliving(hit_atom)) - var/mob/living/L = hit_atom +///Shuts the flare off +/obj/item/explosive/grenade/flare/proc/turn_off() + active = FALSE + fuel = 0 + heat = 0 + force = initial(force) + damtype = initial(damtype) + update_icon() + set_light_on(FALSE) + STOP_PROCESSING(SSobj, src) - var/target_zone = check_zone(L.zone_selected) - if(!target_zone || rand(40)) - target_zone = "chest" - if(launched && CHECK_BITFIELD(resistance_flags, ON_FIRE) && !L.on_fire) - L.apply_damage(randfloat(throwforce * 0.75, throwforce * 1.25), BURN, target_zone, FIRE, updating_health = TRUE) //Do more damage if launched from a proper launcher and active +///Activates the flare +/obj/item/explosive/grenade/flare/proc/turn_on() + active = TRUE + force = 5 + throwforce = 10 + ENABLE_BITFIELD(resistance_flags, ON_FIRE) + heat = 1500 + damtype = BURN + update_icon() + set_light_on(TRUE) + playsound(src,'sound/items/flare.ogg', 15, 1) + START_PROCESSING(SSobj, src) + +//Starts on +/obj/item/explosive/grenade/flare/on/Initialize(mapload) + . = ..() + turn_on() /obj/item/explosive/grenade/flare/civilian name = "flare" @@ -612,8 +615,7 @@ upper_fuel_limit = 20 light_system = STATIC_LIGHT//movable light has a max range light_color = LIGHT_COLOR_CYAN - ///The brightness of the flare - var/brightness = 12 + light_range = 12 /obj/item/explosive/grenade/flare/strongerflare/throw_impact(atom/hit_atom, speed) . = ..() @@ -621,11 +623,6 @@ return anchored = TRUE//prevents marines from picking up and running around with a stronger flare -/obj/item/explosive/grenade/flare/strongerflare/update_brightness() +/obj/item/explosive/grenade/flare/strongerflare/turn_off() . = ..() - if(active && fuel > 0) - icon_state = "[initial(icon_state)]_active" - set_light(brightness) - else - icon_state = initial(icon_state) - set_light(0) + set_light(0) diff --git a/code/game/objects/items/explosives/mine.dm b/code/game/objects/items/explosives/mine.dm index ee99ea48c8658..1d418eb3b8d72 100644 --- a/code/game/objects/items/explosives/mine.dm +++ b/code/game/objects/items/explosives/mine.dm @@ -18,7 +18,7 @@ Stepping directly on the mine will also blow it up throwforce = 5 throw_range = 6 throw_speed = 3 - flags_atom = CONDUCT + atom_flags = CONDUCT ///Trigger flags for this mine var/target_mode = MINE_LIVING_ONLY /// IFF signal - used to determine friendly units @@ -42,11 +42,12 @@ Stepping directly on the mine will also blow it up return ..() /// Update the icon, adding "_armed" if appropriate to the icon_state. -/obj/item/explosive/mine/update_icon() +/obj/item/explosive/mine/update_icon_state() + . = ..() icon_state = "[initial(icon_state)][armed ? "_armed" : ""]" /// On explosion mines trigger their own explosion, assuming there were not deleted straight away (larger explosions or probability) -/obj/item/explosive/mine/ex_act() +/obj/item/explosive/mine/ex_act(severity) . = ..() if(!QDELETED(src)) INVOKE_ASYNC(src, PROC_REF(trigger_explosion)) @@ -101,6 +102,8 @@ Stepping directly on the mine will also blow it up /// Supports diarming a mine /obj/item/explosive/mine/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(!ismultitool(I) || !anchored) return @@ -162,15 +165,15 @@ Stepping directly on the mine will also blow it up return TRUE /// Alien attacks trigger the explosive to instantly detonate -/obj/item/explosive/mine/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) - if(X.status_flags & INCORPOREAL) +/obj/item/explosive/mine/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) + if(xeno_attacker.status_flags & INCORPOREAL) return FALSE if(triggered) //Mine is already set to go off return - if(X.a_intent == INTENT_HELP) + if(xeno_attacker.a_intent == INTENT_HELP) return - X.visible_message(span_danger("[X] has slashed [src]!"), \ + xeno_attacker.visible_message(span_danger("[xeno_attacker] has slashed [src]!"), \ span_danger("We slash [src]!")) playsound(loc, 'sound/weapons/slice.ogg', 25, 1) INVOKE_ASYNC(src, PROC_REF(trigger_explosion)) @@ -238,6 +241,10 @@ Stepping directly on the mine will also blow it up icon_state = "m92" target_mode = MINE_VEHICLE_ONLY +/obj/item/explosive/mine/anti_tank/update_icon(updates=ALL) + . = ..() + alpha = armed ? 50 : 255 + /obj/item/explosive/mine/anti_tank/trigger_explosion() if(triggered) return @@ -246,5 +253,27 @@ Stepping directly on the mine will also blow it up QDEL_NULL(tripwire) qdel(src) -/obj/item/explosive/mine/anti_tank/ex_act() - qdel(src) +/obj/item/explosive/mine/anti_tank/ex_act(severity) + switch(severity) + if(EXPLODE_DEVASTATE) + take_damage(INFINITY, BRUTE, BOMB, 0) + return + if(EXPLODE_HEAVY) + take_damage(rand(100, 250), BRUTE, BOMB, 0) + if(prob(25)) + return + if(EXPLODE_LIGHT) + take_damage(rand(10, 90), BRUTE, BOMB, 0) + if(prob(50)) + return + if(EXPLODE_WEAK) + take_damage(rand(5, 45), BRUTE, BOMB, 0) + return //not strong enough to detonate + if(QDELETED(src)) + return + if(!armed) + return + INVOKE_ASYNC(src, PROC_REF(trigger_explosion)) + +/obj/item/explosive/mine/anti_tank/flamer_fire_act(burnlevel) + return //its highly exploitable if fire detonates these diff --git a/code/game/objects/items/explosives/plastique.dm b/code/game/objects/items/explosives/plastique.dm index 77fd64792ba4b..e658f8e33ab86 100644 --- a/code/game/objects/items/explosives/plastique.dm +++ b/code/game/objects/items/explosives/plastique.dm @@ -5,7 +5,7 @@ icon = 'icons/obj/det.dmi' icon_state = "plastic-explosive" item_state = "plasticx" - flags_item = NOBLUDGEON + item_flags = NOBLUDGEON w_class = WEIGHT_CLASS_TINY /// whether the plastic explosive is armed or not var/armed = FALSE @@ -21,12 +21,16 @@ var/datum/effect_system/smoke_spread/smoketype = /datum/effect_system/smoke_spread/bad /// radius this smoke will encompass var/smokeradius = 1 + ///Current/last user of the c4 + var/mob/living/last_user /obj/item/explosive/plastique/Destroy() plant_target = null + last_user = null return ..() /obj/item/explosive/plastique/update_icon_state() + . = ..() icon_state = "[initial(icon_state)][plant_target ? "_set" : ""]" if(armed) icon_state = "[icon_state][alarm_sounded ? "_armed" : "_on"]" @@ -93,6 +97,7 @@ forceMove(location) armed = TRUE timer = target.plastique_time_mod(timer) + last_user = user log_bomber(user, "planted", src, "on [target] with a [timer] second fuse", message_admins = TRUE) @@ -111,12 +116,6 @@ /obj/item/explosive/plastique/attack_hand(mob/living/user) if(armed) - to_chat(user, "Disarm [src] first to remove it!") - return - return ..() - -/obj/item/explosive/plastique/attackby(obj/item/I, mob/user, params) - if(ismultitool(I) && armed) if(!do_after(user, 2 SECONDS, NONE, plant_target, BUSY_ICON_HOSTILE)) return @@ -141,7 +140,9 @@ armed = FALSE alarm_sounded = FALSE plant_target = null + last_user = null update_icon() + return ..() ///Handles the actual explosion effects /obj/item/explosive/plastique/proc/detonate() @@ -155,7 +156,7 @@ var/datum/effect_system/smoke_spread/smoke = new smoketype() smoke.set_up(smokeradius, plant_target, 2) smoke.start() - plant_target.plastique_act() + plant_target.plastique_act(last_user) qdel(src) ///Triggers a warning beep prior to the actual detonation, while also setting the actual detonation timer @@ -167,7 +168,7 @@ update_icon() ///Handles the effect of c4 on the atom - overridden as needed -/atom/proc/plastique_act() +/atom/proc/plastique_act(mob/living/plastique_user) ex_act(EXPLODE_DEVASTATE) /obj/item/explosive/plastique/genghis_charge @@ -189,7 +190,7 @@ flame_target.ignite(10, 5) qdel(src) return - new /obj/flamer_fire/autospread(flame_target, 17, 31) + new /obj/flamer_fire/autospread(flame_target, 9, 62) playsound(plant_target, sound(get_sfx("explosion_small")), 100, FALSE, 25) qdel(src) @@ -225,7 +226,7 @@ spread_directions |= old_spreader.possible_directions if(old_flame) qdel(old_flame) - new /obj/flamer_fire/autospread(turf_to_burn, 17, 31, flame_color, 0, 0, spread_directions) + new /obj/flamer_fire/autospread(turf_to_burn, 9, 62, flame_color, 0, 0, spread_directions) ///Allows the c4 timer to be tweaked on certain atoms as required /atom/proc/plastique_time_mod(time) diff --git a/code/game/objects/items/firesupport_binoculars.dm b/code/game/objects/items/firesupport_binoculars.dm index d4402f608d33d..bb848ea686393 100644 --- a/code/game/objects/items/firesupport_binoculars.dm +++ b/code/game/objects/items/firesupport_binoculars.dm @@ -7,10 +7,11 @@ ///Faction locks this item if specified var/faction = null ///lase effect - var/obj/effect/overlay/temp/laser_target/laser + var/image/laser_overlay + ///lasing time var/target_acquisition_delay = 5 SECONDS ///Last stored turf targetted by rangefinders - var/turf/targetturf + var/turf/target_atom ///Current mode for support request var/datum/fire_support/mode = null ///firemodes available for these binos @@ -41,11 +42,9 @@ . += span_warning("Available in [round(timeleft(mode.cooldown_timer) MILLISECONDS)] seconds.") /obj/item/binoculars/fire_support/Destroy() - if(laser) - QDEL_NULL(laser) + unset_target() mode = null mode_list = null - targetturf = null return ..() @@ -70,7 +69,7 @@ /obj/item/binoculars/fire_support/onunzoom(mob/living/user) . = ..() - QDEL_NULL(laser) + unset_target() if(!user?.client) return @@ -115,77 +114,88 @@ update_icon() ///lases a target and calls fire support on it -/obj/item/binoculars/fire_support/proc/acquire_target(atom/A, mob/living/carbon/human/user) +/obj/item/binoculars/fire_support/proc/acquire_target(atom/target, mob/living/carbon/human/user) set waitfor = 0 + if(user.do_actions) + balloon_alert_to_viewers("Busy") + return if(is_mainship_level(user.z)) user.balloon_alert(user, "Can't use here") return if(faction && user.faction != faction) balloon_alert_to_viewers("Security locks engaged") return - if(laser) + if(laser_overlay) to_chat(user, span_warning("You're already targeting something.")) return - if(!mode) - balloon_alert_to_viewers("Select a mode!") - return - if(!(mode.fire_support_flags & FIRESUPPORT_AVAILABLE)) - balloon_alert_to_viewers("[mode.name] unavailable") - return - if(!mode.uses) - balloon_alert_to_viewers("[mode.name] expended") - return - if(mode.cooldown_timer) - balloon_alert_to_viewers("On cooldown") - return - - var/turf/TU = get_turf(A) - var/distance = get_dist(TU, get_turf(user)) - var/zoom_screen_size = zoom_tile_offset + zoom_viewsize + 1 - if(TU.z != user.z || distance == -1 || (distance > zoom_screen_size)) - to_chat(user, span_warning("You can't focus properly through \the [src] while looking through something else.")) + if(!bino_checks(target, user)) return - - if(!user.mind) + if(!can_see_target(target, user)) + balloon_alert_to_viewers("No clear view") return - var/area/targ_area = get_area(A) - if(isspacearea(targ_area)) - to_chat(user, span_warning("Cannot fire into space.")) - return - if(targ_area.ceiling >= CEILING_UNDERGROUND) - to_chat(user, span_warning("DEPTH WARNING: Target too deep for ordnance.")) - return - if(user.do_actions) - return playsound(src, 'sound/effects/nightvision.ogg', 35) to_chat(user, span_notice("INITIATING LASER TARGETING. Stand still.")) - var/obj/effect/overlay/temp/laser_target/cas/CS = new (TU) - laser = CS - if(!do_after(user, target_acquisition_delay, NONE, user, BUSY_ICON_HOSTILE)) + target_atom = target + laser_overlay = image('icons/obj/items/projectiles.dmi', icon_state = "sniper_laser", layer =-LASER_LAYER) + target_atom.apply_fire_support_laser(laser_overlay) + if(!do_after(user, target_acquisition_delay, NONE, user, BUSY_ICON_HOSTILE, extra_checks = CALLBACK(src, PROC_REF(can_see_target), target, user))) + to_chat(user, span_danger("You lose sight of your target!")) + playsound(user,'sound/machines/click.ogg', 25, 1) + unset_target() + return + if(!bino_checks(target, user)) return + + playsound(src, 'sound/effects/binoctarget.ogg', 35) + mode.initiate_fire_support(get_turf(target_atom), user) + unset_target() + +///Internal bino checks, mainly around firemode +/obj/item/binoculars/fire_support/proc/bino_checks(atom/target, mob/living/user) if(!mode) balloon_alert_to_viewers("Select a mode!") - return + return FALSE if(!(mode.fire_support_flags & FIRESUPPORT_AVAILABLE)) balloon_alert_to_viewers("[mode.name] unavailable") - return + return FALSE if(!mode.uses) balloon_alert_to_viewers("[mode.name] expended") - return + return FALSE if(mode.cooldown_timer) balloon_alert_to_viewers("On cooldown") - return + return FALSE + var/area/targ_area = get_area(target) + if(isspacearea(targ_area)) + to_chat(user, span_warning("Cannot fire into space.")) + return FALSE + if(targ_area.ceiling >= CEILING_UNDERGROUND) + to_chat(user, span_warning("DEPTH WARNING: Target too deep for ordnance.")) + return FALSE + return TRUE - playsound(src, 'sound/effects/binoctarget.ogg', 35) - QDEL_NULL(laser) - mode.initiate_fire_support(TU, user) +///Checks if we can draw LOS to the target +/obj/item/binoculars/fire_support/proc/can_see_target(atom/target, mob/living/user) + if(QDELETED(target)) + return FALSE + if(target.z != user.z) + return FALSE + if(!(user in viewers(zoom_tile_offset + zoom_viewsize + 1, target))) + return FALSE + return TRUE + +///Unsets the target and cleans up +/obj/item/binoculars/fire_support/proc/unset_target() + if(target_atom) + target_atom.remove_fire_support_laser(laser_overlay) + target_atom = null + if(laser_overlay) + QDEL_NULL(laser_overlay) ///Acquires coords of a target turf /obj/item/binoculars/fire_support/proc/acquire_coordinates(atom/A, mob/living/carbon/human/user) - var/turf/TU = get_turf(A) - targetturf = TU - to_chat(user, span_notice("COORDINATES: LONGITUDE [targetturf.x]. LATITUDE [targetturf.y].")) + var/turf/target_turf = get_turf(A) + to_chat(user, span_notice("COORDINATES: LONGITUDE [target_turf.x]. LATITUDE [target_turf.y].")) playsound(src, 'sound/effects/binoctarget.ogg', 35) @@ -215,3 +225,18 @@ FIRESUPPORT_TYPE_SATRAPINE_SMOKE_MORTAR, FIRESUPPORT_TYPE_SMOKE_MORTAR_SOM, ) + +///Sets a laser overlay for fire support binos +/atom/proc/apply_fire_support_laser(image/laser_overlay) + add_overlay(laser_overlay) + +/mob/living/carbon/apply_fire_support_laser(image/laser_overlay) + overlays_standing[LASER_LAYER] = laser_overlay + apply_overlay(LASER_LAYER) + +///Removes a laser overlay for fire support binos +/atom/proc/remove_fire_support_laser(image/laser_overlay) + cut_overlay(laser_overlay) + +/mob/living/carbon/remove_fire_support_laser(image/laser_overlay) + remove_overlay(LASER_LAYER) diff --git a/code/game/objects/items/flash.dm b/code/game/objects/items/flash.dm index 85e52d03ec01f..be05ebdbc666d 100644 --- a/code/game/objects/items/flash.dm +++ b/code/game/objects/items/flash.dm @@ -8,7 +8,7 @@ w_class = WEIGHT_CLASS_SMALL throw_speed = 4 throw_range = 10 - flags_atom = CONDUCT + atom_flags = CONDUCT var/times_used = 0 //Number of times it's been used. var/broken = 0 //Is the flash burnt out? diff --git a/code/game/objects/items/flashlight.dm b/code/game/objects/items/flashlight.dm index b5d8d37b88aae..5a61ee9b61164 100644 --- a/code/game/objects/items/flashlight.dm +++ b/code/game/objects/items/flashlight.dm @@ -9,8 +9,8 @@ ) item_state = "flashlight" w_class = WEIGHT_CLASS_SMALL - flags_atom = CONDUCT - flags_equip_slot = ITEM_SLOT_BELT + atom_flags = CONDUCT + equip_slot_flags = ITEM_SLOT_BELT actions_types = list(/datum/action/item_action) light_range = 5 light_power = 3 //luminosity when on @@ -40,12 +40,12 @@ update_action_button_icons() update_icon() -/obj/item/flashlight/attack_alien(mob/living/carbon/xenomorph/X, isrightclick = FALSE) - if(turn_light(X, FALSE) != CHECKS_PASSED) +/obj/item/flashlight/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) + if(turn_light(xeno_attacker, FALSE) != CHECKS_PASSED) return playsound(loc, "alien_claw_metal", 25, 1) - X.do_attack_animation(src, ATTACK_EFFECT_CLAW) - to_chat(X, span_warning("We disable the metal thing's lights.") ) + xeno_attacker.do_attack_animation(src, ATTACK_EFFECT_CLAW) + to_chat(xeno_attacker, span_warning("We disable the metal thing's lights.") ) /obj/item/flashlight/update_icon_state() . = ..() @@ -65,6 +65,8 @@ /obj/item/flashlight/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/tool/screwdriver)) if(!raillight_compatible) //No fancy messages, just no @@ -92,8 +94,8 @@ var/mob/living/carbon/human/H = M //mob has protective eyewear - if(ishuman(M) && ((H.head && H.head.flags_inventory & COVEREYES) || (H.wear_mask && H.wear_mask.flags_inventory & COVEREYES) || (H.glasses && H.glasses.flags_inventory & COVEREYES))) - to_chat(user, span_notice("You're going to need to remove that [(H.head && H.head.flags_inventory & COVEREYES) ? "helmet" : (H.wear_mask && H.wear_mask.flags_inventory & COVEREYES) ? "mask": "glasses"] first.")) + if(ishuman(M) && ((H.head && H.head.inventory_flags & COVEREYES) || (H.wear_mask && H.wear_mask.inventory_flags & COVEREYES) || (H.glasses && H.glasses.inventory_flags & COVEREYES))) + to_chat(user, span_notice("You're going to need to remove that [(H.head && H.head.inventory_flags & COVEREYES) ? "helmet" : (H.wear_mask && H.wear_mask.inventory_flags & COVEREYES) ? "mask": "glasses"] first.")) return if(M == user) //they're using it on themselves @@ -121,7 +123,7 @@ desc = "A pen-sized light, used by medical staff." icon_state = "penlight" item_state = "" - flags_atom = CONDUCT + atom_flags = CONDUCT light_range = 2 w_class = WEIGHT_CLASS_TINY raillight_compatible = FALSE @@ -174,12 +176,12 @@ if(!usr.stat) attack_self(usr) -/obj/item/flashlight/lamp/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) - if(X.status_flags & INCORPOREAL) +/obj/item/flashlight/lamp/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) + if(xeno_attacker.status_flags & INCORPOREAL) return FALSE - X.do_attack_animation(src, ATTACK_EFFECT_SMASH) + xeno_attacker.do_attack_animation(src, ATTACK_EFFECT_SMASH) playsound(loc, 'sound/effects/metalhit.ogg', 20, TRUE) - X.visible_message(span_danger("\The [X] smashes [src]!"), \ + xeno_attacker.visible_message(span_danger("\The [xeno_attacker] smashes [src]!"), \ span_danger("We smash [src]!"), null, 5) deconstruct(FALSE) diff --git a/code/game/objects/items/frames/alarms.dm b/code/game/objects/items/frames/alarms.dm index 0c85a54efd62f..66c946de8456a 100644 --- a/code/game/objects/items/frames/alarms.dm +++ b/code/game/objects/items/frames/alarms.dm @@ -8,10 +8,12 @@ Code shamelessly copied from apc_frame desc = "Used for building Fire Alarms" icon = 'icons/obj/objects.dmi' icon_state = "fire_bitem" - flags_atom = CONDUCT + atom_flags = CONDUCT /obj/item/frame/fire_alarm/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(iswrench(I)) new /obj/item/stack/sheet/metal(loc, 2) diff --git a/code/game/objects/items/frames/frame.dm b/code/game/objects/items/frames/frame.dm index 0e312d9db56b3..50cfb05502a1e 100644 --- a/code/game/objects/items/frames/frame.dm +++ b/code/game/objects/items/frames/frame.dm @@ -14,10 +14,12 @@ desc = "Used for repairing or building APCs" icon = 'icons/obj/objects.dmi' icon_state = "apc_frame" - flags_atom = CONDUCT + atom_flags = CONDUCT /obj/item/frame/apc/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(iswrench(I)) new /obj/item/stack/sheet/metal(loc, 2) diff --git a/code/game/objects/items/frames/light_fixtures.dm b/code/game/objects/items/frames/light_fixtures.dm index 907b862237656..5cecbe4ef2ffe 100644 --- a/code/game/objects/items/frames/light_fixtures.dm +++ b/code/game/objects/items/frames/light_fixtures.dm @@ -5,12 +5,14 @@ desc = "Used for building lights." icon = 'icons/obj/lighting.dmi' icon_state = "tube-construct-item" - flags_atom = CONDUCT + atom_flags = CONDUCT var/fixture_type = "tube" var/sheets_refunded = 2 /obj/item/frame/light_fixture/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(iswrench(I)) new /obj/item/stack/sheet/metal(loc, sheets_refunded) diff --git a/code/game/objects/items/frames/table_rack.dm b/code/game/objects/items/frames/table_rack.dm index e13d0f43fe2f0..72167b1233c7a 100644 --- a/code/game/objects/items/frames/table_rack.dm +++ b/code/game/objects/items/frames/table_rack.dm @@ -16,13 +16,15 @@ slot_r_hand_str = 'icons/mob/inhands/equipment/engineering_right.dmi', ) item_state = "table_parts" - flags_atom = CONDUCT + atom_flags = CONDUCT attack_verb = list("slammed", "bashed", "battered", "bludgeoned", "thrashed", "whacked") var/table_type = /obj/structure/table //what type of table it creates when assembled var/deconstruct_type = /obj/item/stack/sheet/metal /obj/item/frame/table/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return var/turf/table_turf = get_turf(src) if(iswrench(I) && deconstruct_type) @@ -98,12 +100,14 @@ name = "wooden table parts" desc = "A kit for a table, including a large, flat wooden surface and four legs. Some assembly required." icon_state = "wood_tableparts" - flags_atom = null + atom_flags = null table_type = /obj/structure/table/woodentable deconstruct_type = /obj/item/stack/sheet/wood /obj/item/frame/table/wood/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/stack/tile/carpet)) var/obj/item/stack/tile/carpet/C = I @@ -128,12 +132,14 @@ name = "gamble table parts" desc = "A kit for a table, including a large, flat wooden and carpet surface and four legs. Some assembly required." icon_state = "gamble_tableparts" - flags_atom = null + atom_flags = null table_type = /obj/structure/table/gamblingtable deconstruct_type = /obj/item/stack/sheet/wood /obj/item/frame/table/gambling/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(iscrowbar(I)) to_chat(user, span_notice("You pry the carpet out of [src].")) @@ -159,11 +165,13 @@ slot_r_hand_str = 'icons/mob/inhands/equipment/engineering_right.dmi', ) icon_state = "rack_parts" - flags_atom = CONDUCT + atom_flags = CONDUCT /obj/item/frame/rack/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(iswrench(I)) new /obj/item/stack/sheet/metal(loc) diff --git a/code/game/objects/items/gift_wrappaper.dm b/code/game/objects/items/gift_wrappaper.dm index 11cba3b1bae92..e100af4070f59 100644 --- a/code/game/objects/items/gift_wrappaper.dm +++ b/code/game/objects/items/gift_wrappaper.dm @@ -132,7 +132,7 @@ /obj/item/weapon/gun/launcher/rocket/m57a4/xmas - flags_gun_features = NONE + gun_features_flags = NONE /obj/item/weapon/gun/launcher/rocket/m57a4/xmas/able_to_fire(mob/living/user) @@ -144,7 +144,7 @@ /obj/item/weapon/gun/rifle/sniper/elite/xmas - flags_gun_features = NONE + gun_features_flags = NONE /obj/item/weapon/gun/rifle/sniper/elite/xmas/able_to_fire(mob/living/user) @@ -159,6 +159,8 @@ /obj/effect/spresent/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(!iswirecutter(I)) to_chat(user, span_notice("You need wirecutters for that.")) @@ -186,6 +188,8 @@ /obj/item/wrapping_paper/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return var/a_used = 2 ** (w_class - 1) diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm index 98185408be90c..e5ac03a04b336 100644 --- a/code/game/objects/items/handcuffs.dm +++ b/code/game/objects/items/handcuffs.dm @@ -4,8 +4,8 @@ gender = PLURAL icon = 'icons/obj/items/items.dmi' icon_state = "handcuff" - flags_atom = CONDUCT - flags_equip_slot = ITEM_SLOT_BELT + atom_flags = CONDUCT + equip_slot_flags = ITEM_SLOT_BELT throwforce = 5 w_class = WEIGHT_CLASS_SMALL throw_speed = 2 @@ -63,7 +63,7 @@ . = ..() if(!.) return - flags_item |= DELONDROP + item_flags |= DELONDROP @@ -100,6 +100,8 @@ /obj/item/restraints/handcuffs/cable/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/stack/rods)) var/obj/item/stack/rods/R = I @@ -110,7 +112,7 @@ user.put_in_hands(W) to_chat(user, span_notice("You wrap the cable restraint around the top of the rod.")) qdel(src) - update_icon(user) + update_icon() /obj/item/restraints/handcuffs/cyborg diff --git a/code/game/objects/items/implants/implant.dm b/code/game/objects/items/implants/implant.dm index e3129754e7df6..4ce67774952aa 100644 --- a/code/game/objects/items/implants/implant.dm +++ b/code/game/objects/items/implants/implant.dm @@ -16,7 +16,7 @@ ///What level of malfunction/breakage this implant is at, used for functionality checks var/malfunction = MALFUNCTION_NONE ///Implant secific flags - var/flags_implant = GRANT_ACTIVATION_ACTION + var/implant_flags = GRANT_ACTIVATION_ACTION ///Whitelist for llimbs that this implavnt is allowed to be inserted into, all limbs by default var/list/allowed_limbs ///Activation_action reference @@ -27,7 +27,7 @@ /obj/item/implant/Initialize(mapload) . = ..() - if(flags_implant & GRANT_ACTIVATION_ACTION) + if(implant_flags & GRANT_ACTIVATION_ACTION) activation_action = new(src, src) if(allow_reagents) reagents = new /datum/reagents(MAX_IMPLANT_REAGENTS) @@ -43,7 +43,7 @@ return ..() /obj/item/implant/ui_action_click(mob/user, datum/action/item_action/action) - activate() + return activate() ///Handles the actual activation of the implant/it's effects. Returns TRUE on succesful activation and FALSE on failure for parentcalls /obj/item/implant/proc/activate() @@ -77,7 +77,7 @@ CRASH("[src] implanted into [target] [user ? "by [user]" : ""] but had no limb, despite being set to implant in [limb_targeting].") affected.implants += src part = affected - if(flags_implant & ACTIVATE_ON_HEAR) + if(implant_flags & ACTIVATE_ON_HEAR) RegisterSignal(src, COMSIG_MOVABLE_HEAR, PROC_REF(on_hear)) activation_action?.give_action(target) embed_into(target, limb_targeting, TRUE) @@ -92,7 +92,7 @@ if(!implanted) return FALSE activation_action?.remove_action(implant_owner) - if(flags_implant & ACTIVATE_ON_HEAR) + if(implant_flags & ACTIVATE_ON_HEAR) UnregisterSignal(src, COMSIG_MOVABLE_HEAR) implanted = FALSE part.implants -= src diff --git a/code/game/objects/items/implants/implant_chem.dm b/code/game/objects/items/implants/implant_chem.dm index b8224c063a75d..9dc0a00938a76 100644 --- a/code/game/objects/items/implants/implant_chem.dm +++ b/code/game/objects/items/implants/implant_chem.dm @@ -2,7 +2,7 @@ name = "chemical implant" desc = "A chemical implant containing a single use chemical cocktail which is added via syringe." allow_reagents = TRUE - flags_implant = ACTIVATE_ON_HEAR|GRANT_ACTIVATION_ACTION + implant_flags = ACTIVATE_ON_HEAR|GRANT_ACTIVATION_ACTION var/used = FALSE var/activation_phrase = "aaaaaa help i dying help maint" @@ -60,5 +60,4 @@ return FALSE var/mob/living/carbon/carb_mob = implant_owner - var/current_blood = carb_mob.blood_volume - carb_mob.blood_volume += min(BLOOD_VOLUME_MAXIMUM - current_blood, blood_amount) + carb_mob.adjust_blood_volume(blood_amount) diff --git a/code/game/objects/items/implants/implant_cloak.dm b/code/game/objects/items/implants/implant_cloak.dm index cfa861c7df6c4..d25eabf60499a 100644 --- a/code/game/objects/items/implants/implant_cloak.dm +++ b/code/game/objects/items/implants/implant_cloak.dm @@ -5,7 +5,7 @@ name = "cloak implant" desc = "A top of the line nanotrasen implant, designed for infiltration." icon_state = "gripper" - flags_implant = GRANT_ACTIVATION_ACTION + implant_flags = GRANT_ACTIVATION_ACTION cooldown_time = 0 var/deactivation_timer diff --git a/code/game/objects/items/implants/implant_items.dm b/code/game/objects/items/implants/implant_items.dm index 81e3217d5ec1d..c9af32eed5577 100644 --- a/code/game/objects/items/implants/implant_items.dm +++ b/code/game/objects/items/implants/implant_items.dm @@ -69,8 +69,8 @@ item_state = "armblade" force = 75 attack_speed = 8 - flags_atom = CONDUCT - flags_equip_slot = NONE + atom_flags = CONDUCT + equip_slot_flags = NONE w_class = WEIGHT_CLASS_BULKY //not needed but just in case why not sharp = IS_SHARP_ITEM_BIG hitsound = 'sound/weapons/slash.ogg' diff --git a/code/game/objects/items/implants/implant_neurostim.dm b/code/game/objects/items/implants/implant_neurostim.dm index 7d4292baa0bb0..469208177647c 100644 --- a/code/game/objects/items/implants/implant_neurostim.dm +++ b/code/game/objects/items/implants/implant_neurostim.dm @@ -2,7 +2,7 @@ name = "neurostimulator implant" desc = "An implant which regulates nociception and sensory function. Benefits include pain reduction, improved balance, and improved resistance to overstimulation and disoritentation. To encourage compliance, negative stimulus is applied if the implant hears a (non-radio) spoken codeprhase. Implant may be degraded by the body's immune system over time, and thus may occasionally malfunction." icon_state = "implant_evil" - flags_implant = ACTIVATE_ON_HEAR + implant_flags = ACTIVATE_ON_HEAR var/phrase = "supercalifragilisticexpialidocious" /obj/item/implant/neurostim/get_data() diff --git a/code/game/objects/items/implants/implant_suicidedust.dm b/code/game/objects/items/implants/implant_suicidedust.dm index 9f860f7b9f256..72d479d4e0e00 100644 --- a/code/game/objects/items/implants/implant_suicidedust.dm +++ b/code/game/objects/items/implants/implant_suicidedust.dm @@ -2,7 +2,7 @@ ///In order to prevent Marines from looting things they should not ever have /obj/item/implant/suicide_dust name = "self-dusting implant" - flags_implant = NONE + implant_flags = NONE /obj/item/implant/suicide_dust/implant(mob/living/carbon/human/target, mob/living/user) . = ..() diff --git a/code/game/objects/items/implants/implantcase.dm b/code/game/objects/items/implants/implantcase.dm index 204d9a1b28bc5..5170cfd476ecb 100644 --- a/code/game/objects/items/implants/implantcase.dm +++ b/code/game/objects/items/implants/implantcase.dm @@ -25,6 +25,7 @@ return ..() /obj/item/implantcase/update_icon_state() + . = ..() if(imp) icon_state = "implantcase-[imp.implant_color]" else @@ -33,6 +34,8 @@ /obj/item/implantcase/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/tool/pen)) var/label = stripped_input(user, "What would you like the label to be?", "[name]", null) diff --git a/code/game/objects/items/jetpack.dm b/code/game/objects/items/jetpack.dm index 24fe22c49e1fe..849ea47fe7137 100644 --- a/code/game/objects/items/jetpack.dm +++ b/code/game/objects/items/jetpack.dm @@ -12,7 +12,7 @@ slot_r_hand_str = 'icons/mob/inhands/equipment/backpacks_right.dmi', ) w_class = WEIGHT_CLASS_BULKY - flags_equip_slot = ITEM_SLOT_BACK + equip_slot_flags = ITEM_SLOT_BACK obj_flags = CAN_BE_HIT ///Time between uses var/cooldown_time = 10 SECONDS @@ -26,11 +26,12 @@ var/speed = 1 ///True when jetpack has flame overlay var/lit = FALSE - ///True if you can use shift click/middle click to use it - var/selected = FALSE + ///Controlling action + var/datum/action/ability/activable/item_toggle/jetpack/toggle_action /obj/item/jetpack_marine/Initialize(mapload) . = ..() + toggle_action = new(src) update_icon() /obj/item/jetpack_marine/examine(mob/user, distance, infix, suffix) @@ -45,40 +46,14 @@ /obj/item/jetpack_marine/equipped(mob/user, slot) . = ..() if(slot == SLOT_BACK) - var/datum/action/item_action/toggle/action = new(src) - action.give_action(user) + toggle_action.give_action(user) /obj/item/jetpack_marine/dropped(mob/user) . = ..() - UnregisterSignal(user, list(COMSIG_MOB_MIDDLE_CLICK, COMSIG_MOB_CLICK_ALT_RIGHT, COMSIG_ITEM_EXCLUSIVE_TOGGLE)) - selected = FALSE - LAZYCLEARLIST(actions) - -/obj/item/jetpack_marine/ui_action_click(mob/user, datum/action/item_action/action) - if(selected) - UnregisterSignal(user, list(COMSIG_MOB_MIDDLE_CLICK, COMSIG_MOB_CLICK_ALT_RIGHT, COMSIG_ITEM_EXCLUSIVE_TOGGLE)) - action.set_toggle(FALSE) - else - RegisterSignals(user, list(COMSIG_MOB_MIDDLE_CLICK, COMSIG_MOB_CLICK_ALT_RIGHT), PROC_REF(can_use_jetpack)) - SEND_SIGNAL(user, COMSIG_ITEM_EXCLUSIVE_TOGGLE, user) - RegisterSignal(user, COMSIG_ITEM_EXCLUSIVE_TOGGLE, PROC_REF(unselect)) - action.set_toggle(TRUE) - selected = !selected - -///Signal handler for making it impossible to use middleclick to use the jetpack -/obj/item/jetpack_marine/proc/unselect(datum/source, mob/user) - SIGNAL_HANDLER - if(!selected) - return - selected = FALSE - UnregisterSignal(user, list(COMSIG_MOB_MIDDLE_CLICK, COMSIG_MOB_CLICK_ALT_RIGHT, COMSIG_ITEM_EXCLUSIVE_TOGGLE)) - for(var/action in user.actions) - if (!istype(action, /datum/action/item_action)) - continue - var/datum/action/item_action/iaction = action - if(iaction?.holder_item == src) - iaction.set_toggle(FALSE) + toggle_action.remove_action(user) +/obj/item/jetpack_marine/ui_action_click(mob/user, datum/action/item_action/action, target) + return use_jetpack(target, user) ///remove the flame overlay /obj/item/jetpack_marine/proc/reset_flame(mob/living/carbon/human/human_user) @@ -105,8 +80,8 @@ human_user.update_inv_back() update_icon() new /obj/effect/temp_visual/smoke(get_turf(human_user)) - human_user.fly_at(A, calculate_range(human_user), speed) RegisterSignal(human_user, COMSIG_MOVABLE_POST_THROW, PROC_REF(reset_flame)) + human_user.fly_at(A, calculate_range(human_user), speed) return TRUE ///Calculate the max range of the jetpack, changed by some item slowdown @@ -122,21 +97,6 @@ if(1.2 to INFINITY)//heavy armor with shield and tyr mk2 return 2 -///Check if we can use the jetpack and give feedback to the users -/obj/item/jetpack_marine/proc/can_use_jetpack(datum/source, atom/A) - SIGNAL_HANDLER - var/mob/living/carbon/human/human_user = usr - if(human_user.incapacitated() || human_user.lying_angle) - return - var/time_left = S_TIMER_COOLDOWN_TIMELEFT(src, COOLDOWN_JETPACK) - if(time_left) - balloon_alert(human_user, "[time_left * 0.1] seconds") - return - if(fuel_left < FUEL_USE) - balloon_alert(human_user, "No fuel") - return - INVOKE_ASYNC(src, PROC_REF(use_jetpack), A, human_user) - /obj/item/jetpack_marine/update_overlays() . = ..() switch(fuel_indicator) @@ -190,6 +150,8 @@ /obj/item/jetpack_marine/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(!istype(I, /obj/item/ammo_magazine/flamer_tank)) return var/obj/item/ammo_magazine/flamer_tank/FT = I @@ -206,6 +168,27 @@ balloon_alert(user, "Refilled") update_icon() +/datum/action/ability/activable/item_toggle/jetpack + name = "Use jetpack" + action_icon_state = "axe_sweep" + desc = "Briefly fly using your jetpack." + use_state_flags = ABILITY_USE_STAGGERED|ABILITY_USE_BUSY + keybinding_signals = list(KEYBINDING_NORMAL = COMSIG_ITEM_TOGGLE_JETPACK) + +/datum/action/ability/activable/item_toggle/jetpack/New(Target, obj/item/holder) + . = ..() + var/obj/item/jetpack_marine/jetpack = Target + cooldown_duration = jetpack.cooldown_time + +/datum/action/ability/activable/item_toggle/jetpack/can_use_ability(silent, override_flags, selecting) + var/mob/living/carbon/carbon_owner = owner + if(carbon_owner.incapacitated() || carbon_owner.lying_angle) + return FALSE + var/obj/item/jetpack_marine/jetpack = holder_item + if(jetpack.fuel_left < FUEL_USE) + carbon_owner.balloon_alert(carbon_owner, "No fuel") + return + return ..() /obj/item/jetpack_marine/heavy name = "heavy lift jetpack" diff --git a/code/game/objects/items/lightreplacer.dm b/code/game/objects/items/lightreplacer.dm index e69b12102395d..80d5fabb41674 100644 --- a/code/game/objects/items/lightreplacer.dm +++ b/code/game/objects/items/lightreplacer.dm @@ -31,8 +31,8 @@ ) item_state = "electronic" - flags_atom = CONDUCT - flags_equip_slot = ITEM_SLOT_BELT + atom_flags = CONDUCT + equip_slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_SMALL @@ -52,6 +52,8 @@ /obj/item/lightreplacer/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/stack/sheet/glass)) var/obj/item/stack/sheet/glass/G = I diff --git a/code/game/objects/items/loot_box.dm b/code/game/objects/items/loot_box.dm index 2d2d5238a91af..d5274f30c93f7 100644 --- a/code/game/objects/items/loot_box.dm +++ b/code/game/objects/items/loot_box.dm @@ -421,7 +421,7 @@ /obj/item/storage/box/crate/loot/sadarclassic_pack, ) rare_list = list( - /obj/item/storage/box/crate/loot/tl102_pack, + /obj/item/storage/box/crate/loot/hsg_102_pack, /obj/item/storage/box/crate/loot/mortar_pack, /obj/structure/closet/crate/loot/howitzer_pack, /obj/item/storage/box/crate/loot/sentry_pack, @@ -620,10 +620,10 @@ new /obj/item/mortal_shell/howitzer/white_phos(src) new /obj/item/mortal_shell/howitzer/white_phos(src) -/obj/item/storage/box/crate/loot/tl102_pack/Initialize(mapload) +/obj/item/storage/box/crate/loot/hsg_102_pack/Initialize(mapload) . = ..() - new /obj/item/storage/box/tl102(src) - new /obj/item/storage/box/tl102(src) + new /obj/item/storage/box/hsg_102(src) + new /obj/item/storage/box/hsg_102(src) /obj/item/storage/box/crate/loot/agl_pack/Initialize(mapload) . = ..() @@ -676,5 +676,5 @@ /obj/item/storage/box/crate/loot/sadarclassic_pack/Initialize(mapload) . = ..() new /obj/item/weapon/gun/launcher/rocket/sadar(src) - new /obj/item/storage/backpack/marine/satchel/scout_cloak/scout(src) + new /obj/item/storage/backpack/marine/satchel/scout_cloak(src) new /obj/item/ammo_magazine/rocket/sadar/ap(src) diff --git a/code/game/objects/items/marine_gear.dm b/code/game/objects/items/marine_gear.dm index 07f1d72c973fa..f17e9eb1bfb98 100644 --- a/code/game/objects/items/marine_gear.dm +++ b/code/game/objects/items/marine_gear.dm @@ -64,7 +64,7 @@ list("dark chocolate TGMC protein bar","The dark chocolate flavor helps it out a bit, but its still a cheap protein bar.","#5a3b1d",list("bitter dark chocolate" = 1)), list("milk chocolate TGMC protein bar","A nice milky addition to a otherwise bland protein taste.","#efc296",list("off flavor milk chocolate"= 1)), list("raspberry lime TGMC protein bar","A flavored protein bar, some might say a bit too strongly flavored for their tastes.","#ff0066",list("sour raspberry and lime" = 1)), - list("chicken TGMC protein bar","Protein bar covered with chicken powder one might find in ramen. Get some extra sodium with your protein.","#cccc00",list= ("powdered chicken")), + list("chicken TGMC protein bar","Protein bar covered with chicken powder one might find in ramen. Get some extra sodium with your protein.","#cccc00",list("powdered chicken" = 1)), list("blueberry TGMC protein bar","A nice blueberry crunch into your otherwise stale and boring protein bar.","#4e39c5",list("blueberry" = 1)), list("cement TGMC protein bar", "A gray bar that's allegedly made of cement. It seems to have hardened up. Perhaps it'll make you harden up, too.", "#B2B2B2", list("cement" = 1)) ), @@ -77,7 +77,7 @@ list("milk chocolate SOM protein bar","A nice milky addition to a otherwise bland protein taste.","#efc296",list("off flavor milk chocolate"= 1)), list("beef SOM protein bar","A beef flavored protein bar, doesn't taste like any cow you've ever tried.","#ff0066",list("meat substitute" = 1)), list("meat SOM protein bar","A surprisingly tasty protein bar made from an unspecified meat. Rumors claiming they're made from reconstituted TGMC personnel have been widely dismissed.","#a7576b",list("pork" = 1)), - list("chicken SOM protein bar","Protein bar covered with chicken powder one might find in ramen. Get some extra sodium with your protein.","#cccc00",list= ("powdered chicken")), + list("chicken SOM protein bar","Protein bar covered with chicken powder one might find in ramen. Get some extra sodium with your protein.","#cccc00",list("powdered chicken" = 1)), list("blueberry SOM protein bar","A nice blueberry crunch into your otherwise stale and boring protein bar.","#4e39c5",list("blueberry" = 1)) ), ) @@ -248,11 +248,11 @@ icon = 'icons/obj/clothing/belts.dmi' icon_state = "gun_sling" item_state = "gun_sling" - flags_equip_slot = ITEM_SLOT_BELT + equip_slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_BULKY equip_delay_self = 2 SECONDS unequip_delay_self = 1 SECONDS - flags_inventory = NOQUICKEQUIP + inventory_flags = NOQUICKEQUIP ///The current attacher. Gets remade for every new item var/datum/component/reequip/reequip_component diff --git a/code/game/objects/items/megaphone.dm b/code/game/objects/items/megaphone.dm index 738397e174100..991d22eef181c 100644 --- a/code/game/objects/items/megaphone.dm +++ b/code/game/objects/items/megaphone.dm @@ -9,7 +9,7 @@ ) item_state = "radio" w_class = WEIGHT_CLASS_SMALL - flags_atom = CONDUCT + atom_flags = CONDUCT var/spamcheck = 0 var/list/voicespan = list(SPAN_COMMAND) diff --git a/code/game/objects/items/misc.dm b/code/game/objects/items/misc.dm index c216bbb75e074..9b94a042cb8be 100644 --- a/code/game/objects/items/misc.dm +++ b/code/game/objects/items/misc.dm @@ -123,3 +123,11 @@ desc = "A small set of servos and gears, coupled to a battery, antenna and circuitry. Attach it to a mortar to allow a shipborne AI to remotely target it." icon = 'icons/obj/items/items.dmi' icon_state = "modkit" + +/obj/item/rosary + name = "Rosary" + desc = "A small hematite-beaded silver rosary" + icon = 'icons/obj/items/items.dmi' + icon_state = "rosary" + item_state = "rosary" + w_class = WEIGHT_CLASS_TINY diff --git a/code/game/objects/items/motion_detector.dm b/code/game/objects/items/motion_detector.dm index 6afe631102738..1169178dbd9c0 100644 --- a/code/game/objects/items/motion_detector.dm +++ b/code/game/objects/items/motion_detector.dm @@ -24,6 +24,7 @@ qdel(src) /obj/effect/blip/edge_blip/update_icon_state() + . = ..() icon_state = "edge_blip_[identifier]" /obj/effect/blip/close_blip @@ -52,7 +53,7 @@ desc = "A device that detects hostile movement. Hostiles appear as red blips. Friendlies with the correct IFF signature appear as green, and their bodies as blue, unrevivable bodies as dark blue. It has a mode selection interface." icon_state = "minidetector" slot = ATTACHMENT_SLOT_RAIL - attachment_action_type = /datum/action/item_action/toggle/motion_detector + attachment_action_type = /datum/action/item_action/toggle /// Who's using this item var/mob/living/carbon/human/operator ///If a hostile was detected @@ -65,19 +66,20 @@ var/list/obj/effect/blip/blips_list = list() /obj/item/attachable/motiondetector/Destroy() - clean_operator() + clean_operator(forced = TRUE) return ..() /obj/item/attachable/motiondetector/activate(mob/user, turn_off) if(operator) - clean_operator() - return + clean_operator(forced = TRUE) + return TRUE operator = user RegisterSignals(operator, list(COMSIG_QDELETING, COMSIG_GUN_USER_UNSET), PROC_REF(clean_operator)) RegisterSignals(src, list(COMSIG_ITEM_EQUIPPED_TO_SLOT, COMSIG_ITEM_REMOVED_INVENTORY), PROC_REF(clean_operator)) UnregisterSignal(operator, COMSIG_GUN_USER_SET) START_PROCESSING(SSobj, src) update_icon() + return TRUE ///Activate the attachement when your are putting the gun out of your suit slot /obj/item/attachable/motiondetector/proc/start_processing_again(datum/source, obj/item/weapon/gun/equipping) @@ -93,12 +95,8 @@ /obj/item/attachable/motiondetector/attack_self(mob/user) activate(user) -/obj/item/attachable/motiondetector/update_icon() - . = ..() - for(var/datum/action/action AS in master_gun?.actions) - action.update_button_icon() - /obj/item/attachable/motiondetector/update_icon_state() + . = ..() icon_state = initial(icon_state) + (isnull(operator) ? "" : "_on") /obj/item/attachable/motiondetector/equipped(mob/user, slot) @@ -108,12 +106,12 @@ /obj/item/attachable/motiondetector/removed_from_inventory(mob/user) . = ..() - clean_operator() + clean_operator(forced = TRUE) //Exploit prevention. If you are putting the tac sensor into a storage in your hand (Like holding a satchel), hand == loc will return /// Signal handler to clean out user vars -/obj/item/attachable/motiondetector/proc/clean_operator() +/obj/item/attachable/motiondetector/proc/clean_operator(datum/source, obj/item/weapon/gun/gun, forced = FALSE) SIGNAL_HANDLER - if(operator && (operator.l_hand == src || operator.r_hand == src || operator.l_hand == loc || operator.r_hand == loc)) + if(!forced && operator && (operator.l_hand == src || operator.r_hand == src || operator.l_hand == loc || operator.r_hand == loc)) return STOP_PROCESSING(SSobj, src) clean_blips() diff --git a/code/game/objects/items/multitool.dm b/code/game/objects/items/multitool.dm index 72c0a5593aac0..a97dea728da00 100644 --- a/code/game/objects/items/multitool.dm +++ b/code/game/objects/items/multitool.dm @@ -8,7 +8,7 @@ name = "multitool" desc = "Used for pulsing wires to test which to cut. Not recommended by doctors." icon_state = "multitool" - flags_atom = CONDUCT + atom_flags = CONDUCT force = 5 w_class = WEIGHT_CLASS_SMALL throwforce = 5 diff --git a/code/game/objects/items/pamphlets.dm b/code/game/objects/items/pamphlets.dm new file mode 100644 index 0000000000000..ce2adbc2788d6 --- /dev/null +++ b/code/game/objects/items/pamphlets.dm @@ -0,0 +1,41 @@ +//skill modifying item +/obj/item/pamphlet + name = "generic phamplet" + desc = "you shouldnt see this" + icon = 'icons/obj/items/paper.dmi' + icon_state = "paper_words" + var/cqc + var/melee_weapons + var/firearms + var/pistols + var/shotguns + var/rifles + var/smgs + var/heavy_weapons + var/smartgun + var/engineer + var/construction + var/leadership + var/medical + var/surgery + var/pilot + var/police + var/powerloader + var/large_vehicle + var/stamina + +/obj/item/pamphlet/attack_self(mob/living/user) + . = ..() + if(!do_after(user, 5 SECONDS, NONE, user)) + return + user.set_skills(user.skills.modifyRating(cqc, melee_weapons, firearms, pistols, shotguns, rifles, smgs, heavy_weapons, smartgun, \ + engineer, construction, leadership, medical, surgery, pilot, police, powerloader, large_vehicle, stamina)) + user.temporarilyRemoveItemFromInventory(src) + qdel(src) + + +/obj/item/pamphlet/tank_loader + name = "loader's instruction manual" + desc = "A crude drawing depicting what you think is loading a tank gun. Is that crayon?" + large_vehicle = 1 + diff --git a/code/game/objects/items/pinpointer.dm b/code/game/objects/items/pinpointer.dm index ec28ba5951f8c..98e16d7e3103a 100644 --- a/code/game/objects/items/pinpointer.dm +++ b/code/game/objects/items/pinpointer.dm @@ -2,8 +2,8 @@ name = "Xeno structure pinpointer" icon = 'icons/Marine/marine-navigation.dmi' icon_state = "pinoff" - flags_atom = CONDUCT - flags_equip_slot = ITEM_SLOT_BELT + atom_flags = CONDUCT + equip_slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_TINY item_icons = list( slot_l_hand_str = 'icons/mob/inhands/equipment/engineering_left.dmi', diff --git a/code/game/objects/items/plantable_flags.dm b/code/game/objects/items/plantable_flags.dm index 4f172ae09b931..4a9d4bdbbff08 100644 --- a/code/game/objects/items/plantable_flags.dm +++ b/code/game/objects/items/plantable_flags.dm @@ -25,7 +25,7 @@ playsound(loc, 'sound/effects/thud.ogg', 100) user.dropItemToGround(src) is_collapsed = FALSE - update_icon_state() + update_appearance() /obj/item/flag_base/attack_hand(mob/living/user) @@ -34,8 +34,8 @@ to_chat(user, "You decide against removing the flag here.") return is_collapsed = TRUE - update_icon_state() - . = ..() + update_appearance() + return ..() /obj/item/flag_base/update_icon_state() diff --git a/code/game/objects/items/portable_vendor.dm b/code/game/objects/items/portable_vendor.dm index dc8748f926559..54ac8f97ea0b2 100644 --- a/code/game/objects/items/portable_vendor.dm +++ b/code/game/objects/items/portable_vendor.dm @@ -11,7 +11,7 @@ slot_l_hand_str = 'icons/mob/inhands/items/containers_left.dmi', slot_r_hand_str = 'icons/mob/inhands/items/containers_right.dmi', ) - flags_atom = CONDUCT + atom_flags = CONDUCT force = 8 hitsound = "swing_hit" throw_speed = 1 @@ -132,7 +132,7 @@ playsound(src, "sound/machines/fax.ogg", 5) balloon_alert(user, "fabricating") fabricating = TRUE - update_overlays() + update_appearance() addtimer(CALLBACK(src, PROC_REF(do_vend), L[3], user), 1 SECONDS) /obj/item/portable_vendor/proc/do_vend(thing, mob/user) @@ -140,7 +140,7 @@ if(loc == user) user.put_in_hands(IT) fabricating = FALSE - update_overlays() + update_appearance() /obj/item/portable_vendor/update_overlays() . = ..() @@ -161,7 +161,7 @@ /obj/item/portable_vendor/Initialize(mapload) . = ..() START_PROCESSING(SSobj, src) - update_overlays() + update_appearance() /obj/item/portable_vendor/Destroy() STOP_PROCESSING(SSobj, src) @@ -173,7 +173,7 @@ T.visible_message(span_warning("[src] shudders as its internal components break apart!")) broken = 1 STOP_PROCESSING(SSobj, src) - update_overlays() + update_appearance() playsound(src, 'sound/effects/sparks4.ogg', 60, 1) var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread diff --git a/code/game/objects/items/quickdeploy_cade.dm b/code/game/objects/items/quickdeploy_cade.dm index 1e2c2fc1f5e4e..78ba11f4e3349 100644 --- a/code/game/objects/items/quickdeploy_cade.dm +++ b/code/game/objects/items/quickdeploy_cade.dm @@ -51,7 +51,7 @@ for(var/obj/thing in user.loc) if(!thing.density) //not dense, move on continue - if(!(thing.flags_atom & ON_BORDER)) //dense and non-directional, end + if(!(thing.atom_flags & ON_BORDER)) //dense and non-directional, end balloon_alert(user, "No space") return FALSE if(thing.dir != user.dir) diff --git a/code/game/objects/items/radio/detpack.dm b/code/game/objects/items/radio/detpack.dm index 788c674ee354d..f43da27d5e8e8 100644 --- a/code/game/objects/items/radio/detpack.dm +++ b/code/game/objects/items/radio/detpack.dm @@ -9,7 +9,7 @@ slot_r_hand_str = 'icons/mob/inhands/weapons/explosives_right.dmi', ) item_state = "plasticx" - flags_item = NOBLUDGEON + item_flags = NOBLUDGEON w_class = WEIGHT_CLASS_SMALL layer = MOB_LAYER - 0.1 var/frequency = 1457 @@ -70,6 +70,7 @@ /obj/item/detpack/update_icon_state() + . = ..() icon_state = "detpack_[plant_target ? "set_" : ""]" if(on) icon_state = "[icon_state][armed ? "armed" : "on"]" @@ -79,6 +80,8 @@ /obj/item/detpack/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(ismultitool(I) && armed) if(user.skills.getRating(SKILL_ENGINEER) < SKILL_ENGINEER_METAL) @@ -136,8 +139,9 @@ if(!signal || !on) return - var/turf/location = get_turf(signal.source) - if(location.z != z) + var/turf/source_location = get_turf(signal.source) + var/turf/det_location = get_turf(src) + if(source_location.z != det_location.z) return if(signal.data["code"] != code) @@ -340,15 +344,13 @@ //Time to go boom playsound(src.loc, 'sound/weapons/ring.ogg', 200, FALSE) boom = TRUE + var/turf/det_location = get_turf(plant_target) + plant_target.ex_act(EXPLODE_DEVASTATE) + plant_target = null if(det_mode == TRUE) //If we're on demolition mode, big boom. - explosion(plant_target, 3, 5, 6, 0, 6) + explosion(det_location, 3, 5, 6, 0, 6) else //if we're not, focused boom. - explosion(plant_target, 2, 2, 3, 0, 3, throw_range = FALSE) - if(plant_target) - if(isobj(plant_target)) - plant_target = null - if(!istype(plant_target,/obj/vehicle/multitile/root/cm_armored)) - qdel(plant_target) + explosion(det_location, 2, 2, 3, 0, 3, throw_range = FALSE) qdel(src) diff --git a/code/game/objects/items/radio/electropack.dm b/code/game/objects/items/radio/electropack.dm index 424b0913b6b25..ed39207150ba8 100644 --- a/code/game/objects/items/radio/electropack.dm +++ b/code/game/objects/items/radio/electropack.dm @@ -8,8 +8,8 @@ slot_r_hand_str = 'icons/mob/inhands/equipment/security_right.dmi', ) item_state = "electropack" - flags_atom = CONDUCT - flags_equip_slot = ITEM_SLOT_BACK + atom_flags = CONDUCT + equip_slot_flags = ITEM_SLOT_BACK w_class = WEIGHT_CLASS_HUGE diff --git a/code/game/objects/items/radio/encryptionkey.dm b/code/game/objects/items/radio/encryptionkey.dm index 1d4d60343636b..204d4459dd634 100644 --- a/code/game/objects/items/radio/encryptionkey.dm +++ b/code/game/objects/items/radio/encryptionkey.dm @@ -124,6 +124,11 @@ GLOBAL_LIST_EMPTY_TYPED(custom_updating_encryptkeys, /obj/item/encryptionkey) channels = list(RADIO_CHANNEL_ICC = TRUE) independent = TRUE +/obj/item/encryptionkey/retired + name = "\improper retirement home encryption key" + channels = list(RADIO_CHANNEL_RETIRED = TRUE) + independent = TRUE + /obj/item/encryptionkey/sectoid name = "\improper alien encryption key" channels = list(RADIO_CHANNEL_SECTOID = TRUE) diff --git a/code/game/objects/items/radio/headset.dm b/code/game/objects/items/radio/headset.dm index c607f3097ba67..f3e4d131bb0f0 100644 --- a/code/game/objects/items/radio/headset.dm +++ b/code/game/objects/items/radio/headset.dm @@ -24,7 +24,7 @@ GLOBAL_LIST_INIT(channel_tokens, list( subspace_transmission = TRUE canhear_range = 0 // can't hear headsets from very far away - flags_equip_slot = ITEM_SLOT_EARS + equip_slot_flags = ITEM_SLOT_EARS var/obj/item/encryptionkey/keyslot2 = null @@ -54,6 +54,8 @@ GLOBAL_LIST_INIT(channel_tokens, list( /obj/item/radio/headset/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(isscrewdriver(I)) if(keyslot || keyslot2) @@ -170,7 +172,7 @@ GLOBAL_LIST_INIT(channel_tokens, list( icon_state = "cargo_headset" item_state = "headset" frequency = FREQ_COMMON - flags_atom = CONDUCT | PREVENT_CONTENTS_EXPLOSION + atom_flags = CONDUCT | PREVENT_CONTENTS_EXPLOSION freerange = TRUE var/obj/machinery/camera/camera var/datum/atom_hud/squadhud = null @@ -210,7 +212,8 @@ GLOBAL_LIST_INIT(channel_tokens, list( /obj/item/radio/headset/mainship/proc/safety_protocol(mob/living/carbon/human/user) balloon_alert_to_viewers("Explodes") playsound(user, 'sound/effects/explosion_micro1.ogg', 50, 1) - user.ex_act(EXPLODE_LIGHT) + if(wearer) + wearer.ex_act(EXPLODE_LIGHT) qdel(src) /* RUTGMC DELETION, SL_locator beheading runtime fix @@ -234,7 +237,6 @@ GLOBAL_LIST_INIT(channel_tokens, list( if(wearer) if(headset_hud_on && wearer.wear_ear == src) squadhud.remove_hud_from(wearer) - wearer.SL_directional = null if(wearer.assigned_squad) SSdirection.stop_tracking(wearer.assigned_squad.tracking_id, wearer) wearer = null @@ -286,8 +288,8 @@ GLOBAL_LIST_INIT(channel_tokens, list( if(HAS_TRAIT(wearer, TRAIT_UNDEFIBBABLE)) SSminimaps.add_marker(wearer, marker_flags, image('icons/UI_icons/map_blips.dmi', null, "undefibbable")) return - if(!wearer.client) - var/mob/dead/observer/ghost = wearer.get_ghost() + if(!wearer.mind) + var/mob/dead/observer/ghost = wearer.get_ghost(TRUE) if(!ghost?.can_reenter_corpse) SSminimaps.add_marker(wearer, marker_flags, image('icons/UI_icons/map_blips.dmi', null, "undefibbable")) return @@ -450,7 +452,10 @@ GLOBAL_LIST_INIT(channel_tokens, list( /obj/item/radio/headset/mainship/marine/Initialize(mapload, datum/squad/squad, rank) if(squad) - icon_state = "headset_marine_[lowertext(squad.name)]" + icon_state = "headset_marine_greyscale" + var/image/coloring = image(icon, icon_state="headset_marine_overlay") + coloring.color = squad.color + add_overlay(coloring) var/dat = "marine [lowertext(squad.name)]" frequency = squad.radio_freq if(ispath(rank, /datum/job/terragov/squad/leader)) @@ -649,6 +654,11 @@ GLOBAL_LIST_INIT(channel_tokens, list( name = "\improper Echo Task Force headset" keyslot = /obj/item/encryptionkey/echo +/obj/item/radio/headset/distress/retired + name = "retirement home headset" + keyslot = /obj/item/encryptionkey/retired + frequency = FREQ_RETIRED + //SOM headsets /obj/item/radio/headset/mainship/som diff --git a/code/game/objects/items/radio/intercom.dm b/code/game/objects/items/radio/intercom.dm index 6f6dd8adf3bae..d28bd5154d1bd 100644 --- a/code/game/objects/items/radio/intercom.dm +++ b/code/game/objects/items/radio/intercom.dm @@ -6,7 +6,7 @@ anchored = TRUE w_class = WEIGHT_CLASS_BULKY canhear_range = 2 - flags_atom = CONDUCT|NOBLOODY + atom_flags = CONDUCT|NOBLOODY light_range = 1.5 light_power = 0.5 light_color = LIGHT_COLOR_EMISSIVE_YELLOW @@ -28,15 +28,15 @@ pixel_x = 32 START_PROCESSING(SSobj, src) become_hearing_sensitive() - update_icon() + check_light() /obj/item/radio/intercom/Destroy() STOP_PROCESSING(SSobj, src) return ..() -/obj/item/radio/intercom/update_icon() - . = ..() +///Checks if we're on, if so a light turns on +/obj/item/radio/intercom/proc/check_light() if(!on) set_light(0) return @@ -44,6 +44,7 @@ set_light(initial(light_range)) /obj/item/radio/intercom/update_icon_state() + . = ..() if(!on) icon_state = "intercom_unpowered" else @@ -56,16 +57,14 @@ . += emissive_appearance(icon, "[icon_state]_emissive") /obj/item/radio/intercom/attack_ai(mob/user as mob) - spawn (0) - attack_self(user) + attack_self(user) /obj/item/radio/intercom/attack_hand(mob/living/user) . = ..() if(.) return - spawn (0) - attack_self(user) + attack_self(user) /obj/item/radio/intercom/can_receive(freq, list/levels) @@ -100,7 +99,7 @@ return else on = new_state - update_icon() + check_light() /obj/item/radio/intercom/general name = "General Listening Channel" diff --git a/code/game/objects/items/radio/radio.dm b/code/game/objects/items/radio/radio.dm index b2dc331551c43..a784a5b1efa19 100644 --- a/code/game/objects/items/radio/radio.dm +++ b/code/game/objects/items/radio/radio.dm @@ -8,8 +8,8 @@ ) item_state = "radio" - flags_atom = CONDUCT - flags_equip_slot = ITEM_SLOT_BELT + atom_flags = CONDUCT + equip_slot_flags = ITEM_SLOT_BELT throw_speed = 2 throw_range = 9 w_class = WEIGHT_CLASS_SMALL @@ -292,10 +292,21 @@ return var/area/A = get_area(src) - if(!isnull(A) && (A.ceiling >= CEILING_UNDERGROUND) && !(A.flags_area & ALWAYS_RADIO)) + var/radio_disruption = CAVE_NO_INTERFERENCE + if(!isnull(A) && (A.ceiling >= CEILING_UNDERGROUND) && !(A.area_flags & ALWAYS_RADIO)) + radio_disruption = CAVE_MINOR_INTERFERENCE if(A.ceiling >= CEILING_DEEP_UNDERGROUND) + radio_disruption = CAVE_FULL_INTERFERENCE + + var/list/inplace_interference = list(radio_disruption) + SEND_SIGNAL(talking_movable, COMSIG_CAVE_INTERFERENCE_CHECK, inplace_interference) + radio_disruption = inplace_interference[1] + + switch(radio_disruption) + if(CAVE_MINOR_INTERFERENCE) + signal.data["compression"] += rand(20, 40) + if(CAVE_FULL_INTERFERENCE) return - signal.data["compression"] += rand(20, 40) // All non-independent radios make an attempt to use the subspace system first signal.send_to_receivers() @@ -345,8 +356,23 @@ var/turf/position = get_turf(src) if(!position || !(position.z in levels)) return FALSE + var/radio_disruption = CAVE_NO_INTERFERENCE var/area/A = get_area(src) - if(A?.ceiling >= CEILING_DEEP_UNDERGROUND) + if(A?.ceiling >= CEILING_UNDERGROUND && !(A.area_flags & ALWAYS_RADIO)) + radio_disruption = CAVE_MINOR_INTERFERENCE //Unused for this case but may aswell create parity on what the value of the var is. + if(A.ceiling >= CEILING_DEEP_UNDERGROUND) + radio_disruption = CAVE_FULL_INTERFERENCE + var/list/potential_owners = get_nested_locs(src) //Sometimes not equipped, sometimes not even equippable, sometimes in storage, this feels like it's an okay way to do it. + var/mob/living/found_owner + for(var/mob/living/candidate in potential_owners) + found_owner = candidate + break + + if(found_owner) + var/inplace_interference = list(radio_disruption) + SEND_SIGNAL(found_owner, COMSIG_CAVE_INTERFERENCE_CHECK, inplace_interference) + radio_disruption = inplace_interference[1] + if(radio_disruption == CAVE_FULL_INTERFERENCE) return FALSE // allow checks: are we listening on that frequency? @@ -372,6 +398,8 @@ /obj/item/radio/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(isscrewdriver(I) && !subspace_transmission) unscrewed = !unscrewed if(unscrewed) diff --git a/code/game/objects/items/rcd.dm b/code/game/objects/items/rcd.dm index ef0ba36e35755..ca528c098d9be 100644 --- a/code/game/objects/items/rcd.dm +++ b/code/game/objects/items/rcd.dm @@ -6,7 +6,7 @@ opacity = FALSE density = FALSE anchored = FALSE - flags_atom = CONDUCT + atom_flags = CONDUCT force = 10 throwforce = 10 throw_speed = 1 diff --git a/code/game/objects/items/reagent_containers/autoinjectors.dm b/code/game/objects/items/reagent_containers/autoinjectors.dm index e9982bf2388b8..60a1a1157abd1 100644 --- a/code/game/objects/items/reagent_containers/autoinjectors.dm +++ b/code/game/objects/items/reagent_containers/autoinjectors.dm @@ -11,6 +11,7 @@ list_reagents = list(/datum/reagent/consumable/sodiumchloride = 30) /obj/item/reagent_containers/hypospray/autoinjector/update_icon_state() + . = ..() if(!(reagents.total_volume) && is_drawable()) icon_state += "X" name = "expended [name]" //So people can see what have been expended since we have smexy new sprites people aren't used too... @@ -309,7 +310,7 @@ icon_state = "autoinjector-6" amount_per_transfer_from_this = 1 volume = 1 - list_reagents = list(/datum/reagent/medicine/research/medicalnanites = 1) + list_reagents = list(/datum/reagent/medicalnanites = 1) free_refills = FALSE /obj/item/reagent_containers/hypospray/autoinjector/pain //made for debugging diff --git a/code/game/objects/items/reagent_containers/blood_pack.dm b/code/game/objects/items/reagent_containers/blood_pack.dm index 760e4b61a802a..05909c8ccb68a 100644 --- a/code/game/objects/items/reagent_containers/blood_pack.dm +++ b/code/game/objects/items/reagent_containers/blood_pack.dm @@ -20,7 +20,7 @@ update_icon() /obj/item/reagent_containers/blood/update_icon_state() - + . = ..() var/percent = PERCENT(reagents.total_volume / volume) switch(percent) if(0 to 9.9) diff --git a/code/game/objects/items/reagent_containers/dropper.dm b/code/game/objects/items/reagent_containers/dropper.dm index f1a7bd01052c8..4f3a89d1986a2 100644 --- a/code/game/objects/items/reagent_containers/dropper.dm +++ b/code/game/objects/items/reagent_containers/dropper.dm @@ -42,10 +42,10 @@ var/obj/item/safe_thing = null if( victim.wear_mask ) - if ( victim.wear_mask.flags_inventory & COVEREYES ) + if ( victim.wear_mask.inventory_flags & COVEREYES ) safe_thing = victim.wear_mask if( victim.head ) - if ( victim.head.flags_inventory & COVEREYES ) + if ( victim.head.inventory_flags & COVEREYES ) safe_thing = victim.head if(victim.glasses) if ( !safe_thing ) diff --git a/code/game/objects/items/reagent_containers/food/burgers.dm b/code/game/objects/items/reagent_containers/food/burgers.dm index d38e885308b47..f6cc39b46f9cf 100644 --- a/code/game/objects/items/reagent_containers/food/burgers.dm +++ b/code/game/objects/items/reagent_containers/food/burgers.dm @@ -294,6 +294,8 @@ // Human Burger + cheese wedge = cheeseburger /obj/item/reagent_containers/food/snacks/burger/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/reagent_containers/food/snacks/cheesewedge)) new /obj/item/reagent_containers/food/snacks/burger/cheese(src) @@ -305,6 +307,8 @@ // Burger + cheese wedge = cheeseburger /obj/item/reagent_containers/food/snacks/burger/plain/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/reagent_containers/food/snacks/cheesewedge)) new /obj/item/reagent_containers/food/snacks/burger/cheese(src) @@ -330,6 +334,8 @@ /obj/item/reagent_containers/food/snacks/burger/bun/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return // Bun + meatball = burger if(istype(I, /obj/item/reagent_containers/food/snacks/meatball)) new /obj/item/reagent_containers/food/snacks/burger/plain(src) diff --git a/code/game/objects/items/reagent_containers/food/cans.dm b/code/game/objects/items/reagent_containers/food/cans.dm index d1670b2e7a2d4..3d1cf57458099 100644 --- a/code/game/objects/items/reagent_containers/food/cans.dm +++ b/code/game/objects/items/reagent_containers/food/cans.dm @@ -3,10 +3,10 @@ init_reagent_flags = NONE var/canopened = FALSE -/obj/item/reagent_containers/food/drinks/cans/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) +/obj/item/reagent_containers/food/drinks/cans/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) if(!CONFIG_GET(flag/fun_allowed)) return FALSE - attack_hand(X) + attack_hand(xeno_attacker) /obj/item/reagent_containers/food/drinks/cans/attack_self(mob/user as mob) diff --git a/code/game/objects/items/reagent_containers/food/donuts.dm b/code/game/objects/items/reagent_containers/food/donuts.dm index 1eb1531fc6621..2b6af43e10d2a 100644 --- a/code/game/objects/items/reagent_containers/food/donuts.dm +++ b/code/game/objects/items/reagent_containers/food/donuts.dm @@ -179,7 +179,7 @@ desc = "Goes great with a bottle of Bastion Burbon!" icon_state = "donut_laugh" list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/sugar = 3, /datum/reagent/consumable/laughter = 3) - tastes = list("donut" = 3, "fizzy tutti frutti" = 1,) + tastes = list("donut" = 3, "fizzy tutti frutti" = 1) /obj/item/reagent_containers/food/snacks/donut/jelly/trumpet name = "spaceman's jelly donut" diff --git a/code/game/objects/items/reagent_containers/food/drinks.dm b/code/game/objects/items/reagent_containers/food/drinks.dm index 8c9965b70f511..3ee18a0e283bc 100644 --- a/code/game/objects/items/reagent_containers/food/drinks.dm +++ b/code/game/objects/items/reagent_containers/food/drinks.dm @@ -113,7 +113,7 @@ amount_per_transfer_from_this = 20 possible_transfer_amounts = null volume = 150 - flags_atom = CONDUCT + atom_flags = CONDUCT /obj/item/reagent_containers/food/drinks/golden_cup/tournament_26_06_2011 desc = "A golden cup. It will be presented to a winner of tournament 26 june and name of the winner will be graved on it." diff --git a/code/game/objects/items/reagent_containers/food/drinks/bottle.dm b/code/game/objects/items/reagent_containers/food/drinks/bottle.dm index abbdd3e56ce5a..53fa066ccff34 100644 --- a/code/game/objects/items/reagent_containers/food/drinks/bottle.dm +++ b/code/game/objects/items/reagent_containers/food/drinks/bottle.dm @@ -74,10 +74,10 @@ //Finally, smash the bottle. This kills (del) the bottle. smash(target, user) -/obj/item/reagent_containers/food/drinks/bottle/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) +/obj/item/reagent_containers/food/drinks/bottle/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) if(!CONFIG_GET(flag/fun_allowed)) return FALSE - attack_hand(X) + attack_hand(xeno_attacker) /obj/item/reagent_containers/food/drinks/bottle/gin name = "\improper Griffeater Gin" diff --git a/code/game/objects/items/reagent_containers/food/drinks/drinkingglass.dm b/code/game/objects/items/reagent_containers/food/drinks/drinkingglass.dm index 6ba09eadaddf1..83de06e7a5321 100644 --- a/code/game/objects/items/reagent_containers/food/drinks/drinkingglass.dm +++ b/code/game/objects/items/reagent_containers/food/drinks/drinkingglass.dm @@ -611,10 +611,10 @@ center_of_mass = list("x"=16, "y"=10) return -/obj/item/reagent_containers/food/drinks/drinkingglass/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) +/obj/item/reagent_containers/food/drinks/drinkingglass/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) if(!CONFIG_GET(flag/fun_allowed)) return FALSE - attack_hand(X) + attack_hand(xeno_attacker) // for /obj/machinery/vending/sovietsoda /obj/item/reagent_containers/food/drinks/drinkingglass/soda diff --git a/code/game/objects/items/reagent_containers/food/pizzapasta.dm b/code/game/objects/items/reagent_containers/food/pizzapasta.dm index 0b6c83ce48681..7a2bf6ca795fd 100644 --- a/code/game/objects/items/reagent_containers/food/pizzapasta.dm +++ b/code/game/objects/items/reagent_containers/food/pizzapasta.dm @@ -171,56 +171,55 @@ var/list/boxes = list() // If the boxes are stacked, they come here var/boxtag = "" -/obj/item/pizzabox/update_icon() - - overlays = list() - - // Set appropriate description - if( open && pizza ) +/obj/item/pizzabox/update_desc(updates) + . = ..() + if(open && pizza) desc = "A box suited for pizzas. It appears to have a [pizza.name] inside." - else if( boxes.len > 0 ) + else if(boxes.len > 0) desc = "A pile of boxes suited for pizzas. There appears to be [boxes.len + 1] boxes in the pile." var/obj/item/pizzabox/topbox = boxes[boxes.len] var/toptag = topbox.boxtag - if( toptag != "" ) + if(toptag != "") desc = "[desc] The box on top has a tag, it reads: '[toptag]'." else desc = "A box suited for pizzas." - if( boxtag != "" ) + if(boxtag != "") desc = "[desc] The box has a tag, it reads: '[boxtag]'." - // Icon states and overlays - if( open ) - if( ismessy ) +/obj/item/pizzabox/update_icon_state() + . = ..() + if(open) + if(ismessy) icon_state = "pizzabox_messy" else icon_state = "pizzabox_open" + return - if( pizza ) - var/image/pizzaimg = image("pizzaspaghetti.dmi", icon_state = pizza.icon_state) - pizzaimg.pixel_y = -3 - overlays += pizzaimg + icon_state = "pizzabox[boxes.len+1]" +/obj/item/pizzabox/update_overlays() + . = ..() + if(open && pizza) + var/image/pizzaimg = image("pizzaspaghetti.dmi", icon_state = pizza.icon_state) + pizzaimg.pixel_y = -3 + . += pizzaimg return + // Stupid code because byondcode sucks - imagine blaming the engine for you being bad at coding. TODO: clean this up + var/doimgtag = 0 + if(boxes.len > 0) + var/obj/item/pizzabox/topbox = boxes[boxes.len] + if(topbox.boxtag != "") + doimgtag = 1 else - // Stupid code because byondcode sucks - var/doimgtag = 0 - if( boxes.len > 0 ) - var/obj/item/pizzabox/topbox = boxes[boxes.len] - if( topbox.boxtag != "" ) - doimgtag = 1 - else - if( boxtag != "" ) - doimgtag = 1 + if(boxtag != "") + doimgtag = 1 - if( doimgtag ) - var/image/tagimg = image("pizzaspaghetti.dmi", icon_state = "pizzabox_tag") - tagimg.pixel_y = boxes.len * 3 - overlays += tagimg - - icon_state = "pizzabox[boxes.len+1]" + if(doimgtag) + var/image/tagimg = image("pizzaspaghetti.dmi", icon_state = "pizzabox_tag") + tagimg.pixel_y = boxes.len * 3 + . += tagimg //ATTACK HAND IGNORING PARENT RETURN VALUE /obj/item/pizzabox/attack_hand(mob/living/user) @@ -261,6 +260,8 @@ /obj/item/pizzabox/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/pizzabox)) var/obj/item/pizzabox/box = I diff --git a/code/game/objects/items/reagent_containers/food/sandwich.dm b/code/game/objects/items/reagent_containers/food/sandwich.dm index 1578d3c6aabd0..d6e90327c2b02 100644 --- a/code/game/objects/items/reagent_containers/food/sandwich.dm +++ b/code/game/objects/items/reagent_containers/food/sandwich.dm @@ -3,6 +3,8 @@ /obj/item/reagent_containers/food/snacks/sandwiches/breadslice/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/shard) || istype(I, /obj/item/reagent_containers/food/snacks)) var/obj/item/reagent_containers/food/snacks/sandwiches/csandwich/S = new(loc) @@ -82,6 +84,8 @@ /obj/item/reagent_containers/food/snacks/sandwiches/csandwich/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return var/sandwich_limit = 4 for(var/obj/item/reagent_containers/food/snacks/sandwiches/breadslice/B in ingredients) diff --git a/code/game/objects/items/reagent_containers/food/snacks.dm b/code/game/objects/items/reagent_containers/food/snacks.dm index 27887aa2022f7..626ec4b121ff3 100644 --- a/code/game/objects/items/reagent_containers/food/snacks.dm +++ b/code/game/objects/items/reagent_containers/food/snacks.dm @@ -47,10 +47,10 @@ /obj/item/reagent_containers/food/snacks/attack_self(mob/user as mob) return -/obj/item/reagant_containers/food/snacks/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) +/obj/item/reagant_containers/food/snacks/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) if(!CONFIG_GET(flag/fun_allowed)) return FALSE - attack_hand(X) + attack_hand(xeno_attacker) /obj/item/reagent_containers/food/snacks/attack(mob/M, mob/user, def_zone) if(!reagents.total_volume) //Shouldn't be needed but it checks to see if it has anything left in it. @@ -144,6 +144,8 @@ /obj/item/reagent_containers/food/snacks/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/tool/kitchen/utensil)) //todo early return var/obj/item/tool/kitchen/utensil/U = I @@ -173,6 +175,8 @@ /obj/item/reagent_containers/food/snacks/sliceable/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(I.sharp == IS_NOT_SHARP_ITEM) if(I.w_class >= WEIGHT_CLASS_SMALL) @@ -1164,6 +1168,8 @@ // Flour + egg = dough /obj/item/reagent_containers/food/snacks/flour/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/reagent_containers/food/snacks/egg)) new /obj/item/reagent_containers/food/snacks/dough(src) @@ -1174,6 +1180,8 @@ // Egg + flour = dough /obj/item/reagent_containers/food/snacks/egg/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/reagent_containers/food/snacks/flour)) new /obj/item/reagent_containers/food/snacks/dough(src) @@ -1205,6 +1213,8 @@ // Dough + rolling pin = flat dough /obj/item/reagent_containers/food/snacks/dough/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/tool/kitchen/rollingpin)) new /obj/item/reagent_containers/food/snacks/sliceable/flatdough(src) @@ -1243,6 +1253,8 @@ /obj/item/reagent_containers/food/snacks/meat/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/tool/kitchen/knife)) new /obj/item/reagent_containers/food/snacks/rawcutlet(src) @@ -1282,6 +1294,8 @@ /obj/item/reagent_containers/food/snacks/rawcutlet/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/tool/kitchen/knife)) new /obj/item/reagent_containers/food/snacks/rawmeatball(src) @@ -1479,12 +1493,12 @@ list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/coco = 10) tastes = list("compressed matter" = 1) -/obj/item/reagent_containers/food/snacks/wrapped/barcardine - name = "Barcardine Bars" +/obj/item/reagent_containers/food/snacks/wrapped/barcaridine + name = "Barcaridine Bars" desc = "A bar of chocolate, it smells like the medical bay. \"Chocolate always helps the pain go away.\"" icon_state = "barcardine" - wrapper = /obj/item/trash/barcardine - list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/coco = 2, /datum/reagent/medicine/tramadol = 1, /datum/reagent/medicine/tramadol = 1) + wrapper = /obj/item/trash/barcaridine + list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/coco = 2, /datum/reagent/medicine/tramadol = 2) tastes = list ("cough syrup" = 1) /obj/item/reagent_containers/food/snacks/wrapped/berrybar @@ -1498,7 +1512,8 @@ /datum/reagent/medicine/tramadol = 10, /datum/reagent/medicine/bicaridine = 10, /datum/reagent/medicine/kelotane = 10, - /datum/reagent/medicine/tricordrazine = 10,) + /datum/reagent/medicine/tricordrazine = 10, + ) tastes = list("delicious processed berries" = 1) bitesize = 9 @@ -1562,7 +1577,7 @@ icon = 'icons/obj/items/lollipop.dmi' icon_state = "lollipop_stick" item_state = "lollipop_stick" - flags_equip_slot = ITEM_SLOT_MASK + equip_slot_flags = ITEM_SLOT_MASK w_class = WEIGHT_CLASS_TINY list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 4) tastes = list("candy" = 1) diff --git a/code/game/objects/items/reagent_containers/food/snacks/grown.dm b/code/game/objects/items/reagent_containers/food/snacks/grown.dm index f5286f2881d8f..95ffd212116cd 100644 --- a/code/game/objects/items/reagent_containers/food/snacks/grown.dm +++ b/code/game/objects/items/reagent_containers/food/snacks/grown.dm @@ -82,6 +82,8 @@ /obj/item/reagent_containers/food/snacks/grown/potato/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(iscablecoil(I)) var/obj/item/stack/cable_coil/C = I @@ -246,6 +248,8 @@ /obj/item/reagent_containers/food/snacks/grown/pumpkin/attackby(obj/item/I, mob/user, param) . = ..() + if(.) + return if(I.sharp == IS_SHARP_ITEM_ACCURATE || I.sharp == IS_SHARP_ITEM_BIG) to_chat(user, span_notice("You carve a face into [src]!")) diff --git a/code/game/objects/items/reagent_containers/glass.dm b/code/game/objects/items/reagent_containers/glass.dm index d3eca61d7cb04..4fc8598173621 100644 --- a/code/game/objects/items/reagent_containers/glass.dm +++ b/code/game/objects/items/reagent_containers/glass.dm @@ -107,6 +107,8 @@ /obj/item/reagent_containers/glass/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/tool/pen) || istype(I, /obj/item/flashlight/pen)) var/tmp_label = stripped_input(user, "Enter a label for [name]", "Label", label_text) @@ -151,28 +153,35 @@ return update_icon() -/obj/item/reagent_containers/glass/beaker/update_icon() - overlays.Cut() +/obj/item/reagent_containers/glass/beaker/update_overlays() + . = ..() if(reagents.total_volume) var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]10") var/percent = round((reagents.total_volume / volume) * 100) switch(percent) - if(0 to 9) filling.icon_state = "[icon_state]-10" - if(10 to 24) filling.icon_state = "[icon_state]10" - if(25 to 49) filling.icon_state = "[icon_state]25" - if(50 to 74) filling.icon_state = "[icon_state]50" - if(75 to 79) filling.icon_state = "[icon_state]75" - if(80 to 90) filling.icon_state = "[icon_state]80" - if(91 to INFINITY) filling.icon_state = "[icon_state]100" + if(0 to 9) + filling.icon_state = "[icon_state]-10" + if(10 to 24) + filling.icon_state = "[icon_state]10" + if(25 to 49) + filling.icon_state = "[icon_state]25" + if(50 to 74) + filling.icon_state = "[icon_state]50" + if(75 to 79) + filling.icon_state = "[icon_state]75" + if(80 to 90) + filling.icon_state = "[icon_state]80" + if(91 to INFINITY) + filling.icon_state = "[icon_state]100" filling.color = mix_color_from_reagents(reagents.reagent_list) - overlays += filling + . += filling if(!is_open_container()) var/image/lid = image(icon, src, "lid_[initial(icon_state)]") - overlays += lid + . += lid /obj/item/reagent_containers/glass/beaker/large name = "large beaker" @@ -250,6 +259,8 @@ /obj/item/reagent_containers/glass/bucket/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/tool/mop)) if(reagents.total_volume < 1) @@ -260,12 +271,12 @@ to_chat(user, span_notice("You wet [I] in [src].")) playsound(loc, 'sound/effects/slosh.ogg', 25, 1) -/obj/item/reagent_containers/glass/bucket/update_icon() - overlays.Cut() +/obj/item/reagent_containers/glass/bucket/update_overlays() + . = ..() if(!is_open_container()) var/image/lid = image(icon, src, "lid_[initial(icon_state)]") - overlays += lid + . += lid /obj/item/reagent_containers/glass/bucket/janibucket name = "janitorial bucket" @@ -276,14 +287,17 @@ update_icon() -/obj/item/reagent_containers/glass/bucket/janibucket/update_icon() - ..() +/obj/item/reagent_containers/glass/bucket/janibucket/update_icon_state() + . = ..() if(reagents.total_volume) var/percent = round((reagents.total_volume / volume) * 100) switch(percent) - if(0 to 9) icon_state = "janibucket" - if(10 to 65) icon_state = "janibucket_half" - if(66 to INFINITY) icon_state = "janibucket_full" + if(0 to 9) + icon_state = "janibucket" + if(10 to 65) + icon_state = "janibucket_half" + if(66 to INFINITY) + icon_state = "janibucket_full" else icon_state = "janibucket" diff --git a/code/game/objects/items/reagent_containers/glass/bottle.dm b/code/game/objects/items/reagent_containers/glass/bottle.dm index c85f4415119b1..2e241ee381472 100644 --- a/code/game/objects/items/reagent_containers/glass/bottle.dm +++ b/code/game/objects/items/reagent_containers/glass/bottle.dm @@ -34,28 +34,35 @@ if(!icon_state) icon_state = "bottle-[rand(1, 5)]" -/obj/item/reagent_containers/glass/bottle/update_icon() - overlays.Cut() +/obj/item/reagent_containers/glass/bottle/update_overlays() + . = ..() if(reagents.total_volume && (icon_state == "bottle-1" || icon_state == "bottle-2" || icon_state == "bottle-3" || icon_state == "bottle-4")) //only for those who have reagentfillings icons var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]10") var/percent = round((reagents.total_volume / volume) * 100) switch(percent) - if(0 to 9) filling.icon_state = "[icon_state]--10" - if(10 to 24) filling.icon_state = "[icon_state]-10" - if(25 to 49) filling.icon_state = "[icon_state]-25" - if(50 to 74) filling.icon_state = "[icon_state]-50" - if(75 to 79) filling.icon_state = "[icon_state]-75" - if(80 to 90) filling.icon_state = "[icon_state]-80" - if(91 to INFINITY) filling.icon_state = "[icon_state]-100" + if(0 to 9) + filling.icon_state = "[icon_state]--10" + if(10 to 24) + filling.icon_state = "[icon_state]-10" + if(25 to 49) + filling.icon_state = "[icon_state]-25" + if(50 to 74) + filling.icon_state = "[icon_state]-50" + if(75 to 79) + filling.icon_state = "[icon_state]-75" + if(80 to 90) + filling.icon_state = "[icon_state]-80" + if(91 to INFINITY) + filling.icon_state = "[icon_state]-100" filling.color = mix_color_from_reagents(reagents.reagent_list) - overlays += filling + . += filling if (!is_open_container()) var/image/lid = image(icon, src, "lid_bottle") - overlays += lid + . += lid /obj/item/reagent_containers/glass/bottle/empty //Because the parent has RNG icon_state icon_state = "bottle-1" //Same one when you make a bottle in the chem master @@ -245,6 +252,6 @@ /obj/item/reagent_containers/glass/bottle/doctor_delight name = "\improper Doctor's Delight bottle" - desc = "A small bottle. Contains Doctor's Delight." + desc = "A small bottle. Contains Doctor's Delight - functions similar to tricordrazine, but is weaker and makes the patient hungry." icon_state = "bottle3" list_reagents = list(/datum/reagent/consumable/drink/doctor_delight = 60) diff --git a/code/game/objects/items/reagent_containers/hypospray.dm b/code/game/objects/items/reagent_containers/hypospray.dm index 55b8431ca479c..8ca2e249240a3 100644 --- a/code/game/objects/items/reagent_containers/hypospray.dm +++ b/code/game/objects/items/reagent_containers/hypospray.dm @@ -12,22 +12,18 @@ possible_transfer_amounts = list(1, 3, 5, 10, 15, 20, 30) volume = 60 init_reagent_flags = OPENCONTAINER - flags_equip_slot = ITEM_SLOT_BELT - flags_item = NOBLUDGEON + equip_slot_flags = ITEM_SLOT_BELT + item_flags = NOBLUDGEON w_class = WEIGHT_CLASS_SMALL + interaction_flags = INTERACT_OBJ_UI var/skilllock = 1 var/inject_mode = HYPOSPRAY_INJECT_MODE_INJECT var/core_name = "hypospray" + ///If we add a custom label, our name becomes "[core_name] ([label])" var/label = null /// Small description appearing as an overlay var/description_overlay = "" -/obj/item/reagent_containers/hypospray/advanced - name = "Advanced hypospray" - desc = "The hypospray is a sterile, air-needle reusable autoinjector for rapid administration of drugs to patients with customizable dosages. Comes complete with an internal reagent analyzer, digital labeler and 2 letter tagger. Handy." - core_name = "hypospray" - - /obj/item/reagent_containers/hypospray/proc/empty(mob/user) if(tgui_alert(user, "Are you sure you want to empty [src]?", "Flush [src]:", list("Yes", "No")) != "Yes") return @@ -70,6 +66,11 @@ if(!reagents.total_volume) balloon_alert(user, "Hypospray is Empty.") return + if(iscarbon(A)) + var/mob/living/carbon/C = A + if((C.species.species_flags & NO_CHEM_METABOLIZATION) || (C.species.species_flags & IS_SYNTHETIC)) + C.balloon_alert(user, "Can't inject (robot)") + return if(!A.is_injectable() && !ismob(A)) A.balloon_alert(user, "Can't fill.") return @@ -205,119 +206,110 @@ desc.maptext_width = 16 . += desc -/obj/item/reagent_containers/hypospray/advanced - icon_state = "hypo" - init_reagent_flags = REFILLABLE|DRAINABLE - liquifier = TRUE +/obj/item/reagent_containers/hypospray/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "Hypospray", name) + ui.open() + +/obj/item/reagent_containers/hypospray/ui_data(mob/user) + var/list/data = list() + data["IsAdvanced"] = liquifier + data["InjectMode"] = inject_mode + data["CurrentLabel"] = label + data["CurrentTag"] = description_overlay + data["TransferAmount"] = amount_per_transfer_from_this -/obj/item/reagent_containers/hypospray/open_ui(mob/user) - var/dat = {" - Activate Autolabeler
- Current Label: [label]
-
- Activate Tagger
- Current Tag: [description_overlay]
-
- Toggle Mode:
- Current Mode: [inject_mode ? "Inject" : "Draw"]
-
- Set Transfer Amount:
- Current Transfer Amount [amount_per_transfer_from_this]
-
- Empty Hypospray:
-
"} - - var/datum/browser/popup = new(user, "hypospray") - popup.set_content(dat) - popup.open() - - -/obj/item/reagent_containers/hypospray/advanced/open_ui(mob/user) - var/dat = {" - Activate Autolabeler
- Current Label: [label]
-
- Activate Tagger
- Current Tag: [description_overlay]
-
- Toggle Mode:
- Current Mode: [inject_mode ? "Inject" : "Draw"]
-
- Set Transfer Amount:
- Current Transfer Amount: [amount_per_transfer_from_this]
-
- Display Reagent Content:
-
-
- Empty Hypospray:
-
"} - - var/datum/browser/popup = new(user, "hypospray") - popup.set_content(dat) - popup.open() - - -/obj/item/reagent_containers/hypospray/Topic(href, href_list) + return data + +/obj/item/reagent_containers/hypospray/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) return - if(href_list["inject_mode"]) - if(inject_mode) - to_chat(usr, span_notice("[src] has been set to draw mode. It will now drain reagents.")) - - else - to_chat(usr, span_notice("[src] has been set to inject mode. It will now inject reagents.")) - inject_mode = !inject_mode - update_icon() - - else if(href_list["autolabeler"]) - var/mob/user = usr - var/str = copytext(reject_bad_text(input(user,"Hypospray label text?", "Set label", "")), 1, MAX_NAME_LEN) - if(!length(str)) - user.balloon_alert(user, "Invalid text.") - return - balloon_alert(user, "Labeled \"[str]\".") - name = "[core_name] ([str])" - label = str - - else if(href_list["overlayer"]) - var/mob/user = usr - var/str = copytext(reject_bad_text(input(user,"Hypospray tag text?", "Set tag", "")), 1, MAX_NAME_HYPO) - if(!length(str)) - user.balloon_alert(user, "Invalid text.") - return - user.balloon_alert(user, "You tag [src] as \"[str]\".") - description_overlay = str - update_icon() + switch(action) + if("ActivateAutolabeler") + var/mob/user = usr + var/str = copytext(reject_bad_text(input(user,"Hypospray label text?", "Set label", "")), 1, MAX_NAME_LEN) + if(!length(str)) + user.balloon_alert(user, "Invalid text.") + return + balloon_alert(user, "Labeled \"[str]\".") + name = "[core_name] ([str])" + label = str + + if("ActivateTagger") + var/mob/user = usr + var/str = copytext(reject_bad_text(input(user,"Hypospray tag text?", "Set tag", "")), 1, MAX_NAME_HYPO) + if(!length(str)) + user.balloon_alert(user, "Invalid text.") + return + user.balloon_alert(user, "You tag [src] as \"[str]\".") + description_overlay = str + update_icon() + + if("ToggleMode") + if(inject_mode) + to_chat(usr, span_notice("[src] has been set to draw mode. It will now drain reagents.")) - else if(href_list["set_transfer"]) - var/N = tgui_input_list(usr, "Amount per transfer from this:", "[src]", possible_transfer_amounts) - if(!N) - return + else + to_chat(usr, span_notice("[src] has been set to inject mode. It will now inject reagents.")) + inject_mode = !inject_mode + update_icon() - amount_per_transfer_from_this = N + if("SetTransferAmount") + var/N = tgui_input_list(usr, "Amount per transfer from this:", "[src]", possible_transfer_amounts) + if(!N) + return - else if(href_list["flush"]) - empty(usr) + amount_per_transfer_from_this = N - updateUsrDialog() + if("EmptyHypospray") + empty(usr) +/obj/item/reagent_containers/hypospray/advanced + name = "Advanced hypospray" + desc = "The hypospray is a sterile, air-needle reusable autoinjector for rapid administration of drugs to patients with customizable dosages. Comes complete with an internal reagent analyzer, digital labeler and 2 letter tagger. Handy." + core_name = "hypospray" + icon_state = "hypo" + init_reagent_flags = REFILLABLE|DRAINABLE + liquifier = TRUE -/obj/item/reagent_containers/hypospray/advanced/Topic(href, href_list) +/obj/item/reagent_containers/hypospray/advanced/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) return - if(href_list["displayreagents"]) + if(action == "DisplayReagentContent") to_chat(usr, display_reagents()) + return TRUE +/obj/item/reagent_containers/hypospray/advanced/update_icon_state() + . = ..() + if(!reagents?.total_volume) + icon_state = "[initial(icon_state)]_0" + return + var/percent = round((reagents.total_volume / volume) * 100) + switch(percent) + if(0 to 9) + icon_state = initial(icon_state) + if(10 to 24) + icon_state = "[initial(icon_state)]_10" + if(25 to 49) + icon_state = "[initial(icon_state)]_25" + if(50 to 64) + icon_state = "[initial(icon_state)]_50" + if(65 to 79) + icon_state = "[initial(icon_state)]_65" + if(80 to 90) + icon_state = "[initial(icon_state)]_80" + if(91 to INFINITY) + icon_state = "[initial(icon_state)]_100" /obj/item/reagent_containers/hypospray/advanced/update_overlays() . = ..() - overlays.Cut() if(reagents.total_volume) var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]10") @@ -327,37 +319,28 @@ filling.icon_state = "[initial(icon_state)]-10" if(10 to 24) filling.icon_state = "[initial(icon_state)]10" - icon_state = "[initial(icon_state)]_10" if(25 to 49) filling.icon_state = "[initial(icon_state)]25" - icon_state = "[initial(icon_state)]_25" if(50 to 64) filling.icon_state = "[initial(icon_state)]50" - icon_state = "[initial(icon_state)]_50" if(65 to 79) filling.icon_state = "[initial(icon_state)]65" - icon_state = "[initial(icon_state)]_65" if(80 to 90) filling.icon_state = "[initial(icon_state)]80" - icon_state = "[initial(icon_state)]_80" if(91 to INFINITY) filling.icon_state = "[initial(icon_state)]100" - icon_state = "[initial(icon_state)]_100" filling.color = mix_color_from_reagents(reagents.reagent_list) - overlays += filling - - else - icon_state = "[initial(icon_state)]_0" + . += filling if(ismob(loc)) var/injoverlay switch(inject_mode) - if (HYPOSPRAY_INJECT_MODE_DRAW) + if(HYPOSPRAY_INJECT_MODE_DRAW) injoverlay = "draw" - if (HYPOSPRAY_INJECT_MODE_INJECT) + if(HYPOSPRAY_INJECT_MODE_INJECT) injoverlay = "inject" - add_overlay(injoverlay) + . += injoverlay /obj/item/reagent_containers/hypospray/advanced/examine(mob/user as mob) . = ..() @@ -483,7 +466,7 @@ list_reagents = list( /datum/reagent/hypervene = 60, ) - description_overlay = "Ht" + description_overlay = "Hy" /obj/item/reagent_containers/hypospray/advanced/nanoblood name = "nanoblood hypospray" diff --git a/code/game/objects/items/reagent_containers/reagent_container.dm b/code/game/objects/items/reagent_containers/reagent_container.dm index dd13fced78263..7fe1bed0895ca 100644 --- a/code/game/objects/items/reagent_containers/reagent_container.dm +++ b/code/game/objects/items/reagent_containers/reagent_container.dm @@ -21,7 +21,6 @@ ///Whether we can restock this in a vendor without it having its starting reagents var/free_refills = TRUE - /obj/item/reagent_containers/Initialize(mapload) . = ..() create_reagents(volume, init_reagent_flags, list_reagents) @@ -30,41 +29,27 @@ /obj/item/reagent_containers/attack_hand_alternate(mob/living/user) . = ..() + change_transfer_amount(user) + +/obj/item/reagent_containers/attack_self_alternate(mob/living/user) + . = ..() + change_transfer_amount(user) + +///Opens a tgui_input_list and changes the transfer_amount of our container based on our selection +/obj/item/reagent_containers/proc/change_transfer_amount(mob/living/user) if(!possible_transfer_amounts) - return + return FALSE var/result = tgui_input_list(user, "Amount per transfer from this:","[src]", possible_transfer_amounts) if(result) amount_per_transfer_from_this = result - -/obj/item/reagent_containers/interact(mob/user) - . = ..() - if(.) - return - - open_ui(user) - -///Opens the relevant UI -/obj/item/reagent_containers/proc/open_ui(mob/user) - if(!length(possible_transfer_amounts)) - return - - var/N = tgui_input_list(user, "Amount per transfer from this:", "[src]", possible_transfer_amounts) - if(!N) - return - - amount_per_transfer_from_this = N + return TRUE /obj/item/reagent_containers/verb/set_APTFT() set name = "Set transfer amount" set category = "Object" set src in view(1) - var/N = tgui_input_list(usr, "Amount per transfer from this:", "[src]", possible_transfer_amounts) - if(!N) - return - - amount_per_transfer_from_this = N - + change_transfer_amount(usr) //returns a text listing the reagents (and their volume) in the atom. Used by Attack logs for reagents in pills /obj/item/reagent_containers/proc/get_reagent_list_text() diff --git a/code/game/objects/items/reagent_containers/spray.dm b/code/game/objects/items/reagent_containers/spray.dm index b4436911e92ad..e4b0077838d37 100644 --- a/code/game/objects/items/reagent_containers/spray.dm +++ b/code/game/objects/items/reagent_containers/spray.dm @@ -9,8 +9,8 @@ ) item_state = "cleaner" init_reagent_flags = OPENCONTAINER_NOUNIT - flags_item = NOBLUDGEON - flags_equip_slot = ITEM_SLOT_BELT + item_flags = NOBLUDGEON + equip_slot_flags = ITEM_SLOT_BELT throwforce = 3 w_class = WEIGHT_CLASS_SMALL throw_speed = 2 diff --git a/code/game/objects/items/reagent_containers/syringes.dm b/code/game/objects/items/reagent_containers/syringes.dm index f919b6c787daa..6b8f32ebec3a0 100644 --- a/code/game/objects/items/reagent_containers/syringes.dm +++ b/code/game/objects/items/reagent_containers/syringes.dm @@ -20,7 +20,7 @@ possible_transfer_amounts = null //list(5,10,15) volume = 15 w_class = WEIGHT_CLASS_TINY - flags_item = NOBLUDGEON + item_flags = NOBLUDGEON sharp = IS_SHARP_ITEM_SIMPLE var/mode = SYRINGE_DRAW @@ -185,32 +185,37 @@ update_icon() -/obj/item/reagent_containers/syringe/update_icon() +/obj/item/reagent_containers/syringe/update_icon_state() + . = ..() if(mode == SYRINGE_BROKEN) icon_state = "broken" - overlays.Cut() return + var/rounded_vol = round(reagents.total_volume,5) - overlays.Cut() + icon_state = "[rounded_vol]" + item_state = "syringe_[rounded_vol]" + +/obj/item/reagent_containers/syringe/update_overlays() + . = ..() + if(mode == SYRINGE_BROKEN) + return if(ismob(loc)) var/injoverlay switch(mode) - if (SYRINGE_DRAW) + if(SYRINGE_DRAW) injoverlay = "draw" - if (SYRINGE_INJECT) + if(SYRINGE_INJECT) injoverlay = "inject" - overlays += injoverlay - icon_state = "[rounded_vol]" - item_state = "syringe_[rounded_vol]" + . += injoverlay + var/rounded_vol = round(reagents.total_volume,5) if(reagents.total_volume) var/image/filling = image('icons/obj/reagentfillings.dmi', src, "syringe10") filling.icon_state = "syringe[rounded_vol]" filling.color = mix_color_from_reagents(reagents.reagent_list) - overlays += filling - + . += filling /obj/item/reagent_containers/syringe/proc/syringestab(mob/living/carbon/target as mob, mob/living/carbon/user as mob) diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index fbe752d120bf8..4fdc489b68000 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -7,8 +7,8 @@ ) item_state = "buildpipe" icon_state = "blank" - flags_atom = CONDUCT - flags_equip_slot = ITEM_SLOT_BELT + atom_flags = CONDUCT + equip_slot_flags = ITEM_SLOT_BELT var/list/part /obj/item/robot_parts/l_arm @@ -53,7 +53,7 @@ /obj/item/robot_parts/biotic name = "biotic limbs" icon = 'icons/mob/human_races/r_human.dmi' - flags_atom = NONE + atom_flags = NONE /obj/item/robot_parts/biotic/l_arm name = "biotic left arm" diff --git a/code/game/objects/items/scanners.dm b/code/game/objects/items/scanners.dm index 0adbe90c14a7a..e45da80161c85 100644 --- a/code/game/objects/items/scanners.dm +++ b/code/game/objects/items/scanners.dm @@ -16,8 +16,8 @@ REAGENT SCANNER icon = 'icons/obj/device.dmi' icon_state = "t-ray0" var/on = 0 - flags_atom = CONDUCT - flags_equip_slot = ITEM_SLOT_BELT + atom_flags = CONDUCT + equip_slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_SMALL item_icons = list( slot_l_hand_str = 'icons/mob/inhands/equipment/engineering_left.dmi', @@ -71,8 +71,8 @@ REAGENT SCANNER ) item_state = "healthanalyzer" desc = "A hand-held body scanner able to distinguish vital signs of the subject. The front panel is able to provide the basic readout of the subject's status." - flags_atom = CONDUCT - flags_equip_slot = ITEM_SLOT_BELT + atom_flags = CONDUCT + equip_slot_flags = ITEM_SLOT_BELT throwforce = 3 w_class = WEIGHT_CLASS_SMALL throw_speed = 5 @@ -267,12 +267,13 @@ REAGENT SCANNER ) damaged_organs += list(current_organ) data["damaged_organs"] = damaged_organs - + var/ssd = null if(patient.has_brain() && patient.stat != DEAD && ishuman(patient)) if(!patient.key) - data["ssd"] = "No soul detected." // they ghosted + ssd = "No soul detected." // they ghosted else if(!patient.client) - data["ssd"] = "SSD detected." // SSD + ssd = "SSD detected." // SSD + data["ssd"] = ssd return data @@ -286,18 +287,18 @@ REAGENT SCANNER desc = "Advanced medical gloves, these include a built-in analyzer to quickly scan patients." icon_state = "medscan_gloves" item_state = "medscan_gloves" - flags_equip_slot = ITEM_SLOT_GLOVES + equip_slot_flags = ITEM_SLOT_GLOVES w_class = WEIGHT_CLASS_SMALL icon = 'icons/obj/clothing/gloves.dmi' item_state_worn = TRUE siemens_coefficient = 0.50 blood_sprite_state = "bloodyhands" - flags_armor_protection = HANDS - flags_equip_slot = ITEM_SLOT_GLOVES + armor_protection_flags = HANDS + equip_slot_flags = ITEM_SLOT_GLOVES attack_verb = "scans" soft_armor = list(MELEE = 25, BULLET = 15, LASER = 10, ENERGY = 15, BOMB = 15, BIO = 5, FIRE = 15, ACID = 15) - flags_cold_protection = HANDS - flags_heat_protection = HANDS + cold_protection_flags = HANDS + heat_protection_flags = HANDS min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE @@ -350,8 +351,8 @@ REAGENT SCANNER icon_state = "atmos" item_state = "analyzer" w_class = WEIGHT_CLASS_SMALL - flags_atom = CONDUCT - flags_equip_slot = ITEM_SLOT_BELT + atom_flags = CONDUCT + equip_slot_flags = ITEM_SLOT_BELT throwforce = 5 throw_speed = 4 throw_range = 20 @@ -400,14 +401,13 @@ REAGENT SCANNER icon_state = "spectrometer" item_state = "analyzer" w_class = WEIGHT_CLASS_SMALL - flags_atom = CONDUCT - flags_equip_slot = ITEM_SLOT_BELT + atom_flags = CONDUCT + equip_slot_flags = ITEM_SLOT_BELT throwforce = 5 throw_speed = 4 throw_range = 20 var/details = FALSE - var/recent_fail = TRUE /obj/item/mass_spectrometer/Initialize(mapload) . = ..() @@ -422,9 +422,6 @@ REAGENT SCANNER /obj/item/mass_spectrometer/attack_self(mob/user as mob) if (user.stat) return - if (crit_fail) - to_chat(user, span_warning("This device has critically failed and is no longer functional!")) - return if(!reagents.total_volume) return var/list/blood_traces @@ -438,16 +435,7 @@ REAGENT SCANNER break var/dat = "Trace Chemicals Found: " for(var/R in blood_traces) - if(prob(reliability)) - dat += "\n\t[R][details ? " ([blood_traces[R]] units)" : "" ]" - recent_fail = FALSE - else if(recent_fail) - crit_fail = TRUE - reagents.clear_reagents() - to_chat(user, span_warning("Device malfunction occured. Please consult manual for manufacturer contact and warranty.")) - return - else - recent_fail = TRUE + dat += "\n\t[R][details ? " ([blood_traces[R]] units)" : "" ]" to_chat(user, "[dat]") reagents.clear_reagents() @@ -464,14 +452,13 @@ REAGENT SCANNER icon_state = "spectrometer" item_state = "analyzer" w_class = WEIGHT_CLASS_SMALL - flags_atom = CONDUCT - flags_equip_slot = ITEM_SLOT_BELT + atom_flags = CONDUCT + equip_slot_flags = ITEM_SLOT_BELT throwforce = 5 throw_speed = 4 throw_range = 20 var/details = FALSE - var/recent_fail = FALSE /obj/item/reagent_scanner/afterattack(obj/O, mob/user as mob, proximity) if(!proximity) @@ -480,24 +467,13 @@ REAGENT SCANNER return if(!istype(O)) return - if (crit_fail) - to_chat(user, span_warning("This device has critically failed and is no longer functional!")) - return if(!O.reagents || !length(O.reagents.reagent_list)) to_chat(user, span_notice("No chemical agents found in [O]")) return var/dat = "" var/one_percent = O.reagents.total_volume / 100 for (var/datum/reagent/R in O.reagents.reagent_list) - if(prob(reliability)) - dat += "\n \t [span_notice(" [R.name][details ? ": [R.volume / one_percent]%" : ""]")]" - recent_fail = FALSE - else if(recent_fail) - crit_fail = TRUE - to_chat(user, span_warning("Device malfunction occured. Please consult manual for manufacturer contact and warranty.")) - return - else - recent_fail = TRUE + dat += "\n \t [span_notice(" [R.name][details ? ": [R.volume / one_percent]%" : ""]")]" to_chat(user, span_notice("Chemicals found: [dat]")) /obj/item/reagent_scanner/adv diff --git a/code/game/objects/items/shards.dm b/code/game/objects/items/shards.dm index 63b9b2bec1409..92921b3e8ae2b 100644 --- a/code/game/objects/items/shards.dm +++ b/code/game/objects/items/shards.dm @@ -16,7 +16,7 @@ ) item_state = "shard-glass" attack_verb = list("stabbed", "slashed", "sliced", "cut") - var/source_sheet_type = /obj/item/stack/sheet/glass + var/source_sheet_type = /obj/item/stack/sheet/glass/glass var/shardsize /obj/item/shard/suicide_act(mob/user) @@ -52,6 +52,8 @@ /obj/item/shard/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(iswelder(I)) var/obj/item/tool/weldingtool/WT = I @@ -106,7 +108,7 @@ if(H.species.species_flags & ROBOTIC_LIMBS || H.species.species_flags & IS_INSULATED) return - if(!H.shoes && !(H.wear_suit?.flags_armor_protection & FEET)) + if(!H.shoes && !(H.wear_suit?.armor_protection_flags & FEET)) INVOKE_ASYNC(src, PROC_REF(pierce_foot), H) /obj/item/shard/proc/pierce_foot(mob/living/carbon/human/target) diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index 0a4d9e13477f9..e8896d7639905 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -28,7 +28,7 @@ icon = 'icons/obj/objects.dmi' icon_state = "target_stake" density = TRUE - flags_atom = CONDUCT + atom_flags = CONDUCT max_integrity = 15000 //important that what the marines are shooting at doesn't break, we don't make it invulnerable because we still need to plasma cutter it sometimes soft_armor = list(MELEE = 80, BULLET = 100, LASER = 100, ENERGY = 100, BOMB = 120, BIO = 100, FIRE = 100, ACID = 0) ///ungas need to actually hit this @@ -36,6 +36,8 @@ /obj/structure/target_stake/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(!istype(I, /obj/item/target)) return var/obj/item/target/targetcushion = I diff --git a/code/game/objects/items/stacks/barbed_wire.dm b/code/game/objects/items/stacks/barbed_wire.dm index 147f877a19b83..d02df54cc31ed 100644 --- a/code/game/objects/items/stacks/barbed_wire.dm +++ b/code/game/objects/items/stacks/barbed_wire.dm @@ -4,7 +4,7 @@ desc = "A spiky length of wire." icon = 'icons/Marine/marine-items.dmi' icon_state = "barbed_wire" - flags_item = NOBLUDGEON + item_flags = NOBLUDGEON singular_name = "length" w_class = WEIGHT_CLASS_SMALL force = 0 @@ -29,6 +29,8 @@ /obj/item/stack/barbed_wire/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(!istype(I, /obj/item/stack/rods)) return diff --git a/code/game/objects/items/stacks/catwalk.dm b/code/game/objects/items/stacks/catwalk.dm index 1ad00da269d96..4f0b5f8f543be 100644 --- a/code/game/objects/items/stacks/catwalk.dm +++ b/code/game/objects/items/stacks/catwalk.dm @@ -9,5 +9,5 @@ throwforce = 8 throw_speed = 3 throw_range = 6 - flags_atom = CONDUCT + atom_flags = CONDUCT max_amount = 60 diff --git a/code/game/objects/items/stacks/flags.dm b/code/game/objects/items/stacks/flags.dm index 897b9aa943ab3..565626bfe3cc9 100644 --- a/code/game/objects/items/stacks/flags.dm +++ b/code/game/objects/items/stacks/flags.dm @@ -31,6 +31,8 @@ /obj/item/stack/flag/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(upright && istype(I, type)) return attack_hand(user) diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 44d5863abcb4f..97f0dd6bc97af 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -181,28 +181,10 @@ /obj/item/stack/medical/heal_pack/advanced dir = NORTH - flags_atom = DIRLOCK + atom_flags = DIRLOCK skill_level_needed = SKILL_MEDICAL_PRACTICED unskilled_delay = SKILL_TASK_EASY -/* //RUTGMC edit - turning off unused proc -/obj/item/stack/medical/heal_pack/advanced/update_icon_state() - if(max_amount < 1 || amount > max_amount) - return - var/percentage = round(amount / max_amount) * 100 - switch(percentage) - if(1 to 20) - setDir(SOUTH) - if(21 to 40) - setDir(EAST) - if(41 to 60) - setDir(SOUTHEAST) - if(61 to 80) - setDir(WEST) - if(81 to INFINITY) - setDir(NORTH) -*/ - /obj/item/stack/medical/heal_pack/advanced/bruise_pack name = "advanced trauma kit" singular_name = "advanced trauma kit" diff --git a/code/game/objects/items/stacks/nanopaste.dm b/code/game/objects/items/stacks/nanopaste.dm index e58b980c2ce17..f9506ec160417 100644 --- a/code/game/objects/items/stacks/nanopaste.dm +++ b/code/game/objects/items/stacks/nanopaste.dm @@ -18,7 +18,7 @@ var/datum/limb/S = H.get_limb(user.zone_selected) if(H.species.species_flags & IS_SYNTHETIC) - H.blood_volume = BLOOD_VOLUME_NORMAL + H.set_blood_volume(BLOOD_VOLUME_NORMAL) if(S.surgery_open_stage == 0) if (S && (S.limb_status & LIMB_ROBOT)) diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index 13d889e577293..153a5aab8c8c1 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -3,7 +3,7 @@ desc = "Some rods. Can be used for building, or something." singular_name = "metal rod" icon_state = "rods" - flags_atom = CONDUCT + atom_flags = CONDUCT w_class = WEIGHT_CLASS_NORMAL force = 9 throwforce = 15 @@ -14,7 +14,9 @@ /obj/item/stack/rods/attackby(obj/item/W as obj, mob/user as mob) - ..() + . = ..() + if(.) + return if(istype(W, /obj/item/stack/barbed_wire)) // making razorwire obstacles var/obj/item/stack/barbed_wire/B = W @@ -46,8 +48,6 @@ if (!R && replace) user.put_in_hands(new_item) return - ..() - /obj/item/stack/rods/attack_self(mob/user as mob) diff --git a/code/game/objects/items/stacks/sandbags.dm b/code/game/objects/items/stacks/sandbags.dm index 9408d2360f9f2..cada5cca97479 100644 --- a/code/game/objects/items/stacks/sandbags.dm +++ b/code/game/objects/items/stacks/sandbags.dm @@ -22,6 +22,8 @@ /obj/item/stack/sandbags_empty/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/tool/shovel)) var/obj/item/tool/shovel/ET = I @@ -86,5 +88,5 @@ /obj/item/stack/sandbags/attack_self(mob/living/user) . = ..() - var/building_time = LERP(2 SECONDS, 1 SECONDS, user.skills.getPercent(SKILL_CONSTRUCTION, SKILL_ENGINEER_MASTER)) + var/building_time = LERP(2 SECONDS, 1 SECONDS, user.skills.getPercent(SKILL_CONSTRUCTION, SKILL_ENGINEER_EXPERT)) create_object(user, new/datum/stack_recipe("sandbag barricade", /obj/structure/barricade/sandbags, 5, time = building_time, max_per_turf = STACK_RECIPE_ONE_DIRECTIONAL_PER_TILE, on_floor = TRUE), 1) diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 3dbd6282c5bbf..112f298f23c9f 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -15,7 +15,6 @@ singular_name = "glass sheet" icon_state = "sheet-glass" item_state = "sheet-glass" - merge_type = /obj/item/stack/sheet/glass var/created_window = /obj/structure/window var/reinforced_type = /obj/item/stack/sheet/glass/reinforced var/is_reinforced = FALSE @@ -58,6 +57,8 @@ GLOBAL_LIST_INIT(glass_radial_images, list( /obj/item/stack/sheet/glass/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(is_reinforced) return @@ -74,8 +75,9 @@ GLOBAL_LIST_INIT(glass_radial_images, list( V.use(1) if(!src && !RG) user.put_in_hands(RG) - -/obj/item/stack/sheet/glass/large_stack +/obj/item/stack/sheet/glass/glass //this exists because otherwise glass can be merger into any ofthe other glass types. + merge_type = /obj/item/stack/sheet/glass/glass +/obj/item/stack/sheet/glass/glass/large_stack amount = 50 @@ -88,6 +90,7 @@ GLOBAL_LIST_INIT(glass_radial_images, list( singular_name = "reinforced glass sheet" icon_state = "sheet-rglass" item_state = "sheet-rglass" + merge_type = /obj/item/stack/sheet/glass/reinforced created_window = /obj/structure/window/reinforced is_reinforced = TRUE @@ -101,9 +104,11 @@ GLOBAL_LIST_INIT(glass_radial_images, list( desc = "Phoron glass is a silicate-phoron alloy turned into a non-crystalline solid. It is transparent just like glass, even if visibly tainted pink, and very resistant to damage and heat." singular_name = "phoron glass sheet" icon_state = "sheet-phoronglass" + merge_type = /obj/item/stack/sheet/glass/phoronglass created_window = /obj/structure/window/phoronbasic reinforced_type = /obj/item/stack/sheet/glass/phoronrglass + /* * Reinforced phoron glass sheets */ @@ -112,5 +117,6 @@ GLOBAL_LIST_INIT(glass_radial_images, list( desc = "Reinforced phoron glass is made out of squares of silicate-phoron alloy glass layered on a metallic rod matrice. It is insanely resistant to both physical shock and heat." singular_name = "reinforced phoron glass sheet" icon_state = "sheet-phoronrglass" + merge_type = /obj/item/stack/sheet/glass/phoronrglass created_window = /obj/structure/window/phoronreinforced is_reinforced = TRUE diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index 7baaa36b7a4ee..b7279d03f79d9 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -88,6 +88,8 @@ //Step one - dehairing. /obj/item/stack/sheet/animalhide/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(I.sharp) user.visible_message(span_notice(" \the [user] starts cutting hair off \the [src]"), span_notice(" You start cutting the hair off \the [src]"), "You hear the sound of a knife rubbing against flesh") diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index a338918e27f91..6c0896d6f3d40 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -32,21 +32,21 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ new/datum/stack_recipe("reinforced table parts", /obj/item/frame/table/reinforced, 2), \ new/datum/stack_recipe("rack parts", /obj/item/frame/rack, 1), \ new/datum/stack_recipe_list("airlock assemblies", list( \ - new/datum/stack_recipe("standard airlock assembly", /obj/structure/door_assembly, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_MASTER), \ - new/datum/stack_recipe("command airlock assembly", /obj/structure/door_assembly/door_assembly_com, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_MASTER), \ - new/datum/stack_recipe("security airlock assembly", /obj/structure/door_assembly/door_assembly_sec, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_MASTER), \ - new/datum/stack_recipe("engineering airlock assembly", /obj/structure/door_assembly/door_assembly_eng, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_MASTER), \ - new/datum/stack_recipe("mining airlock assembly", /obj/structure/door_assembly/door_assembly_min, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_MASTER), \ - new/datum/stack_recipe("atmospherics airlock assembly", /obj/structure/door_assembly/door_assembly_atmo, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_MASTER), \ - new/datum/stack_recipe("research airlock assembly", /obj/structure/door_assembly/door_assembly_research, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_MASTER), \ - new/datum/stack_recipe("medical airlock assembly", /obj/structure/door_assembly/door_assembly_med, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_MASTER), \ - new/datum/stack_recipe("maintenance airlock assembly", /obj/structure/door_assembly/door_assembly_mai, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_MASTER), \ - new/datum/stack_recipe("external airlock assembly", /obj/structure/door_assembly/door_assembly_ext, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_MASTER), \ - new/datum/stack_recipe("freezer airlock assembly", /obj/structure/door_assembly/door_assembly_fre, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_MASTER), \ - new/datum/stack_recipe("airtight hatch assembly", /obj/structure/door_assembly/door_assembly_hatch, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_MASTER), \ - new/datum/stack_recipe("maintenance hatch assembly", /obj/structure/door_assembly/door_assembly_mhatch, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_MASTER), \ - new/datum/stack_recipe("high security airlock assembly", /obj/structure/door_assembly/door_assembly_highsecurity, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_MASTER), \ - new/datum/stack_recipe("multi-tile airlock assembly", /obj/structure/door_assembly/multi_tile, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_MASTER), \ + new/datum/stack_recipe("standard airlock assembly", /obj/structure/door_assembly, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_EXPERT), \ + new/datum/stack_recipe("command airlock assembly", /obj/structure/door_assembly/door_assembly_com, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_EXPERT), \ + new/datum/stack_recipe("security airlock assembly", /obj/structure/door_assembly/door_assembly_sec, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_EXPERT), \ + new/datum/stack_recipe("engineering airlock assembly", /obj/structure/door_assembly/door_assembly_eng, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_EXPERT), \ + new/datum/stack_recipe("mining airlock assembly", /obj/structure/door_assembly/door_assembly_min, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_EXPERT), \ + new/datum/stack_recipe("atmospherics airlock assembly", /obj/structure/door_assembly/door_assembly_atmo, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_EXPERT), \ + new/datum/stack_recipe("research airlock assembly", /obj/structure/door_assembly/door_assembly_research, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_EXPERT), \ + new/datum/stack_recipe("medical airlock assembly", /obj/structure/door_assembly/door_assembly_med, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_EXPERT), \ + new/datum/stack_recipe("maintenance airlock assembly", /obj/structure/door_assembly/door_assembly_mai, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_EXPERT), \ + new/datum/stack_recipe("external airlock assembly", /obj/structure/door_assembly/door_assembly_ext, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_EXPERT), \ + new/datum/stack_recipe("freezer airlock assembly", /obj/structure/door_assembly/door_assembly_fre, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_EXPERT), \ + new/datum/stack_recipe("airtight hatch assembly", /obj/structure/door_assembly/door_assembly_hatch, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_EXPERT), \ + new/datum/stack_recipe("maintenance hatch assembly", /obj/structure/door_assembly/door_assembly_mhatch, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_EXPERT), \ + new/datum/stack_recipe("high security airlock assembly", /obj/structure/door_assembly/door_assembly_highsecurity, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_EXPERT), \ + new/datum/stack_recipe("multi-tile airlock assembly", /obj/structure/door_assembly/multi_tile, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_EXPERT), \ ), 4), \ null, \ )) @@ -66,9 +66,9 @@ GLOBAL_LIST_INIT(metal_radial_images, list( singular_name = "metal sheet" icon_state = "sheet-metal" item_state = "sheet-metal" - flags_item = NOBLUDGEON + item_flags = NOBLUDGEON throwforce = 14 - flags_atom = CONDUCT + atom_flags = CONDUCT merge_type = /obj/item/stack/sheet/metal number_of_extra_variants = 3 @@ -132,9 +132,9 @@ GLOBAL_LIST_INIT(metal_radial_images, list( desc = "This sheet is an alloy of iron and phoron." icon_state = "sheet-plasteel" item_state = "sheet-plasteel" - flags_item = NOBLUDGEON + item_flags = NOBLUDGEON throwforce = 15 - flags_atom = CONDUCT + atom_flags = CONDUCT merge_type = /obj/item/stack/sheet/plasteel number_of_extra_variants = 3 diff --git a/code/game/objects/items/stacks/snow.dm b/code/game/objects/items/stacks/snow.dm index 91c1af488d74f..91e29432d2c77 100644 --- a/code/game/objects/items/stacks/snow.dm +++ b/code/game/objects/items/stacks/snow.dm @@ -15,6 +15,8 @@ /obj/item/stack/snow/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(!istype(I, /obj/item/tool/shovel)) return @@ -61,7 +63,8 @@ return var/turf/open/T = target if(T.get_dirt_type() == DIRT_TYPE_SNOW) - if(T.slayer >= 3) + var/turf/open/floor/plating/ground/snow/snowy_turf = T + if(snowy_turf.slayer >= 3) to_chat(user, "This ground is already full of snow.") return if(amount < 5) @@ -70,11 +73,12 @@ to_chat(user, "You start putting some snow back on the ground.") if(!do_after(user, 15, IGNORE_HELD_ITEM, target, BUSY_ICON_BUILD)) return - if(T.slayer >= 3) + if(snowy_turf.slayer >= 3) return to_chat(user, "You put a new snow layer on the ground.") - T.slayer += 1 - T.update_icon(TRUE, FALSE) + snowy_turf.slayer += 1 + snowy_turf.update_appearance() + snowy_turf.update_sides() use(5) /obj/item/stack/snow/attack_self(mob/user) @@ -93,7 +97,7 @@ //Using same safeties as other constructions for(var/obj/O in user.loc) //Objects, we don't care about mobs. Turfs are checked elsewhere if(O.density) - if(O.flags_atom & ON_BORDER) + if(O.atom_flags & ON_BORDER) if(O.dir == user.dir) to_chat(user, span_warning("There is already \a [O.name] in this direction!")) return @@ -109,7 +113,7 @@ return for(var/obj/O in user.loc) //Objects, we don't care about mobs. Turfs are checked elsewhere if(O.density) - if(!(O.flags_atom & ON_BORDER) || O.dir == user.dir) + if(!(O.atom_flags & ON_BORDER) || O.dir == user.dir) return var/obj/structure/barricade/snow/SB = new(user.loc, user.dir) user.visible_message(span_notice("[user] assembles a snow barricade."), diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index a6363a127de57..4a38cb9ec68fd 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -56,6 +56,7 @@ /obj/item/stack/update_icon_state() + . = ..() if(!number_of_extra_variants) return var/ratio = round((amount * (number_of_extra_variants + 1)) / max_amount) @@ -271,7 +272,7 @@ continue if(!AM.density) continue - if(AM.flags_atom & ON_BORDER && AM.dir != user.dir) + if(AM.atom_flags & ON_BORDER && AM.dir != user.dir) if(istype(AM, /obj/structure/window)) var/obj/structure/window/W = AM if(!W.is_full_window()) diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 1c23e9e576337..f5d8d0c4d83e6 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -32,7 +32,7 @@ throwforce = 8 throw_speed = 3 throw_range = 6 - flags_atom = CONDUCT + atom_flags = CONDUCT turf_type = /turf/open/floor ///Creates plating, used for space turfs only @@ -87,6 +87,8 @@ /obj/item/stack/tile/light/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/tool/crowbar)) new /obj/item/stack/sheet/metal(user.loc) diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index cd6a0f5a815a6..227e446ef74ea 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -19,7 +19,7 @@ "Ratcher Combat Robot" = 'icons/mob/species/robot/backpack.dmi', ) w_class = WEIGHT_CLASS_BULKY - flags_equip_slot = ITEM_SLOT_BACK //ERROOOOO + equip_slot_flags = ITEM_SLOT_BACK //ERROOOOO max_w_class = WEIGHT_CLASS_NORMAL storage_slots = null max_storage_space = 24 @@ -66,28 +66,11 @@ max_w_class = WEIGHT_CLASS_BULKY max_storage_space = 28 -/obj/item/storage/backpack/holding/proc/failcheck(mob/user) - if (prob(reliability)) - return TRUE //No failure - if (prob(reliability)) - to_chat(user, span_warning("The Bluespace portal resists your attempt to add another item.")) - else - to_chat(user, span_warning("The Bluespace generator malfunctions!")) - for (var/obj/O in src.contents) //it broke, delete what was in it - qdel(O) - crit_fail = 1 - icon_state = "brokenpack" - /obj/item/storage/backpack/holding/attackby(obj/item/I, mob/user, params) - if(crit_fail) - to_chat(user, span_warning("The Bluespace generator isn't working.")) - - else if(istype(I, /obj/item/storage/backpack/holding) && !I.crit_fail) - to_chat(user, span_warning("The Bluespace interfaces of the two devices conflict and malfunction.")) - qdel(I) - - else + if(!istype(I, /obj/item/storage/backpack/holding)) return ..() + to_chat(user, span_warning("The Bluespace interfaces of the two devices conflict and malfunction.")) + qdel(I) /obj/item/storage/backpack/santabag name = "Santa's Gift Bag" @@ -314,6 +297,7 @@ . += span_warning("Its defibrillator recharge unit does not have a power cell installed!") /obj/item/storage/backpack/marine/corpsman/update_icon_state() + . = ..() icon_state = icon_skin if(cell?.charge >= 0) switch(PERCENT(cell.charge/cell.maxcharge)) @@ -329,13 +313,18 @@ icon_state += "_0" /obj/item/storage/backpack/marine/corpsman/MouseDrop_T(obj/item/W, mob/living/user) //Dragging the defib/power cell onto the backpack will trigger its special functionality. + var/obj/item/defibrillator/defib if(istype(W, /obj/item/defibrillator)) + defib = W + else if(istype(W, /obj/item/clothing/gloves/defibrillator)) + var/obj/item/clothing/gloves/defibrillator/defib_gloves = W + defib = defib_gloves.internal_defib + if(defib) if(cell) - var/obj/item/defibrillator/D = W - var/charge_difference = D.dcell.maxcharge - D.dcell.charge + var/charge_difference = defib.dcell.maxcharge - defib.dcell.charge if(charge_difference) //If the defib has less than max charge, recharge it. use_charge(user, charge_difference) //consume an appropriate amount of charge - D.dcell.charge += min(charge_difference, cell.charge) //Recharge the defibrillator battery with the lower of the difference between its present and max cap, or the remaining charge + defib.dcell.charge += min(charge_difference, cell.charge) //Recharge the defibrillator battery with the lower of the difference between its present and max cap, or the remaining charge else to_chat(user, span_warning("This defibrillator is already at maximum charge!")) else @@ -358,14 +347,14 @@ /obj/item/storage/backpack/marine/tech name = "\improper TGMC technician backpack" - desc = "The standard-issue backpack worn by TGMC technicians. Specially equipped to hold sentry gun and M56D emplacement parts." + desc = "The standard-issue backpack worn by TGMC technicians. Specially equipped to hold sentry gun and HSG-102 emplacement parts." icon_state = "marinepackt" item_state = "marinepackt" bypass_w_limit = list( /obj/item/weapon/gun/sentry/big_sentry, /obj/item/weapon/gun/sentry/mini, - /obj/item/weapon/gun/tl102, - /obj/item/ammo_magazine/tl102, + /obj/item/weapon/gun/hsg_102, + /obj/item/ammo_magazine/hsg_102, /obj/item/ammo_magazine/sentry, /obj/item/ammo_magazine/minisentry, /obj/item/mortal_shell, @@ -405,7 +394,7 @@ item_state = "marinesatt" bypass_w_limit = list( /obj/item/weapon/gun/sentry/mini, - /obj/item/ammo_magazine/tl102, + /obj/item/ammo_magazine/hsg_102, /obj/item/ammo_magazine/sentry, /obj/item/ammo_magazine/minisentry, /obj/item/mortal_shell, @@ -462,8 +451,6 @@ var/stealth_delay = null actions_types = list(/datum/action/item_action/toggle) -/obj/item/storage/backpack/marine/satchel/scout_cloak/scout - /obj/item/storage/backpack/marine/satchel/scout_cloak/Destroy() camo_off() return ..() @@ -474,13 +461,48 @@ STOP_PROCESSING(SSprocessing, src) return ..() -/obj/item/storage/backpack/marine/satchel/scout_cloak/verb/use_camouflage() - set name = "Toggle M68 Thermal Camouflage" - set desc = "Activate your cloak's camouflage." - set category = "Scout" - +/obj/item/storage/backpack/marine/satchel/scout_cloak/attack_self(mob/user) + . = ..() camouflage() +/obj/item/storage/backpack/marine/satchel/scout_cloak/process() + if(!wearer) + camo_off() + return + else if(wearer.stat != CONSCIOUS) + camo_off(wearer) + return + + stealth_delay = world.time - SCOUT_CLOAK_STEALTH_DELAY + if(camo_last_shimmer > stealth_delay) //Shimmer after taking aggressive actions; no energy regeneration + wearer.alpha = shimmer_alpha //50% invisible + else if(camo_last_stealth > stealth_delay ) //We have an initial reprieve at max invisibility allowing us to reposition; no energy recovery during this time + wearer.alpha = SCOUT_CLOAK_STILL_ALPHA + return + //Stationary stealth + else if( wearer.last_move_intent < stealth_delay ) //If we're standing still and haven't shimmed in the past 3 seconds we become almost completely invisible + wearer.alpha = SCOUT_CLOAK_STILL_ALPHA //95% invisible + camo_adjust_energy(wearer, SCOUT_CLOAK_ACTIVE_RECOVERY) + +///Handles the wearer moving with the cloak active +/obj/item/storage/backpack/marine/satchel/scout_cloak/proc/handle_movement(mob/living/carbon/human/source, atom/old_loc, movement_dir, forced, list/old_locs) + SIGNAL_HANDLER + if(!camo_active) + return + if(camo_last_shimmer > world.time - SCOUT_CLOAK_STEALTH_DELAY) //Shimmer after taking aggressive actions + source.alpha = SCOUT_CLOAK_RUN_ALPHA + camo_adjust_energy(src, SCOUT_CLOAK_RUN_DRAIN) + else if(camo_last_stealth > world.time - SCOUT_CLOAK_STEALTH_DELAY) //We have an initial reprieve at max invisibility allowing us to reposition, albeit at a high drain rate + source.alpha = SCOUT_CLOAK_STILL_ALPHA + camo_adjust_energy(src, SCOUT_CLOAK_RUN_DRAIN) + else if(source.m_intent == MOVE_INTENT_WALK) + source.alpha = SCOUT_CLOAK_WALK_ALPHA + camo_adjust_energy(src, SCOUT_CLOAK_WALK_DRAIN) + else + source.alpha = SCOUT_CLOAK_RUN_ALPHA + camo_adjust_energy(src, SCOUT_CLOAK_RUN_DRAIN) + +///Activates the cloak /obj/item/storage/backpack/marine/satchel/scout_cloak/proc/camouflage() if (usr.incapacitated(TRUE)) return @@ -497,6 +519,7 @@ camo_off(usr) return + //other sources of cloaking if(SEND_SIGNAL(M, COMSIG_MOB_ENABLE_STEALTH) & STEALTH_ALREADY_ACTIVE) to_chat(M, span_warning("You are already cloaked!")) return FALSE @@ -509,7 +532,6 @@ camo_last_stealth = world.time wearer = M - RegisterSignal(wearer, COMSIG_MOB_ENABLE_STEALTH, PROC_REF(on_other_activate)) M.visible_message("[M] fades into thin air!", span_notice("You activate your cloak's camouflage.")) playsound(M.loc,'sound/effects/cloak_scout_on.ogg', 15, 1) @@ -537,11 +559,11 @@ COMSIG_MOB_ITEM_ATTACK), PROC_REF(action_taken)) START_PROCESSING(SSprocessing, src) - wearer.cloaking = TRUE + RegisterSignal(wearer, COMSIG_MOVABLE_MOVED, PROC_REF(handle_movement)) return TRUE - +///Sig handler for other sources of cloaking /obj/item/storage/backpack/marine/satchel/scout_cloak/proc/on_other_activate() SIGNAL_HANDLER return STEALTH_ALREADY_ACTIVE @@ -592,9 +614,10 @@ COMSIG_MOB_GUN_AUTOFIRED, COMSIG_MOB_ATTACHMENT_FIRED, COMSIG_MOB_THROW, - COMSIG_MOB_ITEM_ATTACK)) + COMSIG_MOB_ITEM_ATTACK, + COMSIG_MOVABLE_MOVED, + )) STOP_PROCESSING(SSprocessing, src) - wearer.cloaking = FALSE /obj/item/storage/backpack/marine/satchel/scout_cloak/proc/process_camo_cooldown(mob/living/user, cooldown) if(!camo_cooldown_timer) @@ -630,11 +653,6 @@ return FALSE return TRUE - -/obj/item/storage/backpack/marine/satchel/scout_cloak/attack_self(mob/user) - . = ..() - camouflage() - /obj/item/storage/backpack/marine/satchel/scout_cloak/proc/camo_adjust_energy(mob/user, drain = SCOUT_CLOAK_WALK_DRAIN) camo_energy = clamp(camo_energy - drain,0,initial(camo_energy)) @@ -658,34 +676,16 @@ camo_last_shimmer = world.time //Reduces transparency to 50% wearer.alpha = max(wearer.alpha,shimmer_alpha) -/obj/item/storage/backpack/marine/satchel/scout_cloak/process() - if(!wearer) - camo_off() - return - else if(wearer.stat != CONSCIOUS) - camo_off(wearer) - return - - stealth_delay = world.time - SCOUT_CLOAK_STEALTH_DELAY - if(camo_last_shimmer > stealth_delay) //Shimmer after taking aggressive actions; no energy regeneration - wearer.alpha = shimmer_alpha //50% invisible - else if(camo_last_stealth > stealth_delay ) //We have an initial reprieve at max invisibility allowing us to reposition; no energy recovery during this time - wearer.alpha = SCOUT_CLOAK_STILL_ALPHA - return - //Stationary stealth - else if( wearer.last_move_intent < stealth_delay ) //If we're standing still and haven't shimmed in the past 3 seconds we become almost completely invisible - wearer.alpha = SCOUT_CLOAK_STILL_ALPHA //95% invisible - camo_adjust_energy(wearer, SCOUT_CLOAK_ACTIVE_RECOVERY) - /obj/item/storage/backpack/marine/satchel/scout_cloak/sniper name = "\improper M68-B Thermal Cloak" icon_state = "smock" desc = "The M68-B thermal cloak is a variant custom-purposed for snipers, allowing for faster, superior, stationary concealment at the expense of mobile concealment. It is designed to be paired with the lightweight M3 recon battle armor. Serves as a satchel." shimmer_alpha = SCOUT_CLOAK_RUN_ALPHA * 0.5 //Half the normal shimmer transparency. -/obj/item/storage/backpack/marine/satchel/scout_cloak/sniper/equippedsniper/Initialize(mapload) - . = ..() - new /obj/item/detpack(src) +/obj/item/storage/backpack/marine/satchel/scout_cloak/sniper/handle_movement(mob/living/carbon/human/source, atom/old_loc, movement_dir, forced, list/old_locs) + if(!camo_active) + return + source.alpha = initial(source.alpha) //Sniper variant has *no* mobility stealth, but no drain on movement either /obj/item/storage/backpack/marine/satchel/scout_cloak/sniper/process() if(!wearer) @@ -707,7 +707,7 @@ /obj/item/storage/backpack/marine/engineerpack name = "\improper TGMC technician welderpack" - desc = "A specialized backpack worn by TGMC technicians. It carries a fueltank for quick welder refueling and use," + desc = "A specialized backpack worn by TGMC technicians. It carries a fueltank for quick welder refueling." icon_state = "engineerpack" item_state = "engineerpack" var/max_fuel = 260 diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index 70b204e0bcb93..6dda103b35603 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -20,7 +20,7 @@ allow_quick_empty = 1 display_contents_with_number = 0 // UNStABLE AS FuCK, turn on when it stops crashing clients use_to_pickup = 1 - flags_equip_slot = ITEM_SLOT_BELT + equip_slot_flags = ITEM_SLOT_BELT // ----------------------------- // Trash bag @@ -39,6 +39,7 @@ cant_hold = list(/obj/item/disk/nuclear) /obj/item/storage/bag/trash/update_icon_state() + . = ..() if(length(contents) == 0) icon_state = "trashbag0" else if(length(contents) < 12) @@ -75,7 +76,7 @@ desc = "This little bugger can be used to store and transport ores." icon = 'icons/obj/mining.dmi' icon_state = "satchel" - flags_equip_slot = ITEM_SLOT_BELT|ITEM_SLOT_POCKET + equip_slot_flags = ITEM_SLOT_BELT|ITEM_SLOT_POCKET w_class = WEIGHT_CLASS_NORMAL storage_slots = 50 max_storage_space = 200 //Doesn't matter what this is, so long as it's more or equal to storage_slots * ore.w_class diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index b73abf8ee40e7..019fdcaa04894 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -7,7 +7,7 @@ icon_state = "utilitybelt" item_state = "utility" item_state_worn = TRUE - flags_equip_slot = ITEM_SLOT_BELT + equip_slot_flags = ITEM_SLOT_BELT attack_verb = list("whipped", "lashed", "disciplined") w_class = WEIGHT_CLASS_BULKY allow_drawing_method = TRUE @@ -177,6 +177,30 @@ new /obj/item/reagent_containers/hypospray/autoinjector/dexalinplus(src) new /obj/item/healthanalyzer(src) +/obj/item/storage/belt/lifesaver/beginner/Initialize(mapload, ...) //For beginner vendor + . = ..() + new /obj/item/storage/pill_bottle/bicaridine(src) + new /obj/item/storage/pill_bottle/meralyne(src) + new /obj/item/storage/pill_bottle/kelotane(src) + new /obj/item/storage/pill_bottle/dermaline(src) + new /obj/item/storage/pill_bottle/tramadol(src) + new /obj/item/storage/pill_bottle/tricordrazine(src) + new /obj/item/storage/pill_bottle/dylovene(src) + new /obj/item/storage/pill_bottle/inaprovaline(src) + new /obj/item/storage/pill_bottle/isotonic(src) + new /obj/item/storage/pill_bottle/spaceacillin(src) + new /obj/item/storage/pill_bottle/alkysine(src) + new /obj/item/storage/pill_bottle/imidazoline(src) + new /obj/item/storage/pill_bottle/quickclot(src) + new /obj/item/storage/pill_bottle/hypervene(src) + new /obj/item/stack/medical/splint(src) + new /obj/item/stack/medical/splint(src) + new /obj/item/stack/medical/splint(src) + new /obj/item/stack/medical/splint(src) + new /obj/item/stack/medical/splint(src) + new /obj/item/stack/medical/splint(src) + new /obj/item/healthanalyzer(src) + /obj/item/storage/belt/lifesaver/full/upp name ="\improper Type 41 pattern lifesaver bag" desc = "The Type 41 load rig is the standard-issue LBE of the UPP military. This configuration mounts a satchel filled with a range of injectors and light medical supplies, common among medics and partisans." @@ -325,15 +349,15 @@ new /obj/item/storage/pill_bottle/tricordrazine(src) new /obj/item/storage/pill_bottle/dylovene(src) new /obj/item/storage/pill_bottle/inaprovaline(src) - new /obj/item/storage/pill_bottle/dexalin(src) + new /obj/item/storage/pill_bottle/isotonic(src) new /obj/item/storage/pill_bottle/spaceacillin(src) new /obj/item/storage/pill_bottle/alkysine(src) new /obj/item/storage/pill_bottle/imidazoline(src) new /obj/item/storage/pill_bottle/quickclot(src) new /obj/item/storage/pill_bottle/hypervene(src) + new /obj/item/bodybag/cryobag(src) new /obj/item/defibrillator(src) new /obj/item/tool/research/excavation_tool(src) - new /obj/item/tool/research/xeno_analyzer(src) new /obj/item/healthanalyzer(src) /obj/item/storage/belt/hypospraybelt @@ -352,7 +376,7 @@ /obj/item/storage/syringe_case, ) -/obj/item/storage/belt/hypospraybelt/Initialize(mapload) //The belt, with all it's magic inside! +/obj/item/storage/belt/hypospraybelt/full/Initialize(mapload) //The belt, with all it's magic inside! . = ..() new /obj/item/reagent_containers/glass/bottle/bicaridine(src) new /obj/item/reagent_containers/glass/bottle/kelotane(src) @@ -372,6 +396,31 @@ new /obj/item/reagent_containers/hypospray/advanced/hypervene(src) new /obj/item/healthanalyzer(src) +/obj/item/storage/belt/hypospraybelt/beginner/Initialize(mapload) + . = ..() + new /obj/item/reagent_containers/glass/bottle/bicaridine(src) + new /obj/item/reagent_containers/glass/bottle/kelotane(src) + new /obj/item/reagent_containers/glass/bottle/tramadol(src) + new /obj/item/reagent_containers/glass/bottle/tricordrazine(src) + new /obj/item/reagent_containers/hypospray/advanced/big/bicaridine(src) + new /obj/item/reagent_containers/hypospray/advanced/big/kelotane(src) + new /obj/item/reagent_containers/hypospray/advanced/big/tramadol(src) + new /obj/item/reagent_containers/hypospray/advanced/big/tricordrazine(src) + new /obj/item/reagent_containers/hypospray/advanced/big/combatmix(src) + new /obj/item/reagent_containers/hypospray/advanced/big/dylovene(src) + new /obj/item/reagent_containers/hypospray/advanced/big/inaprovaline(src) + new /obj/item/reagent_containers/hypospray/advanced/big/isotonic(src) + new /obj/item/reagent_containers/hypospray/advanced/big/spaceacillin(src) + new /obj/item/reagent_containers/hypospray/advanced/big/quickclot(src) + new /obj/item/reagent_containers/hypospray/advanced/imialky(src) + new /obj/item/reagent_containers/hypospray/advanced/hypervene(src) + new /obj/item/reagent_containers/hypospray/advanced/peridaxonplus(src) + new /obj/item/reagent_containers/hypospray/advanced/quickclotplus(src) + new /obj/item/storage/syringe_case/meraderm(src) + new /obj/item/storage/syringe_case/meraderm(src) + new /obj/item/reagent_containers/hypospray/advanced/meraderm(src) + + /obj/item/storage/belt/security name = "\improper M276 pattern security rig" desc = "The M276 is the standard load-bearing equipment of the TGMC. It consists of a modular belt with various clips. This configuration is commonly seen among TGMC Military Police and peacekeepers, though it can hold some light munitions." @@ -718,12 +767,11 @@ /obj/item/storage/belt/shotgun/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/ammo_magazine)) var/obj/item/ammo_magazine/M = I - if(CHECK_BITFIELD(M.flags_magazine, MAGAZINE_HANDFUL)) + if(CHECK_BITFIELD(M.magazine_flags, MAGAZINE_HANDFUL)) return ..() - if(M.flags_magazine & MAGAZINE_REFILLABLE) + if(M.magazine_flags & MAGAZINE_REFILLABLE) if(!M.current_rounds) to_chat(user, span_warning("[M] is empty.")) return @@ -862,47 +910,44 @@ /obj/item/storage/belt/shotgun/martini name = "martini henry ammo belt" desc = "A belt good enough for holding all your .577/400 ball rounds." - icon_state = ".557_belt" + icon_state = "martini_belt" storage_slots = 12 max_storage_space = 24 - + sprite_slots = 6 draw_mode = 1 - flags_atom = DIRLOCK + atom_flags = DIRLOCK /obj/item/storage/belt/shotgun/martini/Initialize(mapload, ...) . = ..() update_icon() -/obj/item/storage/belt/shotgun/martini/update_icon() - if(!length(contents)) - icon_state = initial(icon_state) + "_e" - return - icon_state = initial(icon_state) +/obj/item/storage/belt/shotgun/martini/attackby(obj/item/I, mob/user, params) + if(!istype(I, /obj/item/ammo_magazine)) + update_icon() + return ..() - var/holding = round((length(contents) + 1) / 2) - setDir(holding + round(holding/3)) + var/obj/item/ammo_magazine/new_mag = I + if(new_mag.caliber != CALIBER_557) + to_chat(user, span_notice("[src] can only be filled with .557/440 ball rifle rounds.")) + return -/obj/item/storage/belt/shotgun/martini/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/ammo_magazine)) - var/obj/item/ammo_magazine/new_mag = I - if(new_mag.caliber != CALIBER_557) - to_chat(user, span_notice("[src] can only be filled with .557/440 ball rifle rounds.")) - return - . = ..() - update_icon() + return ..() /obj/item/storage/belt/shotgun/martini/attack_hand(mob/living/user) - if (loc != user) + if(!ishuman(user)) + return + + if(loc != user) . = ..() for(var/mob/M in content_watchers) close(M) - if(!draw_mode || !ishuman(user) && !length(contents)) - open(user) - if(!length(contents)) - return + open(user) //Empty belt? Open the inventory + + if(!draw_mode) + return ..() //No draw mode so we just click like normal var/obj/item/I = contents[length(contents)] if(!istype(I, /obj/item/ammo_magazine/handful)) @@ -917,7 +962,6 @@ existing_handful.create_handful(user, 1) update_icon() - /obj/item/storage/belt/knifepouch name="\improper M276 pattern knife rig" desc="The M276 is the standard load-bearing equipment of the TGMC. It consists of a modular belt with various clips. This version is specially designed with six holsters to store throwing knives. Not commonly issued, but kept in service." diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 1aafb5ffc2fa0..81807542d8cf4 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -235,7 +235,7 @@ icon_state = "matchbox" item_state = "zippo" w_class = WEIGHT_CLASS_TINY - flags_equip_slot = ITEM_SLOT_BELT + equip_slot_flags = ITEM_SLOT_BELT spawn_type = /obj/item/tool/match spawn_number = 14 @@ -349,6 +349,7 @@ spawn_number = 5 /obj/item/storage/box/explosive_mines/update_icon_state() + . = ..() icon_state = initial(icon_state) if(!length(contents)) icon_state += "_e" @@ -381,7 +382,8 @@ spawn_type = /obj/item/explosive/grenade/flare spawn_number = 14 -/obj/item/storage/box/m94/update_icon() +/obj/item/storage/box/m94/update_icon_state() + . = ..() icon_state = initial(icon_state) if(!length(contents)) icon_state += "_e" @@ -445,7 +447,8 @@ if(. && !length(contents) && !gc_destroyed) qdel(src) -/obj/item/storage/box/MRE/update_icon() +/obj/item/storage/box/MRE/update_icon_state() + . = ..() if(!isopened) isopened = 1 icon_state += "opened" @@ -668,7 +671,7 @@ /obj/item/ammo_magazine/smg, /obj/item/ammo_magazine/sniper, /obj/item/ammo_magazine/standard_gpmg, - /obj/item/ammo_magazine/tl102, + /obj/item/ammo_magazine/hsg_102, /obj/item/ammo_magazine/standard_lmg, /obj/item/ammo_magazine/standard_mmg, /obj/item/ammo_magazine/heavymachinegun, @@ -1148,9 +1151,9 @@ /obj/item/storage/box/visual/grenade/phosphorus name = "\improper M40 HPDP grenade box" desc = "A secure box holding 15 M40 HPDP white phosphorous grenades. War crimes for the entire platoon!" - storage_slots = 15 + storage_slots = 25 max_storage_space = 30 - spawn_number = 15 + spawn_number = 25 spawn_type = /obj/item/explosive/grenade/phosphorus closed_overlay = "grenade_box_overlay_phosphorus" @@ -1182,13 +1185,20 @@ spawn_type = /obj/item/explosive/grenade/smokebomb/drain closed_overlay = "grenade_box_overlay_drain" +/obj/item/storage/box/visual/grenade/antigas + name = "\improper M40-AG grenade box" + desc = "A secure box holding 25 M40-AG gas grenades. Quickly clears out hostile smoke." + spawn_number = 25 + spawn_type = /obj/item/explosive/grenade/smokebomb/antigas + closed_overlay = "grenade_box_overlay_antigas" + /obj/item/storage/box/visual/grenade/razorburn name = "razorburn grenade box" desc = "A secure box holding 15 razor burn grenades. Used for quick flank coverage." - storage_slots = 15 + storage_slots = 25 max_storage_space = 30 - spawn_number = 15 - spawn_type = /obj/item/explosive/grenade/chem_grenade/razorburn_smol + spawn_number = 25 + spawn_type = /obj/item/explosive/grenade/chem_grenade/razorburn_small closed_overlay = "grenade_box_overlay_razorburn" /obj/item/storage/box/visual/grenade/razorburn_large @@ -1206,6 +1216,20 @@ spawn_type = /obj/item/explosive/grenade/chem_grenade/teargas closed_overlay = "grenade_box_overlay_teargas" +/obj/item/storage/box/visual/grenade/lasburster + name = "\improper M80 lasburster grenade box" + desc = "A secure box holding 25 M80 lasburster grenades." + spawn_number = 25 + spawn_type = /obj/item/explosive/grenade/bullet/laser + closed_overlay = "grenade_box_overlay_grenade_lasburster" + +/obj/item/storage/box/visual/grenade/hefa + name = "\improper M25 HEFA grenade box" + desc = "A secure box holding 25 M25 high explosive fragmentation grenades. Keep very far away from extreme heat and flame." + spawn_number = 25 + spawn_type = /obj/item/explosive/grenade/bullet/hefa + closed_overlay = "grenade_box_overlay_grenade_hefa2" + /obj/item/storage/box/visual/grenade/training name = "\improper M07 training grenade box" desc = "A secure box holding 25 M07 training grenades. Harmless and reusable." diff --git a/code/game/objects/items/storage/briefcase.dm b/code/game/objects/items/storage/briefcase.dm index 78b42fa622799..ba9e334cd2650 100644 --- a/code/game/objects/items/storage/briefcase.dm +++ b/code/game/objects/items/storage/briefcase.dm @@ -3,7 +3,7 @@ desc = "It's made of AUTHENTIC faux-leather and has a price-tag still attached. Its owner must be a real professional." icon_state = "briefcase" item_state = "briefcase" - flags_atom = CONDUCT + atom_flags = CONDUCT force = 8 throw_speed = 1 throw_range = 4 @@ -16,7 +16,7 @@ desc = "A well made, expensive looking case, made to fit an R-76 Magnum and its accessories. For the discerning gun owner." icon_state = "magnum_case" item_state = "briefcase" - flags_atom = CONDUCT + atom_flags = CONDUCT force = 12 throw_speed = 1 throw_range = 4 diff --git a/code/game/objects/items/storage/dispenser.dm b/code/game/objects/items/storage/dispenser.dm index 44a70023e47d4..481c060426308 100644 --- a/code/game/objects/items/storage/dispenser.dm +++ b/code/game/objects/items/storage/dispenser.dm @@ -113,7 +113,7 @@ desc = "The TX-9000 also known as \"Dispenser\" is a machine capable of holding a big amount of items on it, while also healing nearby synthetics. Your allies will often ask you to lay down one of those." icon = 'icons/obj/items/storage/storage_48.dmi' icon_state = "dispenser" - flags_equip_slot = ITEM_SLOT_BACK + equip_slot_flags = ITEM_SLOT_BACK max_storage_space = 48 max_integrity = 250 @@ -122,12 +122,12 @@ AddComponent(/datum/component/deployable_item, /obj/machinery/deployable/dispenser, 0, 0) /obj/item/storage/backpack/dispenser/attack_hand(mob/living/user) - if(!CHECK_BITFIELD(flags_item, IS_DEPLOYED)) + if(!CHECK_BITFIELD(item_flags, IS_DEPLOYED)) return ..() open(user) /obj/item/storage/backpack/dispenser/open(mob/user) - if(CHECK_BITFIELD(flags_item, IS_DEPLOYED)) + if(CHECK_BITFIELD(item_flags, IS_DEPLOYED)) return ..() /obj/item/storage/backpack/dispenser/attempt_draw_object(mob/living/user) diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 02d96ac9f7e01..5e6fb8ca22eea 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -29,6 +29,7 @@ new spawn_type(src) /obj/item/storage/fancy/update_icon_state() + . = ..() icon_state = "[icon_type]box[length(contents)]" /obj/item/storage/fancy/remove_from_storage(obj/item/W, atom/new_location, mob/user) @@ -75,7 +76,7 @@ item_state = "candlebox5" storage_slots = 5 throwforce = 2 - flags_equip_slot = ITEM_SLOT_BELT + equip_slot_flags = ITEM_SLOT_BELT spawn_type = /obj/item/tool/candle spawn_number = 5 @@ -111,6 +112,8 @@ /obj/item/storage/fancy/crayons/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/toy/crayon)) var/obj/item/toy/crayon/C = I @@ -131,7 +134,7 @@ item_state = "cigpacket" w_class = WEIGHT_CLASS_TINY throwforce = 2 - flags_equip_slot = ITEM_SLOT_BELT + equip_slot_flags = ITEM_SLOT_BELT max_storage_space = 18 storage_slots = 18 can_hold = list( @@ -146,6 +149,7 @@ new /obj/item/clothing/mask/cigarette(src) /obj/item/storage/fancy/cigarettes/update_icon_state() + . = ..() icon_state = "[initial(icon_state)][length(contents)]" /obj/item/storage/fancy/cigarettes/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) @@ -170,7 +174,7 @@ item_state = "chempacketbox" w_class = WEIGHT_CLASS_TINY throwforce = 2 - flags_equip_slot = ITEM_SLOT_BELT + equip_slot_flags = ITEM_SLOT_BELT max_storage_space = 18 storage_slots = 18 can_hold = list( @@ -192,10 +196,10 @@ // for(var/i in 1 to 5) // new /obj/item/clothing/mask/cigarette/antitox(src) - new /obj/item/clothing/mask/cigarette/emergency(src) new /obj/item/tool/lighter(src) /obj/item/storage/fancy/chemrettes/update_icon_state() + . = ..() icon_state = "[initial(icon_state)][length(contents)]" /obj/item/storage/fancy/cigarettes/dromedaryco @@ -231,13 +235,14 @@ w_class = WEIGHT_CLASS_TINY throwforce = 2 w_class = WEIGHT_CLASS_SMALL - flags_equip_slot = ITEM_SLOT_BELT + equip_slot_flags = ITEM_SLOT_BELT storage_slots = 7 spawn_type = /obj/item/clothing/mask/cigarette/cigar spawn_number = 7 icon_type = "cigar" /obj/item/storage/fancy/cigar/update_icon_state() + . = ..() icon_state = "[initial(icon_state)][length(contents)]" @@ -287,8 +292,9 @@ . = ..() update_icon() -/obj/item/storage/lockbox/vials/update_icon(itemremoved = 0) - icon_state = "vialbox[length(contents)-itemremoved]" +/obj/item/storage/lockbox/vials/update_icon_state() + . = ..() + icon_state = "vialbox[length(contents)]" /obj/item/storage/lockbox/vials/update_overlays() . = ..() diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 0afa7561e1ca3..19a3522bf950d 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -36,7 +36,8 @@ fill_firstaid_kit() -/obj/item/storage/firstaid/update_icon() +/obj/item/storage/firstaid/update_icon_state() + . = ..() if(!length(contents)) icon_state = icon_state += "_empty" else @@ -351,6 +352,7 @@ pill_type_to_fill = /obj/item/reagent_containers/pill/kelotane greyscale_colors = "#CC9900#FFFFFF" description_overlay = "Ke" + storage_flags = BYPASS_VENDOR_CHECK /obj/item/storage/pill_bottle/dermaline name = "dermaline pill bottle" @@ -366,6 +368,7 @@ pill_type_to_fill = /obj/item/reagent_containers/pill/dylovene greyscale_colors = "#669900#ffffff" description_overlay = "Dy" + storage_flags = BYPASS_VENDOR_CHECK /obj/item/storage/pill_bottle/isotonic name = "isotonic pill bottle" @@ -373,6 +376,7 @@ pill_type_to_fill = /obj/item/reagent_containers/pill/isotonic greyscale_colors = "#5c0e0e#ffffff" description_overlay = "Is" + storage_flags = BYPASS_VENDOR_CHECK /obj/item/storage/pill_bottle/inaprovaline name = "inaprovaline pill bottle" @@ -388,6 +392,7 @@ pill_type_to_fill = /obj/item/reagent_containers/pill/tramadol greyscale_colors = "#8a8686#ffffff" description_overlay = "Ta" + storage_flags = BYPASS_VENDOR_CHECK /obj/item/storage/pill_bottle/paracetamol name = "paracetamol pill bottle" @@ -397,6 +402,7 @@ greyscale_config = /datum/greyscale_config/pillbottlebox greyscale_colors = "#f8f4f8#ffffff" description_overlay = "Pa" + storage_flags = BYPASS_VENDOR_CHECK /obj/item/storage/pill_bottle/spaceacillin name = "spaceacillin pill bottle" @@ -412,6 +418,7 @@ pill_type_to_fill = /obj/item/reagent_containers/pill/bicaridine greyscale_colors = "#DA0000#ffffff" description_overlay = "Bi" + storage_flags = BYPASS_VENDOR_CHECK /obj/item/storage/pill_bottle/meralyne name = "meralyne pill bottle" @@ -480,6 +487,7 @@ greyscale_colors = "#f8f8f8#ffffff" greyscale_config = /datum/greyscale_config/pillbottleround description_overlay = "Ti" + storage_flags = BYPASS_VENDOR_CHECK /obj/item/storage/pill_bottle/happy name = "happy pill bottle" diff --git a/code/game/objects/items/storage/holsters.dm b/code/game/objects/items/storage/holsters.dm index b6d76933f91f5..af1ad9d6756e0 100644 --- a/code/game/objects/items/storage/holsters.dm +++ b/code/game/objects/items/storage/holsters.dm @@ -7,7 +7,7 @@ max_w_class = WEIGHT_CLASS_BULKY ///normally the special item will be larger than what should fit. Child items will have lower limits and an override storage_slots = 1 max_storage_space = 4 - flags_equip_slot = ITEM_SLOT_BACK + equip_slot_flags = ITEM_SLOT_BACK draw_mode = 1 allow_drawing_method = TRUE storage_type_limits = list(/obj/item/weapon = 1) @@ -70,6 +70,7 @@ return ..() /obj/item/storage/holster/update_icon_state() + . = ..() if(holstered_item) icon_state = initial(icon_state) + "_full" else @@ -78,7 +79,7 @@ /obj/item/storage/holster/update_icon() . = ..() - if(flags_item & HAS_UNDERLAY) + if(item_flags & HAS_UNDERLAY) update_underlays() var/mob/user = loc if(!istype(user)) @@ -91,10 +92,7 @@ ///Adds or removes underlay sprites, checks holstered_item to see which underlay to add /obj/item/storage/holster/proc/update_underlays() if(holstered_item && !holstered_item_underlay) - if(holstered_item.greyscale_config && holstered_item.greyscale_colors) - holstered_item_underlay = image(SSgreyscale.GetColoredIconByType(holstered_item.greyscale_config, holstered_item.greyscale_colors), "belt") - else - holstered_item_underlay = image(icon, src, holstered_item.icon_state) + holstered_item_underlay = image(icon, src, holstered_item.icon_state) underlays += holstered_item_underlay else underlays -= holstered_item_underlay @@ -157,9 +155,9 @@ /obj/item/weapon/gun/launcher/rocket/recoillessrifle, /obj/item/weapon/gun/launcher/rocket/recoillessrifle/low_impact, ) - bypass_w_limit = list(/obj/item/weapon/gun/launcher/rocket/recoillessrifle,) + bypass_w_limit = list(/obj/item/weapon/gun/launcher/rocket/recoillessrifle) ///only one RR per bag - storage_type_limits = list(/obj/item/weapon/gun/launcher/rocket/recoillessrifle = 1,) + storage_type_limits = list(/obj/item/weapon/gun/launcher/rocket/recoillessrifle = 1) can_hold = list( /obj/item/ammo_magazine/rocket, /obj/item/weapon/gun/launcher/rocket/recoillessrifle, @@ -250,9 +248,9 @@ storage_slots = null max_storage_space = 30 access_delay = 0 - holsterable_allowed = list(/obj/item/mortar_kit,) - bypass_w_limit = list(/obj/item/mortar_kit,) - storage_type_limits = list(/obj/item/mortar_kit = 1,) + holsterable_allowed = list(/obj/item/mortar_kit) + bypass_w_limit = list(/obj/item/mortar_kit) + storage_type_limits = list(/obj/item/mortar_kit = 1) can_hold = list( /obj/item/mortal_shell/he, /obj/item/mortal_shell/incendiary, @@ -285,9 +283,9 @@ max_storage_space = 16 max_w_class = WEIGHT_CLASS_NORMAL access_delay = 0 - holsterable_allowed = list(/obj/item/weapon/gun/flamer/big_flamer/marinestandard/engineer,) - bypass_w_limit = list(/obj/item/weapon/gun/flamer/big_flamer/marinestandard/engineer,) - storage_type_limits = list(/obj/item/weapon/gun/flamer/big_flamer/marinestandard/engineer = 1,) + holsterable_allowed = list(/obj/item/weapon/gun/flamer/big_flamer/marinestandard/engineer) + bypass_w_limit = list(/obj/item/weapon/gun/flamer/big_flamer/marinestandard/engineer) + storage_type_limits = list(/obj/item/weapon/gun/flamer/big_flamer/marinestandard/engineer = 1) ///The internal fuel tank var/obj/item/ammo_magazine/flamer_tank/internal/tank @@ -368,7 +366,7 @@ name = "\improper H5 pattern M2132 machete scabbard" desc = "A large leather scabbard used to carry a M2132 machete. It can be strapped to the back, waist or armor." icon_state = "machete_holster" - flags_equip_slot = ITEM_SLOT_BELT|ITEM_SLOT_BACK + equip_slot_flags = ITEM_SLOT_BELT|ITEM_SLOT_BACK holsterable_allowed = list( /obj/item/weapon/claymore/mercsword/machete, /obj/item/weapon/claymore/harvester, @@ -397,7 +395,7 @@ icon_state = "katana_holster" force = 12 attack_verb = list("bludgeoned", "struck", "cracked") - flags_equip_slot = ITEM_SLOT_BELT|ITEM_SLOT_BACK + equip_slot_flags = ITEM_SLOT_BELT|ITEM_SLOT_BACK holsterable_allowed = list(/obj/item/weapon/katana) can_hold = list(/obj/item/weapon/katana) @@ -410,7 +408,7 @@ name = "\improper officer sword scabbard" desc = "A large leather scabbard used to carry a sword. Appears to be a reproduction, rather than original. It can be strapped to the waist or armor." icon_state = "officer_sheath" - flags_equip_slot = ITEM_SLOT_BELT + equip_slot_flags = ITEM_SLOT_BELT holsterable_allowed = list(/obj/item/weapon/claymore/mercsword/machete/officersword) can_hold = list(/obj/item/weapon/claymore/mercsword/machete/officersword) @@ -460,7 +458,7 @@ desc = "The M276 is the standard load-bearing equipment of the TGMC. It consists of a modular belt with various clips. This version is designed for the M25 SMG, and features a larger frame to support the gun. Due to its unorthodox design, it isn't a very common sight, and is only specially issued." icon_state = "m25_holster" icon = 'icons/obj/clothing/belts.dmi' - flags_equip_slot = ITEM_SLOT_BELT + equip_slot_flags = ITEM_SLOT_BELT holsterable_allowed = list( /obj/item/weapon/gun/smg/m25, /obj/item/weapon/gun/smg/m25/holstered, @@ -477,7 +475,7 @@ desc = "The M276 is the standard load-bearing equipment of the TGMC. It consists of a modular belt with various clips. This version is designed for the MP-19 SMG, and features a larger frame to support the gun. Due to its unorthodox design, it isn't a very common sight, and is only specially issued." icon_state = "t19_holster" icon = 'icons/obj/clothing/belts.dmi' - flags_equip_slot = ITEM_SLOT_BELT + equip_slot_flags = ITEM_SLOT_BELT holsterable_allowed = list( /obj/item/weapon/gun/smg/standard_machinepistol, /obj/item/weapon/gun/smg/standard_machinepistol/compact, @@ -501,7 +499,7 @@ /obj/item/storage/holster/flarepouch name = "flare pouch" desc = "A pouch designed to hold flares and a single flaregun. Refillable with a M94 flare pack." - flags_equip_slot = ITEM_SLOT_POCKET + equip_slot_flags = ITEM_SLOT_POCKET storage_slots = 28 max_storage_space = 28 icon = 'icons/Marine/marine-pouches.dmi' @@ -535,6 +533,32 @@ for(var/i in 1 to (storage_slots-flare_gun.w_class)) new /obj/item/explosive/grenade/flare(src) + +/obj/item/storage/holster/icc_mg + name = "\improper ML-41 scabbard (10x26mm)" + desc = "A backpack holster allowing the storage of any a ML-41 Assault Machinegun, also carries ammo for the other portion of the system." + icon_state = "icc_bagmg" + storage_slots = 5 + max_storage_space = 16 + holsterable_allowed = list( + /obj/item/weapon/gun/rifle/icc_mg, + ) + can_hold = list( + /obj/item/weapon/gun/rifle/icc_mg, + /obj/item/ammo_magazine/icc_mg/packet, + ) + +/obj/item/storage/holster/icc_mg/full/Initialize(mapload) + . = ..() + var/obj/item/weapon/gun/new_gun = new /obj/item/weapon/gun/rifle/icc_mg(src) + new /obj/item/ammo_magazine/icc_mg/packet(src) + new /obj/item/ammo_magazine/icc_mg/packet(src) + new /obj/item/ammo_magazine/icc_mg/packet(src) + new /obj/item/ammo_magazine/icc_mg/packet(src) + INVOKE_ASYNC(src, PROC_REF(handle_item_insertion), new_gun) + + + ////////////////////////////// GUN BELTS ///////////////////////////////////// /obj/item/storage/holster/belt @@ -542,8 +566,8 @@ desc = "A belt-holster assembly that allows one to hold a pistol and two magazines." icon = 'icons/obj/clothing/belts.dmi' icon_state = "m4a3_holster" - flags_equip_slot = ITEM_SLOT_BELT - flags_item = HAS_UNDERLAY + equip_slot_flags = ITEM_SLOT_BELT + item_flags = HAS_UNDERLAY use_sound = null storage_slots = 7 max_storage_space = 15 @@ -554,6 +578,7 @@ /obj/item/weapon/gun/pistol, /obj/item/ammo_magazine/pistol, /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_pistol, + /obj/item/cell/lasgun/plasma, /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/serpenta, /obj/item/cell/lasgun/lasrifle, /obj/item/cell/lasgun/volkite/small, @@ -579,6 +604,7 @@ /obj/item/ammo_magazine/pistol, /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_pistol, /obj/item/cell/lasgun/lasrifle, + /obj/item/cell/lasgun/plasma, ) /obj/item/storage/holster/belt/pistol/m4a3/full/Initialize(mapload) @@ -658,6 +684,7 @@ /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/serpenta, /obj/item/cell/lasgun/lasrifle, /obj/item/cell/lasgun/volkite/small, + /obj/item/cell/lasgun/plasma, ) /obj/item/storage/holster/belt/pistol/m4a3/som/serpenta/Initialize(mapload, ...) diff --git a/code/game/objects/items/storage/internal.dm b/code/game/objects/items/storage/internal.dm index 2604e4522a868..5c38e9afe7ba1 100644 --- a/code/game/objects/items/storage/internal.dm +++ b/code/game/objects/items/storage/internal.dm @@ -43,9 +43,6 @@ if(user.lying_angle || user.incapacitated()) //Can't use your inventory when lying return FALSE - if(istype(user.loc, /obj/vehicle/multitile/root/cm_armored)) //Stops inventory actions in a mech/tank - return FALSE - if(over_object == user && Adjacent(user)) //This must come before the screen objects only block open(user) return FALSE @@ -122,7 +119,7 @@ close(M) return TRUE -/obj/item/storage/internal/Adjacent(atom/neighbor) +/obj/item/storage/internal/Adjacent(atom/neighbor, atom/target, atom/movable/mover) return master_item.Adjacent(neighbor) diff --git a/code/game/objects/items/storage/marine_boxes.dm b/code/game/objects/items/storage/marine_boxes.dm index 08ef5190e7102..7c73e823ffaa5 100644 --- a/code/game/objects/items/storage/marine_boxes.dm +++ b/code/game/objects/items/storage/marine_boxes.dm @@ -6,90 +6,8 @@ foldable = /obj/item/stack/sheet/wood /obj/item/storage/box/crate/update_icon_state() - icon_state = length(contents) ? initial(icon_state) : "empty_case" - -/obj/item/storage/box/crate/heavy_armor - name = "\improper B-Series defensive armor crate" - desc = "A large case containing an experiemental suit of B18 armor for the discerning specialist." - icon_state = "armor_case" - w_class = WEIGHT_CLASS_HUGE - storage_slots = 3 - can_hold = list() //Nada. Once you take the stuff out it doesn't fit back in. - -/obj/item/storage/box/crate/heavy_armor/Initialize(mapload, ...) - . = ..() - new /obj/item/clothing/gloves/marine/specialist(src) - new /obj/item/clothing/suit/storage/marine/specialist(src) - new /obj/item/clothing/head/helmet/marine/specialist(src) - -/obj/item/storage/box/crate/grenade_system - name = "\improper M92 grenade launcher case" - desc = "A large case containing a heavy-duty multi-shot grenade launcher, the Armat Systems M92. Drag this sprite into you to open it up!\nNOTE: You cannot put items back inside this case." - icon_state = "grenade_case" - w_class = WEIGHT_CLASS_HUGE - storage_slots = 2 - slowdown = 1 - can_hold = list() //Nada. Once you take the stuff out it doesn't fit back in. - -/obj/item/storage/box/crate/grenade_system/Initialize(mapload, ...) - . = ..() - new /obj/item/weapon/gun/grenade_launcher/multinade_launcher(src) - new /obj/item/storage/belt/grenade/b17(src) - -/obj/item/storage/box/crate/rocket_system - name = "\improper M5 RPG crate" - desc = "A large case containing a heavy-caliber antitank missile launcher and missiles. Drag this sprite into you to open it up!\nNOTE: You cannot put items back inside this case." - icon_state = "rocket_case" - w_class = WEIGHT_CLASS_HUGE - storage_slots = 6 - slowdown = 1 - can_hold = list() //Nada. Once you take the stuff out it doesn't fit back in. - -/obj/item/storage/box/crate/rocket_system/Initialize(mapload, ...) - . = ..() - new /obj/item/weapon/gun/launcher/rocket/sadar(src) - new /obj/item/ammo_magazine/rocket/sadar(src) - new /obj/item/ammo_magazine/rocket/sadar(src) - new /obj/item/ammo_magazine/rocket/sadar/ap(src) - new /obj/item/ammo_magazine/rocket/sadar/ap(src) - new /obj/item/ammo_magazine/rocket/sadar/wp(src) - -/obj/item/storage/box/crate/heavy_grenadier - name = "\improper Heavy Grenadier case" - desc = "A large case containing B17 Heavy Armor and a heavy-duty multi-shot grenade launcher, the Armat Systems M92. Drag this sprite into you to open it up!\nNOTE: You cannot put items back inside this case." - icon_state = "grenade_case" - w_class = WEIGHT_CLASS_HUGE - storage_slots = 6 - slowdown = 1 - can_hold = list() //Nada. Once you take the stuff out it doesn't fit back in. - -/obj/item/storage/box/crate/heavy_grenadier/Initialize(mapload, ...) . = ..() - new /obj/item/weapon/gun/grenade_launcher/multinade_launcher(src) - new /obj/item/storage/belt/grenade/b17(src) - new /obj/item/clothing/suit/storage/marine/B17(src) - new /obj/item/clothing/head/helmet/marine/grenadier(src) - new /obj/item/storage/box/visual/grenade/frag(src) - new /obj/item/storage/box/visual/grenade/frag(src) - new /obj/item/storage/box/visual/grenade/incendiary(src) - -/obj/item/storage/box/crate/heavy_gunner - name = "\improper Heavy Minigunner case" - desc = "A large case containing B18 armor, munitions, and a goddamn minigun. Drag this sprite into you to open it up!\nNOTE: You cannot put items back inside this case." - icon_state = "rocket_case" - w_class = WEIGHT_CLASS_HUGE - storage_slots = 16 - slowdown = 1 - can_hold = list() //Nada. Once you take the stuff out it doesn't fit back in. - -/obj/item/storage/box/crate/heavy_gunner/Initialize(mapload, ...) - . = ..() - new /obj/item/clothing/gloves/marine/specialist(src) - new /obj/item/clothing/suit/storage/marine/specialist(src) - new /obj/item/clothing/head/helmet/marine/specialist(src) - new /obj/item/weapon/gun/minigun(src) - new /obj/item/belt_harness/marine(src) - new /obj/item/ammo_magazine/minigun_powerpack(src) + icon_state = length(contents) ? initial(icon_state) : "empty_case" /obj/item/storage/box/crate/m42c_system name = "\improper antimaterial scoped rifle system (recon set)" diff --git a/code/game/objects/items/storage/misc.dm b/code/game/objects/items/storage/misc.dm index 14dfdedafb711..be83920b3bc0b 100644 --- a/code/game/objects/items/storage/misc.dm +++ b/code/game/objects/items/storage/misc.dm @@ -36,18 +36,22 @@ if(!length(contents)) return ..() - -/obj/item/storage/donut_box/update_icon() - overlays.Cut() +/obj/item/storage/donut_box/update_icon_state() + . = ..() if(!open) icon_state = "donutbox" return icon_state = "donutbox_o" + +/obj/item/storage/donut_box/update_overlays() + . = ..() + if(!open) + return var/i = 0 for(var/obj/item/reagent_containers/food/snacks/donut/D in contents) i++ var/image/img = image('icons/obj/items/food/donuts.dmi', "[D.overlay_state]-[i]") - overlays += img + . += img /obj/item/storage/donut_box/empty icon_state = "donutbox_o" diff --git a/code/game/objects/items/storage/pill_packets.dm b/code/game/objects/items/storage/pill_packets.dm index 3219bffe488a3..96246b8beac0b 100644 --- a/code/game/objects/items/storage/pill_packets.dm +++ b/code/game/objects/items/storage/pill_packets.dm @@ -15,7 +15,7 @@ var/trash_item = /obj/item/trash/pillpacket refill_types = null refill_sound = null - flags_storage = BYPASS_VENDOR_CHECK + storage_flags = BYPASS_VENDOR_CHECK /obj/item/storage/pill_bottle/packet/remove_from_storage(obj/item/item, atom/new_location, mob/user) . = ..() diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm index 31fc63ee706c6..713d452dac886 100644 --- a/code/game/objects/items/storage/pouch.dm +++ b/code/game/objects/items/storage/pouch.dm @@ -4,7 +4,7 @@ icon_state = "small_drop" w_class = WEIGHT_CLASS_BULKY //does not fit in backpack max_w_class = WEIGHT_CLASS_SMALL - flags_equip_slot = ITEM_SLOT_POCKET + equip_slot_flags = ITEM_SLOT_POCKET storage_slots = 1 draw_mode = 0 allow_drawing_method = TRUE @@ -395,11 +395,18 @@ /obj/item/storage/pouch/explosive/razorburn/Initialize(mapload) . = ..() - new /obj/item/explosive/grenade/chem_grenade/razorburn_smol(src) - new /obj/item/explosive/grenade/chem_grenade/razorburn_smol(src) - new /obj/item/explosive/grenade/chem_grenade/razorburn_smol(src) + new /obj/item/explosive/grenade/chem_grenade/razorburn_small(src) + new /obj/item/explosive/grenade/chem_grenade/razorburn_small(src) + new /obj/item/explosive/grenade/chem_grenade/razorburn_small(src) new /obj/item/explosive/grenade/chem_grenade/razorburn_large(src) +/obj/item/storage/pouch/explosive/antigas/Initialize(mapload) + . = ..() + new /obj/item/explosive/grenade/smokebomb/antigas(src) + new /obj/item/explosive/grenade/smokebomb/antigas(src) + new /obj/item/explosive/grenade/smokebomb/antigas(src) + new /obj/item/explosive/grenade/smokebomb/antigas(src) + /obj/item/storage/pouch/explosive/upp fill_type = /obj/item/explosive/grenade/upp fill_number = 4 @@ -438,6 +445,15 @@ new /obj/item/explosive/grenade/flashbang/stun(src) new /obj/item/explosive/grenade/flashbang/stun(src) +/obj/item/storage/pouch/grenade/standard/Initialize(mapload) + . = ..() + new /obj/item/explosive/grenade(src) + new /obj/item/explosive/grenade(src) + new /obj/item/explosive/grenade(src) + new /obj/item/explosive/grenade/bullet/laser(src) + new /obj/item/explosive/grenade/bullet/laser(src) + new /obj/item/explosive/grenade/incendiary(src) + /obj/item/storage/pouch/grenade/som desc = "It can contain grenades. This one looks to be made out of traditional SOM leather." icon_state = "grenade_som" @@ -461,6 +477,15 @@ new /obj/item/explosive/grenade/som(src) new /obj/item/explosive/grenade/som(src) +/obj/item/storage/pouch/grenade/som/standard/Initialize(mapload) + . = ..() + new /obj/item/explosive/grenade/som(src) + new /obj/item/explosive/grenade/som(src) + new /obj/item/explosive/grenade/som(src) + new /obj/item/explosive/grenade/som(src) + new /obj/item/explosive/grenade/incendiary/som(src) + new /obj/item/explosive/grenade/incendiary/som(src) + /obj/item/storage/pouch/medkit name = "medkit pouch" desc = "A standard use medkit pouch that can contain all kinds of medical supplies and equipment." @@ -521,7 +546,7 @@ /obj/item/storage/pouch/medical_injectors/firstaid desc = "Standard marine first-aid injector pouch. Specialized to store only auto-injectors. Contains basic injectors, a stabilizing injector, stimulant injector, and an emergency injector." -/obj/item/storage/pouch/medical_injectors/firstaid/Initialize(mapload) +/obj/item/storage/pouch/medical_injectors/firstaid/Initialize(mapload) //used in hvh and erts . = ..() new /obj/item/reagent_containers/hypospray/autoinjector/bicaridine (src) new /obj/item/reagent_containers/hypospray/autoinjector/kelotane (src) @@ -532,6 +557,17 @@ new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine (src) new /obj/item/reagent_containers/hypospray/autoinjector/russian_red (src) +/obj/item/storage/pouch/medical_injectors/standard/Initialize(mapload) //normal access variant available by default to marines + . = ..() + new /obj/item/reagent_containers/hypospray/autoinjector/bicaridine(src) + new /obj/item/reagent_containers/hypospray/autoinjector/kelotane(src) + new /obj/item/reagent_containers/hypospray/autoinjector/tramadol(src) + new /obj/item/reagent_containers/hypospray/autoinjector/tricordrazine(src) + new /obj/item/reagent_containers/hypospray/autoinjector/dylovene(src) + new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline(src) + new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine(src) + new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine(src) + /obj/item/storage/pouch/medical_injectors/medic/Initialize(mapload) //corpsman autoinjector pouch gets upgraded, but more general chems. . = ..() new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced(src) @@ -594,7 +630,7 @@ sprite_slots = 3 storage_slots = 3 - can_hold = list(/obj/item/storage/box/combat_lolipop,) + can_hold = list(/obj/item/storage/box/combat_lolipop) /obj/item/storage/pouch/med_lolipops/Initialize(mapload) . = ..() @@ -673,7 +709,7 @@ /obj/item/flashlight, /obj/item/whistle, /obj/item/binoculars, - /obj/item/beacon/supply_beacon, + /obj/item/supply_beacon, /obj/item/compass, /obj/item/deployable_camera, /obj/item/hud_tablet, @@ -824,13 +860,12 @@ draw_mode = 0 can_hold = list(/obj/item/ammo_magazine/handful) - /obj/item/storage/pouch/shotgun/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/ammo_magazine)) var/obj/item/ammo_magazine/M = I - if(CHECK_BITFIELD(M.flags_magazine, MAGAZINE_HANDFUL)) + if(CHECK_BITFIELD(M.magazine_flags, MAGAZINE_HANDFUL)) return ..() - if(M.flags_magazine & MAGAZINE_REFILLABLE) + if(M.magazine_flags & MAGAZINE_REFILLABLE) if(!M.current_rounds) to_chat(user, span_warning("[M] is empty.")) return diff --git a/code/game/objects/items/storage/reagent_pouch.dm b/code/game/objects/items/storage/reagent_pouch.dm index ebd86f3eb62b9..8e1b7834581dc 100644 --- a/code/game/objects/items/storage/reagent_pouch.dm +++ b/code/game/objects/items/storage/reagent_pouch.dm @@ -53,7 +53,7 @@ You can Alt-Click to remove the canister in order to refill it." can_hold = list(/obj/item/reagent_containers/hypospray) cant_hold = list(/obj/item/reagent_containers/glass/reagent_canister) //To prevent chat spam when you try to put the container in - flags_item = NOBLUDGEON + item_flags = NOBLUDGEON draw_mode = TRUE ///The internal container of the pouch. Holds the reagent that you use to refill the connected injector var/obj/item/reagent_containers/glass/reagent_canister/inner diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm index 0ea8c091f11f7..73e995524ebfd 100644 --- a/code/game/objects/items/storage/secure.dm +++ b/code/game/objects/items/storage/secure.dm @@ -165,7 +165,7 @@ icon_opened = "safe0" icon_locking = "safeb" icon_sparking = "safespark" - flags_atom = CONDUCT + atom_flags = CONDUCT force = 8 w_class = WEIGHT_CLASS_GIGANTIC max_w_class = WEIGHT_CLASS_GIGANTIC diff --git a/code/game/objects/items/storage/storage.dm b/code/game/objects/items/storage/storage.dm index fde59f2dd7f2c..c09ac3b44cce9 100644 --- a/code/game/objects/items/storage/storage.dm +++ b/code/game/objects/items/storage/storage.dm @@ -77,7 +77,7 @@ ///What sound gets played when the item is tactical refilled var/refill_sound = null ///Flags for specifically storage items - var/flags_storage = NONE + var/storage_flags = NONE /obj/item/storage/MouseDrop(obj/over_object as obj) if(!ishuman(usr)) @@ -86,9 +86,6 @@ if(usr.lying_angle) return - if(istype(usr.loc, /obj/vehicle/multitile/root/cm_armored)) // stops inventory actions in a mech/tank - return - if(over_object == usr && Adjacent(usr)) // this must come before the screen objects only block open(usr) return @@ -96,6 +93,9 @@ if(!istype(over_object, /atom/movable/screen)) return ..() + if(HAS_TRAIT(src, TRAIT_NODROP)) + return + //Makes sure that the storage is equipped, so that we can't drag it into our hand from miles away. //There's got to be a better way of doing this. if(loc != usr || (loc && loc.loc == usr)) @@ -304,9 +304,6 @@ if(usr.incapacitated(TRUE)) return - if(istype(usr.loc, /obj/vehicle/multitile/root/cm_armored)) // stops inventory actions in a mech/tank - return - var/list/PL = params2list(params) if(!master) @@ -346,7 +343,7 @@ sample_object = null return ..() -///This proc determins the size of the inventory to be displayed. Please touch it only if you know what you're doing. +///This proc determines the size of the inventory to be displayed. Please touch it only if you know what you're doing. /obj/item/storage/proc/orient2hud() var/adjusted_contents = length(contents) @@ -553,6 +550,8 @@ ///This proc is called when you want to place an item into the storage item. /obj/item/storage/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(length(refill_types)) for(var/typepath in refill_types) @@ -668,7 +667,7 @@ if(!allow_drawing_method) verbs -= /obj/item/storage/verb/toggle_draw_mode - boxes = new + boxes = new() boxes.name = "storage" boxes.master = src boxes.icon_state = "block" @@ -676,21 +675,21 @@ boxes.layer = HUD_LAYER boxes.plane = HUD_PLANE - storage_start = new /atom/movable/screen/storage( ) + storage_start = new /atom/movable/screen/storage() storage_start.name = "storage" storage_start.master = src storage_start.icon_state = "storage_start" storage_start.screen_loc = "7,7 to 10,8" storage_start.layer = HUD_LAYER storage_start.plane = HUD_PLANE - storage_continue = new /atom/movable/screen/storage( ) + storage_continue = new /atom/movable/screen/storage() storage_continue.name = "storage" storage_continue.master = src storage_continue.icon_state = "storage_continue" storage_continue.screen_loc = "7,7 to 10,8" storage_continue.layer = HUD_LAYER storage_continue.plane = HUD_PLANE - storage_end = new /atom/movable/screen/storage( ) + storage_end = new /atom/movable/screen/storage() storage_end.name = "storage" storage_end.master = src storage_end.icon_state = "storage_end" @@ -698,20 +697,20 @@ storage_end.layer = HUD_LAYER storage_end.plane = HUD_PLANE - stored_start = new /obj //we just need these to hold the icon + stored_start = new /obj() //we just need these to hold the icon stored_start.icon_state = "stored_start" stored_start.layer = HUD_LAYER stored_start.plane = HUD_PLANE - stored_continue = new /obj + stored_continue = new /obj() stored_continue.icon_state = "stored_continue" stored_continue.layer = HUD_LAYER stored_continue.plane = HUD_PLANE - stored_end = new /obj + stored_end = new /obj() stored_end.icon_state = "stored_end" stored_end.layer = HUD_LAYER stored_end.plane = HUD_PLANE - closer = new + closer = new() closer.master = src /obj/item/storage/Destroy() @@ -745,7 +744,7 @@ ///BubbleWrap - A box can be folded up to make card /obj/item/storage/attack_self(mob/user) - + . = ..() //Clicking on itself will empty it, if it has the verb to do that. if(allow_quick_empty) @@ -876,6 +875,7 @@ return /obj/item/storage/update_icon_state() + . = ..() if(!sprite_slots) icon_state = initial(icon_state) return diff --git a/code/game/objects/items/storage/surgical_tray.dm b/code/game/objects/items/storage/surgical_tray.dm index bed8f1703cf2f..479c322944d77 100644 --- a/code/game/objects/items/storage/surgical_tray.dm +++ b/code/game/objects/items/storage/surgical_tray.dm @@ -2,7 +2,7 @@ name = "surgical tray" desc = "A small metallic tray covered in sterile tarp. Intended to store surgical tools in a neat and clean fashion." icon_state = "surgical_tray" - flags_atom = CONDUCT + atom_flags = CONDUCT w_class = WEIGHT_CLASS_BULKY //Should not fit in backpacks storage_slots = 12 max_storage_space = 24 @@ -27,6 +27,7 @@ new /obj/item/stack/nanopaste(src) /obj/item/storage/surgical_tray/update_icon_state() + . = ..() if(!length(contents)) icon_state = "surgical_tray_e" else diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index 6c5aed7a864b0..acab4433f9d26 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -7,7 +7,7 @@ slot_r_hand_str = 'icons/mob/inhands/equipment/toolboxes_right.dmi', ) item_state = "toolbox_red" - flags_atom = CONDUCT + atom_flags = CONDUCT force = 5 throwforce = 10 throw_speed = 1 diff --git a/code/game/objects/items/storage/wallets.dm b/code/game/objects/items/storage/wallets.dm index 2e6133e9764e1..ddc70217409b6 100644 --- a/code/game/objects/items/storage/wallets.dm +++ b/code/game/objects/items/storage/wallets.dm @@ -25,7 +25,7 @@ /obj/item/tool/screwdriver, /obj/item/tool/stamp, ) - flags_equip_slot = ITEM_SLOT_ID + equip_slot_flags = ITEM_SLOT_ID var/obj/item/card/id/front_id = null @@ -46,8 +46,8 @@ name = "[name] ([front_id])" update_icon() -/obj/item/storage/wallet/update_icon() - +/obj/item/storage/wallet/update_icon_state() + . = ..() if(front_id) switch(front_id.icon_state) if("id") diff --git a/code/game/objects/items/suit_cooling.dm b/code/game/objects/items/suit_cooling.dm index f43f8aa0c7a80..b1d9ec88562f2 100644 --- a/code/game/objects/items/suit_cooling.dm +++ b/code/game/objects/items/suit_cooling.dm @@ -4,8 +4,8 @@ icon = 'icons/obj/device.dmi' w_class = WEIGHT_CLASS_BULKY icon_state = "suitcooler0" - flags_equip_slot = ITEM_SLOT_BACK - flags_atom = CONDUCT + equip_slot_flags = ITEM_SLOT_BACK + atom_flags = CONDUCT force = 5 throwforce = 10 throw_speed = 1 diff --git a/code/game/objects/items/tanks/tank_types.dm b/code/game/objects/items/tanks/tank_types.dm index 0a4db04a31656..c701130c6dff8 100644 --- a/code/game/objects/items/tanks/tank_types.dm +++ b/code/game/objects/items/tanks/tank_types.dm @@ -55,8 +55,8 @@ name = "phoron tank" desc = "Contains dangerous phoron. Do not inhale. Warning: extremely flammable." icon_state = "phoron" - flags_atom = CONDUCT - flags_equip_slot = NONE //they have no straps! + atom_flags = CONDUCT + equip_slot_flags = NONE //they have no straps! @@ -67,8 +67,8 @@ name = "emergency oxygen tank" desc = "Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it." icon_state = "emergency" - flags_atom = CONDUCT - flags_equip_slot = ITEM_SLOT_BELT + atom_flags = CONDUCT + equip_slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_TINY force = 4 distribute_pressure = ONE_ATMOSPHERE*O2STANDARD diff --git a/code/game/objects/items/tanks/tanks.dm b/code/game/objects/items/tanks/tanks.dm index 695bf1fbb0375..f17d48924fb09 100644 --- a/code/game/objects/items/tanks/tanks.dm +++ b/code/game/objects/items/tanks/tanks.dm @@ -8,8 +8,8 @@ slot_l_hand_str = 'icons/mob/inhands/equipment/tanks_left.dmi', slot_r_hand_str = 'icons/mob/inhands/equipment/tanks_right.dmi', ) - flags_atom = CONDUCT - flags_equip_slot = ITEM_SLOT_BACK + atom_flags = CONDUCT + equip_slot_flags = ITEM_SLOT_BACK w_class = WEIGHT_CLASS_NORMAL var/pressure_full = ONE_ATMOSPHERE*4 @@ -54,6 +54,8 @@ /obj/item/tank/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if((istype(I, /obj/item/tool/analyzer)) && get_dist(user, src) <= 1) visible_message(span_warning("[user] has used [I] on [icon2html(src, user)] [src]")) diff --git a/code/game/objects/items/taperecorder.dm b/code/game/objects/items/taperecorder.dm index ec84e411a1080..6233564f0b3e9 100644 --- a/code/game/objects/items/taperecorder.dm +++ b/code/game/objects/items/taperecorder.dm @@ -13,7 +13,7 @@ var/list/storedinfo = list() var/list/timestamp = list() var/canprint = 1 - flags_atom = CONDUCT + atom_flags = CONDUCT throwforce = 2 throw_speed = 4 throw_range = 20 diff --git a/code/game/objects/items/tools/extinguisher.dm b/code/game/objects/items/tools/extinguisher.dm index 6c73dc8baf91b..fc67c43282e3e 100644 --- a/code/game/objects/items/tools/extinguisher.dm +++ b/code/game/objects/items/tools/extinguisher.dm @@ -9,7 +9,7 @@ ) item_state = "fire_extinguisher" hitsound = 'sound/weapons/smash.ogg' - flags_atom = CONDUCT + atom_flags = CONDUCT throwforce = 10 w_class = WEIGHT_CLASS_NORMAL throw_speed = 2 diff --git a/code/game/objects/items/tools/flame_tools.dm b/code/game/objects/items/tools/flame_tools.dm index a06edf3ce0d7c..34b0d38584e0b 100644 --- a/code/game/objects/items/tools/flame_tools.dm +++ b/code/game/objects/items/tools/flame_tools.dm @@ -34,14 +34,13 @@ CIGARETTE PACKETS ARE IN FANCY.DM var/wax = 800 /obj/item/tool/candle/update_icon_state() - var/i - if(wax>150) - i = 1 - else if(wax>80) - i = 2 + . = ..() + if(wax > 150) + icon_state = "candle[1][heat ? "_lit" : ""]" + else if(wax > 80) + icon_state = "candle[2][heat ? "_lit" : ""]" else - i = 3 - icon_state = "candle[i][heat ? "_lit" : ""]" + icon_state = "candle[3][heat ? "_lit" : ""]" /obj/item/tool/candle/Destroy() if(heat) @@ -161,7 +160,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM throw_speed = 0.5 item_state = "cigoff" w_class = WEIGHT_CLASS_TINY - flags_armor_protection = NONE + armor_protection_flags = NONE light_range = 0.1 light_power = 0.1 light_color = LIGHT_COLOR_ORANGE @@ -412,7 +411,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/cigarette/bica name = "strawberry flavored cigarette" - desc = "Red tipped. Has got a single word stamped on the side: \"(BICARDINE)\"." + desc = "Red tipped. Has got a single word stamped on the side: \"(BICARIDINE)\"." icon_state = "bicacigoff" item_state = "bicacigoff" icon_on = "bicacigon" @@ -562,8 +561,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM light_color = LIGHT_COLOR_FIRE w_class = WEIGHT_CLASS_TINY throwforce = 4 - flags_atom = CONDUCT - flags_equip_slot = ITEM_SLOT_BELT + atom_flags = CONDUCT + equip_slot_flags = ITEM_SLOT_BELT attack_verb = list("burnt", "singed") /obj/item/tool/lighter/zippo diff --git a/code/game/objects/items/tools/hydro_tools.dm b/code/game/objects/items/tools/hydro_tools.dm index 626b23a4e5c38..865651d370630 100644 --- a/code/game/objects/items/tools/hydro_tools.dm +++ b/code/game/objects/items/tools/hydro_tools.dm @@ -6,8 +6,8 @@ /obj/item/tool/plantspray icon = 'icons/obj/items/spray.dmi' item_state = "spray" - flags_item = NOBLUDGEON - flags_equip_slot = ITEM_SLOT_BELT + item_flags = NOBLUDGEON + equip_slot_flags = ITEM_SLOT_BELT throwforce = 4 w_class = WEIGHT_CLASS_SMALL throw_speed = 2 @@ -88,8 +88,8 @@ icon = 'icons/obj/items/weapons.dmi' icon_state = "hoe" item_state = "hoe" - flags_atom = CONDUCT - flags_item = NOBLUDGEON + atom_flags = CONDUCT + item_flags = NOBLUDGEON force = 5 throwforce = 7 w_class = WEIGHT_CLASS_SMALL @@ -104,7 +104,7 @@ desc = "A sharp hand hatchet, commonly used to cut things apart, be it timber or other objects. Often found in the hands of woodsmen, scouts, and looters." icon = 'icons/obj/items/weapons.dmi' icon_state = "hatchet" - flags_atom = CONDUCT + atom_flags = CONDUCT force = 25 w_class = WEIGHT_CLASS_SMALL throwforce = 20 @@ -129,8 +129,8 @@ throw_speed = 1 throw_range = 3 w_class = WEIGHT_CLASS_BULKY - flags_atom = CONDUCT - flags_equip_slot = ITEM_SLOT_BACK + atom_flags = CONDUCT + equip_slot_flags = ITEM_SLOT_BACK attack_verb = list("chopped", "sliced", "cut", "reaped") /obj/item/tool/scythe/afterattack(atom/A, mob/user as mob, proximity) diff --git a/code/game/objects/items/tools/kitchen_tools.dm b/code/game/objects/items/tools/kitchen_tools.dm index d13bfea7b9b59..5a1f5dcb4e2b9 100644 --- a/code/game/objects/items/tools/kitchen_tools.dm +++ b/code/game/objects/items/tools/kitchen_tools.dm @@ -26,7 +26,7 @@ throwforce = 5 throw_speed = 3 throw_range = 5 - flags_atom = CONDUCT + atom_flags = CONDUCT attack_verb = list("attacked", "stabbed", "poked") sharp = 0 var/loaded //Descriptive string for currently loaded food object. @@ -60,10 +60,10 @@ else ..() -/obj/item/tool/kitchen/utensil/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) +/obj/item/tool/kitchen/utensil/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) if(!CONFIG_GET(flag/fun_allowed)) return FALSE - attack_hand(X) + attack_hand(xeno_attacker) /obj/item/tool/kitchen/utensil/fork name = "fork" @@ -123,7 +123,7 @@ name = "kitchen knife" icon_state = "knife" desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come." - flags_atom = CONDUCT + atom_flags = CONDUCT sharp = IS_SHARP_ITEM_ACCURATE edge = 1 force = 10 @@ -152,7 +152,7 @@ name = "butcher's cleaver" icon_state = "butch" desc = "A huge thing used for chopping and chopping up meat. This includes clowns and clown-by-products." - flags_atom = CONDUCT + atom_flags = CONDUCT force = 15 w_class = WEIGHT_CLASS_SMALL throwforce = 8 @@ -195,7 +195,7 @@ throw_speed = 1 throw_range = 5 w_class = WEIGHT_CLASS_NORMAL - flags_atom = CONDUCT + atom_flags = CONDUCT /* // NOPE var/food_total= 0 var/burger_amt = 0 @@ -260,7 +260,7 @@ - if(ishuman(M) && ((H.head && (H.head.flags_inventory & COVEREYES) ) || (H.wear_mask && (H.wear_mask.flags_inventory & COVEREYES) ) || (H.glasses && (H.glasses.flags_inventory & COVEREYES) ))) + if(ishuman(M) && ((H.head && (H.head.inventory_flags & COVEREYES) ) || (H.wear_mask && (H.wear_mask.inventory_flags & COVEREYES) ) || (H.glasses && (H.glasses.inventory_flags & COVEREYES) ))) to_chat(M, span_warning("You get slammed in the face with the tray, against your mask!")) if(prob(33)) src.add_mob_blood(H) @@ -317,6 +317,8 @@ /obj/item/tool/kitchen/tray/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/tool/kitchen/rollingpin)) if(cooldown < world.time - 25) diff --git a/code/game/objects/items/tools/maintenance_tools.dm b/code/game/objects/items/tools/maintenance_tools.dm index 940466d749b25..e522e151cc136 100644 --- a/code/game/objects/items/tools/maintenance_tools.dm +++ b/code/game/objects/items/tools/maintenance_tools.dm @@ -2,8 +2,8 @@ name = "wrench" desc = "A wrench with many common uses. Can be usually found in your hand." icon_state = "wrench" - flags_atom = CONDUCT - flags_equip_slot = ITEM_SLOT_BELT + atom_flags = CONDUCT + equip_slot_flags = ITEM_SLOT_BELT force = 5 throwforce = 7 w_class = WEIGHT_CLASS_SMALL @@ -16,8 +16,8 @@ name = "screwdriver" desc = "You can be totally screwwy with this." icon_state = "screwdriver_map" - flags_atom = CONDUCT - flags_equip_slot = ITEM_SLOT_BELT + atom_flags = CONDUCT + equip_slot_flags = ITEM_SLOT_BELT force = 5 w_class = WEIGHT_CLASS_TINY throwforce = 5 @@ -65,8 +65,8 @@ name = "wirecutters" desc = "This cuts wires." icon_state = "cutters" - flags_atom = CONDUCT - flags_equip_slot = ITEM_SLOT_BELT + atom_flags = CONDUCT + equip_slot_flags = ITEM_SLOT_BELT force = 6 throw_speed = 2 throw_range = 9 @@ -99,8 +99,8 @@ name = "blowtorch" desc = "Used for welding and repairing various things." icon_state = "welder" - flags_atom = CONDUCT - flags_equip_slot = ITEM_SLOT_BELT + atom_flags = CONDUCT + equip_slot_flags = ITEM_SLOT_BELT //Amount of OUCH when it's thrown force = 3 @@ -179,6 +179,8 @@ /obj/item/tool/weldingtool/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/tool/screwdriver)) flamethrower_screwdriver(src, user) @@ -330,8 +332,8 @@ name = "crowbar" desc = "Used to remove floors and to pry open doors." icon_state = "crowbar" - flags_atom = CONDUCT - flags_equip_slot = ITEM_SLOT_BELT + atom_flags = CONDUCT + equip_slot_flags = ITEM_SLOT_BELT force = 5 throwforce = 7 item_state = "crowbar" @@ -351,7 +353,7 @@ /obj/item/tool/weldpack name = "Welding kit" desc = "A heavy-duty, portable fuel carrier. Welder and flamer compatible." - flags_equip_slot = ITEM_SLOT_BACK + equip_slot_flags = ITEM_SLOT_BACK icon = 'icons/obj/items/tank.dmi' icon_state = "welderpack" w_class = WEIGHT_CLASS_BULKY @@ -366,6 +368,8 @@ /obj/item/tool/weldpack/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(reagents.total_volume == 0) balloon_alert(user, "Out of fuel") return @@ -447,7 +451,7 @@ /obj/item/tool/weldpack/marinestandard name = "M-22 welding kit" desc = "A heavy-duty, portable fuel carrier. Mainly used in flamethrowers. Welder and flamer compatible." - flags_equip_slot = ITEM_SLOT_BACK + equip_slot_flags = ITEM_SLOT_BACK icon_state = "marine_flamerpack" w_class = WEIGHT_CLASS_BULKY max_fuel = 500 //Because the marine backpack can carry 260, and still allows you to take items, there should be a reason to still use this one. @@ -456,14 +460,14 @@ name = "handheld charger" desc = "A hand-held, lightweight cell charger. It isn't going to give you tons of power, but it can help in a pinch." icon = 'icons/obj/items/tools.dmi' - icon_state = "handheldcharger_black_empty" + icon_state = "handheldcharger_black" item_state = "handheldcharger_black_empty" w_class = WEIGHT_CLASS_SMALL - flags_atom = CONDUCT + atom_flags = CONDUCT force = 6 throw_speed = 2 throw_range = 9 - flags_equip_slot = ITEM_SLOT_BELT + equip_slot_flags = ITEM_SLOT_BELT /// This is the cell we ar charging var/obj/item/cell/cell ///Are we currently recharging something. @@ -471,7 +475,14 @@ /obj/item/tool/handheld_charger/Initialize(mapload) . = ..() - cell = null + update_icon() + +/obj/item/tool/handheld_charger/update_icon_state() + . = ..() + if(cell) + icon_state = initial(icon_state) + else + icon_state = initial(icon_state) + "_empty" /obj/item/tool/handheld_charger/attack_self(mob/user) if(!cell) @@ -499,6 +510,8 @@ /obj/item/tool/handheld_charger/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(!istype(I, /obj/item/cell)) return @@ -528,7 +541,7 @@ cell = null playsound(user, 'sound/machines/click.ogg', 20, 1, 5) balloon_alert(user, "Removes the cell") - icon_state = "handheldcharger_black_empty" + update_appearance() /obj/item/tool/handheld_charger/attack_hand(mob/living/user) if(user.get_inactive_held_item() != src) @@ -540,8 +553,12 @@ cell = null playsound(user, 'sound/machines/click.ogg', 20, 1, 5) balloon_alert(user, "Removes the cell") - icon_state = "handheldcharger_black_empty" + update_appearance() /obj/item/tool/handheld_charger/Destroy() QDEL_NULL(cell) return ..() + +/obj/item/tool/handheld_charger/hicapcell/Initialize(mapload) + cell = new /obj/item/cell/high(src) + return ..() diff --git a/code/game/objects/items/tools/mining_tools.dm b/code/game/objects/items/tools/mining_tools.dm index 8570dabd3d962..25ab6d4f44689 100644 --- a/code/game/objects/items/tools/mining_tools.dm +++ b/code/game/objects/items/tools/mining_tools.dm @@ -7,8 +7,8 @@ name = "pickaxe" icon = 'icons/obj/mining.dmi' icon_state = "pickaxe" - flags_atom = CONDUCT - flags_equip_slot = ITEM_SLOT_BELT + atom_flags = CONDUCT + equip_slot_flags = ITEM_SLOT_BELT force = 15 throwforce = 4 item_state = "pickaxe" @@ -86,7 +86,7 @@ icon_state = "plasma_cutter_off" item_state = "plasmacutter" w_class = WEIGHT_CLASS_BULKY - flags_equip_slot = ITEM_SLOT_BELT|ITEM_SLOT_BACK + equip_slot_flags = ITEM_SLOT_BELT|ITEM_SLOT_BACK force = 70 damtype = BURN digspeed = 20 //Can slice though normal walls, all girders, or be used in reinforced wall deconstruction @@ -166,7 +166,6 @@ spark_system.attach(source) spark_system.start(source) if(!no_string) - balloon_alert(user, "Cutting...") if(custom_string) to_chat(user, span_notice(custom_string)) else @@ -185,8 +184,6 @@ balloon_alert(user, "Charge Remaining: [cell.charge]/[cell.maxcharge]") if(custom_string) to_chat(user, span_notice(custom_string)) - else - balloon_alert(user, "Cuts apart") /obj/item/tool/pickaxe/plasmacutter/proc/debris(location, metal = 0, rods = 0, wood = 0, wires = 0, shards = 0, plasteel = 0) if(metal) @@ -290,7 +287,8 @@ if(!ST.slayer) return ST.slayer = max(0 , ST.slayer - dirt_amt_per_dig) - ST.update_icon(1,0) + ST.update_appearance() + ST.update_sides() cut_apart(user, target.name, target, 0, "You melt the snow with [src]. ") //costs nothing diff --git a/code/game/objects/items/tools/misc_tools.dm b/code/game/objects/items/tools/misc_tools.dm index b9b8df77ce62d..aefa38d499ad3 100644 --- a/code/game/objects/items/tools/misc_tools.dm +++ b/code/game/objects/items/tools/misc_tools.dm @@ -55,6 +55,8 @@ /obj/item/tool/hand_labeler/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/paper)) to_chat(user, span_notice("You insert [I] into [src].")) qdel(I) @@ -80,7 +82,7 @@ slot_r_hand_str = 'icons/mob/inhands/items/civilian_right.dmi', ) item_state = "pen" - flags_equip_slot = ITEM_SLOT_BELT|ITEM_SLOT_EARS + equip_slot_flags = ITEM_SLOT_BELT|ITEM_SLOT_EARS w_class = WEIGHT_CLASS_TINY throw_speed = 7 throw_range = 15 @@ -117,7 +119,7 @@ */ /obj/item/tool/pen/sleepypen desc = "It's a black ink pen with a sharp point and a carefully engraved \"Waffle Co.\"" - flags_equip_slot = ITEM_SLOT_BELT + equip_slot_flags = ITEM_SLOT_BELT /obj/item/tool/pen/sleepypen/Initialize(mapload) @@ -139,7 +141,7 @@ * Parapens */ /obj/item/tool/pen/paralysis - flags_equip_slot = ITEM_SLOT_BELT + equip_slot_flags = ITEM_SLOT_BELT /obj/item/tool/pen/paralysis/attack(mob/living/M as mob, mob/user as mob) diff --git a/code/game/objects/items/tools/policetape.dm b/code/game/objects/items/tools/policetape.dm index f861a0503532e..1eef67cea2f58 100644 --- a/code/game/objects/items/tools/policetape.dm +++ b/code/game/objects/items/tools/policetape.dm @@ -3,7 +3,7 @@ name = "tape roll" icon = 'icons/obj/policetape.dmi' icon_state = "rollstart" - flags_item = NOBLUDGEON + item_flags = NOBLUDGEON w_class = WEIGHT_CLASS_SMALL var/turf/start var/turf/end diff --git a/code/game/objects/items/tools/research_tools.dm b/code/game/objects/items/tools/research_tools.dm index dc485e36c7b49..7d86d8682a41a 100644 --- a/code/game/objects/items/tools/research_tools.dm +++ b/code/game/objects/items/tools/research_tools.dm @@ -5,68 +5,11 @@ ///Skill level needed to use the tool var/skill_threshold = SKILL_MEDICAL_EXPERT -#define RESEARCH_DELAY 2 SECONDS - /obj/item/tool/research/xeno_analyzer - name = "xenomorph analyzer" - desc = "A tool for analyzing xenomorphs for research material. Just click on a xenomorph. Can be used to befriend Newt." - icon = 'icons/obj/items/surgery_tools.dmi' - icon_state = "predator_bonesaw" - ///List of rewards for each xeno tier - var/static/list/xeno_tier_rewards = list( - XENO_TIER_ZERO = list( - /obj/item/research_resource/xeno/tier_one, - ), - XENO_TIER_ONE = list( - /obj/item/research_resource/xeno/tier_one, - ), - XENO_TIER_TWO = list( - /obj/item/research_resource/xeno/tier_two, - ), - XENO_TIER_THREE = list( - /obj/item/research_resource/xeno/tier_three, - ), - XENO_TIER_FOUR = list( - /obj/item/research_resource/xeno/tier_four, - ), - ) - -/obj/item/tool/research/xeno_analyzer/attack(mob/living/M, mob/living/user) - if(!isxeno(M)) - return ..() - - var/mob/living/carbon/xenomorph/target_xeno = M - - var/list/xeno_rewards = xeno_tier_rewards[target_xeno.tier] - if(!xeno_rewards) - balloon_alert(user, "Can't research") - return ..() - - if(HAS_TRAIT(target_xeno, TRAIT_RESEARCHED)) - balloon_alert(user, "Already probed") - return ..() - - if(user.skills.getRating(SKILL_MEDICAL) < SKILL_MEDICAL_EXPERT) - user.balloon_alert_to_viewers("Tries to find weak point on [target_xeno]") - var/fumbling_time = 15 SECONDS - 2 SECONDS * user.skills.getRating(SKILL_MEDICAL) - if(!do_after(user, fumbling_time, NONE, src, BUSY_ICON_UNSKILLED)) - return ..() - user.balloon_alert_to_viewers("Begins cutting [target_xeno]") - if(!do_after(user, 5 SECONDS, NONE, src, BUSY_ICON_FRIENDLY)) - return ..() - - if(HAS_TRAIT(target_xeno, TRAIT_RESEARCHED)) - balloon_alert(user, "Already probed") - return ..() - - var/reward_typepath = pick(xeno_rewards) - var/obj/reward = new reward_typepath - reward.forceMove(get_turf(user)) - ADD_TRAIT(target_xeno, TRAIT_RESEARCHED, TRAIT_RESEARCHED) - - return ..() - -#undef RESEARCH_DELAY + name = "xenolinguistic analyzer" + desc = "A tool translating communications with some alien species. Can be used to befriend Newt." + icon = 'icons/obj/items/implants.dmi' + icon_state = "implantcase-b" /obj/item/tool/research/excavation_tool name = "subterrain scanner and excavator" diff --git a/code/game/objects/items/tools/shovel_tools.dm b/code/game/objects/items/tools/shovel_tools.dm index bb2dd145ca413..e9dddcdfa60c3 100644 --- a/code/game/objects/items/tools/shovel_tools.dm +++ b/code/game/objects/items/tools/shovel_tools.dm @@ -6,8 +6,8 @@ icon = 'icons/obj/items/tools.dmi' icon_state = "shovel" item_state = "shovel" - flags_atom = CONDUCT - flags_equip_slot = ITEM_SLOT_BELT + atom_flags = CONDUCT + equip_slot_flags = ITEM_SLOT_BELT force = 8 throwforce = 4 w_class = WEIGHT_CLASS_NORMAL @@ -85,7 +85,8 @@ if(!ST.slayer) return ST.slayer -= 1 - ST.update_icon(1,0) + ST.update_appearance() + ST.update_sides() balloon_alert(user, "Digs up snow") else balloon_alert(user, "Digs up dirt") @@ -151,7 +152,7 @@ else icon_state = "etool_c" item_state = "etool_c" - ..() + return ..() /obj/item/tool/shovel/etool/attack_self(mob/user as mob) if(sharp) diff --git a/code/game/objects/items/tools/surgery_tools.dm b/code/game/objects/items/tools/surgery_tools.dm index cc64c17e62f83..005e5e468e638 100644 --- a/code/game/objects/items/tools/surgery_tools.dm +++ b/code/game/objects/items/tools/surgery_tools.dm @@ -11,14 +11,14 @@ name = "retractor" desc = "Retracts stuff." icon_state = "retractor" - flags_atom = CONDUCT + atom_flags = CONDUCT w_class = WEIGHT_CLASS_SMALL /obj/item/tool/surgery/hemostat name = "hemostat" desc = "You think you have seen this before." icon_state = "hemostat" - flags_atom = CONDUCT + atom_flags = CONDUCT w_class = WEIGHT_CLASS_SMALL attack_verb = list("attacked", "pinched") @@ -26,7 +26,7 @@ name = "cautery" desc = "This stops bleeding." icon_state = "cautery" - flags_atom = CONDUCT + atom_flags = CONDUCT w_class = WEIGHT_CLASS_TINY attack_verb = list("burnt") @@ -35,7 +35,7 @@ desc = "You can drill using this item. You dig?" icon_state = "drill" hitsound = 'sound/weapons/circsawhit.ogg' - flags_atom = CONDUCT + atom_flags = CONDUCT force = 15 w_class = WEIGHT_CLASS_SMALL attack_verb = list("drilled") @@ -48,7 +48,7 @@ name = "scalpel" desc = "Cut, cut, and once more cut." icon_state = "scalpel" - flags_atom = CONDUCT + atom_flags = CONDUCT force = 10 sharp = IS_SHARP_ITEM_ACCURATE edge = 1 @@ -88,7 +88,7 @@ desc = "For heavy duty cutting." icon_state = "saw" hitsound = 'sound/weapons/circsawhit.ogg' - flags_atom = CONDUCT + atom_flags = CONDUCT force = 15 w_class = WEIGHT_CLASS_SMALL throwforce = 9 diff --git a/code/game/objects/items/toys/cards.dm b/code/game/objects/items/toys/cards.dm index b4aeeeb525ccc..dfbcd78b4472c 100644 --- a/code/game/objects/items/toys/cards.dm +++ b/code/game/objects/items/toys/cards.dm @@ -32,6 +32,8 @@ /obj/item/toy/deck/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/toy/handcard)) var/obj/item/toy/handcard/H = I @@ -42,6 +44,7 @@ to_chat(user, "You place your cards on the bottom of the deck.") /obj/item/toy/deck/update_icon_state() + . = ..() switch(length(cards)) if(52) icon_state = "deck" @@ -136,14 +139,9 @@ user.visible_message("\The [user] deals a card to \the [target].") H.throw_at(get_step(target,target.dir),10,1,H) -/obj/item/toy/deck/attack_self(mob/user as mob) - - var/list/newcards = list() - while(length(cards)) - var/datum/playingcard/P = pick(cards) - newcards += P - cards -= P - cards = newcards +/obj/item/toy/deck/attack_self(mob/user) + . = ..() + shuffle_inplace(cards) user.visible_message("\The [user] shuffles [src].") /obj/item/toy/deck/MouseDrop(atom/over) @@ -167,6 +165,8 @@ var/concealed = 0 var/list/cards = list() + ///The last direction the person who dropped us was facing + var/last_direction = SOUTH /obj/item/toy/handcard/Initialize(mapload, card_type) . = ..() @@ -178,6 +178,8 @@ /obj/item/toy/handcard/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/toy/handcard)) var/obj/item/toy/handcard/H = I @@ -250,16 +252,22 @@ for(var/datum/playingcard/P in cards) . += "-[P.name]" -/obj/item/toy/handcard/update_icon(direction = 0) +/obj/item/toy/handcard/update_name(updates) + . = ..() if(length(cards) > 1) name = "hand of cards" - desc = "Some playing cards." else name = "a playing card" - desc = "A playing card." - overlays.Cut() +/obj/item/toy/handcard/update_desc(updates) + . = ..() + if(length(cards) > 1) + desc = "Some playing cards." + else + desc = "A playing card." +/obj/item/toy/handcard/update_overlays() + . = ..() if(!length(cards)) return @@ -268,14 +276,14 @@ var/image/I = new(src.icon, (concealed ? "card_back" : "[P.card_icon]") ) I.pixel_x += (-5+rand(10)) I.pixel_y += (-5+rand(10)) - overlays += I + . += I return var/offset = FLOOR(20/length(cards), 1) var/matrix/M = matrix() - if(direction) - switch(direction) + if(last_direction) + switch(last_direction) if(NORTH) M.Translate( 0, 0) if(SOUTH) @@ -290,7 +298,7 @@ for(var/datum/playingcard/P in cards) var/image/I = new(src.icon, (concealed ? "card_back" : "[P.card_icon]") ) //I.pixel_x = origin+(offset*i) - switch(direction) + switch(last_direction) if(SOUTH) I.pixel_x = 8-(offset*i) if(WEST) @@ -300,15 +308,14 @@ else I.pixel_x = -7+(offset*i) I.transform = M - overlays += I + . += I i++ /obj/item/toy/handcard/dropped(mob/user as mob) - ..() + . = ..() if(locate(/obj/structure/table, loc)) - src.update_icon(user.dir) - else - update_icon() + last_direction = user.dir + update_icon() /obj/item/toy/handcard/pickup(mob/user as mob) src.update_icon() @@ -357,12 +364,34 @@ P.card_icon = "Wildcard" cards += P for(var/k in 0 to 3) + P = new() P.name= "Draw 4" P.card_icon = "Draw 4" cards += P /obj/item/toy/deck/kotahi/update_icon_state() + . = ..() switch(length(cards)) - if(107 to 108) icon_state = "deck" - if(37 to 106) icon_state = "deck_open" - if(0 to 36) icon_state = "deck_empty" + if(107 to 108) + icon_state = "deck" + if(37 to 106) + icon_state = "deck_open" + if(0 to 36) + icon_state = "deck_empty" + +// purely cosmetic for helmet stuff, can't be stacked with normal cards +/obj/item/toy/card/ace/hearts + name = "Ancient Ace of Hearts card" + desc = "An ancient copy of an Ace of Hearts from a deck of playing cards." + icon = 'icons/obj/items/items.dmi' + icon_state = "ace_of_hearts" + item_state = "ace_of_hearts" + w_class = WEIGHT_CLASS_TINY + +/obj/item/toy/card/ace/spades + name = "Ancient Ace of Spades card" + desc = "An ancient copy of an Ace of Spades from a deck of playing cards." + icon = 'icons/obj/items/items.dmi' + icon_state = "ace_of_spades" + item_state = "ace_of_spades" + w_class = WEIGHT_CLASS_TINY diff --git a/code/game/objects/items/toys/toy_weapons.dm b/code/game/objects/items/toys/toy_weapons.dm index 27393f6e8f0a7..628a81998a4a7 100644 --- a/code/game/objects/items/toys/toy_weapons.dm +++ b/code/game/objects/items/toys/toy_weapons.dm @@ -14,7 +14,7 @@ desc = "Looks almost like the real thing! Ages 8 and up. Please recycle in an autolathe when you're out of caps!" icon_state = "capgun" item_state = "gun" - flags_equip_slot = ITEM_SLOT_BELT + equip_slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_NORMAL attack_verb = list("struck", "pistol whipped", "hit", "bashed") @@ -66,6 +66,7 @@ var/amount_left = 7 /obj/item/toy/gun_ammo/update_icon_state() + . = ..() if(amount_left) icon_state = "cap_ammo" else @@ -220,8 +221,8 @@ desc = "Woefully underpowered in D20." icon = 'icons/obj/items/weapons.dmi' icon_state = "katana" - flags_atom = CONDUCT - flags_equip_slot = ITEM_SLOT_BELT|ITEM_SLOT_BACK + atom_flags = CONDUCT + equip_slot_flags = ITEM_SLOT_BELT|ITEM_SLOT_BACK force = 5 throwforce = 5 w_class = WEIGHT_CLASS_NORMAL diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm index e25b26fdc7f35..c3685440ed322 100755 --- a/code/game/objects/items/toys/toys.dm +++ b/code/game/objects/items/toys/toys.dm @@ -25,10 +25,10 @@ throw_range = 20 force = 0 -/obj/item/toy/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) +/obj/item/toy/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) if(!CONFIG_GET(flag/fun_allowed)) return FALSE - attack_hand(X) + attack_hand(xeno_attacker) /* @@ -61,6 +61,8 @@ /obj/item/toy/balloon/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/reagent_containers/glass)) if(!I.reagents) @@ -96,6 +98,7 @@ QDEL_IN(src, 5) /obj/item/toy/balloon/update_icon_state() + . = ..() if(reagents.total_volume) icon_state = "waterballoon" item_state = "balloon" @@ -362,7 +365,7 @@ icon_state = "inflatable" item_state = "inflatable" icon = 'icons/obj/clothing/belts.dmi' - flags_equip_slot = ITEM_SLOT_BELT + equip_slot_flags = ITEM_SLOT_BELT /obj/item/toy/beach_ball @@ -773,28 +776,33 @@ var/side = "" var/id = "" - -/obj/structure/hoop/attackby(obj/item/I, mob/user, params) +/obj/structure/hoop/grab_interact(obj/item/grab/grab, mob/user, base_damage = BASE_OBJ_SLAM_DAMAGE, is_sharp = FALSE) . = ..() + if(.) + return + if(!isliving(grab.grabbed_thing)) + return + if(user.a_intent == INTENT_HARM) + return + var/mob/living/grabbed_mob = grab.grabbed_thing + if(user.grab_state <= GRAB_AGGRESSIVE) + to_chat(user, span_warning("You need a better grip to do that!")) + return - if(istype(I, /obj/item/grab) && get_dist(src, user) <= 1) - var/obj/item/grab/G = I - if(!isliving(G.grabbed_thing)) - return + grabbed_mob.forceMove(loc) + grabbed_mob.Paralyze(4 SECONDS) + for(var/obj/machinery/scoreboard/X in GLOB.machines) + if(X.id == id) + X.score(side, 3)// 3 points for dunking a mob + visible_message(span_danger("[user] dunks [grabbed_mob] into the [src]!")) - var/mob/living/L = G.grabbed_thing - if(user.grab_state < GRAB_AGGRESSIVE) - to_chat(user, span_warning("You need a better grip to do that!")) - return - L.forceMove(loc) - L.Paralyze(10 SECONDS) - for(var/obj/machinery/scoreboard/X in GLOB.machines) - if(X.id == id) - X.score(side, 3)// 3 points for dunking a mob - // no break, to update multiple scoreboards - visible_message(span_danger("[user] dunks [L] into the [src]!")) - else if(get_dist(src, user) < 2) +/obj/structure/hoop/attackby(obj/item/I, mob/user, params) + . = ..() + if(.) + return + + if(get_dist(src, user) < 2) user.transferItemToLoc(I, loc) for(var/obj/machinery/scoreboard/X in GLOB.machines) if(X.id == id) diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 9d6c8722ff65e..4167ec4a2be05 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -148,9 +148,9 @@ desc = "An empty box from a chunk bar. Significantly less heavy." icon_state = "chunk_trash" -/obj/item/trash/barcardine - name = "barcardine bar wrapper" - desc = "An empty wrapper from a barcardine bar. You notice the inside has several medical labels. You're not sure if you care or not about that." +/obj/item/trash/barcaridine + name = "barcaridine bar wrapper" + desc = "An empty wrapper from a barcaridine bar. You notice the inside has several medical labels. You're not sure if you care or not about that." icon_state = "barcardine_trash" /obj/item/trash/berrybar diff --git a/code/game/objects/items/weapons/blades.dm b/code/game/objects/items/weapons/blades.dm index 0f8fc8d30706d..4b4ca8a9da8a1 100644 --- a/code/game/objects/items/weapons/blades.dm +++ b/code/game/objects/items/weapons/blades.dm @@ -22,23 +22,95 @@ desc = "What are you standing around staring at this for? Get to killing!" icon_state = "claymore" item_state = "claymore" - flags_atom = CONDUCT - flags_equip_slot = ITEM_SLOT_BELT + atom_flags = CONDUCT + equip_slot_flags = ITEM_SLOT_BELT force = 40 throwforce = 10 sharp = IS_SHARP_ITEM_BIG edge = 1 w_class = WEIGHT_CLASS_NORMAL attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + hitsound = 'sound/weapons/bladeslice.ogg' + ///Special attack action granted to users with the right trait + var/datum/action/ability/activable/weapon_skill/sword_lunge/special_attack /obj/item/weapon/claymore/Initialize(mapload) . = ..() AddElement(/datum/element/scalping) + special_attack = new(src, force, penetration) + +/obj/item/weapon/claymore/Destroy() + QDEL_NULL(special_attack) + return ..() + +/obj/item/weapon/claymore/equipped(mob/user, slot) + . = ..() + if(HAS_TRAIT(user, TRAIT_SWORD_EXPERT)) + special_attack.give_action(user) + +/obj/item/weapon/claymore/dropped(mob/user) + . = ..() + special_attack.remove_action(user) /obj/item/weapon/claymore/suicide_act(mob/user) user.visible_message(span_danger("[user] is falling on the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.")) return(BRUTELOSS) +//Special attack +/datum/action/ability/activable/weapon_skill/sword_lunge + name = "Lunging strike" + action_icon_state = "sword_lunge" + desc = "A powerful leaping strike. Cannot stun." + ability_cost = 8 + cooldown_duration = 6 SECONDS + keybinding_signals = list( + KEYBINDING_NORMAL = COMSIG_WEAPONABILITY_SWORDLUNGE, + ) + +/datum/action/ability/activable/weapon_skill/sword_lunge/use_ability(atom/A) + var/mob/living/carbon/carbon_owner = owner + + RegisterSignal(carbon_owner, COMSIG_MOVABLE_MOVED, PROC_REF(movement_fx)) + RegisterSignal(carbon_owner, COMSIG_MOVABLE_BUMP, PROC_REF(lunge_impact)) + RegisterSignal(carbon_owner, COMSIG_MOVABLE_POST_THROW, PROC_REF(charge_complete)) + + carbon_owner.visible_message(span_danger("[carbon_owner] charges towards \the [A]!")) + playsound(owner, "sound/effects/alien_tail_swipe2.ogg", 50, 0, 4) + carbon_owner.throw_at(A, 2, 1, carbon_owner) + succeed_activate() + add_cooldown() + +///Create an after image +/datum/action/ability/activable/weapon_skill/sword_lunge/proc/movement_fx() + SIGNAL_HANDLER + new /obj/effect/temp_visual/xenomorph/afterimage(get_turf(owner), owner) + +///Unregisters signals after lunge complete +/datum/action/ability/activable/weapon_skill/sword_lunge/proc/charge_complete() + SIGNAL_HANDLER + UnregisterSignal(owner, list(COMSIG_MOVABLE_BUMP, COMSIG_MOVABLE_POST_THROW, COMSIG_MOVABLE_MOVED)) + +///Sig handler for atom impacts during lunge +/datum/action/ability/activable/weapon_skill/sword_lunge/proc/lunge_impact(datum/source, obj/target, speed) + SIGNAL_HANDLER + INVOKE_ASYNC(src, PROC_REF(do_lunge_impact), source, target) + charge_complete() + +///Actual effects of lunge impact +/datum/action/ability/activable/weapon_skill/sword_lunge/proc/do_lunge_impact(datum/source, obj/target) + var/mob/living/carbon/carbon_owner = source + if(!ishuman(target)) + var/obj/obj_victim = target + obj_victim.take_damage(damage, BRUTE, MELEE, TRUE, TRUE, get_dir(obj_victim, carbon_owner), penetration, carbon_owner) + if(!obj_victim.anchored && obj_victim.move_resist < MOVE_FORCE_VERY_STRONG) + obj_victim.knockback(carbon_owner, 1, 2) + else + var/mob/living/carbon/human/human_victim = target + human_victim.apply_damage(damage, BRUTE, BODY_ZONE_CHEST, MELEE, TRUE, TRUE, TRUE, penetration) + human_victim.adjust_stagger(1 SECONDS) + playsound(human_victim, "sound/weapons/wristblades_hit.ogg", 25, 0, 5) + shake_camera(human_victim, 2, 1) + /obj/item/weapon/claymore/mercsword name = "combat sword" desc = "A dusty sword commonly seen in historical museums. Where you got this is a mystery, for sure. Only a mercenary would be nuts enough to carry one of these. Sharpened to deal massive damage." @@ -97,15 +169,11 @@ attack_speed = 10 w_class = WEIGHT_CLASS_BULKY -/obj/item/weapon/claymore/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) - playsound(loc, 'sound/weapons/bladeslice.ogg', 25, 1) - return ..() - /obj/item/weapon/katana name = "katana" desc = "A finely made Japanese sword, with a well sharpened blade. The blade has been filed to a molecular edge, and is extremely deadly. Commonly found in the hands of mercenaries and yakuza." icon_state = "katana" - flags_atom = CONDUCT + atom_flags = CONDUCT force = 50 throwforce = 10 sharp = IS_SHARP_ITEM_BIG @@ -164,7 +232,7 @@ icon_state = "combat_knife" item_state = "combat_knife" desc = "A standard survival knife of high quality. You can slide this knife into your boots, and can be field-modified to attach to the end of a rifle with cable coil." - flags_atom = CONDUCT + atom_flags = CONDUCT sharp = IS_SHARP_ITEM_ACCURATE force = 30 w_class = WEIGHT_CLASS_SMALL @@ -217,7 +285,7 @@ icon_state = "karambit" item_state = "karambit" desc = "A small high quality knife with a curved blade, good for slashing and hooking. This one has a mottled red finish." - flags_atom = CONDUCT + atom_flags = CONDUCT sharp = IS_SHARP_ITEM_ACCURATE force = 30 w_class = WEIGHT_CLASS_SMALL @@ -260,7 +328,7 @@ desc="A military knife designed to be thrown at the enemy. Much quieter than a firearm, but requires a steady hand to be used effectively." stack_name = "pile" singular_name = "knife" - flags_atom = CONDUCT|DIRLOCK + atom_flags = CONDUCT|DIRLOCK sharp = IS_SHARP_ITEM_ACCURATE force = 20 w_class = WEIGHT_CLASS_TINY @@ -269,7 +337,7 @@ throw_range = 7 hitsound = 'sound/weapons/slash.ogg' attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - flags_equip_slot = ITEM_SLOT_POCKET + equip_slot_flags = ITEM_SLOT_POCKET max_amount = 5 amount = 5 @@ -285,13 +353,9 @@ RegisterSignal(src, COMSIG_MOVABLE_POST_THROW, PROC_REF(post_throw)) AddComponent(/datum/component/automatedfire/autofire, throw_delay, _fire_mode = GUN_FIREMODE_AUTOMATIC, _callback_reset_fire = CALLBACK(src, PROC_REF(stop_fire)), _callback_fire = CALLBACK(src, PROC_REF(throw_knife))) -/obj/item/stack/throwing_knife/update_icon() +/obj/item/stack/throwing_knife/update_icon_state() . = ..() - var/amount_to_show = amount > max_amount ? max_amount : amount - if(amount_to_show > 8) - setDir(8) - return - setDir(amount_to_show + round(amount_to_show / 3)) + icon_state = "throwing_knife_[amount]" /obj/item/stack/throwing_knife/equipped(mob/user, slot) . = ..() diff --git a/code/game/objects/items/weapons/energy.dm b/code/game/objects/items/weapons/energy.dm index a7faf3b092115..0b1dd7cbe2469 100644 --- a/code/game/objects/items/weapons/energy.dm +++ b/code/game/objects/items/weapons/energy.dm @@ -1,5 +1,5 @@ /obj/item/weapon/energy - flags_atom = NOBLOODY + atom_flags = NOBLOODY /obj/item/weapon/energy/suicide_act(mob/user) user.visible_message(pick(span_danger("[user] is slitting [user.p_their()] stomach open with the [name]! It looks like [user.p_theyre()] trying to commit seppuku."), \ @@ -17,7 +17,7 @@ throw_speed = 1 throw_range = 5 w_class = WEIGHT_CLASS_NORMAL - flags_atom = CONDUCT|NOBLOODY + atom_flags = CONDUCT|NOBLOODY attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut") sharp = IS_SHARP_ITEM_BIG edge = 1 @@ -52,23 +52,33 @@ throw_speed = 1 throw_range = 5 w_class = WEIGHT_CLASS_SMALL - flags_atom = NOBLOODY + atom_flags = NOBLOODY attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") sharp = IS_SHARP_ITEM_BIG edge = 1 - flags_equip_slot = ITEM_SLOT_BELT + equip_slot_flags = ITEM_SLOT_BELT ///Sword color, if applicable var/sword_color ///Force of the weapon when activated var/active_force = 40 + ///Penetration when activated + var/active_penetration = 30 + ///Special attack action granted to users with the right trait + var/datum/action/ability/activable/weapon_skill/sword_lunge/special_attack /obj/item/weapon/energy/sword/Initialize(mapload) . = ..() if(!sword_color) sword_color = pick("red","blue","green","purple") - AddComponent(/datum/component/shield, SHIELD_TOGGLE|SHIELD_PURE_BLOCKING, shield_cover = list(MELEE = 35, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 0, BIO = 0, FIRE = 0, ACID = 0)) + AddComponent(/datum/component/shield, SHIELD_TOGGLE|SHIELD_PURE_BLOCKING, list(MELEE = 35, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 0, BIO = 0, FIRE = 0, ACID = 0)) AddComponent(/datum/component/stun_mitigation, shield_cover = list(MELEE = 40, BULLET = 40, LASER = 40, ENERGY = 40, BOMB = 40, BIO = 40, FIRE = 40, ACID = 40)) AddElement(/datum/element/strappable) + AddElement(/datum/element/scalping) + special_attack = new(src, active_force, active_penetration) + +/obj/item/weapon/energy/sword/Destroy() + QDEL_NULL(special_attack) + return ..() /obj/item/weapon/energy/sword/attack_self(mob/living/user) switch_state(src, user) @@ -84,27 +94,30 @@ SIGNAL_HANDLER toggle_active() if(active) + RegisterSignals(src, list(COMSIG_ITEM_EQUIPPED_TO_SLOT, COMSIG_ITEM_EQUIPPED_NOT_IN_SLOT, COMSIG_ITEM_UNEQUIPPED), PROC_REF(switch_state)) toggle_item_bump_attack(user, TRUE) hitsound = 'sound/weapons/blade1.ogg' force = active_force throwforce = active_force - penetration = 30 + penetration = active_penetration heat = 3500 icon_state = "[initial(icon_state)]_[sword_color]" w_class = WEIGHT_CLASS_BULKY playsound(src, 'sound/weapons/saberon.ogg', 25, 1) - RegisterSignals(src, list(COMSIG_ITEM_EQUIPPED_TO_SLOT, COMSIG_ITEM_EQUIPPED_NOT_IN_SLOT, COMSIG_ITEM_UNEQUIPPED), PROC_REF(switch_state)) + if(HAS_TRAIT(user, TRAIT_SWORD_EXPERT)) + special_attack.give_action(user) else + UnregisterSignal(src, list(COMSIG_ITEM_EQUIPPED_TO_SLOT, COMSIG_ITEM_EQUIPPED_NOT_IN_SLOT, COMSIG_ITEM_UNEQUIPPED)) toggle_item_bump_attack(user, FALSE) hitsound = initial(hitsound) force = initial(force) throwforce = initial(throwforce) - penetration = 0 + penetration = initial(penetration) heat = 0 icon_state = "[initial(icon_state)]" w_class = WEIGHT_CLASS_SMALL playsound(src, 'sound/weapons/saberoff.ogg', 25, 1) - UnregisterSignal(src, list(COMSIG_ITEM_EQUIPPED_TO_SLOT, COMSIG_ITEM_EQUIPPED_NOT_IN_SLOT, COMSIG_ITEM_UNEQUIPPED)) + special_attack.remove_action(user) /obj/item/weapon/energy/sword/pirate name = "energy cutlass" diff --git a/code/game/objects/items/weapons/holo_weapons.dm b/code/game/objects/items/weapons/holo_weapons.dm index 597c3466a19f5..a1d153935c345 100644 --- a/code/game/objects/items/weapons/holo_weapons.dm +++ b/code/game/objects/items/weapons/holo_weapons.dm @@ -11,7 +11,7 @@ throw_speed = 1 throw_range = 5 w_class = WEIGHT_CLASS_SMALL - flags_item = NOBLUDGEON + item_flags = NOBLUDGEON var/sword_color diff --git a/code/game/objects/items/weapons/misc.dm b/code/game/objects/items/weapons/misc.dm index 369b4692e140f..80a298c491957 100644 --- a/code/game/objects/items/weapons/misc.dm +++ b/code/game/objects/items/weapons/misc.dm @@ -3,8 +3,8 @@ desc = "A tool used by great men to placate the frothing masses." icon_state = "chain" item_state = "chain" - flags_atom = CONDUCT - flags_equip_slot = ITEM_SLOT_BELT + atom_flags = CONDUCT + equip_slot_flags = ITEM_SLOT_BELT force = 10 throwforce = 7 w_class = WEIGHT_CLASS_NORMAL @@ -20,7 +20,7 @@ icon = 'icons/obj/items/weapons.dmi' icon_state = "cane" item_state = "cane" - flags_atom = CONDUCT + atom_flags = CONDUCT force = 5 throwforce = 7 w_class = WEIGHT_CLASS_SMALL @@ -50,7 +50,7 @@ desc = "A metal gauntlet with a energy-powered fist to throw back enemies. Altclick to clamp it around your hand, use it to change power settings and click with an empty off-hand or right click to pop out the cell." icon_state = "powerfist" item_state = "powerfist" - flags_equip_slot = ITEM_SLOT_BELT + equip_slot_flags = ITEM_SLOT_BELT force = 10 attack_verb = list("smashed", "rammed", "power-fisted") var/obj/item/cell/cell @@ -188,5 +188,5 @@ attack_verb = list("smacked", "whacked", "bonked", "pelted", "thwacked", "cracked") hitsound = 'sound/weapons/heavyhit.ogg' singular_name = "stone" - flags_atom = DIRLOCK + atom_flags = DIRLOCK sharp = IS_NOT_SHARP_ITEM diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index e50a9dd5bbd6b..f663ad2b3f060 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -10,7 +10,7 @@ set_shield() /obj/item/weapon/shield/proc/set_shield() - AddComponent(/datum/component/shield, SHIELD_PARENT_INTEGRITY, shield_cover = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 80, BIO = 30, FIRE = 50, ACID = 80)) + AddComponent(/datum/component/shield, SHIELD_PARENT_INTEGRITY, list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 80, BIO = 30, FIRE = 50, ACID = 80)) AddComponent(/datum/component/stun_mitigation) /obj/item/weapon/shield/riot @@ -19,8 +19,8 @@ icon = 'icons/obj/items/weapons.dmi' icon_state = "riot" max_integrity = 200 - flags_item = IMPEDE_JETPACK - flags_equip_slot = ITEM_SLOT_BACK + item_flags = IMPEDE_JETPACK + equip_slot_flags = ITEM_SLOT_BACK force = 5 throwforce = 5 throw_speed = 1 @@ -53,6 +53,8 @@ /obj/item/weapon/shield/riot/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/stack/sheet/metal)) var/obj/item/stack/sheet/metal/metal_sheets = I @@ -91,7 +93,7 @@ desc = "A heavy shield adept at blocking blunt or sharp objects from connecting with the shield wielder. Looks very robust. Alt click to tighten the strap." icon = 'icons/obj/items/weapons.dmi' icon_state = "marine_shield" - flags_equip_slot = ITEM_SLOT_BACK + equip_slot_flags = ITEM_SLOT_BACK max_integrity = 400 integrity_failure = 100 soft_armor = list(MELEE = 40, BULLET = 50, LASER = 20, ENERGY = 70, BOMB = 15, BIO = 50, FIRE = 0, ACID = 30) @@ -104,6 +106,7 @@ AddElement(/datum/element/strappable) /obj/item/weapon/shield/riot/marine/update_icon_state() + . = ..() if(obj_integrity <= integrity_failure) icon_state = initial(icon_state) + "_broken" else @@ -137,13 +140,13 @@ desc = "A compact shield adept at blocking blunt or sharp objects from connecting with the shield wielder. Can be deployed as a barricade. Alt click to tighten the strap." icon = 'icons/obj/items/weapons.dmi' icon_state = "folding_shield" - flags_equip_slot = ITEM_SLOT_BACK + equip_slot_flags = ITEM_SLOT_BACK w_class = WEIGHT_CLASS_NORMAL max_integrity = 300 integrity_failure = 50 soft_armor = list(MELEE = 35, BULLET = 30, LASER = 20, ENERGY = 40, BOMB = 25, BIO = 50, FIRE = 0, ACID = 30) slowdown = 0.3 - flags_item = IS_DEPLOYABLE + item_flags = IS_DEPLOYABLE ///The item this deploys into var/deployable_item = /obj/structure/barricade/metal/deployable ///Time to deploy @@ -158,14 +161,14 @@ AddComponent(/datum/component/deployable_item, deployable_item, deploy_time, undeploy_time) /obj/item/weapon/shield/riot/marine/deployable/set_shield() - AddComponent(/datum/component/shield, SHIELD_PARENT_INTEGRITY, shield_cover = list(MELEE = 40, BULLET = 35, LASER = 35, ENERGY = 35, BOMB = 40, BIO = 15, FIRE = 30, ACID = 35)) + AddComponent(/datum/component/shield, SHIELD_PARENT_INTEGRITY, list(MELEE = 40, BULLET = 35, LASER = 35, ENERGY = 35, BOMB = 40, BIO = 15, FIRE = 30, ACID = 35)) /obj/item/weapon/shield/energy name = "energy combat shield" desc = "A shield capable of stopping most projectile and melee attacks. It can be retracted, expanded, and stored anywhere." icon = 'icons/obj/items/weapons.dmi' icon_state = "eshield0" // eshield1 for expanded - flags_atom = CONDUCT|NOBLOODY + atom_flags = CONDUCT|NOBLOODY force = 3 throwforce = 5 throw_speed = 1 diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 5c264d6b0966f..62855da1d467a 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -3,7 +3,7 @@ desc = "A stun baton for incapacitating people with." icon_state = "stunbaton" item_state = "baton" - flags_equip_slot = ITEM_SLOT_BELT + equip_slot_flags = ITEM_SLOT_BELT force = 15 sharp = 0 edge = 0 @@ -38,6 +38,7 @@ return 0 /obj/item/weapon/baton/update_icon_state() + . = ..() if(status) icon_state = "[initial(name)]_active" else if(!bcell) @@ -84,6 +85,8 @@ /obj/item/weapon/baton/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/cell)) if(bcell) @@ -200,7 +203,7 @@ agonyforce = 60 //same force as a stunbaton, but uses way more charge. hitcost = 2500 attack_verb = list("poked") - flags_equip_slot = NONE + equip_slot_flags = NONE has_user_lock = FALSE @@ -209,7 +212,7 @@ desc = "A specialised prod designed for incapacitating xenomorphic lifeforms with." icon_state = "stunbaton" item_state = "baton" - flags_equip_slot = ITEM_SLOT_BELT + equip_slot_flags = ITEM_SLOT_BELT force = 12 throwforce = 7 w_class = WEIGHT_CLASS_NORMAL @@ -223,6 +226,7 @@ /obj/item/weapon/stunprod/update_icon_state() + . = ..() if(status) icon_state = "stunbaton_active" else diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index 3eaa6733a30e4..463d06d476a8e 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -22,7 +22,7 @@ icon = 'icons/obj/items/weapons.dmi' icon_state = "baton" item_state = "classic_baton" - flags_equip_slot = ITEM_SLOT_BELT + equip_slot_flags = ITEM_SLOT_BELT force = 10 /obj/item/weapon/classic_baton/attack(mob/living/M, mob/living/user) @@ -40,7 +40,7 @@ icon = 'icons/obj/items/weapons.dmi' icon_state = "telebaton_0" item_state = "telebaton_0" - flags_equip_slot = ITEM_SLOT_BELT + equip_slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_SMALL force = 3 var/on = 0 diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 89bb9d67d447c..db3090941c70f 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -6,7 +6,7 @@ var/force_wielded = 0 var/wieldsound var/unwieldsound - flags_item = TWOHANDED + item_flags = TWOHANDED /obj/item/weapon/twohanded/mob_can_equip(mob/user, slot, warning = TRUE, override_nodrop = FALSE, bitslot = FALSE) unwield(user) @@ -24,7 +24,7 @@ /obj/item/proc/wield(mob/user) - if(!(flags_item & TWOHANDED) || flags_item & WIELDED) + if(!(item_flags & TWOHANDED) || item_flags & WIELDED) return FALSE var/obj/item/offhand = user.get_inactive_held_item() @@ -59,7 +59,7 @@ /obj/item/proc/unwield(mob/user) - if(!CHECK_MULTIPLE_BITFIELDS(flags_item, TWOHANDED|WIELDED)) + if(!CHECK_MULTIPLE_BITFIELDS(item_flags, TWOHANDED|WIELDED)) return FALSE toggle_wielded(user, FALSE) @@ -95,9 +95,9 @@ /obj/item/proc/toggle_wielded(user, wielded) if(wielded) - flags_item |= WIELDED + item_flags |= WIELDED else - flags_item &= ~WIELDED + item_flags &= ~WIELDED /obj/item/weapon/twohanded/wield(mob/user) . = ..() @@ -126,7 +126,7 @@ /obj/item/weapon/twohanded/attack_self(mob/user) . = ..() - if(flags_item & WIELDED) + if(item_flags & WIELDED) unwield(user) else wield(user) @@ -137,7 +137,7 @@ w_class = WEIGHT_CLASS_HUGE icon_state = "offhand" name = "offhand" - flags_item = DELONDROP|TWOHANDED|WIELDED + item_flags = DELONDROP|TWOHANDED|WIELDED resistance_flags = RESIST_ALL @@ -178,9 +178,9 @@ sharp = IS_SHARP_ITEM_BIG edge = TRUE w_class = WEIGHT_CLASS_BULKY - flags_equip_slot = ITEM_SLOT_BELT|ITEM_SLOT_BACK - flags_atom = CONDUCT - flags_item = TWOHANDED + equip_slot_flags = ITEM_SLOT_BELT|ITEM_SLOT_BACK + atom_flags = CONDUCT + item_flags = TWOHANDED force_wielded = 75 attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut") @@ -213,26 +213,99 @@ force = 40 force_wielded = 80 penetration = 35 - flags_equip_slot = ITEM_SLOT_BACK + equip_slot_flags = ITEM_SLOT_BACK attack_speed = 15 + ///Special attack action granted to users with the right trait + var/datum/action/ability/activable/weapon_skill/axe_sweep/special_attack /obj/item/weapon/twohanded/fireaxe/som/Initialize(mapload) . = ..() - AddComponent(/datum/component/shield, SHIELD_TOGGLE|SHIELD_PURE_BLOCKING, shield_cover = list(MELEE = 45, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 0, BIO = 0, FIRE = 0, ACID = 0)) + AddComponent(/datum/component/shield, SHIELD_TOGGLE|SHIELD_PURE_BLOCKING, list(MELEE = 45, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 0, BIO = 0, FIRE = 0, ACID = 0)) AddComponent(/datum/component/stun_mitigation, SHIELD_TOGGLE, shield_cover = list(MELEE = 60, BULLET = 60, LASER = 60, ENERGY = 60, BOMB = 60, BIO = 60, FIRE = 60, ACID = 60)) AddElement(/datum/element/strappable) + special_attack = new(src, force_wielded, penetration) + +/obj/item/weapon/twohanded/fireaxe/som/Destroy() + QDEL_NULL(special_attack) + return ..() /obj/item/weapon/twohanded/fireaxe/som/wield(mob/user) . = ..() if(!.) return toggle_item_bump_attack(user, TRUE) + if(HAS_TRAIT(user, TRAIT_AXE_EXPERT)) + special_attack.give_action(user) /obj/item/weapon/twohanded/fireaxe/som/unwield(mob/user) . = ..() if(!.) return toggle_item_bump_attack(user, FALSE) + special_attack.remove_action(user) + +//Special attack +/datum/action/ability/activable/weapon_skill/axe_sweep + name = "Sweeping blow" + action_icon_state = "axe_sweep" + desc = "A powerful sweeping blow that hits foes in the direction you are facing. Cannot stun." + ability_cost = 10 + cooldown_duration = 6 SECONDS + keybinding_signals = list( + KEYBINDING_NORMAL = COMSIG_WEAPONABILITY_AXESWEEP, + ) + /// Used for particles. Holds the particles instead of the mob. See particle_holder for documentation. + var/obj/effect/abstract/particle_holder/particle_holder + +/datum/action/ability/activable/weapon_skill/axe_sweep/use_ability(atom/A) + succeed_activate() + add_cooldown() + var/mob/living/carbon/carbon_owner = owner + carbon_owner.Move(get_step_towards(carbon_owner, A), get_dir(src, A)) + carbon_owner.face_atom(A) + activate_particles(owner.dir) + playsound(owner, "sound/effects/alien_tail_swipe3.ogg", 50, 0, 5) + owner.visible_message(span_danger("[owner] Swing their weapon in a deadly arc!")) + + var/list/atom/movable/atoms_to_ravage = get_step(owner, owner.dir).contents.Copy() + atoms_to_ravage += get_step(owner, turn(owner.dir, -45)).contents + atoms_to_ravage += get_step(owner, turn(owner.dir, 45)).contents + for(var/atom/movable/victim AS in atoms_to_ravage) + if((victim.resistance_flags & INDESTRUCTIBLE)) + continue + if(!ishuman(victim)) + var/obj/obj_victim = victim + obj_victim.take_damage(damage, BRUTE, MELEE, TRUE, TRUE, get_dir(obj_victim, carbon_owner), penetration, carbon_owner) + if(!obj_victim.anchored && obj_victim.move_resist < MOVE_FORCE_VERY_STRONG) + obj_victim.knockback(owner, 1, 2) + continue + var/mob/living/carbon/human/human_victim = victim + if(human_victim.lying_angle) + continue + human_victim.apply_damage(damage, BRUTE, BODY_ZONE_CHEST, MELEE, TRUE, TRUE, TRUE, penetration) + human_victim.knockback(owner, 1, 2) + human_victim.adjust_stagger(1 SECONDS) + playsound(human_victim, "sound/weapons/wristblades_hit.ogg", 25, 0, 5) + shake_camera(human_victim, 2, 1) + +/// Handles the activation and deactivation of particles, as well as their appearance. +/datum/action/ability/activable/weapon_skill/axe_sweep/proc/activate_particles(direction) + particle_holder = new(get_turf(owner), /particles/ravager_slash) + QDEL_NULL_IN(src, particle_holder, 5) + particle_holder.particles.rotation += dir2angle(direction) + switch(direction) // There's no shared logic here because sprites are magical. + if(NORTH) // Gotta define stuff for each angle so it looks good. + particle_holder.particles.position = list(8, 4) + particle_holder.particles.velocity = list(0, 20) + if(EAST) + particle_holder.particles.position = list(3, -8) + particle_holder.particles.velocity = list(20, 0) + if(SOUTH) + particle_holder.particles.position = list(-9, -3) + particle_holder.particles.velocity = list(0, -20) + if(WEST) + particle_holder.particles.position = list(-4, 9) + particle_holder.particles.velocity = list(-20, 0) /* * Double-Bladed Energy Swords - Cheridan @@ -250,7 +323,7 @@ force_wielded = 150 wieldsound = 'sound/weapons/saberon.ogg' unwieldsound = 'sound/weapons/saberoff.ogg' - flags_atom = NOBLOODY + atom_flags = NOBLOODY attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") sharp = IS_SHARP_ITEM_BIG edge = 1 @@ -267,7 +340,7 @@ item_state = "spearglass" force = 40 w_class = WEIGHT_CLASS_BULKY - flags_equip_slot = ITEM_SLOT_BACK + equip_slot_flags = ITEM_SLOT_BACK force_wielded = 75 throwforce = 75 throw_speed = 3 @@ -313,7 +386,7 @@ /obj/item/weapon/twohanded/spear/tactical/tacticool name = "M-23 TACTICOOL spear" - icon = 'icons/Marine/gun64.dmi' + icon = 'icons/Marine/spear.dmi' desc = "A TACTICOOL spear. Used for TACTICOOLNESS in combat." /obj/item/weapon/twohanded/spear/tactical/tacticool/Initialize(mapload) @@ -356,24 +429,26 @@ desc = "A huge, powerful blade on a metallic pole. Mysterious writing is carved into the weapon." force = 28 w_class = WEIGHT_CLASS_BULKY - flags_equip_slot = ITEM_SLOT_BACK + equip_slot_flags = ITEM_SLOT_BACK force_wielded = 90 throwforce = 65 throw_speed = 3 edge = 1 sharp = IS_SHARP_ITEM_BIG - flags_atom = CONDUCT - hitsound = 'sound/weapons/bladeslice.ogg' + atom_flags = CONDUCT attack_verb = list("sliced", "slashed", "jabbed", "torn", "gored") resistance_flags = UNACIDABLE attack_speed = 12 //Default is 7. +/obj/item/weapon/twohanded/glaive/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) + playsound(loc, 'sound/weapons/bladeslice.ogg', 25, 1) + return ..() + /obj/item/weapon/twohanded/glaive/damaged name = "war glaive" desc = "A huge, powerful blade on a metallic pole. Mysterious writing is carved into the weapon. This one is ancient and has suffered serious acid damage, making it near-useless." force = 18 force_wielded = 28 - /obj/item/weapon/twohanded/rocketsledge name = "rocket sledge" desc = "Fitted with a rocket booster at the head, the rocket sledge would deliver a tremendously powerful impact, easily crushing your enemies. Uses fuel to power itself. Press AltClick to tighten your grip. Press Spacebar to change modes." @@ -381,13 +456,13 @@ item_state = "rocketsledge" force = 30 w_class = WEIGHT_CLASS_BULKY - flags_equip_slot = ITEM_SLOT_BACK + equip_slot_flags = ITEM_SLOT_BACK force_wielded = 75 throwforce = 50 throw_speed = 2 edge = 1 sharp = IS_SHARP_ITEM_BIG - flags_atom = CONDUCT | TWOHANDED + atom_flags = CONDUCT | TWOHANDED attack_verb = list("smashed", "hammered") attack_speed = 20 @@ -444,7 +519,8 @@ update_icon() /obj/item/weapon/twohanded/rocketsledge/update_icon_state() - if ((reagents.get_reagent_amount(/datum/reagent/fuel) > fuel_used) && (CHECK_BITFIELD(flags_item, WIELDED))) + . = ..() + if ((reagents.get_reagent_amount(/datum/reagent/fuel) > fuel_used) && (CHECK_BITFIELD(item_flags, WIELDED))) icon_state = "rocketsledge_w" else icon_state = "rocketsledge" @@ -482,7 +558,7 @@ playsound(loc, 'sound/machines/switch.ogg', 25) /obj/item/weapon/twohanded/rocketsledge/attack(mob/living/carbon/M, mob/living/carbon/user as mob) - if(!CHECK_BITFIELD(flags_item, WIELDED)) + if(!CHECK_BITFIELD(item_flags, WIELDED)) to_chat(user, span_warning("You need a more secure grip to use [src]!")) return diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index aeddd6d6a4ded..048e34e7ad78f 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -5,7 +5,7 @@ name = "banhammer" icon = 'icons/obj/items/items.dmi' icon_state = "toyhammer" - flags_equip_slot = ITEM_SLOT_BELT + equip_slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_SMALL throw_speed = 7 throw_range = 15 @@ -20,7 +20,7 @@ desc = "A rod of pure obsidian, its very presence disrupts and dampens the powers of paranormal phenomenae." icon_state = "nullrod" item_state = "nullrod" - flags_equip_slot = ITEM_SLOT_BELT + equip_slot_flags = ITEM_SLOT_BELT force = 15 throw_speed = 1 throw_range = 4 @@ -118,7 +118,7 @@ desc = "A rod with some wire wrapped around the top. It'd be easy to attach something to the top bit." icon_state = "wiredrod" item_state = "rods" - flags_atom = CONDUCT + atom_flags = CONDUCT force = 8 throwforce = 10 w_class = WEIGHT_CLASS_NORMAL @@ -127,6 +127,8 @@ /obj/item/weapon/wirerod/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/shard)) var/obj/item/weapon/twohanded/spear/S = new @@ -135,4 +137,4 @@ to_chat(user, span_notice("You fasten the glass shard to the top of the rod with the cable.")) qdel(I) qdel(src) - update_icon(user) + update_icon() diff --git a/code/game/objects/items/whistle.dm b/code/game/objects/items/whistle.dm index e29e036aca29d..bf26b51a631f8 100644 --- a/code/game/objects/items/whistle.dm +++ b/code/game/objects/items/whistle.dm @@ -4,13 +4,13 @@ desc = "A metal pea-whistle. Can be blown while held, or worn in the mouth" icon_state = "whistle" w_class = WEIGHT_CLASS_TINY - flags_atom = CONDUCT - flags_equip_slot = ITEM_SLOT_MASK + atom_flags = CONDUCT + equip_slot_flags = ITEM_SLOT_MASK actions_types = list(/datum/action/item_action) // RUTGMC ADDITION var/volume = 60 - var/spamcheck = FALSE - + /// The range in tiles which whistle makes people warcry + var/warcryrange = 5 /obj/item/whistle/attack_self(mob/user) . = ..() @@ -19,6 +19,8 @@ /obj/item/whistle/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(user.wear_mask == src) whistle_playsound(user) @@ -33,14 +35,22 @@ /obj/item/whistle/proc/whistle_playsound(mob/user as mob) - if (spamcheck) + if(TIMER_COOLDOWN_CHECK(user, COOLDOWN_WHISTLE_BLOW)) + user.balloon_alert(user, "Catch your breath!") return user.visible_message(span_warning("[user] blows into [src]!")) playsound(get_turf(src), 'sound/items/whistle.ogg', volume, 1) - spamcheck = TRUE - addtimer(VARSET_CALLBACK(src, spamcheck, FALSE), 3 SECONDS) + if(TIMER_COOLDOWN_CHECK(user, COOLDOWN_WHISTLE_WARCRY)) + to_chat(user, span_notice("You have to wait a while to rally your troops...")) + else + TIMER_COOLDOWN_START(user, COOLDOWN_WHISTLE_WARCRY, 1 MINUTES) + for(var/mob/living/carbon/human/human in get_hearers_in_view(warcryrange, user.loc)) + human.emote("warcry", intentional = TRUE) + CHECK_TICK + + TIMER_COOLDOWN_START(user, COOLDOWN_WHISTLE_BLOW, 3 SECONDS) /obj/item/hailer @@ -50,7 +60,7 @@ icon_state = "voice" item_state = "flashbang" //looks exactly like a flash (and nothing like a flashbang) w_class = WEIGHT_CLASS_TINY - flags_atom = CONDUCT + atom_flags = CONDUCT var/spamcheck = FALSE diff --git a/code/game/objects/machinery.dm b/code/game/objects/machinery.dm index 48d31828ec5b4..128167ac8f5a0 100644 --- a/code/game/objects/machinery.dm +++ b/code/game/objects/machinery.dm @@ -30,7 +30,7 @@ component_parts = list() var/turf/current_turf = get_turf(src) if(anchored && current_turf && density) - current_turf.flags_atom |= AI_BLOCKED + current_turf.atom_flags |= AI_BLOCKED /obj/machinery/Destroy() @@ -41,7 +41,7 @@ operator = null var/turf/current_turf = get_turf(src) if(anchored && current_turf && density) - current_turf.flags_atom &= ~ AI_BLOCKED + current_turf.atom_flags &= ~ AI_BLOCKED return ..() /obj/machinery/proc/is_operational() @@ -49,7 +49,7 @@ /obj/machinery/proc/default_deconstruction_crowbar(obj/item/crowbar, ignore_panel = 0, custom_deconstruct = FALSE) - . = !(flags_atom & NODECONSTRUCT) && crowbar.tool_behaviour == TOOL_CROWBAR + . = !(atom_flags & NODECONSTRUCT) && crowbar.tool_behaviour == TOOL_CROWBAR if(!. || custom_deconstruct) return crowbar.play_tool_sound(src, 50) @@ -65,7 +65,7 @@ return TRUE /obj/machinery/deconstruct(disassembled = TRUE) - if(!(flags_atom & NODECONSTRUCT)) + if(!(atom_flags & NODECONSTRUCT)) on_deconstruction() if(length(component_parts)) spawn_frame(disassembled) diff --git a/code/game/objects/machinery/OpTable.dm b/code/game/objects/machinery/OpTable.dm index 025803c3397bd..3920ff5fb5420 100644 --- a/code/game/objects/machinery/OpTable.dm +++ b/code/game/objects/machinery/OpTable.dm @@ -188,6 +188,8 @@ /obj/machinery/optable/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/tank/anesthetic)) if(anes_tank) @@ -196,32 +198,33 @@ anes_tank = I to_chat(user, span_notice("You connect \the [anes_tank] to \the [src].")) - if(!istype(I, /obj/item/grab)) +/obj/machinery/optable/grab_interact(obj/item/grab/grab, mob/user, base_damage = BASE_OBJ_SLAM_DAMAGE, is_sharp = FALSE) + . = ..() + if(.) return - - var/obj/item/grab/G = I - if(victim && victim != G.grabbed_thing) + if(victim && victim != grab.grabbed_thing) to_chat(user, span_warning("The table is already occupied!")) return - var/mob/living/carbon/M - if(iscarbon(G.grabbed_thing)) - M = G.grabbed_thing - if(M.buckled) + var/mob/living/carbon/grabbed_mob + if(iscarbon(grab.grabbed_thing)) + grabbed_mob = grab.grabbed_thing + if(grabbed_mob.buckled) to_chat(user, span_warning("Unbuckle first!")) return - else if(istype(G.grabbed_thing, /obj/structure/closet/bodybag/cryobag)) - var/obj/structure/closet/bodybag/cryobag/C = G.grabbed_thing - if(!C.bodybag_occupant) + else if(istype(grab.grabbed_thing, /obj/structure/closet/bodybag/cryobag)) + var/obj/structure/closet/bodybag/cryobag/cryobag = grab.grabbed_thing + if(!cryobag.bodybag_occupant) return - M = C.bodybag_occupant - C.open() + grabbed_mob = cryobag.bodybag_occupant + cryobag.open() user.stop_pulling() - user.start_pulling(M) + user.start_pulling(grabbed_mob) - if(!M) + if(!grabbed_mob) return - take_victim(M, user) + take_victim(grabbed_mob, user) + return TRUE /obj/machinery/optable/proc/check_table(mob/living/carbon/patient as mob) if(victim) diff --git a/code/game/objects/machinery/adv_med.dm b/code/game/objects/machinery/adv_med.dm index 95063a17355ec..52f96cd5af02b 100644 --- a/code/game/objects/machinery/adv_med.dm +++ b/code/game/objects/machinery/adv_med.dm @@ -32,6 +32,7 @@ set_light(initial(light_range)) /obj/machinery/bodyscanner/update_icon_state() + . = ..() if(occupant) icon_state = "[initial(icon_state)]_occupied" else @@ -107,57 +108,59 @@ return go_out() - /obj/machinery/bodyscanner/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/healthanalyzer) && occupant) //Allows us to use the analyzer on the occupant without taking him out; this is here mainly for consistency's sake. var/obj/item/healthanalyzer/J = I J.attack(occupant, user) return - var/mob/M - if(!istype(I, /obj/item/grab)) +/obj/machinery/bodyscanner/grab_interact(obj/item/grab/grab, mob/user, base_damage = BASE_OBJ_SLAM_DAMAGE, is_sharp = FALSE) + . = ..() + if(.) return - - else if(occupant) + if(occupant) to_chat(user, span_warning("The scanner is already occupied!")) return - var/obj/item/grab/G = I - if(istype(G.grabbed_thing,/obj/structure/closet/bodybag/cryobag)) - var/obj/structure/closet/bodybag/cryobag/C = G.grabbed_thing - if(!C.bodybag_occupant) + var/mob/grabbed_mob + if(ismob(grab.grabbed_thing)) + grabbed_mob = grab.grabbed_thing + else if(istype(grab.grabbed_thing, /obj/structure/closet/bodybag/cryobag)) + var/obj/structure/closet/bodybag/cryobag/cryobag = grab.grabbed_thing + if(!cryobag.bodybag_occupant) to_chat(user, span_warning("The stasis bag is empty!")) return - M = C.bodybag_occupant - C.open() - user.start_pulling(M) - else if(ismob(G.grabbed_thing)) - M = G.grabbed_thing + grabbed_mob = cryobag.bodybag_occupant + cryobag.open() + user.start_pulling(grabbed_mob) - if(!M) + if(!grabbed_mob) return - if(M.abiotic()) + if(grabbed_mob.abiotic()) to_chat(user, span_warning("Subject cannot have abiotic items on.")) return - M.forceMove(src) - occupant = M + grabbed_mob.forceMove(src) + occupant = grabbed_mob update_icon() for(var/obj/O in src) O.forceMove(loc) + return TRUE -/obj/machinery/bodyscanner/attack_alien(mob/living/carbon/xenomorph/X, damage_amount, damage_type, damage_flag, effects, armor_penetration, isrightclick) +/obj/machinery/bodyscanner/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) if(!occupant) - to_chat(X, span_xenowarning("There is nothing of interest in there.")) + to_chat(xeno_attacker, span_xenowarning("There is nothing of interest in there.")) return - if(X.status_flags & INCORPOREAL || X.do_actions) + if(xeno_attacker.status_flags & INCORPOREAL || xeno_attacker.do_actions) return - visible_message(span_warning("[X] begins to pry the [src]'s cover!"), 3) + visible_message(span_warning("[xeno_attacker] begins to pry the [src]'s cover!"), 3) playsound(src,'sound/effects/metal_creaking.ogg', 25, 1) - if(!do_after(X, 2 SECONDS)) + if(!do_after(xeno_attacker, 2 SECONDS)) return playsound(loc, 'sound/effects/metal_creaking.ogg', 25, 1) go_out() diff --git a/code/game/objects/machinery/air_alarm.dm b/code/game/objects/machinery/air_alarm.dm index e644e46a4e20c..ea737f7f2af5d 100644 --- a/code/game/objects/machinery/air_alarm.dm +++ b/code/game/objects/machinery/air_alarm.dm @@ -36,6 +36,7 @@ set_light(initial(light_range)) /obj/machinery/air_alarm/update_icon_state() + . = ..() if(machine_stat & (NOPOWER|BROKEN)) icon_state = "alarm_unpowered" else diff --git a/code/game/objects/machinery/autodoc.dm b/code/game/objects/machinery/autodoc.dm index 5fc73f11f9685..4bd4fc7ab1a1c 100644 --- a/code/game/objects/machinery/autodoc.dm +++ b/code/game/objects/machinery/autodoc.dm @@ -105,6 +105,7 @@ set_light(initial(light_range)) /obj/machinery/autodoc/update_icon_state() + . = ..() if(machine_stat & NOPOWER) icon_state = "autodoc_off" else if(surgery) @@ -193,15 +194,15 @@ if(updating_health) occupant.updatehealth() -/obj/machinery/autodoc/attack_alien(mob/living/carbon/xenomorph/X, damage_amount, damage_type, damage_flag, effects, armor_penetration, isrightclick) +/obj/machinery/autodoc/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) if(!occupant) - to_chat(X, span_xenowarning("There is nothing of interest in there.")) + to_chat(xeno_attacker, span_xenowarning("There is nothing of interest in there.")) return - if(X.status_flags & INCORPOREAL || X.do_actions) + if(xeno_attacker.status_flags & INCORPOREAL || xeno_attacker.do_actions) return - visible_message(span_warning("[X] begins to pry the [src]'s cover!"), 3) + visible_message(span_warning("[xeno_attacker] begins to pry the [src]'s cover!"), 3) playsound(src,'sound/effects/metal_creaking.ogg', 25, 1) - if(!do_after(X, 2 SECONDS)) + if(!do_after(xeno_attacker, 2 SECONDS)) return playsound(loc, 'sound/effects/metal_creaking.ogg', 25, 1) go_out() @@ -851,6 +852,8 @@ /obj/machinery/autodoc/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(!ishuman(user)) return // no @@ -870,67 +873,63 @@ J.attack(occupant, user) return - else if(!istype(I, /obj/item/grab)) +/obj/machinery/autodoc/grab_interact(obj/item/grab/grab, mob/user, base_damage = BASE_OBJ_SLAM_DAMAGE, is_sharp = FALSE) + . = ..() + if(.) + return + if(!ishuman(user)) return - if(machine_stat & (NOPOWER|BROKEN)) - to_chat(user, span_notice("[src] is non-functional!")) + to_chat(user, span_notice("\ [src] is non-functional!")) return - else if(occupant) - to_chat(user, span_notice("[src] is already occupied!")) + if(occupant) + to_chat(user, span_notice("\ [src] is already occupied!")) return - if(!istype(I, /obj/item/grab)) - return + var/mob/grabbed_mob - var/obj/item/grab/G = I + if(ismob(grab.grabbed_thing)) + grabbed_mob = grab.grabbed_thing - var/mob/M - if(ismob(G.grabbed_thing)) - M = G.grabbed_thing - else if(istype(G.grabbed_thing, /obj/structure/closet/bodybag/cryobag)) - var/obj/structure/closet/bodybag/cryobag/C = G.grabbed_thing - if(!C.bodybag_occupant) + else if(istype(grab.grabbed_thing,/obj/structure/closet/bodybag/cryobag)) + var/obj/structure/closet/bodybag/cryobag/cryobag = grab.grabbed_thing + if(!cryobag.bodybag_occupant) to_chat(user, span_warning("The stasis bag is empty!")) return - M = C.bodybag_occupant - C.open() - user.start_pulling(M) + grabbed_mob = cryobag.bodybag_occupant + cryobag.open() + user.start_pulling(grabbed_mob) - - if(!M) - return - - else if(!ishuman(M)) // stop fucking monkeys and xenos being put in. // MONKEEY IS FREE - to_chat(user, span_notice("[src] is compatible with humanoid anatomies only!")) + if(!ishuman(grabbed_mob)) + to_chat(user, span_notice("\ [src] is compatible with humanoid anatomies only!")) return - else if(M.abiotic()) + if(grabbed_mob.abiotic()) to_chat(user, span_warning("Subject cannot have abiotic items on.")) return if(user.skills.getRating(SKILL_SURGERY) < SKILL_SURGERY_TRAINED && !event) - user.visible_message(span_notice("[user] fumbles around figuring out how to put [M] into [src]."), - span_notice("You fumble around figuring out how to put [M] into [src].")) + user.visible_message(span_notice("[user] fumbles around figuring out how to put [grabbed_mob] into [src]."), + span_notice("You fumble around figuring out how to put [grabbed_mob] into [src].")) var/fumbling_time = max(0 , SKILL_TASK_TOUGH - ( SKILL_TASK_EASY * user.skills.getRating(SKILL_SURGERY) ))// 8 secs non-trained, 5 amateur - if(!do_after(user, fumbling_time, NONE, M, BUSY_ICON_UNSKILLED) || QDELETED(src)) + if(!do_after(user, fumbling_time, NONE, grabbed_mob, BUSY_ICON_UNSKILLED) || QDELETED(src)) return - visible_message("[user] starts putting [M] into [src].", 3) + visible_message("[user] starts putting [grabbed_mob] into [src].", 3) - if(!do_after(user, 10, IGNORE_HELD_ITEM, M, BUSY_ICON_GENERIC) || QDELETED(src)) + if(!do_after(user, 10, IGNORE_HELD_ITEM, grabbed_mob, BUSY_ICON_GENERIC) || QDELETED(src)) return if(occupant) to_chat(user, span_notice("[src] is already occupied!")) return - if(!M || !G) + if(!grabbed_mob || !grab) return - M.forceMove(src) - occupant = M + grabbed_mob.forceMove(src) + occupant = grabbed_mob update_icon() var/implants = list(/obj/item/implant/neurostim) var/mob/living/carbon/human/H = occupant @@ -941,6 +940,7 @@ say("Automatic mode engaged, initialising procedures.") addtimer(CALLBACK(src, PROC_REF(auto_start)), 5 SECONDS) + return TRUE ///////////////////////////////////////////////////////////// diff --git a/code/game/objects/machinery/bioprinter.dm b/code/game/objects/machinery/bioprinter.dm index d58009e2896a4..27bd83acc06e4 100644 --- a/code/game/objects/machinery/bioprinter.dm +++ b/code/game/objects/machinery/bioprinter.dm @@ -58,6 +58,8 @@ /obj/machinery/bioprinter/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/reagent_containers/glass/beaker)) var/obj/item/reagent_containers/glass/beaker/B = I if(B.reagents.has_reagent(/datum/reagent/medicine/biomass, 30)) @@ -83,6 +85,7 @@ . += "It has [stored_matter] matter and [stored_metal] metal left." /obj/machinery/bioprinter/update_icon_state() + . = ..() if(machine_stat & NOPOWER) icon_state = "bioprinter_off" return diff --git a/code/game/objects/machinery/buttons.dm b/code/game/objects/machinery/buttons.dm index 892b33cfe2a4d..183f3bc09e4c9 100644 --- a/code/game/objects/machinery/buttons.dm +++ b/code/game/objects/machinery/buttons.dm @@ -27,6 +27,7 @@ /obj/machinery/button/update_icon_state() + . = ..() if(machine_stat & (NOPOWER|BROKEN)) icon_state = "[initial(icon_state)]-p" else @@ -123,7 +124,7 @@ /obj/machinery/button/door/open_only/landing_zone/Initialize(mapload) . = ..() var/area/area = get_area(src) - area.flags_area |= MARINE_BASE + area.area_flags |= MARINE_BASE /obj/machinery/button/door/open_only/landing_zone/attack_hand(mob/living/user) if((machine_stat & (NOPOWER|BROKEN))) @@ -249,6 +250,7 @@ update_icon() /obj/machinery/medical_help_button/update_icon_state() + . = ..() if(machine_stat & NOPOWER) icon_state = "doorctrl-p" else @@ -283,7 +285,7 @@ ///The list of outfits we can equip on the humans we're spawning var/outfit_list = list() -/obj/machinery/button/valhalla/xeno_button/attack_alien(mob/living/carbon/xenomorph/X, damage_amount, damage_type, damage_flag, effects, armor_penetration, isrightclick) +/obj/machinery/button/valhalla/xeno_button/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) var/list/job_outfits = list() for(var/type in subtypesof(/datum/outfit/job)) if(istype(type, /datum/outfit)) @@ -301,7 +303,7 @@ QDEL_NULL(linked) if(!get_turf(GLOB.valhalla_button_spawn_landmark[link])) - to_chat(X, span_warning("An error occured, yell at the coders.")) + to_chat(xeno_attacker, span_warning("An error occured, yell at the coders.")) CRASH("Valhalla button linked with an improper landmark: button ID: [link].") linked = new /mob/living/carbon/human(get_turf(GLOB.valhalla_button_spawn_landmark[link])) if(selected_outfit == "Naked" || !selected_outfit) diff --git a/code/game/objects/machinery/camera/camera.dm b/code/game/objects/machinery/camera/camera.dm index 1d8cd4c61ea98..44133deb5e1d7 100644 --- a/code/game/objects/machinery/camera/camera.dm +++ b/code/game/objects/machinery/camera/camera.dm @@ -93,6 +93,8 @@ /obj/machinery/camera/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/paper) && isliving(user)) var/mob/living/U = user @@ -164,16 +166,16 @@ return TRUE -/obj/machinery/camera/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) - if(X.status_flags & INCORPOREAL) +/obj/machinery/camera/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) + if(xeno_attacker.status_flags & INCORPOREAL) return FALSE if(obj_integrity <= 0) - to_chat(X, span_warning("The camera is already disabled.")) + to_chat(xeno_attacker, span_warning("The camera is already disabled.")) return - X.do_attack_animation(src, ATTACK_EFFECT_CLAW) - X.visible_message(span_danger("[X] slashes \the [src]!"), \ + xeno_attacker.do_attack_animation(src, ATTACK_EFFECT_CLAW) + xeno_attacker.visible_message(span_danger("[xeno_attacker] slashes \the [src]!"), \ span_danger("We slash \the [src]!")) playsound(loc, "alien_claw_metal", 25, 1) @@ -218,6 +220,7 @@ to_chat(AI, span_notice("[src] has been deactivated at [myarea]")) /obj/machinery/camera/update_icon_state() + . = ..() if(obj_integrity <= 0) icon_state = "camera_assembly" else @@ -402,10 +405,6 @@ /obj/machinery/camera/autoname/lz_camera/ex_act() return - -/obj/machinery/camera/autoname/lz_camera/update_icon() - return - //Thunderdome cameras /obj/machinery/camera/autoname/thunderdome name = "thunderdome camera" @@ -415,5 +414,6 @@ //Special invisible cameras, to get even better angles without looking ugly /obj/machinery/camera/autoname/thunderdome/hidden -/obj/machinery/camera/autoname/thunderdome/hidden/update_icon() +/obj/machinery/camera/autoname/thunderdome/hidden/update_icon_state() + . = ..() icon_state = "nothing" diff --git a/code/game/objects/machinery/camera/camera_assembly.dm b/code/game/objects/machinery/camera/camera_assembly.dm index d1a4e5005cf07..adb5fa8d7c988 100644 --- a/code/game/objects/machinery/camera/camera_assembly.dm +++ b/code/game/objects/machinery/camera/camera_assembly.dm @@ -81,6 +81,8 @@ /obj/structure/camera_assembly/attackby(obj/item/I, mob/living/user, params) . = ..() + if(.) + return switch(state) if(STATE_WRENCHED) @@ -173,7 +175,7 @@ /obj/structure/camera_assembly/deconstruct(disassembled = TRUE) - if(!(flags_atom & NODECONSTRUCT)) + if(!(atom_flags & NODECONSTRUCT)) new /obj/item/stack/sheet/metal(loc) return ..() diff --git a/code/game/objects/machinery/camera/deployable_camera.dm b/code/game/objects/machinery/camera/deployable_camera.dm index 35e5791b33476..58058623dff2e 100644 --- a/code/game/objects/machinery/camera/deployable_camera.dm +++ b/code/game/objects/machinery/camera/deployable_camera.dm @@ -7,7 +7,8 @@ GLOBAL_VAR_INIT(deployed_cameras, 0) icon_state = "deployable" layer = ABOVE_ALL_MOB_LAYER//it flies after all -/obj/machinery/camera/deployable/update_icon() +/obj/machinery/camera/deployable/update_icon_state() + . = ..() if(obj_integrity <= 0) icon_state = "deployableoff" else diff --git a/code/game/objects/machinery/cell_charger.dm b/code/game/objects/machinery/cell_charger.dm index 04bd92eb0c891..d7149a4024b3e 100644 --- a/code/game/objects/machinery/cell_charger.dm +++ b/code/game/objects/machinery/cell_charger.dm @@ -37,6 +37,8 @@ /obj/machinery/cell_charger/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(machine_stat & BROKEN) return diff --git a/code/game/objects/machinery/cic_maptable.dm b/code/game/objects/machinery/cic_maptable.dm index dafadd77d288f..af9ccd28672e9 100644 --- a/code/game/objects/machinery/cic_maptable.dm +++ b/code/game/objects/machinery/cic_maptable.dm @@ -145,17 +145,16 @@ . = ..() if(.) return - if(user.skills.getRating(SKILL_LEADERSHIP) < SKILL_LEAD_EXPERT) - user.balloon_alert(user, "Can't use that!") - return TRUE - if(is_banned_from(user.client.ckey, GLOB.roles_allowed_minimap_draw)) - to_chat(user, span_boldwarning("You have been banned from a command role. You may not use [src] until the ban has been lifted.")) - return TRUE /obj/machinery/cic_maptable/drawable/interact(mob/user) . = ..() if(.) return + if(user.skills.getRating(SKILL_LEADERSHIP) < SKILL_LEAD_EXPERT) + return + if(is_banned_from(user.client.ckey, GLOB.roles_allowed_minimap_draw)) + to_chat(user, span_boldwarning("You have been banned from a command role. You may not use access draw functions until the ban has been lifted.")) + return user.client.screen += drawing_tools /obj/machinery/cic_maptable/drawable/on_unset_interaction(mob/user) @@ -179,7 +178,15 @@ pixel_x = -16 pixel_y = -14 coverage = 75 - allow_pass_flags = PASS_LOW_STRUCTURE|PASSABLE + allow_pass_flags = PASS_LOW_STRUCTURE|PASSABLE|PASS_WALKOVER + bound_width = 64 + +/obj/machinery/cic_maptable/drawable/big/Initialize(mapload) + . = ..() + var/static/list/connections = list( + COMSIG_OBJ_TRY_ALLOW_THROUGH = PROC_REF(can_climb_over), + ) + AddElement(/datum/element/connect_loc, connections) /obj/machinery/cic_maptable/drawable/big/som minimap_flag = MINIMAP_FLAG_MARINE_SOM diff --git a/code/game/objects/machinery/cloning/cloning.dm b/code/game/objects/machinery/cloning/cloning.dm index 52d2f5c33563d..6aebe9b342b10 100644 --- a/code/game/objects/machinery/cloning/cloning.dm +++ b/code/game/objects/machinery/cloning/cloning.dm @@ -207,6 +207,7 @@ These act as a respawn mechanic growning a body and offering it up to ghosts. set_light(0) /obj/machinery/cloning/vats/update_icon_state() + . = ..() if(!beaker) icon_state = "cell_0" return diff --git a/code/game/objects/machinery/computer/HolodeckControl.dm b/code/game/objects/machinery/computer/HolodeckControl.dm index 0e1cc11d0e497..0c1b155dbf38a 100644 --- a/code/game/objects/machinery/computer/HolodeckControl.dm +++ b/code/game/objects/machinery/computer/HolodeckControl.dm @@ -15,23 +15,8 @@ /obj/structure/table/holotable/attackby(obj/item/I, mob/user, params) if(iswrench(I)) to_chat(user, "It's a holotable! There are no bolts!") - - else if(istype(I, /obj/item/grab) && get_dist(src, user) <= 1) - var/obj/item/grab/G = I - if(!isliving(G.grabbed_thing)) - return - - var/mob/living/L = G.grabbed_thing - if(user.grab_state < GRAB_AGGRESSIVE) - to_chat(user, span_warning("You need a better grip to do that!")) - return - - L.forceMove(loc) - L.Paralyze(10 SECONDS) - user.visible_message(span_danger("[user] puts [L] on the table.")) - - else - return ..() + return + return ..() /obj/structure/table/holotable/wood name = "table" @@ -49,7 +34,7 @@ density = TRUE layer = WINDOW_LAYER anchored = TRUE - flags_atom = ON_BORDER + atom_flags = ON_BORDER @@ -63,60 +48,7 @@ desc = "Here's your chance, do your dance at the Space Jam." w_class = WEIGHT_CLASS_BULKY //Stops people from hiding it in their bags/pockets -/obj/item/toy/beach_ball/holoball/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) +/obj/item/toy/beach_ball/holoball/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) if(!CONFIG_GET(flag/fun_allowed)) return FALSE - attack_hand(X) - -/obj/structure/holohoop - name = "basketball hoop" - desc = "Boom, Shakalaka!" - icon = 'icons/obj/structures/misc.dmi' - icon_state = "hoop" - anchored = TRUE - density = TRUE - var/side = "" - var/id = "" - -/obj/structure/holohoop/attackby(obj/item/I, mob/user, params) - . = ..() - - if(istype(I, /obj/item/grab) && get_dist(src, user) <= 1) - var/obj/item/grab/G = I - if(!isliving(G.grabbed_thing)) - return - - var/mob/living/L = G.grabbed_thing - if(user.grab_state < GRAB_AGGRESSIVE) - to_chat(user, span_warning("You need a better grip to do that!")) - return - L.forceMove(loc) - L.Paralyze(10 SECONDS) - for(var/obj/machinery/scoreboard/X in GLOB.machines) - if(X.id == id) - X.score(side, 3)// 3 points for dunking a mob - // no break, to update multiple scoreboards - visible_message(span_danger("[user] dunks [L] into the [src]!")) - - else if(get_dist(src, user) < 2) - user.transferItemToLoc(I, loc) - for(var/obj/machinery/scoreboard/X in GLOB.machines) - if(X.id == id) - X.score(side) - visible_message(span_notice("[user] dunks [I] into the [src]!")) - -/obj/structure/holohoop/CanAllowThrough(atom/movable/mover, turf/target) - if(istype(mover,/obj/item) && mover.throwing) - var/obj/item/I = mover - if(prob(50)) - I.loc = src.loc - for(var/obj/machinery/scoreboard/X in GLOB.machines) - if(X.id == id) - X.score(side) - // no break, to update multiple scoreboards - visible_message(span_notice(" Swish! \the [I] lands in \the [src]."), 3) - else - visible_message(span_warning(" \the [I] bounces off of \the [src]'s rim!"), 3) - return FALSE - else - return ..() + attack_hand(xeno_attacker) diff --git a/code/game/objects/machinery/computer/Operating.dm b/code/game/objects/machinery/computer/Operating.dm index 1b448c2727959..00b0cc34210af 100644 --- a/code/game/objects/machinery/computer/Operating.dm +++ b/code/game/objects/machinery/computer/Operating.dm @@ -30,7 +30,7 @@
Name: [src.victim.real_name]
Age: [src.victim.age]
-Blood Type: [src.victim.b_type]
+Blood Type: [src.victim.blood_type]
Health: [src.victim.health]
Brute Damage: [src.victim.getBruteLoss()]
diff --git a/code/game/objects/machinery/computer/buildandrepair.dm b/code/game/objects/machinery/computer/buildandrepair.dm index f1f77d2fb4e78..857acbbbdf916 100644 --- a/code/game/objects/machinery/computer/buildandrepair.dm +++ b/code/game/objects/machinery/computer/buildandrepair.dm @@ -26,7 +26,7 @@ return playsound(loc, 'sound/items/welder.ogg', 25, 1) - if(!do_after(user, 20, NONE, src, BUSY_ICON_BUILD, extra_checks = CALLBACK(WT, /obj/item/tool/weldingtool/proc/isOn))) + if(!do_after(user, 20, NONE, src, BUSY_ICON_BUILD, extra_checks = CALLBACK(WT, TYPE_PROC_REF(/obj/item/tool/weldingtool, isOn)))) return FALSE to_chat(user, span_notice("You deconstruct the frame.")) diff --git a/code/game/objects/machinery/computer/camera_advanced.dm b/code/game/objects/machinery/computer/camera_advanced.dm index 8099fb2f152b1..61abeeb0a785c 100644 --- a/code/game/objects/machinery/computer/camera_advanced.dm +++ b/code/game/objects/machinery/computer/camera_advanced.dm @@ -242,7 +242,6 @@ var/visible_icon = 0 var/image/user_image = null - /mob/camera/aiEye/remote/update_remote_sight(mob/living/user) user.see_invisible = SEE_INVISIBLE_LIVING user.sight = SEE_SELF|SEE_MOBS|SEE_OBJS|SEE_TURFS|SEE_BLACKNESS diff --git a/code/game/objects/machinery/computer/camera_console.dm b/code/game/objects/machinery/computer/camera_console.dm index a86c34b9a2ad3..b717b0c6e2765 100644 --- a/code/game/objects/machinery/computer/camera_console.dm +++ b/code/game/objects/machinery/computer/camera_console.dm @@ -169,6 +169,7 @@ /obj/machinery/computer/security/telescreen/update_icon_state() + . = ..() icon_state = initial(icon_state) if(machine_stat & (BROKEN|DISABLED)) icon_state += "b" diff --git a/code/game/objects/machinery/computer/communications.dm b/code/game/objects/machinery/computer/communications.dm index fdc1537a07a14..c797fe1cc4e12 100644 --- a/code/game/objects/machinery/computer/communications.dm +++ b/code/game/objects/machinery/computer/communications.dm @@ -118,7 +118,7 @@ to_chat(usr, span_warning("That announcement contained charachters prohibited in IC chat! Consider reviewing the server rules.")) return FALSE - priority_announce(input, type = ANNOUNCEMENT_COMMAND) + priority_announce(input, subtitle = "Sent by [usr]", type = ANNOUNCEMENT_COMMAND) message_admins("[ADMIN_TPMONTY(usr)] has just sent a command announcement") log_game("[key_name(usr)] has just sent a command announcement.") cooldown_message = world.time @@ -149,11 +149,11 @@ to_chat(usr, span_warning("The ship must be under red alert in order to enact evacuation procedures.")) return FALSE - if(SSevacuation.flags_scuttle & FLAGS_SDEVAC_TIMELOCK) + if(SSevacuation.scuttle_flags & FLAGS_SDEVAC_TIMELOCK) to_chat(usr, span_warning("The sensors do not detect a sufficient threat present.")) return FALSE - if(SSevacuation.flags_scuttle & FLAGS_EVACUATION_DENY) + if(SSevacuation.scuttle_flags & FLAGS_EVACUATION_DENY) to_chat(usr, span_warning("The TGMC has placed a lock on deploying the evacuation pods.")) return FALSE @@ -172,7 +172,7 @@ state = STATE_EVACUATION - if("evacuation_cancel") + if("delta_cancel") if(state == STATE_EVACUATION_CANCEL) if(!SSevacuation.cancel_evacuation()) to_chat(usr, span_warning("You are unable to cancel the evacuation right now!")) @@ -356,7 +356,7 @@ dat += "
\[ Send Distress Beacon \]" switch(SSevacuation.evac_status) if(EVACUATION_STATUS_STANDING_BY) dat += "
\[ Initiate emergency evacuation \]" - if(EVACUATION_STATUS_INITIATING) dat += "
\[ Cancel emergency evacuation \]" + if(EVACUATION_STATUS_INITIATING) dat += "
\[ Cancel Delta Alert \]" else dat += "
\[ LOG IN \]" @@ -365,7 +365,7 @@ dat += "Are you sure you want to evacuate the [SSmapping.configs[SHIP_MAP].map_name]? \[ Confirm\]" if(STATE_EVACUATION_CANCEL) - dat += "Are you sure you want to cancel the evacuation of the [SSmapping.configs[SHIP_MAP].map_name]? \[ Confirm\]" + dat += "Are you sure you want to cancel Delta Alert and prevent the evacuation and/or self destruction of the [SSmapping.configs[SHIP_MAP].map_name]? \[ Confirm\]" if(STATE_DISTRESS) if(CONFIG_GET(flag/infestation_ert_allowed)) diff --git a/code/game/objects/machinery/computer/computer.dm b/code/game/objects/machinery/computer/computer.dm index 85e1b1db479cb..286c5a5279843 100644 --- a/code/game/objects/machinery/computer/computer.dm +++ b/code/game/objects/machinery/computer/computer.dm @@ -103,6 +103,7 @@ set_light(initial(light_range)) /obj/machinery/computer/update_icon_state() + . = ..() if(machine_stat & (BROKEN|DISABLED)) icon_state = "[initial(icon_state)]_broken" else @@ -140,10 +141,10 @@ if(!welder.tool_use_check(user, 2)) return FALSE - if(user.skills.getRating(SKILL_ENGINEER) < SKILL_ENGINEER_MASTER) + if(user.skills.getRating(SKILL_ENGINEER) < SKILL_ENGINEER_EXPERT) user.visible_message(span_notice("[user] fumbles around figuring out how to deconstruct [src]."), span_notice("You fumble around figuring out how to deconstruct [src].")) - var/fumbling_time = 5 SECONDS * (SKILL_ENGINEER_MASTER - user.skills.getRating(SKILL_ENGINEER)) + var/fumbling_time = 5 SECONDS * (SKILL_ENGINEER_EXPERT - user.skills.getRating(SKILL_ENGINEER)) if(!do_after(user, fumbling_time, NONE, src, BUSY_ICON_UNSKILLED)) return @@ -167,12 +168,14 @@ /obj/machinery/computer/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(isscrewdriver(I) && circuit) - if(user.skills.getRating(SKILL_ENGINEER) < SKILL_ENGINEER_MASTER) + if(user.skills.getRating(SKILL_ENGINEER) < SKILL_ENGINEER_EXPERT) user.visible_message(span_notice("[user] fumbles around figuring out how to deconstruct [src]."), span_notice("You fumble around figuring out how to deconstruct [src].")) - var/fumbling_time = 50 * ( SKILL_ENGINEER_MASTER - user.skills.getRating(SKILL_ENGINEER) ) + var/fumbling_time = 50 * ( SKILL_ENGINEER_EXPERT - user.skills.getRating(SKILL_ENGINEER) ) if(!do_after(user, fumbling_time, NONE, src, BUSY_ICON_UNSKILLED)) return @@ -217,25 +220,25 @@ pick(playsound(src, 'sound/machines/computer_typing1.ogg', 5, 1), playsound(src, 'sound/machines/computer_typing2.ogg', 5, 1), playsound(src, 'sound/machines/computer_typing3.ogg', 5, 1)) ///So Xenos can smash computers out of the way without actually breaking them -/obj/machinery/computer/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) - if(X.status_flags & INCORPOREAL) +/obj/machinery/computer/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) + if(xeno_attacker.status_flags & INCORPOREAL) return FALSE if(resistance_flags & INDESTRUCTIBLE) - to_chat(X, span_xenowarning("We're unable to damage this!")) + to_chat(xeno_attacker, span_xenowarning("We're unable to damage this!")) return if(machine_stat & (BROKEN|DISABLED)) //If we're already broken or disabled, don't bother - to_chat(X, span_xenowarning("This peculiar thing is already broken!")) + to_chat(xeno_attacker, span_xenowarning("This peculiar thing is already broken!")) return if(durability <= 0) set_disabled() - to_chat(X, span_xenowarning("We smash the annoying device, disabling it!")) + to_chat(xeno_attacker, span_xenowarning("We smash the annoying device, disabling it!")) else durability-- - to_chat(X, span_xenowarning("We smash the annoying device!")) + to_chat(xeno_attacker, span_xenowarning("We smash the annoying device!")) - X.do_attack_animation(src, ATTACK_EFFECT_DISARM2) //SFX - playsound(loc, pick('sound/effects/bang.ogg','sound/effects/metal_crash.ogg','sound/effects/meteorimpact.ogg'), 25, 1) //SFX + xeno_attacker.do_attack_animation(src, ATTACK_EFFECT_DISARM2) //SFxeno_attacker + playsound(loc, pick('sound/effects/bang.ogg','sound/effects/metal_crash.ogg','sound/effects/meteorimpact.ogg'), 25, 1) //SFxeno_attacker Shake(duration = 0.5 SECONDS) diff --git a/code/game/objects/machinery/computer/dropship_weapons.dm b/code/game/objects/machinery/computer/dropship_weapons.dm index 8a67d9eecac0a..463df4e343ac8 100644 --- a/code/game/objects/machinery/computer/dropship_weapons.dm +++ b/code/game/objects/machinery/computer/dropship_weapons.dm @@ -7,6 +7,7 @@ icon_state = "consoleright" screen_overlay = "consoleright_emissive" circuit = null + opacity = FALSE resistance_flags = RESIST_ALL interaction_flags = INTERACT_MACHINE_TGUI var/shuttle_tag // Used to know which shuttle we're linked to. diff --git a/code/game/objects/machinery/computer/intel_computer.dm b/code/game/objects/machinery/computer/intel_computer.dm index 99effa1e947a2..38dbdde62acc5 100644 --- a/code/game/objects/machinery/computer/intel_computer.dm +++ b/code/game/objects/machinery/computer/intel_computer.dm @@ -53,7 +53,7 @@ printing_complete = TRUE SSpoints.supply_points[faction] += supply_reward SSpoints.dropship_points += dropship_reward - priority_announce("Classified transmission recieved from [get_area(src)]. Bonus delivered as [supply_reward] supply points and [dropship_reward] dropship points.", title = "TGMC Intel Division") + minor_announce("Classified transmission recieved from [get_area(src)]. Bonus delivered as [supply_reward] supply points and [dropship_reward] dropship points.", title = "TGMC Intel Division") SSminimaps.remove_marker(src) /obj/machinery/computer/intel_computer/Destroy() diff --git a/code/game/objects/machinery/computer/marines_consoles.dm b/code/game/objects/machinery/computer/marines_consoles.dm index a8dced845cecd..61840a74f8f78 100644 --- a/code/game/objects/machinery/computer/marines_consoles.dm +++ b/code/game/objects/machinery/computer/marines_consoles.dm @@ -15,6 +15,8 @@ /obj/machinery/computer/marine_card/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/card/id)) var/obj/item/card/id/idcard = I @@ -352,6 +354,8 @@ /obj/machinery/computer/squad_changer/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/card/id)) var/obj/item/card/id/idcard = I diff --git a/code/game/objects/machinery/computer/medical.dm b/code/game/objects/machinery/computer/medical.dm index 78e6f3fa59f85..397558576d355 100644 --- a/code/game/objects/machinery/computer/medical.dm +++ b/code/game/objects/machinery/computer/medical.dm @@ -35,6 +35,8 @@ /obj/machinery/computer/med_data/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/card/id) && !scan) if(!user.drop_held_item()) diff --git a/code/game/objects/machinery/computer/nt_access.dm b/code/game/objects/machinery/computer/nt_access.dm index 5e7724d4ff679..028e05a0f174f 100644 --- a/code/game/objects/machinery/computer/nt_access.dm +++ b/code/game/objects/machinery/computer/nt_access.dm @@ -1,4 +1,5 @@ // -- generate override code computer +//TODO: Make a parent computer to remove all the nuke disk copy paste /obj/item/circuitboard/computer/nt_access name = "circuit board (nuke disk generator)" build_path = /obj/machinery/computer/nt_access @@ -15,11 +16,9 @@ resistance_flags = INDESTRUCTIBLE|UNACIDABLE layer = ABOVE_MOB_LAYER ///Time needed for the machine to generate the disc - var/segment_time = 1.5 MINUTES + var/segment_time = 1 MINUTES ///Time to start a segment - var/start_time = 15 SECONDS - ///Time to print a disk - var/printing_time = 15 SECONDS + var/start_time = 5 SECONDS ///Total number of times the hack is required var/total_segments = 5 ///What segment we are on, (once this hits total, disk is printed) @@ -71,7 +70,7 @@ visible_message("[src] shuts down as it loses power. Any running programs will now exit") /obj/machinery/computer/nt_access/update_icon_state() - icon_state = initial(icon_state) + return /obj/machinery/computer/nt_access/attackby(obj/item/I, mob/living/user, params) return attack_hand(user) @@ -128,13 +127,14 @@ busy = TRUE usr.visible_message("[usr] started a program to send the [code_color] security override command.", "You started a program to send the [code_color] security override command.") - if(!do_after(usr, printing_time, NONE, src, BUSY_ICON_GENERIC, null, null, CALLBACK(src, TYPE_PROC_REF(/datum, process)))) + if(!do_after(usr, start_time, NONE, src, BUSY_ICON_GENERIC, null, null, CALLBACK(src, TYPE_PROC_REF(/datum, process)))) busy = FALSE return visible_message(span_notice("[src] beeps as it finishes sending the security override command.")) SEND_GLOBAL_SIGNAL(COMSIG_GLOB_CAMPAIGN_NT_OVERRIDE_CODE, code_color) busy = FALSE + set_disabled() //stops spamming the signal return busy = TRUE @@ -145,7 +145,7 @@ return busy = FALSE - + SEND_GLOBAL_SIGNAL(COMSIG_GLOB_CAMPAIGN_NT_OVERRIDE_RUNNING, src) current_timer = addtimer(CALLBACK(src, PROC_REF(complete_segment)), segment_time, TIMER_STOPPABLE) update_minimap_icon() running = TRUE @@ -155,6 +155,7 @@ ///Completes a stage of program progress /obj/machinery/computer/nt_access/proc/complete_segment() + SEND_GLOBAL_SIGNAL(COMSIG_GLOB_CAMPAIGN_NT_OVERRIDE_STOP_RUNNING, src) playsound(src, 'sound/machines/ping.ogg', 25, 1) deltimer(current_timer) current_timer = null diff --git a/code/game/objects/machinery/computer/nuke_disk_generator.dm b/code/game/objects/machinery/computer/nuke_disk_generator.dm index 7d8c9561be29e..6fe47e59f1bdd 100644 --- a/code/game/objects/machinery/computer/nuke_disk_generator.dm +++ b/code/game/objects/machinery/computer/nuke_disk_generator.dm @@ -185,7 +185,7 @@ ///Change minimap icon if its on or off /obj/machinery/computer/nuke_disk_generator/proc/update_minimap_icon() SSminimaps.remove_marker(src) - SSminimaps.add_marker(src, MINIMAP_FLAG_ALL, image('modular_RUtgmc/icons/UI_icons/map_blips_large.dmi', null, "[disk_color]_disk[current_timer ? "_on" : "_off"]", VERY_HIGH_FLOAT_LAYER)) + SSminimaps.add_marker(src, MINIMAP_FLAG_ALL, image('modular_RUtgmc/icons/UI_icons/map_blips_large.dmi', null, "[disk_color]_disk[current_timer ? "_on" : "_off"]", VERY_HIGH_FLOAT_LAYER)) //RUTGMC EDIT /obj/machinery/computer/nuke_disk_generator/red name = "red nuke disk generator" diff --git a/code/game/objects/machinery/computer/security.dm b/code/game/objects/machinery/computer/security.dm index 23c3764766787..f26895f72f50f 100644 --- a/code/game/objects/machinery/computer/security.dm +++ b/code/game/objects/machinery/computer/security.dm @@ -41,6 +41,8 @@ /obj/machinery/computer/secure_data/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/card/id) && !scan) if(!user.drop_held_item()) diff --git a/code/game/objects/machinery/computer/skills.dm b/code/game/objects/machinery/computer/skills.dm index 54cc570ee14c2..3e22e802f9d60 100644 --- a/code/game/objects/machinery/computer/skills.dm +++ b/code/game/objects/machinery/computer/skills.dm @@ -23,6 +23,8 @@ /obj/machinery/computer/skills/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/card/id) && !scan) if(!user.drop_held_item()) diff --git a/code/game/objects/machinery/computer/som_computer.dm b/code/game/objects/machinery/computer/som_computer.dm index c1c60943a836f..2dcd787e872f6 100644 --- a/code/game/objects/machinery/computer/som_computer.dm +++ b/code/game/objects/machinery/computer/som_computer.dm @@ -13,6 +13,7 @@ pixel_y = 10 /obj/machinery/computer/som/update_icon_state() + . = ..() if(machine_stat & (BROKEN|DISABLED)) icon_state = "[initial(icon_state)]_broken" else if(machine_stat & NOPOWER) diff --git a/code/game/objects/machinery/constructable_frame.dm b/code/game/objects/machinery/constructable_frame.dm index 22ef9574cdda1..2a6969c75a236 100644 --- a/code/game/objects/machinery/constructable_frame.dm +++ b/code/game/objects/machinery/constructable_frame.dm @@ -10,7 +10,8 @@ var/state = 1 -/obj/machinery/constructable_frame/proc/update_desc() +/obj/machinery/constructable_frame/update_desc(updates) + . = ..() var/D if(req_components) D = "Requires " @@ -32,10 +33,6 @@ /obj/machinery/constructable_frame/machine_frame/attackby(obj/item/I, mob/living/user, params) - if(I.crit_fail) - to_chat(user, span_warning("This part is faulty, you cannot add this to the machine!")) - return - switch(state) if(1) if(iscablecoil(I)) diff --git a/code/game/objects/machinery/cryopod.dm b/code/game/objects/machinery/cryopod.dm index ad6153f93d3e8..8345ffa69f90b 100644 --- a/code/game/objects/machinery/cryopod.dm +++ b/code/game/objects/machinery/cryopod.dm @@ -1,3 +1,12 @@ +#define STATE_GUN 0 +#define STATE_AMMO 1 +#define STATE_EXPLOSIVE 2 +#define STATE_MELEE 4 +#define STATE_CLOTHING 5 +#define STATE_FOOD 6 +#define STATE_DRUGS 7 +#define STATE_CONTAINERS 8 +#define STATE_OTHER 9 /obj/machinery/computer/cryopod name = "hypersleep bay console" @@ -7,6 +16,7 @@ screen_overlay = "cellconsole_screen" circuit = /obj/item/circuitboard/computer/cryopodcontrol resistance_flags = RESIST_ALL + var/state = STATE_GUN /obj/machinery/computer/cryopod/interact(mob/user) . = ..() @@ -22,11 +32,81 @@ dat +="
" - for(var/obj/item/I AS in GLOB.cryoed_item_list) - if(QDELETED(I)) - GLOB.cryoed_item_list -= I - continue - dat += "" + dat += "Guns
" + dat += "Ammo
" + dat += "Explosives
" + dat += "Melee
" + dat += "Clothing
" + dat += "Food
" + dat += "Drugs
" + dat += "Containers
" + dat += "Other
" + dat += "
" + + switch(state) + if(STATE_GUN) + dat += "
" + for(var/obj/item/I in GLOB.cryoed_item_list_gun) + if(QDELETED(I)) + GLOB.cryoed_item_list_gun -= I + continue + dat += "" + if(STATE_AMMO) + dat += "
" + for(var/obj/item/I in GLOB.cryoed_item_list_ammo) + if(QDELETED(I)) + GLOB.cryoed_item_list_ammo -= I + continue + dat += "" + if(STATE_EXPLOSIVE) + dat += "
" + for(var/obj/item/I in GLOB.cryoed_item_list_explosive) + if(QDELETED(I)) + GLOB.cryoed_item_list_explosive -= I + continue + dat += "" + if(STATE_MELEE) + dat += "
" + for(var/obj/item/I in GLOB.cryoed_item_list_melee) + if(QDELETED(I)) + GLOB.cryoed_item_list_melee -= I + continue + dat += "" + if(STATE_CLOTHING) + dat += "
" + for(var/obj/item/I in GLOB.cryoed_item_list_clothing) + if(QDELETED(I)) + GLOB.cryoed_item_list_clothing -= I + continue + dat += "" + if(STATE_FOOD) + dat += "
" + for(var/obj/item/I in GLOB.cryoed_item_list_food) + if(QDELETED(I)) + GLOB.cryoed_item_list_food -= I + continue + dat += "" + if(STATE_DRUGS) + dat += "
" + for(var/obj/item/I in GLOB.cryoed_item_list_drugs) + if(QDELETED(I)) + GLOB.cryoed_item_list_drugs -= I + continue + dat += "" + if(STATE_CONTAINERS) + dat += "
" + for(var/obj/item/I in GLOB.cryoed_item_list_containers) + if(QDELETED(I)) + GLOB.cryoed_item_list_containers -= I + continue + dat += "" + if(STATE_OTHER) + dat += "
" + for(var/obj/item/I in GLOB.cryoed_item_list_other) + if(QDELETED(I)) + GLOB.cryoed_item_list_other -= I + continue + dat += "" dat += "
" var/datum/browser/popup = new(user, "cryopod_console", "
Cryogenics
")
@@ -39,20 +119,80 @@
if(.)
return
+ switch(href_list["operation"])
+ if("gun")
+ state = STATE_GUN
+ if("ammo")
+ state = STATE_AMMO
+ if("explosive")
+ state = STATE_EXPLOSIVE
+ if("melee")
+ state = STATE_MELEE
+ if("clothing")
+ state = STATE_CLOTHING
+ if("food")
+ state = STATE_FOOD
+ if("drug")
+ state = STATE_DRUGS
+ if("container")
+ state = STATE_CONTAINERS
+ if("other")
+ state = STATE_OTHER
+ updateUsrDialog()
+
if(href_list["item"])
- var/obj/item/I = locate(href_list["item"]) in GLOB.cryoed_item_list
+ var/obj/item/I
+ switch(state)
+ if(STATE_GUN)
+ I = locate(href_list["item"]) in GLOB.cryoed_item_list_gun
+ if(STATE_AMMO)
+ I = locate(href_list["item"]) in GLOB.cryoed_item_list_ammo
+ if(STATE_EXPLOSIVE)
+ I = locate(href_list["item"]) in GLOB.cryoed_item_list_explosive
+ if(STATE_MELEE)
+ I = locate(href_list["item"]) in GLOB.cryoed_item_list_melee
+ if(STATE_CLOTHING)
+ I = locate(href_list["item"]) in GLOB.cryoed_item_list_clothing
+ if(STATE_FOOD)
+ I = locate(href_list["item"]) in GLOB.cryoed_item_list_food
+ if(STATE_DRUGS)
+ I = locate(href_list["item"]) in GLOB.cryoed_item_list_drugs
+ if(STATE_CONTAINERS)
+ I = locate(href_list["item"]) in GLOB.cryoed_item_list_containers
+ if(STATE_OTHER)
+ I = locate(href_list["item"]) in GLOB.cryoed_item_list_other
dispense_item(I, usr)
else if(href_list["allitems"])
- if(!length(GLOB.cryoed_item_list))
+ if(!length(GLOB.cryoed_item_list_gun) && !length(GLOB.cryoed_item_list_ammo) && !length(GLOB.cryoed_item_list_explosive) && !length(GLOB.cryoed_item_list_melee) && !length(GLOB.cryoed_item_list_clothing) && !length(GLOB.cryoed_item_list_food) && !length(GLOB.cryoed_item_list_drugs) && !length(GLOB.cryoed_item_list_containers) && !length(GLOB.cryoed_item_list_other))
to_chat(usr, span_warning("There is nothing to recover from storage."))
updateUsrDialog()
return
visible_message(span_notice("[src] beeps happily as it disgorges the desired objects."))
- for(var/obj/item/I AS in GLOB.cryoed_item_list)
+ var/list/combined_list
+ switch(state)
+ if(STATE_GUN)
+ combined_list = GLOB.cryoed_item_list_gun
+ if(STATE_AMMO)
+ combined_list = GLOB.cryoed_item_list_ammo
+ if(STATE_EXPLOSIVE)
+ combined_list = GLOB.cryoed_item_list_explosive
+ if(STATE_MELEE)
+ combined_list = GLOB.cryoed_item_list_melee
+ if(STATE_CLOTHING)
+ combined_list = GLOB.cryoed_item_list_clothing
+ if(STATE_FOOD)
+ combined_list = GLOB.cryoed_item_list_food
+ if(STATE_DRUGS)
+ combined_list = GLOB.cryoed_item_list_drugs
+ if(STATE_CONTAINERS)
+ combined_list = GLOB.cryoed_item_list_containers
+ if(STATE_OTHER)
+ combined_list = GLOB.cryoed_item_list_other
+ for(var/obj/item/I in combined_list)
dispense_item(I, usr, FALSE)
updateUsrDialog()
@@ -60,16 +200,35 @@
/obj/machinery/computer/cryopod/proc/dispense_item(obj/item/I, mob/user, message = TRUE)
if(!istype(I) || QDELETED(I))
- GLOB.cryoed_item_list -= I
+ GLOB.cryoed_item_list_gun -= I;
+ GLOB.cryoed_item_list_ammo -= I;
+ GLOB.cryoed_item_list_explosive -= I;
+ GLOB.cryoed_item_list_melee -= I;
+ GLOB.cryoed_item_list_clothing -= I;
+ GLOB.cryoed_item_list_food -= I;
+ GLOB.cryoed_item_list_drugs -= I;
+ GLOB.cryoed_item_list_containers -= I;
+ GLOB.cryoed_item_list_other -= I;
CRASH("Deleted or erroneous variable ([I]) called for hypersleep inventory retrivial.")
- if(!(I in GLOB.cryoed_item_list))
+ if((!I) in (GLOB.cryoed_item_list_gun || GLOB.cryoed_item_list_ammo || GLOB.cryoed_item_list_explosive || GLOB.cryoed_item_list_melee || GLOB.cryoed_item_list_clothing || GLOB.cryoed_item_list_food || GLOB.cryoed_item_list_drugs || GLOB.cryoed_item_list_containers || GLOB.cryoed_item_list_other))
if(message)
to_chat(user, span_warning("[I] is no longer in storage."))
return
if(message)
visible_message(span_notice("[src] beeps happily as it disgorges [I]."))
I.forceMove(get_turf(src))
- GLOB.cryoed_item_list -= I
+ // For when we have south and north facing sprites.
+ // I.forceMove(get_step(loc, dir))
+
+ GLOB.cryoed_item_list_gun -= I;
+ GLOB.cryoed_item_list_ammo -= I;
+ GLOB.cryoed_item_list_explosive -= I;
+ GLOB.cryoed_item_list_melee -= I;
+ GLOB.cryoed_item_list_clothing -= I;
+ GLOB.cryoed_item_list_food -= I;
+ GLOB.cryoed_item_list_drugs -= I;
+ GLOB.cryoed_item_list_containers -= I;
+ GLOB.cryoed_item_list_other -= I;
//Decorative structures to go alongside cryopods.
/obj/structure/cryofeed
@@ -129,6 +288,7 @@
set_light(initial(light_range))
/obj/machinery/cryopod/update_icon_state()
+ . = ..()
if(occupant)
icon_state = "[initial(icon_state)]_occupied"
else
@@ -190,53 +350,56 @@
return ..()
/obj/item/proc/store_in_cryo()
- if(is_type_in_typecache(src, GLOB.do_not_preserve) || HAS_TRAIT(src, TRAIT_NODROP) || (flags_item & (ITEM_ABSTRACT|DELONDROP)))
+ if(is_type_in_typecache(src, GLOB.do_not_preserve) || HAS_TRAIT(src, TRAIT_NODROP) || (item_flags & (ITEM_ABSTRACT|DELONDROP)))
if(!QDELETED(src))
qdel(src)
return
moveToNullspace()
- GLOB.cryoed_item_list += src
+ if(istype(src, /obj/item/weapon/gun))
+ GLOB.cryoed_item_list_gun += src
+ else if(istype(src, /obj/item/ammo_magazine))
+ GLOB.cryoed_item_list_ammo += src
+ else if(istype(src, /obj/item/explosive))
+ GLOB.cryoed_item_list_explosive += src
+ else if(istype(src, /obj/item/weapon))
+ GLOB.cryoed_item_list_melee += src
+ else if(istype(src, /obj/item/clothing))
+ GLOB.cryoed_item_list_clothing += src
+ else if(isfood(src))
+ GLOB.cryoed_item_list_food += src
+ else if(istype(src, /obj/item/reagent_containers/hypospray) || istype(src, /obj/item/reagent_containers/syringe) || istype(src, /obj/item/reagent_containers/pill))
+ GLOB.cryoed_item_list_drugs += src
+ else if(istype(src, /obj/item/storage))
+ GLOB.cryoed_item_list_containers += src
+ else
+ GLOB.cryoed_item_list_other += src
/obj/item/storage/store_in_cryo()
for(var/obj/item/I AS in src)
I.store_in_cryo()
return ..()
-/obj/machinery/cryopod/attackby(obj/item/I, mob/user, params)
+/obj/machinery/cryopod/grab_interact(obj/item/grab/grab, mob/user, base_damage = BASE_OBJ_SLAM_DAMAGE, is_sharp = FALSE)
. = ..()
-
- if(!istype(I, /obj/item/grab))
- return
-
- else if(isxeno(user))
- return
-
- var/obj/item/grab/G = I
- if(!isliving(G.grabbed_thing))
+ if(.)
return
-
- if(!QDELETED(occupant))
- to_chat(user, span_warning("[src] is occupied."))
+ if(isxeno(user))
return
-
- var/mob/living/M = G.grabbed_thing
-
- if(M.stat == DEAD) //This mob is dead
- to_chat(user, span_warning("[src] immediately rejects [M]. [M.p_they(TRUE)] passed away!"))
+ var/mob/living/carbon/human/grabbed_mob = grab.grabbed_thing
+ if(!ishuman(grabbed_mob))
+ to_chat(user, span_warning("There is no way [src] will accept [grabbed_mob]!"))
return
- if(!ishuman(M))
- to_chat(user, span_warning("There is no way [src] will accept [M]!"))
- return
-
- if(M.client)
- if(tgui_alert(M, "Would you like to enter cryosleep?", null, list("Yes", "No")) == "Yes")
- if(QDELETED(M) || !(G?.grabbed_thing == M))
+ if(grabbed_mob.client)
+ if(tgui_alert(grabbed_mob, "Would you like to enter cryosleep?", null, list("Yes", "No")) == "Yes")
+ if(QDELETED(grabbed_mob) || !(grab?.grabbed_thing == grabbed_mob))
return
else
return
- climb_in(M, user)
+ climb_in(grabbed_mob, user)
+
+ return TRUE
/obj/machinery/cryopod/verb/eject()
set name = "Eject Pod"
@@ -313,15 +476,25 @@
occupant = null
update_icon()
-/obj/machinery/cryopod/attack_alien(mob/living/carbon/xenomorph/X, damage_amount, damage_type, damage_flag, effects, armor_penetration, isrightclick)
+/obj/machinery/cryopod/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE)
if(!occupant)
- to_chat(X, span_xenowarning("There is nothing of interest in there."))
+ to_chat(xeno_attacker, span_xenowarning("There is nothing of interest in there."))
return
- if(X.status_flags & INCORPOREAL || X.do_actions)
+ if(xeno_attacker.status_flags & INCORPOREAL || xeno_attacker.do_actions)
return
- visible_message(span_warning("[X] begins to pry the [src]'s cover!"), 3)
+ visible_message(span_warning("[xeno_attacker] begins to pry the [src]'s cover!"), 3)
playsound(src,'sound/effects/metal_creaking.ogg', 25, 1)
- if(!do_after(X, 2 SECONDS))
+ if(!do_after(xeno_attacker, 2 SECONDS))
return
playsound(loc, 'sound/effects/metal_creaking.ogg', 25, 1)
go_out()
+
+#undef STATE_GUN
+#undef STATE_AMMO
+#undef STATE_EXPLOSIVE
+#undef STATE_MELEE
+#undef STATE_CLOTHING
+#undef STATE_FOOD
+#undef STATE_DRUGS
+#undef STATE_CONTAINERS
+#undef STATE_OTHER
diff --git a/code/game/objects/machinery/deployable.dm b/code/game/objects/machinery/deployable.dm
index 14465a874d949..4d2b0d0708bad 100644
--- a/code/game/objects/machinery/deployable.dm
+++ b/code/game/objects/machinery/deployable.dm
@@ -1,5 +1,5 @@
/obj/machinery/deployable
- flags_atom = PREVENT_CONTENTS_EXPLOSION
+ atom_flags = PREVENT_CONTENTS_EXPLOSION
hud_possible = list(MACHINE_HEALTH_HUD)
obj_flags = CAN_BE_HIT
allow_pass_flags = PASS_AIR
@@ -58,8 +58,8 @@
var/obj/item/item = get_internal_item()
if(!item)
return
- if(CHECK_BITFIELD(item.flags_item, DEPLOYED_NO_PICKUP))
- to_chat(user, span_notice("The [src] is anchored in place and cannot be disassembled."))
+ if(CHECK_BITFIELD(item.item_flags, DEPLOYED_NO_PICKUP))
+ balloon_alert(user, "Cannot disassemble")
return
operator?.unset_interaction()
SEND_SIGNAL(src, COMSIG_ITEM_UNDEPLOY, user)
@@ -77,7 +77,7 @@
var/obj/item/_internal_item = get_internal_item()
if(!_internal_item)
return
- if(CHECK_BITFIELD(_internal_item.flags_item, DEPLOYED_WRENCH_DISASSEMBLE))
+ if(CHECK_BITFIELD(_internal_item.item_flags, DEPLOYED_WRENCH_DISASSEMBLE))
to_chat(user, span_notice("You cannot disassemble [src] without a wrench."))
return
disassemble(user)
@@ -86,7 +86,7 @@
var/obj/item/_internal_item = get_internal_item()
if(!_internal_item)
return
- if(!CHECK_BITFIELD(_internal_item.flags_item, DEPLOYED_WRENCH_DISASSEMBLE))
+ if(!CHECK_BITFIELD(_internal_item.item_flags, DEPLOYED_WRENCH_DISASSEMBLE))
return ..()
disassemble(user)
@@ -99,8 +99,8 @@
if(EXPLODE_DEVASTATE)
qdel(src)
if(EXPLODE_HEAVY)
- take_damage(200, damage_flag = BOMB, effects = TRUE)
+ take_damage(200, armor_type = BOMB, effects = TRUE)
if(EXPLODE_LIGHT)
- take_damage(100, damage_flag = BOMB, effects = TRUE)
+ take_damage(100, armor_type = BOMB, effects = TRUE)
if(EXPLODE_WEAK)
- take_damage(50, damage_flag = BOMB, effects = TRUE)
+ take_damage(50, armor_type = BOMB, effects = TRUE)
diff --git a/code/game/objects/machinery/door_control.dm b/code/game/objects/machinery/door_control.dm
index 4bff08604124c..d7e5c252a920f 100644
--- a/code/game/objects/machinery/door_control.dm
+++ b/code/game/objects/machinery/door_control.dm
@@ -128,6 +128,7 @@
update_icon()
/obj/machinery/door_control/update_icon_state()
+ . = ..()
if(machine_stat & NOPOWER)
icon_state = "doorctrl-p"
else if(pressed)
@@ -141,6 +142,8 @@
/obj/machinery/driver_button/attackby(obj/item/I, mob/user, params)
. = ..()
+ if(.)
+ return
if(istype(I, /obj/item/detective_scanner))
return
@@ -281,6 +284,7 @@
directional = FALSE
/obj/machinery/door_control/old/update_icon_state()
+ . = ..()
if(machine_stat & NOPOWER)
icon_state = "olddoorctrl-p"
else if(pressed)
diff --git a/code/game/objects/machinery/door_display/door_display.dm b/code/game/objects/machinery/door_display/door_display.dm
index 18d81891c61f8..43b7c871812e0 100644
--- a/code/game/objects/machinery/door_display/door_display.dm
+++ b/code/game/objects/machinery/door_display/door_display.dm
@@ -110,17 +110,17 @@
//icon update function
// if NOPOWER, display blank
// if BROKEN, display blue screen of death icon AI uses
-/obj/machinery/door_display/update_icon()
- cut_overlays()
- if (machine_stat & (NOPOWER))
+/obj/machinery/door_display/update_overlays()
+ . = ..()
+ if(machine_stat & (NOPOWER))
return
- if (machine_stat & (BROKEN))
- add_overlay("ai_bsod")
+ if(machine_stat & (BROKEN))
+ . += "ai_bsod"
return
if(open)
- add_overlay("open")
+ . += "open"
else
- add_overlay("closed")
+ . += "closed"
//************ RESEARCH DOORS ****************\\
// Research cells have flashers and shutters/pod doors.
diff --git a/code/game/objects/machinery/doors/airlock.dm b/code/game/objects/machinery/doors/airlock.dm
old mode 100644
new mode 100755
index a26410a7f22c8..2b8b10b3ab1dc
--- a/code/game/objects/machinery/doors/airlock.dm
+++ b/code/game/objects/machinery/doors/airlock.dm
@@ -7,7 +7,7 @@
use_power = IDLE_POWER_USE
idle_power_usage = 5
active_power_usage = 360
- flags_atom = HTML_USE_INITAL_ICON_1
+ atom_flags = HTML_USE_INITAL_ICON_1
obj_flags = CAN_BE_HIT
var/aiControlDisabled = 0 //If 1, AI control is disabled until the AI hacks back in and disables the lock. If 2, the AI has bypassed the lock. If -1, the control is enabled but the AI had bypassed it earlier, so if it is disabled again the AI would have no trouble getting back in.
@@ -63,6 +63,8 @@
/obj/machinery/door/airlock/LateInitialize()
. = ..()
+ if(cyclelinkeddir)
+ cyclelinkairlock()
if(!abandoned)
return
var/outcome = rand(1,40)
@@ -84,6 +86,28 @@
if(24 to 30)
machine_stat ^= PANEL_OPEN
+///connect potential airlocks to each other for cycling
+/obj/machinery/door/airlock/proc/cyclelinkairlock()
+ if (cycle_linked_airlock)
+ cycle_linked_airlock.cycle_linked_airlock = null
+ cycle_linked_airlock = null
+ if (!cyclelinkeddir)
+ return
+ var/limit = world.view
+ var/turf/T = get_turf(src)
+ var/obj/machinery/door/airlock/FoundDoor
+ do
+ T = get_step(T, cyclelinkeddir)
+ FoundDoor = locate() in T
+ if (FoundDoor && FoundDoor.cyclelinkeddir != get_dir(FoundDoor, src))
+ FoundDoor = null
+ limit--
+ while(!FoundDoor && limit)
+ if (!FoundDoor)
+ return
+ FoundDoor.cycle_linked_airlock = src
+ cycle_linked_airlock = FoundDoor
+
/obj/machinery/door/airlock/proc/isElectrified()
if(secondsElectrified != MACHINE_NOT_ELECTRIFIED)
return TRUE
@@ -91,6 +115,8 @@
/obj/machinery/door/airlock/proc/canAIControl(mob/user)
+ if(hackProof)
+ return
if(z != user.z)
return
return ((aiControlDisabled != 1) && !isAllPowerCut())
@@ -182,25 +208,45 @@
else
return 0
-
-/obj/machinery/door/airlock/update_icon()
- if(overlays) overlays.Cut()
+/obj/machinery/door/airlock/update_icon_state()
+ . = ..()
if(density)
- if(emergency && hasPower())
- overlays += image(icon, "emergency_access_on")
if(locked && lights)
icon_state = "door_locked"
else
icon_state = "door_closed"
- if(CHECK_BITFIELD(machine_stat, PANEL_OPEN) || welded)
- overlays = list()
- if(CHECK_BITFIELD(machine_stat, PANEL_OPEN))
- overlays += image(icon, "panel_open")
- if(welded)
- overlays += image(icon, "welded")
else
icon_state = "door_open"
+/obj/machinery/door/airlock/update_overlays()
+ . = ..()
+ if(!density)
+ return
+ if(emergency && hasPower())
+ . += image(icon, "emergency_access_on")
+ if(CHECK_BITFIELD(machine_stat, PANEL_OPEN))
+ . += image(icon, "panel_open")
+ if(welded)
+ . += image(icon, "welded")
+ if(hasPower() && unres_sides)
+ for(var/heading in list(NORTH,SOUTH,EAST,WEST))
+ if(!(unres_sides & heading))
+ continue
+ var/image/access_overlay = image('icons/obj/doors/overlays.dmi', "unres_[heading]", layer = DOOR_HELPER_LAYER, pixel_y = -4)
+ switch(heading)
+ if(NORTH)
+ access_overlay.pixel_x = 0
+ access_overlay.pixel_y = 32
+ if(SOUTH)
+ access_overlay.pixel_x = 0
+ access_overlay.pixel_y = -32
+ if(EAST)
+ access_overlay.pixel_x = 32
+ access_overlay.pixel_y = 0
+ if(WEST)
+ access_overlay.pixel_x = -32
+ access_overlay.pixel_y = 0
+ . += access_overlay
/obj/machinery/door/airlock/do_animate(animation)
switch(animation)
@@ -227,46 +273,46 @@
//Prying open doors
-/obj/machinery/door/airlock/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE)
- if(X.status_flags & INCORPOREAL)
+/obj/machinery/door/airlock/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE)
+ if(xeno_attacker.status_flags & INCORPOREAL)
return FALSE
- var/turf/cur_loc = X.loc
+ var/turf/cur_loc = xeno_attacker.loc
if(isElectrified())
- if(shock(X, 70))
+ if(shock(xeno_attacker, 70))
return
if(locked)
- to_chat(X, span_warning("\The [src] is bolted down tight."))
+ to_chat(xeno_attacker, span_warning("\The [src] is bolted down tight."))
return FALSE
if(welded)
- to_chat(X, span_warning("\The [src] is welded shut."))
+ to_chat(xeno_attacker, span_warning("\The [src] is welded shut."))
return FALSE
if(!istype(cur_loc))
return FALSE //Some basic logic here
if(!density)
- to_chat(X, span_warning("\The [src] is already open!"))
+ to_chat(xeno_attacker, span_warning("\The [src] is already open!"))
return FALSE
- if(X.do_actions)
+ if(xeno_attacker.do_actions)
return FALSE
playsound(loc, 'sound/effects/metal_creaking.ogg', 25, 1)
if(hasPower())
- X.visible_message(span_warning("\The [X] digs into \the [src] and begins to pry it open."), \
+ xeno_attacker.visible_message(span_warning("\The [xeno_attacker] digs into \the [src] and begins to pry it open."), \
span_warning("We dig into \the [src] and begin to pry it open."), null, 5)
- if(!do_after(X, 4 SECONDS, IGNORE_HELD_ITEM, src, BUSY_ICON_HOSTILE) && !X.lying_angle)
+ if(!do_after(xeno_attacker, 4 SECONDS, IGNORE_HELD_ITEM, src, BUSY_ICON_HOSTILE) && !xeno_attacker.lying_angle)
return FALSE
if(locked)
- to_chat(X, span_warning("\The [src] is bolted down tight."))
+ to_chat(xeno_attacker, span_warning("\The [src] is bolted down tight."))
return FALSE
if(welded)
- to_chat(X, span_warning("\The [src] is welded shut."))
+ to_chat(xeno_attacker, span_warning("\The [src] is welded shut."))
return FALSE
if(density) //Make sure it's still closed
open(TRUE)
- X.visible_message(span_danger("\The [X] pries \the [src] open."), \
+ xeno_attacker.visible_message(span_danger("\The [xeno_attacker] pries \the [src] open."), \
span_danger("We pry \the [src] open."), null, 5)
/obj/machinery/door/airlock/attack_larva(mob/living/carbon/xenomorph/larva/M)
@@ -307,6 +353,8 @@
/obj/machinery/door/airlock/attackby(obj/item/I, mob/user, params)
. = ..()
+ if(.)
+ return
if(istype(I, /obj/item/clothing/mask/cigarette) && isElectrified())
var/obj/item/clothing/mask/cigarette/L = I
diff --git a/code/game/objects/machinery/doors/airlock_control.dm b/code/game/objects/machinery/doors/airlock_control.dm
index 60a254001d1b8..76fa2d62910ab 100644
--- a/code/game/objects/machinery/doors/airlock_control.dm
+++ b/code/game/objects/machinery/doors/airlock_control.dm
@@ -149,6 +149,7 @@
/obj/machinery/access_button/update_icon_state()
+ . = ..()
if(on)
icon_state = "access_button_standby"
else
@@ -156,6 +157,8 @@
/obj/machinery/access_button/attackby(obj/item/I, mob/user, params)
. = ..()
+ if(.)
+ return
if(istype(I, /obj/item/card/id))
attack_hand(user)
diff --git a/code/game/objects/machinery/doors/door.dm b/code/game/objects/machinery/doors/door.dm
old mode 100644
new mode 100755
index bd76a3b972de1..ba9b41ebde229
--- a/code/game/objects/machinery/doors/door.dm
+++ b/code/game/objects/machinery/doors/door.dm
@@ -21,14 +21,20 @@
var/operating = FALSE
var/autoclose = FALSE
var/glass = FALSE
+ /// Unrestricted sides. A bitflag for which direction (if any) can open the door with no access
+ var/unres_sides = NONE
var/normalspeed = TRUE
var/locked = FALSE
var/welded = FALSE
var/not_weldable = FALSE // stops people welding the door if true
var/openspeed = 10 //How many seconds does it take to open it? Default 1 second. Use only if you have long door opening animations
var/list/fillers
- //used for determining emergency access
+ ///used for determining emergency access
var/emergency = FALSE
+ ///bool for determining linked state
+ var/cyclelinkeddir = FALSE
+ ///what airlock we are linked with
+ var/obj/machinery/door/airlock/cycle_linked_airlock
//Multi-tile doors
dir = EAST
@@ -38,14 +44,14 @@
. = ..()
if(density)
layer = closed_layer
- update_flags_heat_protection(get_turf(src))
+ update_heat_protection_flags(get_turf(src))
else
layer = open_layer
if(width > 1)
handle_multidoor()
var/turf/current_turf = get_turf(src)
- current_turf.flags_atom &= ~ AI_BLOCKED
+ current_turf.atom_flags &= ~ AI_BLOCKED
if(glass)
allow_pass_flags |= PASS_GLASS
@@ -100,11 +106,17 @@
user = null
if(density)
- if(allowed(user) || emergency)
+ if(allowed(user) || emergency || unrestricted_side(user))
+ if(cycle_linked_airlock)
+ if(!emergency && !cycle_linked_airlock.emergency && allowed(user))
+ cycle_linked_airlock.close()
open()
else
flick("door_deny", src)
+///Allows for specific sides of airlocks to be unrestricted (IE, can exit maint freely, but need access to enter)
+/obj/machinery/door/proc/unrestricted_side(mob/opener)
+ return get_dir(src, opener) & unres_sides
/obj/machinery/door/attack_hand(mob/living/user)
. = ..()
@@ -160,7 +172,8 @@
s.start()
-/obj/machinery/door/update_icon()
+/obj/machinery/door/update_icon_state()
+ . = ..()
if(density)
icon_state = "door1"
else
@@ -235,7 +248,7 @@
/obj/machinery/door/proc/hasPower()
return !CHECK_BITFIELD(machine_stat, NOPOWER)
-/obj/machinery/door/proc/update_flags_heat_protection(turf/source)
+/obj/machinery/door/proc/update_heat_protection_flags(turf/source)
/obj/machinery/door/proc/autoclose()
if(!density && !operating && !locked && !welded && autoclose)
diff --git a/code/game/objects/machinery/doors/firedoor.dm b/code/game/objects/machinery/doors/firedoor.dm
index 8dd7ddca4d5e1..a0f1ed4fdb40a 100644
--- a/code/game/objects/machinery/doors/firedoor.dm
+++ b/code/game/objects/machinery/doors/firedoor.dm
@@ -48,7 +48,7 @@
. = ..()
for(var/obj/machinery/door/firedoor/F in loc)
if(F != src)
- flags_atom |= INITIALIZED
+ atom_flags |= INITIALIZED
return INITIALIZE_HINT_QDEL
var/area/A = get_area(src)
ASSERT(istype(A))
@@ -117,32 +117,32 @@
return ..()
return FALSE
-/obj/machinery/door/firedoor/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE)
- if(X.status_flags & INCORPOREAL)
+/obj/machinery/door/firedoor/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE)
+ if(xeno_attacker.status_flags & INCORPOREAL)
return FALSE
- var/turf/cur_loc = X.loc
+ var/turf/cur_loc = xeno_attacker.loc
if(blocked)
- to_chat(X, span_warning("\The [src] is welded shut."))
+ to_chat(xeno_attacker, span_warning("\The [src] is welded shut."))
return FALSE
if(!istype(cur_loc))
return FALSE //Some basic logic here
if(!density)
- to_chat(X, span_warning("\The [src] is already open!"))
+ to_chat(xeno_attacker, span_warning("\The [src] is already open!"))
return FALSE
playsound(loc, 'sound/effects/metal_creaking.ogg', 25, 1)
- X.visible_message(span_warning("\The [X] digs into \the [src] and begins to pry it open."), \
+ xeno_attacker.visible_message(span_warning("\The [xeno_attacker] digs into \the [src] and begins to pry it open."), \
span_warning("We dig into \the [src] and begin to pry it open."), null, 5)
- if(do_after(X, 30, IGNORE_HELD_ITEM, src, BUSY_ICON_BUILD))
+ if(do_after(xeno_attacker, 30, IGNORE_HELD_ITEM, src, BUSY_ICON_BUILD))
if(blocked)
- to_chat(X, span_warning("\The [src] is welded shut."))
+ to_chat(xeno_attacker, span_warning("\The [src] is welded shut."))
return FALSE
if(density) //Make sure it's still closed
spawn(0)
open(1)
- X.visible_message(span_danger("\The [X] pries \the [src] open."), \
+ xeno_attacker.visible_message(span_danger("\The [xeno_attacker] pries \the [src] open."), \
span_danger("We pry \the [src] open."), null, 5)
/obj/machinery/door/firedoor/attack_hand(mob/living/user)
@@ -158,7 +158,7 @@
var/alarmed = lockdown
for(var/area/A in areas_added) //Checks if there are fire alarms in any areas associated with that firedoor
- if(A.flags_alarm_state & ALARM_WARNING_FIRE || A.air_doors_activated)
+ if(A.alarm_state_flags & ALARM_WARNING_FIRE || A.air_doors_activated)
alarmed = TRUE
var/answer = tgui_alert(user, "Would you like to [density ? "open" : "close"] this [src.name]?[ alarmed && density ? "\nNote that by doing so, you acknowledge any damages from opening this\n[src.name] as being your own fault, and you will be held accountable under the law." : ""]",\
@@ -194,7 +194,7 @@
spawn(50)
alarmed = FALSE
for(var/area/A in areas_added) //Just in case a fire alarm is turned off while the firedoor is going through an autoclose cycle
- if(A.flags_alarm_state & ALARM_WARNING_FIRE || A.air_doors_activated)
+ if(A.alarm_state_flags & ALARM_WARNING_FIRE || A.air_doors_activated)
alarmed = TRUE
if(alarmed)
nextstate = FIREDOOR_CLOSED
@@ -202,6 +202,8 @@
/obj/machinery/door/firedoor/attackby(obj/item/I, mob/user, params)
. = ..()
+ if(.)
+ return
if(operating)
return
@@ -287,26 +289,29 @@
flick("door_closing", src)
playsound(loc, 'sound/machines/emergency_shutter.ogg', 25)
-
-/obj/machinery/door/firedoor/update_icon()
- overlays.Cut()
+/obj/machinery/door/firedoor/update_icon_state()
+ . = ..()
if(density)
icon_state = "door_closed"
+ else
+ icon_state = "door_open"
+
+/obj/machinery/door/firedoor/update_overlays()
+ . = ..()
+ if(density)
if(blocked)
- overlays += "welded"
+ . += "welded"
if(pdiff_alert)
- overlays += "palert"
+ . += "palert"
if(dir_alerts)
for(var/d=1;d<=4;d++)
var/cdir = GLOB.cardinals[d]
for(var/i=1;i<=length(ALERT_STATES);i++)
if(dir_alerts[d] & (1<<(i-1)))
- overlays += new/icon(icon,"alert_[ALERT_STATES[i]]", dir=cdir)
+ . += new/icon(icon,"alert_[ALERT_STATES[i]]", dir=cdir)
else
- icon_state = "door_open"
if(blocked)
- overlays += "welded_open"
-
+ . += "welded_open"
/obj/machinery/door/firedoor/mainship
name = "\improper Emergency Shutter"
@@ -323,7 +328,7 @@
/obj/machinery/door/firedoor/border_only
icon = 'icons/obj/doors/edge_Doorfire.dmi'
- flags_atom = ON_BORDER
+ atom_flags = ON_BORDER
allow_pass_flags = PASS_GLASS
/obj/machinery/door/firedoor/border_only/Initialize(mapload)
diff --git a/code/game/objects/machinery/doors/multi_tile.dm b/code/game/objects/machinery/doors/multi_tile.dm
index 69595ac2e6439..9972fa1607245 100644
--- a/code/game/objects/machinery/doors/multi_tile.dm
+++ b/code/game/objects/machinery/doors/multi_tile.dm
@@ -2,10 +2,10 @@
/obj/machinery/door/airlock/multi_tile
width = 2
-/obj/machinery/door/airlock/multi_tile/close() //Nasty as hell O(n^2) code but unfortunately necessary
+/obj/machinery/door/airlock/multi_tile/close() //Nasty as hell O(n^2) code but unfortunately necessary //honestly probably not, TODO fixme
for(var/turf/T in locs)
- for(var/obj/vehicle/multitile/M in T)
- if(M) return FALSE
+ for(var/obj/hitbox/hit in T)
+ return FALSE
return ..()
@@ -133,12 +133,11 @@
/obj/machinery/door/airlock/multi_tile/mainship/blackgeneric
name = "\improper Airlock"
icon = 'icons/obj/doors/mainship/2x1almayerdoor.dmi'
- opacity = FALSE
- glass = FALSE
/obj/machinery/door/airlock/multi_tile/mainship/blackgeneric/glass
name = "\improper Glass Airlock"
icon = 'icons/obj/doors/mainship/2x1almayerdoor_glass.dmi'
+ opacity = FALSE
glass = TRUE
//PREP DOORS
@@ -314,8 +313,6 @@
/obj/machinery/door/airlock/multi_tile/mainship/engineering
name = "\improper Engineering Airlock"
icon = 'icons/obj/doors/mainship/2x1engidoor.dmi'
- opacity = FALSE
- glass = FALSE
req_one_access = list(ACCESS_MARINE_LOGISTICS, ACCESS_MARINE_ENGINEERING)
/obj/machinery/door/airlock/multi_tile/mainship/engineering/glass
diff --git a/code/game/objects/machinery/doors/poddoor.dm b/code/game/objects/machinery/doors/poddoor.dm
index fecb6742f6045..ecf8149440e58 100644
--- a/code/game/objects/machinery/doors/poddoor.dm
+++ b/code/game/objects/machinery/doors/poddoor.dm
@@ -15,12 +15,12 @@
. = ..()
var/turf/current_turf = get_turf(src)
if(anchored && current_turf && density)
- current_turf.flags_atom |= AI_BLOCKED
+ current_turf.atom_flags |= AI_BLOCKED
/obj/machinery/door/poddoor/Destroy()
var/turf/current_turf = get_turf(src)
if(anchored && current_turf && density)
- current_turf.flags_atom &= ~AI_BLOCKED
+ current_turf.atom_flags &= ~AI_BLOCKED
return ..()
/obj/machinery/door/poddoor/bumpopen(mob/user)
@@ -30,13 +30,13 @@
. = ..()
var/turf/current_turf = get_turf(src)
if(anchored && current_turf && density)
- current_turf.flags_atom &= ~AI_BLOCKED
+ current_turf.atom_flags &= ~AI_BLOCKED
/obj/machinery/door/poddoor/close()
. = ..()
var/turf/current_turf = get_turf(src)
if(anchored && current_turf && density)
- current_turf.flags_atom |= AI_BLOCKED
+ current_turf.atom_flags |= AI_BLOCKED
/obj/machinery/door/poddoor/Bumped(atom/AM)
if(!density)
@@ -48,7 +48,8 @@
/obj/machinery/door/poddoor/try_to_activate_door(mob/user)
return
-/obj/machinery/door/poddoor/update_icon()
+/obj/machinery/door/poddoor/update_icon_state()
+ . = ..()
if(density)
icon_state = "pdoor1"
else
@@ -98,7 +99,6 @@
/obj/machinery/door/poddoor/telecomms
name = "Telecomms Emergency Window"
id = "tcomwind"
- opacity = FALSE
/obj/machinery/door/poddoor/two_tile_hor
icon = 'icons/obj/doors/1x2blast_hor.dmi'
@@ -266,14 +266,14 @@
. = ..()
if(mapload)
var/area/ourarea = get_area(src)
- ENABLE_BITFIELD(ourarea.flags_area, DISALLOW_WEEDING)
- ENABLE_BITFIELD(ourarea.flags_area, NEAR_FOB)
+ ENABLE_BITFIELD(ourarea.area_flags, DISALLOW_WEEDING)
+ ENABLE_BITFIELD(ourarea.area_flags, NEAR_FOB)
/obj/machinery/door/poddoor/timed_late/containment/landing_zone/open()
. = ..()
var/area/ourarea = get_area(src)
- DISABLE_BITFIELD(ourarea.flags_area, DISALLOW_WEEDING)
+ DISABLE_BITFIELD(ourarea.area_flags, DISALLOW_WEEDING)
/obj/machinery/door/poddoor/timed_late/containment/landing_zone
id = "landing_zone"
diff --git a/code/game/objects/machinery/doors/railing.dm b/code/game/objects/machinery/doors/railing.dm
index 65fcc85836118..35a2312795acc 100644
--- a/code/game/objects/machinery/doors/railing.dm
+++ b/code/game/objects/machinery/doors/railing.dm
@@ -3,7 +3,7 @@
icon = 'icons/obj/doors/railing.dmi'
icon_state = "railing1"
use_power = 0
- flags_atom = ON_BORDER
+ atom_flags = ON_BORDER
allow_pass_flags = PASSABLE
opacity = FALSE
open_layer = CATWALK_LAYER
@@ -57,7 +57,8 @@
return TRUE
-/obj/machinery/door/poddoor/railing/update_icon()
+/obj/machinery/door/poddoor/railing/update_icon_state()
+ . = ..()
if(density)
icon_state = "railing1"
else
@@ -68,7 +69,7 @@
operating = FALSE
var/turf/current_turf = get_turf(src)
if(current_turf)
- current_turf.flags_atom &= ~AI_BLOCKED
+ current_turf.atom_flags &= ~AI_BLOCKED
/obj/machinery/door/poddoor/railing/close()
if (!SSticker || operating || density)
@@ -81,7 +82,7 @@
icon_state = "railing1"
var/turf/current_turf = get_turf(src)
if(current_turf)
- current_turf.flags_atom |= AI_BLOCKED
+ current_turf.atom_flags |= AI_BLOCKED
addtimer(CALLBACK(src, PROC_REF(do_close)), 12)
return TRUE
diff --git a/code/game/objects/machinery/doors/shutters.dm b/code/game/objects/machinery/doors/shutters.dm
index 3d019311d6513..81cee63954d24 100644
--- a/code/game/objects/machinery/doors/shutters.dm
+++ b/code/game/objects/machinery/doors/shutters.dm
@@ -55,7 +55,8 @@
operating = FALSE
-/obj/machinery/door/poddoor/shutters/update_icon()
+/obj/machinery/door/poddoor/shutters/update_icon_state()
+ . = ..()
if(operating)
return
icon_state = "shutter[density]"
diff --git a/code/game/objects/machinery/doors/windowdoor.dm b/code/game/objects/machinery/doors/windowdoor.dm
index 56389874d968e..ab4c9a7d900d2 100644
--- a/code/game/objects/machinery/doors/windowdoor.dm
+++ b/code/game/objects/machinery/doors/windowdoor.dm
@@ -11,7 +11,7 @@
soft_armor = list(MELEE = 20, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 10, BIO = 100, FIRE = 70, ACID = 100)
visible = FALSE
use_power = FALSE
- flags_atom = ON_BORDER
+ atom_flags = ON_BORDER
allow_pass_flags = PASS_GLASS
opacity = FALSE
var/obj/item/circuitboard/airlock/electronics = null
@@ -44,7 +44,8 @@
return ..()
-/obj/machinery/door/window/update_icon()
+/obj/machinery/door/window/update_icon_state()
+ . = ..()
if(operating)
return
icon_state = density ? base_state : "[base_state]open"
@@ -128,6 +129,8 @@
/obj/machinery/door/window/attackby(obj/item/I, mob/user, params)
. = ..()
+ if(.)
+ return
if(operating)
return TRUE
diff --git a/code/game/objects/machinery/dropship_part_fabricator.dm b/code/game/objects/machinery/dropship_part_fabricator.dm
index d2024fea2e511..0d7ccebc193da 100644
--- a/code/game/objects/machinery/dropship_part_fabricator.dm
+++ b/code/game/objects/machinery/dropship_part_fabricator.dm
@@ -19,6 +19,7 @@
var/busy = FALSE
/obj/machinery/dropship_part_fabricator/update_icon_state()
+ . = ..()
if(machine_stat & NOPOWER)
icon_state = "drone_fab_nopower"
return
diff --git a/code/game/objects/machinery/fax.dm b/code/game/objects/machinery/fax.dm
index f39f5fc0e5158..4291cce94f600 100644
--- a/code/game/objects/machinery/fax.dm
+++ b/code/game/objects/machinery/fax.dm
@@ -144,6 +144,8 @@
/obj/machinery/faxmachine/attackby(obj/item/I, mob/user, params)
. = ..()
+ if(.)
+ return
if(istype(I, /obj/item/paper))
if(!message)
user.transferItemToLoc(I, src)
diff --git a/code/game/objects/machinery/fire_alarm.dm b/code/game/objects/machinery/fire_alarm.dm
index 23d03243cb0ae..4c95dc3aed05b 100644
--- a/code/game/objects/machinery/fire_alarm.dm
+++ b/code/game/objects/machinery/fire_alarm.dm
@@ -56,7 +56,7 @@ FIRE ALARM
return
var/area/A = get_area(src)
- if(A.flags_alarm_state & ALARM_WARNING_FIRE)
+ if(A.alarm_state_flags & ALARM_WARNING_FIRE)
set_light_color(LIGHT_COLOR_EMISSIVE_ORANGE)
else
switch(GLOB.marine_main_ship.get_security_level())
@@ -74,7 +74,7 @@ FIRE ALARM
/obj/machinery/firealarm/update_icon_state()
. = ..()
var/area/A = get_area(src)
- icon_state = "fire[!CHECK_BITFIELD(A.flags_alarm_state, ALARM_WARNING_FIRE)]"
+ icon_state = "fire[!CHECK_BITFIELD(A.alarm_state_flags, ALARM_WARNING_FIRE)]"
/obj/machinery/firealarm/update_overlays()
. = ..()
@@ -86,7 +86,7 @@ FIRE ALARM
. += emissive_appearance(icon, "fire_o[(is_mainship_level(z)) ? GLOB.marine_main_ship.get_security_level() : "green"]")
. += mutable_appearance(icon, "fire_o[(is_mainship_level(z)) ? GLOB.marine_main_ship.get_security_level() : "green"]")
var/area/A = get_area(src)
- if(A.flags_alarm_state & ALARM_WARNING_FIRE)
+ if(A.alarm_state_flags & ALARM_WARNING_FIRE)
. += mutable_appearance(icon, "fire_o1")
/obj/machinery/firealarm/fire_act(temperature, volume)
@@ -100,6 +100,8 @@ FIRE ALARM
/obj/machinery/firealarm/attackby(obj/item/I, mob/user, params)
. = ..()
+ if(.)
+ return
if(isscrewdriver(I) && buildstage == 2)
wiresexposed = !wiresexposed
@@ -176,7 +178,7 @@ FIRE ALARM
var/d1
var/d2
- if (A.flags_alarm_state & ALARM_WARNING_FIRE)
+ if (A.alarm_state_flags & ALARM_WARNING_FIRE)
d1 = "Reset - Lockdown"
else
d1 = "Alarm - Lockdown"
diff --git a/code/game/objects/machinery/flasher.dm b/code/game/objects/machinery/flasher.dm
index f269b918c1ef6..c714e2cfa5e5d 100644
--- a/code/game/objects/machinery/flasher.dm
+++ b/code/game/objects/machinery/flasher.dm
@@ -34,6 +34,7 @@
/obj/machinery/flasher/update_icon_state()
+ . = ..()
if(!(machine_stat & NOPOWER))
icon_state = "[base_state]1"
else
@@ -105,6 +106,8 @@
/obj/machinery/flasher/portable/attackby(obj/item/I, mob/user, params)
. = ..()
+ if(.)
+ return
if(iswrench(I))
anchored = !anchored
@@ -120,6 +123,8 @@
/obj/machinery/flasher_button/attackby(obj/item/I, mob/user, params)
. = ..()
+ if(.)
+ return
return attack_hand(user)
/obj/machinery/flasher_button/attack_hand(mob/living/user)
diff --git a/code/game/objects/machinery/floodlight.dm b/code/game/objects/machinery/floodlight.dm
index f16b5e2addcc9..c981aea68462b 100644
--- a/code/game/objects/machinery/floodlight.dm
+++ b/code/game/objects/machinery/floodlight.dm
@@ -125,6 +125,7 @@
turn_light(user, !light_on)
/obj/machinery/deployable/floodlight/update_icon_state()
+ . = ..()
icon_state = "floodlightcombat_deployed" + (light_on ? "_on" : "_off")
/obj/item/deployable_floodlight
@@ -133,7 +134,7 @@
icon = 'icons/obj/machines/floodlight.dmi'
icon_state = "floodlightcombat"
max_integrity = 200
- flags_item = IS_DEPLOYABLE
+ item_flags = IS_DEPLOYABLE
w_class = WEIGHT_CLASS_NORMAL
var/deployable_item = /obj/machinery/deployable/floodlight
@@ -177,7 +178,7 @@
update_icon()
-/obj/machinery/floodlight/colony/update_icon()
+/obj/machinery/floodlight/colony/update_icon_state()
. = ..()
if(light_on)
icon_state = "floodon"
@@ -199,7 +200,7 @@
resistance_flags = RESIST_ALL
var/turned_on = FALSE //has to be toggled in engineering
-/obj/machinery/colony_floodlight_switch/update_icon()
+/obj/machinery/colony_floodlight_switch/update_icon_state()
. = ..()
if(machine_stat & NOPOWER)
icon_state = "panelnopower"
diff --git a/code/game/objects/machinery/fuelcell_recycler.dm b/code/game/objects/machinery/fuelcell_recycler.dm
index a91363d75284a..8c37b8cb30dff 100644
--- a/code/game/objects/machinery/fuelcell_recycler.dm
+++ b/code/game/objects/machinery/fuelcell_recycler.dm
@@ -15,6 +15,8 @@
/obj/machinery/fuelcell_recycler/attackby(obj/item/I, mob/user, params)
. = ..()
+ if(.)
+ return
if(istype(I, /obj/item/fuel_cell))
if(!cell_left)
if(user.transferItemToLoc(I, src))
@@ -85,18 +87,22 @@
update_icon()
-/obj/machinery/fuelcell_recycler/update_icon()
- src.overlays.Cut()
-
+/obj/machinery/fuelcell_recycler/update_icon_state()
+ . = ..()
if(machine_stat & (BROKEN|NOPOWER))
icon_state = "recycler0"
+ else
+ icon_state = "recycler"
+
+/obj/machinery/fuelcell_recycler/update_overlays()
+ . = ..()
+
+ if(machine_stat & (BROKEN|NOPOWER))
if(cell_left != null)
src.overlays += "recycler-left-cell"
if(cell_right != null)
src.overlays += "recycler-right-cell"
return
- else
- icon_state = "recycler"
var/overlay_builder = "recycler-"
if(cell_left == null && cell_right == null)
@@ -107,8 +113,8 @@
else
overlay_builder += "left-charging"
- src.overlays += overlay_builder
- src.overlays += "recycler-left-cell"
+ . += overlay_builder
+ . += "recycler-left-cell"
return
else if(cell_left == null)
if(cell_right.is_regenerated())
@@ -116,8 +122,8 @@
else
overlay_builder += "right-charging"
- src.overlays += overlay_builder
- src.overlays += "recycler-right-cell"
+ . += overlay_builder
+ . += "recycler-right-cell"
return
else // both left and right cells are there
if(cell_left.is_regenerated())
@@ -130,7 +136,6 @@
else
overlay_builder += "-right-charging"
- src.overlays += overlay_builder
- src.overlays += "recycler-left-cell"
- src.overlays += "recycler-right-cell"
- return
+ . += overlay_builder
+ . += "recycler-left-cell"
+ . += "recycler-right-cell"
diff --git a/code/game/objects/machinery/hologram.dm b/code/game/objects/machinery/hologram.dm
index 1a6de82d0c063..878e61ba616de 100644
--- a/code/game/objects/machinery/hologram.dm
+++ b/code/game/objects/machinery/hologram.dm
@@ -335,11 +335,6 @@
For the other part of the code, check silicon say.dm. Particularly robot talk.*/
/obj/machinery/holopad/Hear(message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode)
. = ..()
- if(speaker && LAZYLEN(masters) && !radio_freq)//Master is mostly a safety in case lag hits or something. Radio_freq so AIs dont hear holopad stuff through radios.
- for(var/mob/living/silicon/ai/master in masters)
- if(masters[master] && speaker != master)
- master.relay_speech(message, speaker, message_language, raw_message, radio_freq, spans, message_mode)
-
for(var/datum/holocall/holocall_to_update AS in holo_calls)
if(holocall_to_update.connected_holopad == src && speaker != holocall_to_update.hologram)
holocall_to_update.user.Hear(message, speaker, message_language, raw_message, radio_freq, spans, message_mode)
@@ -359,6 +354,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
update_icon()
/obj/machinery/holopad/update_icon_state()
+ . = ..()
var/total_users = LAZYLEN(masters) + LAZYLEN(holo_calls)
if(ringing)
icon_state = "holopad_ringing"
diff --git a/code/game/objects/machinery/holosign.dm b/code/game/objects/machinery/holosign.dm
index 4217b4ba818dc..70940add018de 100644
--- a/code/game/objects/machinery/holosign.dm
+++ b/code/game/objects/machinery/holosign.dm
@@ -17,6 +17,7 @@
update_icon()
/obj/machinery/holosign/update_icon_state()
+ . = ..()
if(!lit)
icon_state = "sign_off"
else
@@ -51,6 +52,8 @@
/obj/machinery/holosign_switch/attackby(obj/item/I, mob/user, params)
. = ..()
+ if(.)
+ return
if(istype(I, /obj/item/detective_scanner))
return
diff --git a/code/game/objects/machinery/igniter.dm b/code/game/objects/machinery/igniter.dm
index fb08154766ea9..016a4c3fd8925 100644
--- a/code/game/objects/machinery/igniter.dm
+++ b/code/game/objects/machinery/igniter.dm
@@ -30,7 +30,8 @@
icon_state = "igniter[on]"
-/obj/machinery/igniter/update_icon()
+/obj/machinery/igniter/update_icon_state()
+ . = ..()
if(is_operational())
icon_state = "igniter[on]"
else
@@ -52,17 +53,17 @@
var/base_state = "migniter"
anchored = TRUE
-/obj/machinery/sparker/update_icon()
- if ( !(machine_stat & NOPOWER) && disable == 0 )
-
+/obj/machinery/sparker/update_icon_state()
+ . = ..()
+ if(!(machine_stat & NOPOWER) && disable == 0)
icon_state = "[base_state]"
-// src.sd_SetLuminosity(2)
else
icon_state = "[base_state]-p"
-// src.sd_SetLuminosity(0)
/obj/machinery/sparker/attackby(obj/item/I, mob/user, params)
. = ..()
+ if(.)
+ return
if(istype(I, /obj/item/detective_scanner))
return
@@ -109,6 +110,8 @@
/obj/machinery/ignition_switch/attackby(obj/item/I, mob/user, params)
. = ..()
+ if(.)
+ return
return attack_hand(user)
/obj/machinery/ignition_switch/attack_hand(mob/living/user)
diff --git a/code/game/objects/machinery/iv_drip.dm b/code/game/objects/machinery/iv_drip.dm
index 7ab2a83e7962b..0c5c2bcacf60f 100644
--- a/code/game/objects/machinery/iv_drip.dm
+++ b/code/game/objects/machinery/iv_drip.dm
@@ -10,37 +10,44 @@
var/obj/item/reagent_containers/beaker = null
var/datum/beam/current_beam //RUTGMC ADDON
-/obj/machinery/iv_drip/update_icon()
- /* СМ КОСТЫЛЬ
- if(src.attached)
+/obj/machinery/iv_drip/update_icon_state()
+ . = ..()
+ if(attached)
icon_state = "hooked"
else
icon_state = ""
- */
- icon_state = "" //КОСТЫЛЬ
- //У нас нет системы которая позволила бы изменить pixel x/y вары у начальной и конечной точек beam'а
- //Поэтому оставляю 1 айкон стейт, чтобы не выглядело всё слишком плохо
+/obj/machinery/iv_drip/update_overlays()
+ . = ..()
- overlays = null
+ if(!beaker)
+ return
- if(beaker)
- var/datum/reagents/reagents = beaker.reagents
- if(reagents.total_volume)
- var/image/filling = image('icons/obj/iv_drip.dmi', src, "reagent")
-
- var/percent = round((reagents.total_volume / beaker.volume) * 100)
- switch(percent)
- if(0 to 9) filling.icon_state = "reagent0"
- if(10 to 24) filling.icon_state = "reagent10"
- if(25 to 49) filling.icon_state = "reagent25"
- if(50 to 74) filling.icon_state = "reagent50"
- if(75 to 79) filling.icon_state = "reagent75"
- if(80 to 90) filling.icon_state = "reagent80"
- if(91 to INFINITY) filling.icon_state = "reagent100"
-
- filling.color = mix_color_from_reagents(reagents.reagent_list)
- overlays += filling
+ var/datum/reagents/reagents = beaker.reagents
+ if(!reagents?.total_volume)
+ return
+
+ var/image/filling = image('icons/obj/iv_drip.dmi', src, "reagent")
+
+ var/percent = round((reagents.total_volume / beaker.volume) * 100)
+ switch(percent)
+ if(0 to 9)
+ filling.icon_state = "reagent0"
+ if(10 to 24)
+ filling.icon_state = "reagent10"
+ if(25 to 49)
+ filling.icon_state = "reagent25"
+ if(50 to 74)
+ filling.icon_state = "reagent50"
+ if(75 to 79)
+ filling.icon_state = "reagent75"
+ if(80 to 90)
+ filling.icon_state = "reagent80"
+ if(91 to INFINITY)
+ filling.icon_state = "reagent100"
+
+ filling.color = mix_color_from_reagents(reagents.reagent_list)
+ . += filling
/obj/machinery/iv_drip/MouseDrop(over_object, src_location, over_location)
..()
@@ -70,6 +77,8 @@
/obj/machinery/iv_drip/attackby(obj/item/I, mob/user, params)
. = ..()
+ if(.)
+ return
if(istype(I, /obj/item/reagent_containers))
if(beaker)
diff --git a/code/game/objects/machinery/kitchen/gibber.dm b/code/game/objects/machinery/kitchen/gibber.dm
index 38a85bf7d66f4..09cadb8dc5a8c 100644
--- a/code/game/objects/machinery/kitchen/gibber.dm
+++ b/code/game/objects/machinery/kitchen/gibber.dm
@@ -51,39 +51,32 @@
startgibbing(user)
-/obj/machinery/gibber/attackby(obj/item/grab/I, mob/user, param)
- . = ..()
-
+/obj/machinery/gibber/grab_interact(obj/item/grab/grab, mob/user, base_damage = BASE_OBJ_SLAM_DAMAGE, is_sharp = FALSE)
+ if(!is_operational())
+ return ..()
if(occupant)
to_chat(user, span_warning("The gibber is full, empty it first!"))
return
-
- else if(!(istype(I, /obj/item/grab)) )
+ var/mob/living/grabbed_mob = grab.grabbed_thing
+ if(!iscarbon(grabbed_mob) && !istype(grabbed_mob, /mob/living/simple_animal))
to_chat(user, span_warning("This item is not suitable for the gibber!"))
return
-
- else if(!iscarbon(I.grabbed_thing) && !istype(I.grabbed_thing, /mob/living/simple_animal))
- to_chat(user, span_warning("This item is not suitable for the gibber!"))
- return
-
- var/mob/living/M = I.grabbed_thing
if(user.grab_state < GRAB_AGGRESSIVE)
to_chat(user, span_warning("You need a better grip to do that!"))
return
-
- else if(M.abiotic(TRUE))
+ if(grabbed_mob.abiotic(TRUE))
to_chat(user, span_warning("Subject may not have abiotic items on."))
return
+ user.visible_message(span_danger("[user] starts to put [grabbed_mob] into the gibber!"))
- user.visible_message(span_danger("[user] starts to put [M] into the gibber!"))
-
- if(!do_after(user, 30, NONE, M, BUSY_ICON_DANGER) || QDELETED(src) || occupant)
+ if(!do_after(user, 30, NONE, grabbed_mob, BUSY_ICON_DANGER) || QDELETED(src) || occupant)
return
- user.visible_message(span_danger("[user] stuffs [M] into the gibber!"))
- M.forceMove(src)
- occupant = M
+ user.visible_message(span_danger("[user] stuffs [grabbed_mob] into the gibber!"))
+ grabbed_mob.forceMove(src)
+ occupant = grabbed_mob
update_icon()
+ return TRUE
/obj/machinery/gibber/verb/eject()
set category = "Object"
diff --git a/code/game/objects/machinery/kitchen/microwave.dm b/code/game/objects/machinery/kitchen/microwave.dm
index 3e894ef52ba72..0141c1475b3bf 100644
--- a/code/game/objects/machinery/kitchen/microwave.dm
+++ b/code/game/objects/machinery/kitchen/microwave.dm
@@ -48,6 +48,8 @@
/obj/machinery/microwave/attackby(obj/item/I, mob/user, params)
. = ..()
+ if(.)
+ return
if(broken == 2 && isscrewdriver(I))
balloon_alert_to_viewers("starts to fix the microwave")
@@ -120,14 +122,48 @@
return FALSE
- else if(istype(I, /obj/item/grab))
- return TRUE
-
else
balloon_alert(user, "Can't cook anything with this")
return TRUE
+/obj/machinery/microwave/grab_interact(obj/item/grab/grab, mob/user, base_damage = BASE_OBJ_SLAM_DAMAGE, is_sharp = FALSE)
+ if(!is_operational())
+ return ..()
+ if(isxeno(user))
+ return
+ if(user.do_actions)
+ return
+ if(!isliving(grab.grabbed_thing))
+ return
+ if(user.a_intent != INTENT_HARM)
+ return
+ if(user.grab_state <= GRAB_AGGRESSIVE)
+ to_chat(user, span_warning("You need a better grip to do that!"))
+ return
+ var/mob/living/grabbed_mob = grab.grabbed_thing
+ if(grabbed_mob.mob_size > MOB_SIZE_HUMAN)
+ to_chat(user, span_warning("They're too big to fit!"))
+ return
+ user.visible_message(span_danger("[user] starts to force [grabbed_mob] into [src]!"), span_notice("You start to force [grabbed_mob] into [src]!"))
+ if(!do_after(user, 3 SECONDS, NONE, src, BUSY_ICON_HOSTILE, extra_checks = CALLBACK(src, PROC_REF(microwave_victim), grabbed_mob)))
+ playsound(src.loc, 'sound/machines/ding.ogg', 25, 1)
+ return
+
+ user.visible_message(span_danger("[user] microwaves [grabbed_mob]!"), span_notice("You microwave [grabbed_mob]!"), "You hear sizzling.")
+ log_combat(user, grabbed_mob, "microwaved")
+ playsound(src.loc, 'sound/machines/ding.ogg', 25, 1)
+ return TRUE
+
+/obj/machinery/microwave/proc/microwave_victim(mob/living/victim)
+ victim.apply_damage(3, BURN, "head", ENERGY, updating_health = TRUE, penetration = 20)
+ victim.jitter(5)
+ if(prob(10))
+ victim.emote("scream")
+ victim.adjustBrainLoss(5)
+ if(victim.stat != DEAD)
+ return TRUE
+
/obj/machinery/microwave/nopower
use_power = NO_POWER_USE
diff --git a/code/game/objects/machinery/kitchen/processor.dm b/code/game/objects/machinery/kitchen/processor.dm
index aa139464bd6d7..79908c9c25081 100644
--- a/code/game/objects/machinery/kitchen/processor.dm
+++ b/code/game/objects/machinery/kitchen/processor.dm
@@ -37,6 +37,8 @@
/obj/machinery/processor/attackby(obj/item/I, mob/user, params)
. = ..()
+ if(.)
+ return
if(processing)
to_chat(user, span_warning("The processor is in the process of processing."))
@@ -48,7 +50,7 @@
var/obj/O = I
- if(istype(I, /obj/item/grab))
+ if(isgrabitem(I))
var/obj/item/grab/G = I
O = G.grabbed_thing
@@ -61,6 +63,29 @@
user.drop_held_item()
O.forceMove(src)
+/obj/machinery/processor/grab_interact(obj/item/grab/grab, mob/user, base_damage = BASE_OBJ_SLAM_DAMAGE, is_sharp = FALSE)
+ if(!is_operational())
+ return ..()
+ if(isxeno(user))
+ return
+ if(!isliving(grab.grabbed_thing))
+ return
+ if(user.a_intent != INTENT_HARM)
+ return
+ if(user.grab_state <= GRAB_AGGRESSIVE)
+ to_chat(user, span_warning("You need a better grip to do that!"))
+ return
+ var/mob/living/grabbed_mob = grab.grabbed_thing
+ user.visible_message(span_danger("[user] starts to force [grabbed_mob] into [src]!"), span_notice("You start to force [grabbed_mob] into [src]!"))
+ if(!do_after(user, 3 SECONDS, NONE, src, BUSY_ICON_HOSTILE))
+ return
+
+ user.visible_message(span_danger("[user] processes [grabbed_mob]!"), span_notice("You process [grabbed_mob]!"), "You hear churning.")
+ log_combat(user, grabbed_mob, "food processed")
+ playsound(loc, 'sound/machines/blender.ogg', 25, 1)
+ grabbed_mob.apply_damage(80, BRUTE, "head", MELEE, TRUE, updating_health = TRUE)
+ return TRUE
+
/obj/machinery/processor/attack_hand(mob/living/user)
. = ..()
if(.)
diff --git a/code/game/objects/machinery/kitchen/smartfridge.dm b/code/game/objects/machinery/kitchen/smartfridge.dm
index 1b8d4713d4a66..f3e1d3b43c143 100644
--- a/code/game/objects/machinery/kitchen/smartfridge.dm
+++ b/code/game/objects/machinery/kitchen/smartfridge.dm
@@ -41,8 +41,9 @@
if(src.shoot_inventory && prob(2))
src.throw_item()
-/obj/machinery/smartfridge/update_icon()
- if( !(machine_stat & NOPOWER) )
+/obj/machinery/smartfridge/update_icon_state()
+ . = ..()
+ if(!(machine_stat & NOPOWER))
icon_state = icon_on
else
icon_state = icon_off
@@ -53,6 +54,8 @@
/obj/machinery/smartfridge/attackby(obj/item/I, mob/user, params)
. = ..()
+ if(.)
+ return
if(isscrewdriver(I))
TOGGLE_BITFIELD(machine_stat, PANEL_OPEN)
diff --git a/code/game/objects/machinery/lightswitch.dm b/code/game/objects/machinery/lightswitch.dm
index f4762b8f83a35..b810656ae3eaa 100644
--- a/code/game/objects/machinery/lightswitch.dm
+++ b/code/game/objects/machinery/lightswitch.dm
@@ -25,6 +25,7 @@
update_icon()
/obj/machinery/light_switch/update_icon_state()
+ . = ..()
if(machine_stat & NOPOWER)
icon_state = "light-p"
return
diff --git a/code/game/objects/machinery/line_nexter.dm b/code/game/objects/machinery/line_nexter.dm
index add6e694b9203..1e41d9835ec63 100644
--- a/code/game/objects/machinery/line_nexter.dm
+++ b/code/game/objects/machinery/line_nexter.dm
@@ -7,7 +7,7 @@
icon_state = "turnstile"
anchored = TRUE
allow_pass_flags = PASS_DEFENSIVE_STRUCTURE|PASSABLE
- flags_atom = ON_BORDER
+ atom_flags = ON_BORDER
dir = 8
var/last_use
var/id
diff --git a/code/game/objects/machinery/minelayer.dm b/code/game/objects/machinery/minelayer.dm
index 796b63d617ed9..a13be8935aa52 100644
--- a/code/game/objects/machinery/minelayer.dm
+++ b/code/game/objects/machinery/minelayer.dm
@@ -4,7 +4,7 @@
icon = 'icons/Marine/marine-items.dmi'
icon_state = "minelayer"
max_integrity = 200
- flags_item = IS_DEPLOYABLE
+ item_flags = IS_DEPLOYABLE
w_class = WEIGHT_CLASS_NORMAL
///amount of currently stored mines
var/stored_mines = 0
@@ -65,6 +65,8 @@
/obj/machinery/deployable/minelayer/attackby(obj/item/I, mob/user, params)
. = ..()
+ if(.)
+ return
if(istype(I, /obj/item/explosive/mine) && stored_amount <= max_amount)
stored_amount++
qdel(I)
diff --git a/code/game/objects/machinery/miner.dm b/code/game/objects/machinery/miner.dm
index 6e09369e27e82..e9c971e301953 100644
--- a/code/game/objects/machinery/miner.dm
+++ b/code/game/objects/machinery/miner.dm
@@ -73,7 +73,8 @@
var/marker_icon = "miner_[mineral_value >= PLATINUM_CRATE_SELL_AMOUNT ? "platinum" : "phoron"]_on"
SSminimaps.add_marker(src, MINIMAP_FLAG_ALL, image('modular_RUtgmc/icons/UI_icons/map_blips.dmi', null, marker_icon)) //RU TGMC edit
-/obj/machinery/miner/update_icon()
+/obj/machinery/miner/update_icon_state()
+ . = ..()
switch(miner_status)
if(MINER_RUNNING)
icon_state = "mining_drill_active_[miner_upgrade_type]"
@@ -127,6 +128,8 @@
/obj/machinery/miner/attackby(obj/item/I,mob/user,params)
. = ..()
+ if(.)
+ return
if(istype(I, /obj/item/minerupgrade))
var/obj/item/minerupgrade/upgrade = I
if(!(miner_status == MINER_RUNNING))
@@ -173,13 +176,13 @@
user.visible_message(span_notice("[user] fumbles around figuring out [src]'s internals."),
span_notice("You fumble around figuring out [src]'s internals."))
var/fumbling_time = 10 SECONDS - 2 SECONDS * user.skills.getRating(SKILL_ENGINEER)
- if(!do_after(user, fumbling_time, NONE, src, BUSY_ICON_UNSKILLED, extra_checks = CALLBACK(weldingtool, /obj/item/tool/weldingtool/proc/isOn)))
+ if(!do_after(user, fumbling_time, NONE, src, BUSY_ICON_UNSKILLED, extra_checks = CALLBACK(weldingtool, TYPE_PROC_REF(/obj/item/tool/weldingtool, isOn))))
return FALSE
playsound(loc, 'sound/items/weldingtool_weld.ogg', 25)
user.visible_message(span_notice("[user] starts welding [src]'s internal damage."),
span_notice("You start welding [src]'s internal damage."))
add_overlay(GLOB.welding_sparks)
- if(!do_after(user, 200, NONE, src, BUSY_ICON_BUILD, extra_checks = CALLBACK(weldingtool, /obj/item/tool/weldingtool/proc/isOn)))
+ if(!do_after(user, 200, NONE, src, BUSY_ICON_BUILD, extra_checks = CALLBACK(weldingtool, TYPE_PROC_REF(/obj/item/tool/weldingtool, isOn))))
cut_overlay(GLOB.welding_sparks)
return FALSE
if(miner_status != MINER_DESTROYED )
@@ -313,26 +316,26 @@
else
add_tick += 1
-/obj/machinery/miner/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE)
- if(X.status_flags & INCORPOREAL) //Incorporeal xenos cannot attack physically.
+/obj/machinery/miner/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE)
+ if(xeno_attacker.status_flags & INCORPOREAL) //Incorporeal xenos cannot attack physically.
return
- if(miner_upgrade_type == MINER_RESISTANT && !(X.mob_size == MOB_SIZE_BIG || X.xeno_caste.caste_flags & CASTE_IS_STRONG))
- X.visible_message(span_notice("[X]'s claws bounce off of [src]'s reinforced plating."),
+ if(miner_upgrade_type == MINER_RESISTANT && !(xeno_attacker.mob_size == MOB_SIZE_BIG || xeno_attacker.xeno_caste.caste_flags & CASTE_IS_STRONG))
+ xeno_attacker.visible_message(span_notice("[xeno_attacker]'s claws bounce off of [src]'s reinforced plating."),
span_notice("We can't slash through [src]'s reinforced plating!"))
return
while(miner_status != MINER_DESTROYED)
- if(X.do_actions)
- return balloon_alert(X, "busy")
- if(!do_after(X, 1.5 SECONDS, NONE, src, BUSY_ICON_DANGER, BUSY_ICON_HOSTILE))
+ if(xeno_attacker.do_actions)
+ return balloon_alert(xeno_attacker, "busy")
+ if(!do_after(xeno_attacker, 1.5 SECONDS, NONE, src, BUSY_ICON_DANGER, BUSY_ICON_HOSTILE))
return
- X.do_attack_animation(src, ATTACK_EFFECT_CLAW)
- X.visible_message(span_danger("[X] slashes \the [src]!"), \
+ xeno_attacker.do_attack_animation(src, ATTACK_EFFECT_CLAW)
+ xeno_attacker.visible_message(span_danger("[xeno_attacker] slashes \the [src]!"), \
span_danger("We slash \the [src]!"), null, 5)
playsound(loc, "alien_claw_metal", 25, TRUE)
miner_integrity -= 25
set_miner_status()
- if(miner_status == MINER_DESTROYED && X.client)
- var/datum/personal_statistics/personal_statistics = GLOB.personal_statistics_list[X.ckey]
+ if(miner_status == MINER_DESTROYED && xeno_attacker.client)
+ var/datum/personal_statistics/personal_statistics = GLOB.personal_statistics_list[xeno_attacker.ckey]
personal_statistics.miner_sabotages_performed++
/* RUTGMC DELETION
diff --git a/code/game/objects/machinery/mortar.dm b/code/game/objects/machinery/mortar.dm
index af2ed87f17983..5be0bc9868465 100644
--- a/code/game/objects/machinery/mortar.dm
+++ b/code/game/objects/machinery/mortar.dm
@@ -189,6 +189,8 @@
/obj/machinery/deployable/mortar/attackby(obj/item/I, mob/user, params)
. = ..()
+ if(.)
+ return
if(firing)
user.balloon_alert(user, "The barrel is steaming hot. Wait till it cools off")
@@ -275,8 +277,7 @@
var/datum/ammo/ammo = GLOB.ammo_list[arty_shell.ammo_type]
shell.generate_bullet(ammo)
var/shell_range = min(get_dist_euclidean(src, target), ammo.max_range)
- // shell.fire_at(target, null, src, shell_range, ammo.shell_speed) // FUTURE ORIGINAL, WE DON'T HAVE NEEDED CHANGES YET
- shell.fire_at(target, src, src, shell_range, ammo.shell_speed) // RUTGMC OLD VERSION
+ shell.fire_at(target, null, src, shell_range, ammo.shell_speed)
perform_firing_visuals()
@@ -429,7 +430,7 @@
icon_state = "mortar"
max_integrity = 200
soft_armor = list(MELEE = 0, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 15, BIO = 100, FIRE = 0, ACID = 0)
- flags_item = IS_DEPLOYABLE
+ item_flags = IS_DEPLOYABLE
/// What item is this going to deploy when we put down the mortar?
var/deployable_item = /obj/machinery/deployable/mortar
resistance_flags = RESIST_ALL
@@ -458,7 +459,7 @@
desc = "A manual, crew-operated mortar system intended to rain down 80mm goodness on anything it's aimed at. Needs to be set down first to fire. This one is a double barreled mortar that can hold 4 rounds usually fitted in TAV's."
icon_state = "mortar_db"
max_integrity = 400
- flags_item = IS_DEPLOYABLE|TWOHANDED|DEPLOYED_NO_PICKUP|DEPLOY_ON_INITIALIZE
+ item_flags = IS_DEPLOYABLE|TWOHANDED|DEPLOYED_NO_PICKUP|DEPLOY_ON_INITIALIZE
w_class = WEIGHT_CLASS_HUGE
deployable_item = /obj/machinery/deployable/mortar/double
@@ -479,7 +480,7 @@
icon = 'icons/Marine/howitzer.dmi'
icon_state = "howitzer"
max_integrity = 400
- flags_item = IS_DEPLOYABLE|TWOHANDED|DEPLOYED_NO_PICKUP|DEPLOY_ON_INITIALIZE
+ item_flags = IS_DEPLOYABLE|TWOHANDED|DEPLOYED_NO_PICKUP|DEPLOY_ON_INITIALIZE
w_class = WEIGHT_CLASS_HUGE
deployable_item = /obj/machinery/deployable/mortar/howitzer
@@ -564,7 +565,7 @@
desc = "A manual, crew-operated and towable multiple rocket launcher system piece used by the TerraGov Marine Corps, it is meant to saturate an area with munitions to total up to large amounts of firepower, it thus has high scatter when firing to accomplish such a task. Fires in only bursts of up to 16 rockets, it can hold 32 rockets in total. Uses 60mm Rockets."
icon_state = "mlrs"
max_integrity = 400
- flags_item = IS_DEPLOYABLE|TWOHANDED|DEPLOYED_NO_PICKUP|DEPLOY_ON_INITIALIZE
+ item_flags = IS_DEPLOYABLE|TWOHANDED|DEPLOYED_NO_PICKUP|DEPLOY_ON_INITIALIZE
w_class = WEIGHT_CLASS_HUGE
deployable_item = /obj/machinery/deployable/mortar/howitzer/mlrs
@@ -581,6 +582,8 @@
allowed_shells = list(
/obj/item/mortal_shell/rocket/mlrs,
/obj/item/mortal_shell/rocket/mlrs/gas,
+ /obj/item/mortal_shell/rocket/mlrs/incendiary,
+ /obj/item/mortal_shell/rocket/mlrs/cloak,
)
tally_type = TALLY_ROCKET_ARTY
cool_off_time = 80 SECONDS
@@ -598,7 +601,7 @@
user.balloon_alert(user, "The barrel is steaming hot. Wait till it cools off")
return
- if(!istype(I, /obj/item/storage/box/mlrs_rockets) && !istype(I, /obj/item/storage/box/mlrs_rockets_gas))
+ if(!istype(I, /obj/item/storage/box/mlrs_rockets))
return ..()
var/obj/item/storage/box/rocket_box = I
@@ -660,7 +663,7 @@
)
icon_state = "mortar_ammo_cas"
w_class = WEIGHT_CLASS_SMALL
- flags_atom = CONDUCT
+ atom_flags = CONDUCT
///Ammo datum typepath that the shell uses
var/ammo_type
@@ -745,6 +748,18 @@
icon_state = "mlrs_rocket_gas"
ammo_type = /datum/ammo/mortar/rocket/smoke/mlrs
+/obj/item/mortal_shell/rocket/mlrs/cloak
+ name = "\improper 60mm 'S-2' cloak rocket"
+ desc = "A 60mm rocket loaded with cloak smoke that hides any friendlies inside of it with advanced chemical technology."
+ icon_state = "mlrs_rocket_cloak"
+ ammo_type = /datum/ammo/mortar/rocket/smoke/mlrs/cloak
+
+/obj/item/mortal_shell/rocket/mlrs/incendiary
+ name = "\improper 60mm incendiary rocket"
+ desc = "A 60mm rocket loaded with an incendiary payload with a minor side of explosive."
+ icon_state = "mlrs_rocket_incendiary"
+ ammo_type = /datum/ammo/mortar/rocket/mlrs/incendiary
+
/obj/structure/closet/crate/mortar_ammo
name = "\improper T-50S mortar ammo crate"
desc = "A crate containing live mortar shells with various payloads. DO NOT DROP. KEEP AWAY FROM FIRE SOURCES."
@@ -776,7 +791,7 @@
desc = "A crate containing a basic set of a mortar and some shells, to get an engineer started."
/obj/structure/closet/crate/mortar_ammo/mortar_kit/PopulateContents()
- new /obj/item/mortar_kit(src)
+ new /obj/item/storage/holster/backholster/mortar/full(src)
new /obj/item/mortal_shell/he(src)
new /obj/item/mortal_shell/he(src)
new /obj/item/mortal_shell/he(src)
@@ -880,8 +895,7 @@
desc = "A large case containing rockets in a compressed setting for the TA-40L MLRS. Drag this sprite into you to open it up!\nNOTE: You cannot put items back inside this case."
storage_slots = 16
-/obj/item/storage/box/mlrs_rockets/Initialize(mapload)
- . = ..()
+/obj/item/storage/box/mlrs_rockets/PopulateContents()
new /obj/item/mortal_shell/rocket/mlrs(src)
new /obj/item/mortal_shell/rocket/mlrs(src)
new /obj/item/mortal_shell/rocket/mlrs(src)
@@ -899,13 +913,10 @@
new /obj/item/mortal_shell/rocket/mlrs(src)
new /obj/item/mortal_shell/rocket/mlrs(src)
-/obj/item/storage/box/mlrs_rockets_gas
+/obj/item/storage/box/mlrs_rockets/gas
name = "\improper TA-40L X-50 rocket crate"
- desc = "A large case containing rockets in a compressed setting for the TA-40L MLRS. Drag this sprite into you to open it up!\nNOTE: You cannot put items back inside this case."
- storage_slots = 16
-/obj/item/storage/box/mlrs_rockets_gas/Initialize(mapload)
- . = ..()
+/obj/item/storage/box/mlrs_rockets/gas/PopulateContents()
new /obj/item/mortal_shell/rocket/mlrs/gas(src)
new /obj/item/mortal_shell/rocket/mlrs/gas(src)
new /obj/item/mortal_shell/rocket/mlrs/gas(src)
@@ -923,5 +934,49 @@
new /obj/item/mortal_shell/rocket/mlrs/gas(src)
new /obj/item/mortal_shell/rocket/mlrs/gas(src)
+/obj/item/storage/box/mlrs_rockets/cloak
+ name = "\improper TA-40L 'S-2' rocket crate"
+
+/obj/item/storage/box/mlrs_rockets/cloak/PopulateContents()
+ new /obj/item/mortal_shell/rocket/mlrs/cloak(src)
+ new /obj/item/mortal_shell/rocket/mlrs/cloak(src)
+ new /obj/item/mortal_shell/rocket/mlrs/cloak(src)
+ new /obj/item/mortal_shell/rocket/mlrs/cloak(src)
+ new /obj/item/mortal_shell/rocket/mlrs/cloak(src)
+ new /obj/item/mortal_shell/rocket/mlrs/cloak(src)
+ new /obj/item/mortal_shell/rocket/mlrs/cloak(src)
+ new /obj/item/mortal_shell/rocket/mlrs/cloak(src)
+ new /obj/item/mortal_shell/rocket/mlrs/cloak(src)
+ new /obj/item/mortal_shell/rocket/mlrs/cloak(src)
+ new /obj/item/mortal_shell/rocket/mlrs/cloak(src)
+ new /obj/item/mortal_shell/rocket/mlrs/cloak(src)
+ new /obj/item/mortal_shell/rocket/mlrs/cloak(src)
+ new /obj/item/mortal_shell/rocket/mlrs/cloak(src)
+ new /obj/item/mortal_shell/rocket/mlrs/cloak(src)
+ new /obj/item/mortal_shell/rocket/mlrs/cloak(src)
+
+/obj/item/storage/box/mlrs_rockets/incendiary
+ name = "\improper TA-40L incendiary rocket crate"
+
+/obj/item/storage/box/mlrs_rockets/incendiary/PopulateContents()
+ new /obj/item/mortal_shell/rocket/mlrs/incendiary(src)
+ new /obj/item/mortal_shell/rocket/mlrs/incendiary(src)
+ new /obj/item/mortal_shell/rocket/mlrs/incendiary(src)
+ new /obj/item/mortal_shell/rocket/mlrs/incendiary(src)
+ new /obj/item/mortal_shell/rocket/mlrs/incendiary(src)
+ new /obj/item/mortal_shell/rocket/mlrs/incendiary(src)
+ new /obj/item/mortal_shell/rocket/mlrs/incendiary(src)
+ new /obj/item/mortal_shell/rocket/mlrs/incendiary(src)
+ new /obj/item/mortal_shell/rocket/mlrs/incendiary(src)
+ new /obj/item/mortal_shell/rocket/mlrs/incendiary(src)
+ new /obj/item/mortal_shell/rocket/mlrs/incendiary(src)
+ new /obj/item/mortal_shell/rocket/mlrs/incendiary(src)
+ new /obj/item/mortal_shell/rocket/mlrs/incendiary(src)
+ new /obj/item/mortal_shell/rocket/mlrs/incendiary(src)
+ new /obj/item/mortal_shell/rocket/mlrs/incendiary(src)
+ new /obj/item/mortal_shell/rocket/mlrs/incendiary(src)
+
+
#undef TALLY_MORTAR
#undef TALLY_HOWITZER
+#undef TALLY_ROCKET_ARTY
diff --git a/code/game/objects/machinery/nuclearbomb.dm b/code/game/objects/machinery/nuclearbomb.dm
index 0c124657cf668..2b1b58efd3816 100644
--- a/code/game/objects/machinery/nuclearbomb.dm
+++ b/code/game/objects/machinery/nuclearbomb.dm
@@ -13,10 +13,10 @@
density = TRUE
anchored = TRUE
coverage = 20
- flags_atom = CRITICAL_ATOM
+ atom_flags = CRITICAL_ATOM
resistance_flags = RESIST_ALL
layer = BELOW_MOB_LAYER
- interaction_flags = INTERACT_OBJ_UI
+ interaction_flags = INTERACT_MACHINE_TGUI
var/deployable = TRUE
var/extended = FALSE
var/lighthack = FALSE
@@ -103,6 +103,8 @@
/obj/machinery/nuclearbomb/attackby(obj/item/I, mob/user, params)
. = ..()
+ if(.)
+ return
if(!extended)
return
if(!istype(I, /obj/item/disk/nuclear))
@@ -119,23 +121,23 @@
if(r_auth && g_auth && b_auth)
has_auth = TRUE
-/obj/machinery/nuclearbomb/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE)
- if(X.status_flags & INCORPOREAL)
+/obj/machinery/nuclearbomb/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE)
+ if(xeno_attacker.status_flags & INCORPOREAL)
return FALSE
if(!timer_enabled)
- to_chat(X, span_warning("\The [src] is soundly asleep. We better not disturb it."))
+ to_chat(xeno_attacker, span_warning("\The [src] is soundly asleep. We better not disturb it."))
return
- X.visible_message("[X] begins to slash delicately at the nuke",
+ xeno_attacker.visible_message("[xeno_attacker] begins to slash delicately at the nuke",
"You start slashing delicately at the nuke.")
- if(!do_after(X, 5 SECONDS, NONE, src, BUSY_ICON_DANGER, BUSY_ICON_HOSTILE))
+ if(!do_after(xeno_attacker, 5 SECONDS, NONE, src, BUSY_ICON_DANGER, BUSY_ICON_HOSTILE))
return
- X.visible_message("[X] disabled the nuke",
+ xeno_attacker.visible_message("[xeno_attacker] disabled the nuke",
"You disabled the nuke.")
disable()
- SEND_GLOBAL_SIGNAL(COMSIG_GLOB_NUKE_DIFFUSED, src, X)
+ SEND_GLOBAL_SIGNAL(COMSIG_GLOB_NUKE_DIFFUSED, src, xeno_attacker)
/obj/machinery/nuclearbomb/can_interact(mob/user)
. = ..()
@@ -350,7 +352,7 @@
///Change minimap icon if its on or off
/obj/machinery/nuclearbomb/proc/update_minimap_icon()
SSminimaps.remove_marker(src)
- SSminimaps.add_marker(src, MINIMAP_FLAG_ALL, image('modular_RUtgmc/icons/UI_icons/map_blips_large.dmi', null, "nuke[timer_enabled ? "_on" : "_off"]", VERY_HIGH_FLOAT_LAYER))
+ SSminimaps.add_marker(src, MINIMAP_FLAG_ALL, image('modular_RUtgmc/icons/UI_icons/map_blips_large.dmi', null, "nuke[timer_enabled ? "_on" : "_off"]", VERY_HIGH_FLOAT_LAYER)) //RUTGMC EDIT
#undef NUKE_STAGE_NONE
#undef NUKE_STAGE_COVER_REMOVED
diff --git a/code/game/objects/machinery/overwatch.dm b/code/game/objects/machinery/overwatch.dm
index beabe1afa2baf..81c934bf09eb7 100644
--- a/code/game/objects/machinery/overwatch.dm
+++ b/code/game/objects/machinery/overwatch.dm
@@ -327,30 +327,8 @@ GLOBAL_LIST_EMPTY(active_cas_targets)
state = OW_MAIN
if("monitor")
state = OW_MONITOR
- if("monitoralpha_squad")
- state = OW_MONITOR
- current_squad = get_squad_by_id(ALPHA_SQUAD)
- if("monitorbravo_squad")
- state = OW_MONITOR
- current_squad = get_squad_by_id(BRAVO_SQUAD)
- if("monitorcharlie_squad")
- state = OW_MONITOR
- current_squad = get_squad_by_id(CHARLIE_SQUAD)
- if("monitordelta_squad")
- state = OW_MONITOR
- current_squad = get_squad_by_id(DELTA_SQUAD)
- if("monitorzulu_squad")
- state = OW_MONITOR
- current_squad = get_squad_by_id(ZULU_SQUAD)
- if("monitoryankee_squad")
- state = OW_MONITOR
- current_squad = get_squad_by_id(YANKEE_SQUAD)
- if("monitorxray_squad")
- state = OW_MONITOR
- current_squad = get_squad_by_id(XRAY_SQUAD)
- if("monitorwhiskey_squad")
- state = OW_MONITOR
- current_squad = get_squad_by_id(WHISKEY_SQUAD)
+ if(href_list["squad_id"])
+ current_squad = get_squad_by_id(href_list["squad_id"])
if("change_operator")
if(operator != usr)
if(current_squad)
@@ -556,7 +534,7 @@ GLOBAL_LIST_EMPTY(active_cas_targets)
dat += "Squad Overwatch: [S.overwatch_officer.name]" else dat += "Squad Overwatch: NONE
" - dat += "[S.name] Squad Monitor
" + dat += "[S.name] Squad Monitor
" dat += "----------------------
" dat += "Orbital Bombardment Control
" dat += "Current Cannon Status: " @@ -624,7 +602,7 @@ GLOBAL_LIST_EMPTY(active_cas_targets) dat += "Squad Overwatch: [S.overwatch_officer.name]
" else dat += "Squad Overwatch: NONE
" - dat += "[S.name] Squad Monitor
" + dat += "[S.name] Squad Monitor
" if(OW_MONITOR)//Info screen. dat += get_squad_info() diff --git a/code/game/objects/machinery/pipe/construction.dm b/code/game/objects/machinery/pipe/construction.dm index 18bea1f105ef0..c62cf1eed5397 100644 --- a/code/game/objects/machinery/pipe/construction.dm +++ b/code/game/objects/machinery/pipe/construction.dm @@ -130,6 +130,8 @@ Buildable meters /obj/item/pipe/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(user.incapacitated()) return FALSE if(iswrench(I)) diff --git a/code/game/objects/machinery/pipe/pipe_dispenser.dm b/code/game/objects/machinery/pipe/pipe_dispenser.dm index bbacead24a43a..efd04f3c2dc88 100644 --- a/code/game/objects/machinery/pipe/pipe_dispenser.dm +++ b/code/game/objects/machinery/pipe/pipe_dispenser.dm @@ -64,6 +64,8 @@ /obj/machinery/pipedispenser/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/pipe) || istype(I, /obj/item/pipe_meter)) to_chat(usr, span_notice("You put [I] back into [src].")) diff --git a/code/game/objects/machinery/portable_reagent_tank.dm b/code/game/objects/machinery/portable_reagent_tank.dm index 68a1a1c60f87b..3da26bacf4607 100644 --- a/code/game/objects/machinery/portable_reagent_tank.dm +++ b/code/game/objects/machinery/portable_reagent_tank.dm @@ -66,9 +66,9 @@ var/obj/item/storage/internal_bag = get_internal_item() internal_bag?.open(user) -/obj/machinery/deployable/reagent_tank/attack_alien(mob/living/carbon/xenomorph/X, damage_amount, damage_type, damage_flag, effects, armor_penetration, isrightclick) - if(X.a_intent != INTENT_HARM) - return drink_from_nozzle(X, TRUE) +/obj/machinery/deployable/reagent_tank/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) + if(xeno_attacker.a_intent != INTENT_HARM) + return drink_from_nozzle(xeno_attacker, TRUE) return ..() ///Process for drinking reagents directly from the dispenser's nozzle @@ -122,7 +122,7 @@ icon_state = "dispenser" item_state_worn = TRUE item_state = "reagent_dispenser" - flags_equip_slot = ITEM_SLOT_BACK + equip_slot_flags = ITEM_SLOT_BACK w_class = WEIGHT_CLASS_HUGE max_w_class = WEIGHT_CLASS_SMALL //Beaker size storage_slots = null @@ -172,16 +172,16 @@ update_icon() /obj/item/storage/reagent_tank/attack_hand(mob/living/user) - if(CHECK_BITFIELD(flags_item, IS_DEPLOYED)) + if(CHECK_BITFIELD(item_flags, IS_DEPLOYED)) return open(user) return ..() /obj/item/storage/reagent_tank/open(mob/user) - if(CHECK_BITFIELD(flags_item, IS_DEPLOYED)) + if(CHECK_BITFIELD(item_flags, IS_DEPLOYED)) return ..() /obj/item/storage/reagent_tank/attempt_draw_object(mob/living/user) - if(!CHECK_BITFIELD(flags_item, IS_DEPLOYED)) + if(!CHECK_BITFIELD(item_flags, IS_DEPLOYED)) balloon_alert(user, "Not deployed") return FALSE return ..() @@ -190,7 +190,7 @@ balloon_alert(user, "Not deployed") /obj/item/storage/reagent_tank/can_be_inserted(obj/item/W, warning) - if(!CHECK_BITFIELD(flags_item, IS_DEPLOYED)) + if(!CHECK_BITFIELD(item_flags, IS_DEPLOYED)) balloon_alert(usr, "Not deployed") return FALSE return ..() diff --git a/code/game/objects/machinery/recharger.dm b/code/game/objects/machinery/recharger.dm index 4c4f48c0fbe9d..41868a9ba86bb 100644 --- a/code/game/objects/machinery/recharger.dm +++ b/code/game/objects/machinery/recharger.dm @@ -12,6 +12,8 @@ /obj/machinery/recharger/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(issilicon(user)) return @@ -140,29 +142,29 @@ B.bcell.charge = 0 ..(severity) -/obj/machinery/recharger/update_icon() - overlays = list() +/obj/machinery/recharger/update_overlays() + . = ..() if((machine_stat & (NOPOWER|BROKEN))) return - else if(!charging) - overlays += "recharger-power" + if(!charging) + . += "recharger-power" return if(percent_charge_complete < 25) - overlays += "recharger-10" + . += "recharger-10" else if(percent_charge_complete >= 25 && percent_charge_complete < 50) - overlays += "recharger-25" + . += "recharger-25" else if(percent_charge_complete >= 50 && percent_charge_complete < 75) - overlays += "recharger-50" + . += "recharger-50" else if(percent_charge_complete >= 75 && percent_charge_complete < 100) - overlays += "recharger-75" + . += "recharger-75" else if(percent_charge_complete >= 100) - overlays += "recharger-100" + . += "recharger-100" if(istype(charging, /obj/item/weapon/gun/energy/taser)) - overlays += "recharger-taser" + . += "recharger-taser" else if(istype(charging, /obj/item/weapon/baton)) - overlays += "recharger-baton" + . += "recharger-baton" /obj/machinery/recharger/nopower use_power = NO_POWER_USE diff --git a/code/game/objects/machinery/research.dm b/code/game/objects/machinery/research.dm index 84e8b8b2b0d8a..097a7cd36a62b 100644 --- a/code/game/objects/machinery/research.dm +++ b/code/game/objects/machinery/research.dm @@ -48,7 +48,6 @@ RES_TIER_UNCOMMON = list( /obj/item/research_product/money/uncommon, /obj/item/implanter/blade, - /obj/item/attachable/shoulder_mount, ), RES_TIER_RARE = list( /obj/item/research_product/money/rare, @@ -65,7 +64,6 @@ RES_TIER_UNCOMMON = list( /obj/item/research_product/money/uncommon, /obj/item/implanter/chem/blood, - /obj/item/attachable/shoulder_mount, ), RES_TIER_RARE = list( /obj/item/research_product/money/rare, @@ -90,6 +88,8 @@ /obj/machinery/researchcomp/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(researching || !istype(I, /obj/item/research_resource)) return @@ -248,16 +248,10 @@ ) /obj/item/research_resource/xeno + name = "Xenomorph research material" research_type = RES_XENO icon = 'icons/obj/alien_autopsy.dmi' icon_state = "sample_0" - -/obj/item/research_resource/xeno/Initialize(mapload) - . = ..() - icon_state = "sample_[rand(0, 11)]" - -/obj/item/research_resource/xeno/tier_one - name = "Xenomorph research material - tier 1" color = "#f0bee3" reward_probs = list( RES_TIER_BASIC = 100, @@ -266,35 +260,9 @@ RES_TIER_RARE = 1, ) -/obj/item/research_resource/xeno/tier_two - name = "Xenomorph research material - tier 2" - color = "#d6e641" - reward_probs = list( - RES_TIER_BASIC = 100, - RES_TIER_COMMON = 40, - RES_TIER_UNCOMMON = 20, - RES_TIER_RARE = 6, - ) - -/obj/item/research_resource/xeno/tier_three - name = "Xenomorph research material - tier 3" - color = "#e43939" - reward_probs = list( - RES_TIER_BASIC = 100, - RES_TIER_COMMON = 50, - RES_TIER_UNCOMMON = 40, - RES_TIER_RARE = 10, - ) - -/obj/item/research_resource/xeno/tier_four - name = "Xenomorph research material - tier 4" - color = "#a800ad" - reward_probs = list( - RES_TIER_BASIC = 100, - RES_TIER_COMMON = 50, - RES_TIER_UNCOMMON = 40, - RES_TIER_RARE = 50, - ) +/obj/item/research_resource/xeno/Initialize(mapload) + . = ..() + icon_state = "sample_[rand(0, 11)]" /// ///Items designed to be products of research diff --git a/code/game/objects/machinery/robotic_cradle.dm b/code/game/objects/machinery/robotic_cradle.dm index 69bf7b1f3d26f..4567a7d5b87c3 100644 --- a/code/game/objects/machinery/robotic_cradle.dm +++ b/code/game/objects/machinery/robotic_cradle.dm @@ -1,62 +1,57 @@ #define CRADLE_NOTICE_SUCCESS 1 #define CRADLE_NOTICE_DEATH 2 -#define CRADLE_NOTICE_NO_RECORD 3 -#define CRADLE_NOTICE_NO_POWER 4 -#define CRADLE_NOTICE_XENO_FUCKERY 5 -#define CRADLE_NOTICE_IDIOT_EJECT 6 -#define CRADLE_NOTICE_FORCE_EJECT 7 +#define CRADLE_NOTICE_NO_POWER 3 +#define CRADLE_NOTICE_XENO_FUCKERY 4 +#define CRADLE_NOTICE_EARLY_EJECT 5 //Cradle /obj/machinery/robotic_cradle name = "robotic cradle" desc = "A highly experimental robotic maintenence machine using a bath of industrial nanomachines to quickly restore any robotic machine inserted." - icon = 'icons/obj/objects.dmi' - icon_state = "borgcharger0" + icon = 'icons/obj/machines/suit_cycler.dmi' + icon_state = "suit_cycler" density = TRUE max_integrity = 350 soft_armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 100, BOMB = 0, BIO = 100, FIRE = 30, ACID = 30) - //This var is used to see if the machine is currently repairing or not. - var/repairing = FALSE - //This var is the reference used for the patient - var/mob/living/carbon/human/occupant - //It uses power use_power = ACTIVE_POWER_USE idle_power_usage = 15 active_power_usage = 10000 // It rebuilds you from nothing... - //This var is in reference to the radio the cradle uses to speak to the craw. + ///This var is used to see if the machine is currently repairing or not. + var/repairing = FALSE + ///This var is the reference used for the patient + var/mob/living/carbon/human/occupant + ///This var is in reference to the radio the cradle uses to speak to the crew var/obj/item/radio/headset/mainship/doc/radio + ///This var is so we can call deltimer() it if we need to abort the operation early + var/operation_timer /obj/machinery/robotic_cradle/Initialize(mapload) . = ..() radio = new(src) /obj/machinery/robotic_cradle/Destroy() - do_eject(forceeject = TRUE) + if(occupant) + visible_message("\The [src] malfunctions as it is destroyed mid-repair, ejecting [occupant] with unfinished repair wounds and showering them in debris.") + occupant.take_limb_damage(rand(30,50),rand(30,50)) + remove_occupant() if(radio) QDEL_NULL(radio) return ..() /obj/machinery/robotic_cradle/update_icon_state() - if(machine_stat & NOPOWER) - icon_state = "borgcharger0" - return - if(repairing) - icon_state = "borgcharger1" - return - if(occupant) - icon_state = "borgcharger1" - return - icon_state = "borgcharger0" + if(occupant && !(machine_stat & NOPOWER)) + icon_state = "suit_cycler_active" + return ..() + icon_state = "suit_cycler" /obj/machinery/robotic_cradle/power_change() . = ..() if(is_operational() || !occupant) return visible_message("[src] engages the safety override, ejecting the occupant.") - repairing = FALSE - go_out(CRADLE_NOTICE_NO_POWER) + perform_eject(CRADLE_NOTICE_NO_POWER) /obj/machinery/robotic_cradle/process() if(!occupant) @@ -64,45 +59,22 @@ if(occupant.stat == DEAD) say("Patient has expired.") - repairing = FALSE - go_out(CRADLE_NOTICE_DEATH) + perform_eject(CRADLE_NOTICE_DEATH) return if(!repairing) return -//This proc handles the actual repair once the timer is up, ejection of the healed robot and radio message of ejection. -/obj/machinery/robotic_cradle/proc/repair_op() - if(QDELETED(occupant) || occupant.stat == DEAD) - if(!ishuman(occupant)) - stack_trace("Non-human occupant made its way into the autodoc: [occupant] | [occupant?.type].") - visible_message("[src] buzzes.") - go_out(CRADLE_NOTICE_DEATH) //kick them out too. - return - - occupant.revive() - visible_message("\The [src] clicks and opens up having finished the requested operations.") - repairing = FALSE - go_out(CRADLE_NOTICE_SUCCESS) - -/obj/machinery/robotic_cradle/attack_alien(mob/living/carbon/xenomorph/X, damage_amount, damage_type, damage_flag, effects, armor_penetration, isrightclick) +/obj/machinery/robotic_cradle/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) if(!occupant) - to_chat(X, span_xenowarning("There is nothing of interest in there.")) - return - if(X.status_flags & INCORPOREAL || X.do_actions) + to_chat(xeno_attacker, span_xenowarning("There is nothing of interest in there.")) return - visible_message(span_warning("[X] begins to pry the [src]'s cover!"), 3) - playsound(src,'sound/effects/metal_creaking.ogg', 25, 1) - if(!do_after(X, 2 SECONDS)) + if(xeno_attacker.status_flags & INCORPOREAL || xeno_attacker.do_actions) return - playsound(loc, 'sound/effects/metal_creaking.ogg', 25, 1) - go_out() + start_emergency_eject(xeno_attacker) -//This proc acts as a heads up to the doctors/engineers about the patient exiting the cradle for whatever reason. Does not warn if the patient itself exits the cradle. it also wipes the memory of who the patient was and readies the cradle for a new patient. -/obj/machinery/robotic_cradle/proc/go_out(notice_code = FALSE) - if(!occupant) - return - occupant.forceMove(drop_location()) +///This proc acts as a heads up to the doctors/engineers about the patient exiting the cradle for whatever reason. Takes CRADLE_NOTICE defines as arguments +/obj/machinery/robotic_cradle/proc/notify_about_eject(notice_code = FALSE) var/reason = "Reason for discharge: Procedural completion." switch(notice_code) if(CRADLE_NOTICE_SUCCESS) @@ -110,167 +82,169 @@ if(CRADLE_NOTICE_DEATH) playsound(src, 'sound/machines/warning-buzzer.ogg', 50, FALSE) reason = "Reason for discharge: Patient has expired." - if(CRADLE_NOTICE_NO_RECORD) - playsound(src, 'sound/machines/warning-buzzer.ogg', 50, FALSE) - reason = "Reason for discharge: Medical records not detected. Alerting security advised." if(CRADLE_NOTICE_NO_POWER) playsound(src, 'sound/machines/warning-buzzer.ogg', 50, FALSE) reason = "Reason for discharge: Power failure." if(CRADLE_NOTICE_XENO_FUCKERY) playsound(src, 'sound/machines/warning-buzzer.ogg', 50, FALSE) reason = "Reason for discharge: Unauthorized manual release. Alerting security advised." - if(CRADLE_NOTICE_IDIOT_EJECT) - playsound(src, 'sound/machines/warning-buzzer.ogg', 50, FALSE) - reason = "Reason for discharge: Unauthorized manual release during repair. Alerting security advised." - if(CRADLE_NOTICE_FORCE_EJECT) - playsound(src, 'sound/machines/warning-buzzer.ogg', 50, FALSE) - reason = "Reason for discharge: Destruction of linked CRADLE Engineering System. Alerting security advised." + if(CRADLE_NOTICE_EARLY_EJECT) + playsound(src,'sound/machines/buzz-two.ogg',50,FALSE) + reason = "Reason for discharge: Operation manually terminated by end user." + if(!radio)//The radio shouldn't ever be deleted, but this is a sanity check just in case + return radio.talk_into(src, "Patient: [occupant] has been released from [src] at: [get_area(src)]. [reason]", RADIO_CHANNEL_MEDICAL) + +///Forces the occupant out of the cradle, leaves it empty for someone else to enter. +/obj/machinery/robotic_cradle/proc/remove_occupant() + if(!occupant) + return + occupant.forceMove(drop_location()) occupant = null update_icon() stop_processing() -//This proc is what a robot calls when they try to enter a cradle on their own. -/obj/machinery/robotic_cradle/proc/move_inside_wrapper(mob/living/dropped, mob/dragger) - if(dragger.incapacitated() || !ishuman(dragger) || !isrobot(dropped)) - return - +///Finishes ejecting the patient after the cradle is done. Takes CRADLE_NOTICE defines as arguments, used in notify_about_eject() +/obj/machinery/robotic_cradle/proc/perform_eject(notice_code = FALSE) + repairing = FALSE + if(operation_timer) + deltimer(operation_timer) + notify_about_eject(notice_code) + remove_occupant() + +///Handles any mob placing themselves or someone else into the cradle. target_mob is the mob being placed in, operating_mob is the person placing the mob in. Returns true if the mob got placed inside, false otherwise +/obj/machinery/robotic_cradle/proc/place_mob_inside(mob/living/target_mob, mob/operating_mob) + if(operating_mob.incapacitated()||!ishuman(operating_mob)||!ishuman(target_mob)) + return FALSE if(occupant) - to_chat(dragger, span_notice("[src] is already occupied!")) - return - + to_chat(operating_mob, span_notice("[src] is already occupied!")) + return FALSE + var/mob/living/carbon/human/patient = target_mob + if(!(patient.species.species_flags & ROBOTIC_LIMBS)) + visible_message(span_warning("[src] buzzes. Subject is biological, cannot repair")) + playsound(src, 'sound/machines/buzz-two.ogg', 50, FALSE) + return FALSE + if(patient.abiotic()) + visible_message(span_warning("[src] buzzes. Subject cannot wear abiotic items.")) + playsound(src, 'sound/machines/buzz-two.ogg', 50, FALSE) + return FALSE if(machine_stat & (NOPOWER|BROKEN)) - to_chat(dragger, span_notice("[src] is non-functional!")) + to_chat(operating_mob, span_notice("[src] is non-functional!")) + return FALSE + + if(operating_mob == patient) + patient.visible_message(span_notice("[patient] starts climbing into \the [src]."), + span_notice("You start climbing into \the [src].")) + else + operating_mob.visible_message(span_notice("[operating_mob] starts placing [patient] \the [src]."), + span_notice("You start placing [patient] into \the [src].")) + + if(!do_after(patient, 1 SECONDS, IGNORE_HELD_ITEM, src, BUSY_ICON_GENERIC)) + return FALSE + if(occupant) //In case someone tried climbing in earlier than us, while the cradle was empty + to_chat(operating_mob, span_notice("[src] is already occupied!")) + return FALSE + patient.stop_pulling() + patient.forceMove(src) + occupant = patient + return TRUE +///Starts the repair operation of the cradle +/obj/machinery/robotic_cradle/proc/start_repair_operation() + if(!occupant) return - if(dragger.skills.getRating(SKILL_ENGINEER) < SKILL_ENGINEER_ENGI) - dropped.visible_message(span_notice("[dropped] fumbles around figuring out how to get into \the [src]."), - span_notice("You fumble around figuring out how to get into \the [src].")) - var/fumbling_time = max(0 , SKILL_TASK_TOUGH - ( SKILL_TASK_EASY * dragger.skills.getRating(SKILL_ENGINEER) ))// 8 secs non-trained, 5 amateur - if(!do_after(dropped, fumbling_time, NONE, src, BUSY_ICON_UNSKILLED)) - return - - dropped.visible_message(span_notice("[dropped] starts climbing into \the [src]."), - span_notice("You start climbing into \the [src].")) - if(!do_after(dropped, 1 SECONDS, IGNORE_HELD_ITEM, src, BUSY_ICON_GENERIC)) + if(powered()) + use_power(active_power_usage) + playsound(loc, 'sound/machines/ping.ogg', 25, 1) + else + perform_eject(CRADLE_NOTICE_NO_POWER) return - if(occupant) - to_chat(dragger, span_notice("[src] is already occupied!")) - return - dropped.stop_pulling() - dropped.forceMove(src) - occupant = dropped - icon_state = "pod_0" - var/implants = list(/obj/item/implant/neurostim) - var/mob/living/carbon/human/H = occupant - var/doc_dat - med_scan(H, doc_dat, implants, TRUE) - start_processing() - say("Automatic mode engaged, initialising procedure.") - addtimer(CALLBACK(src, PROC_REF(auto_start)), 20 SECONDS) - -///Callback to start auto mode on someone entering -/obj/machinery/robotic_cradle/proc/auto_start() - if(repairing) + start_processing() + update_icon() + repairing = TRUE + say("Automatic mode engaged, initialising repair procedure.") + operation_timer = addtimer(CALLBACK(src, PROC_REF(handle_repair_operation)), 20 SECONDS,TIMER_STOPPABLE) + +///Callback to start repair on someone entering the cradle +/obj/machinery/robotic_cradle/proc/handle_repair_operation() + if(!occupant) //sanity check, in case we get teleported outside the cradle midrepair without calling perform_eject() + if(operation_timer) + deltimer(operation_timer) + repairing = FALSE + visible_message(span_warning("[src] buzzes. Occupant missing, procedures canceled.")) + playsound(src, 'sound/machines/buzz-two.ogg', 50, FALSE) return + say("Repair procedure complete.") + perform_repair() + +///This proc handles the actual repair once the timer is up and ejects the healed robot. +/obj/machinery/robotic_cradle/proc/perform_repair() if(!occupant) - say("Occupant missing, procedures canceled.") return - say("Beginning repair procedure.") - repair_op() + if(QDELETED(occupant) || occupant.stat == DEAD) + if(!ishuman(occupant)) + stack_trace("Non-human occupant made its way into the autodoc: [occupant] | [occupant?.type].") + visible_message(span_warning("[src] buzzes.")) + perform_eject(CRADLE_NOTICE_DEATH) + return + occupant.revive() + visible_message("\The [src] clicks and opens up having finished the requested operations.") + perform_eject(CRADLE_NOTICE_SUCCESS) -/obj/machinery/robotic_cradle/MouseDrop_T(mob/M, mob/user) +/obj/machinery/robotic_cradle/MouseDrop_T(mob/dropping, mob/user) . = ..() - move_inside_wrapper(M, user) + if(place_mob_inside(dropping, user)) + start_repair_operation() /obj/machinery/robotic_cradle/verb/move_inside() set name = "Enter Cradle" set category = "Object" set src in oview(1) - move_inside_wrapper(usr, usr) + if(place_mob_inside(usr, usr)) + start_repair_operation() -//This proc is called when someone has a robot grabbed either by hand or in a stasis bag. It is also lets docs/engineers use health analyzers on the cradle if they really want to. /obj/machinery/robotic_cradle/attackby(obj/item/I, mob/user, params) . = ..() - - if(!ishuman(user)) - return //no + if(.) + return if(istype(I, /obj/item/healthanalyzer) && occupant) //Allows us to use the analyzer on the occupant without taking him out. var/obj/item/healthanalyzer/J = I J.attack(occupant, user) return - if(!istype(I, /obj/item/grab)) +/obj/machinery/robotic_cradle/attack_hand(mob/living/user) + . = ..() + if(user.do_actions) //stops them from spamming if they're attempting to eject someone or otherwise busy return - - if(machine_stat & (NOPOWER|BROKEN)) - to_chat(user, span_notice("[src] is non-functional!")) + if(!occupant) return + start_emergency_eject(user) - if(occupant) - to_chat(user, span_notice("[src] is already occupied!")) +/obj/machinery/robotic_cradle/grab_interact(obj/item/grab/grab, mob/user, base_damage = BASE_OBJ_SLAM_DAMAGE, is_sharp = FALSE) + . = ..() + if(.) return + var/mob/grabbed_mob - var/obj/item/grab/G = I + if(ismob(grab.grabbed_thing)) + grabbed_mob = grab.grabbed_thing - var/mob/M - if(ismob(G.grabbed_thing)) - M = G.grabbed_thing - else if(istype(G.grabbed_thing, /obj/structure/closet/bodybag/cryobag)) - var/obj/structure/closet/bodybag/cryobag/C = G.grabbed_thing - if(!C.bodybag_occupant) + else if(istype(grab.grabbed_thing,/obj/structure/closet/bodybag/cryobag)) + var/obj/structure/closet/bodybag/cryobag/cryobag = grab.grabbed_thing + if(!cryobag.bodybag_occupant) to_chat(user, span_warning("The stasis bag is empty!")) return - M = C.bodybag_occupant - C.open() - user.start_pulling(M) - - if(!M) - return - - if(!ishuman(M)) // No monkee or beano - to_chat(user, span_notice("[src] is compatible with humanoid anatomies only!")) - return - - if(M.abiotic()) - to_chat(user, span_warning("Subject cannot have abiotic items on.")) - return - - if(ishumanbasic(M)) - to_chat(user, span_warning("Subject is biological, cannot repair.")) - return - - if(user.skills.getRating(SKILL_ENGINEER) < SKILL_ENGINEER_ENGI) - user.visible_message(span_notice("[user] fumbles around figuring out how to put [M] into [src]."), - span_notice("You fumble around figuring out how to put [M] into [src].")) - var/fumbling_time = max(0 , SKILL_TASK_TOUGH - ( SKILL_TASK_EASY * user.skills.getRating(SKILL_ENGINEER) ))// 8 secs non-trained, 5 amateur - if(!do_after(user, fumbling_time, NONE, M, BUSY_ICON_UNSKILLED) || QDELETED(src)) - return - - visible_message("[user] starts putting [M] into [src].", 3) - - if(!do_after(user, 10, IGNORE_HELD_ITEM, M, BUSY_ICON_GENERIC) || QDELETED(src)) - return - - if(occupant) - to_chat(user, span_notice("[src] is already occupied!")) - return + grabbed_mob = cryobag.bodybag_occupant + cryobag.open() + user.start_pulling(grabbed_mob) - if(!M || !G) - return + if(place_mob_inside(grabbed_mob,user)) + start_repair_operation() - M.forceMove(src) - occupant = M - icon_state = "pod_1" - var/implants = list(/obj/item/implant/neurostim) - var/mob/living/carbon/human/H = occupant - med_scan(H, null, implants, TRUE) - start_processing() - say("Automatic mode engaged, initialising procedure.") - addtimer(CALLBACK(src, PROC_REF(auto_start)), 20 SECONDS) + return TRUE /obj/machinery/robotic_cradle/verb/eject() set name = "Eject cradle" @@ -278,45 +252,34 @@ set src in oview(1) if(usr.incapacitated()) return - do_eject() + start_emergency_eject(usr) -//This proc ejects whomever is inside the cradle, by force if needed depending if the cradle is destroyed or not. -/obj/machinery/robotic_cradle/proc/do_eject(forceeject) +///This proc ejects whomever is inside the cradle while it is presumably operating. mob_ejecting is the mob triggering the eject +/obj/machinery/robotic_cradle/proc/start_emergency_eject(mob/mob_ejecting) if(!occupant) return - if(forceeject) - if(!repairing) - visible_message("\The [src] is destroyed, ejecting [occupant] and showering them in debris.") - occupant.take_limb_damage(rand(10,20),rand(10,20)) - else - visible_message("\The [src] malfunctions as it is destroyed mid-repair, ejecting [occupant] with unfinished repair wounds and showering them in debris.") - occupant.take_limb_damage(rand(30,50),rand(30,50)) - go_out(CRADLE_NOTICE_FORCE_EJECT) - return - if(isxeno(usr) && !repairing) // let xenos eject people hiding inside; a xeno ejecting someone during repair does so like someone untrained - go_out(CRADLE_NOTICE_XENO_FUCKERY) + if(!repairing)//this shouldn't be possible unless you get var edited inside without triggering start_repair_operation(), in that case just get them out + remove_occupant() return - if(!ishuman(usr)) + if(!mob_ejecting) + perform_eject(CRADLE_NOTICE_EARLY_EJECT) return - if(usr == occupant) - if(repairing) - to_chat(usr, span_warning("There's no way you're getting out while this thing is operating on you!")) - return - else - visible_message("[usr] engages the internal release mechanism, and climbs out of \the [src].") - if(usr.skills.getRating(SKILL_ENGINEER) < SKILL_ENGINEER_ENGI) - usr.visible_message(span_notice("[usr] fumbles around figuring out how to use [src]."), - span_notice("You fumble around figuring out how to use [src].")) - var/fumbling_time = max(0 , SKILL_TASK_TOUGH - ( SKILL_TASK_EASY * usr.skills.getRating(SKILL_ENGINEER) ))// 8 secs non-trained, 5 amateur - if(!do_after(usr, fumbling_time, NONE, src, BUSY_ICON_UNSKILLED) || !occupant) + if(isxeno(mob_ejecting)) + mob_ejecting.visible_message(span_notice("[mob_ejecting] pries the cover of [src]"), + span_notice("You begin to pry at the cover of [src].")) + playsound(mob_ejecting,'sound/effects/metal_creaking.ogg', 25, 1) + if(!do_after(mob_ejecting, 2 SECONDS, NONE, src, BUSY_ICON_DANGER) || !occupant) return - if(repairing) - repairing = 0 - if(usr.skills.getRating(SKILL_ENGINEER) < SKILL_ENGINEER_ENGI) //Untrained people will fail to terminate the repair properly. - visible_message("\The [src] malfunctions as [usr] aborts the rapair in progress.") - occupant.take_limb_damage(rand(30,50),rand(30,50)) - log_game("[key_name(usr)] ejected [key_name(occupant)] from the cradle during repair causing damage.") - message_admins("[ADMIN_TPMONTY(usr)] ejected [ADMIN_TPMONTY(occupant)] from the cradle during repair causing damage.") - go_out(CRADLE_NOTICE_IDIOT_EJECT) - return - go_out() + perform_eject(CRADLE_NOTICE_XENO_FUCKERY) + return + if(!ishuman(mob_ejecting)) + return + if(mob_ejecting == occupant) + to_chat(usr, span_warning("There's no way you're getting out while this thing is operating on you!")) + return + perform_eject(CRADLE_NOTICE_EARLY_EJECT) + +#undef CRADLE_NOTICE_SUCCESS +#undef CRADLE_NOTICE_DEATH +#undef CRADLE_NOTICE_NO_POWER +#undef CRADLE_NOTICE_EARLY_EJECT diff --git a/code/game/objects/machinery/seed_extractor.dm b/code/game/objects/machinery/seed_extractor.dm index f7641018c92e5..14ce66e941761 100644 --- a/code/game/objects/machinery/seed_extractor.dm +++ b/code/game/objects/machinery/seed_extractor.dm @@ -9,6 +9,8 @@ /obj/machinery/seed_extractor/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return // Fruits and vegetables. if(istype(I, /obj/item/reagent_containers/food/snacks/grown) || istype(I, /obj/item/grown)) if(!user.temporarilyRemoveItemFromInventory(I)) diff --git a/code/game/objects/machinery/self_destruct.dm b/code/game/objects/machinery/self_destruct.dm index c31edda08bd86..95f89676ce6dd 100644 --- a/code/game/objects/machinery/self_destruct.dm +++ b/code/game/objects/machinery/self_destruct.dm @@ -81,7 +81,7 @@ if("dest_start") to_chat(usr, span_notice("You press a few keys on the panel.")) to_chat(usr, span_notice("The system must be booting up the self-destruct sequence now.")) - priority_announce("Danger. The emergency destruct system is now activated. The ship will detonate in T-minus 20 minutes. Automatic detonation is unavailable. Manual detonation is required.", "Priority Alert", sound = 'sound/AI/selfdestruct.ogg') + priority_announce("Danger. The emergency destruct system is now activated. The ship will detonate in T-minus 20 minutes. Automatic detonation is unavailable. Manual detonation is required.", title = "Self Destruct System", type = ANNOUNCEMENT_PRIORITY, sound = 'sound/AI/selfdestruct.ogg', color_override = "purple") active_state = SELF_DESTRUCT_MACHINE_ARMED var/obj/machinery/self_destruct/rod/I = SSevacuation.dest_rods[SSevacuation.dest_index] I.activate_time = world.time diff --git a/code/game/objects/machinery/sleeper.dm b/code/game/objects/machinery/sleeper.dm index 32cceba5f64ec..de45bf9a75985 100644 --- a/code/game/objects/machinery/sleeper.dm +++ b/code/game/objects/machinery/sleeper.dm @@ -261,6 +261,7 @@ set_light(initial(light_range)) /obj/machinery/sleeper/update_icon_state() + . = ..() if(occupant) icon_state = "[initial(icon_state)]_occupied" else @@ -277,36 +278,50 @@ /obj/machinery/sleeper/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/healthanalyzer) && occupant) //Allows us to use the analyzer on the occupant without taking him out. var/obj/item/healthanalyzer/J = I J.attack(occupant, user) return +/obj/machinery/sleeper/grab_interact(obj/item/grab/grab, mob/user, base_damage = BASE_OBJ_SLAM_DAMAGE, is_sharp = FALSE) + . = ..() + if(.) + return if(isxeno(user)) return - + if(machine_stat & (NOPOWER|BROKEN)) + to_chat(user, span_notice("\ [src] is non-functional!")) + return if(occupant) - to_chat(user, span_notice("The sleeper is already occupied!")) + to_chat(user, span_notice("\ [src] is already occupied!")) return + var/mob/grabbed_mob - if(!istype(I, /obj/item/grab)) - return - - var/obj/item/grab/G = I - if(!ismob(G.grabbed_thing)) + if(ismob(grab.grabbed_thing)) + grabbed_mob = grab.grabbed_thing + else if(istype(grab.grabbed_thing,/obj/structure/closet/bodybag/cryobag)) + var/obj/structure/closet/bodybag/cryobag/cryobag = grab.grabbed_thing + if(!cryobag.bodybag_occupant) + to_chat(user, span_warning("The stasis bag is empty!")) + return + grabbed_mob = cryobag.bodybag_occupant + cryobag.open() + user.start_pulling(grabbed_mob) + if(!grabbed_mob) return - var/mob/M = G.grabbed_thing - if(!M.forceMove(src)) + if(!grabbed_mob.forceMove(src)) return - - visible_message("[user] puts [M] into the sleeper.", 3) - occupant = M + visible_message("[user] puts [grabbed_mob] into the sleeper.", 3) + occupant = grabbed_mob start_processing() connected.start_processing() update_icon() + return TRUE /obj/machinery/sleeper/ex_act(severity) if(filtering) @@ -406,15 +421,15 @@ else to_chat(user, span_notice("There is no one inside!")) -/obj/machinery/sleeper/attack_alien(mob/living/carbon/xenomorph/X, damage_amount, damage_type, damage_flag, effects, armor_penetration, isrightclick) +/obj/machinery/sleeper/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) if(!occupant) - to_chat(X, span_xenowarning("There is nothing of interest in there.")) + to_chat(xeno_attacker, span_xenowarning("There is nothing of interest in there.")) return - if(X.status_flags & INCORPOREAL || X.do_actions) + if(xeno_attacker.status_flags & INCORPOREAL || xeno_attacker.do_actions) return - visible_message(span_warning("[X] begins to pry the [src]'s cover!"), 3) + visible_message(span_warning("[xeno_attacker] begins to pry the [src]'s cover!"), 3) playsound(src,'sound/effects/metal_creaking.ogg', 25, 1) - if(!do_after(X, 2 SECONDS)) + if(!do_after(xeno_attacker, 2 SECONDS)) return playsound(loc, 'sound/effects/metal_creaking.ogg', 25, 1) go_out() diff --git a/code/game/objects/machinery/spaceheater.dm b/code/game/objects/machinery/spaceheater.dm index 2fa3048c05004..56aea6421dc30 100644 --- a/code/game/objects/machinery/spaceheater.dm +++ b/code/game/objects/machinery/spaceheater.dm @@ -72,6 +72,8 @@ /obj/machinery/space_heater/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(!istype(I, /obj/item/cell)) return if(!open) diff --git a/code/game/objects/machinery/squad_manager.dm b/code/game/objects/machinery/squad_manager.dm index a0621b2cda5b5..ecdf7489c4371 100644 --- a/code/game/objects/machinery/squad_manager.dm +++ b/code/game/objects/machinery/squad_manager.dm @@ -1,5 +1,7 @@ #define MAX_SQUAD_NAME_LEN 15 +GLOBAL_DATUM_INIT(squad_manager, /datum/squad_manager, new) + /obj/machinery/computer/squad_manager name = "squad managment console" desc = "A console for squad management. Allows squad leaders to manage their squad." @@ -8,12 +10,21 @@ interaction_flags = INTERACT_OBJ_UI /obj/machinery/computer/squad_manager/ui_interact(mob/user, datum/tgui/ui) + return GLOB.squad_manager.ui_interact(arglist(args)) + +/datum/squad_manager + interaction_flags = INTERACT_UI_INTERACT + +/datum/squad_manager/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) - ui = new(user, src, "SquadManager", name) + ui = new(user, src, "SquadManager", "Squad Management") ui.open() -/obj/machinery/computer/squad_manager/ui_data(mob/user) +/datum/squad_manager/ui_state(mob/user) + return GLOB.conscious_state + +/datum/squad_manager/ui_data(mob/user) var/list/data = list() data["active_squads"] = list() for(var/datum/squad/squad AS in SSjob.active_squads[user.faction]) @@ -22,7 +33,7 @@ data["valid_colors"] = GLOB.custom_squad_colors return data -/obj/machinery/computer/squad_manager/ui_act(action, list/params) +/datum/squad_manager/ui_act(action, list/params) . = ..() if(.) return @@ -77,5 +88,5 @@ log_game(log_msg) message_admins(log_msg) new_squad.desc = new_desc - ui_close(user) - balloon_alert(user, "\"[new_name]\" created") + SStgui.close_user_uis(usr, src) + user.balloon_alert(user, "\"[new_name]\" created") diff --git a/code/game/objects/machinery/squad_selector.dm b/code/game/objects/machinery/squad_selector.dm index 9c12e733c5a8c..e7f0df80ba42f 100644 --- a/code/game/objects/machinery/squad_selector.dm +++ b/code/game/objects/machinery/squad_selector.dm @@ -1,3 +1,5 @@ +GLOBAL_DATUM_INIT(squad_selector, /datum/squad_selector, new) + /obj/machinery/computer/squad_selector name = "squad selection console" desc = "A console for squad management. Allows users to join a squad." @@ -8,12 +10,21 @@ interaction_flags = INTERACT_OBJ_UI /obj/machinery/computer/squad_selector/ui_interact(mob/user, datum/tgui/ui) + return GLOB.squad_selector.ui_interact(arglist(args)) + +/datum/squad_selector + interaction_flags = INTERACT_UI_INTERACT + +/datum/squad_selector/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) - ui = new(user, src, "SquadSelector", name) + ui = new(user, src, "SquadSelector", "Squad Selection") ui.open() -/obj/machinery/computer/squad_selector/ui_data(mob/user) +/datum/squad_selector/ui_state(mob/user) + return GLOB.conscious_state + +/datum/squad_selector/ui_data(mob/user) var/list/data = list() if(!SSjob.active_squads[user.faction]) return data @@ -24,7 +35,7 @@ data["active_squads"] = squad_data return data -/obj/machinery/computer/squad_selector/ui_act(action, list/params) +/datum/squad_selector/ui_act(action, list/params) . = ..() if(.) return @@ -37,3 +48,4 @@ if(new_squad == user.assigned_squad) return user.change_squad(new_squad_id) + SStgui.close_user_uis(usr, src) diff --git a/code/game/objects/machinery/squad_supply/supply_beacon.dm b/code/game/objects/machinery/squad_supply/supply_beacon.dm index f4df56df68bf8..0ffc3da886c45 100644 --- a/code/game/objects/machinery/squad_supply/supply_beacon.dm +++ b/code/game/objects/machinery/squad_supply/supply_beacon.dm @@ -1,160 +1,10 @@ -/obj/item/beacon - w_class = WEIGHT_CLASS_SMALL - /// If this beacon is activated - var/activated = FALSE - /// How long to activate this beacon - var/activation_time = 80 - /// The icon when acticated - var/icon_activated = "" - /// The camera attached to the beacon - var/obj/machinery/camera/beacon_cam = null - ///Can work underground - var/underground_signal = FALSE - -/obj/item/beacon/update_icon_state() - icon_state = activated ? icon_activated : initial(icon_state) - -/obj/item/beacon/attack_self(mob/living/carbon/human/H) - if(!istype(H)) - return - activate(H) - -/obj/item/beacon/attack_hand(mob/living/carbon/human/H) - if(!ishuman(H)) - return ..() - if(activated) - deactivate(H) - return - return ..() - -/// Set this beacon on the ground and activate it -/obj/item/beacon/proc/activate(mob/living/carbon/human/H) - if(!is_ground_level(H.z)) - to_chat(H, span_warning("You have to be on the planet to use this or it won't transmit.")) - return FALSE - var/area/A = get_area(H) - if(A && istype(A) && A.ceiling >= CEILING_DEEP_UNDERGROUND && !underground_signal) - to_chat(H, span_warning("This won't work if you're standing deep underground.")) - return FALSE - if(istype(A, /area/shuttle/dropship)) - to_chat(H, span_warning("You have to be outside the dropship to use this or it won't transmit.")) - return FALSE - var/delay = max(1.5 SECONDS, activation_time - 2 SECONDS * H.skills.getRating(SKILL_LEADERSHIP)) - H.visible_message(span_notice("[H] starts setting up [src] on the ground."), - span_notice("You start setting up [src] on the ground and inputting all the data it needs.")) - if(!do_after(H, delay, NONE, src, BUSY_ICON_GENERIC)) - return FALSE - var/obj/machinery/camera/beacon_cam/BC = new(src, "[H.get_paygrade()] [H.name] [src]") - H.transferItemToLoc(src, H.loc) - beacon_cam = BC - message_admins("[ADMIN_TPMONTY(usr)] set up a supply beacon.") - name = "transmitting orbital beacon - [get_area(src)] - [H]" - activated = TRUE - anchored = TRUE - w_class = WEIGHT_CLASS_GIGANTIC - layer = ABOVE_FLY_LAYER - set_light(2, 1) - playsound(src, 'sound/machines/twobeep.ogg', 15, 1) - H.visible_message("[H] activates [src].", - "You activate [src].") - - var/marker_flags = GLOB.faction_to_minimap_flag[H.faction] - if(!marker_flags) - marker_flags = MINIMAP_FLAG_MARINE - //RUTGMC EDIT CHANGE BEGIN - ORBITAL_BEACON - //SSminimaps.add_marker(src, marker_flags, image('icons/UI_icons/map_blips.dmi', null, "supply")) RUTGMC EDIT - ORIGINAL - SSminimaps.add_marker(src, marker_flags, image('modular_RUtgmc/icons/UI_icons/map_blips.dmi', null, beacon_mini_icon, ABOVE_FLOAT_LAYER)) - //RUTGMC EDIT CHANGE END - update_icon() - return TRUE - -/// Deactivate this beacon and put it in the hand of the human -/obj/item/beacon/proc/deactivate(mob/living/carbon/human/H) - var/delay = max(1 SECONDS, activation_time * 0.5 - 2 SECONDS * H.skills.getRating(SKILL_LEADERSHIP)) //Half as long as setting it up. - H.visible_message(span_notice("[H] starts removing [src] from the ground."), - span_notice("You start removing [src] from the ground, deactivating it.")) - if(!do_after(H, delay, NONE, src, BUSY_ICON_GENERIC)) - return FALSE - QDEL_NULL(beacon_cam) - activated = FALSE - anchored = FALSE - w_class = initial(w_class) - layer = initial(layer) - name = initial(name) - set_light(0) - playsound(src, 'sound/machines/twobeep.ogg', 15, 1) - H.visible_message("[H] deactivates [src].", - "You deactivate [src].") - H.put_in_active_hand(src) - SSminimaps.remove_marker(src) - update_icon() - return TRUE - -/obj/item/beacon/Destroy() - if(beacon_cam) - qdel(beacon_cam) - beacon_cam = null - return ..() - -/obj/item/beacon/supply_beacon +/obj/item/supply_beacon name = "supply beacon" desc = "A rugged, glorified laser pointer capable of sending a beam into space. Activate and throw this to call for a supply drop." icon = 'icons/Marine/marine-navigation.dmi' icon_state = "motion0" - icon_activated = "motion2" - activation_time = 60 - /// Reference to the datum used by the supply drop console - var/datum/supply_beacon/beacon_datum - -/obj/item/beacon/supply_beacon/Destroy() - if(beacon_datum) - UnregisterSignal(beacon_datum, COMSIG_QDELETING) - QDEL_NULL(beacon_datum) - return ..() - -/// Signal handler to nullify beacon datum -/obj/item/beacon/supply_beacon/proc/clean_beacon_datum() - SIGNAL_HANDLER - beacon_datum = null - -/obj/item/beacon/supply_beacon/onTransitZ(old_z,new_z) - . = ..() - //Assumes doMove sets loc before onTransitZ - if(beacon_datum) // RUTGMC ADDITION, supply beacon runtime fix - beacon_datum.drop_location = loc - -/obj/item/beacon/supply_beacon/activate(mob/living/carbon/human/H) - var/area/A = get_area(H) - . = ..() - if(!.) - return - beacon_datum = new /datum/supply_beacon("[H.name] + [A]", loc, H.faction) - RegisterSignal(beacon_datum, COMSIG_QDELETING, PROC_REF(clean_beacon_datum)) + w_class = WEIGHT_CLASS_SMALL -/obj/item/beacon/supply_beacon/deactivate(mob/living/carbon/human/H) +/obj/item/supply_beacon/Initialize(mapload) . = ..() - if(!.) - return - UnregisterSignal(beacon_datum, COMSIG_QDELETING) - QDEL_NULL(beacon_datum) - -/datum/supply_beacon - /// Name printed on the supply console - var/name = "" - /// Where the supply drops will land - var/turf/drop_location - /// The faction of the beacon - var/faction = "" - -/datum/supply_beacon/New(_name, turf/_drop_location, _faction, life_time = 0 SECONDS) - name = _name - drop_location = _drop_location - faction = _faction - GLOB.supply_beacon[name] = src - if(life_time) - QDEL_IN(src, life_time) - -/// Remove that beacon from the list of glob supply beacon -/datum/supply_beacon/Destroy() - GLOB.supply_beacon -= name - return ..() + AddComponent(/datum/component/beacon, TRUE, 60, "motion2") diff --git a/code/game/objects/machinery/squad_supply/supply_console.dm b/code/game/objects/machinery/squad_supply/supply_console.dm index 18c246a5ea5fd..285b54ab0bc9e 100644 --- a/code/game/objects/machinery/squad_supply/supply_console.dm +++ b/code/game/objects/machinery/squad_supply/supply_console.dm @@ -25,6 +25,7 @@ /obj/machinery/computer/supplydrop_console/Initialize(mapload) . = ..() + RegisterSignal(SSdcs, COMSIG_GLOB_SUPPLY_BEACON_CREATED, PROC_REF(ping_beacon)) return INITIALIZE_HINT_LATELOAD /obj/machinery/computer/supplydrop_console/LateInitialize() @@ -34,6 +35,11 @@ supply_pad = _supply_pad return +/// Used to notify of a new beacon target +/obj/machinery/computer/supplydrop_console/proc/ping_beacon() + SIGNAL_HANDLER + playsound(src,'sound/machines/terminal_prompt_confirm.ogg', 50, TRUE) + /obj/machinery/computer/supplydrop_console/Destroy() supply_beacon = null supply_pad = null @@ -68,8 +74,14 @@ switch(action) if("select_beacon") - var/datum/supply_beacon/supply_beacon_choice = GLOB.supply_beacon[tgui_input_list(ui.user, "Select the beacon to send supplies", "Beacon choice", GLOB.supply_beacon)] - if(!istype(supply_beacon_choice)) + var/list/beacon_list = GLOB.supply_beacon.Copy() + for(var/beacon_name in beacon_list) + var/datum/supply_beacon/beacon = beacon_list[beacon_name] + if(!is_ground_level(beacon.drop_location.z)) + beacon_list -= beacon_name + continue + var/datum/supply_beacon/supply_beacon_choice = beacon_list[tgui_input_list(ui.user, "Select the beacon to send supplies", "Beacon choice", beacon_list)] + if(!istype(supply_beacon_choice) && is_ground_level(supply_beacon.drop_location.z)) return supply_beacon = supply_beacon_choice RegisterSignal(supply_beacon, COMSIG_QDELETING, PROC_REF(clean_supply_beacon), override = TRUE) diff --git a/code/game/objects/machinery/suit_storage_unit.dm b/code/game/objects/machinery/suit_storage_unit.dm index 3d4a67b897e4f..1a8a884f7b5cf 100644 --- a/code/game/objects/machinery/suit_storage_unit.dm +++ b/code/game/objects/machinery/suit_storage_unit.dm @@ -35,31 +35,32 @@ inserted_tank = new starting_tank_type(src) update_icon() - -/obj/machinery/suit_storage_unit/update_icon() - overlays.Cut() - if(isUV) - icon_state = "disinfecting" +/obj/machinery/suit_storage_unit/update_overlays() + . = ..() + if(isUV || !isopen) return - else if(isopen) - if(inserted_helmet) - overlays += image("helmet") - if(inserted_suit) - overlays += image("suit") - if(inserted_mask) - overlays += image("mask") - if(inserted_tank) - overlays += image("tank") + if(inserted_helmet) + . += image("helmet") + if(inserted_suit) + . += image("suit") + if(inserted_mask) + . += image("mask") + if(inserted_tank) + . += image("tank") - icon_state = "open" +/obj/machinery/suit_storage_unit/update_icon_state() + . = ..() + if(isUV) + return + if(isopen) + icon_state = "open" else icon_state = "closed" if(machine_stat & NOPOWER) icon_state += "_off" - /obj/machinery/suit_storage_unit/power_change() ..() if(machine_stat & NOPOWER) @@ -228,6 +229,8 @@ /obj/machinery/suit_storage_unit/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(machine_stat & NOPOWER) return diff --git a/code/game/objects/machinery/telecomms/broadcasting.dm b/code/game/objects/machinery/telecomms/broadcasting.dm index 54fd59fbc57e3..e87c0718dc798 100644 --- a/code/game/objects/machinery/telecomms/broadcasting.dm +++ b/code/game/objects/machinery/telecomms/broadcasting.dm @@ -186,7 +186,7 @@ // Add observers who have ghost radio enabled. for(var/mob/dead/observer/ghost in GLOB.player_list) - if(ghost.client.prefs.toggles_chat & CHAT_GHOSTRADIO) + if(ghost?.client?.prefs?.toggles_chat & CHAT_GHOSTRADIO) receive |= ghost // Render the message and have everybody hear it. diff --git a/code/game/objects/machinery/telecomms/telecomunications.dm b/code/game/objects/machinery/telecomms/telecomunications.dm index 37eee7febe775..523f07c031a19 100644 --- a/code/game/objects/machinery/telecomms/telecomunications.dm +++ b/code/game/objects/machinery/telecomms/telecomunications.dm @@ -144,7 +144,8 @@ GLOBAL_LIST_EMPTY(telecomms_freq_listening_list) return -/obj/machinery/telecomms/update_icon() +/obj/machinery/telecomms/update_icon_state() + . = ..() if(on) if(CHECK_BITFIELD(machine_stat, PANEL_OPEN)) icon_state = "[initial(icon_state)]_o" diff --git a/code/game/objects/machinery/vending/beginner_vendor.dm b/code/game/objects/machinery/vending/beginner_vendor.dm new file mode 100644 index 0000000000000..3824ab4aad171 --- /dev/null +++ b/code/game/objects/machinery/vending/beginner_vendor.dm @@ -0,0 +1,39 @@ +//Beginner Vendor + +GLOBAL_LIST_INIT(beginner_loadouts, init_beginner_loadouts()) + +/proc/init_beginner_loadouts() //List of all loadouts in quick_load_beginners.dm + . = list() + var/list/loadout_list = list( + /datum/outfit/quick/beginner/marine/rifleman, + /datum/outfit/quick/beginner/marine/machinegunner, + /datum/outfit/quick/beginner/marine/marksman, + /datum/outfit/quick/beginner/marine/shotgunner, + /datum/outfit/quick/beginner/marine/shocktrooper, + /datum/outfit/quick/beginner/marine/hazmat, + /datum/outfit/quick/beginner/marine/cqc, + /datum/outfit/quick/beginner/marine/chad, + /datum/outfit/quick/beginner/engineer/builder, + /datum/outfit/quick/beginner/engineer/burnitall, + /datum/outfit/quick/beginner/engineer/pcenjoyer, + /datum/outfit/quick/beginner/corpsman/lifesaver, + /datum/outfit/quick/beginner/corpsman/hypobelt, + /datum/outfit/quick/beginner/smartgunner/sg29, + /datum/outfit/quick/beginner/smartgunner/sg85, + ) + + for(var/X in loadout_list) + .[X] = new X + +/obj/machinery/quick_vendor/beginner //Loadout vendor that shits out basic pre-made loadouts so new players can get something usable + icon_state = "loadoutvendor" + categories = list( + "Squad Marine", + "Squad Engineer", + "Squad Corpsman", + "Squad Smartgunner", + ) + drop_worn_items = TRUE + +/obj/machinery/quick_vendor/beginner/set_stock_list() + global_list_to_use = GLOB.beginner_loadouts diff --git a/code/game/objects/machinery/vending/loadout_vendor.dm b/code/game/objects/machinery/vending/loadout_vendor.dm index ba5fd54604b59..42539a1bc0d42 100644 --- a/code/game/objects/machinery/vending/loadout_vendor.dm +++ b/code/game/objects/machinery/vending/loadout_vendor.dm @@ -26,6 +26,7 @@ set_light(0) /obj/machinery/loadout_vendor/update_icon_state() + . = ..() if(is_operational()) icon_state = initial(icon_state) else diff --git a/code/game/objects/machinery/vending/marine_vending.dm b/code/game/objects/machinery/vending/marine_vending.dm index 0c65676120a03..ce3dfdcdca327 100644 --- a/code/game/objects/machinery/vending/marine_vending.dm +++ b/code/game/objects/machinery/vending/marine_vending.dm @@ -23,18 +23,23 @@ ), "Energy Weapons" = list( /obj/item/cell/lasgun/lasrifle = -1, + /obj/item/cell/lasgun/volkite/powerpack/marine = -1, /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_rifle = -1, /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_sniper = -1, /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_carbine = -1, /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_mlaser = -1, /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_pistol = -1, /obj/item/weapon/gun/energy/lasgun/lasrifle/tesla = 2, + /obj/item/cell/lasgun/plasma = -1, ), "SMGs" = list( /obj/item/weapon/gun/smg/standard_smg = -1, /obj/item/ammo_magazine/smg/standard_smg = -1, /obj/item/weapon/gun/smg/standard_machinepistol = -1, /obj/item/ammo_magazine/smg/standard_machinepistol = -1, + /obj/item/weapon/gun/smg/standard_heavysmg = -1, + /obj/item/ammo_magazine/smg/standard_heavysmg = -1, + /obj/item/ammo_magazine/smg/standard_heavysmg/squashhead = -1, ), "Marksman" = list( /obj/item/weapon/gun/rifle/standard_dmr = -1, @@ -80,7 +85,6 @@ /obj/item/weapon/twohanded/spear/tactical = -1, /obj/item/weapon/twohanded/glaive/harvester = -1, /obj/item/weapon/powerfist = -1, - /obj/item/weapon/shield/riot/marine = 6, /obj/item/weapon/shield/riot/marine/deployable = 6, /obj/item/weapon/combat_knife/harvester = 12, ), @@ -116,9 +120,11 @@ /obj/item/explosive/grenade/incendiary = 50, /obj/item/explosive/grenade/smokebomb = 25, /obj/item/explosive/grenade/smokebomb/cloak = 25, + /obj/item/explosive/grenade/smokebomb/antigas = 20, /obj/item/explosive/grenade/sticky/cloaker = 10, - /obj/item/explosive/grenade/smokebomb/drain = 10, /obj/item/explosive/grenade/mirage = 100, + /obj/item/explosive/grenade/bullet/laser = 30, + /obj/item/explosive/grenade/bullet/hefa = 10, /obj/item/storage/box/m94 = 200, /obj/item/storage/box/m94/cas = 30, ), @@ -136,7 +142,7 @@ /obj/structure/closet/crate/mortar_ammo/mortar_kit = 1, /obj/structure/closet/crate/mortar_ammo/howitzer_kit = 1, /obj/item/storage/box/crate/sentry = 4, - /obj/item/storage/box/tl102 = 1, + /obj/item/storage/box/hsg_102 = 1, /obj/item/weapon/gun/heavymachinegun = 1, /obj/item/ammo_magazine/heavymachinegun = 5, /obj/item/ammo_magazine/heavymachinegun/small = 10, @@ -169,8 +175,6 @@ /obj/item/ammo_magazine/rifle/pepperball/pepperball_mini = -1, /obj/item/attachable/stock/t76 = -1, /obj/item/attachable/flamer_nozzle = -1, - /obj/item/attachable/flamer_nozzle/wide = -1, - /obj/item/attachable/flamer_nozzle/long = -1, ), "Boxes" = list( /obj/item/ammo_magazine/packet/p9mm = -1, @@ -239,18 +243,23 @@ ), "Energy Weapons" = list( /obj/item/cell/lasgun/lasrifle = -1, + /obj/item/cell/lasgun/volkite/powerpack/marine = -1, /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_rifle = -1, /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_sniper = -1, /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_carbine = -1, /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_mlaser = -1, /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_pistol = -1, /obj/item/weapon/gun/energy/lasgun/lasrifle/tesla = 2, + /obj/item/cell/lasgun/plasma = -1, ), "SMGs" = list( /obj/item/weapon/gun/smg/standard_smg = -1, /obj/item/ammo_magazine/smg/standard_smg = -1, /obj/item/weapon/gun/smg/standard_machinepistol = -1, /obj/item/ammo_magazine/smg/standard_machinepistol = -1, + /obj/item/weapon/gun/smg/standard_heavysmg = -1, + /obj/item/ammo_magazine/smg/standard_heavysmg = -1, + /obj/item/ammo_magazine/smg/standard_heavysmg/squashhead = -1, ), "Marksman" = list( /obj/item/weapon/gun/rifle/standard_dmr = -1, @@ -295,7 +304,6 @@ /obj/item/weapon/twohanded/spear/tactical = -1, /obj/item/weapon/twohanded/glaive/harvester = -1, /obj/item/weapon/powerfist = -1, - /obj/item/weapon/shield/riot/marine = 6, /obj/item/weapon/shield/riot/marine/deployable = 6, /obj/item/weapon/combat_knife/harvester = 12, ), @@ -306,7 +314,6 @@ /obj/item/ammo_magazine/pistol/standard_heavypistol = -1, /obj/item/weapon/gun/revolver/standard_revolver = -1, /obj/item/ammo_magazine/revolver/standard_revolver = -1, - /obj/item/weapon/gun/revolver/standard_magnum = -1, /obj/item/ammo_magazine/revolver/standard_magnum = -1, /obj/item/weapon/gun/pistol/standard_pocketpistol = -1, /obj/item/ammo_magazine/pistol/standard_pocketpistol = -1, @@ -325,8 +332,9 @@ /obj/item/explosive/grenade/sticky = 125, /obj/item/explosive/grenade/incendiary = 50, /obj/item/explosive/grenade/smokebomb/cloak = 25, - /obj/item/explosive/grenade/smokebomb/drain = 10, + /obj/item/explosive/grenade/smokebomb/antigas = 20, /obj/item/explosive/grenade/mirage = 100, + /obj/item/explosive/grenade/bullet/laser = 30, /obj/item/storage/box/m94 = 200, /obj/item/storage/box/m94/cas = 50, ), @@ -367,8 +375,6 @@ /obj/item/ammo_magazine/rifle/pepperball/pepperball_mini = -1, /obj/item/attachable/stock/t76 = -1, /obj/item/attachable/flamer_nozzle = -1, - /obj/item/attachable/flamer_nozzle/wide = -1, - /obj/item/attachable/flamer_nozzle/long = -1, ), "Boxes" = list( /obj/item/ammo_magazine/packet/p9mm = -1, @@ -437,18 +443,25 @@ ), "Energy Weapons" = list( /obj/item/cell/lasgun/lasrifle = -1, + /obj/item/cell/lasgun/volkite/powerpack/marine = -1, /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_rifle = -1, /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_sniper = -1, /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_carbine = -1, /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_mlaser = -1, /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_pistol = -1, /obj/item/weapon/gun/energy/lasgun/lasrifle/tesla = -1, + /obj/item/cell/lasgun/plasma = -1, + /obj/item/weapon/gun/energy/lasgun/lasrifle/plasma/rifle = -1, + /obj/item/weapon/gun/energy/lasgun/lasrifle/plasma/cannon = -1, ), "SMGs" = list( /obj/item/weapon/gun/smg/standard_smg = -1, /obj/item/ammo_magazine/smg/standard_smg = -1, /obj/item/weapon/gun/smg/standard_machinepistol = -1, /obj/item/ammo_magazine/smg/standard_machinepistol = -1, + /obj/item/weapon/gun/smg/standard_heavysmg = -1, + /obj/item/ammo_magazine/smg/standard_heavysmg = -1, + /obj/item/ammo_magazine/smg/standard_heavysmg/squashhead = -1, ), "Marksman" = list( /obj/item/weapon/gun/rifle/standard_dmr = -1, @@ -457,6 +470,7 @@ /obj/item/ammo_magazine/rifle/standard_br = -1, /obj/item/weapon/gun/rifle/chambered = -1, /obj/item/ammo_magazine/rifle/chamberedrifle = -1, + /obj/item/ammo_magazine/rifle/chamberedrifle/flak = -1, /obj/item/weapon/gun/shotgun/pump/bolt = -1, /obj/item/ammo_magazine/rifle/bolt = -1, /obj/item/weapon/gun/shotgun/double/martini = -1, @@ -525,14 +539,18 @@ /obj/item/ammo_magazine/rifle/tx54/smoke = -1, /obj/item/ammo_magazine/rifle/tx54/smoke/dense = -1, /obj/item/ammo_magazine/rifle/tx54/smoke/tangle = -1, + /obj/item/ammo_magazine/rifle/tx54/smoke/acid = -1, + /obj/item/ammo_magazine/rifle/tx54/razor = -1, /obj/item/explosive/grenade = -1, /obj/item/explosive/grenade/m15 = -1, /obj/item/explosive/grenade/sticky = -1, /obj/item/explosive/grenade/sticky/trailblazer = -1, /obj/item/explosive/grenade/incendiary = -1, /obj/item/explosive/grenade/smokebomb/cloak = -1, - /obj/item/explosive/grenade/smokebomb/drain = -1, + /obj/item/explosive/grenade/smokebomb/antigas = -1, /obj/item/explosive/grenade/mirage = -1, + /obj/item/explosive/grenade/bullet/laser = -1, + /obj/item/explosive/grenade/bullet/hefa = -1, /obj/item/storage/box/m94 = -1, /obj/item/storage/box/m94/cas = -1, ), @@ -547,23 +565,11 @@ "Heavy Weapons" = list( /obj/structure/closet/crate/mortar_ammo/mortar_kit = -1, /obj/structure/closet/crate/mortar_ammo/howitzer_kit = -1, - /obj/structure/largecrate/supply/weapons/standard_atgun = -1, - /obj/item/ammo_magazine/standard_atgun = -1, - /obj/item/ammo_magazine/standard_atgun/apcr = -1, - /obj/item/ammo_magazine/standard_atgun/he = -1, - /obj/item/ammo_magazine/standard_atgun/beehive = -1, - /obj/item/ammo_magazine/standard_atgun/incend = -1, /obj/item/storage/box/crate/sentry = -1, - /obj/item/storage/box/tl102 = -1, + /obj/item/storage/box/hsg_102 = -1, /obj/item/weapon/gun/heavymachinegun = -1, /obj/item/ammo_magazine/heavymachinegun = -1, - /obj/item/storage/holster/backholster/rpg/full = -1, - /obj/item/ammo_magazine/rocket/recoilless = -1, - /obj/item/ammo_magazine/rocket/recoilless/light = -1, - /obj/item/ammo_magazine/rocket/recoilless/heat = -1, - /obj/item/ammo_magazine/rocket/recoilless/cloak = -1, - /obj/item/ammo_magazine/rocket/recoilless/smoke = -1, - /obj/item/ammo_magazine/rocket/recoilless/plasmaloss = -1, + /obj/item/ammo_magazine/heavymachinegun/small = -1, ), "Attachments" = list( /obj/item/attachable/bayonet = -1, @@ -712,7 +718,7 @@ products = list( "Surplus Special Equipment" = list( /obj/item/pinpointer = 1, - /obj/item/beacon/supply_beacon = 1, + /obj/item/supply_beacon = 1, /obj/item/ammo_magazine/rifle/autosniper = 3, /obj/item/ammo_magazine/rifle/tx8 = 3, /obj/item/ammo_magazine/rocket/sadar = 3, @@ -747,6 +753,7 @@ /obj/item/storage/box/visual/grenade/incendiary = 2, /obj/item/storage/box/visual/grenade/M15 = 2, /obj/item/storage/box/visual/grenade/cloak = 1, + /obj/item/storage/box/visual/grenade/lasburster = 1, ), "Ammo Boxes" = list( /obj/item/big_ammo_box = -1, @@ -821,7 +828,8 @@ . = ..() update_icon() -/obj/machinery/vending/lasgun/update_icon() +/obj/machinery/vending/lasgun/update_icon_state() + . = ..() if(machine_max_charge) switch(machine_current_charge / max(1,machine_max_charge)) if(0.7 to 1) @@ -915,7 +923,6 @@ /obj/item/reagent_containers/hypospray/autoinjector/imidazoline = 20, /obj/item/reagent_containers/hypospray/autoinjector/quickclot = 10, /obj/item/reagent_containers/hypospray/autoinjector/medicalnanites = 20, - /obj/item/reagent_containers/hypospray/autoinjector/russian_red = 10, ), "Heal Pack" = list( /obj/item/stack/medical/heal_pack/gauze = -1, @@ -1069,7 +1076,7 @@ "General" = list( /obj/item/clothing/suit/modular = -1, /obj/item/clothing/suit/modular/rownin = -1, - /obj/item/clothing/suit/modular/xenonauten/pilot = -1, + /obj/item/clothing/suit/storage/marine/ballistic = -1, /obj/item/facepaint/green = -1, ), "Armor modules" = list( @@ -1097,19 +1104,6 @@ /obj/item/armor_module/module/style/light_armor = -1, /obj/item/armor_module/module/style/medium_armor = -1, /obj/item/armor_module/module/style/heavy_armor = -1, - /obj/item/clothing/head/modular/marine/kabuto = -1, - /obj/item/armor_module/armor/chest/marine/kabuto = -1, - /obj/item/armor_module/armor/legs/marine/kabuto = -1, - /obj/item/armor_module/armor/arms/marine/kabuto = -1, - /obj/item/clothing/head/modular/marine/hotaru = -1, - /obj/item/clothing/suit/modular/jaeger/hotaru = -1, - /obj/item/armor_module/armor/chest/marine/hotaru = -1, - /obj/item/armor_module/armor/legs/marine/hotaru = -1, - /obj/item/armor_module/armor/arms/marine/hotaru = -1, - /obj/item/clothing/head/modular/marine/dashe = -1, - /obj/item/armor_module/armor/chest/marine/dashe = -1, - /obj/item/armor_module/armor/arms/marine/dashe = -1, - /obj/item/armor_module/armor/legs/marine/dashe = -1, ), "Jaeger Mk.I chestpieces" = list( /obj/item/armor_module/armor/chest/marine/skirmisher = -1, @@ -1417,12 +1411,15 @@ /obj/item/ammo_magazine/railgun = -1, /obj/item/ammo_magazine/railgun/smart = -1, /obj/item/ammo_magazine/railgun/hvap = -1, - /obj/item/weapon/gun/rifle/tx8 = -1, - /obj/item/ammo_magazine/rifle/tx8 = -1, - /obj/item/ammo_magazine/rifle/tx8/impact = -1, - /obj/item/ammo_magazine/rifle/tx8/incendiary = -1, /obj/item/ammo_magazine/packet/scout_rifle = -1, /obj/item/weapon/gun/energy/lasgun/lasrifle/xray = -1, + /obj/item/weapon/gun/launcher/rocket/recoillessrifle = -1, + /obj/item/ammo_magazine/rocket/recoilless = -1, + /obj/item/ammo_magazine/rocket/recoilless/light = -1, + /obj/item/ammo_magazine/rocket/recoilless/heat = -1, + /obj/item/ammo_magazine/rocket/recoilless/cloak = -1, + /obj/item/ammo_magazine/rocket/recoilless/smoke = -1, + /obj/item/ammo_magazine/rocket/recoilless/plasmaloss = -1, /obj/item/weapon/gun/launcher/rocket/m57a4/t57 = -1, /obj/item/ammo_magazine/rocket/m57a4 = -1, /obj/item/weapon/gun/launcher/rocket/sadar/valhalla = -1, @@ -1433,18 +1430,8 @@ /obj/item/ammo_magazine/rocket/sadar/wp/unguided = -1, /obj/item/weapon/gun/shotgun/zx76 = -1, /obj/item/ammo_magazine/shotgun/incendiary = -1, - /obj/item/weapon/gun/rifle/standard_autosniper = -1, - /obj/item/ammo_magazine/rifle/autosniper = -1, - /obj/item/weapon/gun/rifle/sniper/antimaterial = -1, - /obj/item/ammo_magazine/sniper = -1, - /obj/item/ammo_magazine/rifle/autosniper = -1, /obj/item/weapon/gun/minigun/valhalla = -1, /obj/item/ammo_magazine/minigun_powerpack = -1, - /obj/item/weapon/gun/rifle/standard_smartmachinegun = -1, - /obj/item/ammo_magazine/standard_smartmachinegun = -1, - /obj/item/weapon/gun/minigun/smart_minigun = -1, - /obj/item/ammo_magazine/minigun_powerpack/smartgun = -1, - /obj/item/ammo_magazine/packet/smart_minigun = -1, /obj/item/weapon/gun/launcher/rocket/oneuse = -1, /obj/item/storage/holster/belt/mateba/full = -1, /obj/item/ammo_magazine/revolver/mateba = -1, @@ -1459,13 +1446,50 @@ /obj/item/explosive/grenade/smokebomb/neuro = -1, /obj/item/explosive/grenade/smokebomb/acid = -1, /obj/item/explosive/grenade/smokebomb/satrapine = -1, + /obj/item/explosive/grenade/smokebomb/drain = -1, + /obj/item/explosive/grenade/chem_grenade/cleaner = -1, /obj/item/weapon/gun/rifle/m412l1_hpr = -1, /obj/item/ammo_magazine/m412l1_hpr = -1, /obj/item/weapon/gun/rifle/famas = -1, /obj/item/ammo_magazine/rifle/famas = -1, ), + "Smartguns/IFF" = list( + /obj/item/weapon/gun/rifle/standard_smartmachinegun = -1, + /obj/item/ammo_magazine/standard_smartmachinegun = -1, + /obj/item/weapon/gun/minigun/smart_minigun = -1, + /obj/item/ammo_magazine/minigun_powerpack/smartgun = -1, + /obj/item/ammo_magazine/packet/smart_minigun = -1, + /obj/item/weapon/gun/rifle/standard_smarttargetrifle = -1, + /obj/item/ammo_magazine/rifle/standard_smarttargetrifle = -1, + /obj/item/ammo_magazine/packet/smart_targetrifle = -1, + /obj/item/ammo_magazine/rifle/standard_spottingrifle = -1, + /obj/item/ammo_magazine/rifle/standard_spottingrifle/highimpact = -1, + /obj/item/ammo_magazine/rifle/standard_spottingrifle/heavyrubber = -1, + /obj/item/ammo_magazine/rifle/standard_spottingrifle/tungsten = -1, + /obj/item/ammo_magazine/rifle/standard_spottingrifle/flak = -1, + /obj/item/ammo_magazine/rifle/standard_spottingrifle/plasmaloss = -1, + /obj/item/ammo_magazine/rifle/standard_spottingrifle/incendiary = -1, + /obj/item/weapon/gun/pistol/smart_pistol = -1, + /obj/item/ammo_magazine/pistol/standard_pistol/smart_pistol = -1, + /obj/item/weapon/gun/rifle/tx8 = -1, + /obj/item/ammo_magazine/rifle/tx8 = -1, + /obj/item/ammo_magazine/rifle/tx8/impact = -1, + /obj/item/ammo_magazine/rifle/tx8/incendiary = -1, + /obj/item/weapon/gun/rifle/standard_autosniper = -1, + /obj/item/ammo_magazine/rifle/autosniper = -1, + /obj/item/weapon/gun/rifle/sniper/antimaterial = -1, + /obj/item/ammo_magazine/sniper = -1, + /obj/item/ammo_magazine/sniper/incendiary = -1, + /obj/item/ammo_magazine/sniper/flak = -1, + ), "Mounted" = list( - /obj/item/weapon/gun/standard_auto_cannon = -1, + /obj/item/weapon/gun/standard_atgun = -1, + /obj/item/ammo_magazine/standard_atgun = -1, + /obj/item/ammo_magazine/standard_atgun/apcr = -1, + /obj/item/ammo_magazine/standard_atgun/he = -1, + /obj/item/ammo_magazine/standard_atgun/beehive = -1, + /obj/item/ammo_magazine/standard_atgun/incend = -1, + /obj/structure/largecrate/supply/weapons/standard_flakgun = -1, /obj/item/ammo_magazine/auto_cannon = -1, /obj/item/ammo_magazine/auto_cannon/flak = -1, /obj/item/weapon/gun/standard_minigun = -1, @@ -1477,7 +1501,7 @@ /obj/item/ammo_magazine/standard_agls/flare = -1, /obj/item/ammo_magazine/standard_agls/cloak = -1, /obj/item/ammo_magazine/standard_agls/tanglefoot = -1, - /obj/item/weapon/gun/heavy_isg = -1, + /obj/structure/largecrate/supply/weapons/heavy_flakgun = -1, /obj/item/ammo_magazine/heavy_isg/he = -1, /obj/item/ammo_magazine/heavy_isg/sabot = -1, ), @@ -1490,15 +1514,15 @@ /obj/item/clothing/gloves/marine/specialist = -1, /obj/item/clothing/suit/storage/marine/B17/valhalla = -1, /obj/item/clothing/head/helmet/marine/grenadier = -1, - /obj/item/storage/backpack/marine/satchel/scout_cloak/scout = -1, + /obj/item/storage/backpack/marine/satchel/scout_cloak = -1, /obj/item/storage/backpack/marine/satchel/scout_cloak/sniper = -1, /obj/item/storage/belt/grenade/b17 = -1, + /obj/item/storage/holster/m25 = -1, /obj/item/armor_module/module/valkyrie_autodoc = -1, /obj/item/armor_module/module/fire_proof = -1, /obj/item/armor_module/module/fire_proof_helmet = -1, /obj/item/armor_module/module/tyr_extra_armor = -1, /obj/item/armor_module/module/tyr_head = -1, - /obj/item/attachable/shoulder_mount = -1, /* RU TGMC EDIT /obj/item/armor_module/module/mimir_environment_protection = -1, /obj/item/armor_module/module/mimir_environment_protection/mimir_helmet = -1, @@ -1601,6 +1625,12 @@ RU TGMC EDIT*/ /obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/culverin = -1, /obj/item/cell/lasgun/volkite = -1, /obj/item/cell/lasgun/volkite/powerpack = -1, + /obj/item/weapon/gun/launcher/rocket/som = -1, + /obj/item/ammo_magazine/rocket/som = -1, + /obj/item/ammo_magazine/rocket/som/incendiary = -1, + /obj/item/ammo_magazine/rocket/som/heat = -1, + /obj/item/weapon/gun/flamer/som = -1, + /obj/item/ammo_magazine/flamer_tank/large/som = -1, ), "ICC" = list( /obj/item/weapon/gun/rifle/icc_battlecarbine = -1, @@ -1630,6 +1660,15 @@ RU TGMC EDIT*/ /obj/item/ammo_magazine/rifle/dpm = -1, /obj/item/weapon/gun/clf_heavyrifle = -1, /obj/item/shotgunbox/clf_heavyrifle = -1, + /obj/item/weapon/gun/launcher/rocket/icc = -1, + /obj/item/ammo_magazine/rocket/icc = -1, + /obj/item/ammo_magazine/rocket/icc/heat = -1, + /obj/item/ammo_magazine/rocket/icc/thermobaric = -1, + /obj/item/weapon/gun/rifle/icc_mg = -1, + /obj/item/ammo_magazine/icc_mg = -1, + /obj/item/ammo_magazine/icc_mg/belt = -1, + /obj/item/weapon/gun/icc_hmg = -1, + /obj/item/ammo_magazine/icc_hmg = -1, ), "PMC" = list( /obj/item/weapon/gun/rifle/sniper/elite = -1, diff --git a/code/game/objects/machinery/vending/new_marine_vendors.dm b/code/game/objects/machinery/vending/new_marine_vendors.dm index ad6063b329bff..973f64ae6bae3 100644 --- a/code/game/objects/machinery/vending/new_marine_vendors.dm +++ b/code/game/objects/machinery/vending/new_marine_vendors.dm @@ -41,6 +41,7 @@ set_light(0) /obj/machinery/marine_selector/update_icon_state() + . = ..() if(is_operational()) icon_state = initial(icon_state) else @@ -63,11 +64,11 @@ to_chat(user, span_warning("Access denied. Your assigned role doesn't have access to this machinery.")) return FALSE - var/obj/item/card/id/I = H.get_idcard() - if(!istype(I)) //not wearing an ID + var/obj/item/card/id/user_id = H.get_idcard() + if(!istype(user_id)) //not wearing an ID return FALSE - if(I.registered_name != H.real_name) + if(user_id.registered_name != H.real_name) return FALSE if(lock_flags & JOB_LOCK && vendor_role && !istype(H.job, vendor_role)) @@ -144,13 +145,16 @@ return var/idx = text2path(params["vend"]) - var/obj/item/card/id/I = usr.get_idcard() + var/obj/item/card/id/user_id = usr.get_idcard() var/list/L = listed_products[idx] var/item_category = L[1] var/cost = L[3] - if(use_points && (item_category in I.marine_points) && I.marine_points[item_category] < cost) + if(!(user_id.id_flags & CAN_BUY_LOADOUT)) //If you use the quick-e-quip, you cannot also use the GHMMEs + to_chat(usr, span_warning("Access denied. You have already vended a loadout.")) + return FALSE + if(use_points && (item_category in user_id.marine_points) && user_id.marine_points[item_category] < cost) to_chat(usr, span_warning("Not enough points.")) if(icon_deny) flick(icon_deny, src) @@ -163,9 +167,9 @@ flick(icon_deny, src) return - if(item_category in I.marine_buy_choices) - if(I.marine_buy_choices[item_category] && GLOB.marine_selector_cats[item_category]) - I.marine_buy_choices[item_category] -= 1 + if(item_category in user_id.marine_buy_choices) + if(user_id.marine_buy_choices[item_category] && GLOB.marine_selector_cats[item_category]) + user_id.marine_buy_choices[item_category] -= 1 else if(cost == 0) to_chat(usr, span_warning("You can't buy things from this category anymore.")) @@ -198,9 +202,10 @@ for (var/obj/item/vended_item in vended_items) vended_item.on_vend(usr, faction, auto_equip = TRUE) - if(use_points && (item_category in I.marine_points)) - I.marine_points[item_category] -= cost + if(use_points && (item_category in user_id.marine_points)) + user_id.marine_points[item_category] -= cost . = TRUE + user_id.id_flags |= USED_GHMME /obj/machinery/marine_selector/clothes name = "GHMME Automated Closet" @@ -382,6 +387,11 @@ lock_flags = JOB_LOCK gives_webbing = FALSE +/obj/machinery/marine_selector/clothes/commander/valhalla + vendor_role = /datum/job/fallen/marine/fieldcommander + resistance_flags = INDESTRUCTIBLE + lock_flags = JOB_LOCK + /* RUTGMC DELETION /obj/machinery/marine_selector/clothes/commander/Initialize(mapload) . = ..() @@ -701,6 +711,7 @@ ) /obj/effect/vendor_bundle/stretcher + desc = "A standard-issue TerraGov Marine Corps corpsman medivac stretcher. Comes with an extra beacon, but multiple beds can be linked to one beacon." gear_to_spawn = list( /obj/item/roller/medevac, /obj/item/medevac_beacon, @@ -709,7 +720,7 @@ /obj/effect/vendor_bundle/engi gear_to_spawn = list( /obj/item/explosive/plastique, - /obj/item/explosive/grenade/chem_grenade/razorburn_smol, + /obj/item/explosive/grenade/chem_grenade/razorburn_small, /obj/item/clothing/gloves/marine/insulated, /obj/item/cell/high, /obj/item/lightreplacer, @@ -728,8 +739,8 @@ /obj/effect/vendor_bundle/leader gear_to_spawn = list( /obj/item/explosive/plastique, - /obj/item/beacon/supply_beacon, - /obj/item/beacon/supply_beacon, + /obj/item/supply_beacon, + /obj/item/supply_beacon, //RUTGMC EDIT ADDITION BEGIN - ORBITAL_BEACON /obj/item/beacon/orbital_bombardment_beacon, //RUTGMC EDIT ADDITION END @@ -743,7 +754,7 @@ /obj/effect/vendor_bundle/commander gear_to_spawn = list( /obj/item/explosive/plastique, - /obj/item/beacon/supply_beacon, + /obj/item/supply_beacon, //RUTGMC EDIT ADDITION BEGIN - ORBITAL_BEACON /obj/item/beacon/orbital_bombardment_beacon, //RUTGMC EDIT ADDITION END diff --git a/code/game/objects/machinery/vending/quick_vendor.dm b/code/game/objects/machinery/vending/quick_vendor.dm index db2e6553aaa73..2a68fe84ceb67 100644 --- a/code/game/objects/machinery/vending/quick_vendor.dm +++ b/code/game/objects/machinery/vending/quick_vendor.dm @@ -81,10 +81,10 @@ GLOBAL_LIST_INIT(quick_loadouts, init_quick_loadouts()) for(var/X in loadout_list) .[X] = new X - /obj/machinery/quick_vendor name = "Kwik-E-Quip vendor" - desc = "An advanced vendor to instantly arm soldiers with specific sets of equipment, allowing for immediate combat deployment." + desc = "An advanced vendor to instantly arm soldiers with specific sets of equipment, allowing for immediate combat deployment. \ + Mutually exclusive with the GHMME." icon = 'icons/obj/machines/vending.dmi' icon_state = "specialist" density = TRUE @@ -106,6 +106,18 @@ GLOBAL_LIST_INIT(quick_loadouts, init_quick_loadouts()) "Squad Smartgunner", "Squad Leader", ) + ///Whichever global loadout is used to build the vendor stock + var/list/global_list_to_use + ///If the vendor drops your items, or deletes them when you vend a loadout + var/drop_worn_items = FALSE + +/obj/machinery/quick_vendor/Initialize(mapload) + . = ..() + set_stock_list() + +///Chooses which global list the vendor will build stock from, gets run on Initialize() +/obj/machinery/quick_vendor/proc/set_stock_list() + global_list_to_use = GLOB.quick_loadouts /obj/machinery/quick_vendor/Initialize(mapload) . = ..() @@ -119,6 +131,7 @@ GLOBAL_LIST_INIT(quick_loadouts, init_quick_loadouts()) set_light(0) /obj/machinery/quick_vendor/update_icon_state() + . = ..() if(is_operational()) icon_state = initial(icon_state) else @@ -148,6 +161,7 @@ GLOBAL_LIST_INIT(quick_loadouts, init_quick_loadouts()) var/obj/item/card/id/user_id = human_user.get_idcard() if(user_id.registered_name != human_user.real_name) return FALSE + return TRUE /obj/machinery/quick_vendor/ui_interact(mob/living/user, datum/tgui/ui) @@ -164,9 +178,9 @@ GLOBAL_LIST_INIT(quick_loadouts, init_quick_loadouts()) . = ..() var/list/data = list() var/list/loadouts_data_tgui = list() - for(var/loadout_data in GLOB.quick_loadouts) + for(var/loadout_data in global_list_to_use) var/list/next_loadout_data = list() //makes a list item with the below lines, for each loadout entry in the list - var/datum/outfit/quick/current_loadout = GLOB.quick_loadouts[loadout_data] + var/datum/outfit/quick/current_loadout = global_list_to_use[loadout_data] next_loadout_data["job"] = current_loadout.jobtype next_loadout_data["name"] = current_loadout.name next_loadout_data["desc"] = current_loadout.desc @@ -191,7 +205,7 @@ GLOBAL_LIST_INIT(quick_loadouts, init_quick_loadouts()) return switch(action) if("selectLoadout") - var/datum/outfit/quick/selected_loadout = GLOB.quick_loadouts[text2path(params["loadout_outfit"])] + var/datum/outfit/quick/selected_loadout = global_list_to_use[text2path(params["loadout_outfit"])] if(!selected_loadout) to_chat(ui.user, span_warning("Error when loading this loadout")) CRASH("Fail to load loadouts") @@ -199,13 +213,28 @@ GLOBAL_LIST_INIT(quick_loadouts, init_quick_loadouts()) to_chat(usr, span_warning("This loadout has been depleted, you'll need to pick another.")) return var/obj/item/card/id/user_id = usr.get_idcard() //ui.user better? - if(selected_loadout.jobtype != user_id.rank) + var/user_job = user_id.rank + user_job = replacetext(user_job, "Fallen ", "") //So that jobs in valhalla can vend a loadout too + if(selected_loadout.jobtype != user_job) to_chat(usr, span_warning("You are not in the right job for this loadout!")) return - if(user_id.can_buy_loadout) - user_id.can_buy_loadout = FALSE + if(user_id.id_flags & USED_GHMME) //Same check here, in case they opened the UI before vending a loadout somehow + to_chat(ui.user, span_warning("Access denied, continue using the GHHME.")) + return FALSE + if(user_id.id_flags & CAN_BUY_LOADOUT) + user_id.id_flags &= ~CAN_BUY_LOADOUT selected_loadout.quantity -- + if(drop_worn_items) + for(var/obj/item/inventory_items in ui.user) + if(inventory_items.equip_slot_flags == ITEM_SLOT_ID) + continue + ui.user.dropItemToGround(inventory_items) selected_loadout.equip(ui.user) //actually equips the loadout + //After vending a quick loadout, remove points and GHMME options so that you can't vend them via loadout vendor + for(var/points in user_id.marine_points) + user_id.marine_points[points] = 0 + for(var/option in user_id.marine_buy_choices) + user_id.marine_buy_choices[option] = 0 else to_chat(usr, span_warning("You can't buy things from this category anymore.")) diff --git a/code/game/objects/machinery/vending/vending.dm b/code/game/objects/machinery/vending/vending.dm index 74acae91a45a5..77e7981cb0f13 100644 --- a/code/game/objects/machinery/vending/vending.dm +++ b/code/game/objects/machinery/vending/vending.dm @@ -279,38 +279,38 @@ for(var/season in seasonal_items) products[seasonal_items[season]] += SSpersistence.season_items[season] -/obj/machinery/vending/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) - if(X.status_flags & INCORPOREAL) +/obj/machinery/vending/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) + if(xeno_attacker.status_flags & INCORPOREAL) return FALSE - if(X.a_intent == INTENT_HARM) - X.do_attack_animation(src, ATTACK_EFFECT_SMASH) - if(prob(X.xeno_caste.melee_damage)) + if(xeno_attacker.a_intent == INTENT_HARM) + xeno_attacker.do_attack_animation(src, ATTACK_EFFECT_SMASH) + if(prob(damage_amount)) playsound(loc, 'sound/effects/metalhit.ogg', 25, 1) - X.visible_message(span_danger("\The [X] smashes \the [src] beyond recognition!"), \ + xeno_attacker.visible_message(span_danger("\The [xeno_attacker] smashes \the [src] beyond recognition!"), \ span_danger("We enter a frenzy and smash \the [src] apart!"), null, 5) malfunction() return TRUE else - X.visible_message(span_danger("[X] slashes \the [src]!"), \ + xeno_attacker.visible_message(span_danger("[xeno_attacker] slashes \the [src]!"), \ span_danger("We slash \the [src]!"), null, 5) playsound(loc, 'sound/effects/metalhit.ogg', 25, 1) return TRUE if(tipped_level) - to_chat(X, span_warning("There's no reason to bother with that old piece of trash.")) + to_chat(xeno_attacker, span_warning("There's no reason to bother with that old piece of trash.")) return FALSE - X.visible_message(span_warning("\The [X] begins to lean against \the [src]."), \ + xeno_attacker.visible_message(span_warning("\The [xeno_attacker] begins to lean against \the [src]."), \ span_warning("You begin to lean against \the [src]."), null, 5) tipped_level = 1 var/shove_time = 1 SECONDS - if(X.mob_size == MOB_SIZE_BIG) + if(xeno_attacker.mob_size == MOB_SIZE_BIG) shove_time = 5 SECONDS - if(istype(X,/mob/living/carbon/xenomorph/crusher)) + if(istype(xeno_attacker,/mob/living/carbon/xenomorph/crusher)) shove_time = 1.5 SECONDS - if(do_after(X, shove_time, IGNORE_HELD_ITEM, src, BUSY_ICON_HOSTILE)) - X.visible_message(span_danger("\The [X] knocks \the [src] down!"), \ + if(do_after(xeno_attacker, shove_time, IGNORE_HELD_ITEM, src, BUSY_ICON_HOSTILE)) + xeno_attacker.visible_message(span_danger("\The [xeno_attacker] knocks \the [src] down!"), \ span_danger("You knock \the [src] down!"), null, 5) tip_over() else @@ -337,6 +337,8 @@ /obj/machinery/vending/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(tipped_level) to_chat(user, "Tip it back upright first!") @@ -378,12 +380,12 @@ user.visible_message("[user] tightens the bolts securing \the [src] to the floor.", "You tighten the bolts securing \the [src] to the floor.") var/turf/current_turf = get_turf(src) if(current_turf && density) - current_turf.flags_atom |= AI_BLOCKED + current_turf.atom_flags |= AI_BLOCKED else user.visible_message("[user] unfastens the bolts securing \the [src] to the floor.", "You unfasten the bolts securing \the [src] to the floor.") var/turf/current_turf = get_turf(src) if(current_turf && density) - current_turf.flags_atom &= ~AI_BLOCKED + current_turf.atom_flags &= ~AI_BLOCKED else if(isitem(I)) var/obj/item/to_stock = I stock(to_stock, user) @@ -658,6 +660,34 @@ return do_stock(item_to_stock, user, show_feedback, record) +/obj/machinery/vending/lasgun/do_stock(obj/item/item_to_stock, mob/user, show_feedback = TRUE, datum/vending_product/record) + //Special snowflake handling of cells + if(!iscell(item_to_stock)) + return ..() + + var/recharge_amount = 0 //the amount of charge required to fully charge our cell + var/obj/item/cell/cell = item_to_stock + if(cell.charge < cell.maxcharge) + // Item is not full. Time to try to recharge + recharge_amount = cell.maxcharge - cell.charge + if(machine_current_charge == 0) + display_message_and_visuals(user, show_feedback, "No power!", VENDING_RESTOCK_DENY) + return FALSE + else if(machine_current_charge < recharge_amount) // Not enough but some charge remaining so partially recharge cell and move on + cell.give(machine_current_charge) + machine_current_charge = 0 + cell.update_icon() + display_message_and_visuals(user, show_feedback, "Cell charged partially! [round(cell.percent())]%.", VENDING_RESTOCK_RECHARGE) + playsound(loc, 'sound/machines/hydraulics_1.ogg', 25, 0, 1) + return FALSE + else + machine_current_charge -= recharge_amount + cell.give(recharge_amount) + if(!record.attempt_restock(item_to_stock, user, show_feedback)) + return FALSE + display_message_and_visuals(user, show_feedback, "Restocked and recharged", VENDING_RESTOCK_ACCEPT_RECHARGE) + return TRUE + ///Actually does the restock. Overridden by lasgun vendor for snowflake behaviour /obj/machinery/vending/proc/do_stock(obj/item/item_to_stock, mob/user, show_feedback = TRUE, datum/vending_product/record) if(!record.attempt_restock(item_to_stock, user, show_feedback)) @@ -703,7 +733,7 @@ //More accurate comparison between absolute paths. if(isstorage(item_to_stock)) //Nice try, specialists/engis var/obj/item/storage/storage_to_stock = item_to_stock - if(!(storage_to_stock.flags_storage & BYPASS_VENDOR_CHECK)) //If your storage has this flag, it can be restocked + if(!(storage_to_stock.storage_flags & BYPASS_VENDOR_CHECK)) //If your storage has this flag, it can be restocked user?.balloon_alert(user, "Can't restock containers!") return FALSE @@ -742,7 +772,7 @@ //Actually restocks the item after our checks if(user) if(item_to_stock.loc == user) //Inside the mob's inventory - if(item_to_stock.flags_item & WIELDED) + if(item_to_stock.item_flags & WIELDED) item_to_stock.unwield(user) user.temporarilyRemoveItemFromInventory(item_to_stock) @@ -830,6 +860,7 @@ set_light(initial(light_range)) /obj/machinery/vending/update_icon_state() + . = ..() if(machine_stat & BROKEN) icon_state = "[initial(icon_state)]-broken" else if(machine_stat & NOPOWER) @@ -885,7 +916,7 @@ . = TRUE -/obj/machinery/vending/take_damage(damage_amount, damage_type = BRUTE, damage_flag = "", effects = TRUE, attack_dir, armour_penetration = 0) +/obj/machinery/vending/take_damage(damage_amount, damage_type = BRUTE, armor_type = null, effects = TRUE, attack_dir, armour_penetration = 0, mob/living/blame_mob) if(density && damage_amount >= knockdown_threshold) tip_over() return ..() diff --git a/code/game/objects/machinery/vending/vending_types.dm b/code/game/objects/machinery/vending/vending_types.dm index 373d0cb011c67..1c3197b03efc5 100644 --- a/code/game/objects/machinery/vending/vending_types.dm +++ b/code/game/objects/machinery/vending/vending_types.dm @@ -112,11 +112,15 @@ /obj/item/reagent_containers/food/snacks/enrg_bar = -1, /obj/item/reagent_containers/food/snacks/wrapped/booniebars = -1, /obj/item/reagent_containers/food/snacks/wrapped/chunk = -1, - /obj/item/reagent_containers/food/snacks/wrapped/barcardine = -1, + /obj/item/reagent_containers/food/snacks/wrapped/barcaridine = -1, /obj/item/reagent_containers/food/snacks/lollipop = -1, /obj/item/reagent_containers/food/snacks/wrapped/berrybar = -1, ) +/obj/machinery/vending/snack/alamo + product_slogans = "" //silent for no spam + wrenchable = FALSE + /obj/machinery/vending/cola name = "Souto Softdrinks" desc = "A softdrink vendor provided by Souto Soda Company, Havana." @@ -137,19 +141,9 @@ /obj/item/reagent_containers/food/drinks/cans/cola = -1, ) - prices = list( - /obj/item/reagent_containers/food/drinks/cans/souto = 5, - /obj/item/reagent_containers/food/drinks/cans/souto/diet = 5, - /obj/item/reagent_containers/food/drinks/cans/souto/cherry = 5, - /obj/item/reagent_containers/food/drinks/cans/souto/cherry/diet = 5, - /obj/item/reagent_containers/food/drinks/cans/souto/lime = 5, - /obj/item/reagent_containers/food/drinks/cans/souto/lime/diet = 5, - /obj/item/reagent_containers/food/drinks/cans/souto/grape = 5, - /obj/item/reagent_containers/food/drinks/cans/souto/grape/diet = 5, - /obj/item/reagent_containers/food/drinks/cans/waterbottle = 2, - /obj/item/reagent_containers/food/drinks/cans/cola = 10, - ) - idle_power_usage = 200 +/obj/machinery/vending/cola/alamo + product_slogans = "" //silent for no spam + wrenchable = FALSE /obj/machinery/vending/medical name = "NanotrasenMed Plus" @@ -216,7 +210,7 @@ /obj/item/storage/reagent_tank/bktt = 1, ), "Misc" = list( - /obj/item/tool/research/xeno_analyzer = -1, + /obj/item/tool/research/xeno_analyzer = 2, /obj/item/tool/research/excavation_tool = -1, /obj/item/storage/pouch/surgery = -1, /obj/item/armor_module/storage/uniform/surgery_webbing = -1, @@ -264,7 +258,6 @@ /obj/item/reagent_containers/glass/bottle/adminordrazine = -1, /obj/item/reagent_containers/glass/bottle/lemoline = -1, /obj/item/reagent_containers/glass/bottle/nanoblood = -1, - /obj/item/reagent_containers/glass/bottle/doctor_delight = -1, ), "Pill Bottle" = list( /obj/item/storage/pill_bottle/bicaridine = -1, @@ -321,6 +314,8 @@ /obj/item/reagent_containers/hypospray/autoinjector/virilyth = -1, /obj/item/reagent_containers/hypospray/autoinjector/roulettium = -1, /obj/item/reagent_containers/glass/bottle/toxin = -1, + /obj/item/reagent_containers/glass/bottle/doctor_delight = -1, + /obj/item/alien_embryo = -1, ), ) @@ -380,6 +375,7 @@ /obj/machinery/vending/nanomed/tadpolemed name = "Flight surgeon medical equipment dispenser" desc = "Dedicated for the surgeon with wings, this humble box contains a lot for its size." + layer = ABOVE_OBJ_LAYER products = list( "Autoinjectors" = list( /obj/item/reagent_containers/hypospray/autoinjector/sleeptoxin = 2, @@ -534,7 +530,7 @@ /obj/item/tool/kitchen/utensil/fork = 6, /obj/item/tool/kitchen/knife = 3, /obj/item/reagent_containers/food/drinks/drinkingglass = 8, - /obj/item/clothing/suit/chef/classic = 2, + /obj/item/clothing/suit/storage/chef/classic = 2, /obj/item/tool/kitchen/utensil/spoon = 2, /obj/item/tool/kitchen/utensil/knife = 2, /obj/item/tool/kitchen/rollingpin = 2, diff --git a/code/game/objects/machinery/washing_machine.dm b/code/game/objects/machinery/washing_machine.dm index 30f1aa74230cf..0c69863af5b92 100644 --- a/code/game/objects/machinery/washing_machine.dm +++ b/code/game/objects/machinery/washing_machine.dm @@ -67,12 +67,15 @@ usr.loc = src.loc -/obj/machinery/washing_machine/update_icon() +/obj/machinery/washing_machine/update_icon_state() + . = ..() icon_state = "wm_[state][panel]" /obj/machinery/washing_machine/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/toy/crayon) || istype(I, /obj/item/tool/stamp)) if(!(state in list(1, 3, 6))) diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm index 50c9357423a17..c43d9446cad18 100644 --- a/code/game/objects/obj_defense.dm +++ b/code/game/objects/obj_defense.dm @@ -1,15 +1,15 @@ -/obj/proc/take_damage(damage_amount, damage_type = BRUTE, damage_flag = "", effects = TRUE, attack_dir, armour_penetration = 0) +/obj/proc/take_damage(damage_amount, damage_type = BRUTE, armor_type = null, effects = TRUE, attack_dir, armour_penetration = 0, mob/living/blame_mob) if(QDELETED(src)) CRASH("[src] taking damage after deletion") if(!damage_amount) return if(effects) - play_attack_sound(damage_amount, damage_type, damage_flag) + play_attack_sound(damage_amount, damage_type, armor_type) if((resistance_flags & INDESTRUCTIBLE) || obj_integrity <= 0) return - if(damage_flag) - damage_amount = round(modify_by_armor(damage_amount, damage_flag, armour_penetration), DAMAGE_PRECISION) + if(armor_type) + damage_amount = round(modify_by_armor(damage_amount, armor_type, armour_penetration, null, attack_dir), DAMAGE_PRECISION) if(damage_amount < DAMAGE_PRECISION) return . = damage_amount @@ -18,11 +18,11 @@ //BREAKING FIRST if(integrity_failure && obj_integrity <= integrity_failure) - obj_break(damage_flag) + obj_break(armor_type) //DESTROYING SECOND if(obj_integrity <= 0) - obj_destruction(damage_amount, damage_type, damage_flag) + obj_destruction(damage_amount, damage_type, armor_type, blame_mob) ///Increase obj_integrity and record it to the repairer's stats /obj/proc/repair_damage(repair_amount, mob/user) @@ -67,6 +67,15 @@ take_damage(rand(5, 45), BRUTE, BOMB, 0) */ +/obj/lava_act() + if(resistance_flags & INDESTRUCTIBLE) + return FALSE + if(!take_damage(50, BURN, FIRE)) + return FALSE + if(QDELETED(src)) + return FALSE + fire_act() + return TRUE /obj/hitby(atom/movable/AM, speed = 5) . = ..() @@ -92,13 +101,13 @@ return playsound(loc, P.hitsound, 50, 1) visible_message(span_warning("\the [src] is damaged by \the [P]!"), visible_message_flags = COMBAT_MESSAGE) - take_damage(P.damage, P.ammo.damage_type, P.ammo.armor_type, 0, REVERSE_DIR(P.dir), P.ammo.penetration) + take_damage(P.damage, P.ammo.damage_type, P.ammo.armor_type, 0, REVERSE_DIR(P.dir), P.ammo.penetration, isliving(P.firer) ? P.firer : null) -/obj/proc/attack_generic(mob/user, damage_amount = 0, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0) //used by attack_alien, attack_animal, and attack_slime +/obj/proc/attack_generic(mob/user, damage_amount = 0, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = 0) //used by attack_alien, attack_animal, and attack_slime user.do_attack_animation(src, ATTACK_EFFECT_SMASH) user.changeNext_move(CLICK_CD_MELEE) - return take_damage(damage_amount, damage_type, damage_flag, effects, get_dir(src, user), armor_penetration) + return take_damage(damage_amount, damage_type, armor_type, effects, get_dir(src, user), armor_penetration, user) /obj/attack_animal(mob/living/simple_animal/M) @@ -115,22 +124,22 @@ playsound(loc, 'sound/effects/meteorimpact.ogg', 100, 1) -/obj/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) +/obj/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) // SHOULD_CALL_PARENT(TRUE) // TODO: fix this - if(X.status_flags & INCORPOREAL) //Ghosts can't attack machines + if(xeno_attacker.status_flags & INCORPOREAL) //Ghosts can't attack machines return FALSE - SEND_SIGNAL(X, COMSIG_XENOMORPH_ATTACK_OBJ, src) - if(SEND_SIGNAL(src, COMSIG_OBJ_ATTACK_ALIEN, X) & COMPONENT_NO_ATTACK_ALIEN) + SEND_SIGNAL(xeno_attacker, COMSIG_XENOMORPH_ATTACK_OBJ, src) + if(SEND_SIGNAL(src, COMSIG_OBJ_ATTACK_ALIEN, xeno_attacker) & COMPONENT_NO_ATTACK_ALIEN) return FALSE if(!(resistance_flags & XENO_DAMAGEABLE)) - to_chat(X, span_warning("We stare at \the [src] cluelessly.")) + to_chat(xeno_attacker, span_warning("We stare at \the [src] cluelessly.")) return FALSE if(effects) - X.visible_message(span_danger("[X] has slashed [src]!"), + xeno_attacker.visible_message(span_danger("[xeno_attacker] has slashed [src]!"), span_danger("We slash [src]!")) - X.do_attack_animation(src, ATTACK_EFFECT_CLAW) + xeno_attacker.do_attack_animation(src, ATTACK_EFFECT_CLAW) playsound(loc, "alien_claw_metal", 25) - attack_generic(X, damage_amount, damage_type, damage_flag, effects, armor_penetration) + attack_generic(xeno_attacker, damage_amount, damage_type, armor_type, effects, armor_penetration) return TRUE /obj/attack_larva(mob/living/carbon/xenomorph/larva/L) @@ -151,7 +160,7 @@ ///what happens when the obj's integrity reaches zero. -/obj/proc/obj_destruction(damage_amount, damage_type, damage_flag) +/obj/proc/obj_destruction(damage_amount, damage_type, damage_flag, mob/living/blame_mob) SHOULD_CALL_PARENT(TRUE) if(destroy_sound) playsound(loc, destroy_sound, 35, 1) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 127984fb8dc93..aa96df4e841c5 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -13,30 +13,26 @@ /// %-reduction-based armor. var/datum/armor/soft_armor - /// Flat-damage-reduction-based armor. + ///Modifies the AP of incoming attacks var/datum/armor/hard_armor - - var/obj_integrity //defaults to max_integrity + ///Object HP + var/obj_integrity + ///Max object HP var/max_integrity = 500 - var/integrity_failure = 0 //0 if we have no special broken behavior - var/reliability = 100 //Used by SOME devices to determine how reliable they are. - var/crit_fail = 0 - - ///throwforce needs to be at least 1 else it causes runtimes with shields + ///Integrety below this number causes special behavior + var/integrity_failure = 0 + ///Base throw damage. Throwforce needs to be at least 1 else it causes runtimes with shields var/throwforce = 1 - + ///Object behavior flags var/obj_flags = NONE - var/hit_sound //Sound this object makes when hit, overrides specific item hit sound. - var/destroy_sound //Sound this object makes when destroyed. - - var/item_fire_stacks = 0 //How many fire stacks it applies - + ///Sound when hit + var/hit_sound + ///Sound this object makes when destroyed + var/destroy_sound + ///ID access where all are required to access this object var/list/req_access = null + ///ID access where any one is required to access this object var/list/req_one_access = null - - ///Optimization for dynamic explosion block values, for things whose explosion block is dependent on certain conditions. - var/real_explosion_block - ///Odds of a projectile hitting the object, if the object is dense var/coverage = 50 @@ -108,7 +104,7 @@ . = ..() if(.) return - if((flags_atom & ON_BORDER) && !(get_dir(loc, target) & dir)) + if((atom_flags & ON_BORDER) && !(get_dir(loc, target) & dir)) return TRUE if((allow_pass_flags & PASS_DEFENSIVE_STRUCTURE) && (mover.pass_flags & PASS_DEFENSIVE_STRUCTURE)) return TRUE @@ -124,7 +120,7 @@ return FALSE if((allow_pass_flags & PASS_MOB)) return TRUE - if((allow_pass_flags & PASS_WALKOVER) && SEND_SIGNAL(target, COMSIG_OBJ_TRY_ALLOW_THROUGH)) + if((allow_pass_flags & PASS_WALKOVER) && SEND_SIGNAL(target, COMSIG_OBJ_TRY_ALLOW_THROUGH, mover)) return TRUE ///Handles extra checks for things trying to exit this objects turf @@ -140,16 +136,16 @@ return TRUE if((allow_pass_flags & PASS_GLASS) && (mover.pass_flags & PASS_GLASS)) return NONE - if(!density || !(flags_atom & ON_BORDER) || !(direction & dir) || (mover.status_flags & INCORPOREAL)) + if(!density || !(atom_flags & ON_BORDER) || !(direction & dir) || (mover.status_flags & INCORPOREAL)) return NONE knownblockers += src return COMPONENT_ATOM_BLOCK_EXIT ///Signal handler to check if you can move from one low object to another -/obj/proc/can_climb_over(datum/source) +/obj/proc/can_climb_over(datum/source, atom/mover) SIGNAL_HANDLER - if(!(flags_atom & ON_BORDER) && density) + if(!(atom_flags & ON_BORDER) && density) return TRUE /obj/proc/updateUsrDialog() @@ -230,6 +226,62 @@ return TRUE return ..() +/obj/vv_get_dropdown() + . = ..() + VV_DROPDOWN_OPTION("", "---------") + VV_DROPDOWN_OPTION(VV_HK_MASS_DEL_TYPE, "Delete all of type") + VV_DROPDOWN_OPTION(VV_HK_OSAY, "Object Say") + +/obj/vv_do_topic(list/href_list) + . = ..() + + if(!.) + return + + if(href_list[VV_HK_OSAY]) + if(check_rights(R_FUN, FALSE)) + usr.client.object_say(src) + + if(href_list[VV_HK_MASS_DEL_TYPE]) + if(!check_rights(R_DEBUG|R_SERVER)) + return + var/action_type = tgui_alert(usr, "Strict type ([type]) or type and all subtypes?",,list("Strict type","Type and subtypes","Cancel")) + if(action_type == "Cancel" || !action_type) + return + + if(tgui_alert(usr, "Are you really sure you want to delete all objects of type [type]?",,list("Yes","No")) != "Yes") + return + + if(tgui_alert(usr, "Second confirmation required. Delete?",,list("Yes","No")) != "Yes") + return + + var/O_type = type + switch(action_type) + if("Strict type") + var/i = 0 + for(var/obj/Obj in world) + if(Obj.type == O_type) + i++ + qdel(Obj) + CHECK_TICK + if(!i) + to_chat(usr, "No objects of this type exist") + return + log_admin("[key_name(usr)] deleted all objects of type [O_type] ([i] objects deleted) ") + message_admins(span_notice("[key_name(usr)] deleted all objects of type [O_type] ([i] objects deleted) ")) + if("Type and subtypes") + var/i = 0 + for(var/obj/Obj in world) + if(istype(Obj,O_type)) + i++ + qdel(Obj) + CHECK_TICK + if(!i) + to_chat(usr, "No objects of this type exist") + return + log_admin("[key_name(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted) ") + message_admins(span_notice("[key_name(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted) ")) + ///Called to return an internally stored item, currently for the deployable element /obj/proc/get_internal_item() return @@ -270,6 +322,9 @@ if(!do_after(user, (fumble_time ? fumble_time : repair_time) * (skill_required - user.skills.getRating(SKILL_ENGINEER)), NONE, src, BUSY_ICON_BUILD)) return TRUE + if(user.skills.getRating(SKILL_ENGINEER) > skill_required) + repair_amount *= (1+(0.1*(user.skills.getRating(SKILL_ENGINEER) - (skill_required + 1)))) + repair_time *= welder.toolspeed balloon_alert_to_viewers("starting repair...") handle_weldingtool_overlay() @@ -297,3 +352,27 @@ playsound(loc, 'sound/items/welder2.ogg', 25, TRUE) handle_weldingtool_overlay(TRUE) return TRUE + +/obj/grab_interact(obj/item/grab/grab, mob/user, base_damage = BASE_OBJ_SLAM_DAMAGE, is_sharp = FALSE) + if(isxeno(user)) + return + if(user.a_intent != INTENT_HARM) + return + if(!isliving(grab.grabbed_thing)) + return + if(user.grab_state <= GRAB_AGGRESSIVE) + to_chat(user, span_warning("You need a better grip to do that!")) + return + + var/mob/living/grabbed_mob = grab.grabbed_thing + if(prob(15)) + grabbed_mob.Paralyze(2 SECONDS) + user.drop_held_item() + step_towards(grabbed_mob, src) + var/damage = base_damage + (user.skills.getRating(SKILL_CQC) * CQC_SKILL_DAMAGE_MOD) + grabbed_mob.apply_damage(damage, BRUTE, "head", MELEE, is_sharp, updating_health = TRUE) + user.visible_message(span_danger("[user] slams [grabbed_mob]'s face against [src]!"), + span_danger("You slam [grabbed_mob]'s face against [src]!")) + log_combat(user, grabbed_mob, "slammed", "", "against \the [src]") + take_damage(damage, BRUTE, MELEE) + return TRUE diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index 9026acd470003..2570caa2008e0 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -2,7 +2,7 @@ icon = 'icons/obj/structures/structures.dmi' var/climbable = FALSE var/climb_delay = 50 - var/flags_barrier = NONE + var/barrier_flags = NONE var/broken = FALSE //similar to machinery's stat BROKEN obj_flags = CAN_BE_HIT anchored = TRUE @@ -49,7 +49,7 @@ do_climb(usr) -/obj/structure/specialclick(mob/living/carbon/user) +/obj/structure/CtrlClick(mob/living/carbon/user) . = ..() INVOKE_ASYNC(src, PROC_REF(do_climb), user) @@ -73,7 +73,7 @@ if(!user.Adjacent(src)) return - if((flags_atom & ON_BORDER)) + if((atom_flags & ON_BORDER)) if(user_turf != destination_turf && user_turf != get_step(destination_turf, dir)) to_chat(user, span_warning("You need to be up against [src] to leap over.")) return @@ -88,7 +88,7 @@ var/obj/structure/structure = object if(structure.allow_pass_flags & PASS_WALKOVER) continue - if(object.density && (!(object.flags_atom & ON_BORDER) || object.dir & get_dir(src,user))) + if(object.density && (!(object.atom_flags & ON_BORDER) || object.dir & get_dir(src,user))) to_chat(user, span_warning("There's \a [object.name] in the way.")) return @@ -97,7 +97,7 @@ var/obj/structure/structure = object if(structure.allow_pass_flags & PASS_WALKOVER) continue - if(object.density && (object.flags_atom & ON_BORDER) && object.dir & get_dir(user, src)) + if(object.density && (object.atom_flags & ON_BORDER) && object.dir & get_dir(user, src)) to_chat(user, span_warning("There's \a [object.name] in the way.")) return @@ -108,7 +108,7 @@ if(user.do_actions || !can_climb(user)) return - user.visible_message(span_warning("[user] starts [flags_atom & ON_BORDER ? "leaping over" : "climbing onto"] \the [src]!")) + user.visible_message(span_warning("[user] starts [atom_flags & ON_BORDER ? "leaping over" : "climbing onto"] \the [src]!")) if(!do_after(user, climb_delay, IGNORE_HELD_ITEM, src, BUSY_ICON_GENERIC)) return @@ -121,7 +121,7 @@ user.unbuckle_mob(m) user.forceMove(destination_turf) - user.visible_message(span_warning("[user] [flags_atom & ON_BORDER ? "leaps over" : "climbs onto"] \the [src]!")) + user.visible_message(span_warning("[user] [atom_flags & ON_BORDER ? "leaps over" : "climbs onto"] \the [src]!")) /obj/structure/proc/structure_shaken() diff --git a/code/game/objects/structures/barricade.dm b/code/game/objects/structures/barricade.dm index 24fd65e74fae9..1c5f878f53b14 100644 --- a/code/game/objects/structures/barricade.dm +++ b/code/game/objects/structures/barricade.dm @@ -6,13 +6,13 @@ anchored = TRUE density = TRUE layer = BELOW_OBJ_LAYER - flags_atom = ON_BORDER + atom_flags = ON_BORDER resistance_flags = XENO_DAMAGEABLE allow_pass_flags = PASS_DEFENSIVE_STRUCTURE|PASSABLE|PASS_WALKOVER climb_delay = 20 //Leaping a barricade is universally much faster than clumsily climbing on a table or rack interaction_flags = INTERACT_CHECK_INCAPACITATED max_integrity = 100 - flags_barrier = HANDLE_BARRIER_CHANCE + barrier_flags = HANDLE_BARRIER_CHANCE ///The type of stack the barricade dropped when disassembled if any. var/stack_type ///The amount of stack dropped when disassembled at full health @@ -75,18 +75,20 @@ /obj/structure/barricade/attack_animal(mob/user) return attack_alien(user) -/obj/structure/barricade/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) - if(X.status_flags & INCORPOREAL) +/obj/structure/barricade/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) + if(xeno_attacker.status_flags & INCORPOREAL) return FALSE if(is_wired) - balloon_alert(X, "Wire slices into us") - X.apply_damage(10, blocked = MELEE , sharp = TRUE, updating_health = TRUE) + balloon_alert(xeno_attacker, "Wire slices into us") + xeno_attacker.apply_damage(10, blocked = MELEE , sharp = TRUE, updating_health = TRUE) return ..() /obj/structure/barricade/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return for(var/obj/effect/xenomorph/acid/A in loc) if(A.acid_t == src) @@ -267,6 +269,8 @@ //Item Attack /obj/structure/barricade/snow/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return for(var/obj/effect/xenomorph/acid/A in loc) if(A.acid_t == src) @@ -345,6 +349,8 @@ /obj/structure/barricade/wooden/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return for(var/obj/effect/xenomorph/acid/A in loc) if(A.acid_t == src) @@ -438,6 +444,8 @@ /* RUTGMC DELETION, moved to modular /obj/structure/barricade/metal/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(!istype(I, /obj/item/stack/sheet/metal)) return @@ -894,6 +902,8 @@ /* RUTGMC DELETION, moved to modular /obj/structure/barricade/plasteel/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/stack/sheet/plasteel)) var/obj/item/stack/sheet/plasteel/plasteel_sheets = I @@ -1003,6 +1013,8 @@ /obj/structure/barricade/sandbags/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return for(var/obj/effect/xenomorph/acid/A in loc) if(A.acid_t == src) @@ -1059,7 +1071,7 @@ is_wired = FALSE soft_armor = list(MELEE = 35, BULLET = 30, LASER = 30, ENERGY = 30, BOMB = 25, BIO = 100, FIRE = 100, ACID = 30) ///Whether this item can be deployed or undeployed - var/flags_item = IS_DEPLOYABLE + var/item_flags = IS_DEPLOYABLE ///What it deploys into. typecast version of internal_item var/obj/item/weapon/shield/riot/marine/deployable/internal_shield @@ -1073,9 +1085,10 @@ name = internal_shield.name desc = internal_shield.desc //if the shield is wired, it deploys wired - if (internal_shield.is_wired) + if(internal_shield.is_wired) can_wire = FALSE is_wired = TRUE + climbable = FALSE /obj/structure/barricade/metal/deployable/get_internal_item() return internal_shield @@ -1085,8 +1098,8 @@ ///Dissassembles the device /obj/structure/barricade/metal/deployable/proc/disassemble(mob/user) - if(CHECK_BITFIELD(internal_shield.flags_item, DEPLOYED_NO_PICKUP)) - balloon_alert(user, "cannot be disassembled") + if(CHECK_BITFIELD(internal_shield.item_flags, DEPLOYED_NO_PICKUP)) + balloon_alert(user, "Cannot disassemble") return SEND_SIGNAL(src, COMSIG_ITEM_UNDEPLOY, user) diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm index 5de219f123bf6..fccf55b9d037f 100644 --- a/code/game/objects/structures/barsign.dm +++ b/code/game/objects/structures/barsign.dm @@ -70,6 +70,8 @@ /obj/structure/sign/double/barsign/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(ismultitool(I)) var/sign_type = tgui_input_list(user, "What would you like to change the barsign to?", null, list("Off", "Pink Flamingo", "Magma Sea", "Limbo", "Rusty Axe", "Armok Bar", "Broken Drum", "Mead Bay", "The Damn Wall", "The Cavern", "Cindi Kate", "The Orchard", "The Saucy Clown", "The Clowns Head", "Whiskey Implant", "Carpe Carp", "Robust Roadhouse", "The Redshirt", "Maltese Falcon", "The Bark", "The Harmbaton", "The Singulo", "The Drunk Carp", "Scotch Servin Willys", "Officer Beersky", "The Cavern", "The Outer Spess", "Slippery Shots","The Grey Tide", "Honked N Loaded", "The Nest", "The Coderbus", "The Adminbus", "The Old Cock Inn", "The Wretched Hive", "The Robusta Cafe", "The Emergency Rum Party", "The Combo Cafe", "Vlad's Salad Bar", "The Shaken", "The Ale Nath", "The Aloha Snackbar", "The Net", "Maid Cafe", "The Lightbulb", "The Syndi Cat", "ERROR")) diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 46eafc7015f98..e7db0eccdca67 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -101,7 +101,8 @@ LINEN BINS . += "There are [amount] bed sheets in the bin." -/obj/structure/bedsheetbin/update_icon() +/obj/structure/bedsheetbin/update_icon_state() + . = ..() switch(amount) if(0) icon_state = "linenbin-empty" @@ -113,6 +114,8 @@ LINEN BINS /obj/structure/bedsheetbin/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/bedsheet)) if(!user.drop_held_item()) diff --git a/code/game/objects/structures/benchpress.dm b/code/game/objects/structures/benchpress.dm index 1c799861315dc..6b30b436325b9 100644 --- a/code/game/objects/structures/benchpress.dm +++ b/code/game/objects/structures/benchpress.dm @@ -85,11 +85,11 @@ return do_workout_set(user) -/obj/structure/benchpress/attack_alien(mob/living/carbon/xenomorph/X, damage_amount, damage_type, damage_flag, effects, armor_penetration, isrightclick) +/obj/structure/benchpress/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) . = ..() if(.) return - do_workout_set(X) + do_workout_set(xeno_attacker) ///checks if possible and if yes performs a workout set for this mob /obj/structure/benchpress/proc/do_workout_set(mob/living/user) @@ -99,7 +99,7 @@ ADD_TRAIT(src, BENCH_BEING_USED, WEIGHTBENCH_TRAIT) // yea this is meh but IN_USE and interact code are a mess rn and too buggy so less sidestep it update_icon() user.setDir(SOUTH) - user.flags_atom |= DIRLOCK + user.atom_flags |= DIRLOCK ADD_TRAIT(user, TRAIT_IMMOBILE, WEIGHTBENCH_TRAIT) user.forceMove(loc) var/bragmessage = pick("pushing it to the limit","going into overdrive","burning with determination","rising up to the challenge", "getting strong now","getting ripped") @@ -112,7 +112,7 @@ creak_loop.stop(src) playsound(user, 'sound/machines/click.ogg', 60, TRUE) REMOVE_TRAIT(src, BENCH_BEING_USED, WEIGHTBENCH_TRAIT) - user.flags_atom &= ~DIRLOCK + user.atom_flags &= ~DIRLOCK REMOVE_TRAIT(user, TRAIT_IMMOBILE, WEIGHTBENCH_TRAIT) update_icon() if(user.faction) diff --git a/code/game/objects/structures/bookcase.dm b/code/game/objects/structures/bookcase.dm index d5bfa240ac36e..51f2ae164ccd6 100644 --- a/code/game/objects/structures/bookcase.dm +++ b/code/game/objects/structures/bookcase.dm @@ -18,6 +18,8 @@ /obj/structure/bookcase/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/book)) user.drop_held_item() @@ -67,7 +69,8 @@ qdel(src) -/obj/structure/bookcase/update_icon() +/obj/structure/bookcase/update_icon_state() + . = ..() if(length(contents) < 5) icon_state = "book-[length(contents)]" else diff --git a/code/game/objects/structures/campaign_props.dm b/code/game/objects/structures/campaign_props.dm index 6723521d5dcf1..c0beb09ae244e 100644 --- a/code/game/objects/structures/campaign_props.dm +++ b/code/game/objects/structures/campaign_props.dm @@ -21,6 +21,15 @@ allow_pass_flags = PASS_AIR bound_width = 128 +/obj/structure/prop/train/Initialize(mapload) + . = ..() + update_icon() + +/obj/structure/prop/train/update_overlays() + . = ..() + var/image/new_overlay = image(icon, src, "[icon_state]_overlay", ABOVE_ALL_MOB_LAYER, dir) + . += new_overlay + /obj/structure/prop/train/carriage name = "rail carriage" desc = "A heavy duty maglev carriage. I wonder what's inside?." diff --git a/code/game/objects/structures/campaign_structures/campaign_structure.dm b/code/game/objects/structures/campaign_structures/campaign_structure.dm index f0b5597afde8d..7c3c2d9aae227 100644 --- a/code/game/objects/structures/campaign_structures/campaign_structure.dm +++ b/code/game/objects/structures/campaign_structures/campaign_structure.dm @@ -27,9 +27,11 @@ anchored = TRUE allow_pass_flags = PASSABLE destroy_sound = 'sound/effects/meteorimpact.ogg' - icon = 'icons/obj/structures/campaign_structures.dmi' + ///overhead timer + var/obj/effect/countdown/campaign_objective/countdown + /obj/structure/campaign_objective/Initialize(mapload) . = ..() GLOB.campaign_objectives += src @@ -56,3 +58,7 @@ /obj/structure/campaign_objective/proc/update_control_minimap_icon() SSminimaps.remove_marker(src) SSminimaps.add_marker(src, MINIMAP_FLAG_ALL, image('icons/UI_icons/map_blips.dmi', null, "campaign_objective", HIGH_FLOAT_LAYER)) + +///Remaining time for overhead countdown if applicable +/obj/structure/campaign_objective/proc/get_time_left() + return diff --git a/code/game/objects/structures/campaign_structures/capture_objectives.dm b/code/game/objects/structures/campaign_structures/capture_objectives.dm index 1c68a76a20b13..cc6681602c561 100644 --- a/code/game/objects/structures/campaign_structures/capture_objectives.dm +++ b/code/game/objects/structures/campaign_structures/capture_objectives.dm @@ -15,8 +15,6 @@ var/capturing_faction ///Timer holder for the current capture/decapture timer var/capture_timer - ///overhead timer - var/obj/effect/countdown/campaign_objective/countdown /obj/structure/campaign_objective/capture_objective/Initialize(mapload) . = ..() @@ -112,6 +110,9 @@ owning_faction = null update_icon() SEND_GLOBAL_SIGNAL(COMSIG_GLOB_CAMPAIGN_CAPTURE_OBJECTIVE_DECAPTURED, src, user) + if(user.ckey) + var/datum/personal_statistics/personal_statistics = GLOB.personal_statistics_list[user.ckey] + personal_statistics.mission_objective_decaptured ++ return finish_capture(user) @@ -120,10 +121,12 @@ SHOULD_CALL_PARENT(TRUE) owning_faction = user.faction SEND_GLOBAL_SIGNAL(COMSIG_GLOB_CAMPAIGN_CAPTURE_OBJECTIVE_CAPTURED, src, user) + if(user.ckey) + var/datum/personal_statistics/personal_statistics = GLOB.personal_statistics_list[user.ckey] + personal_statistics.mission_objective_captured ++ update_icon() -///Returns time left on the nuke in seconds -/obj/structure/campaign_objective/capture_objective/proc/get_time_left() +/obj/structure/campaign_objective/capture_objective/get_time_left() return capture_timer ? round(timeleft(capture_timer) MILLISECONDS) : null //sensor tower @@ -131,7 +134,13 @@ name = "sensor tower objective" icon = 'icons/obj/structures/sensor.dmi' icon_state = "sensor" - mission_types = list(/datum/campaign_mission/tdm, /datum/campaign_mission/tdm/lv624, /datum/campaign_mission/tdm/first_mission, /datum/campaign_mission/tdm/mech_wars) + mission_types = list( + /datum/campaign_mission/tdm, + /datum/campaign_mission/tdm/orion, + /datum/campaign_mission/tdm/first_mission, + /datum/campaign_mission/tdm/mech_wars, + /datum/campaign_mission/tdm/mech_wars/som, + ) spawn_object = /obj/structure/campaign_objective/capture_objective/sensor_tower /obj/structure/campaign_objective/capture_objective/sensor_tower @@ -148,6 +157,7 @@ countdown.pixel_y = 90 /obj/structure/campaign_objective/capture_objective/sensor_tower/update_icon_state() + . = ..() icon_state = initial(icon_state) if(!owning_faction) switch(capturing_faction) @@ -220,12 +230,17 @@ icon_state = "asat" desc = "A sophisticated surface to space missile system designed for attacking orbiting satellites or spacecraft." capture_flags = CAPTURE_OBJECTIVE_RECAPTURABLE - ///owning faction - var/faction = FACTION_TERRAGOV + owning_faction = FACTION_TERRAGOV /obj/structure/campaign_objective/capture_objective/fultonable/asat_system/capture_check(mob/living/user) //This is a 'defend' objective. The defending faction can't actually claim it for themselves, just decap it. - if((user.faction == faction) && !capturing_faction && !owning_faction) + if((user.faction == owning_faction) && !capturing_faction) user.balloon_alert(user, "Defend this objective!") return FALSE return ..() + +/obj/structure/campaign_objective/capture_objective/fultonable/asat_system/do_capture(mob/living/user) + capturing_faction = null + capture_timer = null + countdown.stop() + finish_capture(user) diff --git a/code/game/objects/structures/campaign_structures/deploy_blockers.dm b/code/game/objects/structures/campaign_structures/deploy_blockers.dm index 7e544312cded0..3558749cfc1e8 100644 --- a/code/game/objects/structures/campaign_structures/deploy_blockers.dm +++ b/code/game/objects/structures/campaign_structures/deploy_blockers.dm @@ -17,7 +17,7 @@ icon_state = "tele_blocker" pixel_x = -16 ///What flag this removes from the mission - var/flags_to_remove = MISSION_DISALLOW_TELEPORT + var/to_remove_flags = MISSION_DISALLOW_TELEPORT ///The faction this belongs to var/faction = FACTION_TERRAGOV var/owning_faction_notification = "A teleportation disruptor has been deployed in this area. Protect the disruptor to ensure hostile forces cannot deploy via teleportation. " @@ -43,12 +43,15 @@ /obj/structure/campaign_deployblocker/ex_act() return -/obj/structure/campaign_deployblocker/plastique_act() +/obj/structure/campaign_deployblocker/plastique_act(mob/living/plastique_user) + if(plastique_user && plastique_user.ckey) + var/datum/personal_statistics/personal_statistics = GLOB.personal_statistics_list[plastique_user.ckey] + personal_statistics.mission_blocker_destroyed += (faction != plastique_user.faction ? 1 : -1) qdel(src) ///Signals its destruction, enabling the use of the teleporter asset /obj/structure/campaign_deployblocker/proc/deactivate() - SEND_SIGNAL(SSdcs, COMSIG_GLOB_CAMPAIGN_TELEBLOCKER_DISABLED, src, flags_to_remove, faction) + SEND_SIGNAL(SSdcs, COMSIG_GLOB_CAMPAIGN_TELEBLOCKER_DISABLED, src, to_remove_flags, faction) SSminimaps.remove_marker(src) GLOB.campaign_structures -= src @@ -56,13 +59,17 @@ name = "TELEBLOCKER" icon = 'icons/obj/structures/campaign_structures.dmi' icon_state = "drop_block" - mission_types = list(/datum/campaign_mission/destroy_mission/supply_raid, /datum/campaign_mission/destroy_mission/fire_support_raid) + mission_types = list( + /datum/campaign_mission/destroy_mission/supply_raid, + /datum/campaign_mission/destroy_mission/fire_support_raid, + /datum/campaign_mission/raiding_base, + ) spawn_object = /obj/structure/campaign_deployblocker/drop_blocker /obj/structure/campaign_deployblocker/drop_blocker name = "drop pod guidance disruptor array" desc = "A sophisticated device intended to severely disrupt drop pod guidance systems, rendering them unusable while the tower stands." - flags_to_remove = MISSION_DISALLOW_DROPPODS + to_remove_flags = MISSION_DISALLOW_DROPPODS faction = FACTION_SOM owning_faction_notification = "A drop pod disruptor has been deployed in this area. Protect the disruptor to ensure hostile forces cannot deploy via drop pod. " hostile_faction_notification = "The enemy has a device in this area that will prevent the use of our drop pods. Destroy this first to allow for drop pod assault against primary objectives. " diff --git a/code/game/objects/structures/campaign_structures/destroy_objectives.dm b/code/game/objects/structures/campaign_structures/destroy_objectives.dm index b36a00e85cd72..ddc07b4891e0c 100644 --- a/code/game/objects/structures/campaign_structures/destroy_objectives.dm +++ b/code/game/objects/structures/campaign_structures/destroy_objectives.dm @@ -5,12 +5,17 @@ soft_armor = list(MELEE = 200, BULLET = 200, LASER = 200, ENERGY = 200, BOMB = 200, BIO = 200, FIRE = 200, ACID = 200) //require c4 normally ///explosion smoke particle holder var/obj/effect/abstract/particle_holder/explosion_smoke + ///The faction this belongs to + var/faction = FACTION_TERRAGOV /obj/structure/campaign_objective/destruction_objective/Destroy() QDEL_NULL(explosion_smoke) return ..() -/obj/structure/campaign_objective/destruction_objective/plastique_act() +/obj/structure/campaign_objective/destruction_objective/plastique_act(mob/living/plastique_user) + if(plastique_user && plastique_user.ckey) + var/datum/personal_statistics/personal_statistics = GLOB.personal_statistics_list[plastique_user.ckey] + personal_statistics.mission_objective_destroyed += (faction != plastique_user.faction ? 1 : -1) qdel(src) /obj/structure/campaign_objective/destruction_objective/plastique_time_mod(time) @@ -30,6 +35,7 @@ icon = 'icons/Marine/howitzer.dmi' icon_state = "howitzer_deployed" pixel_x = -16 + faction = FACTION_SOM //MLRS /obj/effect/landmark/campaign_structure/mlrs @@ -67,10 +73,13 @@ /obj/structure/campaign_objective/destruction_objective/mlrs/update_overlays() . = ..() - var/image/new_overlay = image(icon, src, "[icon_state]_overlay", ABOVE_MOB_LAYER, dir) + var/image/new_overlay = image(icon, src, "[icon_state]_overlay", ABOVE_ALL_MOB_LAYER, dir) . += new_overlay -/obj/structure/campaign_objective/destruction_objective/mlrs/plastique_act() +/obj/structure/campaign_objective/destruction_objective/mlrs/plastique_act(mob/living/plastique_user) + if(plastique_user && plastique_user.ckey) + var/datum/personal_statistics/personal_statistics = GLOB.personal_statistics_list[plastique_user.ckey] + personal_statistics.mission_objective_destroyed += (faction != plastique_user.faction ? 1 : -1) disable() /obj/structure/campaign_objective/destruction_objective/mlrs/disable() @@ -115,8 +124,8 @@ spawn_object = /obj/structure/campaign_objective/destruction_objective/mlrs/tank /obj/structure/campaign_objective/destruction_objective/mlrs/tank - name = "\improper tank" - desc = "A massive multi launch rocket system on a tracked chassis. Can unleash a tremendous amount of firepower in a short amount of time." + name = "\improper M34A2 Longstreet Light Tank" + desc = "A giant piece of armor with a big gun, good for blowing stuff up." icon_state = "tank" /obj/effect/landmark/campaign_structure/apc @@ -128,8 +137,8 @@ spawn_object = /obj/structure/campaign_objective/destruction_objective/mlrs/apc /obj/structure/campaign_objective/destruction_objective/mlrs/apc - name = "\improper APC" - desc = "A massive multi launch rocket system on a tracked chassis. Can unleash a tremendous amount of firepower in a short amount of time." + name = "\improper M577 armored personnel carrier" + desc = "A giant piece of armor for carrying troops in relative safety. Still has a pretty big gun." icon_state = "apc" smoke_type = /particles/tank_wreck_smoke/apc @@ -137,13 +146,6 @@ position = list(87, 60, 0) //Supply depot objectives -/obj/effect/landmark/campaign_structure/supply_objective - name = "howitzer objective" - icon = 'icons/Marine/howitzer.dmi' - icon_state = "howitzer_deployed" - mission_types = list(/datum/campaign_mission/destroy_mission/fire_support_raid) - spawn_object = /obj/structure/campaign_objective/destruction_objective/howitzer - /obj/structure/campaign_objective/destruction_objective/supply_objective name = "SUPPLY_OBJECTIVE" icon = 'icons/Marine/howitzer.dmi' @@ -165,6 +167,15 @@ allow_pass_flags = PASS_PROJECTILE|PASS_AIR bound_width = 128 +/obj/structure/campaign_objective/destruction_objective/supply_objective/train/Initialize(mapload) + . = ..() + update_icon() + +/obj/structure/campaign_objective/destruction_objective/supply_objective/train/update_overlays() + . = ..() + var/image/new_overlay = image(icon, src, "[icon_state]_overlay", ABOVE_ALL_MOB_LAYER, dir) + . += new_overlay + /obj/effect/landmark/campaign_structure/train/carriage name = "carriage objective" icon_state = "carriage_lit" @@ -190,6 +201,7 @@ icon_state = "phoron_stack" bound_height = 32 bound_width = 64 + faction = FACTION_SOM /obj/structure/campaign_objective/destruction_objective/supply_objective/phoron_stack/Initialize(mapload) . = ..() @@ -197,7 +209,7 @@ /obj/structure/campaign_objective/destruction_objective/supply_objective/phoron_stack/update_overlays() . = ..() - var/image/new_overlay = image(icon, src, "[icon_state]_overlay", ABOVE_MOB_LAYER, dir) + var/image/new_overlay = image(icon, src, "[icon_state]_overlay", ABOVE_ALL_MOB_LAYER, dir) . += new_overlay //NT base @@ -242,6 +254,7 @@ bound_width = 64 pixel_y = -18 pixel_x = -16 + faction = FACTION_SOM var/status = BLUESPACE_CORE_OK /obj/structure/campaign_objective/destruction_objective/bluespace_core/Initialize(mapload) @@ -260,10 +273,10 @@ switch(status) if(BLUESPACE_CORE_OK) . += image(icon, icon_state = "top_overlay", layer = ABOVE_MOB_LAYER) - . += image(icon, icon_state = "bsd_c_s", layer = TANK_BARREL_LAYER) + . += image(icon, icon_state = "bsd_c_s", layer = ABOVE_MOB_PROP_LAYER) if(BLUESPACE_CORE_UNSTABLE) . += image(icon, icon_state = "top_overlay", layer = ABOVE_MOB_LAYER) - . += image(icon, icon_state = "bsd_c_u", layer = TANK_BARREL_LAYER) + . += image(icon, icon_state = "bsd_c_u", layer = ABOVE_MOB_PROP_LAYER) if(BLUESPACE_CORE_BROKEN) . += image(icon, icon_state = "top_overlay_broken", layer = ABOVE_MOB_LAYER) @@ -276,15 +289,18 @@ if(status == BLUESPACE_CORE_BROKEN) disable() -/obj/structure/campaign_objective/destruction_objective/bluespace_core/plastique_act() +/obj/structure/campaign_objective/destruction_objective/bluespace_core/plastique_act(mob/living/plastique_user) if(status == BLUESPACE_CORE_OK) change_status(BLUESPACE_CORE_UNSTABLE) else if(status == BLUESPACE_CORE_UNSTABLE) + if(plastique_user && plastique_user.ckey) + var/datum/personal_statistics/personal_statistics = GLOB.personal_statistics_list[plastique_user.ckey] + personal_statistics.mission_objective_destroyed += (faction != plastique_user.faction ? 1 : -1) change_status(BLUESPACE_CORE_BROKEN) //airbase /obj/structure/prop/som_fighter - name = "\improper Harbinger" + name = "harbinger" desc = "A state of the art Harbinger class fighter. The premier fighter for SOM forces in space and atmosphere, bristling with high tech systems and weapons." icon = 'icons/Marine/mainship_props96.dmi' icon_state = "SOM_fighter" @@ -294,7 +310,7 @@ allow_pass_flags = PASS_AIR /obj/effect/landmark/campaign_structure/harbinger - name = "\improper Harbinger" + name = "harbinger" icon = 'icons/Marine/mainship_props96.dmi' icon_state = "SOM_fighter" pixel_x = -33 @@ -303,7 +319,7 @@ spawn_object = /obj/structure/campaign_objective/destruction_objective/harbinger /obj/structure/campaign_objective/destruction_objective/harbinger - name = "\improper Harbinger" + name = "harbinger" desc = "A state of the art harbinger class fighter. The premier fighter for SOM forces in space and atmosphere, bristling with high tech systems and weapons." icon = 'icons/Marine/mainship_props96.dmi' icon_state = "SOM_fighter" @@ -313,6 +329,7 @@ bound_width = 3 bound_x = -32 layer = ABOVE_MOB_LAYER + faction = FACTION_SOM /obj/effect/landmark/campaign_structure/viper name = "\improper Viper" diff --git a/code/game/objects/structures/campaign_structures/misc_structures.dm b/code/game/objects/structures/campaign_structures/misc_structures.dm new file mode 100644 index 0000000000000..a46501d122a38 --- /dev/null +++ b/code/game/objects/structures/campaign_structures/misc_structures.dm @@ -0,0 +1,26 @@ +//misc campaign structures/landmark spawners. Make sure mission types are set correctly, with child types made as required to avoid conflicts +/obj/effect/landmark/campaign_structure/barricade + name = "fire_support_raid_barricade" + icon = 'icons/Marine/barricades.dmi' + icon_state = "metal_0" + mission_types = list(/datum/campaign_mission/destroy_mission/fire_support_raid) + spawn_object = /obj/structure/barricade/metal + +/obj/effect/landmark/campaign_structure/barricade/sandbags + name = "fire_support_raid_sandbags" + icon_state = "sandbag_0" + mission_types = list(/datum/campaign_mission/destroy_mission/fire_support_raid) + spawn_object = /obj/structure/barricade/sandbags + +/obj/effect/landmark/campaign_structure/barricade/sandbags/som + mission_types = list(/datum/campaign_mission/destroy_mission/fire_support_raid/som) + +/obj/effect/landmark/campaign_structure/barricade/sandbags/asat + name = "ASAT_capture_sandbags" + mission_types = list(/datum/campaign_mission/capture_mission/asat) + +/obj/effect/landmark/campaign_structure/barricade/concrete + name = "fire_support_raid_concrete" + icon_state = "concrete_0" + mission_types = list(/datum/campaign_mission/destroy_mission/fire_support_raid) + spawn_object = /obj/structure/barricade/concrete diff --git a/code/game/objects/structures/campaign_structures/orbital_beacons.dm b/code/game/objects/structures/campaign_structures/orbital_beacons.dm new file mode 100644 index 0000000000000..4a2808959010f --- /dev/null +++ b/code/game/objects/structures/campaign_structures/orbital_beacons.dm @@ -0,0 +1,118 @@ +/obj/item/campaign_beacon + name = "default campaign beacon" + desc = "what smelly admin spawned this?" + icon = 'icons/Marine/marine-navigation.dmi' + icon_state = "motion4" + w_class = WEIGHT_CLASS_SMALL + item_flags = IS_DEPLOYABLE + ///Type path for what this deploys into + var/deployable_type + ///Time to deploy + var/deploy_time = 2 SECONDS + ///Time to undeploy + var/undeploy_time = 2 SECONDS + +/obj/item/campaign_beacon/Initialize(mapload) + . = ..() + AddComponent(/datum/component/deployable_item, deployable_type, deploy_time, undeploy_time, CALLBACK(src, PROC_REF(can_deploy))) + +///Any Additional checks for deploying validity +/obj/item/campaign_beacon/proc/can_deploy(mob/user, turf/location) + return TRUE + +/obj/item/campaign_beacon/bunker_buster + name = "orbital beacon" + desc = "A bulky device that is used to provide precision guidance to powerful orbital weapon systems." + icon = 'icons/Marine/marine-navigation.dmi' + icon_state = "motion4" + deployable_type = /obj/structure/campaign_objective/destruction_objective/bunker_buster + deploy_time = 2 SECONDS + undeploy_time = 2 SECONDS + ///Can only be deployed in map areas listed here + var/list/valid_deploy_areas + +/obj/item/campaign_beacon/bunker_buster/Initialize(mapload) + . = ..() + GLOB.campaign_objectives += src + var/datum/campaign_mission/raiding_base/current_mission = get_current_mission() + if(!istype(current_mission)) + return + valid_deploy_areas = current_mission.get_valid_beacon_areas() + +/obj/item/campaign_beacon/bunker_buster/Destroy() + GLOB.campaign_objectives -= src + return ..() + +/obj/item/campaign_beacon/bunker_buster/examine(mob/user) + . = ..() + if(!length(valid_deploy_areas)) + return + var/location_info + location_info += "Can be deployed in the following areas: \n" + for(var/area/valid_area AS in valid_deploy_areas) + location_info += "[valid_area::name]\n" + . += location_info + +///Checks if we can deploy the beacon here +/obj/item/campaign_beacon/bunker_buster/can_deploy(mob/user, turf/location) + var/area/beacon_area = get_area(location) + if(beacon_area.type in valid_deploy_areas) + return TRUE + if(user) + user.balloon_alert(user, "Cannot deploy here") + return FALSE + +///Delay between beacon timer finishing and the actual explosion +#define CAMPAIGN_OB_BEACON_IMPACT_DELAY 10 SECONDS + +/obj/structure/campaign_objective/destruction_objective/bunker_buster + name = "deployed orbital beacon" + desc = "An ominous red beacon, used to provide precision guidance to powerful orbital weapon systems." + icon = 'icons/Marine/marine-navigation.dmi' + icon_state = "motion1" + faction = FACTION_TERRAGOV + density = FALSE + ///How long the beacon takes to trigger its effect + var/beacon_duration = 3 MINUTES + ///Holds the actual timer for the beacon + var/beacon_timer + +/obj/structure/campaign_objective/destruction_objective/bunker_buster/Initialize(mapload) + . = ..() + RegisterSignal(SSdcs, COMSIG_GLOB_CAMPAIGN_OB_BEACON_TRIGGERED, PROC_REF(cancel_beacon)) + SEND_SIGNAL(SSdcs, COMSIG_GLOB_CAMPAIGN_OB_BEACON_ACTIVATION, src) + + beacon_timer = addtimer(CALLBACK(src, PROC_REF(beacon_effect)), beacon_duration, TIMER_STOPPABLE) + countdown = new(src) + countdown.pixel_x = 7 + countdown.pixel_y = 24 + countdown.start() + +/obj/structure/campaign_objective/destruction_objective/bunker_buster/Destroy() + QDEL_NULL(countdown) + if(beacon_timer) + deltimer(beacon_timer) + beacon_timer = null + return ..() + +/obj/structure/campaign_objective/destruction_objective/bunker_buster/get_time_left() + return beacon_timer ? round(timeleft(beacon_timer) MILLISECONDS) : null + +///Clears the beacon if another beacon successfully activates +/obj/structure/campaign_objective/destruction_objective/bunker_buster/proc/cancel_beacon(datum/source) + SIGNAL_HANDLER + qdel(src) + +///Effects triggered when the timer runs out +/obj/structure/campaign_objective/destruction_objective/bunker_buster/proc/beacon_effect() + UnregisterSignal(SSdcs, COMSIG_GLOB_CAMPAIGN_OB_BEACON_TRIGGERED) + SEND_SIGNAL(SSdcs, COMSIG_GLOB_CAMPAIGN_OB_BEACON_TRIGGERED, src, CAMPAIGN_OB_BEACON_IMPACT_DELAY) + for(var/mob/mob AS in GLOB.player_list) + if(mob.z != z) + continue + var/play_sound = 'sound/effects/OB_warning_announce_novoiceover.ogg' + if(isobserver(mob) || mob.faction == faction) + play_sound = 'sound/effects/OB_warning_announce.ogg' + mob.playsound_local(loc, play_sound, 125, falloff = 10, distance_multiplier = 0.2) + +#undef CAMPAIGN_OB_BEACON_IMPACT_DELAY diff --git a/code/game/objects/structures/coathanger.dm b/code/game/objects/structures/coathanger.dm index 150dbf4121217..16035f84ab4ac 100644 --- a/code/game/objects/structures/coathanger.dm +++ b/code/game/objects/structures/coathanger.dm @@ -5,7 +5,7 @@ icon_state = "coatrack0" coverage = 5 var/obj/item/clothing/suit/coat - var/list/allowed = list(/obj/item/clothing/suit/storage/labcoat, /obj/item/clothing/suit/storage/det_suit, /obj/item/clothing/suit/bomber) + var/list/allowed = list(/obj/item/clothing/suit/storage/labcoat, /obj/item/clothing/suit/storage/det_suit, /obj/item/clothing/suit/storage/bomber) /obj/structure/coatrack/Initialize(mapload) . = ..() @@ -25,6 +25,8 @@ /obj/structure/coatrack/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(!(I.type in allowed) || coat) to_chat(user, span_notice("You cannot hang [I] on [src]")) @@ -50,11 +52,11 @@ break -/obj/structure/coatrack/update_icon() - overlays.Cut() +/obj/structure/coatrack/update_overlays() + . = ..() if(istype(coat, /obj/item/clothing/suit/storage/labcoat)) - overlays += image(icon, icon_state = "coat_lab") + . += image(icon, icon_state = "coat_lab") if(istype(coat, /obj/item/clothing/suit/storage/labcoat/cmo)) - overlays += image(icon, icon_state = "coat_cmo") + . += image(icon, icon_state = "coat_cmo") if(istype(coat, /obj/item/clothing/suit/storage/det_suit)) - overlays += image(icon, icon_state = "coat_det") + . += image(icon, icon_state = "coat_det") diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 8007f73dcfade..268bcfd48835f 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -215,17 +215,17 @@ dump_contents() qdel(src) -/obj/structure/closet/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) +/obj/structure/closet/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) . = ..() if(!.) return - if(X.a_intent == INTENT_HARM && !opened && prob(70)) + if(xeno_attacker.a_intent == INTENT_HARM && !opened && prob(70)) break_open() /obj/structure/closet/attackby(obj/item/I, mob/user, params) if(user in src) return FALSE - if(I.flags_item & ITEM_ABSTRACT) + if(I.item_flags & ITEM_ABSTRACT) return FALSE . = ..() if(opened) @@ -323,15 +323,17 @@ else balloon_alert(usr, "Can't do this") -/obj/structure/closet/update_icon()//Putting the welded stuff in updateicon() so it's easy to overwrite for special cases (Fridges, cabinets, and whatnot) - overlays.Cut() +/obj/structure/closet/update_icon_state()//Putting the welded stuff in updateicon() so it's easy to overwrite for special cases (Fridges, cabinets, and whatnot) + . = ..() if(!opened) icon_state = icon_closed - if(welded) - overlays += image(icon, overlay_welded) else icon_state = icon_opened +/obj/structure/closet/update_overlays() + . = ..() + if(!opened && welded) + . += image(icon, overlay_welded) /obj/structure/closet/resisted_against(datum/source) container_resist(source) @@ -458,7 +460,7 @@ return FALSE if(!CHECK_BITFIELD(destination.closet_flags, CLOSET_ALLOW_DENSE_OBJ) && density) return FALSE - if(CHECK_BITFIELD(flags_item, DELONDROP)) + if(CHECK_BITFIELD(item_flags, DELONDROP)) return FALSE var/item_size = CEILING(w_class * 0.5, 1) if(item_size + destination.item_size_counter > destination.storage_capacity) diff --git a/code/game/objects/structures/crates_lockers/closets/coffin.dm b/code/game/objects/structures/crates_lockers/closets/coffin.dm index 8d2413ac2367c..6a0eab48d6d7c 100644 --- a/code/game/objects/structures/crates_lockers/closets/coffin.dm +++ b/code/game/objects/structures/crates_lockers/closets/coffin.dm @@ -8,6 +8,7 @@ anchored = FALSE /obj/structure/closet/coffin/update_icon_state() + . = ..() if(!opened) icon_state = icon_closed else diff --git a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm index 9504f2a66392c..b4dc832c61e04 100644 --- a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm +++ b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm @@ -30,7 +30,7 @@ to_chat(user, "You disable the locking modules.") update_icon() return - else if(!(O.flags_item & NOBLUDGEON) && O.force) + else if(!(O.item_flags & NOBLUDGEON) && O.force) var/obj/item/W = O if(src.smashed || src.localopened) if(localopened) @@ -53,7 +53,7 @@ return if (istype(O, /obj/item/weapon/twohanded/fireaxe) && src.localopened) if(!fireaxe) - if(O.flags_item & WIELDED) + if(O.item_flags & WIELDED) to_chat(user, span_warning("Unwield the axe first.")) return fireaxe = O @@ -191,7 +191,9 @@ to_chat(user, span_notice("Cabinet unlocked.")) return -/obj/structure/closet/fireaxecabinet/update_icon() //Template: fireaxe[has fireaxe][is opened][hits taken][is smashed]. If you want the opening or closing animations, add "opening" or "closing" right after the numbers +//Template: fireaxe[has fireaxe][is opened][hits taken][is smashed]. If you want the opening or closing animations, add "opening" or "closing" right after the numbers +/obj/structure/closet/fireaxecabinet/update_icon_state() + . = ..() var/hasaxe = 0 if(fireaxe) hasaxe = 1 diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm index 06e05dff0860f..c4f4a99119ad5 100644 --- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm +++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm @@ -9,6 +9,7 @@ AddElement(/datum/element/debris, DEBRIS_WOOD, -10, 5) /obj/structure/closet/cabinet/update_icon_state() + . = ..() if(!opened) icon_state = icon_closed else diff --git a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm index c3686b58dc40e..92590d29814b3 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm @@ -23,6 +23,7 @@ new /obj/item/reagent_containers/food/drinks/cans/beer( src ) /obj/structure/closet/secure_closet/bar/update_icon_state() + . = ..() if(broken) icon_state = icon_broken return diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index 7e65054f0121d..854b71e9c9752 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -8,6 +8,7 @@ icon_off = "fridge1" /obj/structure/closet/secure_closet/freezer/update_icon_state() + . = ..() if(broken) icon_state = icon_broken return diff --git a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm index c2314e38e1a0c..7082cbc11ba9d 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm @@ -13,9 +13,9 @@ . = ..() switch(rand(1,2)) if(1) - new /obj/item/clothing/suit/apron(src) + new /obj/item/clothing/suit/storage/apron(src) if(2) - new /obj/item/clothing/suit/apron/overalls(src) + new /obj/item/clothing/suit/storage/apron/overalls(src) new /obj/item/storage/bag/plants(src) new /obj/item/clothing/under/rank/hydroponics(src) new /obj/item/tool/analyzer/plant_analyzer(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm index 68434d3284483..ab112d2039125 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm @@ -31,7 +31,8 @@ icon_broken = "cabinetdetective_broken" icon_off = "cabinetdetective_broken" -/obj/structure/closet/secure_closet/personal/cabinet/update_icon() +/obj/structure/closet/secure_closet/personal/cabinet/update_icon_state() + . = ..() if(broken) icon_state = icon_broken else diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm index a29102023f1a2..93618348f5f14 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm @@ -50,14 +50,17 @@ return togglelock(usr) -/obj/structure/closet/secure_closet/update_icon() - overlays.Cut() +/obj/structure/closet/secure_closet/update_icon_state() + . = ..() if(opened) icon_state = icon_opened else icon_state = locked ? icon_locked : icon_closed + +/obj/structure/closet/secure_closet/update_overlays() + . = ..() if(welded) - overlays += overlay_welded + . += overlay_welded /obj/structure/closet/secure_closet/break_open() broken = TRUE diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 12872e153fd1f..e91d658cfd0a5 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -271,7 +271,8 @@ new /obj/item/armor_module/storage/uniform/holster/armpit(src) -/obj/structure/closet/secure_closet/detective/update_icon() +/obj/structure/closet/secure_closet/detective/update_icon_state() + . = ..() if(broken) icon_state = icon_broken else @@ -356,7 +357,8 @@ large = FALSE -/obj/structure/closet/secure_closet/wall/update_icon() +/obj/structure/closet/secure_closet/wall/update_icon_state() + . = ..() if(broken) icon_state = icon_broken else diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index 58fc58a48db8b..461263a1d6fc0 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -78,7 +78,8 @@ new /obj/item/tool/extinguisher(src) new /obj/item/clothing/head/hardhat/red(src) -/obj/structure/closet/firecloset/update_icon() +/obj/structure/closet/firecloset/update_icon_state() + . = ..() if(!opened) icon_state = icon_closed else diff --git a/code/game/objects/structures/crates_lockers/largecrate_supplies.dm b/code/game/objects/structures/crates_lockers/largecrate_supplies.dm index 41f1254c74285..f05ef65fc5837 100644 --- a/code/game/objects/structures/crates_lockers/largecrate_supplies.dm +++ b/code/game/objects/structures/crates_lockers/largecrate_supplies.dm @@ -139,7 +139,7 @@ /obj/structure/largecrate/supply/weapons/standard_hmg name = "\improper HSG-102 mounted heavy smartgun chest (x2)" desc = "A supply crate containing two boxed HSG-102 mounted heavy smartguns." - supplies = list(/obj/item/storage/box/tl102 = 2) + supplies = list(/obj/item/storage/box/hsg_102 = 2) /obj/structure/largecrate/supply/weapons/standard_atgun name = "\improper AT-36 anti tank gun and ammo chest (x1, x10)" @@ -160,6 +160,11 @@ /obj/item/ammo_magazine/auto_cannon/flak = 3, ) +/obj/structure/largecrate/supply/weapons/heavy_flakgun + name = "\improper FK-88 mounted flak gun (x1)" + desc = "A supply crate containing a FK-88 mounted flak gun. Ammo sold separately." + supplies = list(/obj/item/weapon/gun/heavy_isg = 1) + /obj/structure/largecrate/supply/ammo name = "ammunition case" icon_state = "case" @@ -197,7 +202,7 @@ /obj/structure/largecrate/supply/ammo/standard_hmg name = "\improper HSG-102 ammunition box case (x6)" desc = "An ammunition case containing six HSG-102 ammunition boxes." - supplies = list(/obj/item/ammo_magazine/tl102 = 6) + supplies = list(/obj/item/ammo_magazine/hsg_102 = 6) /obj/structure/largecrate/supply/ammo/standard_ammo name = "large surplus ammuniton crate" @@ -397,7 +402,7 @@ /obj/structure/largecrate/machine/autodoc/attackby(obj/item/I, mob/user, params) . = ..() - if(!.) + if(.) return if(iscrowbar(I)) @@ -417,7 +422,7 @@ /obj/structure/largecrate/supply/machine/bodyscanner/attackby(obj/item/I, mob/user, params) . = ..() - if(!.) + if(.) return if(iscrowbar(I)) @@ -436,7 +441,7 @@ /obj/structure/largecrate/machine/sleeper/attackby(obj/item/I, mob/user, params) . = ..() - if(!.) + if(.) return if(iscrowbar(I)) diff --git a/code/game/objects/structures/crates_lockers/secure_crates.dm b/code/game/objects/structures/crates_lockers/secure_crates.dm index 06f22499cc5e6..ac69840f78c02 100644 --- a/code/game/objects/structures/crates_lockers/secure_crates.dm +++ b/code/game/objects/structures/crates_lockers/secure_crates.dm @@ -17,16 +17,17 @@ . = ..() update_icon() - -/obj/structure/closet/crate/secure/update_icon() - overlays.Cut() +/obj/structure/closet/crate/secure/update_icon_state() + . = ..() if(opened) icon_state = icon_opened else icon_state = locked ? icon_locked : icon_unlocked - if(welded) - overlays += overlay_welded +/obj/structure/closet/crate/secure/update_overlays() + . = ..() + if(welded) + . += overlay_welded /obj/structure/closet/crate/secure/can_open() return !locked diff --git a/code/game/objects/structures/crates_lockers/walllocker.dm b/code/game/objects/structures/crates_lockers/walllocker.dm index cfe5ff7b18c10..c37ccbcdebed2 100644 --- a/code/game/objects/structures/crates_lockers/walllocker.dm +++ b/code/game/objects/structures/crates_lockers/walllocker.dm @@ -50,6 +50,7 @@ icon_closed = "hydrant" icon_opened = "hydrantopen" overlay_welded = "hydrant-medical_welded" + layer = ABOVE_OBJ_LAYER /obj/structure/closet/walllocker/hydrant/extinguisher diff --git a/code/game/objects/structures/curtains.dm b/code/game/objects/structures/curtains.dm index eea081b66866b..c8d0e8e33e4f9 100644 --- a/code/game/objects/structures/curtains.dm +++ b/code/game/objects/structures/curtains.dm @@ -23,11 +23,11 @@ playsound(get_turf(loc), "rustle", 15, 1, 6) toggle() -/obj/structure/curtain/attack_alien(mob/living/carbon/xenomorph/attackingxeno, damage_amount, damage_type, damage_flag, effects, armor_penetration, isrightclick) - if(!do_after(attackingxeno, XENO_CURTAIN_PULL_DELAY, NONE, src, BUSY_ICON_FRIENDLY)) +/obj/structure/curtain/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) + if(!do_after(xeno_attacker, XENO_CURTAIN_PULL_DELAY, NONE, src, BUSY_ICON_FRIENDLY)) return - attackingxeno.do_attack_animation(src, ATTACK_EFFECT_CLAW) - attackingxeno.visible_message(span_danger("\The [attackingxeno] pulls [src] down and slices it apart!"), \ + xeno_attacker.do_attack_animation(src, ATTACK_EFFECT_CLAW) + xeno_attacker.visible_message(span_danger("\The [xeno_attacker] pulls [src] down and slices it apart!"), \ span_danger("You pull the [src] down and rip it to shreds!"), null, 5) qdel(src) diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index 70352e706a1a8..d1e29cdba9921 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -24,7 +24,8 @@ */ -/obj/structure/displaycase/update_icon() +/obj/structure/displaycase/update_icon_state() + . = ..() if(destroyed) icon_state = "glassboxb[occupied]" else diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index edb2d65539f29..8fc90a3ebafa6 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -136,7 +136,8 @@ /obj/structure/door_assembly/attackby(obj/item/I, mob/user, params) . = ..() - + if(.) + return if(istype(I, /obj/item/tool/pen)) var/t = copytext(stripped_input(user, "Enter the name for the door.", name, created_name), 1, MAX_NAME_LEN) if(!t) diff --git a/code/game/objects/structures/droppod.dm b/code/game/objects/structures/droppod.dm index 7ff0b37230fac..0d0489116c595 100644 --- a/code/game/objects/structures/droppod.dm +++ b/code/game/objects/structures/droppod.dm @@ -4,6 +4,8 @@ GLOBAL_LIST_INIT(blocked_droppod_tiles, typecacheof(list(/turf/open/space/transi #define DROPPOD_TRANSIT_TIME 10 SECONDS ///radius of dispersion for leader pods #define LEADER_POD_DISPERSION 5 +///radius of dispersion for pods for randomisation or obstacle avoidance +#define DROPPOD_BASE_DISPERSION 1 ///base marine drop pod. can be controlled by an attached [/obj/structure/droppod/leader] or [/obj/machinery/computer/droppod_control] /obj/structure/droppod @@ -18,7 +20,7 @@ GLOBAL_LIST_INIT(blocked_droppod_tiles, typecacheof(list(/turf/open/space/transi interaction_flags = INTERACT_OBJ_DEFAULT|INTERACT_POWERLOADER_PICKUP_ALLOWED_BYPASS_ANCHOR soft_armor = list(MELEE = 25, BULLET = 80, LASER = 80, ENERGY = 90, BOMB = 70, BIO = 100, FIRE = 0, ACID = 0) max_integrity = 75 - flags_atom = PREVENT_CONTENTS_EXPLOSION + atom_flags = PREVENT_CONTENTS_EXPLOSION coverage = 75 buckle_flags = CAN_BUCKLE|BUCKLE_PREVENTS_PULL light_range = 1 @@ -99,6 +101,7 @@ GLOBAL_LIST_INIT(blocked_droppod_tiles, typecacheof(list(/turf/open/space/transi set_light(0) /obj/structure/droppod/update_icon_state() + . = ..() if(drop_state == DROPPOD_ACTIVE) icon_state = initial(icon_state) else if(operation_started && launch_allowed) @@ -167,7 +170,7 @@ GLOBAL_LIST_INIT(blocked_droppod_tiles, typecacheof(list(/turf/open/space/transi balloon_alert(user, "Hazardous zone") return FALSE var/area/targetarea = get_area(target) - if(targetarea.flags_area & NO_DROPPOD) // Thou shall not pass! + if(targetarea.area_flags & NO_DROPPOD) // Thou shall not pass! if(user) balloon_alert(user, "Invalid area") return FALSE @@ -210,13 +213,18 @@ GLOBAL_LIST_INIT(blocked_droppod_tiles, typecacheof(list(/turf/open/space/transi if(drop_state != DROPPOD_READY) return + var/turf/target = locate(target_x, target_y, target_z) + if(!commanded_drop) //we randomise the landing slightly, its already randomised for mass launch + target = find_new_target() + target_x = target.x + target_y = target.y + if(!checklanding(user)) return for(var/mob/podder AS in buckled_mobs) podder.forceMove(src) - var/turf/target = locate(target_x, target_y, target_z) if(user) log_game("[key_name(user)] launched pod [src] at [AREACOORD(target)]") deadchat_broadcast(" has been launched", src, turf_target = target) @@ -230,6 +238,22 @@ GLOBAL_LIST_INIT(blocked_droppod_tiles, typecacheof(list(/turf/open/space/transi flick("[icon_state]_closing", src) addtimer(CALLBACK(src, PROC_REF(launch_pod), user), 2.5 SECONDS) +///Find a new suitable target turf around the pods initial target +/obj/structure/droppod/proc/find_new_target(mob/user) + var/scatter_radius = DROPPOD_BASE_DISPERSION + GLOB.current_orbit + var/turf/T0 = locate(target_x + scatter_radius, target_y + scatter_radius, target_z) + var/turf/T1 = locate(target_x - scatter_radius, target_y - scatter_radius, target_z) + var/list/block = block(T0,T1) + shuffle_inplace(block) + for(var/turf/attemptdrop AS in block) + if(!checklanding(optional_turf = attemptdrop)) + continue + return attemptdrop + + if(user) + to_chat(user, span_warning("[icon2html(src, user)] RECALCULATION FAILED!")) + return locate(target_x, target_y, target_z) //no other alt spots found, we return our original target + ///actually launches the pod /obj/structure/droppod/proc/launch_pod(mob/user) if(!launch_allowed) @@ -244,33 +268,21 @@ GLOBAL_LIST_INIT(blocked_droppod_tiles, typecacheof(list(/turf/open/space/transi playsound(src, 'sound/effects/escape_pod_launch.ogg', 70) playsound(src, 'sound/effects/droppod_launch.ogg', 70) - addtimer(CALLBACK(src, PROC_REF(finish_drop), user), DROPPOD_TRANSIT_TIME) + addtimer(CALLBACK(src, PROC_REF(finish_drop), user), ROUND_UP(DROPPOD_TRANSIT_TIME * ((GLOB.current_orbit + 3) / 6))) forceMove(pick(reserved_area.reserved_turfs)) new /area/arrival(loc) //adds a safezone so we dont suffocate on the way down, cleaned up with reserved turfs /// Moves the droppod into its target turf, which it updates if needed /obj/structure/droppod/proc/finish_drop(mob/user) var/turf/targetturf = locate(target_x, target_y, target_z) - for(var/a in targetturf.contents) - var/atom/target = a - if(target.density) //if theres something dense in the turf try to recalculate a new turf - if(user) - to_chat(user, span_warning("[icon2html(src, user)] WARNING! TARGET ZONE OCCUPIED! EVADING!")) - balloon_alert(user, "EVADING") - var/turf/T0 = locate(target_x + 2,target_y + 2, target_z) - var/turf/T1 = locate(target_x - 2,target_y - 2, target_z) - var/list/block = block(T0,T1) - targetturf - for(var/t in block)//Randomly selects a free turf in a 5x5 block around the target - var/turf/attemptdrop = t - if(!attemptdrop.density && !is_type_in_typecache(attemptdrop, GLOB.blocked_droppod_tiles)) - targetturf = attemptdrop - break - if(targetturf.density)//We tried and failed, revert to the old one, which has a new dense obj but is at least not dense - if(user) - to_chat(user, span_warning("[icon2html(src, user)] RECALCULATION FAILED!")) - targetturf = locate(target_x, target_y, target_z) - break - + for(var/atom/target AS in targetturf.contents) + if(!target.density) + continue + if(user) + to_chat(user, span_warning("[icon2html(src, user)] WARNING! TARGET ZONE OCCUPIED! EVADING!")) + balloon_alert(user, "EVADING") + targetturf = find_new_target(user) + break forceMove(targetturf) SEND_GLOBAL_SIGNAL(COMSIG_GLOB_DROPPOD_LANDED, targetturf) pixel_y = 500 @@ -320,7 +332,8 @@ GLOBAL_LIST_INIT(blocked_droppod_tiles, typecacheof(list(/turf/open/space/transi for(var/obj/structure/droppod/pod AS in GLOB.droppod_list) if(LAZYLEN(pod.buckled_mobs) || LAZYLEN(pod.contents)) occupied_pods++ - var/dispersion = max(LEADER_POD_DISPERSION, LEADER_POD_DISPERSION + ((occupied_pods - 10) / 5)) + var/dispersion = LEADER_POD_DISPERSION + GLOB.current_orbit + dispersion = max(dispersion, dispersion + ((occupied_pods - 10) / 5)) var/turf/topright = locate(new_x + dispersion, new_y + dispersion, target_z) var/turf/bottomleft = locate(new_x - dispersion, new_y - dispersion, target_z) var/list/block = block(bottomleft, topright) - locate() @@ -374,6 +387,7 @@ GLOBAL_LIST_INIT(blocked_droppod_tiles, typecacheof(list(/turf/open/space/transi return ..() /obj/structure/droppod/nonmob/update_icon_state() + . = ..() if(drop_state == DROPPOD_ACTIVE) icon_state = initial(icon_state) else if(stored_object) @@ -466,7 +480,7 @@ GLOBAL_LIST_INIT(blocked_droppod_tiles, typecacheof(list(/turf/open/space/transi /obj/structure/droppod/nonmob/mech_pod name = "\improper TGMC Zeus mech drop pod" - desc = "A menacing metal hunk of steel that is used by the TGMC for quick tactical redeployment. This is a larger model designed specifically to carry mechs." + desc = "A menacing metal hunk of steel that is used by the TGMC for quick tactical redeployment. This is a larger model designed specifically to carry mechs. Shift click to enter when inside a mech." icon = 'icons/obj/structures/big_droppod.dmi' icon_state = "mechpod" light_range = 2 @@ -494,7 +508,7 @@ GLOBAL_LIST_INIT(blocked_droppod_tiles, typecacheof(list(/turf/open/space/transi /obj/structure/droppod/nonmob/mech_pod/ex_act(severity) switch(severity) if(EXPLODE_DEVASTATE) - take_damage(100, BRUTE, BOMB, 0) + take_damage(100, BRUTE, BOMB) if(EXPLODE_HEAVY) take_damage(50, BRUTE, BOMB, 0) */ @@ -610,3 +624,12 @@ GLOBAL_LIST_INIT(blocked_droppod_tiles, typecacheof(list(/turf/open/space/transi /obj/structure/drop_pod_launcher/leader pod_type = /obj/structure/droppod/leader + +/obj/structure/drop_pod_launcher/mech + pod_type = /obj/structure/droppod/nonmob/mech_pod + +/obj/structure/drop_pod_launcher/supply + pod_type = /obj/structure/droppod/nonmob/supply_pod + +/obj/structure/drop_pod_launcher/sentry + pod_type = /obj/structure/droppod/nonmob/turret_pod diff --git a/code/game/objects/structures/dropship_ammo.dm b/code/game/objects/structures/dropship_ammo.dm index ce2a8fc74f8d6..a6e5c8ac72eb6 100644 --- a/code/game/objects/structures/dropship_ammo.dm +++ b/code/game/objects/structures/dropship_ammo.dm @@ -16,16 +16,23 @@ var/travelling_time = 10 SECONDS ///type of equipment that accept this type of ammo. var/equipment_type + ///current ammo count var/ammo_count + ///maximum ammo count. does NOT determine starting ammo var/max_ammo_count - var/ammo_name = "rounds" //what to call the ammo in the ammo transfering message + ///what to call the ammo in the ammo transfering message + var/ammo_name = "rounds" var/ammo_id ///whether the ammo inside this magazine can be transfered to another magazine. var/transferable_ammo = FALSE ///sound played mere seconds before impact var/warning_sound = 'sound/machines/hydraulics_2.ogg' + ///voiceline to play half a second after the weapon is fired + var/firing_voiceline + ///how much ammo to use up per firing sequence var/ammo_used_per_firing = 1 - var/point_cost = 0 //how many points it costs to build this with the fabricator, set to 0 if unbuildable. + ///how many points it costs to build this with the fabricator, set to 0 if unbuildable. + var/point_cost = 0 ///Type of ammo var/ammo_type @@ -211,12 +218,12 @@ transferable_ammo = TRUE ammo_used_per_firing = 200 point_cost = 100 + ammo_type = CAS_30MM + cas_effect = /obj/effect/overlay/blinking_laser/heavygun ///Radius of the square that the bullets will strafe var/bullet_spread_range = 2 ///Width of the square we are attacking, so you can make rectangular attacks later var/attack_width = 3 - ammo_type = CAS_30MM - cas_effect = /obj/effect/overlay/blinking_laser/heavygun /obj/structure/ship_ammo/cas/heavygun/examine(mob/user) . = ..() @@ -268,7 +275,7 @@ name = "high-velocity 30mm ammo crate" icon_state = "30mm_crate_hv" desc = "A crate full of 30mm high-velocity bullets used on the dropship heavy guns. Moving this will require some sort of lifter." - travelling_time = 3 SECONDS + travelling_time = 2 SECONDS point_cost = 225 @@ -322,10 +329,10 @@ ammo_used_per_firing = 10 warning_sound = 'sound/effects/nightvision.ogg' point_cost = 150 - ///The length of the beam that will come out of when we fire do both ends xxxoxxx where o is where you click - var/laze_radius = 4 ammo_type = CAS_LASER_BATTERY cas_effect = /obj/effect/overlay/blinking_laser/laser + ///The length of the beam that will come out of when we fire do both ends xxxoxxx where o is where you click + var/laze_radius = 4 /obj/structure/ship_ammo/cas/laser_battery/examine(mob/user) . = ..() @@ -367,7 +374,7 @@ T.ignite(5, 30) //short but intense -//Rockets +//Rockets are defined by being one shot and done, and generally having solid payloads and low travel times. /obj/structure/ship_ammo/cas/rocket name = "abstract rocket" @@ -378,6 +385,7 @@ max_ammo_count = 1 ammo_name = "rocket" ammo_id = "" + firing_voiceline = 'sound/voice/plane_vws/shot_missile.ogg' bound_width = 64 bound_height = 32 travelling_time = 4 SECONDS @@ -385,39 +393,76 @@ ammo_type = CAS_MISSILE /obj/structure/ship_ammo/cas/rocket/detonate_on(turf/impact, attackdir = NORTH) + impact.ceiling_debris_check(3) + explosion(impact, devastating_explosion_range, heavy_explosion_range, light_explosion_range) qdel(src) +//ATGMs, defined by 3 second travel time and tight explosion sizes. -//this one is air-to-air only +// The widowmaker is defined by being the fastest ATGM on offer, however it suffers in explosive potiential due to being so fast. /obj/structure/ship_ammo/cas/rocket/widowmaker - name = "\improper AIM-224 'Widowmaker'" - desc = "The AIM-224 is the latest in air to air missile technology. Earning the nickname of 'Widowmaker' from various dropship pilots after improvements to its guidence warhead prevents it from being jammed leading to its high kill rate. Not well suited for ground bombardment, but its high velocity makes it reach its target quickly. Moving this will require some sort of lifter." + name = "\improper AGM-224 'Widowmaker'" + desc = "The AGM-224 is the latest in air to ground missile technology. Earning the nickname of 'Widowmaker' from various pilots after improvements allow it to land at incredibly high speeds, at the cost of explosive payload. Well suited for ground bombardment, its high velocity making it reach its target quickly. Moving this will require some sort of lifter." icon_state = "single" - travelling_time = 3 SECONDS //not powerful, but reaches target fast + travelling_time = 2 SECONDS //The epitome of ATGMs. ammo_id = "" + point_cost = 300 + devastating_explosion_range = 2 + heavy_explosion_range = 3 + prediction_type = CAS_AMMO_EXPLOSIVE + cas_effect = /obj/effect/overlay/blinking_laser/widowmaker + +/obj/structure/ship_ammo/cas/rocket/keeper + name = "\improper AGM-67 'Keeper II" + desc = "The AGM-67 'Keeper II' is the latest in a generation of laser guided weaponry that spans all the way back to the 20th century. Earning its nickname from a contract that developed its guidance system and the various uses of it during peacekeeping conflicts. Its payload is designed to devastate armored targets. Moving this will require some sort of lifter." + icon_state = "keeper" + ammo_id = "k" point_cost = 225 devastating_explosion_range = 2 heavy_explosion_range = 4 - light_explosion_range = 7 + travelling_time = 3 SECONDS prediction_type = CAS_AMMO_EXPLOSIVE - cas_effect = /obj/effect/overlay/blinking_laser/widowmaker -/obj/structure/ship_ammo/cas/rocket/widowmaker/detonate_on(turf/impact, attackdir = NORTH) +// Da warcrime ATGM. Lower explosive yield, but long lasting fire. +/obj/structure/ship_ammo/cas/rocket/napalm + name = "\improper AGM-99 'Napalm'" + desc = "The AGM-99 'Napalm' is an incendiary rocket used to turn specific targeted areas into giant balls of fire for quite a long time, it has a smaller outer explosive payload than other AGMs, however. Moving this will require some sort of lifter." + icon_state = "napalm" + ammo_id = "n" + point_cost = 275 + devastating_explosion_range = 2 + heavy_explosion_range = 3 + light_explosion_range = 4 + fire_range = 3 + travelling_time = 3 SECONDS + prediction_type = CAS_AMMO_INCENDIARY + cas_effect = /obj/effect/overlay/blinking_laser/napalm + +/obj/structure/ship_ammo/cas/rocket/napalm/detonate_on(turf/impact, attackdir = NORTH) impact.ceiling_debris_check(3) explosion(impact, devastating_explosion_range, heavy_explosion_range, light_explosion_range) + flame_radius(fire_range, impact, 30, 60) //cooking for a long time + var/datum/effect_system/smoke_spread/phosphorus/warcrime = new + warcrime.set_up(fire_range + 1, impact, 7) + warcrime.start() qdel(src) + +// High yield missiles are defined by having... high yields and high travel time, usually around six seconds. + +//The Banshee is defined by combining both explosive and fire into one, literally. At the cost of some outer payload yield. /obj/structure/ship_ammo/cas/rocket/banshee - name = "\improper AGM-227 'Banshee'" - desc = "The AGM-227 missile is a mainstay of the overhauled dropship fleet against any mobile or armored ground targets. It's earned the nickname of 'Banshee' from the sudden wail that it emitts right before hitting a target. Useful to clear out large areas. Moving this will require some sort of lifter." + name = "\improper PGHM-227 'Banshee'" + desc = "The PGHM-227 missile is a mainstay of the fleet against any mobile or armored ground targets. It's earned the nickname of 'Banshee' from the sudden wail that it emitts right before hitting a target. Useful to clear out large areas. Moving this will require some sort of lifter." icon_state = "banshee" ammo_id = "b" - point_cost = 225 + point_cost = 275 devastating_explosion_range = 2 heavy_explosion_range = 4 - light_explosion_range = 7 + light_explosion_range = 5 fire_range = 7 prediction_type = CAS_AMMO_INCENDIARY + travelling_time = 6 SECONDS cas_effect = /obj/effect/overlay/blinking_laser/banshee /obj/structure/ship_ammo/cas/rocket/banshee/detonate_on(turf/impact, attackdir = NORTH) @@ -425,32 +470,18 @@ explosion(impact, devastating_explosion_range, heavy_explosion_range, light_explosion_range, flame_range = fire_range) //more spread out, with flames qdel(src) -/obj/structure/ship_ammo/cas/rocket/keeper - name = "\improper GBU-67 'Keeper II'" - desc = "The GBU-67 'Keeper II' is the latest in a generation of laser guided weaponry that spans all the way back to the 20th century. Earning its nickname from a shortening of 'Peacekeeper' which comes from the program that developed its guidance system and the various uses of it during peacekeeping conflicts. Its payload is designed to devastate armored targets. Moving this will require some sort of lifter." - icon_state = "keeper" - ammo_id = "k" - point_cost = 300 - devastating_explosion_range = 4 - heavy_explosion_range = 4 - light_explosion_range = 5 - prediction_type = CAS_AMMO_EXPLOSIVE - -/obj/structure/ship_ammo/cas/rocket/keeper/detonate_on(turf/impact, attackdir = NORTH) - impact.ceiling_debris_check(3) - explosion(impact, devastating_explosion_range, heavy_explosion_range, light_explosion_range) //tighter blast radius, but more devastating near center - qdel(src) - +//The fatty is well.. Fat. /obj/structure/ship_ammo/cas/rocket/fatty - name = "\improper SM-17 'Fatty'" - desc = "The SM-17 'Fatty' is the most devestating rocket in TGMC arsenal, only second after its big cluster brother in Orbital Cannon. These rocket are also known for highest number of Friendly-on-Friendly incidents due to secondary cluster explosions as well as range of these explosions, TGMC recommends pilots to encourage usage of signal flares or laser for 'Fatty' support. Moving this will require some sort of lifter." + name = "\improper PHGM-17 'Fatty'" + desc = "The PHGM-17 'Fatty' is the most devestating rocket in TGMC arsenal, only second after its big cluster brother in Orbital Cannon. These rocket are also known for highest number of Friendly-on-Friendly incidents due to secondary cluster explosions as well as range of these explosions, TGMC recommends pilots to encourage usage of signal flares or laser for 'Fatty' support. Moving this will require some sort of lifter." icon_state = "fatty" ammo_id = "f" - point_cost = 325 + point_cost = 300 devastating_explosion_range = 2 heavy_explosion_range = 3 light_explosion_range = 4 prediction_type = CAS_AMMO_EXPLOSIVE + travelling_time = 6 SECONDS cas_effect = /obj/effect/overlay/blinking_laser/fatty /obj/structure/ship_ammo/cas/rocket/fatty/detonate_on(turf/impact, attackdir = NORTH) @@ -474,31 +505,36 @@ explosion(detonation_target, devastating_explosion_range, heavy_explosion_range, light_explosion_range, adminlog = FALSE) qdel(src) -/obj/structure/ship_ammo/cas/rocket/napalm - name = "\improper XN-99 'Napalm'" - desc = "The XN-99 'Napalm' is an incendiary rocket used to turn specific targeted areas into giant balls of fire for a long time. Moving this will require some sort of lifter." - icon_state = "napalm" - ammo_id = "n" +// This is the "Default" heavy rocket. +/obj/structure/ship_ammo/cas/rocket/monarch + name = "\improper PHGM-7 'Monarch'" + desc = "The PHGM-7 'Monarch' is a well tried and tested dumb rocket design due to being a mere dumb rocket. Its payload is designed to devastate areas for cheap. Moving this will require some sort of lifter." + icon_state = "monarch" + ammo_id = "m" point_cost = 250 - devastating_explosion_range = 2 - heavy_explosion_range = 3 - light_explosion_range = 4 - fire_range = 5 - prediction_type = CAS_AMMO_INCENDIARY - cas_effect = /obj/effect/overlay/blinking_laser/incendiary - -/obj/structure/ship_ammo/cas/rocket/napalm/detonate_on(turf/impact, attackdir = NORTH) - impact.ceiling_debris_check(3) - explosion(impact, devastating_explosion_range, heavy_explosion_range, light_explosion_range) //relatively weak - flame_radius(fire_range, impact, 60, 30) //cooking for a long time - var/datum/effect_system/smoke_spread/phosphorus/warcrime = new - warcrime.set_up(fire_range + 1, impact, 7) - warcrime.start() - qdel(src) + devastating_explosion_range = 3 + heavy_explosion_range = 5 + light_explosion_range = 7 + travelling_time = 6 SECONDS + prediction_type = CAS_AMMO_EXPLOSIVE + cas_effect = /obj/effect/overlay/blinking_laser/monarch +// High speed missiles are defined by their four second deploy time, solid yield. -//minirockets +//The Swansong is the bogstandard missile, it missiles. +/obj/structure/ship_ammo/cas/rocket/swansong + name = "\improper PLGM-50 'Swansong'" + desc = "The PLGM-7 'Swansong' is the bogstandard air to ground missile load of the Navy. Named after barely dodging discontinuation dozens of times to more expensive design types. Moving this will require some sort of lifter." + icon_state = "swansong" + ammo_id = "s" + point_cost = 200 + devastating_explosion_range = 2 + heavy_explosion_range = 4 + light_explosion_range = 6 + prediction_type = CAS_AMMO_EXPLOSIVE + cas_effect = /obj/effect/overlay/blinking_laser/swansong +//Minirockets are effectively just da small rockets. /obj/structure/ship_ammo/cas/minirocket name = "mini rocket stack" desc = "A pack of explosive laser guided mini rockets. Moving this will require some sort of lifter." @@ -508,6 +544,7 @@ ammo_count = 6 max_ammo_count = 6 ammo_name = "minirocket" + firing_voiceline = 'sound/voice/plane_vws/shot_missile.ogg' travelling_time = 2 SECONDS transferable_ammo = TRUE point_cost = 175 @@ -589,6 +626,7 @@ point_cost = 50 // Not a real rocket, so its cheap travelling_time = 4 SECONDS cas_effect = /obj/effect/overlay/blinking_laser/flare + firing_voiceline = 'sound/voice/plane_vws/shot_flare.ogg' devastating_explosion_range = 0 heavy_explosion_range = 0 light_explosion_range = 0 @@ -602,3 +640,96 @@ /obj/structure/ship_ammo/cas/minirocket/illumination/proc/drop_cas_flare(turf/impact) new /obj/effect/temp_visual/above_flare(impact) + +// Bombs have a long travel time but are decently numerous, ranging in payloads from 200 to 1000lbs. Higher is bigger. +/obj/structure/ship_ammo/cas/bomb + name = "\improper AOE-200lb 'Tiny' stack" + desc = "A decent-sized payload of explosive bombs, will only fit in a full-sized bomb pod. Moving this will require some sort of lifter." + icon_state = "bomb_200" + icon = 'icons/Marine/mainship_props.dmi' + equipment_type = /obj/structure/dropship_equipment/cas/weapon/bomb_pod + ammo_count = 8 + max_ammo_count = 8 + ammo_name = "bomb_200" + firing_voiceline = 'sound/voice/plane_vws/shot_bomb.ogg' + travelling_time = 12 SECONDS + transferable_ammo = TRUE + point_cost = 200 // Bombs are numerous. + ammo_type = CAS_BOMB + devastating_explosion_range = 0 + heavy_explosion_range = 3 + light_explosion_range = 4 + prediction_type = CAS_AMMO_EXPLOSIVE + cas_effect = /obj/effect/overlay/blinking_laser/bomb + + +/obj/structure/ship_ammo/cas/bomb/detonate_on(turf/impact, attackdir = NORTH) + impact.ceiling_debris_check(2) + explosion(impact, devastating_explosion_range, heavy_explosion_range, light_explosion_range, adminlog = FALSE)//no messaging admin, that'd spam them. + +// Four hundos have no real gimmick beyond being a bigger payload. +/obj/structure/ship_ammo/cas/bomb/fourhundred + name = "\improper AOE-400lb 'Mighty' stack" + desc = "A decently-sized payload of explosive bombs, will only fit in a full-sized bomb pod. Moving this will require some sort of lifter." + icon_state = "bomb_400" + equipment_type = /obj/structure/dropship_equipment/cas/weapon/bomb_pod + ammo_count = 4 + max_ammo_count = 4 + ammo_name = "bomb_400" + point_cost = 225 // Bombs are numerous. + heavy_explosion_range = 4 + light_explosion_range = 5 + prediction_type = CAS_AMMO_EXPLOSIVE + cas_effect = /obj/effect/overlay/blinking_laser/bomb + +// The mother of all bombs, Jack. +/obj/structure/ship_ammo/cas/bomb/moab + name = "\improper AOE-1000lb 'MOAB' stack" + desc = "A incredibly high yield payload bomb used to utterly ruin someone's day, generally termed as the 'Mother of all Bombs'. will only fit in a full-sized bomb pod. Moving this will require some sort of lifter." + icon_state = "bomb_1000" + ammo_count = 2 + max_ammo_count = 2 + devastating_explosion_range = 6 + heavy_explosion_range = 8 + light_explosion_range = 0 + ammo_name = "bomb_1000" + travelling_time = 14 SECONDS + point_cost = 600 // This is literally a minituare OB. + cas_effect = /obj/effect/overlay/blinking_laser/bomb_fat + +// Bomblets are small and numerious, with small paylods but high quantity. +/obj/structure/ship_ammo/cas/bomblet + name = "\improper AOE-50lb 'Dandelions' stack" + desc = "A large litter of explosive bomblets, will only fit in a bomblet pod. Moving this will require some sort of lifter." + icon_state = "bomb_50" + icon = 'icons/Marine/mainship_props.dmi' + equipment_type = /obj/structure/dropship_equipment/cas/weapon/bomblet_pod + ammo_count = 40 + max_ammo_count = 40 + ammo_name = "bomb_50" + firing_voiceline = 'sound/voice/plane_vws/shot_bomb.ogg' + travelling_time = 10 SECONDS + transferable_ammo = TRUE + point_cost = 150 + ammo_type = CAS_BOMBLET + light_explosion_range = 2 + heavy_explosion_range = 0 + prediction_type = CAS_AMMO_EXPLOSIVE + cas_effect = /obj/effect/overlay/blinking_laser/bomblet + + +/obj/structure/ship_ammo/cas/bomblet/detonate_on(turf/impact, attackdir = NORTH) + impact.ceiling_debris_check(2) + explosion(impact, heavy_explosion_range, light_explosion_range, adminlog = FALSE)//no messaging admin, that'd spam them. + +/obj/structure/ship_ammo/cas/bomblet/medium + name = "\improper AOE-75lb 'Poppies' stack" + desc = "A large litter of explosive bomblets. Moving this will require some sort of lifter." + icon_state = "bomb_75" + ammo_count = 20 + max_ammo_count = 20 + ammo_name = "bomb_75" + travelling_time = 12 SECONDS + point_cost = 175 + light_explosion_range = 3 + prediction_type = CAS_AMMO_EXPLOSIVE diff --git a/code/game/objects/structures/dropship_equipment.dm b/code/game/objects/structures/dropship_equipment.dm index 918e89b11f420..89de39d69df67 100644 --- a/code/game/objects/structures/dropship_equipment.dm +++ b/code/game/objects/structures/dropship_equipment.dm @@ -104,9 +104,11 @@ pixel_y = 32 /obj/effect/attach_point/crew_weapon - name = "rear attach point" + name = "interior attach point" base_category = DROPSHIP_CREW_WEAPON density = FALSE + layer = HOLOPAD_LAYER //Keeps xenos from hiding under them + plane = FLOOR_PLANE //Doesn't layer under weeds unless it has this /obj/effect/attach_point/crew_weapon/dropship1 ship_tag = SHUTTLE_ALAMO @@ -323,6 +325,8 @@ /obj/structure/dropship_equipment/shuttle/flare_launcher/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/explosive/grenade/flare) && stored_amount < max_amount) stored_amount++ user.balloon_alert(user, "You insert a flare, remaining flares [stored_amount].") @@ -506,6 +510,7 @@ update_icon() /obj/structure/dropship_equipment/shuttle/weapon_holder/update_icon_state() + . = ..() if(ship_base) icon_state = deployed_icon_state else @@ -518,10 +523,10 @@ /obj/structure/dropship_equipment/shuttle/weapon_holder/machinegun name = "machinegun deployment system" - desc = "A box that deploys a modified M56D crewserved machine gun. Fits on the crewserved weapon attach points of dropships. You need a powerloader to lift it." + desc = "A box that deploys a modified HSG-102 crewserved machine gun. Fits on the crewserved weapon attach points of dropships. You need a powerloader to lift it." icon_state = "mg_system" point_cost = 300 - deployable_type = /obj/item/weapon/gun/tl102/hsg_nest + deployable_type = /obj/item/weapon/gun/hsg_102/hsg_nest /obj/structure/dropship_equipment/shuttle/weapon_holder/minigun name = "minigun deployment system" @@ -642,9 +647,12 @@ bound_height = 64 dropship_equipment_flags = USES_AMMO|IS_WEAPON|IS_INTERACTABLE|FIRE_MISSION_ONLY screen_mode = 1 - COOLDOWN_DECLARE(last_fired) //used for weapon cooldown after use. + ///used for weapon cooldown after use + COOLDOWN_DECLARE(last_fired) + ///primary firing sound on the plane var/firing_sound - var/firing_delay = 20 //delay between firing. 2 seconds by default + ///delay between firing. + var/firing_delay = 2 SECONDS /obj/structure/dropship_equipment/cas/weapon/update_equipment() if(ship_base) @@ -681,13 +689,18 @@ /obj/structure/dropship_equipment/cas/weapon/proc/open_fire(obj/selected_target, attackdir) var/turf/target_turf = get_turf(selected_target) if(firing_sound) - playsound(loc, firing_sound, 70, 1) + playsound(loc, firing_sound, 70, TRUE) var/obj/structure/ship_ammo/SA = ammo_equipped //necessary because we nullify ammo_equipped when firing big rockets var/ammo_travelling_time = SA.travelling_time //how long the rockets/bullets take to reach the ground target. var/ammo_warn_sound = SA.warning_sound deplete_ammo() COOLDOWN_START(src, last_fired, firing_delay) + if((SA.max_ammo_count > 1) && (SA.ammo_count <= 0)) + playsound(loc, 'sound/voice/plane_vws/ammunition_zero.ogg', 70, FALSE) + else if(SA.firing_voiceline) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), loc, SA.firing_voiceline, 80, FALSE), 5) + if(ammo_warn_sound) playsound(target_turf, ammo_warn_sound, 70, 1) @@ -706,14 +719,15 @@ /obj/structure/dropship_equipment/cas/weapon/heavygun name = "\improper GAU-21 30mm cannon" - desc = "A dismounted GAU-21 'Rattler' 30mm rotary cannon. It seems to be missing its feed links and has exposed connection wires. Capable of firing 5200 rounds a minute, feared by many for its power. Earned the nickname 'Rattler' from the vibrations it would cause on dropships in its inital production run. Moving this will require some sort of lifter." + desc = "A dismounted GAU-21 'Rattler' 30mm rotary cannon. Capable of firing 5200 rounds a minute, feared by many for its power. Earned the nickname 'Rattler' from the vibrations it would cause on ships in its inital production run. Moving this will require some sort of lifter." icon_state = "30mm_cannon" firing_sound = 'sound/weapons/gunship_chaingun.ogg' point_cost = 300 dropship_equipment_flags = USES_AMMO|IS_WEAPON|IS_INTERACTABLE ammo_type_used = CAS_30MM -/obj/structure/dropship_equipment/cas/weapon/heavygun/update_icon() +/obj/structure/dropship_equipment/cas/weapon/heavygun/update_icon_state() + . = ..() if(ammo_equipped) icon_state = "30mm_cannon_loaded[ammo_equipped.ammo_count?"1":"0"]" else @@ -744,7 +758,8 @@ ammo_equipped = null //nothing left to empty after firing update_icon() -/obj/structure/dropship_equipment/cas/weapon/rocket_pod/update_icon() +/obj/structure/dropship_equipment/cas/weapon/rocket_pod/update_icon_state() + . = ..() if(ammo_equipped?.ammo_count) icon_state = "rocket_pod_loaded[ammo_equipped.ammo_id]" else @@ -764,7 +779,8 @@ point_cost = 450 ammo_type_used = CAS_MINI_ROCKET -/obj/structure/dropship_equipment/cas/weapon/minirocket_pod/update_icon() +/obj/structure/dropship_equipment/cas/weapon/minirocket_pod/update_icon_state() + . = ..() if(ammo_equipped?.ammo_count) icon_state = "minirocket_pod_loaded" else @@ -789,7 +805,8 @@ dropship_equipment_flags = USES_AMMO|IS_WEAPON|IS_INTERACTABLE ammo_type_used = CAS_LASER_BATTERY -/obj/structure/dropship_equipment/cas/weapon/laser_beam_gun/update_icon() +/obj/structure/dropship_equipment/cas/weapon/laser_beam_gun/update_icon_state() + . = ..() if(ammo_equipped?.ammo_count) icon_state = "laser_beam_loaded" else @@ -810,7 +827,8 @@ equip_category = DROPSHIP_CREW_WEAPON //fits inside the central spot of the dropship point_cost = 0 -/obj/structure/dropship_equipment/cas/weapon/launch_bay/update_icon() +/obj/structure/dropship_equipment/cas/weapon/launch_bay/update_icon_state() + . = ..() if(ammo_equipped?.ammo_count) icon_state = "launch_bay_loaded" else @@ -857,3 +875,43 @@ deployed_table.layer = ABOVE_OBJ_LAYER + 0.01 //make sure its directly ABOVE the layer deployed_table.loc = loc icon_state = "table2-idle" + +/obj/structure/dropship_equipment/cas/weapon/bomblet_pod + name = "bomblet pod" + icon_state = "bomblet_pod" + desc = "A pnuematic thrower machine capable of up to 40 smaller bombs, generally called 'bomblets'. Moving this will require some sort of lifter." + icon = 'icons/Marine/mainship_props64.dmi' + firing_sound = 'sound/weapons/gunship_rocketpod.ogg' + firing_delay = 0.5 SECONDS + point_cost = 450 + dropship_equipment_flags = USES_AMMO|IS_WEAPON|IS_INTERACTABLE + ammo_type_used = CAS_BOMBLET + +/obj/structure/dropship_equipment/cas/weapon/bomblet_pod/update_icon_state() + . = ..() + if(ammo_equipped?.ammo_count) + icon_state = "bomblet_pod_loaded" + else if(ship_base) + icon_state = "bomblet_pod_installed" + else + icon_state = "bomblet_pod" + +/obj/structure/dropship_equipment/cas/weapon/bomb_pod + name = "bomb pod" + icon_state = "bomb_pod" + desc = "A bomb pod capable of launching several large bombs. Moving this will require some sort of lifter." + icon = 'icons/Marine/mainship_props64.dmi' + firing_sound = 'sound/weapons/gunship_rocketpod.ogg' + firing_delay = 2 SECONDS + point_cost = 450 + dropship_equipment_flags = USES_AMMO|IS_WEAPON|IS_INTERACTABLE + ammo_type_used = CAS_BOMB + +/obj/structure/dropship_equipment/cas/weapon/bomb_pod/update_icon_state() + . = ..() + if(ammo_equipped?.ammo_count) + icon_state = "bomb_pod_loaded" + else if(ship_base) + icon_state = "bomb_pod_installed" + else + icon_state = "bomb_pod" diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index 97b19ed104a51..0c76545d36271 100644 --- a/code/game/objects/structures/extinguisher.dm +++ b/code/game/objects/structures/extinguisher.dm @@ -30,6 +30,8 @@ /obj/structure/extinguisher_cabinet/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/tool/extinguisher)) if(has_extinguisher || !opened) @@ -58,12 +60,14 @@ opened = !opened update_icon() -/obj/structure/extinguisher_cabinet/update_icon() - overlays.Cut() +/obj/structure/extinguisher_cabinet/update_icon_state() + . = ..() icon_state = "[initial(icon_state)][opened]" +/obj/structure/extinguisher_cabinet/update_overlays() + . = ..() if(opened && has_extinguisher) - overlays += "extinguishero_[has_extinguisher.sprite_name]" + . += "extinguishero_[has_extinguisher.sprite_name]" /obj/structure/extinguisher_cabinet/mini starter_extinguisher = /obj/item/tool/extinguisher/mini diff --git a/code/game/objects/structures/fence.dm b/code/game/objects/structures/fence.dm index 9fe779360f734..475bc15bb8bb1 100644 --- a/code/game/objects/structures/fence.dm +++ b/code/game/objects/structures/fence.dm @@ -16,6 +16,8 @@ smoothing_flags = SMOOTH_BITMASK smoothing_groups = list(SMOOTH_GROUP_FENCE) canSmoothWith = list(SMOOTH_GROUP_FENCE) + ///Chance for the fence to break on /init + var/chance_to_break = 80 //Defaults to 80% /obj/structure/fence/ex_act(severity) switch(severity) @@ -30,6 +32,8 @@ /obj/structure/fence/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/stack/rods) && obj_integrity < max_integrity) if(user.skills.getRating(SKILL_CONSTRUCTION) < SKILL_CONSTRUCTION_PLASTEEL) @@ -71,46 +75,46 @@ else if(cut) //Cut/brokn grilles can't be messed with further than this return - else if(istype(I, /obj/item/grab) && get_dist(src, user) < 2) - var/obj/item/grab/G = I - if(!isliving(G.grabbed_thing)) - return + if(!iswirecutter(I)) + return + user.visible_message(span_notice("[user] starts cutting through [src] with [I]."), + "You start cutting through [src] with [I]") + playsound(loc, 'sound/items/wirecutter.ogg', 25, 1) + if(!do_after(user, 20, NONE, src, BUSY_ICON_BUILD)) + return - var/mob/living/M = G.grabbed_thing - var/state = user.grab_state - user.drop_held_item() - switch(state) - if(GRAB_PASSIVE) - M.visible_message(span_warning("[user] slams [M] against \the [src]!")) - M.apply_damage(7, blocked = MELEE) - UPDATEHEALTH(M) - take_damage(10) - if(GRAB_AGGRESSIVE) - M.visible_message(span_danger("[user] bashes [M] against \the [src]!")) - if(prob(50)) - M.Paralyze(2 SECONDS) - M.apply_damage(10, blocked = MELEE) - UPDATEHEALTH(M) - take_damage(25) - if(GRAB_NECK) - M.visible_message(span_danger("[user] crushes [M] against \the [src]!")) - M.Paralyze(10 SECONDS) - M.apply_damage(20, blocked = MELEE) - UPDATEHEALTH(M) - take_damage(50) - - else if(iswirecutter(I)) - user.visible_message(span_notice("[user] starts cutting through [src] with [I]."), - "You start cutting through [src] with [I]") - playsound(loc, 'sound/items/wirecutter.ogg', 25, 1) - if(!do_after(user, 20, NONE, src, BUSY_ICON_BUILD)) - return + playsound(loc, 'sound/items/wirecutter.ogg', 25, 1) + user.visible_message(span_notice("[user] cuts through [src] with [I]."), + "You cut through [src] with [I]") + deconstruct(TRUE) - playsound(loc, 'sound/items/wirecutter.ogg', 25, 1) - user.visible_message(span_notice("[user] cuts through [src] with [I]."), - "You cut through [src] with [I]") - deconstruct(TRUE) +/obj/structure/fence/grab_interact(obj/item/grab/grab, mob/user, base_damage = BASE_OBJ_SLAM_DAMAGE, is_sharp = FALSE) + if(!isliving(grab.grabbed_thing)) + return + var/mob/living/grabbed_mob = grab.grabbed_thing + var/state = user.grab_state + user.drop_held_item() + var/damage = (user.skills.getRating(SKILL_CQC) * CQC_SKILL_DAMAGE_MOD) + switch(state) + if(GRAB_PASSIVE) + damage += BASE_OBJ_SLAM_DAMAGE + grabbed_mob.visible_message(span_warning("[user] slams [grabbed_mob] against \the [src]!")) + log_combat(user, grabbed_mob, "slammed", "", "against \the [src]") + if(GRAB_AGGRESSIVE) + damage += BASE_OBJ_SLAM_DAMAGE * 1.5 + grabbed_mob.visible_message(span_danger("[user] bashes [grabbed_mob] against \the [src]!")) + log_combat(user, grabbed_mob, "bashed", "", "against \the [src]") + if(prob(50)) + grabbed_mob.Paralyze(2 SECONDS) + if(GRAB_NECK) + damage += BASE_OBJ_SLAM_DAMAGE * 2 + grabbed_mob.visible_message(span_danger("[user] crushes [grabbed_mob] against \the [src]!")) + log_combat(user, grabbed_mob, "crushed", "", "against \the [src]") + grabbed_mob.Paralyze(2 SECONDS) + grabbed_mob.apply_damage(damage, blocked = MELEE, updating_health = TRUE) + take_damage(damage * 2, BRUTE, MELEE) + return TRUE /obj/structure/fence/deconstruct(disassembled = TRUE) SHOULD_CALL_PARENT(FALSE) @@ -123,7 +127,7 @@ /obj/structure/fence/Initialize(mapload, start_dir) . = ..() - if(prob(80)) + if(prob(chance_to_break)) obj_integrity = 0 deconstruct(FALSE) @@ -137,5 +141,8 @@ /obj/structure/fence/fire_act(exposed_temperature, exposed_volume) if(exposed_temperature > T0C + 800) - take_damage(round(exposed_volume / 100), BURN, "fire") + take_damage(round(exposed_volume / 100), BURN, FIRE) return ..() + +/obj/structure/fence/broken + chance_to_break = 100 diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 8967fa3d1759f..9b8e5742d3f2e 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -78,6 +78,8 @@ /obj/structure/flora/tree/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(!I.sharp && I.force <= 0) return @@ -510,6 +512,8 @@ /obj/structure/flora/jungle/vines/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(I.sharp != IS_SHARP_ITEM_BIG || !isliving(user)) return diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index 527d448e3cdd4..e2d948d5e2aa7 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -14,7 +14,7 @@ var/reinforcement = null var/icon_prefix = "girder" smoothing_flags = SMOOTH_BITMASK - canSmoothWith = list(SMOOTH_GROUP_GIRDER,SMOOTH_GROUP_SURVIVAL_TITANIUM_WALLS,) + canSmoothWith = list(SMOOTH_GROUP_GIRDER,SMOOTH_GROUP_SURVIVAL_TITANIUM_WALLS) smoothing_groups = list(SMOOTH_GROUP_GIRDER) base_icon_state = "girder" @@ -53,6 +53,8 @@ /obj/structure/girder/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, GIRDER_REINF_METAL) || istype(I, GIRDER_REINF_PLASTEEL)) if(user.do_actions) return TRUE //no afterattack @@ -334,6 +336,7 @@ /obj/structure/girder/update_icon_state() + . = ..() switch(girder_state) if(GIRDER_BROKEN, GIRDER_BROKEN_PATCHED) icon = 'icons/obj/smooth_objects/girder_broke.dmi' diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index ad149b922b016..dbe4709fcffc5 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -7,7 +7,7 @@ density = TRUE anchored = TRUE coverage = 10 - flags_atom = CONDUCT + atom_flags = CONDUCT allow_pass_flags = PASS_AIR|PASS_PROJECTILE|PASS_GRILLE layer = OBJ_LAYER resistance_flags = XENO_DAMAGEABLE diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm index ffe92ca493949..123739e74ddb5 100644 --- a/code/game/objects/structures/inflatable.dm +++ b/code/game/objects/structures/inflatable.dm @@ -73,6 +73,8 @@ /obj/structure/inflatable/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(can_puncture(I)) visible_message(span_danger("[user] pierces [src] with [I]!")) deflate(TRUE) diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index 5b1b8fa98006d..45ecbc10a5532 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -34,6 +34,8 @@ /obj/structure/janitorialcart/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/storage/bag/trash) && !mybag) user.drop_held_item() diff --git a/code/game/objects/structures/ladders.dm b/code/game/objects/structures/ladders.dm index 5189ccb463c2c..d9c9ef48f4e8f 100644 --- a/code/game/objects/structures/ladders.dm +++ b/code/game/objects/structures/ladders.dm @@ -53,6 +53,7 @@ return ..() /obj/structure/ladder/update_icon_state() + . = ..() if(up && down) icon_state = "ladder11" @@ -65,8 +66,8 @@ else //wtf make your ladders properly assholes icon_state = "ladder00" -/obj/structure/ladder/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) - return attack_hand(X) +/obj/structure/ladder/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) + return attack_hand(xeno_attacker) /obj/structure/ladder/attack_larva(mob/living/carbon/xenomorph/larva/X) return attack_hand(X) @@ -209,6 +210,8 @@ //Throwing Shiet /obj/structure/ladder/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/explosive/grenade)) var/obj/item/explosive/grenade/G = I diff --git a/code/game/objects/structures/lamarr_cage.dm b/code/game/objects/structures/lamarr_cage.dm index c3d25dadd31f4..3e83aed557759 100644 --- a/code/game/objects/structures/lamarr_cage.dm +++ b/code/game/objects/structures/lamarr_cage.dm @@ -55,5 +55,5 @@ stat = DEAD -/obj/item/clothing/mask/facehugger/lamarr/update_icon() +/obj/item/clothing/mask/facehugger/lamarr/update_icon_state() return diff --git a/code/game/objects/structures/mine_structures.dm b/code/game/objects/structures/mine_structures.dm index 343799e5ec4e3..b8c020005e916 100644 --- a/code/game/objects/structures/mine_structures.dm +++ b/code/game/objects/structures/mine_structures.dm @@ -17,10 +17,10 @@ density = TRUE /obj/structure/mine_structure/wooden/flamer_fire_act(burnlevel) - take_damage(burnlevel, BURN, "fire") + take_damage(burnlevel, BURN, FIRE) /obj/structure/mine_structure/wooden/fire_act() - take_damage(25, BURN, "fire") + take_damage(25, BURN, FIRE) /obj/structure/mine_structure/wooden/support_wall name = "wooden support" diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm index d3681918b2e7d..6c994d67dbfc7 100644 --- a/code/game/objects/structures/mineral_doors.dm +++ b/code/game/objects/structures/mineral_doors.dm @@ -75,7 +75,8 @@ update_icon() addtimer(VARSET_CALLBACK(src, switching_states, FALSE), 1 SECONDS) -/obj/structure/mineral_door/update_icon() +/obj/structure/mineral_door/update_icon_state() + . = ..() if(open) icon_state = "[base_icon_state][smoothing_flags ? "-[smoothing_junction]" : ""]-open" else @@ -84,13 +85,15 @@ /obj/structure/mineral_door/attackby(obj/item/W, mob/living/user) . = ..() + if(.) + return if(QDELETED(src)) return var/multiplier = 1 - if(istype(W, /obj/item/tool/pickaxe/plasmacutter) && !user.do_actions) + if(isplasmacutter(W) && !user.do_actions) var/obj/item/tool/pickaxe/plasmacutter/P = W - if(P.start_cut(user, src.name, src, PLASMACUTTER_BASE_COST * PLASMACUTTER_VLOW_MOD)) + if(P.start_cut(user, src.name, src, PLASMACUTTER_BASE_COST * PLASMACUTTER_VLOW_MOD, no_string = TRUE)) if(istype(src, /obj/structure/mineral_door/resin)) multiplier += PLASMACUTTER_RESIN_MULTIPLIER //Plasma cutters are particularly good at destroying resin structures. else @@ -117,24 +120,28 @@ name = "silver door" material_type = /obj/item/stack/sheet/mineral/silver base_icon_state = "silver" + icon_state = "silver" max_integrity = 500 /obj/structure/mineral_door/gold name = "gold door" material_type = /obj/item/stack/sheet/mineral/gold base_icon_state = "gold" + icon_state = "gold" max_integrity = 250 /obj/structure/mineral_door/uranium name = "uranium door" material_type = /obj/item/stack/sheet/mineral/uranium base_icon_state = "uranium" + icon_state = "uranium" max_integrity = 500 /obj/structure/mineral_door/sandstone name = "sandstone door" material_type = /obj/item/stack/sheet/mineral/sandstone base_icon_state = "sandstone" + icon_state = "sandstone" max_integrity = 100 /obj/structure/mineral_door/transparent @@ -150,6 +157,7 @@ name = "phoron door" material_type = /obj/item/stack/sheet/mineral/phoron base_icon_state = "phoron" + icon_state = "phoron" max_integrity = 250 /obj/structure/mineral_door/transparent/phoron/attackby(obj/item/W as obj, mob/user as mob) @@ -172,6 +180,7 @@ name = "diamond door" material_type = /obj/item/stack/sheet/mineral/diamond base_icon_state = "diamond" + icon_state = "diamond" max_integrity = 1000 @@ -179,6 +188,7 @@ name = "wooden door" material_type = /obj/item/stack/sheet/wood base_icon_state = "wood" + icon_state = "wood" trigger_sound = 'sound/effects/doorcreaky.ogg' max_integrity = 100 diff --git a/code/game/objects/structures/misc.dm b/code/game/objects/structures/misc.dm index 2479de87a51c2..e51e78fd16b4c 100644 --- a/code/game/objects/structures/misc.dm +++ b/code/game/objects/structures/misc.dm @@ -73,6 +73,8 @@ /obj/structure/mopbucket/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/tool/mop)) if(reagents.total_volume < 1) @@ -382,7 +384,7 @@ /obj/structure/cryopods name = "hypersleep chamber" icon = 'icons/obj/machines/cryogenics.dmi' - icon_state = "body_scanner_0" + icon_state = "body_scanner" desc = "A large automated capsule with LED displays intended to put anyone inside into 'hypersleep'." density = TRUE anchored = TRUE diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 10bd407fd3dc5..7c52734fc2517 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -23,7 +23,8 @@ QDEL_NULL(connected) return ..() -/obj/structure/morgue/update_icon() +/obj/structure/morgue/update_icon_state() + . = ..() if (morgue_open) icon_state = "[morgue_type]0" else @@ -87,6 +88,8 @@ /obj/structure/morgue/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/tool/pen)) var/t = copytext(stripped_input(user, "What would you like the label to be?", name, null), 1, MAX_MESSAGE_LEN) @@ -181,11 +184,9 @@ /obj/structure/morgue/crematorium/update_icon() + . = ..() if(cremating) icon_state = "[morgue_type]_active" - else - ..() - /obj/structure/morgue/crematorium/proc/cremate(mob/user) set waitfor = 0 diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm index 366fd419017c9..071d535e9bad0 100644 --- a/code/game/objects/structures/noticeboard.dm +++ b/code/game/objects/structures/noticeboard.dm @@ -19,6 +19,8 @@ //attaching papers!! /obj/structure/noticeboard/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/paper)) if(notices >= 5) diff --git a/code/game/objects/structures/orbital_cannon.dm b/code/game/objects/structures/orbital_cannon.dm index 2cb104172289a..32e9a3f52e819 100644 --- a/code/game/objects/structures/orbital_cannon.dm +++ b/code/game/objects/structures/orbital_cannon.dm @@ -45,6 +45,7 @@ return ..() /obj/structure/orbital_cannon/update_icon_state() + . = ..() if(chambered_tray) icon_state = "OBC_chambered" return @@ -171,6 +172,13 @@ /// Handles the playing of the Orbital Bombardment incoming sound and other visual and auditory effects of the cannon, usually a spiraling whistle noise but can be overridden. /obj/structure/orbital_cannon/proc/handle_ob_firing_effects(target, ob_sound = 'sound/effects/OB_incoming.ogg') flick("OBC_firing",src) + for(var/mob/living/current_mob AS in GLOB.mob_living_list) + if(!current_mob || !is_mainship_level(current_mob.z)) + continue + if(get_dist(src, current_mob) > 20) + current_mob.playsound_local(current_mob, 'sound/effects/obalarm.ogg', 25) + shake_camera(current_mob, 0.7 SECONDS) + to_chat(current_mob, span_warning("The deck of the [SSmapping.configs[SHIP_MAP].map_name] shudders as her orbital cannon opens fire.")) playsound(loc, 'sound/effects/obfire.ogg', 100, FALSE, 20, 4) for(var/mob/M AS in hearers(WARHEAD_FALLING_SOUND_RANGE, target)) M.playsound_local(target, ob_sound, falloff = 2) @@ -200,11 +208,23 @@ if("plasma") inaccurate_fuel = abs(GLOB.marine_main_ship?.ob_type_fuel_requirements[4] - tray.fuel_amt) - var/turf/target = locate(T.x + inaccurate_fuel * pick(-1,1),T.y + inaccurate_fuel * pick(-1,1),T.z) + // Give marines a warning if misfuelled. + var/fuel_warning = "Warhead fuel level: safe." + if(inaccurate_fuel > 0) + fuel_warning = "Warhead fuel level: incorrect.
Warhead may be inaccurate." - playsound_z_humans(target.z, 'sound/effects/OB_warning_announce.ogg', 100) //for marines on ground + var/turf/target = locate(T.x + inaccurate_fuel * pick(-1,1),T.y + inaccurate_fuel * pick(-1,1),T.z) + GLOB.round_statistics.obs_fired++ + SSblackbox.record_feedback("tally", "round_statistics", 1, "obs_fired") + priority_announce( + message = "Get out of danger close!
Warhead type: [tray.warhead.warhead_kind].
[fuel_warning]
Estimated location of impact: [get_area(T)].", + title = "Orbital bombardment launch command detected!", + type = ANNOUNCEMENT_PRIORITY, + sound = 'sound/effects/OB_warning_announce.ogg', + channel_override = SSsounds.random_available_channel(), // This way, we can't have it be cut off by other sounds. + color_override = "red" + ) playsound(target, 'sound/effects/OB_warning_announce_novoiceover.ogg', 125, FALSE, 30, 10) //VOX-less version for xenomorphs - playsound_z(z, 'sound/effects/OB_warning_announce.ogg', 100) //for the ship var/impact_time = 10 SECONDS + (WARHEAD_FLY_TIME * (GLOB.current_orbit/3)) @@ -327,7 +347,7 @@ . += "Moving this will require some sort of lifter." -/obj/structure/ob_ammo/obj_destruction(damage_amount, damage_type, damage_flag) +/obj/structure/ob_ammo/obj_destruction(damage_amount, damage_type, damage_flag, mob/living/blame_mob) explosion(loc, light_impact_range = 2, flash_range = 3, flame_range = 2) return ..() @@ -363,7 +383,7 @@ /obj/structure/ob_ammo/warhead/incendiary/warhead_impact(turf/target, inaccuracy_amt = 0) . = ..() var/range_num = max(15 - inaccuracy_amt, 12) - flame_radius(range_num, target, burn_intensity = 36, burn_duration = 40, colour = "blue") + flame_radius(range_num, target, burn_intensity = 46, burn_duration = 40, colour = "blue") var/datum/effect_system/smoke_spread/phosphorus/warcrime = new warcrime.set_up(17, target, 20) warcrime.start() @@ -385,7 +405,7 @@ var/total_amt = max(25 - inaccuracy_amt, 20) for(var/i = 1 to total_amt) var/turf/U = pick_n_take(turf_list) - explosion(U, 1, 4, 6, 0, 6, throw_range = 0, adminlog = FALSE) //rocket barrage + explosion(U, 2, 4, 6, 0, 6, throw_range = 0, adminlog = FALSE) //rocket barrage sleep(0.1 SECONDS) */ @@ -399,7 +419,7 @@ /obj/structure/ob_ammo/warhead/plasmaloss/warhead_impact(turf/target, inaccuracy_amt = 0) . = ..() var/datum/effect_system/smoke_spread/plasmaloss/smoke = new - smoke.set_up(25, target, 3 SECONDS)//Vape nation + smoke.set_up(25, target, 30 - (inaccuracy_amt * 2))//Vape nation smoke.start() */ @@ -423,7 +443,7 @@ icon_state = "ob_console" screen_overlay = "ob_console_screen" dir = WEST - flags_atom = ON_BORDER|CONDUCT + atom_flags = ON_BORDER|CONDUCT var/orbital_window_page = 0 /obj/machinery/computer/orbital_cannon_console/Initialize(mapload) diff --git a/code/game/objects/structures/patrol_points.dm b/code/game/objects/structures/patrol_points.dm index 9841d4e610d53..07dc1a7df3d33 100644 --- a/code/game/objects/structures/patrol_points.dm +++ b/code/game/objects/structures/patrol_points.dm @@ -1,6 +1,10 @@ +#define PATROL_POINT_RAPPEL_EFFECT "patrol_point_rappel_effect" +#define RAPPEL_DURATION 0.6 SECONDS +#define RAPPEL_HEIGHT 128 + /obj/structure/patrol_point name = "Patrol start point" - desc = "A one way ticket to the combat zone." + desc = "A one way ticket to the combat zone. Shift click to deploy when inside a mech." icon = 'icons/effects/effects.dmi' icon_state = "patrolpoint" anchored = TRUE @@ -66,8 +70,22 @@ span_notice("You walk through the [src].")) user.trainteleport(linked_point.loc) add_spawn_protection(user) + if(!obj_mover) + new /atom/movable/effect/rappel_rope(linked_point.loc) //mechs don't need a rope + + var/atom/movable/mover = obj_mover ? obj_mover : user + + mover.add_filter(PATROL_POINT_RAPPEL_EFFECT, 2, drop_shadow_filter(y = -RAPPEL_HEIGHT, color = COLOR_TRANSPARENT_SHADOW, size = 4)) + var/shadow_filter = mover.get_filter(PATROL_POINT_RAPPEL_EFFECT) - new /atom/movable/effect/rappel_rope(linked_point.loc) + var/current_layer = mover.layer + mover.pixel_y += RAPPEL_HEIGHT + mover.layer = FLY_LAYER + + animate(mover, pixel_y = mover.pixel_y - RAPPEL_HEIGHT, time = RAPPEL_DURATION) + animate(shadow_filter, y = 0, size = 0.9, time = RAPPEL_DURATION, flags = ANIMATION_PARALLEL) + + addtimer(CALLBACK(src, PROC_REF(end_rappel), user, mover, current_layer), RAPPEL_DURATION) if(!user) return @@ -111,10 +129,21 @@ user.forceMove(linked_point.loc) ///Temporarily applies godmode to prevent spawn camping -/obj/structure/patrol_point/proc/add_spawn_protection(mob/user) +/obj/structure/patrol_point/proc/add_spawn_protection(mob/living/user) + user.ImmobilizeNoChain(RAPPEL_DURATION) //looks weird if they can move while rappeling user.status_flags |= GODMODE addtimer(CALLBACK(src, PROC_REF(remove_spawn_protection), user), 10 SECONDS) +///Ends the rappel effects +/obj/structure/patrol_point/proc/end_rappel(mob/living/user, atom/movable/mover, original_layer) + mover.remove_filter(PATROL_POINT_RAPPEL_EFFECT) + mover.layer = original_layer + SEND_SIGNAL(mover, COMSIG_MOVABLE_PATROL_DEPLOYED, TRUE, 1.5, 2) + if(ismecha(mover)) + new /obj/effect/temp_visual/rappel_dust(linked_point.loc, 3) + playsound(linked_point.loc, 'sound/effects/behemoth/behemoth_stomp.ogg', 40, TRUE) + shake_camera(user, 0.2 SECONDS, 0.5) + ///Removes spawn protection godmode /obj/structure/patrol_point/proc/remove_spawn_protection(mob/user) user.status_flags &= ~GODMODE diff --git a/code/game/objects/structures/platforms.dm b/code/game/objects/structures/platforms.dm index 670b23a7d8a36..4cd05b6e94c2c 100644 --- a/code/game/objects/structures/platforms.dm +++ b/code/game/objects/structures/platforms.dm @@ -6,7 +6,7 @@ coverage = 10 density = TRUE layer = BELOW_OBJ_LAYER - flags_atom = ON_BORDER + atom_flags = ON_BORDER resistance_flags = RESIST_ALL interaction_flags = INTERACT_CHECK_INCAPACITATED allow_pass_flags = PASS_LOW_STRUCTURE|PASSABLE|PASS_WALKOVER @@ -75,6 +75,11 @@ new_overlay.pixel_x = -32 . += new_overlay +/obj/structure/platform/nondense + density = FALSE + climbable = FALSE + coverage = 0 + /obj/structure/platform/rockcliff icon_state = "rockcliff" name = "rock cliff" @@ -83,6 +88,11 @@ /obj/structure/platform/rockcliff/icycliff icon_state = "icerock" +/obj/structure/platform/rockcliff/icycliff/nondense + density = FALSE + climbable = FALSE + coverage = 0 + /obj/structure/platform/metalplatform icon_state = "metalplatform" @@ -102,7 +112,7 @@ desc = "A square metal surface resting on four legs." icon = 'icons/obj/structures/platforms.dmi' icon_state = "platform_deco" - flags_atom = ON_BORDER + atom_flags = ON_BORDER resistance_flags = RESIST_ALL mouse_opacity = MOUSE_OPACITY_TRANSPARENT diff --git a/code/game/objects/structures/prop.dm b/code/game/objects/structures/prop.dm index ec19cdda3760c..c9ab75560fc11 100644 --- a/code/game/objects/structures/prop.dm +++ b/code/game/objects/structures/prop.dm @@ -75,6 +75,7 @@ set_light(initial(light_range)) /obj/machinery/prop/computer/update_icon_state() + . = ..() if(machine_stat & (BROKEN|DISABLED)) icon_state = "[initial(icon_state)]_broken" else @@ -331,8 +332,7 @@ fallen_list += D.fallen_names qdel(D) return TRUE - else - . = ..() + return ..() /obj/structure/prop/mainship/ship_memorial/examine(mob/user) . = ..() @@ -1094,7 +1094,7 @@ ///BROKEN VEHICLE PROPS /obj/structure/prop/vehicle - layer = TANK_BARREL_LAYER + layer = ABOVE_MOB_PROP_LAYER /obj/structure/prop/vehicle/van name = "van" desc = "An old van, seems to be broken down." @@ -1242,7 +1242,7 @@ /obj/structure/prop/vehicle/tank/east/barrel icon_state = "ltb_cannon_0" - layer = TANK_BARREL_LAYER + layer = ABOVE_MOB_PROP_LAYER mouse_opacity = MOUSE_OPACITY_TRANSPARENT /obj/structure/prop/vehicle/tank/east/barrel/broken @@ -1326,10 +1326,10 @@ icon_state = "glauncher_0" /obj/structure/prop/vehicle/tank/east/decoration/cupolaone - icon_state = "m56cupola_1" + icon_state = "hsg102cupola_1" /obj/structure/prop/vehicle/tank/east/decoration/cupolazero - icon_state = "m56cupola_0" + icon_state = "hsg102cupola_0" /obj/structure/prop/vehicle/tank/east/decoration/towlauncherone icon_state = "towlauncher_1" @@ -1453,10 +1453,10 @@ icon_state = "glauncher_0" /obj/structure/prop/vehicle/tank/north/decoration/cupolaone - icon_state = "m56cupola_1" + icon_state = "hsg102cupola_1" /obj/structure/prop/vehicle/tank/north/decoration/cupolazero - icon_state = "m56cupola_0" + icon_state = "hsg102cupola_0" /obj/structure/prop/vehicle/tank/north/decoration/towlauncherone icon_state = "towlauncher_1" diff --git a/code/game/objects/structures/razorwire.dm b/code/game/objects/structures/razorwire.dm index 3a409db9717f1..a837bbc24e3cc 100644 --- a/code/game/objects/structures/razorwire.dm +++ b/code/game/objects/structures/razorwire.dm @@ -125,6 +125,8 @@ /obj/structure/razorwire/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/stack/sheet/metal)) var/obj/item/stack/sheet/metal/metal_sheets = I @@ -142,33 +144,28 @@ update_icon() return - if(!istype(I, /obj/item/grab)) - return - if(isxeno(user))//I am very tempted to remove this >:) +/obj/structure/razorwire/grab_interact(obj/item/grab/grab, mob/user, base_damage = BASE_OBJ_SLAM_DAMAGE, is_sharp = FALSE) + if(!isliving(grab.grabbed_thing)) return - - var/obj/item/grab/G = I - if(!isliving(G.grabbed_thing)) + if(user.grab_state < GRAB_AGGRESSIVE) + to_chat(user, span_warning("You need a better grip to do that!")) return - var/mob/living/M = G.grabbed_thing - if(user.a_intent == INTENT_HARM) - if(user.grab_state <= GRAB_AGGRESSIVE) - to_chat(user, span_warning("You need a better grip to do that!")) - return - + var/mob/living/grabbed_mob = grab.grabbed_thing + if(user.a_intent == INTENT_HARM && user.grab_state > GRAB_AGGRESSIVE) var/def_zone = ran_zone() - M.apply_damage(RAZORWIRE_BASE_DAMAGE, BRUTE, def_zone, MELEE, TRUE, updating_health = TRUE) - user.visible_message(span_danger("[user] spartas [M]'s into [src]!"), - span_danger("You sparta [M]'s against [src]!")) - log_combat(user, M, "spartaed", "", "against \the [src]") + grabbed_mob.apply_damage(RAZORWIRE_BASE_DAMAGE, BRUTE, def_zone, MELEE, TRUE, updating_health = TRUE) + user.visible_message(span_danger("[user] spartas [grabbed_mob]'s into [src]!"), + span_danger("You sparta [grabbed_mob]'s against [src]!")) + log_combat(user, grabbed_mob, "spartaed", "", "against \the [src]") playsound(src, 'sound/effects/barbed_wire_movement.ogg', 25, 1) + return TRUE - else if(user.grab_state >= GRAB_AGGRESSIVE) - M.forceMove(loc) - M.Paralyze(10 SECONDS) - user.visible_message(span_danger("[user] throws [M] on [src]."), - span_danger("You throw [M] on [src].")) + grabbed_mob.forceMove(loc) + grabbed_mob.Paralyze(2 SECONDS) + user.visible_message(span_danger("[user] throws [grabbed_mob] on [src]."), + span_danger("You throw [grabbed_mob] on [src].")) + return TRUE /obj/structure/razorwire/wirecutter_act(mob/living/user, obj/item/I) user.visible_message(span_notice("[user] starts disassembling [src]."), @@ -184,11 +181,11 @@ deconstruct(TRUE) return TRUE -/obj/structure/razorwire/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) - if(X.status_flags & INCORPOREAL) +/obj/structure/razorwire/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) + if(xeno_attacker.status_flags & INCORPOREAL) return FALSE - X.apply_damage(RAZORWIRE_BASE_DAMAGE, blocked = MELEE, updating_health = TRUE) //About a third as damaging as actually entering + xeno_attacker.apply_damage(RAZORWIRE_BASE_DAMAGE, blocked = MELEE, updating_health = TRUE) //About a third as damaging as actually entering update_icon() return ..() @@ -214,6 +211,7 @@ return ..() /obj/structure/razorwire/update_icon_state() + . = ..() var/health_percent = round(obj_integrity/max_integrity * 100) var/remaining = CEILING(health_percent, 25) icon_state = "[base_icon_state]_[remaining]" diff --git a/code/game/objects/structures/reagent_dispensers.dm b/code/game/objects/structures/reagent_dispensers.dm index 698bd0300e3b9..426cd7101abc9 100644 --- a/code/game/objects/structures/reagent_dispensers.dm +++ b/code/game/objects/structures/reagent_dispensers.dm @@ -143,6 +143,8 @@ /obj/structure/reagent_dispensers/fueltank/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(!istype(I, /obj/item/assembly_holder)) return @@ -238,13 +240,13 @@ exploding = TRUE if(reagents.total_volume > 500) - flame_radius(5, loc, 46, 40, 31, 30, colour = "blue") + flame_radius(5, loc, 40, 46, 31, 30, colour = "blue") explosion(loc, light_impact_range = 5) else if(reagents.total_volume > 100) - flame_radius(4, loc, 46, 40, 31, 30, colour = "blue") + flame_radius(4, loc, 40, 46, 31, 30, colour = "blue") explosion(loc, light_impact_range = 4) else - flame_radius(3, loc, 46, 40, 31, 30, colour = "blue") + flame_radius(3, loc, 40, 46, 31, 30, colour = "blue") explosion(loc, light_impact_range = 3) qdel(src) diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index dc1a780521454..4069b3d0d1d80 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -96,6 +96,7 @@ FLOOR SAFES /obj/structure/safe/update_icon_state() + . = ..() if(open) icon_state = "[initial(icon_state)]-open" else @@ -177,6 +178,8 @@ FLOOR SAFES /obj/structure/safe/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(!open) return diff --git a/code/game/objects/structures/sensor_tower.dm b/code/game/objects/structures/sensor_tower.dm index 351b017ff7723..84a233b893faf 100644 --- a/code/game/objects/structures/sensor_tower.dm +++ b/code/game/objects/structures/sensor_tower.dm @@ -36,6 +36,7 @@ update_icon() /obj/structure/sensor_tower/update_icon_state() + . = ..() icon_state = initial(icon_state) if(current_timer || activated) icon_state += "_tgmc" diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index b35fc93b94ac3..781e628df9776 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -28,6 +28,8 @@ /obj/structure/sign/attackby(obj/item/I, mob/user, params) //deconstruction . = ..() + if(.) + return if(isscrewdriver(I) && !istype(src, /obj/structure/sign/double)) to_chat(user, "You unfasten the sign with your [I].") @@ -47,6 +49,8 @@ /obj/item/sign/attackby(obj/item/I, mob/user, params) //construction . = ..() + if(.) + return if(isscrewdriver(I) && isturf(user.loc)) var/direction = tgui_input_list(user, "In which direction?", "Select direction.", list("North", "East", "South", "West")) diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index 8e3809224d3df..f3f1a2eb1c2aa 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -38,6 +38,7 @@ icon_state = "bunkbed" /obj/structure/bed/update_icon_state() + . = ..() if(!base_bed_icon) return if(LAZYLEN(buckled_mobs) || buckled_bodybag) @@ -172,6 +173,8 @@ /obj/structure/bed/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(iswrench(I)) if(!buildstacktype) @@ -182,15 +185,18 @@ new buildstacktype(loc, buildstackamount) qdel(src) - else if(istype(I, /obj/item/grab) && !LAZYLEN(buckled_mobs) && !buckled_bodybag) - var/obj/item/grab/G = I - if(!ismob(G.grabbed_thing)) - return - - var/mob/M = G.grabbed_thing - to_chat(user, span_notice("You place [M] on [src].")) - M.forceMove(loc) - return TRUE +/obj/structure/bed/grab_interact(obj/item/grab/grab, mob/user, base_damage = 5, is_sharp = FALSE) + . = ..() + if(.) + return + if(LAZYLEN(buckled_mobs) || buckled_bodybag) + return + if(!ismob(grab.grabbed_thing)) + return + var/mob/grabbed_mob = grab.grabbed_thing + to_chat(user, span_notice("You place [grabbed_mob] on [src].")) + grabbed_mob.forceMove(loc) + return TRUE /obj/structure/bed/alien icon_state = "abed" @@ -240,6 +246,8 @@ /obj/item/roller/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/roller_holder) && rollertype == /obj/structure/bed/roller) var/obj/item/roller_holder/RH = I @@ -295,7 +303,7 @@ GLOBAL_LIST_EMPTY(activated_medevac_stretchers) /obj/structure/bed/medevac_stretcher name = "medevac stretcher" - desc = "A medevac stretcher with integrated beacon for rapid evacuation of an injured patient via dropship lift and an emergency bluespace teleporter for tele-evacuation to a linked beacon. Accepts patients and body bags." + desc = "A medevac stretcher with integrated beacon for rapid evacuation of an injured patient via dropship lift and an emergency bluespace teleporter for tele-evacuation to a linked beacon. Accepts patients and body bags. Right click to activate." icon = 'icons/obj/rollerbed.dmi' icon_state = "stretcher_down" buckling_y = 6 @@ -316,13 +324,13 @@ GLOBAL_LIST_EMPTY(activated_medevac_stretchers) . = ..() radio = new(src) -/obj/structure/bed/medevac_stretcher/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) - if(X.status_flags & INCORPOREAL) +/obj/structure/bed/medevac_stretcher/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) + if(xeno_attacker.status_flags & INCORPOREAL) return FALSE if(buckled_bodybag) unbuckle_bodybag() for(var/m in buckled_mobs) - user_unbuckle_mob(m, X, TRUE) + user_unbuckle_mob(m, xeno_attacker, TRUE) /obj/structure/bed/medevac_stretcher/attack_ghost(mob/dead/observer/user) . = ..() @@ -336,24 +344,14 @@ GLOBAL_LIST_EMPTY(activated_medevac_stretchers) linked_beacon.remove_stretcher(src) return ..() -/obj/structure/bed/medevac_stretcher/update_icon() - ..() - overlays.Cut() +/obj/structure/bed/medevac_stretcher/update_overlays() + . = ..() + if(stretcher_activated) - overlays += image("beacon_active_[density ? "up":"down"]") + . += image("beacon_active_[density ? "up":"down"]") if(LAZYLEN(buckled_mobs) || buckled_bodybag) - overlays += image("icon_state"="stretcher_box","layer"=LYING_MOB_LAYER + 0.1) - - -/obj/structure/bed/medevac_stretcher/verb/activate_medevac_displacer() - set name = "Activate Medevac Displacement Field" - set desc = "Teleport the occupant of the stretcher to a linked beacon." - set category = "Object" - set src in oview(1) - - activate_medevac_teleport(usr) - + . += image("icon_state"="stretcher_box","layer"=LYING_MOB_LAYER + 0.1) /obj/structure/bed/medevac_stretcher/attack_hand_alternate(mob/living/user) activate_medevac_teleport(user) @@ -508,7 +506,7 @@ GLOBAL_LIST_EMPTY(activated_medevac_stretchers) /obj/item/roller/medevac name = "medevac stretcher" - desc = "A collapsed medevac stretcher that can be carried around." + desc = "A collapsed medevac stretcher that can be carried around. Can be used to instantly transport a marine to a linked beacon. Don't forget the beacon!" icon_state = "stretcher_folded" var/last_teleport = null var/obj/item/medevac_beacon/linked_beacon = null @@ -575,6 +573,8 @@ GLOBAL_LIST_EMPTY(activated_medevac_stretchers) /obj/item/roller/medevac/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/medevac_beacon)) var/obj/item/medevac_beacon/B = I @@ -691,6 +691,8 @@ GLOBAL_LIST_EMPTY(activated_medevac_stretchers) /obj/item/medevac_beacon/attackby(obj/item/I, mob/user, params) //Corpsmen can lock their beacons. . = ..() + if(.) + return if(istype(I, /obj/item/card/id)) if(!allowed(user)) diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 271c32652297f..d93d55b0ed9f9 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -1,6 +1,16 @@ -#define DROPSHIP_CHAIR_UNFOLDED 1 -#define DROPSHIP_CHAIR_FOLDED 2 -#define DROPSHIP_CHAIR_BROKEN 3 +#define DROPSHIP_CHAIR_UNBUCKLED "" +#define DROPSHIP_CHAIR_FOLDED 0 +#define DROPSHIP_CHAIR_BUCKLED "_buckled" +#define DROPSHIP_CHAIR_BROKEN "_broken" + +#define LEADER_CHAIR 0 + +#define NO_CHAIR_COLOR "" +#define ALPHA_CHAIR "_alpha" +#define BRAVO_CHAIR "_bravo" +#define CHARLIE_CHAIR "_charlie" +#define DELTA_CHAIR "_delta" +#define FC_CHAIR "_fc" /obj/structure/bed/chair //YES, chairs are a type of bed, which are a type of stool. This works, believe me. -Pete name = "chair" @@ -82,6 +92,8 @@ /obj/structure/bed/chair/reinforced/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(iswrench(I)) to_chat(user, span_warning("You can only deconstruct this by welding it down!")) @@ -95,7 +107,7 @@ user.visible_message(span_notice("[user] fumbles around figuring out how to weld down \the [src]."), span_notice("You fumble around figuring out how to weld down \the [src].")) var/fumbling_time = 5 SECONDS * (SKILL_ENGINEER_METAL - user.skills.getRating(SKILL_ENGINEER)) - if(!do_after(user, fumbling_time, NONE, src, BUSY_ICON_UNSKILLED, extra_checks = CALLBACK(WT, /obj/item/tool/weldingtool/proc/isOn))) + if(!do_after(user, fumbling_time, NONE, src, BUSY_ICON_UNSKILLED, extra_checks = CALLBACK(WT, TYPE_PROC_REF(/obj/item/tool/weldingtool, isOn)))) return if(!WT.remove_fuel(0, user)) @@ -260,9 +272,34 @@ icon_state = "officechair_dark" anchored = FALSE +/obj/structure/bed/chair/dropship + name = "dropship chair" + desc = "Holds you in place during high altitude drops." + icon_state = "shuttle_chair" + /// Handles the chair buckle bars overlay + var/image/chairbar = null + buildstacktype = 0 + /// Handles the current state of the chair (buckled, unbuckled, folded, broke) + var/chair_state = DROPSHIP_CHAIR_UNBUCKLED + +/obj/structure/bed/chair/dropship/update_overlays() + . = ..() + if(chair_state == DROPSHIP_CHAIR_BUCKLED) + . += image('icons/obj/objects.dmi', icon_state = "shuttle_bars", layer = ABOVE_MOB_LAYER) + return + +/obj/structure/bed/chair/dropship/doublewide/post_buckle_mob(mob/buckling_mob) + chair_state = DROPSHIP_CHAIR_BUCKLED + update_icon() + return ..() + +/obj/structure/bed/chair/dropship/doublewide/post_unbuckle_mob(mob/buckled_mob) + chair_state = DROPSHIP_CHAIR_UNBUCKLED + update_icon() + return ..() + /obj/structure/bed/chair/dropship/pilot icon_state = "pilot_chair" - anchored = TRUE name = "pilot's chair" desc = "A specially designed chair for pilots to sit in." @@ -271,47 +308,24 @@ /obj/structure/bed/chair/dropship/passenger name = "passenger seat" - desc = "Holds you in place during high altitude drops." - icon_state = "shuttle_chair" - var/image/chairbar = null - var/chair_state = DROPSHIP_CHAIR_UNFOLDED - buildstacktype = 0 resistance_flags = RESIST_ALL var/is_animating = 0 /obj/structure/bed/chair/dropship/passenger/CanAllowThrough(atom/movable/mover, turf/target, height = 0, air_group = 0) - if(chair_state == DROPSHIP_CHAIR_UNFOLDED && istype(mover, /obj/vehicle/multitile) && !is_animating) + if(chair_state == DROPSHIP_CHAIR_UNBUCKLED && istype(mover, /obj/vehicle/sealed) && !is_animating) visible_message(span_danger("[mover] slams into [src] and breaks it!")) INVOKE_ASYNC(src, PROC_REF(fold_down), TRUE) return FALSE return ..() -/obj/structure/bed/chair/dropship/passenger/Initialize(mapload) - . = ..() - chairbar = image("icons/obj/objects.dmi", "shuttle_bars") - chairbar.layer = ABOVE_MOB_LAYER - - -/obj/structure/bed/chair/dropship/passenger/post_buckle_mob(mob/buckling_mob) - icon_state = "shuttle_chair_buckled" - overlays += chairbar - return ..() - - -/obj/structure/bed/chair/dropship/passenger/post_unbuckle_mob(mob/buckled_mob) - icon_state = "shuttle_chair" - overlays -= chairbar - return ..() - - /obj/structure/bed/chair/dropship/passenger/buckle_mob(mob/living/buckling_mob, force = FALSE, check_loc = TRUE, lying_buckle = FALSE, hands_needed = 0, target_hands_needed = 0, silent) - if(chair_state != DROPSHIP_CHAIR_UNFOLDED) + if(chair_state != DROPSHIP_CHAIR_UNBUCKLED) return FALSE return ..() /obj/structure/bed/chair/dropship/passenger/proc/fold_down(break_it = FALSE) - if(chair_state == DROPSHIP_CHAIR_UNFOLDED) + if(chair_state == DROPSHIP_CHAIR_UNBUCKLED) is_animating = 1 flick("shuttle_chair_new_folding", src) is_animating = 0 @@ -330,7 +344,7 @@ is_animating = 1 flick("shuttle_chair_new_unfolding", src) is_animating = 0 - chair_state = DROPSHIP_CHAIR_UNFOLDED + chair_state = DROPSHIP_CHAIR_UNBUCKLED sleep(0.5 SECONDS) icon_state = "shuttle_chair" @@ -338,20 +352,22 @@ return // no -/obj/structure/bed/chair/dropship/passenger/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) - if(X.status_flags & INCORPOREAL) +/obj/structure/bed/chair/dropship/passenger/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) + if(xeno_attacker.status_flags & INCORPOREAL) return FALSE if(chair_state != DROPSHIP_CHAIR_BROKEN) - X.visible_message(span_warning("[X] smashes \the [src], shearing the bolts!"), + xeno_attacker.visible_message(span_warning("[xeno_attacker] smashes \the [src], shearing the bolts!"), span_warning("We smash \the [src], shearing the bolts!")) fold_down(1) /obj/structure/bed/chair/dropship/passenger/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(iswrench(I)) switch(chair_state) - if(DROPSHIP_CHAIR_UNFOLDED) + if(DROPSHIP_CHAIR_UNBUCKLED) user.visible_message(span_warning("[user] begins loosening the bolts on \the [src]."), span_warning("You begin loosening the bolts on \the [src].")) playsound(loc, 'sound/items/ratchet.ogg', 25, 1) @@ -396,6 +412,138 @@ span_warning("You repair \the [src].")) chair_state = DROPSHIP_CHAIR_FOLDED +/obj/structure/bed/chair/dropship/doublewide + name = "doublewide seat" + icon_state = "doublewide_chair" //only facing south cause the rest are ugly + max_integrity = 130 + /// Handles the color of the chair + var/chair_color = NO_CHAIR_COLOR + /// If the chair can only be sat in by a leader or not + var/leader_chair = FALSE + /// pixel x shift to give to the buckled mob + var/buckling_x = 0 + +/obj/structure/bed/chair/dropship/doublewide/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) + if(X.status_flags & INCORPOREAL) + return FALSE + if(LAZYLEN(buckled_mobs)) + unbuckle_all_mobs(TRUE) + return ..() + +/obj/structure/bed/chair/dropship/doublewide/welder_act(mob/living/user, obj/item/I) + if(LAZYLEN(buckled_mobs)) + balloon_alert_to_viewers("You cannot repair this chair while someone is sitting in it") + return + welder_repair_act(user, I, 130, 1 SECONDS, 0, SKILL_ENGINEER_METAL, 1) + chair_state = DROPSHIP_CHAIR_UNBUCKLED + update_icon() + return + +/obj/structure/bed/chair/dropship/doublewide/update_icon_state() + . = ..() + var/percentage = (obj_integrity / max_integrity) * 100 + switch(percentage) + if(-INFINITY to 65) + chair_state = DROPSHIP_CHAIR_BROKEN + icon_state = "doublewide_chair[chair_color][chair_state]" + +/obj/structure/bed/chair/dropship/doublewide/attackby(obj/item/I, mob/user, params) + . = ..() + if(LAZYLEN(buckled_mobs) && chair_state == DROPSHIP_CHAIR_BROKEN) + unbuckle_mob(buckled_mobs[1]) + balloon_alert_to_viewers("This chair is too damaged to stay sitting in") + +/obj/structure/bed/chair/dropship/doublewide/buckle_mob(mob/living/buckling_mob, force = FALSE, check_loc = TRUE, lying_buckle = FALSE, hands_needed = 0, target_hands_needed = 0, silent) + if(chair_state == DROPSHIP_CHAIR_BROKEN) + balloon_alert_to_viewers("This chair is too damaged to sit in") + return FALSE + if(leader_chair && buckling_mob.skills.getRating(SKILL_LEADERSHIP) < SKILL_LEAD_TRAINED) + balloon_alert(buckling_mob, "You don't feel worthy enough to sit in this chair") + return FALSE + if(buckling_x) + src.pixel_x = buckling_x + return ..() + +/obj/structure/bed/chair/dropship/doublewide/post_buckle_mob(mob/buckling_mob) + buckling_mob.pixel_x = buckling_x + buckling_mob.old_x = buckling_x + doublewide_mob_density(buckling_mob, TRUE) + return ..() + +/obj/structure/bed/chair/dropship/doublewide/post_unbuckle_mob(mob/buckled_mob) + buckled_mob.pixel_x = initial(buckled_mob.pixel_x) + buckled_mob.old_x = initial(buckled_mob.pixel_x) + doublewide_mob_density(buckled_mob, FALSE) + return ..() + +/// Handles checking the changing density for the person buckling or unbuckling and the person next to the buckling/unbuckling person +/obj/structure/bed/chair/dropship/doublewide/proc/doublewide_mob_density(mob/interactionmob, buckling) + var/obj/structure/bed/chair/dropship/doublewide/other_doublewide = locate(/obj/structure/bed/chair/dropship/doublewide) in interactionmob.loc + var/mob/living/other_chair_buckled_mob + if(other_doublewide) //if there is another doublewide + if(LAZYLEN(other_doublewide.buckled_mobs) && (other_doublewide.buckled_mobs[1] != interactionmob)) + other_chair_buckled_mob = other_doublewide.buckled_mobs[1] + if(buckling) + other_chair_buckled_mob.density = TRUE + interactionmob.density = TRUE + return + //if theyre unbuckling with and there is another buckled mob + other_chair_buckled_mob.density = FALSE + interactionmob.density = TRUE + return + if(buckling) //if theyre buckling with no other chairs + interactionmob.density = FALSE + return + //if there is no other doublewide or theyre unbuckling + interactionmob.density = TRUE + +/obj/structure/bed/chair/dropship/doublewide/left + pixel_x = -8 + buckling_x = -8 + +/obj/structure/bed/chair/dropship/doublewide/right + pixel_x = 9 + buckling_x = 9 + +/obj/structure/bed/chair/dropship/doublewide/left/alpha + name = "Alpha Squad Leader's Chair" + desc = "A chair specially reserved for the Alpha Squad Leader." + icon_state = "doublewide_chair_alpha" + chair_color = ALPHA_CHAIR + leader_chair = TRUE + max_integrity = 200 + +/obj/structure/bed/chair/dropship/doublewide/right/bravo + name = "Bravo Squad Leader's Chair" + desc = "A chair specially reserved for the Bravo Squad Leader." + icon_state = "doublewide_chair_bravo" + chair_color = BRAVO_CHAIR + leader_chair = TRUE + max_integrity = 200 + +/obj/structure/bed/chair/dropship/doublewide/left/charlie + name = "Charlie Squad Leader's Chair" + desc = "A chair specially reserved for the Charlie Squad Leader." + icon_state = "doublewide_chair_charlie" + chair_color = CHARLIE_CHAIR + leader_chair = TRUE + max_integrity = 200 + +/obj/structure/bed/chair/dropship/doublewide/right/delta + name = "Delta Squad Leader's Chair" + desc = "A chair specially reserved for the Delta Squad Leader." + icon_state = "doublewide_chair_delta" + chair_color = DELTA_CHAIR + leader_chair = TRUE + max_integrity = 200 + +/obj/structure/bed/chair/dropship/doublewide/fieldcommander + name = "Field Commander's Chair" + desc = "A chair specially reserved for the Field Commander." + icon_state = "doublewide_chair_fc" + chair_color = FC_CHAIR + leader_chair = TRUE + max_integrity = 200 /obj/structure/bed/chair/ob_chair name = "seat" diff --git a/code/game/objects/structures/stool_bed_chair_nest/janicart.dm b/code/game/objects/structures/stool_bed_chair_nest/janicart.dm index 8e079d4feefba..c0d352904b6a1 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/janicart.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/janicart.dm @@ -30,6 +30,8 @@ /obj/structure/bed/chair/janicart/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/tool/mop)) if(reagents.total_volume <= 1) diff --git a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm deleted file mode 100644 index a064bbee0065e..0000000000000 --- a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm +++ /dev/null @@ -1,139 +0,0 @@ - -//MAKE ME A OFFICE CHAIR SUBTYPE!! - -/obj/structure/bed/chair/wheelchair - name = "wheelchair" - desc = "You sit in this. Either by will or force." - icon_state = "wheelchair" - anchored = FALSE - buckle_flags = CAN_BUCKLE - drag_delay = 1 //pulling something on wheels is easy - var/bloodiness = 0 - var/move_delay = 6 - - -/obj/structure/bed/chair/wheelchair/relaymove(mob/user, direction) - if(world.time <= last_move_time + move_delay) - return - // Redundant check? - if(user.incapacitated() || user.lying_angle) - return - - if(propelled) //can't manually move it mid-propelling. - return - - if(ishuman(user)) - var/mob/living/carbon/human/driver = user - var/datum/limb/left_hand = driver.get_limb("l_hand") - var/datum/limb/right_hand = driver.get_limb("r_hand") - var/working_hands = 2 - move_delay = initial(move_delay) - if(!left_hand?.is_usable()) - move_delay += 4 //harder to move a wheelchair with a single hand - working_hands-- - else if(left_hand.is_broken()) - move_delay++ - if(!right_hand?.is_usable()) - move_delay += 4 - working_hands-- - else if(right_hand.is_broken()) - move_delay += 2 - if(!working_hands) - return // No hands to drive your chair? Tough luck! - if(driver.pulling?.drag_delay) //Dragging stuff can slow you down a bit. - var/pull_delay = driver.pulling.drag_delay - if(ismob(driver.pulling)) - var/mob/M = driver.pulling - if(M.buckled) //if the pulled mob is buckled to an object, we use that object's drag_delay. - pull_delay = M.buckled.drag_delay - move_delay += max(driver.pull_speed + pull_delay + 3 * driver.grab_state, 0) //harder grab makes you slower - - if(istype(driver.get_active_held_item(), /obj/item/weapon/gun)) //Wheelchair user has a gun out, so obviously can't move - return - - if(driver.next_move_slowdown) - move_delay += driver.next_move_slowdown - driver.next_move_slowdown = 0 - - step(src, direction) - - -/obj/structure/bed/chair/wheelchair/Moved() - . = ..() - if(bloodiness) - create_track() - cut_overlays() - if(LAZYLEN(buckled_mobs)) - handle_rotation_overlayed() - - -/obj/structure/bed/chair/wheelchair/post_buckle_mob(mob/living/user) - . = ..() - handle_rotation_overlayed() - -/obj/structure/bed/chair/wheelchair/post_unbuckle_mob() - . = ..() - cut_overlays() - -/obj/structure/bed/chair/wheelchair/setDir(newdir) - . = ..() - handle_rotation(newdir) - -/obj/structure/bed/chair/wheelchair/handle_rotation(direction) - if(LAZYLEN(buckled_mobs)) - handle_rotation_overlayed() - for(var/m in buckled_mobs) - var/mob/living/buckled_mob = m - buckled_mob.setDir(direction) - -/obj/structure/bed/chair/wheelchair/proc/handle_rotation_overlayed() - cut_overlays() - var/image/V = image(icon = icon, icon_state = "w_overlay", layer = FLY_LAYER, dir = src.dir) - add_overlay(V) - - -/obj/structure/bed/chair/wheelchair/Bump(atom/A) - . = ..() - if(!LAZYLEN(buckled_mobs)) - return - - if(propelled) - var/mob/living/occupant = buckled_mobs[1] - unbuckle_mob(occupant) - - if (propelled) - occupant.throw_at(A, 3, propelled) - - var/def_zone = ran_zone() - var/armor_modifier = occupant.modify_by_armor(1, MELEE, 0, def_zone) - occupant.throw_at(A, 3, propelled) - occupant.apply_effect(6 SECONDS * armor_modifier, STUN) - occupant.apply_effect(6 SECONDS * armor_modifier, WEAKEN) - occupant.apply_effect(6 SECONDS * armor_modifier, STUTTER) - occupant.apply_damage(10 * armor_modifier, BRUTE, def_zone) - UPDATEHEALTH(occupant) - playsound(src.loc, 'sound/weapons/punch1.ogg', 25, 1) - if(isliving(A)) - var/mob/living/victim = A - def_zone = ran_zone() - armor_modifier = victim.modify_by_armor(1, MELEE, 0, def_zone) - victim.apply_effect(6 SECONDS * armor_modifier, STUN) - victim.apply_effect(6 SECONDS * armor_modifier, WEAKEN) - victim.apply_effect(6 SECONDS * armor_modifier, STUTTER) - victim.apply_damage(10 * armor_modifier, BRUTE, def_zone) - UPDATEHEALTH(victim) - occupant.visible_message(span_danger("[occupant] crashed into \the [A]!")) - -/obj/structure/bed/chair/wheelchair/proc/create_track() - var/obj/effect/decal/cleanable/blood/tracks/B = new(loc) - var/newdir = get_dir(get_step(loc, dir), loc) - if(newdir == dir) - B.setDir(newdir) - else - newdir = newdir|dir - if(newdir == 3) - newdir = 1 - else if(newdir == 12) - newdir = 4 - B.setDir(newdir) - bloodiness-- diff --git a/code/game/objects/structures/stool_bed_chair_nest/xeno_nest.dm b/code/game/objects/structures/stool_bed_chair_nest/xeno_nest.dm index 40258c4cfdc14..c257b2bf33b80 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/xeno_nest.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/xeno_nest.dm @@ -19,22 +19,18 @@ var/resisting_time = 0 layer = RESIN_STRUCTURE_LAYER -/obj/structure/bed/nest/attackby(obj/item/I, mob/user, params) - . = ..() - - if(istype(I, /obj/item/grab)) - var/obj/item/grab/G = I - if(!ismob(G.grabbed_thing)) - return - var/mob/M = G.grabbed_thing - to_chat(user, span_notice("You place [M] on [src].")) - M.forceMove(loc) - +/obj/structure/bed/nest/grab_interact(obj/item/grab/grab, mob/user, base_damage = BASE_OBJ_SLAM_DAMAGE, is_sharp = FALSE) + if(!ismob(grab.grabbed_thing)) + return + var/mob/grabbed_mob = grab.grabbed_thing + to_chat(user, span_notice("You place [grabbed_mob] on [src].")) + grabbed_mob.forceMove(loc) + return TRUE //RUTGMC EDIT BEGIN - Moved to modular_RUtgmc\code\game\objects\structures\stool_bed_chair_nest\xeno_nest.dm /* -/obj/structure/bed/nest/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) - if(X.a_intent != INTENT_HARM) - return attack_hand(X) +/obj/structure/bed/nest/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) + if(xeno_attacker.a_intent != INTENT_HARM) + return attack_hand(xeno_attacker) return ..() */ //RUTGMC EDIT END diff --git a/code/game/objects/structures/supplypod.dm b/code/game/objects/structures/supplypod.dm index c6777312b2d93..50fa0741096f8 100644 --- a/code/game/objects/structures/supplypod.dm +++ b/code/game/objects/structures/supplypod.dm @@ -28,7 +28,7 @@ GLOBAL_LIST_INIT(pod_styles, list(\ closet_flags = CLOSET_ALLOW_OBJS|CLOSET_ALLOW_DENSE_OBJ soft_armor = list(MELEE = 30, BULLET = 50, LASER = 50, ENERGY = 100, BOMB = 100, BIO = 0, FIRE = 100, ACID = 80) anchored = TRUE - flags_atom = PREVENT_CONTENTS_EXPLOSION + atom_flags = PREVENT_CONTENTS_EXPLOSION var/adminNamed = FALSE var/bluespace = FALSE var/landingDelay = 30 @@ -75,16 +75,20 @@ GLOBAL_LIST_INIT(pod_styles, list(\ . = ..() setStyle(style, TRUE) +/obj/structure/closet/supplypod/update_icon_state() + . = ..() + icon_state = GLOB.pod_styles[style][POD_ICON_STATE] + +/obj/structure/closet/supplypod/update_overlays() + . = ..() -/obj/structure/closet/supplypod/update_icon() - cut_overlays() if(style == STYLE_SEETHROUGH || style == STYLE_INVISIBLE) return if(opened) - add_overlay("[icon_state]_open") + . += "[icon_state]_open" else - add_overlay("[icon_state]_door") + . += "[icon_state]_door" /obj/structure/closet/supplypod/proc/setStyle(chosenStyle, duringInit = FALSE) @@ -92,7 +96,6 @@ GLOBAL_LIST_INIT(pod_styles, list(\ setStyle(STYLE_CENTCOM) return style = chosenStyle - icon_state = GLOB.pod_styles[chosenStyle][POD_ICON_STATE] if(!adminNamed) name = GLOB.pod_styles[chosenStyle][POD_NAME] desc = GLOB.pod_styles[chosenStyle][POD_DESC] diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index b66ffbd4e6a5a..1350fa41b8fca 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -76,7 +76,8 @@ visible_message(span_danger("[O] plows straight through [src]!")) deconstruct(FALSE) -/obj/structure/table/update_icon() +/obj/structure/table/update_icon_state() + . = ..() if(flipped) var/ttype = 0 var/tabledirs = 0 @@ -132,34 +133,7 @@ /obj/structure/table/attackby(obj/item/I, mob/user, params) . = ..() - - if(istype(I, /obj/item/grab) && get_dist(src, user) <= 1) - if(isxeno(user)) - return - - var/obj/item/grab/G = I - if(!isliving(G.grabbed_thing)) - return - - var/mob/living/M = G.grabbed_thing - if(user.a_intent == INTENT_HARM) - if(user.grab_state <= GRAB_AGGRESSIVE) - to_chat(user, span_warning("You need a better grip to do that!")) - return - - if(prob(15)) - M.Paralyze(10 SECONDS) - M.apply_damage(8, BRUTE, "head", blocked = MELEE, updating_health = TRUE) - user.visible_message(span_danger("[user] slams [M]'s face against [src]!"), - span_danger("You slam [M]'s face against [src]!")) - log_combat(user, M, "slammed", "", "against \the [src]") - playsound(loc, 'sound/weapons/tablehit1.ogg', 25, 1) - - else if(user.grab_state >= GRAB_AGGRESSIVE) - M.forceMove(loc) - M.Paralyze(10 SECONDS) - user.visible_message(span_danger("[user] throws [M] on [src]."), - span_danger("You throw [M] on [src].")) + if(.) return if(user.a_intent != INTENT_HARM) @@ -173,6 +147,24 @@ I.pixel_y = clamp(text2num(click_params["icon-y"]) - 16, -(world.icon_size/2), world.icon_size/2) return TRUE +/obj/structure/table/grab_interact(obj/item/grab/grab, mob/user, base_damage = BASE_OBJ_SLAM_DAMAGE, is_sharp = FALSE) + . = ..() + if(.) + playsound(loc, 'sound/weapons/tablehit1.ogg', 25, 1) + return + if(user.a_intent == INTENT_HARM) + return + if(user.grab_state < GRAB_AGGRESSIVE) + return + if(!isliving(grab.grabbed_thing)) + return + + var/mob/living/grabbed_mob = grab.grabbed_thing + grabbed_mob.forceMove(loc) + grabbed_mob.Paralyze(2 SECONDS) + user.visible_message(span_danger("[user] throws [grabbed_mob] on [src]."), + span_danger("You throw [grabbed_mob] on [src].")) + return TRUE /obj/structure/table/proc/straight_table_check(direction) var/obj/structure/table/T @@ -231,7 +223,7 @@ if(T.flipped && T.dir == src.dir && !T.unflipping_check(new_dir)) return FALSE for(var/obj/structure/S in loc) - if((S.flags_atom & ON_BORDER) && S.density && S != src) //We would put back on a structure that wouldn't allow it + if((S.atom_flags & ON_BORDER) && S.density && S != src) //We would put back on a structure that wouldn't allow it return FALSE return TRUE @@ -277,7 +269,7 @@ layer = FLY_LAYER flipped = TRUE coverage = 60 - flags_atom |= ON_BORDER + atom_flags |= ON_BORDER for(var/D in list(turn(direction, 90), turn(direction, -90))) var/obj/structure/table/T = locate() in get_step(src,D) if(T && !T.flipped) @@ -297,7 +289,7 @@ flipped = FALSE coverage = 10 climbable = initial(climbable) - flags_atom &= ~ON_BORDER + atom_flags &= ~ON_BORDER for(var/D in list(turn(dir, 90), turn(dir, -90))) var/obj/structure/table/T = locate() in get_step(src.loc,D) if(T?.flipped && T.dir == src.dir) @@ -464,6 +456,10 @@ table_status = TABLE_STATUS_FIRM return TRUE +/obj/structure/table/reinforced/weak //used for the icon, functionally similar to a table. + name = "rickety reinforced table" + desc = "A square metal surface resting on four legs. It has seen better days to whence it was strong." + max_integrity = 40 /obj/structure/table/reinforced/prison desc = "A square metal surface resting on four legs. This one has side panels, making it useful as a desk, but impossible to flip." @@ -529,6 +525,8 @@ /obj/structure/rack/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(iswrench(I)) deconstruct(TRUE) diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index 30052da2a34be..465e452440ef1 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -24,14 +24,18 @@ update_icon() -/obj/structure/dispenser/update_icon() - overlays.Cut() +/obj/structure/dispenser/update_overlays() + . = ..() switch(oxygentanks) - if(1 to 3) overlays += "oxygen-[oxygentanks]" - if(4 to INFINITY) overlays += "oxygen-4" + if(1 to 3) + . += "oxygen-[oxygentanks]" + if(4 to INFINITY) + . += "oxygen-4" switch(phorontanks) - if(1 to 4) overlays += "phoron-[phorontanks]" - if(5 to INFINITY) overlays += "phoron-5" + if(1 to 4) + . += "phoron-[phorontanks]" + if(5 to INFINITY) + . += "phoron-5" /obj/structure/dispenser/interact(mob/user) . = ..() @@ -49,6 +53,8 @@ /obj/structure/dispenser/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/tank/oxygen) || istype(I, /obj/item/tank/air) || istype(I, /obj/item/tank/anesthetic)) if(oxygentanks >= 10) diff --git a/code/game/objects/structures/teleporter.dm b/code/game/objects/structures/teleporter.dm index 69dcbb0f2c2f3..efbe3c1964f46 100644 --- a/code/game/objects/structures/teleporter.dm +++ b/code/game/objects/structures/teleporter.dm @@ -141,6 +141,7 @@ update_icon() /obj/machinery/deployable/teleporter/update_icon_state() + . = ..() var/obj/item/teleporter_kit/kit = get_internal_item() if(powered() || kit?.cell?.charge > TELEPORTING_COST) icon_state = default_icon_state + "_on" @@ -154,10 +155,10 @@ icon_state = "teleporter" max_integrity = 200 - flags_item = IS_DEPLOYABLE|DEPLOYED_WRENCH_DISASSEMBLE + item_flags = IS_DEPLOYABLE|DEPLOYED_WRENCH_DISASSEMBLE w_class = WEIGHT_CLASS_BULKY - flags_equip_slot = ITEM_SLOT_BACK + equip_slot_flags = ITEM_SLOT_BACK ///The linked teleporter var/obj/item/teleporter_kit/linked_teleporter ///The optional cell to power the teleporter if off the grid diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index e91eb1a09b477..e36351b2bf4a3 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -46,11 +46,14 @@ open = !open update_icon() -/obj/structure/toilet/update_icon() +/obj/structure/toilet/update_icon_state() + . = ..() icon_state = "toilet[open][cistern]" /obj/structure/toilet/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(iscrowbar(I)) to_chat(user, span_notice("You start to [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"].")) @@ -63,40 +66,6 @@ cistern = !cistern update_icon() - else if(istype(I, /obj/item/grab)) - if(isxeno(user)) - return - var/obj/item/grab/G = I - - if(!iscarbon(G.grabbed_thing)) - return - - var/mob/living/carbon/C = G.grabbed_thing - - if(user.grab_state <= GRAB_PASSIVE) - to_chat(user, span_notice("You need a tighter grip.")) - return - - if(!C.loc == get_turf(src)) - to_chat(user, span_notice("[C] needs to be on the toilet.")) - return - - if(open && !swirlie) - user.visible_message(span_danger("[user] starts to give [C] a swirlie!"), span_notice("You start to give [C] a swirlie!")) - swirlie = C - if(!do_after(user, 3 SECONDS, NONE, src, BUSY_ICON_HOSTILE)) - return - - user.visible_message(span_danger("[user] gives [C] a swirlie!"), span_notice("You give [C] a swirlie!"), "You hear a toilet flushing.") - log_combat(user, C, "given a swirlie") - if(!C.internal) - C.adjustOxyLoss(5) - swirlie = null - else - user.visible_message(span_danger("[user] slams [C] into the [src]!"), span_notice("You slam [C] into the [src]!")) - log_combat(user, C, "slammed", "", "into the \the [src]") - C.apply_damage(8, BRUTE, blocked = MELEE, updating_health = TRUE) - else if(cistern && !issilicon(user)) //STOP PUTTING YOUR MODULES IN THE TOILET. if(I.w_class > 3) to_chat(user, span_notice("\The [I] does not fit.")) @@ -111,10 +80,43 @@ w_items += I.w_class to_chat(user, "You carefully place \the [I] into the cistern.") +/obj/structure/toilet/grab_interact(obj/item/grab/grab, mob/user, base_damage = BASE_OBJ_SLAM_DAMAGE, is_sharp = FALSE) + . = ..() + if(.) + return + if(isxeno(user)) + return + if(!iscarbon(grab.grabbed_thing)) + return + if(!open || swirlie) + return + + var/mob/living/carbon/grabbed_mob = grab.grabbed_thing + + if(user.grab_state <= GRAB_PASSIVE) + to_chat(user, span_notice("You need a tighter grip.")) + return + + if(!grabbed_mob.loc == get_turf(src)) + to_chat(user, span_notice("[grabbed_mob] needs to be on the toilet.")) + return + + user.visible_message(span_danger("[user] starts to give [grabbed_mob] a swirlie!"), span_notice("You start to give [grabbed_mob] a swirlie!")) + swirlie = grabbed_mob + if(!do_after(user, 3 SECONDS, NONE, src, BUSY_ICON_HOSTILE)) + return + + user.visible_message(span_danger("[user] gives [grabbed_mob] a swirlie!"), span_notice("You give [grabbed_mob] a swirlie!"), "You hear a toilet flushing.") + log_combat(user, grabbed_mob, "given a swirlie") + if(!grabbed_mob.internal) + grabbed_mob.adjustOxyLoss(5) + swirlie = null + /obj/structure/toilet/alternate icon_state = "toilet200" -/obj/structure/toilet/alternate/update_icon() +/obj/structure/toilet/alternate/update_icon_state() + . = ..() icon_state = "toilet2[open][cistern]" /obj/structure/urinal @@ -125,30 +127,6 @@ density = FALSE anchored = TRUE -/obj/structure/urinal/attackby(obj/item/I, mob/user, params) - . = ..() - - if(istype(I, /obj/item/grab)) - if(isxeno(user)) - return - var/obj/item/grab/G = I - if(!isliving(G.grabbed_thing)) - return - - var/mob/living/GM = G.grabbed_thing - if(user.grab_state <= GRAB_PASSIVE) - to_chat(user, span_notice("You need a tighter grip.")) - return - - if(!GM.loc == get_turf(src)) - to_chat(user, span_notice("[GM] needs to be on the urinal.")) - return - - user.visible_message(span_danger("[user] slams [GM] into the [src]!"), span_notice("You slam [GM] into the [src]!")) - GM.apply_damage(8, blocked = MELEE) - UPDATEHEALTH(GM) - - /obj/machinery/shower name = "shower" desc = "The HS-451. Installed in the 2050s by the Nanotrasen Hygiene Division." @@ -189,7 +167,7 @@ if(.) return on = !on - update_icon() + update_mist() if(on) start_processing() if (user.loc == loc) @@ -202,6 +180,8 @@ /obj/machinery/shower/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(I.type == /obj/item/tool/analyzer) to_chat(user, span_notice("The water temperature seems to be [watertemp].")) @@ -221,8 +201,9 @@ watertemp = "normal" user.visible_message(span_notice("[user] adjusts the shower with \the [I]."), span_notice("You adjust the shower with \the [I].")) -/obj/machinery/shower/update_icon() //this is terribly unreadable, but basically it makes the shower mist up - overlays.Cut() //once it's been on for a while, in addition to handling the water overlay. +/obj/machinery/shower/proc/update_mist() +//this is terribly unreadable, but basically it makes the shower mist up once it's been on for a while + update_icon() if(mymist) qdel(mymist) mymist = null @@ -248,6 +229,11 @@ mymist = null ismist = FALSE +/obj/machinery/shower/update_overlays() + . = ..() + if(on) + . += image('icons/obj/watercloset.dmi', src, "water", MOB_LAYER + 1, dir) + /obj/machinery/shower/proc/on_cross(datum/source, atom/movable/O, oldloc, oldlocs) SIGNAL_HANDLER wash(O) @@ -365,6 +351,8 @@ /obj/structure/sink/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(busy) to_chat(user, span_warning("Someone's already washing here.")) @@ -395,7 +383,7 @@ L.Paralyze(20 SECONDS) L.visible_message(span_danger("[L] was stunned by [L.p_their()] wet [I]!")) - if(I.flags_item & ITEM_ABSTRACT) + if(I.item_flags & ITEM_ABSTRACT) return var/turf/location = user.loc diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index 0e04738990e01..52364d9f9c166 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -18,7 +18,7 @@ density = FALSE dir = NORTH allow_pass_flags = PASS_GLASS|PASS_AIR - flags_atom = ON_BORDER + atom_flags = ON_BORDER var/obj/item/circuitboard/airlock/electronics = null @@ -47,10 +47,13 @@ update_icon() /obj/structure/windoor_assembly/update_icon_state() + . = ..() icon_state = "[facing]_[secure]windoor_assembly[state]" /obj/structure/windoor_assembly/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return switch(state) if("01") diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index d3b40eba36ca9..56c2ed4a5bccc 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -7,12 +7,14 @@ density = TRUE anchored = TRUE layer = WINDOW_LAYER - flags_atom = ON_BORDER|DIRLOCK + atom_flags = ON_BORDER|DIRLOCK allow_pass_flags = PASS_GLASS resistance_flags = XENO_DAMAGEABLE | DROPSHIP_IMMUNE coverage = 20 var/dismantle = FALSE //If we're dismantling the window properly no smashy smashy max_integrity = 15 + ///Optimization for dynamic explosion block values, for things whose explosion block is dependent on certain conditions. + var/real_explosion_block = 0 var/state = 2 var/reinf = FALSE var/basestate = "window" @@ -29,7 +31,7 @@ //I hate this as much as you do /obj/structure/window/full dir = 10 - flags_atom = DIRLOCK + atom_flags = DIRLOCK /obj/structure/window/Initialize(mapload, start_dir, constructed) ..() @@ -93,7 +95,7 @@ //Once a full window, it will always be a full window, so there's no point //having the same type for both. /obj/structure/window/proc/is_full_window() - if(!(flags_atom & ON_BORDER) || ISDIAGONALDIR(dir)) + if(!(atom_flags & ON_BORDER) || ISDIAGONALDIR(dir)) return TRUE return FALSE @@ -125,43 +127,41 @@ span_notice("You hear a knocking sound.")) windowknock_cooldown = world.time + 100 +/obj/structure/window/grab_interact(obj/item/grab/grab, mob/user, base_damage = BASE_OBJ_SLAM_DAMAGE, is_sharp = FALSE) + if(!isliving(grab.grabbed_thing)) + return + + var/mob/living/grabbed_mob = grab.grabbed_thing + var/state = user.grab_state + user.drop_held_item() + step_towards(grabbed_mob, src) + var/damage = (user.skills.getRating(SKILL_CQC) * CQC_SKILL_DAMAGE_MOD) + switch(state) + if(GRAB_PASSIVE) + damage += base_damage + grabbed_mob.visible_message(span_warning("[user] slams [grabbed_mob] against \the [src]!")) + log_combat(user, grabbed_mob, "slammed", "", "against \the [src]") + if(GRAB_AGGRESSIVE) + damage += base_damage * 1.5 + grabbed_mob.visible_message(span_danger("[user] bashes [grabbed_mob] against \the [src]!")) + log_combat(user, grabbed_mob, "bashed", "", "against \the [src]") + if(prob(50)) + grabbed_mob.Paralyze(2 SECONDS) + if(GRAB_NECK) + damage += base_damage * 2 + grabbed_mob.visible_message(span_danger("[user] crushes [grabbed_mob] against \the [src]!")) + log_combat(user, grabbed_mob, "crushed", "", "against \the [src]") + grabbed_mob.Paralyze(2 SECONDS) + grabbed_mob.apply_damage(damage, blocked = MELEE, updating_health = TRUE) + take_damage(damage * 2, BRUTE, MELEE) + return TRUE + /obj/structure/window/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return - if(istype(I, /obj/item/grab) && get_dist(src, user) < 2) - if(isxeno(user)) - return - var/obj/item/grab/G = I - if(!isliving(G.grabbed_thing)) - return - - var/mob/living/M = G.grabbed_thing - var/state = user.grab_state - user.drop_held_item() - switch(state) - if(GRAB_PASSIVE) - M.visible_message(span_warning("[user] slams [M] against \the [src]!")) - log_combat(user, M, "slammed", "", "against \the [src]") - M.apply_damage(7, blocked = MELEE) - UPDATEHEALTH(M) - take_damage(10, BRUTE, MELEE) - if(GRAB_AGGRESSIVE) - M.visible_message(span_danger("[user] bashes [M] against \the [src]!")) - log_combat(user, M, "bashed", "", "against \the [src]") - if(prob(50)) - M.Paralyze(2 SECONDS) - M.apply_damage(10, blocked = MELEE) - UPDATEHEALTH(M) - take_damage(25, BRUTE, MELEE) - if(GRAB_NECK) - M.visible_message(span_danger("[user] crushes [M] against \the [src]!")) - log_combat(user, M, "crushed", "", "against \the [src]") - M.Paralyze(10 SECONDS) - M.apply_damage(20, blocked = MELEE) - UPDATEHEALTH(M) - take_damage(50, BRUTE, MELEE) - - else if(I.flags_item & NOBLUDGEON) + if(I.item_flags & NOBLUDGEON) return else if(isscrewdriver(I) && deconstructable) @@ -195,7 +195,7 @@ if(reinf) new /obj/item/stack/sheet/glass/reinforced(loc, 2) else - new /obj/item/stack/sheet/glass(loc, 2) + new /obj/item/stack/sheet/glass/glass(loc, 2) else new shardtype(loc) if(is_full_window()) @@ -245,9 +245,8 @@ INVOKE_NEXT_TICK(W, TYPE_PROC_REF(/atom/movable, update_icon)) //merges adjacent full-tile windows into one (blatant ripoff from game/smoothwall.dm) -/obj/structure/window/update_icon() - //A little cludge here, since I don't know how it will work with slim windows. Most likely VERY wrong. - //this way it will only update full-tile ones +/obj/structure/window/update_icon_state() + . = ..() if(!src) return if(!is_full_window()) @@ -388,9 +387,9 @@ basestate = "window" max_integrity = 40 reinf = TRUE - flags_atom = NONE + atom_flags = NONE -/obj/structure/window/shuttle/update_icon() //icon_state has to be set manually +/obj/structure/window/shuttle/update_icon_state() return //Framed windows @@ -399,7 +398,7 @@ name = "theoretical window" layer = TABLE_LAYER static_frame = TRUE - flags_atom = NONE //This is not a border object; it takes up the entire tile. + atom_flags = NONE //This is not a border object; it takes up the entire tile. explosion_block = 2 smoothing_flags = SMOOTH_BITMASK smoothing_groups = list( @@ -421,8 +420,7 @@ /obj/structure/window/framed/update_icon() QUEUE_SMOOTH(src) - - + return ..() /obj/structure/window/framed/deconstruct(disassembled = TRUE, leave_frame = TRUE) if(window_frame && leave_frame) diff --git a/code/game/objects/structures/window_frame.dm b/code/game/objects/structures/window_frame.dm index cefe080862056..e6bbfc4dadb1c 100644 --- a/code/game/objects/structures/window_frame.dm +++ b/code/game/objects/structures/window_frame.dm @@ -49,6 +49,7 @@ /obj/structure/window_frame/update_icon() QUEUE_SMOOTH(src) + return ..() /obj/structure/window_frame/Destroy() density = FALSE @@ -61,6 +62,8 @@ /obj/structure/window_frame/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, sheet_type)) var/obj/item/stack/sheet/sheet = I @@ -80,35 +83,31 @@ new window_type(loc) //This only works on Theseus windows! qdel(src) - else if(istype(I, /obj/item/grab)) - var/obj/item/grab/G = I - if(isxeno(user)) - return - - if(!isliving(G.grabbed_thing)) - return - - var/mob/living/M = G.grabbed_thing - if(user.grab_state < GRAB_AGGRESSIVE) - to_chat(user, span_warning("You need a better grip to do that!")) - return - - if(get_dist(src, M) > 1) - to_chat(user, span_warning("[M] needs to be next to [src].")) - return - - if(user.do_actions) - return - - user.visible_message(span_notice("[user] starts pulling [M] onto [src]."), - span_notice("You start pulling [M] onto [src]!")) - if(!do_after(user, 2 SECONDS, NONE, M, BUSY_ICON_GENERIC)) - return - M.Paralyze(4 SECONDS) - user.visible_message(span_warning("[user] pulls [M] onto [src]."), - span_notice("You pull [M] onto [src].")) - M.forceMove(loc) - +/obj/structure/window_frame/grab_interact(obj/item/grab/grab, mob/user, base_damage = BASE_OBJ_SLAM_DAMAGE, is_sharp = FALSE) + . = ..() + if(.) + return + if(!isliving(grab.grabbed_thing)) + return + if(user.do_actions) + return + if(user.grab_state < GRAB_AGGRESSIVE) + to_chat(user, span_warning("You need a better grip to do that!")) + return + + var/mob/living/grabbed_mob = grab.grabbed_thing + if(get_dist(src, grabbed_mob) > 1) + to_chat(user, span_warning("[grabbed_mob] needs to be next to [src].")) + return + user.visible_message(span_notice("[user] starts pulling [grabbed_mob] onto [src]."), + span_notice("You start pulling [grabbed_mob] onto [src]!")) + if(!do_after(user, 2 SECONDS, NONE, grabbed_mob, BUSY_ICON_GENERIC)) + return + grabbed_mob.Paralyze(2 SECONDS) + user.visible_message(span_warning("[user] pulls [grabbed_mob] onto [src]."), + span_notice("You pull [grabbed_mob] onto [src].")) + grabbed_mob.forceMove(loc) + return TRUE /obj/structure/window_frame/mainship icon = 'icons/obj/smooth_objects/ship_window_frame.dmi' diff --git a/code/game/objects/structures/xeno.dm b/code/game/objects/structures/xeno.dm index 4e0c29769d355..51d69f853c012 100644 --- a/code/game/objects/structures/xeno.dm +++ b/code/game/objects/structures/xeno.dm @@ -27,6 +27,8 @@ /obj/alien/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(user.a_intent == INTENT_HARM) //Already handled at the parent level. return @@ -63,7 +65,7 @@ desc = "Looks like some kind of slimy growth." icon_state = "Resin1" max_integrity = 200 - resistance_flags = XENO_DAMAGEABLE + resistance_flags = XENO_DAMAGEABLE|UNACIDABLE /obj/alien/resin/attack_hand(mob/living/user) @@ -117,14 +119,14 @@ victim.next_move_slowdown += slow_amt /* RUTGMC DELETION -/obj/alien/resin/sticky/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) - if(X.status_flags & INCORPOREAL) +/obj/alien/resin/sticky/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) + if(xeno_attacker.status_flags & INCORPOREAL) return FALSE - if(X.a_intent == INTENT_HARM) //Clear it out on hit; no need to double tap. - if(CHECK_BITFIELD(SSticker.mode?.flags_round_type, MODE_ALLOW_XENO_QUICKBUILD) && SSresinshaping.active && refundable) - SSresinshaping.quickbuild_points_by_hive[X.hivenumber]++ - X.do_attack_animation(src, ATTACK_EFFECT_CLAW) //SFX + if(xeno_attacker.a_intent == INTENT_HARM) //Clear it out on hit; no need to double tap. + if(CHECK_BITFIELD(SSticker.mode?.round_type_flags, MODE_ALLOW_XENO_QUICKBUILD) && SSresinshaping.active && refundable) + SSresinshaping.quickbuild_points_by_hive[xeno_attacker.hivenumber]++ + xeno_attacker.do_attack_animation(src, ATTACK_EFFECT_CLAW) //SFX playsound(src, "alien_resin_break", 25) //SFX deconstruct(TRUE) return @@ -193,22 +195,22 @@ /* RUTGMC DELETION //clicking on resin doors attacks them, or opens them without harm intent -/obj/structure/mineral_door/resin/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) - var/turf/cur_loc = X.loc +/obj/structure/mineral_door/resin/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) + var/turf/cur_loc = xeno_attacker.loc if(!istype(cur_loc)) return FALSE //Some basic logic here - if(X.a_intent != INTENT_HARM) - try_toggle_state(X) + if(xeno_attacker.a_intent != INTENT_HARM) + try_toggle_state(xeno_attacker) return TRUE - if(CHECK_BITFIELD(SSticker.mode?.flags_round_type, MODE_ALLOW_XENO_QUICKBUILD) && SSresinshaping.active) - SSresinshaping.quickbuild_points_by_hive[X.hivenumber]++ + if(CHECK_BITFIELD(SSticker.mode?.round_type_flags, MODE_ALLOW_XENO_QUICKBUILD) && SSresinshaping.active) + SSresinshaping.quickbuild_points_by_hive[xeno_attacker.hivenumber]++ qdel(src) return TRUE - src.balloon_alert(X, "Destroying...") + src.balloon_alert(xeno_attacker, "Destroying...") playsound(src, "alien_resin_break", 25) - if(do_after(X, 1 SECONDS, IGNORE_HELD_ITEM, src, BUSY_ICON_HOSTILE)) - src.balloon_alert(X, "Destroyed") + if(do_after(xeno_attacker, 1 SECONDS, IGNORE_HELD_ITEM, src, BUSY_ICON_HOSTILE)) + src.balloon_alert(xeno_attacker, "Destroyed") qdel(src) */ @@ -283,27 +285,27 @@ /obj/item/resin_jelly name = "resin jelly" desc = "A foul, viscous resin jelly that doesnt seem to burn easily." - icon = 'icons/unused/Marine_Research.dmi' - icon_state = "biomass" + icon = 'icons/Xeno/xeno_materials.dmi' + icon_state = "resin_jelly" soft_armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 200, ACID = 0) var/immune_time = 15 SECONDS ///Holder to ensure only one user per resin jelly. var/current_user -/obj/item/resin_jelly/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) - if(X.status_flags & INCORPOREAL) +/obj/item/resin_jelly/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) + if(xeno_attacker.status_flags & INCORPOREAL) return FALSE - if(X.xeno_caste.can_flags & CASTE_CAN_HOLD_JELLY) - return attack_hand(X) - if(X.do_actions || !isnull(current_user)) + if(xeno_attacker.xeno_caste.can_flags & CASTE_CAN_HOLD_JELLY) + return attack_hand(xeno_attacker) + if(xeno_attacker.do_actions || !isnull(current_user)) return - current_user = X - X.balloon_alert(X, "Applying...") - if(!do_after(X, RESIN_SELF_TIME, NONE, X, BUSY_ICON_MEDICAL)) + current_user = xeno_attacker + xeno_attacker.balloon_alert(xeno_attacker, "Applying...") + if(!do_after(xeno_attacker, RESIN_SELF_TIME, NONE, xeno_attacker, BUSY_ICON_MEDICAL)) current_user = null return - activate_jelly(X) + activate_jelly(xeno_attacker) /obj/item/resin_jelly/attack_self(mob/living/carbon/xenomorph/user) //Activates if the item itself is clicked in hand. diff --git a/code/game/sound.dm b/code/game/sound.dm index 3e1b91f67dec3..e1b7c6749b257 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -62,18 +62,27 @@ A good representation is: 'byond applies a volume reduction to the sound every X frequency = GET_RANDOM_FREQ // Same frequency for everybody // Looping through the player list has the added bonus of working for mobs inside containers var/sound/S = sound(get_sfx(soundin)) - for(var/i in GLOB.player_list) - var/mob/M = i - if(!M.client) + for(var/mob/M AS in GLOB.player_list|GLOB.aiEyes) + if(!M.client && !istype(M, /mob/camera/aiEye)) continue var/turf/T = get_turf(M) if(!T || T.z != turf_source.z || get_dist(M, turf_source) > sound_range) continue - M.playsound_local(turf_source, soundin, vol, vary, frequency, falloff, is_global, channel, S) + M.playsound_local(turf_source, soundin, vol, vary, frequency, falloff, is_global, channel, S, sound_reciever = M) + + for(var/obj/vehicle/sealed/armored/armor AS in GLOB.tank_list) + if(!armor.interior || armor.z != turf_source.z || get_dist(armor.loc, turf_source) > sound_range) + continue + for(var/mob/crew AS in armor.interior.occupants) + //turf source is null on purpose because it will not work properly since crew is on a different z + crew.playsound_local(null, soundin, vol*0.5, vary, frequency, falloff, is_global, channel, S, sound_reciever = crew) + //todo rename S to sound_to_use -/mob/proc/playsound_local(turf/turf_source, soundin, vol, vary, frequency, falloff, is_global, channel = 0, sound/S, distance_multiplier = 1) - if(!client) +/mob/proc/playsound_local(turf/turf_source, soundin, vol, vary, frequency, falloff, is_global, channel = 0, sound/S, distance_multiplier = 1, mob/sound_reciever) + if(!sound_reciever) + sound_reciever = src + if(!sound_reciever.client) return FALSE if(!S) @@ -108,10 +117,10 @@ A good representation is: 'byond applies a volume reduction to the sound every X if(!is_global) S.environment = SOUND_ENVIRONMENT_ROOM - SEND_SOUND(src, S) + SEND_SOUND(sound_reciever, S) -/mob/living/playsound_local(turf/turf_source, soundin, vol, vary, frequency, falloff, is_global, channel = 0, sound/S, distance_multiplier = 1) +/mob/living/playsound_local(turf/turf_source, soundin, vol, vary, frequency, falloff, is_global, channel = 0, sound/S, distance_multiplier = 1, mob/sound_reciever) if(ear_deaf > 0) return FALSE return ..() diff --git a/code/game/turfs/closed.dm b/code/game/turfs/closed.dm index 46ac12cc0d072..0b380f666043b 100644 --- a/code/game/turfs/closed.dm +++ b/code/game/turfs/closed.dm @@ -51,12 +51,12 @@ minimap_color = MINIMAP_SOLID overlays += rock_side -/turf/closed/mineral/attack_alien(mob/living/carbon/xenomorph/xeno_user, isrightclick = FALSE) +/turf/closed/mineral/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) . = ..() - if(isxenobehemoth(xeno_user)) - xeno_user.do_attack_animation(src) + if(isxenobehemoth(xeno_attacker)) + xeno_attacker.do_attack_animation(src) playsound(src, 'sound/effects/behemoth/earth_pillar_eating.ogg', 10, TRUE) - xeno_user.visible_message(span_xenowarning("\The [xeno_user] eats away at the [src.name]!"), \ + xeno_attacker.visible_message(span_xenowarning("\The [xeno_attacker] eats away at the [src.name]!"), \ span_xenonotice(pick( "We eat away at the stone. It tastes good, as expected of our primary diet.", "Mmmmm... Delicious rock. A fitting meal for the hardiest of creatures.", @@ -111,9 +111,9 @@ icon_state = "darkfrostwall-0" walltype = "darkfrostwall" base_icon_state = "darkfrostwall" - resistance_flags = PLASMACUTTER_IMMUNE|UNACIDABLE /turf/closed/mineral/smooth/darkfrostwall/indestructible + name = "tough rock" resistance_flags = RESIST_ALL icon_state = "wall-invincible" @@ -162,6 +162,16 @@ resistance_flags = RESIST_ALL icon_state = "wall-invincible" +//basalt mineral wall +/turf/closed/mineral/smooth/basalt + icon = 'icons/turf/walls/basaltwall.dmi' + icon_state = "basaltwall-0" + base_icon_state = "basaltwall" + +/turf/closed/mineral/smooth/basalt/indestructible + resistance_flags = RESIST_ALL + icon_state = "wall-invincible" + //Ground map dense jungle /turf/closed/gm icon = 'icons/turf/walls/jungle.dmi' @@ -187,7 +197,7 @@ /turf/closed/gm/ex_act(severity) switch(severity) if(EXPLODE_DEVASTATE) - ChangeTurf(/turf/open/ground/grass) + ChangeTurf(/turf/open/ground/grass/weedable) /turf/closed/gm/dense name = "dense jungle wall" @@ -293,9 +303,7 @@ icon_state = "Intersection" /turf/closed/attackby(obj/item/I, mob/user, params) - . = ..() - - if(istype(I, /obj/item/tool/pickaxe/plasmacutter) && !user.do_actions) + if(isplasmacutter(I) && !user.do_actions) var/obj/item/tool/pickaxe/plasmacutter/P = I if(CHECK_BITFIELD(resistance_flags, PLASMACUTTER_IMMUNE)) to_chat(user, span_warning("[P] can't cut through this!")) @@ -309,6 +317,8 @@ //change targetted turf to a new one to simulate deconstruction ChangeTurf(open_turf_type) + return + return ..() //Ice Thin Wall /turf/closed/ice/thin @@ -507,8 +517,13 @@ opacity = FALSE allow_pass_flags = PASS_GLASS +/turf/closed/shuttle/dropship1/aislewindow + icon_state = "shuttle_aisle_window" + opacity = FALSE + /turf/closed/shuttle/dropship1/panel icon_state = "shuttle_interior_panel" + opacity = FALSE /turf/closed/shuttle/dropship1/engineone icon_state = "shuttle_interior_backengine" diff --git a/code/game/turfs/floor.dm b/code/game/turfs/floor.dm index e320c17d47d8b..f1046378d3c0d 100644 --- a/code/game/turfs/floor.dm +++ b/code/game/turfs/floor.dm @@ -68,6 +68,7 @@ return W /turf/open/floor/update_icon_state() + . = ..() if(broken) icon_state = broken_states() else if(burnt) @@ -116,7 +117,7 @@ return TRUE . = ..() if(.) - return . + return if(floor_tile && istype(object, /obj/item/stack/tile)) try_replace_tile(object, user, params) return TRUE diff --git a/code/game/turfs/floor_ground.dm b/code/game/turfs/floor_ground.dm index 72d592521911a..c9deeab594a35 100644 --- a/code/game/turfs/floor_ground.dm +++ b/code/game/turfs/floor_ground.dm @@ -187,6 +187,7 @@ /turf/open/floor/plating/ground/mars/random/cave name = "cave" icon_state = "mars_cave" + smoothing_groups = list(SMOOTH_GROUP_SAND) /turf/open/floor/plating/ground/mars/random/cave/darker color = "#948a7c" @@ -346,6 +347,20 @@ name = "asphalt" icon_state = "cement_threeside" +/turf/open/floor/plating/ground/desertdam/asphalt/autosmooth + name = "concrete" + icon = 'icons/turf/floors/asphalt-regular.dmi' + icon_state = "asphalt-icon" + smoothing_flags = SMOOTH_BITMASK + smoothing_groups = list(SMOOTH_GROUP_ASPHALT) + canSmoothWith = list( + SMOOTH_GROUP_ASPHALT, + ) + base_icon_state = "asphalt-regular" + +/turf/open/floor/plating/ground/desertdam/asphalt/autosmooth/alt + icon = 'icons/turf/floors/asphalt-sunbleached.dmi' + base_icon_state = "aasphalt-sunbleached" //CAVE /turf/open/floor/plating/ground/desertdam/cave @@ -412,3 +427,20 @@ mediumxenofootstep = FOOTSTEP_CONCRETE barefootstep = FOOTSTEP_CONCRETE shoefootstep = FOOTSTEP_CONCRETE + +///These are entirely for decoration purposes, do not make them functional, it will cause salt. +/turf/open/floor/chasm + name = "chasm" + desc = "Watch your step." + icon = 'icons/turf/floors/chasms.dmi' + icon_state = "chasms-0" + base_icon_state = "chasms" + smoothing_flags = SMOOTH_BITMASK + smoothing_groups = list(SMOOTH_GROUP_TURF_CHASM) + canSmoothWith = list(SMOOTH_GROUP_TURF_CHASM) + density = TRUE //keep people from stepping on it + +/turf/open/floor/chasm/junglechasm + icon = 'icons/turf/floors/junglechasm.dmi' + icon_state = "junglechasm-0" + base_icon_state = "junglechasm" diff --git a/code/game/turfs/floor_types.dm b/code/game/turfs/floor_types.dm index ee826f2156318..6561f58d72292 100644 --- a/code/game/turfs/floor_types.dm +++ b/code/game/turfs/floor_types.dm @@ -20,9 +20,18 @@ /turf/open/floor/mainship/plate/outline icon_state = "test_floor5" +/turf/open/floor/mainship/hexagon + icon_state = "hexagon" + /turf/open/floor/mainship/cargo icon_state = "cargo" +/turf/open/floor/mainship/yellow_cargo + icon_state = "yellow_cargo" + +/turf/open/floor/mainship/yellow_cargo/arrow + icon_state = "yellow_cargo_arrow" + /turf/open/floor/mainship/cargo/arrow icon_state = "cargo_arrow" @@ -444,6 +453,8 @@ if(iscrowbar(I)) // Prevent generation of infinite 'floor_tile' objs caused by the overridden make_plating() above never clearing the var return . = ..() + if(.) + return if(iswrench(I)) user.visible_message(span_notice("[user] starts removing [src]'s protective cover."), @@ -904,6 +915,46 @@ /turf/open/floor/carpet/side icon_state = "carpetside" +/turf/open/floor/carpet/blue + icon = 'icons/turf/floors/carpet_blue.dmi' + base_icon_state = "carpet_blue" + icon_state = "carpet_blue-0" + +/turf/open/floor/carpet/black + icon = 'icons/turf/floors/carpet_black.dmi' + base_icon_state = "carpet_black" + icon_state = "carpet_black-0" + +/turf/open/floor/carpet/green + icon = 'icons/turf/floors/carpet_green.dmi' + base_icon_state = "carpet_green" + icon_state = "carpet_green-0" + +/turf/open/floor/carpet/orange + icon = 'icons/turf/floors/carpet_orange.dmi' + base_icon_state = "carpet_orange" + icon_state = "carpet_orange-0" + +/turf/open/floor/carpet/purple + icon = 'icons/turf/floors/carpet_purple.dmi' + base_icon_state = "carpet_purple" + icon_state = "carpet_purple-0" + +/turf/open/floor/carpet/red + icon = 'icons/turf/floors/carpet_red.dmi' + base_icon_state = "carpet_red" + icon_state = "carpet_red-0" + +/turf/open/floor/carpet/cyan + icon = 'icons/turf/floors/carpet_cyan.dmi' + base_icon_state = "carpet_cyan" + icon_state = "carpet_cyan-0" + +/turf/open/floor/carpet/royalblack + icon = 'icons/turf/floors/carpet_royalblack.dmi' + base_icon_state = "carpet_royalblack" + icon_state = "carpet_royalblack-0" + // Start Prison tiles /turf/open/floor/prison diff --git a/code/game/turfs/iron_floor.dm b/code/game/turfs/iron_floor.dm index 82aa6c55c2b4b..ad3a0c9dccb7b 100644 --- a/code/game/turfs/iron_floor.dm +++ b/code/game/turfs/iron_floor.dm @@ -233,8 +233,12 @@ /turf/open/floor/glass name = "glass floor" desc = "Don't jump on it, or do, I'm not your mom." - icon = 'icons/turf/floors.dmi' + icon = 'icons/turf/floors/glass.dmi' icon_state = "glass-0" + base_icon_state = "glass" + smoothing_flags = SMOOTH_BITMASK + smoothing_groups = list(SMOOTH_GROUP_FLOOR_TRANSPARENT_GLASS) + canSmoothWith = list(SMOOTH_GROUP_FLOOR_TRANSPARENT_GLASS) /turf/open/floor/glass/reinforced name = "reinforced glass floor" @@ -242,7 +246,17 @@ icon = 'icons/turf/floors/reinf_glass.dmi' icon_state = "reinf_glass-0" base_icon_state = "reinf_glass" - smoothing_flags = SMOOTH_BITMASK - smoothing_groups = list(SMOOTH_GROUP_FLOOR_TRANSPARENT_GLASS) - canSmoothWith = list(SMOOTH_GROUP_FLOOR_TRANSPARENT_GLASS) +/turf/open/floor/glass/plasma + name = "plasma glass floor" + desc = "Studies by the Nanotrasen Materials Safety Division have not yet determined if this is safe to jump on, do so at your own risk." + icon = 'icons/turf/floors/plasma_glass.dmi' + icon_state = "plasma_glass-0" + base_icon_state = "plasma_glass" + +/turf/open/floor/glass/reinforced/plasma + name = "reinforced plasma glass floor" + desc = "Do jump on it, jump on it while in a mecha, it can take it." + icon = 'icons/turf/floors/reinf_plasma_glass.dmi' + icon_state = "reinf_plasma_glass-0" + base_icon_state = "reinf_plasma_glass" diff --git a/code/game/turfs/liquid_turfs.dm b/code/game/turfs/liquid_turfs.dm index 478141830307f..3b9826febceea 100644 --- a/code/game/turfs/liquid_turfs.dm +++ b/code/game/turfs/liquid_turfs.dm @@ -193,9 +193,6 @@ icon_state = "shallow_water_cave_waterway_edge" // LAVA - -#define LAVA_TILE_BURN_DAMAGE 20 - /turf/open/liquid/lava name = "lava" icon = 'icons/turf/lava.dmi' @@ -214,7 +211,7 @@ . = ..() var/turf/current_turf = get_turf(src) if(current_turf && density) - current_turf.flags_atom |= AI_BLOCKED + current_turf.atom_flags |= AI_BLOCKED /turf/open/liquid/lava/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) . = ..() @@ -232,40 +229,17 @@ if(!burn_stuff()) STOP_PROCESSING(SSobj, src) -/* RUTGMC DELETION, FIRE JUMPING +///Handles burning turf contents or an entering AM. Returns true to keep processing /turf/open/liquid/lava/proc/burn_stuff(AM) - . = FALSE - - var/thing_to_check = src - if (AM) - thing_to_check = list(AM) - for(var/thing in thing_to_check) - if(ismecha(thing)) - var/obj/vehicle/sealed/mecha/burned_mech = thing - burned_mech.take_damage(rand(40, 120), BURN, FIRE) + var/thing_to_check = AM ? list(AM) : src + for(var/atom/thing AS in thing_to_check) + if(thing.lava_act()) . = TRUE - else if(isobj(thing)) - var/obj/O = thing - O.fire_act(10000, 1000) - - else if (isliving(thing)) - var/mob/living/L = thing - - if(L.stat == DEAD) - continue - - if(!L.on_fire || L.getFireLoss() <= 200) - var/damage_amount = max(L.modify_by_armor(LAVA_TILE_BURN_DAMAGE, FIRE), LAVA_TILE_BURN_DAMAGE * 0.3) //snowflakey interaction to stop complete lava immunity - L.take_overall_damage(damage_amount, BURN, updating_health = TRUE, max_limbs = 3) - if(!CHECK_BITFIELD(L.pass_flags, PASS_FIRE))//Pass fire allow to cross lava without igniting - L.adjust_fire_stacks(20) - L.IgniteMob() - . = TRUE -*/ - /turf/open/liquid/lava/attackby(obj/item/C, mob/user, params) . = ..() + if(.) + return if(istype(C, /obj/item/stack/rods)) var/obj/item/stack/rods/R = C var/turf/open/lavaland/catwalk/H = locate(/turf/open/lavaland/catwalk, src) @@ -281,7 +255,7 @@ ChangeTurf(/turf/open/lavaland/catwalk/built) var/turf/current_turf = get_turf(src) if(current_turf && density) - current_turf.flags_atom &= ~AI_BLOCKED + current_turf.atom_flags &= ~AI_BLOCKED else to_chat(user, span_warning("You need four rods to build a heatproof catwalk.")) return diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm index 99078c58105ba..528eef1675364 100644 --- a/code/game/turfs/open.dm +++ b/code/game/turfs/open.dm @@ -146,6 +146,84 @@ /turf/open/shuttle/dropship/fourteen icon_state = "floor6" +/turf/open/shuttle/dropship/fourteen + icon_state = "rasputin14" + +/turf/open/shuttle/dropship/fifteen + icon_state = "rasputin15" + +/turf/open/shuttle/dropship/sixteen + icon_state = "rasputin16" + +/turf/open/shuttle/dropship/seventeen + icon_state = "rasputin17" + +/turf/open/shuttle/dropship/eighteen + icon_state = "rasputin18" + +/turf/open/shuttle/dropship/nineteen + icon_state = "rasputin19" + +/turf/open/shuttle/dropship/twenty + icon_state = "rasputin20" + +/turf/open/shuttle/dropship/twentyone + icon_state = "rasputin21" + +/turf/open/shuttle/dropship/twentytwo + icon_state = "rasputin22" + +/turf/open/shuttle/dropship/twentythree + icon_state = "rasputin23" + +/turf/open/shuttle/dropship/twentyfour + icon_state = "rasputin24" + +/turf/open/shuttle/dropship/twentyfive + icon_state = "rasputin25" + +/turf/open/shuttle/dropship/twentysix + icon_state = "rasputin26" + +/turf/open/shuttle/dropship/twentyseven + icon_state = "rasputin27" + +/turf/open/shuttle/dropship/twentyeight + icon_state = "rasputin28" + +/turf/open/shuttle/dropship/twentynine + icon_state = "rasputin29" + +/turf/open/shuttle/dropship/thirty + icon_state = "rasputin30" + +/turf/open/shuttle/dropship/thirtyone + icon_state = "rasputin31" + +/turf/open/shuttle/dropship/thirtytwo + icon_state = "rasputin32" + +/turf/open/shuttle/dropship/thirtythree + icon_state = "rasputin33" + +/turf/open/shuttle/dropship/thirtyfour + icon_state = "rasputin34" + +/turf/open/shuttle/dropship/thirtyfive + icon_state = "rasputin35" + +/turf/open/shuttle/dropship/thirtysix + icon_state = "rasputin36" + +/turf/open/shuttle/dropship/thirtyseven + icon_state = "rasputin37" + +/turf/open/shuttle/dropship/thirtyeight + icon_state = "rasputin38" + +/turf/open/shuttle/dropship/thirtynine + icon_state = "rasputin39" + /turf/open/shuttle/dropship/grating icon = 'icons/turf/elevator.dmi' icon_state = "floor_grating" @@ -295,20 +373,20 @@ /turf/open/lavaland/catwalk/built var/deconstructing = FALSE -/turf/open/lavaland/catwalk/built/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) - if(X.status_flags & INCORPOREAL) +/turf/open/lavaland/catwalk/built/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) + if(xeno_attacker.status_flags & INCORPOREAL) return - if(X.a_intent != INTENT_HARM) + if(xeno_attacker.a_intent != INTENT_HARM) return if(deconstructing) return deconstructing = TRUE - if(!do_after(X, 10 SECONDS, NONE, src, BUSY_ICON_BUILD)) + if(!do_after(xeno_attacker, 10 SECONDS, NONE, src, BUSY_ICON_BUILD)) deconstructing = FALSE return deconstructing = FALSE playsound(src, 'sound/weapons/genhit.ogg', 50, TRUE) var/turf/current_turf = get_turf(src) if(current_turf) - current_turf.flags_atom |= AI_BLOCKED + current_turf.atom_flags |= AI_BLOCKED ChangeTurf(/turf/open/liquid/lava) diff --git a/code/game/turfs/open_ground.dm b/code/game/turfs/open_ground.dm index 679b0c6bf99d6..8854410f7e02a 100644 --- a/code/game/turfs/open_ground.dm +++ b/code/game/turfs/open_ground.dm @@ -8,9 +8,10 @@ var/icon_variants = 1 /turf/open/ground/update_icon_state() + . = ..() if(icon_variants < 2) - return initial(icon_state) - return "[initial(icon_state)]_[rand(1, icon_variants)]" + icon_state = initial(icon_state) + icon_state = "[initial(icon_state)]_[rand(1, icon_variants)]" /turf/open/ground/AfterChange() . = ..() diff --git a/code/game/turfs/plating.dm b/code/game/turfs/plating.dm index d985d51b26c5d..e9ed80d4f2311 100644 --- a/code/game/turfs/plating.dm +++ b/code/game/turfs/plating.dm @@ -100,6 +100,8 @@ /turf/open/floor/plating/plating_catwalk/attackby(obj/item/I, mob/user) . = ..() + if(.) + return if(iscrowbar(I)) if(covered) var/obj/item/stack/catwalk/R = new(user.loc) @@ -114,8 +116,6 @@ covered = TRUE update_turf_overlay() return - return ..() - /turf/open/floor/plating/plating_catwalk/prison icon = 'icons/turf/prison.dmi' diff --git a/code/game/turfs/snow.dm b/code/game/turfs/snow.dm index 7aa17da86e9fa..8e87c8aae64b8 100644 --- a/code/game/turfs/snow.dm +++ b/code/game/turfs/snow.dm @@ -6,7 +6,7 @@ /turf/open/floor/plating/ground/snow name = "snow layer" icon = 'icons/turf/snow2.dmi' - icon_state = "snow_0" + icon_state = "snow_0_1" hull_floor = TRUE shoefootstep = FOOTSTEP_SNOW barefootstep = FOOTSTEP_SNOW @@ -16,15 +16,17 @@ /turf/open/floor/plating/ground/snow/Initialize(mapload) . = ..() RegisterSignal(src, COMSIG_ATOM_ACIDSPRAY_ACT, PROC_REF(acidspray_act)) - update_icon(TRUE,TRUE) //Update icon and sides on start, but skip nearby check for turfs. + update_appearance() + update_sides() // Melting snow /turf/open/floor/plating/ground/snow/fire_act(exposed_temperature, exposed_volume) slayer = 0 - update_icon(TRUE, FALSE) + update_appearance() + update_sides() //Xenos digging up snow -/turf/open/floor/plating/ground/snow/attack_alien(mob/living/carbon/xenomorph/M, damage_amount = M.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) +/turf/open/floor/plating/ground/snow/attack_alien(mob/living/carbon/xenomorph/M, damage_amount = M.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = 0, isrightclick = FALSE) if(M.status_flags & INCORPOREAL) return @@ -46,11 +48,14 @@ M.visible_message(span_notice("\The [M] clears out \the [src]."), \ span_notice("We clear out \the [src]."), null, 5) slayer = 0 - update_icon(TRUE, FALSE) + update_appearance() + update_sides() //PLACING/REMOVING/BUILDING /turf/open/floor/plating/ground/snow/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return //Light Stick if(istype(I, /obj/item/lightstick)) var/obj/item/lightstick/L = I @@ -79,14 +84,13 @@ var/mob/living/carbon/xenomorph/xeno = arrived if(xeno.is_charging >= CHARGE_ON) // chargers = snow plows slayer = 0 - update_icon(TRUE, FALSE) + update_appearance() + update_sides() return ..() -//Update icon -/turf/open/floor/plating/ground/snow/update_icon(update_full, skip_sides) - icon_state = "snow_[slayer]" - setDir(pick(GLOB.alldirs)) +/turf/open/floor/plating/ground/snow/update_name(updates) + . = ..() switch(slayer) if(0) name = "dirt floor" @@ -97,48 +101,50 @@ if(3) name = "very deep [initial(name)]" - //Update the side overlays - if(update_full) - var/turf/open/T - if(!skip_sides) - for(var/dirn in GLOB.alldirs) - var/turf/open/floor/plating/ground/snow/D = get_step(src,dirn) - if(istype(D)) - //Update turfs that are near us, but only once - D.update_icon(TRUE, TRUE) - - overlays.Cut() - - for(var/dirn in GLOB.alldirs) - T = get_step(src, dirn) - if(istype(T)) - if(slayer > T.slayer && T.slayer < 1) - var/image/I = new('icons/turf/snow2.dmi', "snow_[(dirn & (dirn-1)) ? "outercorner" : pick("innercorner", "outercorner")]", dir = dirn) - switch(dirn) - if(NORTH) - I.pixel_y = 32 - if(SOUTH) - I.pixel_y = -32 - if(EAST) - I.pixel_x = 32 - if(WEST) - I.pixel_x = -32 - if(NORTHEAST) - I.pixel_x = 32 - I.pixel_y = 32 - if(SOUTHEAST) - I.pixel_x = 32 - I.pixel_y = -32 - if(NORTHWEST) - I.pixel_x = -32 - I.pixel_y = 32 - if(SOUTHWEST) - I.pixel_x = -32 - I.pixel_y = -32 - - I.layer = layer + 0.001 + slayer * 0.0001 - overlays += I +/turf/open/floor/plating/ground/snow/update_overlays() + . = ..() + for(var/dirn in GLOB.alldirs) + var/turf/open/T = get_step(src, dirn) + if(!isopenturf(T)) + continue + if(slayer > T.slayer && T.slayer < 1) + var/image/I = new('icons/turf/snow2.dmi', "snow_[(dirn & (dirn-1)) ? "outercorner" : pick("innercorner", "outercorner")]", dir = dirn) + switch(dirn) + if(NORTH) + I.pixel_y = 32 + if(SOUTH) + I.pixel_y = -32 + if(EAST) + I.pixel_x = 32 + if(WEST) + I.pixel_x = -32 + if(NORTHEAST) + I.pixel_x = 32 + I.pixel_y = 32 + if(SOUTHEAST) + I.pixel_x = 32 + I.pixel_y = -32 + if(NORTHWEST) + I.pixel_x = -32 + I.pixel_y = 32 + if(SOUTHWEST) + I.pixel_x = -32 + I.pixel_y = -32 + + I.layer = layer + 0.001 + slayer * 0.0001 + . += I + +/turf/open/floor/plating/ground/snow/update_icon_state() + . = ..() + icon_state = "snow_[slayer]_[rand(1,8)]" +///Fully update all the turfs around us +/turf/open/floor/plating/ground/snow/proc/update_sides() + for(var/dirn in GLOB.alldirs) + var/turf/open/floor/plating/ground/snow/D = get_step(src,dirn) + if(istype(D)) + //Update turfs that are near us, but only once + D.update_appearance(ALL) /* RUTGMC DELETION //Explosion act @@ -154,7 +160,8 @@ if(slayer && prob(20)) slayer = max(slayer - 1, 0) - update_icon(TRUE, FALSE) + update_appearance() + update_sides() return ..() */ @@ -171,7 +178,8 @@ if(25 to INFINITY) slayer = 0 - update_icon(TRUE, FALSE) + update_appearance() + update_sides() /turf/open/floor/plating/ground/snow/proc/acidspray_act() SIGNAL_HANDLER @@ -180,25 +188,26 @@ return slayer = max(0, slayer - 1) //Melt a layer - update_icon(TRUE, FALSE) + update_appearance() + update_sides() //SNOW LAYERS-----------------------------------// /turf/open/floor/plating/ground/snow/layer0 - icon_state = "snow_0" + icon_state = "snow_0_1" slayer = 0 minimap_color = MINIMAP_DIRT /turf/open/floor/plating/ground/snow/layer1 - icon_state = "snow_1" + icon_state = "snow_1_1" slayer = 1 /turf/open/floor/plating/ground/snow/layer2 - icon_state = "snow_2" + icon_state = "snow_2_1" slayer = 2 /turf/open/floor/plating/ground/snow/layer3 - icon_state = "snow_3" + icon_state = "snow_3_1" slayer = 3 diff --git a/code/game/turfs/space.dm b/code/game/turfs/space.dm index 7cb0bdea06775..dc4d6f1ea1681 100644 --- a/code/game/turfs/space.dm +++ b/code/game/turfs/space.dm @@ -33,9 +33,9 @@ */ /turf/open/space/Initialize(mapload, ...) SHOULD_CALL_PARENT(FALSE) //prevent laggies - if(flags_atom & INITIALIZED) + if(atom_flags & INITIALIZED) stack_trace("Warning: [src]([type]) initialized multiple times!") - ENABLE_BITFIELD(flags_atom, INITIALIZED) + ENABLE_BITFIELD(atom_flags, INITIALIZED) icon_state = SPACE_ICON_STATE(x, y, z) return INITIALIZE_HINT_NORMAL @@ -55,6 +55,8 @@ /turf/open/space/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/stack/rods)) var/obj/structure/lattice/L = locate(/obj/structure/lattice) in src diff --git a/code/game/turfs/space/transit.dm b/code/game/turfs/space/transit.dm index 3b9250e8e1462..2e46ef3ffacb2 100644 --- a/code/game/turfs/space/transit.dm +++ b/code/game/turfs/space/transit.dm @@ -89,9 +89,11 @@ transform = turn(matrix(), get_transit_angle(src)) /turf/open/space/transit/update_icon_state() + . = ..() icon_state = "speedspace_ns_[get_transit_state(src, available_icon_state_amounts)]" /turf/open/space/transit/atmos/update_icon_state() + . = ..() icon_state = "Cloud_[get_transit_state(src, available_icon_state_amounts)]" /proc/get_transit_state(turf/T, available_icon_state_amounts) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 05495684ea185..a0386837b5c79 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -59,9 +59,9 @@ /turf/Initialize(mapload) SHOULD_CALL_PARENT(FALSE) // anti laggies - if(flags_atom & INITIALIZED) + if(atom_flags & INITIALIZED) stack_trace("Warning: [src]([type]) initialized multiple times!") - ENABLE_BITFIELD(flags_atom, INITIALIZED) + ENABLE_BITFIELD(atom_flags, INITIALIZED) // by default, vis_contents is inherited from the turf that was here before vis_contents.Cut() @@ -130,7 +130,7 @@ B.vars[I] = null return QDEL_HINT_IWILLGC visibilityChanged() - DISABLE_BITFIELD(flags_atom, INITIALIZED) + DISABLE_BITFIELD(atom_flags, INITIALIZED) soft_armor = null hard_armor = null QDEL_NULL(current_acid) @@ -180,7 +180,7 @@ return TRUE //We've entered the tile and gotten entangled inside it. if(QDELETED(mover)) //Mover deleted from Cross/CanPass, do not proceed. return FALSE - else if(!firstbump || ((thing.layer > firstbump.layer || thing.flags_atom & ON_BORDER) && !(firstbump.flags_atom & ON_BORDER))) + else if(!firstbump || ((thing.layer > firstbump.layer || thing.atom_flags & ON_BORDER) && !(firstbump.atom_flags & ON_BORDER))) firstbump = thing if(QDELETED(mover)) //Mover deleted from Cross/CanPass/Bump, do not proceed. return FALSE @@ -219,7 +219,7 @@ /turf/proc/levelupdate() for(var/obj/O in src) - if(O.flags_atom & INITIALIZED) + if(O.atom_flags & INITIALIZED) SEND_SIGNAL(O, COMSIG_OBJ_HIDE, intact_tile) @@ -534,7 +534,7 @@ */ /turf/proc/check_disallow_alien_fortification(mob/living/builder, silent = FALSE) var/area/ourarea = loc - if(ourarea.flags_area & DISALLOW_WEEDING) + if(ourarea.area_flags & DISALLOW_WEEDING) if(!silent) to_chat(builder, span_warning("We cannot build in this area before the talls are out!")) return FALSE @@ -574,6 +574,9 @@ if(P.chair_state != DROPSHIP_CHAIR_BROKEN) has_obstacle = TRUE break + if(istype(O, /obj/structure/bed/chair/dropship/doublewide)) + has_obstacle = TRUE + break else if(istype(O, /obj/structure/bed/nest)) //We don't care about other beds/chairs/whatever the fuck. has_obstacle = TRUE break @@ -585,7 +588,7 @@ has_obstacle = TRUE break - if(O.density && !(O.flags_atom & ON_BORDER)) + if(O.density && !(O.atom_flags & ON_BORDER)) has_obstacle = TRUE break @@ -684,7 +687,7 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list( var/turf/newT if(flags & CHANGETURF_SKIP) // We haven't been initialized - if(flags_atom & INITIALIZED) + if(atom_flags & INITIALIZED) stack_trace("CHANGETURF_SKIP was used in a PlaceOnTop call for a turf that's initialized. This is a mistake. [src]([type])") assemble_baseturfs() if(fake_turf_type) @@ -781,7 +784,7 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list( // Removes all signs of lattice on the pos of the turf -Donkieyo /turf/proc/RemoveLattice() var/obj/structure/lattice/L = locate(/obj/structure/lattice, src) - if(L && (L.flags_atom & INITIALIZED)) + if(L && (L.atom_flags & INITIALIZED)) qdel(L) // A proc in case it needs to be recreated or badmins want to change the baseturfs @@ -897,25 +900,25 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list( switch(severity) if(EXPLODE_DEVASTATE) SSexplosions.highMovAtom[thing_in_turf] += list(src) - if(thing_in_turf.flags_atom & PREVENT_CONTENTS_EXPLOSION) + if(thing_in_turf.atom_flags & PREVENT_CONTENTS_EXPLOSION) continue for(var/a in thing_in_turf.contents) SSexplosions.highMovAtom[a] += list(src) if(EXPLODE_HEAVY) SSexplosions.medMovAtom[thing_in_turf] += list(src) - if(thing_in_turf.flags_atom & PREVENT_CONTENTS_EXPLOSION) + if(thing_in_turf.atom_flags & PREVENT_CONTENTS_EXPLOSION) continue for(var/a in thing_in_turf.contents) SSexplosions.medMovAtom[a] += list(src) if(EXPLODE_LIGHT) SSexplosions.lowMovAtom[thing_in_turf] += list(src) - if(thing_in_turf.flags_atom & PREVENT_CONTENTS_EXPLOSION) + if(thing_in_turf.atom_flags & PREVENT_CONTENTS_EXPLOSION) continue for(var/a in thing_in_turf.contents) SSexplosions.lowMovAtom[a] += list(src) if(EXPLODE_WEAK) SSexplosions.weakMovAtom[thing_in_turf] += list(src) - if(thing_in_turf.flags_atom & PREVENT_CONTENTS_EXPLOSION) + if(thing_in_turf.atom_flags & PREVENT_CONTENTS_EXPLOSION) continue for(var/a in thing_in_turf.contents) SSexplosions.weakMovAtom[a] += list(src) diff --git a/code/game/turfs/walls/r_wall.dm b/code/game/turfs/walls/r_wall.dm index 670207fe4a80a..1b5d130234e2a 100644 --- a/code/game/turfs/walls/r_wall.dm +++ b/code/game/turfs/walls/r_wall.dm @@ -13,6 +13,8 @@ walltype = "rwall" explosion_block = 4 + soft_armor = list(MELEE = 0, BULLET = 80, LASER = 80, ENERGY = 100, BOMB = 0, BIO = 0, FIRE = 0, ACID = 0) + /turf/closed/wall/r_wall/get_acid_delay() return 10 SECONDS diff --git a/code/game/turfs/walls/resin.dm b/code/game/turfs/walls/resin.dm index 3f3d0e97fca59..b2e857ff65395 100644 --- a/code/game/turfs/walls/resin.dm +++ b/code/game/turfs/walls/resin.dm @@ -15,9 +15,13 @@ smoothing_flags = SMOOTH_BITMASK smoothing_groups = list(SMOOTH_GROUP_XENO_STRUCTURES) canSmoothWith = list(SMOOTH_GROUP_XENO_STRUCTURES) - soft_armor = list(MELEE = 0, BULLET = 70, LASER = 60, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 0, ACID = 0) + soft_armor = list(MELEE = 0, BULLET = 80, LASER = 75, ENERGY = 75, BOMB = 0, BIO = 0, FIRE = 0, ACID = 0) + hard_armor = list(MELEE = 0, BULLET = 15, LASER = 10, ENERGY = 10, BOMB = 0, BIO = 0, FIRE = 0, ACID = 0) resistance_flags = UNACIDABLE + //Used for quickbuild refunding. + var/is_normal_resin_wall = TRUE + /turf/closed/wall/resin/add_debris_element() AddElement(/datum/element/debris, null, -15, 8, 0.7) @@ -86,21 +90,22 @@ take_damage(rand(30, 50), BRUTE, BOMB) /* RUTGMC DELETION -/turf/closed/wall/resin/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) - if(X.status_flags & INCORPOREAL) - return - if(CHECK_BITFIELD(SSticker.mode?.flags_round_type, MODE_ALLOW_XENO_QUICKBUILD) && SSresinshaping.active) - SSresinshaping.quickbuild_points_by_hive[X.hivenumber]++ - take_damage(max_integrity) // Ensure its destroyed +/turf/closed/wall/resin/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) + if(xeno_attacker.status_flags & INCORPOREAL) return - X.visible_message(span_xenonotice("\The [X] starts tearing down \the [src]!"), \ + if(CHECK_BITFIELD(SSticker.mode?.round_type_flags, MODE_ALLOW_XENO_QUICKBUILD) && SSresinshaping.active) + if(is_normal_resin_wall) + SSresinshaping.quickbuild_points_by_hive[xeno_attacker.hivenumber]++ + take_damage(max_integrity) // Ensure its destroyed + return + xeno_attacker.visible_message(span_xenonotice("\The [xeno_attacker] starts tearing down \the [src]!"), \ span_xenonotice("We start to tear down \the [src].")) - if(!do_after(X, 1 SECONDS, NONE, X, BUSY_ICON_GENERIC)) + if(!do_after(xeno_attacker, 1 SECONDS, NONE, xeno_attacker, BUSY_ICON_GENERIC)) return if(!istype(src)) // Prevent jumping to other turfs if do_after completes with the wall already gone return - X.do_attack_animation(src, ATTACK_EFFECT_CLAW) - X.visible_message(span_xenonotice("\The [X] tears down \the [src]!"), \ + xeno_attacker.do_attack_animation(src, ATTACK_EFFECT_CLAW) + xeno_attacker.visible_message(span_xenonotice("\The [xeno_attacker] tears down \the [src]!"), \ span_xenonotice("We tear down \the [src].")) playsound(src, "alien_resin_break", 25) take_damage(max_integrity) // Ensure its destroyed @@ -112,7 +117,7 @@ /turf/closed/wall/resin/attackby(obj/item/I, mob/living/user, params) - if(I.flags_item & NOBLUDGEON || !isliving(user)) + if(I.item_flags & NOBLUDGEON || !isliving(user)) return user.changeNext_move(I.attack_speed) @@ -122,8 +127,10 @@ var/multiplier = 1 if(I.damtype == BURN) //Burn damage deals extra vs resin structures (mostly welders). multiplier += 1 + else if(I.damtype == BRUTE) + multiplier += 0.75 - if(istype(I, /obj/item/tool/pickaxe/plasmacutter) && !user.do_actions) + if(isplasmacutter(I) && !user.do_actions) var/obj/item/tool/pickaxe/plasmacutter/P = I if(P.start_cut(user, name, src, PLASMACUTTER_BASE_COST * PLASMACUTTER_VLOW_MOD)) multiplier += PLASMACUTTER_RESIN_MULTIPLIER @@ -152,14 +159,14 @@ * Regenerating walls that start with lower health, but grow to a much higher hp over time */ /turf/closed/wall/resin/regenerating - max_integrity = 150 + max_integrity = 75 /// Total health possible for a wall after regenerating at max health var/max_upgradable_health = 300 /// How much the walls integrity heals per tick (5 seconds) var/heal_per_tick = 25 /// How much the walls max_integrity increases per tick (5 seconds) - var/max_upgrade_per_tick = 3 + var/max_upgrade_per_tick = 6 /// How long should the wall stop healing for when taking dmg var/cooldown_on_taking_dmg = 30 SECONDS ///Whether we have a timer already to stop from clogging up the timer ss @@ -202,4 +209,27 @@ /* Hivelord walls, they start off stronger */ /turf/closed/wall/resin/regenerating/thick - max_integrity = 250 + max_integrity = 125 + +/turf/closed/wall/resin/regenerating/special + name = "you shouldn't see this" + is_normal_resin_wall = FALSE + +/turf/closed/wall/resin/regenerating/special/bulletproof + name = "bulletproof resin wall" + desc = "Weird slime solidified into a wall. Looks shiny." + soft_armor = list(MELEE = 0, BULLET = 100, LASER = 100, ENERGY = 100, BOMB = 0, BIO = 0, FIRE = 0, ACID = 0) //You aren't damaging this with bullets without alot of AP. + color = COLLOR_WALL_BULLETPROOF + +/turf/closed/wall/resin/regenerating/special/fireproof + name = "fireproof resin wall" + desc = "Weird slime solidified into a wall. Very red." + soft_armor = list(MELEE = 0, BULLET = 80, LASER = 75, ENERGY = 75, BOMB = 0, BIO = 0, FIRE = 200, ACID = 0) + color = COLOR_WALL_FIREPROOF + +/turf/closed/wall/resin/regenerating/special/hardy + name = "hardy resin wall" + desc = "Weird slime soldified into a wall. Looks very strong." + max_upgradable_health = 450 + max_upgrade_per_tick = 12 //Upgrades faster, but if damaged at all it will be put on cooldown still to help against walling in combat. + color = COLOR_WALL_HARDY diff --git a/code/game/turfs/walls/wall_types.dm b/code/game/turfs/walls/wall_types.dm index d33199e9f5a81..5805499cfd637 100644 --- a/code/game/turfs/walls/wall_types.dm +++ b/code/game/turfs/walls/wall_types.dm @@ -244,7 +244,7 @@ return /turf/closed/wall/indestructible/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/tool/pickaxe/plasmacutter)) //needed for user feedback, if not included the user will not receive a message when trying plasma cutter wall/indestructible turfs + if(isplasmacutter(I)) //needed for user feedback, if not included the user will not receive a message when trying plasma cutter wall/indestructible turfs var/obj/item/tool/pickaxe/plasmacutter/P = I to_chat(user, span_warning("[P] can't cut through this!")) return diff --git a/code/game/turfs/walls/walls.dm b/code/game/turfs/walls/walls.dm index da7d61af4f36c..73de916a871c2 100644 --- a/code/game/turfs/walls/walls.dm +++ b/code/game/turfs/walls/walls.dm @@ -16,13 +16,8 @@ var/wall_integrity var/max_integrity = 1000 //Wall will break down to girders if damage reaches this point - var/damage_overlay var/global/damage_overlays[8] - var/current_bulletholes = 0 - var/bullethole_increment = 1 - var/bullethole_state = 0 - var/image/bullethole_overlay base_icon_state = "metal" var/max_temperature = 1800 //K, walls will take damage if they're next to a fire hotter than this @@ -31,6 +26,18 @@ var/obj/effect/acid_hole/acided_hole //the acid hole inside the wall + ///The current number of bulletholes in this turf + var/current_bulletholes = 0 + ///A reference to the current bullethole overlay image, this is added and deleted as needed + var/image/bullethole_overlay + /** + * The variation set we're using + * There are 10 sets and it gets picked randomly the first time a wall is shot + * It corresponds to the first number in the icon_state (bhole_[**bullethole_variation**]_[current_bulletholes]) + * Gets reset to 0 if the wall reaches maximum health, so a new variation is picked when the wall gets shot again + */ + var/bullethole_variation = 0 + smoothing_flags = SMOOTH_BITMASK smoothing_groups = list( SMOOTH_GROUP_CLOSED_TURFS, @@ -59,6 +66,10 @@ visible_message(span_warning("\The [M] is sealed inside the wall as it is built")) qdel(M) +/turf/closed/wall/Destroy(force) + QDEL_NULL(acided_hole) + QDEL_NULL(bullethole_overlay) + return ..() /turf/closed/wall/ChangeTurf(newtype) if(acided_hole) @@ -101,11 +112,11 @@ ..() -/turf/closed/wall/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) - if(X.status_flags & INCORPOREAL) +/turf/closed/wall/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) + if(xeno_attacker.status_flags & INCORPOREAL) return - if(acided_hole && (X.mob_size == MOB_SIZE_BIG || X.xeno_caste.caste_flags & CASTE_IS_STRONG)) //Strong and/or big xenos can tear open acided walls - acided_hole.expand_hole(X) + if(acided_hole && (xeno_attacker.mob_size == MOB_SIZE_BIG || xeno_attacker.xeno_caste.caste_flags & CASTE_IS_STRONG)) //Strong and/or big xenos can tear open acided walls + acided_hole.expand_hole(xeno_attacker) else return ..() @@ -150,81 +161,45 @@ if(7) . += span_info("The inner sheath is gone. A blowtorch should finish off this wall.") -#define BULLETHOLE_STATES 10 //How many variations of bullethole patterns there are -#define BULLETHOLE_MAX 8 * 3 //Maximum possible bullet holes. -//Formulas. These don't need to be defines, but helpful green. Should likely reuse these for a base 8 icon system. -#define cur_increment(v) round((v-1)/8)+1 -#define base_dir(v,i) v-(i-1)*8 -#define cur_dir(v) round(v+round(v)/3) +/turf/closed/wall/update_overlays() + . = ..() + if(wall_integrity == max_integrity) + current_bulletholes = 0 + bullethole_variation = 0 + QDEL_NULL(bullethole_overlay) + return -/turf/closed/wall/update_icon() if(!damage_overlays[1]) //list hasn't been populated - generate_overlays() - - if(wall_integrity == max_integrity) //If the thing was healed for damage; otherwise update_icon() won't run at all, unless it was strictly damaged. - overlays.Cut() - damage_overlay = initial(damage_overlay) - current_bulletholes = initial(current_bulletholes) - bullethole_increment = initial(current_bulletholes) - bullethole_state = initial(current_bulletholes) - qdel(bullethole_overlay) - bullethole_overlay = null - return + var/alpha_inc = 256 / length(damage_overlays) - var/overlay = round((max_integrity - wall_integrity) / max_integrity * length(damage_overlays)) + 1 - if(overlay > length(damage_overlays)) overlay = length(damage_overlays) + for(var/i = 1; i <= length(damage_overlays); i++) + var/image/img = image(icon = 'icons/turf/walls.dmi', icon_state = "overlay_damage") + img.blend_mode = BLEND_MULTIPLY + img.alpha = (i * alpha_inc) - 1 + damage_overlays[i] = img - if(!damage_overlay || overlay != damage_overlay) - overlays -= damage_overlays[damage_overlay] - damage_overlay = overlay - overlays += damage_overlays[damage_overlay] + var/overlay = round((max_integrity - wall_integrity) / max_integrity * length(damage_overlays)) + 1 + if(overlay > length(damage_overlays)) + overlay = length(damage_overlays) - if(current_bulletholes > BULLETHOLE_MAX) //Could probably get away with a unique layer, but let's keep it standardized. - overlays -= bullethole_overlay //We need this to be the top layer, no matter what, but only if the layer is at max bulletholes. - overlays += bullethole_overlay + . += damage_overlays[overlay] if(current_bulletholes && current_bulletholes <= BULLETHOLE_MAX) - overlays -= bullethole_overlay - if(!bullethole_overlay) - bullethole_state = rand(1, BULLETHOLE_STATES) - bullethole_overlay = image('icons/effects/bulletholes.dmi', src, "bhole_[bullethole_state]_[bullethole_increment]") - //for(var/mob/M in view(7)) to_chat(M, bullethole_overlay) - if(cur_increment(current_bulletholes) > bullethole_increment) bullethole_overlay.icon_state = "bhole_[bullethole_state]_[++bullethole_increment]" - - var/base_direction = base_dir(current_bulletholes,bullethole_increment) - var/current_direction = cur_dir(base_direction) - setDir(current_direction) - /*Hack. Image overlays behave as the parent object, so that means they are also attached to it and follow its directional. - Luckily, it doesn't matter what direction the walls are set to, they link together via icon_state it seems. - But I haven't thoroughly tested it.*/ - overlays += bullethole_overlay - //to_chat(world, span_debuginfo("Increment: [bullethole_increment], Direction: [current_direction]")) - -#undef BULLETHOLE_STATES -#undef BULLETHOLE_MAX -#undef cur_increment -#undef base_dir -#undef cur_dir - -/turf/closed/wall/proc/generate_overlays() - var/alpha_inc = 256 / length(damage_overlays) - - for(var/i = 1; i <= length(damage_overlays); i++) - var/image/img = image(icon = 'icons/turf/walls.dmi', icon_state = "overlay_damage") - img.blend_mode = BLEND_MULTIPLY - img.alpha = (i * alpha_inc) - 1 - damage_overlays[i] = img + if(!bullethole_variation) + bullethole_variation = rand(1, BULLETHOLE_STATES) + bullethole_overlay = image('icons/effects/bulletholes.dmi', src, "bhole_[bullethole_variation]_[current_bulletholes]") + . += bullethole_overlay ///Applies damage to the wall -/turf/closed/wall/proc/take_damage(damage_amount, damage_type = BRUTE, damage_flag = "", armour_penetration = 0) +/turf/closed/wall/proc/take_damage(damage_amount, damage_type = BRUTE, armor_type = null, armour_penetration = 0) if(resistance_flags & INDESTRUCTIBLE) //Hull is literally invincible return if(!damage_amount) return - if(damage_flag) - damage_amount = modify_by_armor(damage_amount, damage_flag, armour_penetration) + if(armor_type) + damage_amount = modify_by_armor(damage_amount, armor_type, armour_penetration) wall_integrity = max(0, wall_integrity - damage_amount) @@ -315,6 +290,8 @@ /turf/closed/wall/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(!ishuman(user)) to_chat(user, span_warning("You don't have the dexterity to do this!")) @@ -353,7 +330,7 @@ else if(resistance_flags & INDESTRUCTIBLE) to_chat(user, "[span_warning("[src] is much too tough for you to do anything to it with [I]")].") - else if(istype(I, /obj/item/tool/pickaxe/plasmacutter) && !user.do_actions) + else if(isplasmacutter(I) && !user.do_actions) return else if(wall_integrity < max_integrity && iswelder(I)) @@ -522,3 +499,34 @@ /turf/closed/wall/dissolvability(acid_strength) return 0.5 + +/turf/closed/wall/grab_interact(obj/item/grab/grab, mob/user, base_damage = BASE_WALL_SLAM_DAMAGE, is_sharp = FALSE) + if(!isliving(grab.grabbed_thing)) + return + + var/mob/living/grabbed_mob = grab.grabbed_thing + step_towards(grabbed_mob, src) + var/damage = (user.skills.getRating(SKILL_CQC) * CQC_SKILL_DAMAGE_MOD) + var/state = user.grab_state + switch(state) + if(GRAB_PASSIVE) + damage += base_damage + grabbed_mob.visible_message(span_warning("[user] slams [grabbed_mob] against [src]!")) + log_combat(user, grabbed_mob, "slammed", "", "against [src]") + if(GRAB_AGGRESSIVE) + damage += base_damage * 1.5 + grabbed_mob.visible_message(span_danger("[user] bashes [grabbed_mob] against [src]!")) + log_combat(user, grabbed_mob, "bashed", "", "against [src]") + if(prob(50)) + grabbed_mob.Paralyze(2 SECONDS) + user.drop_held_item() + if(GRAB_NECK) + damage += base_damage * 2 + grabbed_mob.visible_message(span_danger("[user] crushes [grabbed_mob] against [src]!")) + log_combat(user, grabbed_mob, "crushed", "", "against [src]") + grabbed_mob.Paralyze(2 SECONDS) + user.drop_held_item() + grabbed_mob.apply_damage(damage, blocked = MELEE, updating_health = TRUE) + take_damage(damage, BRUTE, MELEE) + playsound(src, 'sound/weapons/heavyhit.ogg', 40) + return TRUE diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm index be8f8fb6b3253..9a5e144de5ab5 100644 --- a/code/modules/admin/admin_ranks.dm +++ b/code/modules/admin/admin_ranks.dm @@ -82,6 +82,8 @@ flag = R_DBRANKS if("LOG") flag = R_LOG + if("POLLS") + flag = R_POLLS if("EVERYTHING") flag = R_EVERYTHING if("@") diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 5d136bb5acf61..9ca6f86458135 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -196,6 +196,14 @@ log_admin("[key_name(usr)] revived [key_name(L)].") message_admins("[ADMIN_TPMONTY(usr)] revived [ADMIN_TPMONTY(L)].") +/client/proc/cmd_admin_check_contents(mob/living/M in GLOB.mob_list) + set category = "Debug" + set name = "Check Contents" + + var/list/L = M.GetAllContents() + for(var/t in L) + to_chat(usr, "[t] [ADMIN_VV(t)] [ADMIN_TAG(t)]", confidential = TRUE) + SSblackbox.record_feedback("tally", "admin_verb", 1, "Check Contents") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! /datum/admins/proc/toggle_sleep(mob/living/L in GLOB.mob_living_list) set category = null @@ -615,6 +623,17 @@ else if(C.mob.stat == DEAD && (C.prefs.toggles_chat & CHAT_DEAD)) to_chat(C, msg) +/client/proc/object_say(obj/O in world) + set category = "Admin" + set name = "OSay" + set desc = "Makes an object say something." + var/message = tgui_input_text(usr, "What do you want the message to be?", "Make Sound", encode = FALSE) + if(!message) + return + O.say(message, sanitize = FALSE) + log_admin("[key_name(usr)] made [O] at [AREACOORD(O)] say \"[message]\"") + message_admins(span_adminnotice("[key_name_admin(usr)] made [O] at [AREACOORD(O)]. say \"[message]\"")) + SSblackbox.record_feedback("tally", "admin_verb", 1, "Object Say") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! /datum/admins/proc/jump() set category = "Admin" @@ -1213,11 +1232,11 @@ if(!check_rights(R_ADMIN)) return - for(var/obj/vehicle/multitile/root/cm_armored/CA AS in GLOB.tank_list) - CA.remove_all_players() + for(var/obj/vehicle/sealed/armored/armor AS in GLOB.tank_list) + armor.dump_mobs(TRUE) - log_admin("[key_name(usr)] forcibly removed all players from [CA].") - message_admins("[ADMIN_TPMONTY(usr)] forcibly removed all players from [CA].") + log_admin("[key_name(usr)] forcibly removed all players from [armor].") + message_admins("[ADMIN_TPMONTY(usr)] forcibly removed all players from [armor].") /// Admin verb to delete a squad completely /datum/admins/proc/delete_squad() diff --git a/code/modules/admin/callproc.dm b/code/modules/admin/callproc.dm index d17d109c55395..f26b0ee09e72e 100644 --- a/code/modules/admin/callproc.dm +++ b/code/modules/admin/callproc.dm @@ -86,185 +86,102 @@ GLOBAL_PROTECT(AdminProcCallHandler) usr = lastusr handler.remove_caller(user) -GLOBAL_VAR(AdminProcCaller) -GLOBAL_PROTECT(AdminProcCaller) -GLOBAL_VAR_INIT(AdminProcCallCount, FALSE) -GLOBAL_PROTECT(AdminProcCallCount) -GLOBAL_VAR(LastAdminCalledTargetRef) -GLOBAL_PROTECT(LastAdminCalledTargetRef) -GLOBAL_VAR(LastAdminCalledTarget) -GLOBAL_PROTECT(LastAdminCalledTarget) -GLOBAL_VAR(LastAdminCalledProc) -GLOBAL_PROTECT(LastAdminCalledProc) -GLOBAL_LIST_EMPTY(AdminProcCallSpamPrevention) -GLOBAL_PROTECT(AdminProcCallSpamPrevention) - - -/datum/admins/proc/proccall_atom(datum/A as null|area|mob|obj|turf) - set category = null - set name = "Atom ProcCall" - set waitfor = FALSE - - if(!check_rights(R_DEBUG)) - return - - /// Holds a reference to the client incase something happens to them - var/client/starting_client = usr.client - - var/procname = input("Proc name, eg: attack_hand", "Proc:", null) as text|null - if(!procname) - return - - if(!hascall(A, procname)) - to_chat(starting_client, "Error: callproc_datum(): type [A.type] has no proc named [procname].") - return - - var/list/lst = starting_client.holder.get_callproc_args() - if(!lst) - return - - if(!A || !IsValidSrc(A)) - to_chat(starting_client, span_warning("Error: callproc_datum(): owner of proc no longer exists.")) - return - - log_admin("[key_name(usr)] called [A]'s [procname]() with [length(lst) ? "the arguments [list2params(lst)]" : "no arguments"].") - message_admins("[ADMIN_TPMONTY(usr)] called [A]'s [procname]() with [length(lst) ? "the arguments [list2params(lst)]" : "no arguments"].") - admin_ticket_log(A, "[key_name_admin(usr)] called [A]'s [procname]() with [length(lst) ? "the arguments [list2params(lst)]" : "no arguments"].") - - var/returnval = WrapAdminProcCall(A, procname, lst) // Pass the lst as an argument list to the proc - . = starting_client.holder.get_callproc_returnval(returnval, procname) - if(.) - to_chat(usr, .) - - -/datum/admins/proc/proccall_advanced() +/client/proc/callproc() set category = "Debug" set name = "Advanced ProcCall" set waitfor = FALSE + callproc_blocking() +/client/proc/callproc_blocking(list/get_retval) if(!check_rights(R_DEBUG)) return - var/datum/target = null - var/targetselected = 0 - var/returnval = null + var/datum/target + var/targetselected = FALSE + var/returnval - switch(alert("Proc owned by something?",, "Yes", "No")) + switch(tgui_alert(usr,"Proc owned by something?",,list("Yes","No"))) if("Yes") targetselected = TRUE - var/list/value = usr.client.vv_get_value(default_class = VV_ATOM_REFERENCE, classes = list(VV_ATOM_REFERENCE, VV_DATUM_REFERENCE, VV_MOB_REFERENCE, VV_CLIENT)) - if(!value["class"] || !value["value"]) + var/list/value = vv_get_value(default_class = VV_ATOM_REFERENCE, classes = list(VV_ATOM_REFERENCE, VV_DATUM_REFERENCE, VV_MOB_REFERENCE, VV_CLIENT, VV_MARKED_DATUM, VV_TEXT_LOCATE, VV_PROCCALL_RETVAL)) + if (!value["class"] || !value["value"]) return target = value["value"] + if(!istype(target)) + to_chat(usr, span_danger("Invalid target."), confidential = TRUE) + return if("No") target = null targetselected = FALSE - var/procname = input("Proc path, eg: /proc/attack_hand(mob/living/user)") - if(!procname) + var/procpath = input("Proc path, eg: /proc/fake_blood","Path:", null) as text|null + if(!procpath) return //strip away everything but the proc name - var/list/proclist = splittext(procname, "/") - if(!length(proclist)) + var/list/proclist = splittext(procpath, "/") + if (!length(proclist)) return - procname = proclist[length(proclist)] - - var/proctype = "proc" - if("verb" in proclist) - proctype = "verb" - + var/procname = proclist[proclist.len] + var/proctype = ("verb" in proclist) ? "verb" :"proc" - var/procpath - if(targetselected && !hascall(target, procname)) - to_chat(usr, - type = MESSAGE_TYPE_DEBUG, - html = "Error: callproc(): type [target.type] has no [proctype] named [procname].",) - return - else if(!targetselected) - procpath = text2path("/[proctype]/[procname]") - if(!procpath) - to_chat(usr, - type = MESSAGE_TYPE_DEBUG, - html = "Error: callproc(): proc [procname] does not exist. (Did you forget the /proc/ part?)") + if(targetselected) + if(!hascall(target, procname)) + to_chat(usr, span_warning("Error: callproc(): type [target.type] has no [proctype] named [procpath]."), confidential = TRUE) + return + else + procpath = "/[proctype]/[procname]" + if(!text2path(procpath)) + to_chat(usr, span_warning("Error: callproc(): [procpath] does not exist."), confidential = TRUE) return - var/list/lst = usr.client.holder.get_callproc_args() + var/list/lst = get_callproc_args() if(!lst) return if(targetselected) if(!target) - to_chat(usr, - type = MESSAGE_TYPE_DEBUG, - html = "Error: callproc(): owner of proc no longer exists.") + to_chat(usr, "Error: callproc(): owner of proc no longer exists.", confidential = TRUE) return - log_admin("[key_name(usr)] called [target]'s [procname]() with [length(lst) ? "the arguments [list2params(lst)]" : "no arguments"].") - message_admins("[ADMIN_TPMONTY(usr)] called [target]'s [procname]() with [length(lst) ? "the arguments [list2params(lst)]" : "no arguments"].") - admin_ticket_log(target, "[key_name(usr)] called [target]'s [procname]() with [length(lst) ? "the arguments [list2params(lst)]" : "no arguments"].") + var/msg = "[key_name(src)] called [target]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"]." + log_admin(msg) + message_admins(msg) //Proccall announce removed. + admin_ticket_log(target, msg) returnval = WrapAdminProcCall(target, procname, lst) // Pass the lst as an argument list to the proc else //this currently has no hascall protection. wasn't able to get it working. - log_admin("[key_name(usr)] called [procname]() with [length(lst) ? "the arguments [list2params(lst)]" : "no arguments"].") - message_admins("[ADMIN_TPMONTY(usr)] called [procname]() with [length(lst) ? "the arguments [list2params(lst)]" : "no arguments"].") - returnval = WrapAdminProcCall(GLOBAL_PROC, procpath, lst) // Pass the lst as an argument list to the proc - - . = usr.client.holder.get_callproc_returnval(returnval, procname) + log_admin("[key_name(src)] called [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"].") + message_admins("[key_name(src)] called [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"].") //Proccall announce removed. + returnval = WrapAdminProcCall(GLOBAL_PROC, procname, lst) // Pass the lst as an argument list to the proc + SSblackbox.record_feedback("tally", "admin_verb", 1, "Advanced ProcCall") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + if(get_retval) + get_retval += returnval + . = get_callproc_returnval(returnval, procname) if(.) - to_chat(usr, .) - - -/datum/admins/proc/get_callproc_returnval(returnval, procname) - . = "" - if(islist(returnval)) - var/list/returnedlist = returnval - . = "" - if(length(returnedlist)) - var/assoc_check = returnedlist[1] - if(istext(assoc_check) && (returnedlist[assoc_check] != null)) - . += "[procname] returned an associative list:" - for(var/key in returnedlist) - . += "\n[key] = [returnedlist[key]]" + to_chat(usr, ., confidential = TRUE) - else - . += "[procname] returned a list:" - for(var/elem in returnedlist) - . += "\n[elem]" - else - . = "[procname] returned an empty list" - . += "" - - else - . = "[procname] returned: [!isnull(returnval) ? returnval : "null"]" - - -/datum/admins/proc/get_callproc_args() - var/argnum = input("Number of arguments", "Number:", 0) as num|null - if(isnull(argnum)) - return - - . = list() - var/list/named_args = list() - while(argnum--) - var/named_arg = input("Leave blank for positional argument. Positional arguments will be considered as if they were added first.", "Named argument") as text|null - var/value = usr.client.vv_get_value(restricted_classes = list(VV_RESTORE_DEFAULT)) - if (!value["class"]) - return - if(named_arg) - named_args[named_arg] = value["value"] - else - . += value["value"] - if(LAZYLEN(named_args)) - . += named_args +GLOBAL_VAR(AdminProcCaller) +GLOBAL_PROTECT(AdminProcCaller) +GLOBAL_VAR_INIT(AdminProcCallCount, FALSE) +GLOBAL_PROTECT(AdminProcCallCount) +GLOBAL_VAR(LastAdminCalledTargetRef) +GLOBAL_PROTECT(LastAdminCalledTargetRef) +GLOBAL_VAR(LastAdminCalledTarget) +GLOBAL_PROTECT(LastAdminCalledTarget) +GLOBAL_VAR(LastAdminCalledProc) +GLOBAL_PROTECT(LastAdminCalledProc) +GLOBAL_LIST_EMPTY(AdminProcCallSpamPrevention) +GLOBAL_PROTECT(AdminProcCallSpamPrevention) +/// Wrapper for proccalls where the datum is flagged as vareditted /proc/WrapAdminProcCall(datum/target, procname, list/arguments) if(target && procname == "Del") - to_chat(usr, "Calling Del() is not allowed") + to_chat(usr, "Calling Del() is not allowed", confidential = TRUE) return if(target != GLOBAL_PROC && !target.CanProcCall(procname)) - to_chat(usr, "Proccall on [target.type]/proc/[procname] is disallowed!") + to_chat(usr, "Proccall on [target.type]/proc/[procname] is disallowed!", confidential = TRUE) return var/current_caller = GLOB.AdminProcCaller var/user_identifier = usr ? usr.client?.ckey : GLOB.AdminProcCaller @@ -276,7 +193,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) CRASH("WrapAdminProcCall with no ckey: [target] [procname] [english_list(arguments)]") if(!is_remote_handler && current_caller && current_caller != user_identifier) - to_chat(usr, span_adminnotice("Another set of admin called procs are still running. Try again later.")) + to_chat(usr, span_adminnotice("Another set of admin called procs are still running. Try again later."), confidential = TRUE) return GLOB.LastAdminCalledProc = procname @@ -293,15 +210,14 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) else . = world.WrapAdminProcCall(target, procname, arguments) - +//adv proc call this, ya nerds /world/proc/WrapAdminProcCall(datum/target, procname, list/arguments) if(target == GLOBAL_PROC) - return call(procname)(arglist(arguments)) + return call("/proc/[procname]")(arglist(arguments)) else if(target != world) return call(target, procname)(arglist(arguments)) else - log_admin_private("[key_name(usr)] attempted to call world/proc/[procname] with arguments: [english_list(arguments)]") - + log_admin("[key_name(usr)] attempted to call world/proc/[procname] with arguments: [english_list(arguments)]") /proc/IsAdminAdvancedProcCall() #ifdef TESTING @@ -309,3 +225,77 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) #else return (GLOB.AdminProcCaller && GLOB.AdminProcCaller == usr?.client?.ckey) || (GLOB.AdminProcCallHandler && usr == GLOB.AdminProcCallHandler) #endif + +/client/proc/callproc_datum(datum/A as null|area|mob|obj|turf) + set category = "Debug" + set name = "Atom ProcCall" + set waitfor = FALSE + + if(!check_rights(R_DEBUG)) + return + + var/procname = input("Proc name, eg: fake_blood","Proc:", null) as text|null + if(!procname) + return + if(!hascall(A,procname)) + to_chat(usr, "Error: callproc_datum(): type [A.type] has no proc named [procname].", confidential = TRUE) + return + var/list/lst = get_callproc_args() + if(!lst) + return + + if(!A || !is_valid_src(A)) + to_chat(usr, span_warning("Error: callproc_datum(): owner of proc no longer exists."), confidential = TRUE) + return + log_admin("[key_name(src)] called [A]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"].") + var/msg = "[key_name(src)] called [A]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"]." + message_admins(msg) + admin_ticket_log(A, msg) + SSblackbox.record_feedback("tally", "admin_verb", 1, "Atom ProcCall") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + + var/returnval = WrapAdminProcCall(A, procname, lst) // Pass the lst as an argument list to the proc + . = get_callproc_returnval(returnval,procname) + if(.) + to_chat(usr, ., confidential = TRUE) + +/client/proc/get_callproc_args() + var/argnum = input("Number of arguments","Number:",0) as num|null + if(isnull(argnum)) + return + + . = list() + var/list/named_args = list() + while(argnum--) + var/named_arg = input("Leave blank for positional argument. Positional arguments will be considered as if they were added first.", "Named argument") as text|null + var/value = vv_get_value(restricted_classes = list(VV_RESTORE_DEFAULT)) + if (!value["class"]) + return + if(named_arg) + named_args[named_arg] = value["value"] + else + . += LIST_VALUE_WRAP_LISTS(value["value"]) + if(LAZYLEN(named_args)) + . += named_args + +/client/proc/get_callproc_returnval(returnval,procname) + . = "" + if(islist(returnval)) + var/list/returnedlist = returnval + . = "" + if(returnedlist.len) + var/assoc_check = returnedlist[1] + if(istext(assoc_check) && (returnedlist[assoc_check] != null)) + . += "[procname] returned an associative list:" + for(var/key in returnedlist) + . += "\n[key] = [returnedlist[key]]" + + else + . += "[procname] returned a list:" + for(var/elem in returnedlist) + . += "\n[elem]" + else + . = "[procname] returned an empty list" + . += "" + + else + . = "[procname] returned: [!isnull(returnval) ? html_encode(returnval) : "null"]" diff --git a/code/modules/admin/debug_verbs.dm b/code/modules/admin/debug_verbs.dm index 58a94264185ac..6112387515e61 100644 --- a/code/modules/admin/debug_verbs.dm +++ b/code/modules/admin/debug_verbs.dm @@ -158,7 +158,7 @@ else for(var/i in 1 to amount) var/atom/A = new chosen(T) - A.flags_atom |= ADMIN_SPAWNED + A.atom_flags |= ADMIN_SPAWNED log_admin("[key_name(usr)] spawned [amount] x [chosen] at [AREACOORD(usr)]") SSblackbox.record_feedback("tally", "admin_verb", 1, "Spawn Atom") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -247,7 +247,7 @@ return var/dat = "
" - for(var/i in L.get_contents()) + for(var/i in L.GetAllContents()) var/atom/A = i dat += "[A] [ADMIN_VV(A)]
" diff --git a/code/modules/admin/fun_verbs.dm b/code/modules/admin/fun_verbs.dm index 9ac5cfc7413a9..26d9ccf0a5d57 100644 --- a/code/modules/admin/fun_verbs.dm +++ b/code/modules/admin/fun_verbs.dm @@ -54,16 +54,19 @@ if(!check_rights(R_FUN)) return - var/customname = tgui_input_text(usr, "What do you want it to be called?.", "Queen Mother Report", "Queen Mother", encode = FALSE) + var/customname = tgui_input_text(usr, "What do you want the title of this report to be?", "Report Title", "Queen Mother Directive", encode = FALSE) var/input = tgui_input_text(usr, "This should be a message from the ruler of the Xenomorph race.", "Queen Mother Report", "", multiline = TRUE, encode = FALSE) if(!input || !customname) return - var/msg = "
[customname]
[span_warning("[input]")]
" for(var/i in (GLOB.xeno_mob_list + GLOB.observer_list)) var/mob/M = i - to_chat(M, msg) + to_chat(M, assemble_alert( + title = customname, + message = input, + color_override = "purple" + )) log_admin("[key_name(usr)] created a Queen Mother report: [input]") message_admins("[ADMIN_TPMONTY(usr)] created a Queen Mother report.") @@ -79,7 +82,7 @@ for(var/mob/living/carbon/xenomorph/xenotorouny in GLOB.xeno_mob_list) if(!isliving(xenotorouny)) return - xenotorouny.is_a_rouny = !xenotorouny.is_a_rouny + xenotorouny.xeno_flags ^= XENO_ROUNY /datum/admins/proc/hive_status() @@ -137,7 +140,9 @@ var/customname = tgui_input_text(usr, "Pick a title for the report.", "Title", "TGMC Update", encode = FALSE) + var/customsubtitle = tgui_input_text(usr, "Pick a subtitle for the report.", "Subtitle", "", encode = FALSE) var/input = tgui_input_text(usr, "Please enter anything you want. Anything. Serious.", "What?", "", multiline = TRUE, encode = FALSE) + var/override = tgui_input_list(usr, "Pick a color for the report.", "Color", faction_alert_colors - "default", default = "blue") if(!input || !customname) return @@ -147,9 +152,9 @@ switch(tgui_alert(usr, "Should this be announced to the general population?", "Announce", list("Yes", "No", "Cancel"))) if("Yes") - priority_announce(input, customname, sound = 'sound/AI/commandreport.ogg'); + priority_announce(input, customname, customsubtitle, sound = 'sound/AI/commandreport.ogg', color_override = override); if("No") - priority_announce("New update available at all communication consoles.", type = ANNOUNCEMENT_COMMAND, sound = 'sound/AI/commandreport.ogg') + priority_announce("New update available at all communication consoles.", "Classified Transmission Received", type = ANNOUNCEMENT_PRIORITY, sound = 'sound/AI/commandreport.ogg') else return @@ -284,8 +289,12 @@ GLOB.custom_info = new_info - to_chat(world, "
Custom Information
") - to_chat(world, span_alert("[GLOB.custom_info]")) + to_chat(world, assemble_alert( + title = "Custom Information", + subtitle = "The following custom information has been set for this round.", + message = GLOB.custom_info, + color_override = "red" + )) log_admin("[key_name(usr)] has changed the custom event text: [GLOB.custom_info]") message_admins("[ADMIN_TPMONTY(usr)] has changed the custom event text.") @@ -299,8 +308,12 @@ to_chat(src, span_notice("There currently is no custom information set.")) return - to_chat(src, "Custom Information
") - to_chat(src, span_alert("[GLOB.custom_info]")) + to_chat(src, assemble_alert( + title = "Custom Information", + subtitle = "The following custom information has been set for this round.", + message = GLOB.custom_info, + color_override = "red" + )) /datum/admins/proc/sound_file(S as sound) @@ -653,7 +666,7 @@ /proc/delayed_detonate_bomb_napalm(turf/impact) impact.ceiling_debris_check(3) explosion(impact, 2, 3, 4, 0, 6) - flame_radius(5, impact, 60, 30) + flame_radius(5, impact, 30, 60) /datum/admins/proc/drop_dynex_bomb() @@ -742,10 +755,10 @@ if(!istype(H)) return - var/hcolor = "#[num2hex(H.r_hair)][num2hex(H.g_hair)][num2hex(H.b_hair)]" - var/fcolor = "#[num2hex(H.r_facial)][num2hex(H.g_facial)][num2hex(H.b_facial)]" - var/ecolor = "#[num2hex(H.r_eyes)][num2hex(H.g_eyes)][num2hex(H.b_eyes)]" - var/bcolor = "#[num2hex(H.r_skin)][num2hex(H.g_skin)][num2hex(H.b_skin)]" + var/hcolor = "#[num2hex(H.r_hair, 2)][num2hex(H.g_hair, 2)][num2hex(H.b_hair, 2)]" + var/fcolor = "#[num2hex(H.r_facial, 2)][num2hex(H.g_facial, 2)][num2hex(H.b_facial, 2)]" + var/ecolor = "#[num2hex(H.r_eyes, 2)][num2hex(H.g_eyes, 2)][num2hex(H.b_eyes, 2)]" + var/bcolor = "#[num2hex(H.r_skin, 2)][num2hex(H.g_skin, 2)][num2hex(H.b_skin, 2)]" var/dat = "" @@ -1093,15 +1106,15 @@ if("Low gravity") to_chat(GLOB.mob_living_list, span_highdanger("You feel gravity pull gently at you.")) for(var/mob/living/living_mob AS in GLOB.mob_living_list) - living_mob.set_jump_component(duration = 1 SECONDS, cooldown = 1.5 SECONDS, cost = 2, height = 32, flags_pass = PASS_LOW_STRUCTURE|PASS_FIRE|PASS_DEFENSIVE_STRUCTURE) + living_mob.set_jump_component(duration = 1 SECONDS, cooldown = 1.5 SECONDS, cost = 2, height = 32, pass_flags = PASS_LOW_STRUCTURE|PASS_FIRE|PASS_DEFENSIVE_STRUCTURE|PASS_TANK) if("John Woo") to_chat(GLOB.mob_living_list, span_highdanger("You feel gravity grow weak, and the urge to fly.")) for(var/mob/living/living_mob AS in GLOB.mob_living_list) - living_mob.set_jump_component(duration = 1 SECONDS, cooldown = 1.5 SECONDS, cost = 2, height = 48, sound = "jump", flags = JUMP_SPIN, flags_pass = HOVERING|PASS_PROJECTILE) + living_mob.set_jump_component(duration = 1 SECONDS, cooldown = 1.5 SECONDS, cost = 2, height = 48, sound = "jump", flags = JUMP_SPIN, pass_flags = HOVERING|PASS_PROJECTILE|PASS_TANK) if("Exceeding orbital velocity") to_chat(GLOB.mob_living_list, span_highdanger("You feel gravity fade to nothing. Will you even come back down?")) for(var/mob/living/living_mob AS in GLOB.mob_living_list) - living_mob.set_jump_component(duration = 4 SECONDS, cooldown = 6 SECONDS, cost = 0, height = 128, sound = "jump", flags = JUMP_SPIN, flags_pass = HOVERING|PASS_PROJECTILE) + living_mob.set_jump_component(duration = 4 SECONDS, cooldown = 6 SECONDS, cost = 0, height = 128, sound = "jump", flags = JUMP_SPIN, pass_flags = HOVERING|PASS_PROJECTILE|PASS_TANK) else return diff --git a/code/modules/admin/holder.dm b/code/modules/admin/holder.dm index 1d9c8020673c7..9ee8dd76126af 100644 --- a/code/modules/admin/holder.dm +++ b/code/modules/admin/holder.dm @@ -22,7 +22,8 @@ var/ghost_interact = FALSE ///Whether this admin is invisiminning var/invisimined = FALSE - + /// A lazylist of tagged datums, for quick reference with the View Tags verb + var/list/tagged_datums /datum/admins/New(datum/admin_rank/R, ckey, protected) if(IsAdminAdvancedProcCall()) @@ -295,6 +296,10 @@ GLOBAL_PROTECT(admin_verbs_default) /datum/admins/proc/toggle_adminhelp_sound, /datum/admins/proc/toggle_prayers, /datum/admins/proc/check_fingerprints, + /datum/admins/proc/display_tags, + /client/proc/mark_datum_mapview, + /client/proc/tag_datum_mapview, + /client/proc/cmd_admin_check_contents, /*displays the contents of an instance*/ /client/proc/smite, /client/proc/show_traitor_panel, /client/proc/cmd_select_equipment, @@ -302,7 +307,8 @@ GLOBAL_PROTECT(admin_verbs_default) /client/proc/private_message_panel, /client/proc/private_message_context, /client/proc/msay, - /client/proc/dsay + /client/proc/dsay, + /client/proc/object_say, ) //GLOBAL_LIST_INIT(admin_verbs_admin, world.AVadmin()) // moved to modular //GLOBAL_PROTECT(admin_verbs_admin) @@ -347,8 +353,8 @@ GLOBAL_PROTECT(admin_verbs_asay) /world/proc/AVdebug() return list( - /datum/admins/proc/proccall_advanced, - /datum/admins/proc/proccall_atom, + /client/proc/callproc, + /client/proc/callproc_datum, /datum/admins/proc/delete_all, /datum/admins/proc/generate_powernets, /datum/admins/proc/debug_mob_lists, @@ -460,7 +466,6 @@ GLOBAL_PROTECT(admin_verbs_server) /world/proc/AVpermissions() return list( /client/proc/edit_admin_permissions, - /client/proc/poll_panel, ) GLOBAL_LIST_INIT(admin_verbs_permissions, world.AVpermissions()) GLOBAL_PROTECT(admin_verbs_permissions) @@ -503,6 +508,13 @@ GLOBAL_PROTECT(admin_verbs_spawn) GLOBAL_LIST_INIT(admin_verbs_log, world.AVlog()) GLOBAL_PROTECT(admin_verbs_log) +/world/proc/AVpolls() + return list( + /client/proc/poll_panel, + ) +GLOBAL_LIST_INIT(admin_verbs_polls, world.AVpolls()) +GLOBAL_PROTECT(admin_verbs_polls) + /client/proc/add_admin_verbs() if(holder) var/rights = holder.rank.rights @@ -537,6 +549,8 @@ GLOBAL_PROTECT(admin_verbs_log) add_verb(src, GLOB.admin_verbs_spawn) if(rights & R_LOG) add_verb(src, GLOB.admin_verbs_log) + if(rights & R_POLLS) + add_verb(src, GLOB.admin_verbs_polls) /client/proc/remove_admin_verbs() diff --git a/code/modules/admin/panels/permission_panel.dm b/code/modules/admin/panels/permission_panel.dm index ee85e8d7219ff..6a8976bb3e6b7 100644 --- a/code/modules/admin/panels/permission_panel.dm +++ b/code/modules/admin/panels/permission_panel.dm @@ -420,14 +420,14 @@ return qdel(query_change_rank_flags) var/log_message = "Permissions of [rank_name] changed from[rights2text(old_flags," ")][rights2text(old_exclude_flags," ", "-")][rights2text(old_can_edit_flags," ", "*")] to[rights2text(new_flags," ")][rights2text(new_exclude_flags," ", "-")][rights2text(new_can_edit_flags," ", "*")]" - var/datum/db_query/query_change_rank_flags_log = SSdbcore.NewQuery({" + var/datum/db_query/query_change_rank_log_flags = SSdbcore.NewQuery({" INSERT INTO [format_table_name("admin_log")] (datetime, round_id, adminckey, adminip, operation, target, log) VALUES (:time, :round_id, :adminckey, INET_ATON(:adminip), 'change rank flags', :rank_name, :log) "}, list("time" = SQLtime(), "round_id" = "[GLOB.round_id]", "adminckey" = usr.ckey, "adminip" = usr.client.address, "rank_name" = rank_name, "log" = log_message)) - if(!query_change_rank_flags_log.warn_execute()) - qdel(query_change_rank_flags_log) + if(!query_change_rank_log_flags.warn_execute()) + qdel(query_change_rank_log_flags) return - qdel(query_change_rank_flags_log) + qdel(query_change_rank_log_flags) for(var/datum/admin_rank/R in GLOB.admin_ranks) if(R.name != D.rank.name) continue diff --git a/code/modules/admin/panels/poll_panel.dm b/code/modules/admin/panels/poll_panel.dm index 065c72e2b6b0b..b6b8f104b895c 100644 --- a/code/modules/admin/panels/poll_panel.dm +++ b/code/modules/admin/panels/poll_panel.dm @@ -1,7 +1,7 @@ /client/proc/poll_panel() set name = "Server Poll Management" set category = "Admin" - if(!check_rights(R_DBRANKS)) + if(!check_rights(R_POLLS)) return holder.poll_list_panel() SSblackbox.record_feedback("tally", "admin_verb", 1, "Server Poll Management") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/admin/server_verbs.dm b/code/modules/admin/server_verbs.dm index 39c2f35433c36..86d67a8a80c09 100644 --- a/code/modules/admin/server_verbs.dm +++ b/code/modules/admin/server_verbs.dm @@ -444,6 +444,9 @@ if(!check_rights(R_SERVER)) return + if(tgui_alert(usr, "Are you sure you want to reload admins?", "Reload admins", list("Yes", "No")) != "Yes") + return + load_admins() log_admin("[key_name(src)] manually reloaded admins.") diff --git a/code/modules/admin/smites/bloodless.dm b/code/modules/admin/smites/bloodless.dm index 4effa3e1f7ce0..22833664bbf27 100644 --- a/code/modules/admin/smites/bloodless.dm +++ b/code/modules/admin/smites/bloodless.dm @@ -15,13 +15,13 @@ to_chat(target, span_userdanger("You feel your skin growing pale as your blood drains away..."), confidential = TRUE) switch (bloodlossamount) - if ("A little") - target.blood_volume = BLOOD_VOLUME_NOT_IDEAL //80% blood - if ("A lot") - target.blood_volume = BLOOD_VOLUME_OKAY //60% blood - if ("So fucking much") - target.blood_volume = BLOOD_VOLUME_BAD //40% blood - if ("FUCK THIS DUDE") - target.blood_volume = BLOOD_VOLUME_SURVIVE //20% blood + if("A little") + target.set_blood_volume(BLOOD_VOLUME_NOT_IDEAL) //80% blood + if("A lot") + target.set_blood_volume(BLOOD_VOLUME_OKAY) //60% blood + if("So fucking much") + target.set_blood_volume(BLOOD_VOLUME_BAD) //40% blood + if("FUCK THIS DUDE") + target.set_blood_volume(BLOOD_VOLUME_SURVIVE) //20% blood #undef BLOOD_VOLUME_NOT_IDEAL diff --git a/code/modules/admin/tag.dm b/code/modules/admin/tag.dm new file mode 100644 index 0000000000000..6e6fa7747cbfb --- /dev/null +++ b/code/modules/admin/tag.dm @@ -0,0 +1,111 @@ +/** + * Inserts the target_datum into [/datum/admins/var/tagged_datums], for later reference. + * + * Arguments: + * * target_datum - The datum you want to create a tag for + */ +/datum/admins/proc/add_tagged_datum(datum/target_datum) + if(LAZYFIND(tagged_datums, target_datum)) + to_chat(owner, span_warning("[target_datum] is already tagged!")) + return + + LAZYADD(tagged_datums, target_datum) + RegisterSignal(target_datum, COMSIG_QDELETING, PROC_REF(handle_tagged_del), override = TRUE) + to_chat(owner, span_notice("[target_datum] has been tagged.")) + +/// Get ahead of the curve with deleting +/datum/admins/proc/handle_tagged_del(datum/source) + SIGNAL_HANDLER + + if(owner) + to_chat(owner, span_boldnotice("Tagged datum [source] ([source.type]) has been deleted.")) + remove_tagged_datum(source, silent = TRUE) + +/** + * Attempts to remove the specified datum from [/datum/admins/var/tagged_datums] if it exists + * + * Arguments: + * * target_datum - The datum you want to remove from the tagged_datums list + * * silent - If TRUE, won't print messages to the owner's chat + */ +/datum/admins/proc/remove_tagged_datum(datum/target_datum, silent=FALSE) + if(!istype(target_datum)) + return + + if(LAZYFIND(tagged_datums, target_datum)) + LAZYREMOVE(tagged_datums, target_datum) + if(!silent) + to_chat(owner, span_notice("[target_datum] has been untagged.")) + else if(!silent) + to_chat(owner, span_warning("[target_datum] was not already tagged.")) + +/// Quick define for readability +#define TAG_DEL(X) "(UNTAG)" +#define TAG_MARK(X) "(MARK)" +#define TAG_SIMPLE_HEALTH(X) "Health: [X.health]" +#define TAG_CARBON_HEALTH(X) "Health: [X.health] (\ + [X.getBruteLoss()] \ + [X.getFireLoss()] \ + [X.getToxLoss()] \ + [X.getOxyLoss()]\ + [X.getCloneLoss() ? " [X.getCloneLoss()]" : ""])" + +/// Display all of the tagged datums +/datum/admins/proc/display_tags() + set category = "Debug" + set name = "View Tags" + + var/datum/admins/holdersrc = src + if (!istype(holdersrc, /datum/admins)) + holdersrc = usr.client.holder + if (!istype(holdersrc, /datum/admins)) + to_chat(usr, "Error: you are not an admin!", confidential = TRUE) + return + holdersrc.index_tags() + +/datum/admins/proc/index_tags() + var/index = 0 + var/list/dat = list("
") + + dat += "
Refresh
" + if(LAZYLEN(tagged_datums)) + for(var/datum/iter_datum as anything in tagged_datums) + index++ + var/specific_info + + if(isnull(iter_datum)) + dat += "\t[index]: Null reference - Check runtime logs!" + stack_trace("Null datum found in tagged datum menu! User: [usr]") + continue + else if(iscarbon(iter_datum)) + var/mob/living/carbon/resolved_carbon = iter_datum + specific_info = "[TAG_CARBON_HEALTH(resolved_carbon)] | [AREACOORD(resolved_carbon)] [ADMIN_PP(iter_datum)] [ADMIN_FLW(iter_datum)]" + else if(isliving(iter_datum)) + var/mob/living/resolved_living = iter_datum + specific_info = "[TAG_SIMPLE_HEALTH(resolved_living)] | [AREACOORD(resolved_living)] [ADMIN_PP(iter_datum)] [ADMIN_FLW(iter_datum)]" + else if(ismob(iter_datum)) + var/atom/resolved_atom = iter_datum // needed for ADMIN_JMP + specific_info = "[AREACOORD(resolved_atom)] [ADMIN_PP(iter_datum)] [ADMIN_FLW(iter_datum)]" + else if(ismovable(iter_datum)) + var/atom/resolved_atom = iter_datum // needed for ADMIN_JMP + specific_info = "[AREACOORD(resolved_atom)] [ADMIN_FLW(iter_datum)]" + else if(isatom(iter_datum)) + var/atom/resolved_atom = iter_datum // needed for ADMIN_JMP + specific_info = "[AREACOORD(resolved_atom)] [ADMIN_JMP(resolved_atom)]" + else if(istype(iter_datum, /datum/controller/subsystem)) + var/datum/controller/subsystem/resolved_subsystem = iter_datum + specific_info = "[resolved_subsystem.stat_entry()]" + // else, it's just a /datum + + dat += "\t[index]: [iter_datum] | [specific_info] | [ADMIN_VV(iter_datum)] | [TAG_DEL(iter_datum)] | [iter_datum == marked_datum ? "Marked" : TAG_MARK(iter_datum)] " + dat += "\t([iter_datum.type])" + else + dat += "No datums tagged :(" + + dat = dat.Join("
") + usr << browse(dat, "window=tag;size=800x480") + +#undef TAG_DEL +#undef TAG_MARK +#undef TAG_SIMPLE_HEALTH +#undef TAG_CARBON_HEALTH diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 86bcc003ee04a..a772a0068b98a 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1107,9 +1107,9 @@ Status: [status ? status : "Unknown"] | Damage: [health ? health : "None"] message_admins("[ADMIN_TPMONTY(usr)] canceled an evacuation.") if("toggle_evac") - SSevacuation.flags_scuttle ^= FLAGS_EVACUATION_DENY - log_admin("[key_name(src)] has [SSevacuation.flags_scuttle & FLAGS_EVACUATION_DENY ? "forbidden" : "allowed"] ship-wide evacuation.") - message_admins("[ADMIN_TPMONTY(usr)] has [SSevacuation.flags_scuttle & FLAGS_EVACUATION_DENY ? "forbidden" : "allowed"] ship-wide evacuation.") + SSevacuation.scuttle_flags ^= FLAGS_EVACUATION_DENY + log_admin("[key_name(src)] has [SSevacuation.scuttle_flags & FLAGS_EVACUATION_DENY ? "forbidden" : "allowed"] ship-wide evacuation.") + message_admins("[ADMIN_TPMONTY(usr)] has [SSevacuation.scuttle_flags & FLAGS_EVACUATION_DENY ? "forbidden" : "allowed"] ship-wide evacuation.") if("force_evac") if(!SSevacuation.begin_launch()) @@ -1147,9 +1147,9 @@ Status: [status ? status : "Unknown"] | Damage: [health ? health : "None"] message_admins("[ADMIN_TPMONTY(usr)] forced the self-destruct system, destroying the [SSmapping.configs[SHIP_MAP].map_name].") if("toggle_dest") - SSevacuation.flags_scuttle ^= FLAGS_SELF_DESTRUCT_DENY - log_admin("[key_name(src)] has [SSevacuation.flags_scuttle & FLAGS_SELF_DESTRUCT_DENY ? "forbidden" : "allowed"] the self-destruct system.") - message_admins("[ADMIN_TPMONTY(usr)] has [SSevacuation.flags_scuttle & FLAGS_SELF_DESTRUCT_DENY ? "forbidden" : "allowed"] the self-destruct system.") + SSevacuation.scuttle_flags ^= FLAGS_SELF_DESTRUCT_DENY + log_admin("[key_name(src)] has [SSevacuation.scuttle_flags & FLAGS_SELF_DESTRUCT_DENY ? "forbidden" : "allowed"] the self-destruct system.") + message_admins("[ADMIN_TPMONTY(usr)] has [SSevacuation.scuttle_flags & FLAGS_SELF_DESTRUCT_DENY ? "forbidden" : "allowed"] the self-destruct system.") //RU TGMC EDIT else if(href_list["admincancelpredsd"]) @@ -1802,7 +1802,7 @@ Status: [status ? status : "Unknown"] | Damage: [health ? health : "None"] var/dat - for(var/i in L.get_contents()) + for(var/i in L.GetAllContents()) var/atom/A = i dat += "[A] [ADMIN_VV(A)]
" @@ -1844,7 +1844,7 @@ Status: [status ? status : "Unknown"] | Damage: [health ? health : "None"] change = input("Select the hair color.", "Edit Appearance") as null|color if(!change || !istype(H)) return - previous = "#[num2hex(H.r_hair)][num2hex(H.g_hair)][num2hex(H.b_hair)]" + previous = "#[num2hex(H.r_hair, 2)][num2hex(H.g_hair, 2)][num2hex(H.b_hair, 2)]" H.r_hair = hex2num(copytext(change, 2, 4)) H.g_hair = hex2num(copytext(change, 4, 6)) H.b_hair = hex2num(copytext(change, 6, 8)) @@ -1858,7 +1858,7 @@ Status: [status ? status : "Unknown"] | Damage: [health ? health : "None"] change = input("Select the facial hair color.", "Edit Appearance") as null|color if(!change || !istype(H)) return - previous = "#[num2hex(H.r_facial)][num2hex(H.g_facial)][num2hex(H.b_facial)]" + previous = "#[num2hex(H.r_facial, 2)][num2hex(H.g_facial, 2)][num2hex(H.b_facial, 2)]" H.r_facial = hex2num(copytext(change, 2, 4)) H.g_facial = hex2num(copytext(change, 4, 6)) H.b_facial = hex2num(copytext(change, 6, 8)) @@ -1866,7 +1866,7 @@ Status: [status ? status : "Unknown"] | Damage: [health ? health : "None"] change = input("Select the eye color.", "Edit Appearance") as null|color if(!change || !istype(H)) return - previous = "#[num2hex(H.r_eyes)][num2hex(H.g_eyes)][num2hex(H.b_eyes)]" + previous = "#[num2hex(H.r_eyes, 2)][num2hex(H.g_eyes, 2)][num2hex(H.b_eyes, 2)]" H.r_eyes = hex2num(copytext(change, 2, 4)) H.g_eyes = hex2num(copytext(change, 4, 6)) H.b_eyes = hex2num(copytext(change, 6, 8)) @@ -1874,7 +1874,7 @@ Status: [status ? status : "Unknown"] | Damage: [health ? health : "None"] change = input("Select the body color.", "Edit Appearance") as null|color if(!change || !istype(H)) return - previous = "#[num2hex(H.r_skin)][num2hex(H.g_skin)][num2hex(H.b_skin)]" + previous = "#[num2hex(H.r_skin, 2)][num2hex(H.g_skin, 2)][num2hex(H.b_skin, 2)]" H.r_skin = hex2num(copytext(change, 2, 4)) H.g_skin = hex2num(copytext(change, 4, 6)) H.b_skin = hex2num(copytext(change, 6, 8)) @@ -2153,7 +2153,7 @@ Status: [status ? status : "Unknown"] | Damage: [health ? health : "None"] else if(href_list["clearpollvotes"]) var/datum/poll_question/poll = locate(href_list["clearpollvotes"]) in GLOB.polls - poll.cleaR_DBRANKS_votes() + poll.cleaR_POLLS_votes() poll_management_panel(poll) else if(href_list["addpolloption"]) @@ -2182,6 +2182,41 @@ Status: [status ? status : "Unknown"] | Damage: [health ? health : "None"] message_admins(logtext) log_admin(logtext) + else if(href_list["cancelsummon"]) + GLOB.active_summons.Cut() + var/logtext = "[key_name(usr)] has cancelled all psychic summons" + message_admins(logtext) + log_admin(logtext) + + else if(href_list["tag_datum"]) + if(!check_rights(R_ADMIN)) + return + var/datum/datum_to_tag = locate(href_list["tag_datum"]) + if(!datum_to_tag) + return + return add_tagged_datum(datum_to_tag) + + else if(href_list["del_tag"]) + if(!check_rights(R_ADMIN)) + return + var/datum/datum_to_remove = locate(href_list["del_tag"]) + if(!datum_to_remove) + return + return remove_tagged_datum(datum_to_remove) + + else if(href_list["show_tags"]) + if(!check_rights(R_ADMIN)) + return + return display_tags() + + else if(href_list["mark_datum"]) + if(!check_rights(R_ADMIN)) + return + var/datum/datum_to_mark = locate(href_list["mark_datum"]) + if(!datum_to_mark) + return + return usr.client?.mark_datum(datum_to_mark) + else if(href_list["adminunbanish"]) if(!check_rights(R_ADMIN)) return diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm index cd985279eda76..3e019efc78ce5 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm @@ -85,7 +85,10 @@ return min(arglist(args)) /proc/_new(type, arguments) - return new type (arglist(arguments)) + var/datum/result = new type(arglist(arguments)) + if(istype(result)) + result.datum_flags |= DF_VAR_EDITED + return result /proc/_num2text(N, SigFig = 6) return num2text(N, SigFig) diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 90020d5b28499..2cb79cbabe33a 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -430,6 +430,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) AddInteraction("Reopened by [key_name_admin(usr)]") log_admin_private("Ticket (#[id]) reopened by [key_name(usr)].") + to_chat(initiator, span_adminhelp("Your ticket has been reopened.")) TicketPanel() //can only be done from here, so refresh it @@ -451,11 +452,13 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) msg = "an admin ticket" AddInteraction("Made admin ticket by: [key_name_admin(usr)].") message_admins("Ticket [TicketHref("#[id]")] has been made [msg] by [ref].") + to_chat(initiator, span_adminhelp("Your ticket has been tiered to an adminhelp.")) else if(tier == TICKET_ADMIN) tier = TICKET_MENTOR msg = "a mentor ticket" AddInteraction("Made mentor ticket by: [key_name_admin(usr)].") message_staff("Ticket [TicketHref("#[id]")] has been made [msg] by [ref].") + to_chat(initiator, span_adminhelp("Your ticket has been tiered to a mentorhelp.")) if(!irc) for(var/client/X in GLOB.admins) if(!is_mentor(X)) @@ -483,6 +486,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) else if(tier == TICKET_ADMIN) message_admins("Ticket [TicketHref("#[id]")] has been unmarked by [ADMIN_TPMONTY(usr)].") log_admin_private("Ticket (#[id]) has been unmarked by [key_name(usr)].") + to_chat(initiator, span_adminhelp("Your ticket has been unmarked.")) return else if(alert("This ticket has already been marked by [marked], do you want to replace them?", "Confirmation", "Yes", "No") != "Yes") return @@ -492,6 +496,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) message_admins("Ticket [TicketHref("#[id]")] has been re-marked by [ADMIN_TPMONTY(usr)].") marked = usr.client.key log_admin_private("Ticket (#[id]) has been re-marked by [key_name(usr)].") + to_chat(initiator, span_adminhelp("Your ticket has been marked by another admin.")) return marked = usr.client.key if(tier == TICKET_MENTOR) @@ -499,6 +504,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) else if(tier == TICKET_ADMIN) message_admins("Ticket [TicketHref("#[id]")] has been marked by [ADMIN_TPMONTY(usr)].") log_admin_private("Ticket (#[id]) has been marked by [key_name(usr)].") + to_chat(initiator, span_adminhelp("Your ticket has been marked by an admin.")) //private @@ -529,6 +535,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) AddInteraction("Closed by [key_name_admin(usr)].") if(!silent) log_admin_private("Ticket (#[id]) closed by [key_name(usr)].") + to_chat(initiator, span_adminhelp("Your ticket has been closed.")) if(tier == TICKET_MENTOR) message_staff("Ticket [TicketHref("#[id]")] closed by [ref].") else if(tier == TICKET_ADMIN) diff --git a/code/modules/admin/verbs/centcom_podlauncher.dm b/code/modules/admin/verbs/centcom_podlauncher.dm index 6af9f59582dff..55a780d31cf5b 100644 --- a/code/modules/admin/verbs/centcom_podlauncher.dm +++ b/code/modules/admin/verbs/centcom_podlauncher.dm @@ -498,7 +498,7 @@ numTurfs = 0 //Counts the number of turfs that can be launched (remember, supplypods either launch all at once or one turf-worth of items at a time) acceptableTurfs = list() for (var/turf/T in orderedArea) //Go through the orderedArea list - if (typecache_filter_list_reverse(T.contents, length(ignored_atoms)) != 0) //if there is something in this turf that isnt in the blacklist, we consider this turf "acceptable" and add it to the acceptableTurfs list + if (length(typecache_filter_list_reverse(T.contents, ignored_atoms)) != 0) //if there is something in this turf that isnt in the blacklist, we consider this turf "acceptable" and add it to the acceptableTurfs list acceptableTurfs.Add(T) //Because orderedArea was an ordered linear list, acceptableTurfs will be as well. numTurfs ++ diff --git a/code/modules/admin/verbs/datumvars.dm b/code/modules/admin/verbs/datumvars.dm index 7b0068eebfe15..74dfd40698dce 100644 --- a/code/modules/admin/verbs/datumvars.dm +++ b/code/modules/admin/verbs/datumvars.dm @@ -1,1212 +1,58 @@ -#define VV_MSG_MARKED "
Marked Object" -#define VV_MSG_EDITED "
Var Edited" -#define VV_MSG_DELETED "
Deleted" - - /datum/proc/CanProcCall(procname) return TRUE - /datum/proc/can_vv_get(var_name) return TRUE -/client/can_vv_get(var_name) - if(var_name != "address" && var_name != "computer_id" || check_rights(R_DEBUG)) - return TRUE - return FALSE - - -/datum/proc/vv_edit_var(var_name, var_value) //called whenever a var is edited +/// Called when a var is edited with the new value to change to +/datum/proc/vv_edit_var(var_name, var_value) if(var_name == NAMEOF(src, vars)) return FALSE vars[var_name] = var_value datum_flags |= DF_VAR_EDITED return TRUE - /datum/proc/vv_get_var(var_name) switch(var_name) - if("vars") + if (NAMEOF(src, vars)) return debug_variable(var_name, list(), 0, src) return debug_variable(var_name, vars[var_name], 0, src) +/datum/proc/can_vv_mark() + return TRUE -/proc/get_all_of_type(T, subtypes = TRUE) - var/list/typecache = list() - typecache[T] = 1 - if(subtypes) - typecache = typecacheof(typecache) - . = list() - if(ispath(T, /mob)) - for(var/mob/thing in GLOB.mob_list) - if(typecache[thing.type]) - . += thing - CHECK_TICK - - else if(ispath(T, /obj/machinery/door)) - for(var/obj/machinery/door/thing in GLOB.machines) - if(typecache[thing.type]) - . += thing - CHECK_TICK - - else if(ispath(T, /obj/machinery)) - for(var/obj/machinery/thing in GLOB.machines) - if(typecache[thing.type]) - . += thing - CHECK_TICK - - else if(ispath(T, /obj)) - for(var/obj/thing in world) - if(typecache[thing.type]) - . += thing - CHECK_TICK - - else if(ispath(T, /atom/movable)) - for(var/atom/movable/thing in world) - if(typecache[thing.type]) - . += thing - CHECK_TICK - - else if(ispath(T, /turf)) - for(var/turf/thing in world) - if(typecache[thing.type]) - . += thing - CHECK_TICK - - else if(ispath(T, /atom)) - for(var/atom/thing in world) - if(typecache[thing.type]) - . += thing - CHECK_TICK - - else if(ispath(T, /client)) - for(var/client/thing in GLOB.clients) - if(typecache[thing.type]) - . += thing - CHECK_TICK - - else if(ispath(T, /datum)) - for(var/datum/thing) - if(typecache[thing.type]) - . += thing - CHECK_TICK - - else - for(var/datum/thing in world) - if(typecache[thing.type]) - . += thing - CHECK_TICK - +/** + * Gets all the dropdown options in the vv menu. + * When overriding, make sure to call . = ..() first and appent to the result, that way parent items are always at the top and child items are further down. + * Add seperators by doing VV_DROPDOWN_OPTION("", "---") + */ +/datum/proc/vv_get_dropdown() + SHOULD_CALL_PARENT(TRUE) -/proc/make_types_fancy(list/types) - if(ispath(types)) - types = list(types) . = list() - for(var/type in types) - var/typename = "[type]" - var/static/list/TYPES_SHORTCUTS = list( - /obj/effect/decal/cleanable = "CLEANABLE", - /obj/item/radio/headset = "HEADSET", - /obj/item/reagent_containers/food/drinks = "DRINK", //longest paths comes first - /obj/item/reagent_containers/food = "FOOD", - /obj/item/reagent_containers = "REAGENT_CONTAINERS", - /obj/item/organ = "ORGAN", - /obj/item = "ITEM", - /obj/machinery = "MACHINERY", - /obj/effect = "EFFECT", - /obj = "O", - /datum = "D", - /turf/open = "OPEN", - /turf/closed = "CLOSED", - /turf = "T", - /mob/living/carbon/human = "HUMAN", - /mob/living/carbon = "CARBON", - /mob/living/simple_animal = "SIMPLE", - /mob/living = "LIVING", - /mob = "M" - ) - for (var/tn in TYPES_SHORTCUTS) - if(copytext(typename, 1, length("[tn]/") + 1) == "[tn]/" /*findtextEx(typename,"[tn]/",1,2)*/ ) - typename = TYPES_SHORTCUTS[tn] + copytext(typename, length("[tn]/")) - break - .[typename] = type - - -/proc/get_fancy_list_of_atom_types() - var/static/list/pre_generated_list - if(!pre_generated_list) //init - pre_generated_list = make_types_fancy(typesof(/atom)) - return pre_generated_list - - -/proc/get_fancy_list_of_datum_types() - var/static/list/pre_generated_list - if(!pre_generated_list) //init - pre_generated_list = make_types_fancy(sortList(typesof(/datum) - typesof(/atom))) - return pre_generated_list - - -/proc/filter_fancy_list(list/L, filter as text) - var/list/matches = new - for(var/key in L) - var/value = L[key] - if(findtext("[key]", filter) || findtext("[value]", filter)) - matches[key] = value - return matches - + VV_DROPDOWN_OPTION("", "---") + VV_DROPDOWN_OPTION(VV_HK_CALLPROC, "Call Proc") + VV_DROPDOWN_OPTION(VV_HK_MARK, "Mark Object") + VV_DROPDOWN_OPTION(VV_HK_TAG, "Tag Datum") + VV_DROPDOWN_OPTION(VV_HK_DELETE, "Delete") + VV_DROPDOWN_OPTION(VV_HK_EXPOSE, "Show VV To Player") + VV_DROPDOWN_OPTION(VV_HK_ADDCOMPONENT, "Add Component/Element") + VV_DROPDOWN_OPTION(VV_HK_REMOVECOMPONENT, "Remove Component/Element") + VV_DROPDOWN_OPTION(VV_HK_MASS_REMOVECOMPONENT, "Mass Remove Component/Element") + +/** + * This proc is only called if everything topic-wise is verified. The only verifications that should happen here is things like permission checks! + * href_list is a reference, modifying it in these procs WILL change the rest of the proc in topic.dm of admin/view_variables! + * This proc is for "high level" actions like admin heal/set species/etc/etc. The low level debugging things should go in admin/view_variables/topic_basic.dm incase this runtimes. + */ +/datum/proc/vv_do_topic(list/href_list) + if(!usr || !usr.client || !usr.client.holder || !check_rights(NONE)) + return FALSE //This is VV, not to be called by anything else. + if(SEND_SIGNAL(src, COMSIG_VV_TOPIC, usr, href_list) & COMPONENT_VV_HANDLED) + return FALSE + return TRUE -//please call . = ..() first and append to the result, that way parent items are always at the top and child items are further down -//add separaters by doing . += "---" -/datum/proc/vv_get_dropdown() +/datum/proc/vv_get_header() . = list() - . += "---" - .["Call Proc"] = "?_src_=vars;[HrefToken()];[VV_HK_CALLPROC]=[REF(src)]" - .["Mark Object"] = "?_src_=vars;[HrefToken()];[VV_HK_MARK]=[REF(src)]" - .["Delete"] = "?_src_=vars;[HrefToken()];[VV_HK_DELETE]=[REF(src)]" - .["Show VV To Player"] = "?_src_=vars;[HrefToken()];[VV_HK_EXPOSE]=[REF(src)]" - - -/client/proc/debug_variables(datum/D in world) - set category = "Debug" - set name = "View Variables" - - if(!check_rights(R_VAREDIT)) - return - - var/static/cookieoffset = rand(1, 9999) //to force cookies to reset after the round. - - if(!D) - return - - var/islist = islist(D) - if(!islist && !istype(D)) - return - - var/title = "" - var/refid = REF(D) - var/icon/sprite - var/hash - - var/type = /list - if(!islist) - type = D.type - - - - if(istype(D, /atom)) - var/atom/AT = D - if(AT.icon && AT.icon_state) - sprite = new /icon(AT.icon, AT.icon_state) - hash = md5(AT.icon) - hash = md5(hash + AT.icon_state) - src << browse_rsc(sprite, "vv[hash].png") - - title = "[D] ([REF(D)]) = [type]" - var/formatted_type = replacetext("[type]", "/", "
<< [dir2text(A.dir) || A.dir] >>" - if(isliving(A)) - atomsnowflake += "
<< [dir2text(A.dir) || A.dir] >>" - var/mob/living/M = A - atomsnowflake += {" -
[M.ckey || "No ckey"] / [M.real_name || "No real name"] -
- BRUTE:[M.getBruteLoss()] - FIRE:[M.getFireLoss()] - TOXIN:[M.getToxLoss()] - OXY:[M.getOxyLoss()] - CLONE:[M.getCloneLoss()] - BRAIN:[M.getBrainLoss()] - STAMINA:[M.getStaminaLoss()] - - "} - else if("name" in D.vars) - atomsnowflake += "[D]" - else - atomsnowflake += "[formatted_type]" - formatted_type = null - - var/marked - if(holder?.marked_datum && holder.marked_datum == D) - marked = VV_MSG_MARKED - var/varedited_line = "" - if(!islist && (D.datum_flags & DF_VAR_EDITED)) - varedited_line = VV_MSG_EDITED - var/deleted_line - if(!islist && D.gc_destroyed) - deleted_line = VV_MSG_DELETED - - var/list/dropdownoptions = list() - if(islist) - dropdownoptions = list( - "---", - "Add Item" = "?_src_=vars;[HrefToken()];listadd=[refid]", - "Remove Nulls" = "?_src_=vars;[HrefToken()];listnulls=[refid]", - "Remove Dupes" = "?_src_=vars;[HrefToken()];listdupes=[refid]", - "Set len" = "?_src_=vars;[HrefToken()];listlen=[refid]", - "Shuffle" = "?_src_=vars;[HrefToken()];listshuffle=[refid]", - "Show VV To Player" = "?_src_=vars;[HrefToken()];expose=[refid]" - ) - else - dropdownoptions = D.vv_get_dropdown() - var/list/dropdownoptions_html = list() - - for(var/name in dropdownoptions) - var/link = dropdownoptions[name] - if(link) - dropdownoptions_html += "" - else - dropdownoptions_html += "" - - var/list/names = list() - if(!islist) - for(var/V in D.vars) - names += V - sleep(0.1 SECONDS)//For some reason, without this sleep, VVing will cause client to disconnect on certain objects. - - var/list/variable_html = list() - if(islist) - var/list/L = D - for(var/i in 1 to length(L)) - var/key = L[i] - var/value - if(IS_NORMAL_LIST(L) && !isnum(key)) - value = L[key] - variable_html += debug_variable(i, value, 0, D) - else - - names = sortList(names) - for (var/V in names) - if(D.can_vv_get(V)) - variable_html += D.vv_get_var(V) - - var/html = {" - - -
-
-
-
-
-
- [formatted_type]
- [marked]
- [varedited_line]
- [deleted_line]
-
- |
-
-
- Refresh
-
-
- |
-
- - E - Edit, tries to determine the variable type by itself.
- C - Change, asks you for the var type first.
- M - Mass modify: changes this variable for all objects of this type.
- -
-
|
-
- Search:
-
- |
- - - | -
-
-
- [variable_html.Join()]
-
- [items.Join()]
" diff --git a/code/modules/admin/verbs/legacy.dm b/code/modules/admin/verbs/legacy.dm index b50d56ae28a55..37882d6b7a4b9 100644 --- a/code/modules/admin/verbs/legacy.dm +++ b/code/modules/admin/verbs/legacy.dm @@ -29,15 +29,15 @@ if(!infos) infos = list() //Overly complex timestamp creation - var/modifyer = "th" + var/modifier = "th" switch(time2text(world.timeofday, "DD")) if("01","21","31") - modifyer = "st" - if("02","22",) - modifyer = "nd" + modifier = "st" + if("02","22") + modifier = "nd" if("03","23") - modifyer = "rd" - var/day_string = "[time2text(world.timeofday, "DD")][modifyer]" + modifier = "rd" + var/day_string = "[time2text(world.timeofday, "DD")][modifier]" if(copytext(day_string, 1, 2) == "0") day_string = copytext(day_string,2) var/full_date = time2text(world.timeofday, "Day, Month DD of YYYY") diff --git a/code/modules/admin/verbs/poll_managment.dm b/code/modules/admin/verbs/poll_managment.dm index ceebb7f7e338c..9c930b2508e7c 100644 --- a/code/modules/admin/verbs/poll_managment.dm +++ b/code/modules/admin/verbs/poll_managment.dm @@ -242,7 +242,7 @@ * */ /datum/admins/proc/poll_parse_href(list/href_list, datum/poll_question/poll) - if(!check_rights(R_DBRANKS)) + if(!check_rights(R_POLLS)) return if(!SSdbcore.Connect()) to_chat(usr, span_danger("Failed to establish database connection.")) @@ -351,7 +351,7 @@ * */ /datum/poll_question/proc/delete_poll() - if(!check_rights(R_DBRANKS)) + if(!check_rights(R_POLLS)) return if(!SSdbcore.Connect()) to_chat(usr, span_danger("Failed to establish database connection.")) @@ -376,11 +376,11 @@ * Uses INSERT ON DUPLICATE KEY UPDATE to handle both inserting and updating at once. * The start and end datetimes and poll id for new polls is then retrieved for the poll datum. * Arguments: - * * clear_votes - When true will call cleaR_DBRANKS_votes() to delete all votes matching this poll id. + * * clear_votes - When true will call cleaR_POLLS_votes() to delete all votes matching this poll id. * */ /datum/poll_question/proc/save_poll_data(clear_votes) - if(!check_rights(R_DBRANKS)) + if(!check_rights(R_POLLS)) return if(!SSdbcore.Connect()) to_chat(usr, span_danger("Failed to establish database connection.")) @@ -427,7 +427,7 @@ future_poll = text2num(query_get_poll_id_start_endtime.item[3]) qdel(query_get_poll_id_start_endtime) if(clear_votes) - cleaR_DBRANKS_votes() + cleaR_POLLS_votes() edit_ready = TRUE var/msg = "has [new_poll ? "created a new" : "edited a"][admin_only ? " admin only" : ""] server poll. Question: [question]" if(admin_only) @@ -456,8 +456,8 @@ * Deletes all votes or text replies for this poll, depending on its type. * */ -/datum/poll_question/proc/cleaR_DBRANKS_votes() - if(!check_rights(R_DBRANKS)) +/datum/poll_question/proc/cleaR_POLLS_votes() + if(!check_rights(R_POLLS)) return if(!SSdbcore.Connect()) to_chat(usr, span_danger("Failed to establish database connection.")) @@ -465,14 +465,14 @@ var/table = "poll_vote" if(poll_type == POLLTYPE_TEXT) table = "poll_textreply" - var/datum/db_query/query_cleaR_DBRANKS_votes = SSdbcore.NewQuery( + var/datum/db_query/query_cleaR_POLLS_votes = SSdbcore.NewQuery( "UPDATE [format_table_name(table)] SET deleted = 1 WHERE pollid = :poll_id", list("poll_id" = poll_id) ) - if(!query_cleaR_DBRANKS_votes.warn_execute()) - qdel(query_cleaR_DBRANKS_votes) + if(!query_cleaR_POLLS_votes.warn_execute()) + qdel(query_cleaR_POLLS_votes) return - qdel(query_cleaR_DBRANKS_votes) + qdel(query_cleaR_POLLS_votes) poll_votes = 0 to_chat(usr, span_danger("Poll [poll_type == POLLTYPE_TEXT ? "responses" : "votes"] cleared.")) @@ -540,7 +540,7 @@ * */ /datum/admins/proc/poll_option_parse_href(list/href_list, datum/poll_question/poll, datum/poll_option/option) - if(!check_rights(R_DBRANKS)) + if(!check_rights(R_POLLS)) return if(!SSdbcore.Connect()) to_chat(usr, span_danger("Failed to establish database connection.")) @@ -638,7 +638,7 @@ * */ /datum/poll_option/proc/save_option() - if(!check_rights(R_DBRANKS)) + if(!check_rights(R_POLLS)) return if(!SSdbcore.Connect()) to_chat(usr, span_danger("Failed to establish database connection.")) @@ -672,7 +672,7 @@ * */ /datum/poll_option/proc/delete_option() - if(!check_rights(R_DBRANKS)) + if(!check_rights(R_POLLS)) return . = parent_poll if(option_id) diff --git a/code/modules/admin/verbs/varedit.dm b/code/modules/admin/verbs/varedit.dm deleted file mode 100644 index 4b01447eeac1f..0000000000000 --- a/code/modules/admin/verbs/varedit.dm +++ /dev/null @@ -1,814 +0,0 @@ -GLOBAL_LIST_INIT(VVwarning, list("vars", "datum_flags", "client", "key", "ckey", "type")) -GLOBAL_PROTECT(VVwarning) -GLOBAL_LIST_INIT(VVpixelmovement, list("step_x", "step_y", "bound_height", "bound_width", "bound_x", "bound_y", "step_size")) -GLOBAL_PROTECT(VVpixelmovement) - - -/client/proc/vv_get_class(var_name, var_value) - if(isnull(var_value)) - . = VV_NULL - - else if (isnum(var_value)) - if (var_name in GLOB.bitfields) - . = VV_BITFIELD - else - . = VV_NUM - - else if (istext(var_value)) - if (findtext(var_value, "\n")) - . = VV_MESSAGE - else - . = VV_TEXT - - else if (isicon(var_value)) - . = VV_ICON - - else if (ismob(var_value)) - . = VV_MOB_REFERENCE - - else if (isloc(var_value)) - . = VV_ATOM_REFERENCE - - else if (istype(var_value, /client)) - . = VV_CLIENT - - else if (istype(var_value, /datum)) - . = VV_DATUM_REFERENCE - - else if (ispath(var_value)) - if (ispath(var_value, /atom)) - . = VV_ATOM_TYPE - else if (ispath(var_value, /datum)) - . = VV_DATUM_TYPE - else - . = VV_TYPE - - else if (islist(var_value)) - . = VV_LIST - - else if (isfile(var_value)) - . = VV_FILE - else - . = VV_NULL - -/client/proc/vv_get_value(class, default_class, current_value, list/restricted_classes, list/extra_classes, list/classes, var_name) - . = list("class" = class, "value" = null) - if (!class) - if (!classes) - classes = list ( - VV_NUM, - VV_TEXT, - VV_MESSAGE, - VV_ICON, - VV_ATOM_REFERENCE, - VV_DATUM_REFERENCE, - VV_MOB_REFERENCE, - VV_CLIENT, - VV_ATOM_TYPE, - VV_DATUM_TYPE, - VV_TYPE, - VV_FILE, - VV_NEW_ATOM, - VV_NEW_DATUM, - VV_NEW_TYPE, - VV_NEW_LIST, - VV_NULL, - VV_RESTORE_DEFAULT - ) - - if(holder?.marked_datum && !(VV_MARKED_DATUM in restricted_classes)) - classes += "[VV_MARKED_DATUM] ([holder.marked_datum.type])" - if (restricted_classes) - classes -= restricted_classes - - if (extra_classes) - classes += extra_classes - - .["class"] = input(src, "What kind of data?", "Variable Type", default_class) as null|anything in classes - if (holder?.marked_datum && .["class"] == "[VV_MARKED_DATUM] ([holder.marked_datum.type])") - .["class"] = VV_MARKED_DATUM - - - switch(.["class"]) - if (VV_TEXT) - .["value"] = input("Enter new text:", "Text", current_value) as null|text - if (.["value"] == null) - .["class"] = null - return - if (VV_MESSAGE) - .["value"] = input("Enter new text:", "Text", current_value) as null|message - if (.["value"] == null) - .["class"] = null - return - - - if (VV_NUM) - .["value"] = input("Enter new number:", "Num", current_value) as null|num - if (.["value"] == null) - .["class"] = null - return - - if (VV_BITFIELD) - .["value"] = input_bitfield(usr, "Editing bitfield: [var_name]", var_name, current_value) - if (.["value"] == null) - .["class"] = null - return - - if (VV_ATOM_TYPE) - .["value"] = pick_closest_path(FALSE) - if (.["value"] == null) - .["class"] = null - return - - if (VV_DATUM_TYPE) - .["value"] = pick_closest_path(FALSE, get_fancy_list_of_datum_types()) - if (.["value"] == null) - .["class"] = null - return - - if (VV_TYPE) - var/type = current_value - var/error = "" - do - type = input("Enter type:[error]", "Type", type) as null|text - if (!type) - break - type = text2path(type) - error = "\nType not found, Please try again" - while(!type) - if (!type) - .["class"] = null - return - .["value"] = type - - - if (VV_ATOM_REFERENCE) - var/type = pick_closest_path(FALSE) - var/subtypes = vv_subtype_prompt(type) - if (subtypes == null) - .["class"] = null - return - var/list/things = vv_reference_list(type, subtypes) - var/value = input("Select reference:", "Reference", current_value) as null|anything in things - if (!value) - .["class"] = null - return - .["value"] = things[value] - - if (VV_DATUM_REFERENCE) - var/type = pick_closest_path(FALSE, get_fancy_list_of_datum_types()) - var/subtypes = vv_subtype_prompt(type) - if (subtypes == null) - .["class"] = null - return - var/list/things = vv_reference_list(type, subtypes) - var/value = input("Select reference:", "Reference", current_value) as null|anything in things - if (!value) - .["class"] = null - return - .["value"] = things[value] - - if (VV_MOB_REFERENCE) - var/type = pick_closest_path(FALSE, make_types_fancy(typesof(/mob))) - var/subtypes = vv_subtype_prompt(type) - if (subtypes == null) - .["class"] = null - return - var/list/things = vv_reference_list(type, subtypes) - var/value = input("Select reference:", "Reference", current_value) as null|anything in things - if (!value) - .["class"] = null - return - .["value"] = things[value] - - - - if (VV_CLIENT) - .["value"] = input("Select reference:", "Reference", current_value) as null|anything in GLOB.clients - if (.["value"] == null) - .["class"] = null - return - - - if (VV_FILE) - .["value"] = input("Pick file:", "File") as null|file - if (.["value"] == null) - .["class"] = null - return - - - if (VV_ICON) - .["value"] = input("Pick icon:", "Icon") as null|icon - if (.["value"] == null) - .["class"] = null - return - - - if (VV_MARKED_DATUM) - .["value"] = holder.marked_datum - if (.["value"] == null) - .["class"] = null - return - - - if (VV_NEW_ATOM) - var/type = pick_closest_path(FALSE) - if (!type) - .["class"] = null - return - .["type"] = type - var/atom/newguy = new type() - newguy.datum_flags |= DF_VAR_EDITED - .["value"] = newguy - - if (VV_NEW_DATUM) - var/type = pick_closest_path(FALSE, get_fancy_list_of_datum_types()) - if (!type) - .["class"] = null - return - .["type"] = type - var/datum/newguy = new type() - newguy.datum_flags |= DF_VAR_EDITED - .["value"] = newguy - - if (VV_NEW_TYPE) - var/type = current_value - var/error = "" - do - type = input("Enter type:[error]", "Type", type) as null|text - if (!type) - break - type = text2path(type) - error = "\nType not found, Please try again" - while(!type) - if (!type) - .["class"] = null - return - .["type"] = type - var/datum/newguy = new type() - if(istype(newguy)) - newguy.datum_flags |= DF_VAR_EDITED - .["value"] = newguy - - - if (VV_NEW_LIST) - .["value"] = list() - .["type"] = /list - -/client/proc/vv_parse_text(O, new_var) - if(O && findtext(new_var,"\[")) - var/process_vars = alert(usr,"\[] detected in string, process as variables?","Process Variables?","Yes","No") - if(process_vars == "Yes") - . = string2listofvars(new_var, O) - -//do they want you to include subtypes? -//FALSE = no subtypes, strict exact type pathing (or the type doesn't have subtypes) -//TRUE = Yes subtypes -//NULL = User cancelled at the prompt or invalid type given -/client/proc/vv_subtype_prompt(type) - if (!ispath(type)) - return null - var/list/subtypes = subtypesof(type) - if (!length(subtypes)) - return FALSE - - switch(alert("Strict object type detection?", "Type detection", "Strictly this type","This type and subtypes", "Cancel")) - if("Strictly this type") - return FALSE - if("This type and subtypes") - return TRUE - - -/client/proc/vv_reference_list(type, subtypes) - . = list() - var/list/types = list(type) - if (subtypes) - types = typesof(type) - - var/list/fancytypes = make_types_fancy(types) - - for(var/fancytype in fancytypes) //swap the assoication - types[fancytypes[fancytype]] = fancytype - - var/things = get_all_of_type(type, subtypes) - - var/i = 0 - for(var/thing in things) - var/datum/D = thing - i++ - //try one of 3 methods to shorten the type text: - // fancy type, - // fancy type with the base type removed from the begaining, - // the type with the base type removed from the begaining - var/fancytype = types[D.type] - if (findtext(fancytype, types[type])) - fancytype = copytext(fancytype, length(types[type]) + 1) - var/shorttype = copytext("[D.type]", length("[type]") + 1) - if (length_char(shorttype) > length_char(fancytype)) - shorttype = fancytype - if (!length(shorttype)) - shorttype = "/" - - .["[D]([shorttype])[REF(D)]#[i]"] = D - -/client/proc/mod_list_add_ass(atom/O) //hehe - - var/list/L = vv_get_value(restricted_classes = list(VV_RESTORE_DEFAULT)) - var/class = L["class"] - if (!class) - return - var/var_value = L["value"] - - if(class == VV_TEXT || class == VV_MESSAGE) - var/list/varsvars = vv_parse_text(O, var_value) - for(var/V in varsvars) - var_value = replacetext(var_value,"\[[V]]","[O.vars[V]]") - - return var_value - - -/client/proc/mod_list_add(list/L, atom/O, original_name, objectvar) - var/list/LL = vv_get_value(restricted_classes = list(VV_RESTORE_DEFAULT)) - var/class = LL["class"] - if (!class) - return - var/var_value = LL["value"] - - if(class == VV_TEXT || class == VV_MESSAGE) - var/list/varsvars = vv_parse_text(O, var_value) - for(var/V in varsvars) - var_value = replacetext(var_value,"\[[V]]","[O.vars[V]]") - - if (O) - L = L.Copy() - - L += var_value - - switch(alert("Would you like to associate a value with the list entry?",,"Yes","No")) - if("Yes") - L[var_value] = mod_list_add_ass(O) - - if(O && !O.vv_edit_var(objectvar, L)) - to_chat(src, "Your edit was rejected by the object.") - return - - log_world("### ListVarEdit by [src]: [(O ? O.type : "/list")] [objectvar]: ADDED=[var_value]") - log_admin("[key_name(src)] modified [original_name]'s [objectvar]: ADDED=[var_value]") - message_admins("[key_name_admin(src)] modified [original_name]'s [objectvar]: ADDED=[var_value]") - -/client/proc/mod_list(list/L, atom/O, original_name, objectvar, index, autodetect_class = FALSE) - if(!check_rights(R_VAREDIT)) - return - - if(!islist(L)) - to_chat(src, "Not a List.") - return - - if(length(L) > 1000) - var/confirm = alert(src, "The list you're trying to edit is very long, continuing may crash the server.", "Warning", "Continue", "Abort") - if(confirm != "Continue") - return - - - - var/list/names = list() - for (var/i in 1 to length(L)) - var/key = L[i] - var/value - if (IS_NORMAL_LIST(L) && !isnum(key)) - value = L[key] - if (value == null) - value = "null" - names["#[i] [key] = [value]"] = i - if (!index) - var/variable = input("Which var?","Var") as null|anything in names + "(ADD VAR)" + "(CLEAR NULLS)" + "(CLEAR DUPES)" + "(SHUFFLE)" - - if(variable == null) - return - - if(variable == "(ADD VAR)") - if(!O.vv_edit_var(objectvar, L)) - to_chat(src, "Your edit was rejected by the object.") - return - mod_list_add(L, O, original_name, objectvar) - return - - if(variable == "(CLEAR NULLS)") - if(!O.vv_edit_var(objectvar, L)) - to_chat(src, "Your edit was rejected by the object.") - return - L = L.Copy() - listclearnulls(L) - log_world("### ListVarEdit by [src]: [O.type] [objectvar]: CLEAR NULLS") - log_admin("[key_name(src)] modified [original_name]'s [objectvar]: CLEAR NULLS") - message_admins("[key_name_admin(src)] modified [original_name]'s list [objectvar]: CLEAR NULLS") - return - - if(variable == "(CLEAR DUPES)") - if(!O.vv_edit_var(objectvar, L)) - to_chat(src, "Your edit was rejected by the object.") - return - L = uniqueList(L) - log_world("### ListVarEdit by [src]: [O.type] [objectvar]: CLEAR DUPES") - log_admin("[key_name(src)] modified [original_name]'s [objectvar]: CLEAR DUPES") - message_admins("[key_name_admin(src)] modified [original_name]'s list [objectvar]: CLEAR DUPES") - return - - if(variable == "(SHUFFLE)") - if(!O.vv_edit_var(objectvar, L)) - to_chat(src, "Your edit was rejected by the object.") - return - L = shuffle(L) - log_world("### ListVarEdit by [src]: [O.type] [objectvar]: SHUFFLE") - log_admin("[key_name(src)] modified [original_name]'s [objectvar]: SHUFFLE") - message_admins("[key_name_admin(src)] modified [original_name]'s list [objectvar]: SHUFFLE") - return - - index = names[variable] - - - var/assoc_key - if (index == null) - return - var/assoc = FALSE - var/prompt = alert(src, "Do you want to edit the key or its assigned value?", "Associated List", "Key", "Assigned Value", "Cancel") - if (prompt == "Cancel") - return - if (prompt == "Assigned Value") - assoc = TRUE - assoc_key = L[index] - var/default - var/variable - if (assoc) - variable = L[assoc_key] - else - variable = L[index] - - default = vv_get_class(objectvar, variable) - - to_chat(src, "Variable appears to be [uppertext(default)].") - - to_chat(src, "Variable contains: [variable]") - - if(default == VV_NUM) - var/dir_text = "" - var/tdir = variable - if(tdir > 0 && tdir < 16) - if(tdir & 1) - dir_text += "NORTH" - if(tdir & 2) - dir_text += "SOUTH" - if(tdir & 4) - dir_text += "EAST" - if(tdir & 8) - dir_text += "WEST" - - if(dir_text) - to_chat(usr, "If a direction, direction is: [dir_text]") - - var/original_var = variable - - if (O) - L = L.Copy() - var/class - if(autodetect_class) - if (default == VV_TEXT) - default = VV_MESSAGE - class = default - var/list/LL = vv_get_value(default_class = default, current_value = original_var, restricted_classes = list(VV_RESTORE_DEFAULT), extra_classes = list(VV_LIST, "DELETE FROM LIST")) - class = LL["class"] - if (!class) - return - var/new_var = LL["value"] - - if(class == VV_MESSAGE) - class = VV_TEXT - - switch(class) //Spits a runtime error if you try to modify an entry in the contents list. Dunno how to fix it, yet. - if(VV_LIST) - mod_list(variable, O, original_name, objectvar) - - if("DELETE FROM LIST") - if(O && !O.vv_edit_var(objectvar, L)) - to_chat(src, "Your edit was rejected by the object.") - return - - L.Cut(index, index + 1) - - log_world("### ListVarEdit by [src]: [O.type] [objectvar]: REMOVED=[html_encode("[original_var]")]") - log_admin("[key_name(src)] modified [original_name]'s [objectvar]: REMOVED=[original_var]") - message_admins("[key_name_admin(src)] modified [original_name]'s [objectvar]: REMOVED=[original_var]") - return - - if(VV_TEXT) - var/list/varsvars = vv_parse_text(O, new_var) - for(var/V in varsvars) - new_var = replacetext(new_var,"\[[V]]","[O.vars[V]]") - - - if(assoc) - L[assoc_key] = new_var - else - L[index] = new_var - - if(O && !O.vv_edit_var(objectvar, L)) - to_chat(src, "Your edit was rejected by the object.") - return - - log_world("### ListVarEdit by [src]: [(O ? O.type : "/list")] [objectvar]: [original_var]=[new_var]") - log_admin("[key_name(src)] modified [original_name]'s [objectvar]: [original_var]=[new_var]") - message_admins("[key_name_admin(src)] modified [original_name]'s varlist [objectvar]: [original_var]=[new_var]") - -/proc/vv_varname_lockcheck(param_var_name) - if(param_var_name in GLOB.VVwarning) - if(alert(usr, "Editing this var may break things. Are you sure you want to continue?", "Warning", "Yes", "No") != "Yes") - return FALSE - if(param_var_name in GLOB.VVpixelmovement) - if(alert(usr, "Editing this var WILL break smooth tile movement for the rest of the round. THIS CAN'T BE UNDONE", "DANGER", "ABORT ", "Continue", " ABORT") != "Continue") - return FALSE - return TRUE - - -/client/proc/modify_variables(atom/O, param_var_name = null, autodetect_class = 0) - if(!check_rights(R_VAREDIT)) - return - - var/class - var/variable - var/var_value - - if(param_var_name) - if(!(param_var_name in O.vars)) - to_chat(src, "A variable with this name ([param_var_name]) doesn't exist in this datum ([O])") - return - variable = param_var_name - - else - var/list/names = list() - for (var/V in O.vars) - names += V - - names = sortList(names) - - variable = input("Which var?","Var") as null|anything in names - if(!variable) - return - - if(!O.can_vv_get(variable)) - return - - var_value = O.vars[variable] - if(!vv_varname_lockcheck(variable)) - return - - var/default = vv_get_class(variable, var_value) - - if(isnull(default)) - to_chat(src, "Unable to determine variable type.") - else - to_chat(src, "Variable appears to be [uppertext(default)].") - - to_chat(src, "Variable contains: [var_value]") - - if(default == VV_NUM) - var/dir_text = "" - if(var_value > 0 && var_value < 16) - if(var_value & 1) - dir_text += "NORTH" - if(var_value & 2) - dir_text += "SOUTH" - if(var_value & 4) - dir_text += "EAST" - if(var_value & 8) - dir_text += "WEST" - - if(dir_text) - to_chat(src, "If a direction, direction is: [dir_text]") - - if(autodetect_class && default != VV_NULL) - if(default == VV_TEXT) - default = VV_MESSAGE - class = default - - var/list/value = vv_get_value(class, default, var_value, extra_classes = list(VV_LIST), var_name = variable) - class = value["class"] - - if(!class) - return - var/var_new = value["value"] - - if(class == VV_MESSAGE) - class = VV_TEXT - - var/original_name = "[O]" - - switch(class) - if(VV_LIST) - if(!islist(var_value)) - mod_list(list(), O, original_name, variable) - - mod_list(var_value, O, original_name, variable) - return - - if(VV_RESTORE_DEFAULT) - var_new = initial(O.vars[variable]) - - if(VV_TEXT) - var/list/varsvars = vv_parse_text(O, var_new) - for(var/V in varsvars) - var_new = replacetext(var_new,"\[[V]]","[O.vars[V]]") - - - if(!O.vv_edit_var(variable, var_new)) - to_chat(src, "Your edit was rejected by the object.") - return - - vv_update_display(O, "varedited", VV_MSG_EDITED) - log_world("### VarEdit by [key_name(src)]: [O.type] [variable]=[var_value] => [var_new]") - log_admin("[key_name(src)] modified [original_name]'s [variable] from [html_encode("[var_value]")] to [html_encode("[var_new]")]") - message_admins("[ADMIN_TPMONTY(usr)] modified [original_name] [ADMIN_VV(O)] [variable] from [var_value] to [var_new]") - admin_ticket_log(O, "[key_name_admin(src)] modified [original_name]'s [variable] from [var_value] to [var_new]") - return TRUE - - -/client/proc/mass_modify(atom/A, var_name) - var/method = 0 //0 means strict type detection while 1 means this type and all subtypes (IE: /obj/item with this set to 1 will set it to ALL items) - - if(!check_rights(R_VAREDIT)) - return - - if(A?.type) - method = usr.client.vv_subtype_prompt(A.type) - - usr.client.massmodify_variables(A, var_name, method) - - -/client/proc/massmodify_variables(datum/O, var_name = "", method = 0) - if(!check_rights(R_VAREDIT)) - return - if(!istype(O)) - return - - var/variable = "" - if(!var_name) - var/list/names = list() - for (var/V in O.vars) - names += V - - names = sortList(names) - - variable = input("Which var?", "Var") as null|anything in names - else - variable = var_name - - if(!variable || !O.can_vv_get(variable)) - return - var/default - var/var_value = O.vars[variable] - - if(!vv_varname_lockcheck(variable)) - return - - default = vv_get_class(variable, var_value) - - if(isnull(default)) - to_chat(src, "Unable to determine variable type.") - else - to_chat(src, "Variable appears to be [uppertext(default)].") - - to_chat(src, "Variable contains: [var_value]") - - if(default == VV_NUM) - var/dir_text = "" - if(var_value > 0 && var_value < 16) - if(var_value & 1) - dir_text += "NORTH" - if(var_value & 2) - dir_text += "SOUTH" - if(var_value & 4) - dir_text += "EAST" - if(var_value & 8) - dir_text += "WEST" - - if(dir_text) - to_chat(src, "If a direction, direction is: [dir_text]") - - var/value = vv_get_value(default, default, var_value, var_name = variable) - var/new_value = value["value"] - var/class = value["class"] - - if(!class || !new_value == null && class != VV_NULL) - return - - if (class == VV_MESSAGE) - class = VV_TEXT - - if (value["type"]) - class = VV_NEW_TYPE - - var/original_name = "[O]" - - var/rejected = 0 - var/accepted = 0 - - switch(class) - if(VV_RESTORE_DEFAULT) - to_chat(src, "Finding items...") - var/list/items = get_all_of_type(O.type, method) - to_chat(src, "Changing [length(items)] items...") - for(var/thing in items) - if (!thing) - continue - var/datum/D = thing - if (D.vv_edit_var(variable, initial(D.vars[variable])) != FALSE) - accepted++ - else - rejected++ - CHECK_TICK - - if(VV_TEXT) - var/list/varsvars = vv_parse_text(O, new_value) - var/pre_processing = new_value - var/unique - if (length(varsvars)) - unique = alert(usr, "Process vars unique to each instance, or same for all?", "Variable Association", "Unique", "Same") - if(unique == "Unique") - unique = TRUE - else - unique = FALSE - for(var/V in varsvars) - new_value = replacetext(new_value,"\[[V]]","[O.vars[V]]") - - to_chat(src, "Finding items...") - var/list/items = get_all_of_type(O.type, method) - to_chat(src, "Changing [length(items)] items...") - for(var/thing in items) - if (!thing) - continue - var/datum/D = thing - if(unique) - new_value = pre_processing - for(var/V in varsvars) - new_value = replacetext(new_value,"\[[V]]","[D.vars[V]]") - - if (D.vv_edit_var(variable, new_value) != FALSE) - accepted++ - else - rejected++ - CHECK_TICK - - if (VV_NEW_TYPE) - var/many = alert(src, "Create only one [value["type"]] and assign each or a new one for each thing", "How Many", "One", "Many", "Cancel") - if (many == "Cancel") - return - if (many == "Many") - many = TRUE - else - many = FALSE - - var/type = value["type"] - to_chat(src, "Finding items...") - var/list/items = get_all_of_type(O.type, method) - to_chat(src, "Changing [length(items)] items...") - for(var/thing in items) - if (!thing) - continue - var/datum/D = thing - if(many && !new_value) - new_value = new type() - - if (D.vv_edit_var(variable, new_value) != FALSE) - accepted++ - else - rejected++ - new_value = null - CHECK_TICK - - else - to_chat(src, "Finding items...") - var/list/items = get_all_of_type(O.type, method) - to_chat(src, "Changing [length(items)] items...") - for(var/thing in items) - if (!thing) - continue - var/datum/D = thing - if (D.vv_edit_var(variable, new_value) != FALSE) - accepted++ - else - rejected++ - CHECK_TICK - - - var/count = rejected+accepted - if (!count) - to_chat(src, "No objects found") - return - if (!accepted) - to_chat(src, "Every object rejected your edit") - return - if (rejected) - to_chat(src, "[rejected] out of [count] objects rejected your edit") - - log_world("### MassVarEdit by [src]: [O.type] (A/R [accepted]/[rejected]) [variable]=[html_encode("[O.vars[variable]]")]([list2params(value)])") - log_admin("[key_name(src)] mass modified [original_name]'s [variable] to [O.vars[variable]] ([accepted] objects modified)") - message_admins("[key_name_admin(src)] mass modified [original_name]'s [variable] to [O.vars[variable]] ([accepted] objects modified)") diff --git a/code/modules/admin/view_variables/admin_delete.dm b/code/modules/admin/view_variables/admin_delete.dm new file mode 100644 index 0000000000000..4bbc5e00ea3b9 --- /dev/null +++ b/code/modules/admin/view_variables/admin_delete.dm @@ -0,0 +1,30 @@ +/client/proc/admin_delete(datum/D) + var/atom/A = D + var/coords = "" + var/jmp_coords = "" + if(isclient(D) && !check_rights(R_DBRANKS)) + log_admin_private("[key_name(usr)] has tried to delete a client [D]!") + message_admins("[ADMIN_TPMONTY(usr)] has tried to delete a client [D]!") + return + if(istype(A)) + var/turf/T = get_turf(A) + if(T) + var/atom/a_loc = A.loc + var/is_turf = isturf(a_loc) + coords = "[is_turf ? "at" : "from [a_loc] at"] [AREACOORD(T)]" + jmp_coords = "[is_turf ? "at" : "from [a_loc] at"] [ADMIN_VERBOSEJMP(T)]" + else + jmp_coords = coords = "in nullspace" + + if (tgui_alert(usr, "Are you sure you want to delete:\n[D]\n[coords]?", "Confirmation", list("Yes", "No")) == "Yes") + log_admin("[key_name(usr)] deleted [D] [coords]") + message_admins("[key_name_admin(usr)] deleted [D] [jmp_coords]") + SSblackbox.record_feedback("tally", "admin_verb", 1, "Delete") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + if(isturf(D)) + var/turf/T = D + T.ScrapeAway() + else + vv_update_display(D, "deleted", VV_MSG_DELETED) + qdel(D) + if(!QDELETED(D)) + vv_update_display(D, "deleted", "") diff --git a/code/modules/admin/view_variables/color_matrix_editor.dm b/code/modules/admin/view_variables/color_matrix_editor.dm new file mode 100644 index 0000000000000..8ea8ea0115dd3 --- /dev/null +++ b/code/modules/admin/view_variables/color_matrix_editor.dm @@ -0,0 +1,99 @@ +/datum/color_matrix_editor + var/client/owner + var/datum/weakref/target + var/atom/movable/screen/map_view/proxy_view + /// All the plane masters that need to be applied. + var/list/proxy_plane_masters + var/list/current_color + var/closed + +/datum/color_matrix_editor/New(user, atom/_target = null) + owner = CLIENT_FROM_VAR(user) + if(islist(_target?.color)) + current_color = _target.color + else if(istext(_target?.color)) + current_color = color_hex2color_matrix(_target.color) + else + current_color = color_matrix_identity() + + var/mutable_appearance/view = image('icons/misc/colortest.dmi', "colors") + if(_target) + target = WEAKREF(_target) + if(!(_target.appearance_flags & PLANE_MASTER)) + view = image(_target) + + // Map name has to start and end with an A-Z character, + // and definitely NOT with a square bracket or even a number. + var/map_name = "color_matrix_proxy_[REF(src)]" + + proxy_view = new + proxy_view.appearance = view + proxy_view.name = "screen" + proxy_view.assigned_map = map_name + proxy_view.screen_loc = "[map_name]:1,1" + + proxy_plane_masters = list() + for(var/plane in subtypesof(/atom/movable/screen/plane_master) - /atom/movable/screen/plane_master/blackness) + var/atom/movable/screen/plane_master/instance = new plane() + instance.assigned_map = map_name + if(instance.blend_mode_override) + instance.blend_mode = instance.blend_mode_override + instance.screen_loc = "[map_name]:CENTER" + proxy_plane_masters += instance + +/datum/color_matrix_editor/Destroy(force, ...) + QDEL_NULL(proxy_view) + return ..() + +/datum/color_matrix_editor/ui_state(mob/user) + return GLOB.admin_state + +/datum/color_matrix_editor/ui_static_data(mob/user) + var/list/data = list() + data["mapRef"] = proxy_view.assigned_map + + return data + +/datum/color_matrix_editor/ui_data(mob/user) + var/list/data = list() + data["currentColor"] = current_color + + return data + +/datum/color_matrix_editor/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "ColorMatrixEditor") + ui.open() + +/datum/color_matrix_editor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + if(.) + return + switch(action) + if("transition_color") + current_color = params["color"] + animate(proxy_view, time = 4, color = current_color) + if("confirm") + on_confirm() + SStgui.close_uis(src) + +/datum/color_matrix_editor/ui_close(mob/user) + . = ..() + closed = TRUE + +/datum/color_matrix_editor/proc/on_confirm() + var/atom/target_atom = target?.resolve() + if(istype(target_atom)) + target_atom.vv_edit_var("color", current_color) + +/datum/color_matrix_editor/proc/wait() + while(!closed) + stoplag(1) + +/client/proc/open_color_matrix_editor(atom/in_atom) + var/datum/color_matrix_editor/editor = new /datum/color_matrix_editor(src, in_atom) + editor.ui_interact(mob) + editor.wait() + . = editor.current_color + qdel(editor) diff --git a/code/modules/admin/view_variables/debug_variables.dm b/code/modules/admin/view_variables/debug_variables.dm new file mode 100644 index 0000000000000..382aea56ef7c1 --- /dev/null +++ b/code/modules/admin/view_variables/debug_variables.dm @@ -0,0 +1,125 @@ +#define VV_HTML_ENCODE(thing) ( sanitize ? html_encode(thing) : thing ) +/// Get displayed variable in VV variable list +/proc/debug_variable(name, value, level, datum/owner, sanitize = TRUE, display_flags = NONE) //if D is a list, name will be index, and value will be assoc value. + if(owner) + if(islist(owner)) + var/index = name + if (value) + name = owner[name] //name is really the index until this line + else + value = owner[name] + . = "
- [items.Join()]
+
|
+
+
+
+
+
+ [formatted_type]
+
+ [ref_line] + [marked_line] + [tagged_line] + [varedited_line] + [deleted_line] + |
+
+
+ Refresh
+
+
+ |
+
+ + E - Edit, tries to determine the variable type by itself.
+ C - Change, asks you for the var type first.
+ M - Mass modify: changes this variable for all objects of this type.
+ +
+
|
+
+ Search:
+
+ |
+ + + | +
+
-
+ [variable_html.Join()]
+
Custom Information
") - to_chat(src, "The following custom information has been set for this round:
") - to_chat(src, span_alert("[GLOB.custom_info]")) - to_chat(src, "") + to_chat(src, assemble_alert( + title = "Custom Information", + subtitle = "The following custom information has been set for this round.", + message = GLOB.custom_info, + color_override = "red" + )) connection_time = world.time connection_realtime = world.realtime diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index d8a346be36c8b..3aa83f85eb024 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -225,3 +225,21 @@ GLOBAL_LIST_INIT(gear_datums, populate_gear_list()) cost = 2 slot = SLOT_R_HAND +/datum/gear/rosary + display_name = "Rosary" + path = /obj/item/rosary + cost = 1 + slot = SLOT_R_HAND + +/datum/gear/card/ace/hearts + display_name = "Old Ace of Hearts card" + path = /obj/item/toy/card/ace/hearts + cost = 1 + slot = SLOT_R_HAND + +/datum/gear/card/ace/spades + display_name = "Old Ace of Spades card" + path = /obj/item/toy/card/ace/spades + cost = 1 + slot = SLOT_R_HAND + diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm index 782551b9a460f..048a2a86de9c3 100644 --- a/code/modules/client/preferences_toggles.dm +++ b/code/modules/client/preferences_toggles.dm @@ -157,7 +157,7 @@ to_chat(src, span_notice("You will now hear ambient sounds.")) else to_chat(src, span_notice("You will no longer hear ambient sounds.")) - mob.stop_sound_channel(CHANNEL_AMBIENT) + mob.stop_sound_channel(CHANNEL_AMBIENCE) usr.client.update_ambience_pref() @@ -203,7 +203,7 @@ GLOBAL_LIST_INIT(ghost_forms, list("Default" = GHOST_DEFAULT_FORM, "Ghost Ian 1" return var/mob/dead/observer/O = mob - O.update_icon(GLOB.ghost_forms[new_form]) + O.pick_form(GLOB.ghost_forms[new_form]) GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE, GHOST_ORBIT_TRIANGLE, GHOST_ORBIT_SQUARE, GHOST_ORBIT_HEXAGON, GHOST_ORBIT_PENTAGON)) @@ -293,7 +293,7 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE usr.client.prefs.toggles_sound ^= SOUND_WEATHER prefs.save_preferences() - to_chat(usr, span_notice("You will [(usr.client.prefs.toggles_sound & SOUND_WEATHER) ? "no longer" : "now"] hear weather.")) + to_chat(usr, span_notice("You will [(usr.client.prefs.toggles_sound & SOUND_WEATHER) ? "now" : "no longer"] hear weather.")) /client/verb/toggle_gas_mask_sound() set category = "Preferences" diff --git a/code/modules/client/preferences_ui.dm b/code/modules/client/preferences_ui.dm index d6d79fc57ce14..e23464c70cd10 100644 --- a/code/modules/client/preferences_ui.dm +++ b/code/modules/client/preferences_ui.dm @@ -152,6 +152,7 @@ data["radialstackspref"] = !!(toggles_gameplay & RADIAL_STACKS) data["radiallasersgunpref"] = !!(toggles_gameplay & RADIAL_LASERGUNS) data["autointeractdeployablespref"] = !!(toggles_gameplay & AUTO_INTERACT_DEPLOYABLES) + data["directional_attacks"] = !!(toggles_gameplay & DIRECTIONAL_ATTACKS) data["scaling_method"] = scaling_method data["pixel_size"] = pixel_size data["parallax"] = parallax @@ -974,6 +975,9 @@ if("autointeractdeployablespref") toggles_gameplay ^= AUTO_INTERACT_DEPLOYABLES + if("directional_attacks") + toggles_gameplay ^= DIRECTIONAL_ATTACKS + if("pixel_size") switch(pixel_size) if(PIXEL_SCALING_AUTO) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index a22c884344fb2..5bbdf8d9be306 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -3,7 +3,7 @@ // Resets the armor on clothing since by default /objs get 100 bio armor soft_armor = list() - flags_inventory = NOQUICKEQUIP + inventory_flags = NOQUICKEQUIP ///Assoc list of available slots. Since this keeps track of all currently equiped attachments per object, this cannot be a string_list() var/list/attachments_by_slot = list() @@ -16,7 +16,7 @@ var/list/starting_attachments = list() /// Bitflags used to determine the state of the armor (light on, overlay used, or reinfornced), currently support flags are in [equipment.dm:100] - var/flags_armor_features = NONE + var/armor_features_flags = NONE /// used for headgear, masks, and glasses, to see how much they protect eyes from bright lights. var/eye_protection = 0 @@ -35,26 +35,26 @@ /obj/item/clothing/equipped(mob/user, slot) . = ..() - if(!(flags_equip_slot & slotdefine2slotbit(slot))) + if(!(equip_slot_flags & slotdefine2slotbit(slot))) return if(!ishuman(user)) return var/mob/living/carbon/human/human_user = user if(accuracy_mod) human_user.adjust_mob_accuracy(accuracy_mod) - if(flags_armor_features & ARMOR_FIRE_RESISTANT) + if(armor_features_flags & ARMOR_FIRE_RESISTANT) ADD_TRAIT(human_user, TRAIT_NON_FLAMMABLE, src) /obj/item/clothing/unequipped(mob/unequipper, slot) - if(!(flags_equip_slot & slotdefine2slotbit(slot))) + if(!(equip_slot_flags & slotdefine2slotbit(slot))) return ..() if(!ishuman(unequipper)) return ..() var/mob/living/carbon/human/human_unequipper = unequipper if(accuracy_mod) human_unequipper.adjust_mob_accuracy(-accuracy_mod) - if(flags_armor_features & ARMOR_FIRE_RESISTANT) + if(armor_features_flags & ARMOR_FIRE_RESISTANT) REMOVE_TRAIT(human_unequipper, TRAIT_NON_FLAMMABLE, src) return ..() @@ -121,7 +121,7 @@ ) w_class = WEIGHT_CLASS_TINY throwforce = 2 - flags_equip_slot = ITEM_SLOT_EARS + equip_slot_flags = ITEM_SLOT_EARS /obj/item/clothing/ears/update_clothing_icon() if (ismob(src.loc)) @@ -134,7 +134,7 @@ desc = "Protects your hearing from loud noises, and quiet ones as well." icon_state = "earmuffs" item_state = "earmuffs" - flags_equip_slot = ITEM_SLOT_EARS + equip_slot_flags = ITEM_SLOT_EARS /obj/item/clothing/ears/earmuffs/green icon_state = "earmuffs2" @@ -151,10 +151,10 @@ slot_r_hand_str = 'icons/mob/inhands/clothing/suits_right.dmi', ) name = "suit" - flags_armor_protection = CHEST|GROIN|ARMS|LEGS + armor_protection_flags = CHEST|GROIN|ARMS|LEGS allowed = list(/obj/item/tank/emergency_oxygen) soft_armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 0, ACID = 0) - flags_equip_slot = ITEM_SLOT_OCLOTHING + equip_slot_flags = ITEM_SLOT_OCLOTHING siemens_coefficient = 0.9 w_class = WEIGHT_CLASS_NORMAL attachments_by_slot = list(ATTACHMENT_SLOT_BADGE) @@ -185,10 +185,9 @@ if(. != CHECKS_PASSED) return set_light_on(toggle_on) - flags_armor_features ^= ARMOR_LAMP_ON + armor_features_flags ^= ARMOR_LAMP_ON playsound(src, 'sound/items/flashlight.ogg', 15, TRUE) - update_icon(user) - update_action_button_icons() + update_icon() /obj/item/clothing/suit/update_clothing_icon() if(ismob(loc)) @@ -222,8 +221,8 @@ var/clipped = 0 var/transfer_prints = TRUE blood_sprite_state = "bloodyhands" - flags_armor_protection = HANDS - flags_equip_slot = ITEM_SLOT_GLOVES + armor_protection_flags = HANDS + equip_slot_flags = ITEM_SLOT_GLOVES attack_verb = list("challenged") @@ -239,9 +238,7 @@ cell.charge -= 1000 / severity if (cell.charge < 0) cell.charge = 0 - if(cell.reliability != 100 && prob(50/severity)) - cell.reliability -= 10 / severity - ..() + return ..() // Called just before an attack_hand(), in mob/UnarmedAttack() /obj/item/clothing/gloves/proc/Touch(atom/A, proximity) @@ -249,6 +246,8 @@ /obj/item/clothing/gloves/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(iswirecutter(I) || istype(I, /obj/item/tool/surgery/scalpel)) if(clipped) to_chat(user, span_notice("The [src] have already been clipped!")) @@ -274,8 +273,8 @@ slot_l_hand_str = 'icons/mob/inhands/clothing/masks_left.dmi', slot_r_hand_str = 'icons/mob/inhands/clothing/masks_right.dmi', ) - flags_equip_slot = ITEM_SLOT_MASK - flags_armor_protection = FACE|EYES + equip_slot_flags = ITEM_SLOT_MASK + armor_protection_flags = FACE|EYES blood_sprite_state = "maskblood" var/anti_hug = 0 var/toggleable = FALSE @@ -303,8 +302,8 @@ desc = "Comfortable-looking shoes." gender = PLURAL //Carn: for grammarically correct text-parsing siemens_coefficient = 0.9 - flags_armor_protection = FEET - flags_equip_slot = ITEM_SLOT_FEET + armor_protection_flags = FEET + equip_slot_flags = ITEM_SLOT_FEET permeability_coefficient = 0.50 slowdown = SHOES_SLOWDOWN blood_sprite_state = "shoeblood" diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 4f180cd016492..3354d41d8d9c3 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -10,9 +10,9 @@ var/prescription = FALSE var/toggleable = FALSE active = TRUE - flags_inventory = COVEREYES - flags_equip_slot = ITEM_SLOT_EYES - flags_armor_protection = EYES + inventory_flags = COVEREYES + equip_slot_flags = ITEM_SLOT_EYES + armor_protection_flags = EYES var/deactive_state = "degoggles" var/vision_flags = NONE var/darkness_view = 2 //Base human is 2 @@ -83,10 +83,12 @@ desc = "Yarr." icon_state = "eyepatch" item_state = "eyepatch" - flags_armor_protection = NONE + armor_protection_flags = NONE /obj/item/clothing/glasses/eyepatch/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/clothing/glasses/hud/health)) var/obj/item/clothing/glasses/hud/medpatch/P = new @@ -101,14 +103,14 @@ qdel(src) user.put_in_hands(P) - update_icon(user) + update_icon() /obj/item/clothing/glasses/monocle name = "monocle" desc = "Such a dapper eyepiece!" icon_state = "monocle" - flags_armor_protection = NONE + armor_protection_flags = NONE /obj/item/clothing/glasses/material name = "optical material scanner" @@ -128,6 +130,8 @@ /obj/item/clothing/glasses/regular/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/clothing/glasses/hud/health)) var/obj/item/clothing/glasses/hud/medglasses/P = new @@ -136,7 +140,7 @@ qdel(src) user.put_in_hands(P) - update_icon(user) + update_icon() /obj/item/clothing/glasses/regular/hipster name = "prescription glasses" @@ -149,14 +153,14 @@ name = "3D glasses" icon_state = "3d" item_state = "3d" - flags_armor_protection = NONE + armor_protection_flags = NONE /obj/item/clothing/glasses/gglasses name = "green glasses" desc = "Forest green glasses, like the kind you'd wear when hatching a nasty scheme." icon_state = "gglasses" item_state = "gglasses" - flags_armor_protection = NONE + armor_protection_flags = NONE /obj/item/clothing/glasses/mgoggles name = "marine ballistic goggles" @@ -164,7 +168,7 @@ icon_state = "mgoggles" item_state = "mgoggles" soft_armor = list(MELEE = 40, BULLET = 40, LASER = 0, ENERGY = 15, BOMB = 35, BIO = 10, FIRE = 30, ACID = 30) - flags_equip_slot = ITEM_SLOT_EYES|ITEM_SLOT_MASK + equip_slot_flags = ITEM_SLOT_EYES|ITEM_SLOT_MASK goggles = TRUE w_class = WEIGHT_CLASS_TINY @@ -176,6 +180,8 @@ /obj/item/clothing/glasses/mgoggles/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/clothing/glasses/hud/health)) if(prescription) @@ -204,7 +210,7 @@ qdel(src) user.put_in_hands(S) - update_icon(user) + update_icon() /obj/item/clothing/glasses/m42_goggles name = "\improper M42 scout sight" @@ -226,8 +232,8 @@ icon_state = "welding-g" item_state = "welding-g" actions_types = list(/datum/action/item_action/toggle) - flags_inventory = COVEREYES - flags_inv_hide = HIDEEYES + inventory_flags = COVEREYES + inv_hide_flags = HIDEEYES eye_protection = 2 activation_sound = null deactivation_sound = null @@ -256,9 +262,9 @@ ///Toggle the welding goggles on /obj/item/clothing/glasses/welding/proc/flip_up(mob/user) - DISABLE_BITFIELD(flags_inventory, COVEREYES) - DISABLE_BITFIELD(flags_inv_hide, HIDEEYES) - DISABLE_BITFIELD(flags_armor_protection, EYES) + DISABLE_BITFIELD(inventory_flags, COVEREYES) + DISABLE_BITFIELD(inv_hide_flags, HIDEEYES) + DISABLE_BITFIELD(armor_protection_flags, EYES) eye_protection = 0 update_icon() if(user) @@ -266,9 +272,9 @@ ///Toggle the welding goggles off /obj/item/clothing/glasses/welding/proc/flip_down(mob/user) - ENABLE_BITFIELD(flags_inventory, COVEREYES) - ENABLE_BITFIELD(flags_inv_hide, HIDEEYES) - ENABLE_BITFIELD(flags_armor_protection, EYES) + ENABLE_BITFIELD(inventory_flags, COVEREYES) + ENABLE_BITFIELD(inv_hide_flags, HIDEEYES) + ENABLE_BITFIELD(armor_protection_flags, EYES) eye_protection = initial(eye_protection) update_icon() if(user) @@ -336,6 +342,8 @@ /obj/item/clothing/glasses/sunglasses/fake/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/clothing/glasses/hud/health)) var/obj/item/clothing/glasses/hud/medsunglasses/P = new @@ -356,7 +364,7 @@ qdel(src) user.put_in_hands(P) - update_icon(user) + update_icon() /obj/item/clothing/glasses/sunglasses/fake/prescription name = "prescription sunglasses" @@ -371,22 +379,6 @@ name = "prescription sunglasses" prescription = TRUE -/obj/item/clothing/glasses/sunglasses/sa - name = "spatial agent's sunglasses" - desc = "Glasses worn by a spatial agent." - eye_protection = 2 - darkness_view = 8 - vision_flags = SEE_TURFS|SEE_MOBS|SEE_OBJS - lighting_alpha = LIGHTING_PLANE_ALPHA_INVISIBLE - -/obj/item/clothing/glasses/sunglasses/sa/Initialize(mapload) - . = ..() - AddComponent(/datum/component/clothing_tint, TINT_NONE) - -/obj/item/clothing/glasses/sunglasses/sa/nodrop - desc = "Glasses worn by a spatial agent. cannot be dropped" - flags_item = DELONDROP - /obj/item/clothing/glasses/sunglasses/sechud name = "HUDSunglasses" desc = "Sunglasses with a HUD." diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index bfc452db57ac9..a6f32ebfa090c 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -1,8 +1,10 @@ /obj/item/clothing/glasses/hud name = "HUD" desc = "A heads-up display that provides important info in (almost) real time." - flags_atom = null //doesn't protect eyes because it's a monocle, duh + atom_flags = null //doesn't protect eyes because it's a monocle, duh + ///The hud type(s) to give this type of glasses var/hud_type + ///The user wearing the glasses var/mob/living/carbon/human/affected_user @@ -19,13 +21,13 @@ if(active) activate_hud(user) else if(affected_user) - deactivate_hud() + deactivate_hud(user) return ..() /obj/item/clothing/glasses/hud/dropped(mob/user) if(affected_user) - deactivate_hud() + deactivate_hud(user) return ..() @@ -47,14 +49,24 @@ ///Activates the hud(s) these glasses have /obj/item/clothing/glasses/hud/proc/activate_hud(mob/living/carbon/human/user) - var/datum/atom_hud/hud_datum = GLOB.huds[hud_type] - hud_datum.add_hud_to(user) affected_user = user - - -/obj/item/clothing/glasses/hud/proc/deactivate_hud() - var/datum/atom_hud/hud_datum = GLOB.huds[hud_type] - hud_datum.remove_hud_from(affected_user) + if(islist(hud_type)) + for(var/hud in hud_type) + var/datum/atom_hud/hud_datum = GLOB.huds[hud] + hud_datum.add_hud_to(affected_user) + else + var/datum/atom_hud/hud_datum = GLOB.huds[hud_type] + hud_datum.add_hud_to(affected_user) + +///Deactivates the hud(s) these glasses have +/obj/item/clothing/glasses/hud/proc/deactivate_hud(mob/user) + if(islist(hud_type)) + for(var/hud in hud_type) + var/datum/atom_hud/hud_datum = GLOB.huds[hud] + hud_datum.remove_hud_from(affected_user) + else + var/datum/atom_hud/hud_datum = GLOB.huds[hud_type] + hud_datum.remove_hud_from(affected_user) affected_user = null @@ -63,7 +75,7 @@ desc = "A heads-up display that scans the humans in view and provides accurate data about their health status. The projector can be attached to compatable eyewear." icon_state = "healthhud" deactive_state = "degoggles_med" - flags_armor_protection = NONE + armor_protection_flags = NONE toggleable = TRUE hud_type = DATA_HUD_MEDICAL_ADVANCED actions_types = list(/datum/action/item_action/toggle) @@ -93,7 +105,7 @@ "Hammerhead Combat Robot" = 'icons/mob/species/robot/glasses_alpharii.dmi', "Ratcher Combat Robot" = 'icons/mob/species/robot/glasses_deltad.dmi') soft_armor = list(MELEE = 40, BULLET = 40, LASER = 0, ENERGY = 15, BOMB = 35, BIO = 10, FIRE = 30, ACID = 30) - flags_equip_slot = ITEM_SLOT_EYES + equip_slot_flags = ITEM_SLOT_EYES goggles = TRUE /obj/item/clothing/glasses/hud/medgoggles/prescription @@ -166,7 +178,7 @@ icon_state = "securityhud" deactive_state = "degoggles_sec" toggleable = 1 - flags_armor_protection = NONE + armor_protection_flags = NONE hud_type = DATA_HUD_SECURITY_ADVANCED actions_types = list(/datum/action/item_action/toggle) var/global/list/jobs[0] @@ -192,7 +204,7 @@ "Chilvaris Combat Robot" = 'icons/mob/species/robot/glasses_charlit.dmi', "Hammerhead Combat Robot" = 'icons/mob/species/robot/glasses_alpharii.dmi', "Ratcher Combat Robot" = 'icons/mob/species/robot/glasses_deltad.dmi') - flags_armor_protection = NONE + armor_protection_flags = NONE toggleable = TRUE hud_type = DATA_HUD_XENO_STATUS actions_types = list(/datum/action/item_action/toggle) @@ -232,4 +244,4 @@ /obj/item/clothing/glasses/hud/sa/nodrop desc = "Glasses worn by a spatial agent. They delete themselves if you take them off!" - flags_item = DELONDROP + item_flags = DELONDROP diff --git a/code/modules/clothing/glasses/meson.dm b/code/modules/clothing/glasses/meson.dm index b6b73450b5ac7..3e7f07f8095d2 100644 --- a/code/modules/clothing/glasses/meson.dm +++ b/code/modules/clothing/glasses/meson.dm @@ -31,7 +31,7 @@ icon_state = "enggoggles" item_state = "enggoggles" deactive_state = "degoggles_enggoggles" - flags_equip_slot = ITEM_SLOT_EYES + equip_slot_flags = ITEM_SLOT_EYES goggles = TRUE /obj/item/clothing/glasses/meson/enggoggles/prescription diff --git a/code/modules/clothing/glasses/night.dm b/code/modules/clothing/glasses/night.dm index 5bd664a56f205..f33bcfabc2222 100644 --- a/code/modules/clothing/glasses/night.dm +++ b/code/modules/clothing/glasses/night.dm @@ -54,7 +54,7 @@ item_state = "alien_lens" darkness_view = 7 lighting_alpha = LIGHTING_PLANE_ALPHA_INVISIBLE - flags_item = DELONDROP + item_flags = DELONDROP /obj/item/clothing/glasses/night/sectoid/Initialize(mapload) . = ..() @@ -100,7 +100,7 @@ "Chilvaris Combat Robot" = 'icons/mob/species/robot/glasses_charlit.dmi', "Hammerhead Combat Robot" = 'icons/mob/species/robot/glasses_alpharii.dmi', "Ratcher Combat Robot" = 'icons/mob/species/robot/glasses_deltad.dmi') - flags_equip_slot = ITEM_SLOT_EYES + equip_slot_flags = ITEM_SLOT_EYES goggles = TRUE /obj/item/clothing/glasses/night/optgoggles/prescription diff --git a/code/modules/clothing/glasses/thermal.dm b/code/modules/clothing/glasses/thermal.dm index 5e22a6488ce3a..1dd808c8b8e98 100644 --- a/code/modules/clothing/glasses/thermal.dm +++ b/code/modules/clothing/glasses/thermal.dm @@ -36,9 +36,9 @@ name = "Thermoncle" desc = "A monocle thermal." icon_state = "thermoncle" - flags_atom = null //doesn't protect eyes because it's a monocle, duh + atom_flags = null //doesn't protect eyes because it's a monocle, duh toggleable = 0 - flags_armor_protection = NONE + armor_protection_flags = NONE /obj/item/clothing/glasses/thermal/eyepatch name = "Optical Thermal Eyepatch" @@ -46,7 +46,7 @@ icon_state = "eyepatch" item_state = "eyepatch" toggleable = 0 - flags_armor_protection = NONE + armor_protection_flags = NONE /obj/item/clothing/glasses/thermal/jensen name = "Optical Thermal Implants" diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index 8314781bb0b51..0e2c5dbc7a51f 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -4,9 +4,9 @@ icon_state = "insulated" siemens_coefficient = 0 permeability_coefficient = 0.05 - flags_cold_protection = HANDS + cold_protection_flags = HANDS min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE - flags_heat_protection = HANDS + heat_protection_flags = HANDS max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE /obj/item/clothing/gloves/yellow //Cheap Chinese Crap @@ -24,9 +24,9 @@ desc = "These gloves are fire-resistant." name = "black gloves" icon_state = "black" - flags_cold_protection = HANDS + cold_protection_flags = HANDS min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE - flags_heat_protection = HANDS + heat_protection_flags = HANDS max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE @@ -80,7 +80,7 @@ desc = "A field of invisible energy, it protects the wearer but prevents any clothing from being worn." icon = 'icons/effects/effects.dmi' icon_state = "shield-blue" - flags_item = DELONDROP + item_flags = DELONDROP soft_armor = list(MELEE = 25, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 30, BIO = 20, FIRE = 20, ACID = 25) /obj/item/clothing/gloves/sectoid/Initialize(mapload) diff --git a/code/modules/clothing/gloves/marine_gloves.dm b/code/modules/clothing/gloves/marine_gloves.dm index c4401c6f97be8..8db71f2cad1b8 100644 --- a/code/modules/clothing/gloves/marine_gloves.dm +++ b/code/modules/clothing/gloves/marine_gloves.dm @@ -9,11 +9,11 @@ icon_state = "gloves_marine" siemens_coefficient = 0.6 permeability_coefficient = 0.05 - flags_cold_protection = HANDS - flags_heat_protection = HANDS + cold_protection_flags = HANDS + heat_protection_flags = HANDS min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE - flags_armor_protection = HANDS + armor_protection_flags = HANDS soft_armor = list(MELEE = 25, BULLET = 15, LASER = 10, ENERGY = 15, BOMB = 15, BIO = 5, FIRE = 15, ACID = 15) /obj/item/clothing/gloves/marine/black @@ -84,7 +84,7 @@ name = "\improper B18 defensive gauntlets" desc = "A pair of heavily armored gloves." icon_state = "armored" - flags_item = SYNTH_RESTRICTED + item_flags = SYNTH_RESTRICTED soft_armor = list(MELEE = 35, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 25, BIO = 15, FIRE = 15, ACID = 20) resistance_flags = UNACIDABLE @@ -93,13 +93,13 @@ desc = "Armored gloves used in special operations. They are also insulated against electrical shock." icon_state = "black" siemens_coefficient = 0 - flags_item = SYNTH_RESTRICTED + item_flags = SYNTH_RESTRICTED soft_armor = list(MELEE = 30, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 30, BIO = 20, FIRE = 20, ACID = 15) /obj/item/clothing/gloves/marine/veteran/pmc/commando name = "\improper PMC commando gloves" desc = "A pair of heavily armored, insulated, acid-resistant gloves." - icon_state = "armored" + icon_state = "death_squad" soft_armor = list(MELEE = 40, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 30, BIO = 20, FIRE = 20, ACID = 25) resistance_flags = UNACIDABLE diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 59850ced7de9c..c06991148f71a 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -2,9 +2,9 @@ desc = "Regal blue gloves, with a nice gold trim. Swanky." name = "captain's gloves" icon_state = "captain" - flags_cold_protection = HANDS + cold_protection_flags = HANDS min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE - flags_heat_protection = HANDS + heat_protection_flags = HANDS max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE /obj/item/clothing/gloves/swat @@ -14,9 +14,9 @@ siemens_coefficient = 0.6 permeability_coefficient = 0.05 - flags_cold_protection = HANDS + cold_protection_flags = HANDS min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE - flags_heat_protection = HANDS + heat_protection_flags = HANDS max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE /obj/item/clothing/gloves/combat //Combined effect of SWAT gloves and insulated gloves @@ -25,9 +25,9 @@ icon_state = "black" siemens_coefficient = 0 permeability_coefficient = 0.05 - flags_cold_protection = HANDS + cold_protection_flags = HANDS min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE - flags_heat_protection = HANDS + heat_protection_flags = HANDS max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE /obj/item/clothing/gloves/ruggedgloves @@ -36,9 +36,9 @@ icon_state = "black" siemens_coefficient = 0 permeability_coefficient = 0.05 - flags_cold_protection = HANDS + cold_protection_flags = HANDS min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE - flags_heat_protection = HANDS + heat_protection_flags = HANDS max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE soft_armor = list(MELEE = 10, BULLET = 10, LASER = 15, ENERGY = 10, BOMB = 10, BIO = 10, FIRE = 10, ACID = 10) diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index f6c6f00908b75..23cde0b164760 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -14,13 +14,13 @@ name = "collectable slime cap!" desc = "It just latches right in place!" icon_state = "slime" - flags_armor_protection = NONE + armor_protection_flags = NONE /obj/item/clothing/head/collectable/xenom name = "collectable xenomorph helmet!" desc = "Hiss hiss hiss!" icon_state = "xenom" - flags_armor_protection = HEAD|FACE|EYES + armor_protection_flags = HEAD|FACE|EYES /obj/item/clothing/head/collectable/chef name = "collectable chef's hat" @@ -32,40 +32,40 @@ name = "collectable paper hat" desc = "What looks like an ordinary paper hat, is actually a rare and valuable collector's edition paper hat. Keep away from water, fire and Librarians." icon_state = "paper" - flags_armor_protection = NONE + armor_protection_flags = NONE /obj/item/clothing/head/collectable/tophat name = "collectable top hat" desc = "A top hat worn by only the most prestigious hat collectors." icon_state = "tophat" item_state = "that" - flags_armor_protection = NONE + armor_protection_flags = NONE /obj/item/clothing/head/collectable/captain name = "collectable captain's hat" desc = "A Collectable Hat that'll make you look just like a real comdom!" icon_state = "captain" item_state = "caphat" - flags_armor_protection = NONE + armor_protection_flags = NONE /obj/item/clothing/head/collectable/police name = "collectable police officer's hat" desc = "A Collectable Police Officer's Hat. This hat emphasizes that you are THE LAW." icon_state = "policehelm" - flags_armor_protection = NONE + armor_protection_flags = NONE /obj/item/clothing/head/collectable/beret name = "collectable beret" desc = "A Collectable red Beret. It smells faintly of Garlic." icon_state = "beret" - flags_armor_protection = NONE + armor_protection_flags = NONE /obj/item/clothing/head/collectable/welding name = "collectable welding helmet" desc = "A Collectable Welding Helmet. Now with 80% less lead! Not for actual welding. Any welding done while wearing this Helmet is done so at the owner's own risk!" icon_state = "welding" item_state = "welding" - flags_armor_protection = HEAD|FACE|EYES + armor_protection_flags = HEAD|FACE|EYES /obj/item/clothing/head/collectable/slime name = "collectable slime hat" @@ -84,14 +84,14 @@ desc = "You'd make a great Dread Syndie Roberts!" icon_state = "pirate" item_state = "pirate" - flags_armor_protection = NONE + armor_protection_flags = NONE /obj/item/clothing/head/collectable/rabbitears name = "collectable rabbit ears" desc = "Not as lucky as the feet!" icon_state = "bunny" item_state = "bunny" - flags_armor_protection = NONE + armor_protection_flags = NONE /obj/item/clothing/head/collectable/wizard name = "collectable wizard's hat" @@ -103,13 +103,13 @@ desc = "WARNING! Offers no real protection, or luminosity, but it is damn fancy!" icon_state = "hardhat0_yellow" item_state = "hardhat0_yellow" - flags_armor_protection = NONE + armor_protection_flags = NONE /obj/item/clothing/head/collectable/HoS name = "collectable HoS hat" desc = "Now you can beat prisoners, set silly sentences and arrest for no reason too!" icon_state = "hoscap" - flags_armor_protection = NONE + armor_protection_flags = NONE /obj/item/clothing/head/collectable/thunderdome name = "collectable Thunderdome helmet" diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 859d238dc30d4..872f25b1a20ba 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -6,7 +6,7 @@ soft_armor = list(MELEE = 30, BULLET = 5, LASER = 20, ENERGY = 10, BOMB = 20, BIO = 10, FIRE = 10, ACID = 10) actions_types = list(/datum/action/item_action/toggle) siemens_coefficient = 0.9 - flags_inventory = BLOCKSHARPOBJ + inventory_flags = BLOCKSHARPOBJ light_range = 4 light_power = 2 var/hardhat_color = "yellow" //Determines used sprites: hardhat[on]_[hardhat_color] @@ -37,14 +37,14 @@ update_action_button_icons() update_icon() -/obj/item/clothing/head/hardhat/attack_alien(mob/living/carbon/xenomorph/X, isrightclick = FALSE) - if(turn_light(X, FALSE) != CHECKS_PASSED) +/obj/item/clothing/head/hardhat/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) + if(turn_light(xeno_attacker, FALSE) != CHECKS_PASSED) return playsound(loc, "alien_claw_metal", 25, 1) - X.do_attack_animation(src, ATTACK_EFFECT_CLAW) - to_chat(X, span_warning("We disable the metal thing's lights.") ) + xeno_attacker.do_attack_animation(src, ATTACK_EFFECT_CLAW) + to_chat(xeno_attacker, span_warning("We disable the metal thing's lights.") ) -/obj/item/clothing/head/hardhat/update_icon() +/obj/item/clothing/head/hardhat/update_icon_state() . = ..() icon_state = "hardhat[light_on]_[hardhat_color]" item_state = "hardhat[light_on]_[hardhat_color]" @@ -57,15 +57,15 @@ icon_state = "hardhat0_red" hardhat_color = "red" name = "firefighter helmet" - flags_inventory = NOPRESSUREDMAGE|BLOCKSHARPOBJ - flags_heat_protection = HEAD + inventory_flags = NOPRESSUREDMAGE|BLOCKSHARPOBJ + heat_protection_flags = HEAD max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE /obj/item/clothing/head/hardhat/white icon_state = "hardhat0_white" hardhat_color = "white" - flags_inventory = NOPRESSUREDMAGE|BLOCKSHARPOBJ - flags_heat_protection = HEAD + inventory_flags = NOPRESSUREDMAGE|BLOCKSHARPOBJ + heat_protection_flags = HEAD max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE /obj/item/clothing/head/hardhat/dblue diff --git a/code/modules/clothing/head/head.dm b/code/modules/clothing/head/head.dm index c503b4bbd0d4e..950a0078e4d20 100644 --- a/code/modules/clothing/head/head.dm +++ b/code/modules/clothing/head/head.dm @@ -5,8 +5,8 @@ slot_l_hand_str = 'icons/mob/inhands/clothing/hats_left.dmi', slot_r_hand_str = 'icons/mob/inhands/clothing/hats_right.dmi', ) - flags_armor_protection = HEAD - flags_equip_slot = ITEM_SLOT_HEAD + armor_protection_flags = HEAD + equip_slot_flags = ITEM_SLOT_HEAD w_class = WEIGHT_CLASS_SMALL blood_sprite_state = "helmetblood" attachments_by_slot = list(ATTACHMENT_SLOT_BADGE) @@ -39,10 +39,11 @@ icon = 'icons/obj/clothing/headwear/marine_hats.dmi' item_icons = list( slot_head_str = 'icons/mob/clothing/headwear/marine_hats.dmi', - slot_l_hand_str = 'icons/mob/items_lefthand_1.dmi', - slot_r_hand_str = 'icons/mob/items_righthand_1.dmi',) + slot_l_hand_str = 'icons/mob/inhands/items/items_left.dmi', + slot_r_hand_str = 'icons/mob/inhands/items/items_right.dmi', + ) icon_state = "beanie_cargo" - flags_inv_hide = HIDETOPHAIR + inv_hide_flags = HIDETOPHAIR soft_armor = list(MELEE = 15, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 10, BIO = 5, FIRE = 5, ACID = 5) @@ -52,66 +53,67 @@ icon = 'icons/obj/clothing/headwear/marine_hats.dmi' item_icons = list( slot_head_str = 'icons/mob/clothing/headwear/marine_hats.dmi', - slot_l_hand_str = 'icons/mob/items_lefthand_1.dmi', - slot_r_hand_str = 'icons/mob/items_righthand_1.dmi',) + slot_l_hand_str = 'icons/mob/inhands/items/items_left.dmi', + slot_r_hand_str = 'icons/mob/inhands/items/items_right.dmi', + ) icon_state = "beret" soft_armor = list(MELEE = 15, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 10, BIO = 5, FIRE = 5, ACID = 5) - flags_item_map_variant = NONE - flags_armor_features = ARMOR_NO_DECAP + item_map_variant_flags = NONE + armor_features_flags = ARMOR_NO_DECAP /obj/item/clothing/head/tgmcberet/tan name = "\improper Tan beret" icon_state = "berettan" - flags_item_map_variant = (ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT) + item_map_variant_flags = (ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT) /obj/item/clothing/head/tgmcberet/red name = "\improper Red badged beret" icon_state = "beretred" - flags_item_map_variant = NONE + item_map_variant_flags = NONE /obj/item/clothing/head/tgmcberet/red2 name = "\improper Red beret" icon_state = "beretred2" - flags_item_map_variant = NONE + item_map_variant_flags = NONE /obj/item/clothing/head/tgmcberet/bloodred name = "\improper Blood red beret" icon_state = "bloodred_beret" - flags_item_map_variant = NONE + item_map_variant_flags = NONE /obj/item/clothing/head/tgmcberet/blueberet name = "\improper Blue beret" icon_state = "blue_beret" - flags_item_map_variant = NONE + item_map_variant_flags = NONE /obj/item/clothing/head/tgmcberet/darkgreen name = "\improper Dark green beret" icon_state = "darkgreen_beret" - flags_item_map_variant = NONE + item_map_variant_flags = NONE /obj/item/clothing/head/tgmcberet/green name = "\improper Green beret" icon_state = "beretgreen" - flags_item_map_variant = NONE + item_map_variant_flags = NONE /obj/item/clothing/head/tgmcberet/snow name = "\improper White beret" icon_state = "beretsnow" - flags_item_map_variant = NONE + item_map_variant_flags = NONE /obj/item/clothing/head/tgmcberet/wo name = "\improper Command Master at Arms beret" desc = "A beret with the lieutenant insignia emblazoned on it. It shines with the glow of corrupt authority and a smudge of doughnut." icon_state = "beretwo" soft_armor = list(MELEE = 15, BULLET = 50, LASER = 50, ENERGY = 15, BOMB = 50, BIO = 5, FIRE = 50, ACID = 5) - flags_item_map_variant = NONE + item_map_variant_flags = NONE /obj/item/clothing/head/tgmcberet/fc name = "\improper Field Commander beret" desc = "A beret with the field commander insignia emblazoned on it. It commands loyalty and bravery in all who gaze upon it." icon_state = "beretfc" soft_armor = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 10, BIO = 5, FIRE = 50, ACID = 50) - flags_item_map_variant = NONE + item_map_variant_flags = NONE /obj/item/clothing/head/tgmccap @@ -121,12 +123,13 @@ icon = 'icons/obj/clothing/headwear/marine_hats.dmi' item_icons = list( slot_head_str = 'icons/mob/clothing/headwear/marine_hats.dmi', - slot_l_hand_str = 'icons/mob/items_lefthand_1.dmi', - slot_r_hand_str = 'icons/mob/items_righthand_1.dmi',) + slot_l_hand_str = 'icons/mob/inhands/items/items_left.dmi', + slot_r_hand_str = 'icons/mob/inhands/items/items_right.dmi', + ) soft_armor = list(MELEE = 15, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 10, BIO = 5, FIRE = 5, ACID = 5) var/flipped_cap = FALSE var/base_cap_icon - flags_item_map_variant = (ITEM_ICE_VARIANT) + item_map_variant_flags = (ITEM_ICE_VARIANT) /obj/item/clothing/head/tgmccap/verb/fliphat() @@ -163,7 +166,7 @@ name = "\improper TGMC requisition cap" desc = "It's a fancy hat for a not-so-fancy military supply clerk." icon_state = "cargocap" - flags_item_map_variant = null + item_map_variant_flags = null /obj/item/clothing/head/boonie @@ -179,9 +182,10 @@ icon_state = "ornamented_cap" icon = 'icons/obj/clothing/headwear/marine_hats.dmi' item_icons = list( - slot_head_str = 'icons/mob/clothing/headwear/marine_hats.dmi',) + slot_head_str = 'icons/mob/clothing/headwear/marine_hats.dmi' + ) soft_armor = list(MELEE = 15, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 10, BIO = 5, FIRE = 5, ACID = 5) - flags_armor_features = ARMOR_NO_DECAP + armor_features_flags = ARMOR_NO_DECAP /obj/item/clothing/head/slouch name = "\improper TGMC slouch hat" @@ -199,11 +203,12 @@ icon = 'icons/obj/clothing/headwear/marine_hats.dmi' item_icons = list( slot_head_str = 'icons/mob/clothing/headwear/marine_hats.dmi', - slot_l_hand_str = 'icons/mob/items_lefthand_1.dmi', - slot_r_hand_str = 'icons/mob/items_righthand_1.dmi',) + slot_l_hand_str = 'icons/mob/inhands/items/items_left.dmi', + slot_r_hand_str = 'icons/mob/inhands/items/items_right.dmi', + ) icon_state = "headband" soft_armor = list(MELEE = 15, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 10, BIO = 5, FIRE = 5, ACID = 5) - flags_armor_features = ARMOR_NO_DECAP + armor_features_flags = ARMOR_NO_DECAP /obj/item/clothing/head/headband/red name = "\improper Red headband" @@ -227,8 +232,9 @@ icon = 'icons/obj/clothing/headwear/marine_hats.dmi' item_icons = list( slot_head_str = 'icons/mob/clothing/headwear/marine_hats.dmi', - slot_l_hand_str = 'icons/mob/items_lefthand_1.dmi', - slot_r_hand_str = 'icons/mob/items_righthand_1.dmi',) + slot_l_hand_str = 'icons/mob/inhands/items/items_left.dmi', + slot_r_hand_str = 'icons/mob/inhands/items/items_right.dmi', + ) /obj/item/clothing/head/cmo name = "\improper Chief Medical hat" @@ -244,7 +250,7 @@ desc = "A beret with the TGMC insignia emblazoned on it. It radiates respect and authority." icon_state = "hosberet" soft_armor = list(MELEE = 15, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 10, BIO = 5, FIRE = 5, ACID = 5) - flags_inventory = BLOCKSHARPOBJ + inventory_flags = BLOCKSHARPOBJ /obj/item/clothing/head/beret/marine/captain name = "captain's beret" @@ -279,10 +285,10 @@ icon_state = "ushankadown" item_state = "ushankadown" soft_armor = list(MELEE = 35, BULLET = 35, LASER = 20, ENERGY = 10, BOMB = 10, BIO = 0, FIRE = 10, ACID = 10) - flags_cold_protection = HEAD + cold_protection_flags = HEAD min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROTECTION_TEMPERATURE - flags_inventory = BLOCKSHARPOBJ - flags_inv_hide = HIDEEARS|HIDETOPHAIR + inventory_flags = BLOCKSHARPOBJ + inv_hide_flags = HIDEEARS|HIDETOPHAIR anti_hug = 1 /obj/item/clothing/head/ushanka/attack_self(mob/user as mob) @@ -303,12 +309,12 @@ icon_state = "bearpelt" siemens_coefficient = 2 anti_hug = 4 - flags_armor_protection = HEAD|CHEST|ARMS + armor_protection_flags = HEAD|CHEST|ARMS soft_armor = list(MELEE = 90, BULLET = 70, LASER = 45, ENERGY = 55, BOMB = 45, BIO = 10, FIRE = 55, ACID = 55) - flags_cold_protection = HEAD|CHEST|ARMS + cold_protection_flags = HEAD|CHEST|ARMS min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROTECTION_TEMPERATURE - flags_inventory = BLOCKSHARPOBJ - flags_inv_hide = HIDEEARS|HIDETOPHAIR + inventory_flags = BLOCKSHARPOBJ + inv_hide_flags = HIDEEARS|HIDETOPHAIR /obj/item/clothing/head/uppcap @@ -318,17 +324,18 @@ icon_state = "upp_cap" item_icons = list( slot_head_str = 'icons/mob/clothing/headwear/ert_headwear.dmi', - slot_l_hand_str = 'icons/mob/items_lefthand_1.dmi', - slot_r_hand_str = 'icons/mob/items_righthand_1.dmi',) + slot_l_hand_str = 'icons/mob/inhands/items/items_left.dmi', + slot_r_hand_str = 'icons/mob/inhands/items/items_right.dmi', + ) siemens_coefficient = 2 //anti_hug = 2 - flags_armor_protection = HEAD + armor_protection_flags = HEAD soft_armor = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 55, BOMB = 50, BIO = 50, FIRE = 55, ACID = 55) - flags_cold_protection = HEAD + cold_protection_flags = HEAD min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROTECTION_TEMPERATURE - flags_inventory = BLOCKSHARPOBJ - flags_inv_hide = HIDEEARS - flags_armor_features = ARMOR_NO_DECAP + inventory_flags = BLOCKSHARPOBJ + inv_hide_flags = HIDEEARS + armor_features_flags = ARMOR_NO_DECAP /obj/item/clothing/head/uppcap/beret name = "\improper armored USL beret" @@ -340,17 +347,18 @@ icon = 'icons/obj/clothing/headwear/ert_headwear.dmi' item_icons = list( slot_head_str = 'icons/mob/clothing/headwear/ert_headwear.dmi', - slot_l_hand_str = 'icons/mob/items_lefthand_1.dmi', - slot_r_hand_str = 'icons/mob/items_righthand_1.dmi',) + slot_l_hand_str = 'icons/mob/inhands/items/items_left.dmi', + slot_r_hand_str = 'icons/mob/inhands/items/items_right.dmi', + ) icon_state = "freelancer_helmet" siemens_coefficient = 2 - flags_armor_protection = HEAD + armor_protection_flags = HEAD soft_armor = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 55, BOMB = 50, BIO = 50, FIRE = 55, ACID = 55) - flags_cold_protection = HEAD + cold_protection_flags = HEAD min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROTECTION_TEMPERATURE - flags_inventory = BLOCKSHARPOBJ - flags_inv_hide = HIDEEARS - flags_armor_features = ARMOR_NO_DECAP + inventory_flags = BLOCKSHARPOBJ + inv_hide_flags = HIDEEARS + armor_features_flags = ARMOR_NO_DECAP attachments_by_slot = list( ATTACHMENT_SLOT_STORAGE, ATTACHMENT_SLOT_HEAD_MODULE, @@ -380,49 +388,52 @@ icon = 'icons/obj/clothing/headwear/ert_headwear.dmi' item_icons = list( slot_head_str = 'icons/mob/clothing/headwear/ert_headwear.dmi', - slot_l_hand_str = 'icons/mob/items_lefthand_1.dmi', - slot_r_hand_str = 'icons/mob/items_righthand_1.dmi',) + slot_l_hand_str = 'icons/mob/inhands/items/items_left.dmi', + slot_r_hand_str = 'icons/mob/inhands/items/items_right.dmi', + ) icon_state = "rebel_hood" siemens_coefficient = 2 - flags_armor_protection = HEAD|CHEST + armor_protection_flags = HEAD|CHEST soft_armor = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 50, BIO = 50, FIRE = 50, ACID = 50) - flags_cold_protection = HEAD + cold_protection_flags = HEAD min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROTECTION_TEMPERATURE - flags_inventory = BLOCKSHARPOBJ - flags_inv_hide = HIDEEARS|HIDETOPHAIR - flags_armor_features = ARMOR_NO_DECAP + inventory_flags = BLOCKSHARPOBJ + inv_hide_flags = HIDEEARS|HIDETOPHAIR + armor_features_flags = ARMOR_NO_DECAP /obj/item/clothing/head/admiral name = "\improper armored admiral cap" desc = "A sturdy admiral's cap. More protective than it seems. Please don't ditch this for a helmet like a punk." icon_state = "admiral_helmet" siemens_coefficient = 2 - flags_armor_protection = HEAD + armor_protection_flags = HEAD soft_armor = list(MELEE = 60, BULLET = 60, LASER = 45, ENERGY = 55, BOMB = 55, BIO = 10, FIRE = 55, ACID = 55) - flags_cold_protection = HEAD + cold_protection_flags = HEAD min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROTECTION_TEMPERATURE - flags_inventory = BLOCKSHARPOBJ - flags_inv_hide = HIDEEARS + inventory_flags = BLOCKSHARPOBJ + inv_hide_flags = HIDEEARS /obj/item/clothing/head/commissar name = "\improper commissar cap" desc = "A cap worn by commissars of the Imperial Army. This one seems to radiate authority." item_icons = list( slot_head_str = 'icons/mob/clothing/headwear/ert_headwear.dmi', - slot_l_hand_str = 'icons/mob/items_lefthand_1.dmi', - slot_r_hand_str = 'icons/mob/items_righthand_1.dmi',) + slot_l_hand_str = 'icons/mob/inhands/items/items_left.dmi', + slot_r_hand_str = 'icons/mob/inhands/items/items_right.dmi', + ) icon = 'icons/obj/clothing/headwear/ert_headwear.dmi' icon_state = "commissar_cap" soft_armor = list(MELEE = 30, BULLET = 30, LASER = 30, ENERGY = 30, BOMB = 15, BIO = 10, FIRE = 20, ACID = 20) - flags_armor_features = ARMOR_NO_DECAP + armor_features_flags = ARMOR_NO_DECAP /obj/item/clothing/head/strawhat name = "\improper straw hat" desc = "A hat lined with durathread on the outside, has the usual iconic look of a straw hat. A common hat across the bubble." item_icons = list( slot_head_str = 'icons/mob/clothing/headwear/ert_headwear.dmi', - slot_l_hand_str = 'icons/mob/items_lefthand_1.dmi', - slot_r_hand_str = 'icons/mob/items_righthand_1.dmi',) + slot_l_hand_str = 'icons/mob/inhands/items/items_left.dmi', + slot_r_hand_str = 'icons/mob/inhands/items/items_right.dmi', + ) icon = 'icons/obj/clothing/headwear/ert_headwear.dmi' icon_state = "straw_hat" soft_armor = list(MELEE = 30, BULLET = 30, LASER = 30, ENERGY = 30, BOMB = 15, BIO = 10, FIRE = 20, ACID = 20) diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 6dfdb9f2f144c..9bdd311fb7315 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -6,37 +6,37 @@ item_state = "helmet" accuracy_mod = 0 soft_armor = list(MELEE = 50, BULLET = 15, LASER = 50, ENERGY = 10, BOMB = 25, BIO = 0, FIRE = 10, ACID = 10) - flags_atom = CONDUCT - flags_inventory = COVEREYES|BLOCKSHARPOBJ - flags_inv_hide = HIDEEARS|HIDEEYES - flags_cold_protection = HEAD - flags_heat_protection = HEAD + atom_flags = CONDUCT + inventory_flags = COVEREYES|BLOCKSHARPOBJ + inv_hide_flags = HIDEEARS|HIDEEYES + cold_protection_flags = HEAD + heat_protection_flags = HEAD min_cold_protection_temperature = HELMET_MIN_COLD_PROTECTION_TEMPERATURE max_heat_protection_temperature = HELMET_MAX_HEAT_PROTECTION_TEMPERATURE siemens_coefficient = 0.7 w_class = WEIGHT_CLASS_NORMAL - flags_armor_features = ARMOR_NO_DECAP - flags_item = SYNTH_RESTRICTED + armor_features_flags = ARMOR_NO_DECAP + item_flags = SYNTH_RESTRICTED /obj/item/clothing/head/helmet/riot name = "riot helmet" desc = "It's a helmet specifically designed to protect against close range attacks. It covers your ears." icon_state = "riot" soft_armor = list(MELEE = 82, BULLET = 15, LASER = 5, ENERGY = 5, BOMB = 5, BIO = 2, FIRE = 5, ACID = 5) - flags_inventory = COVEREYES|BLOCKSHARPOBJ - flags_inv_hide = HIDEEARS|HIDEEYES|HIDETOPHAIR - flags_item = SYNTH_RESTRICTED + inventory_flags = COVEREYES|BLOCKSHARPOBJ + inv_hide_flags = HIDEEARS|HIDEEYES|HIDETOPHAIR + item_flags = SYNTH_RESTRICTED /obj/item/clothing/head/helmet/HoS name = "Head of Security Hat" desc = "The hat of the Head of Security. For showing the officers who's in charge." icon_state = "hoscap" soft_armor = list(MELEE = 80, BULLET = 60, LASER = 50, ENERGY = 10, BOMB = 25, BIO = 10, FIRE = 10, ACID = 10) - flags_inventory = COVEREYES - flags_inv_hide = HIDEEARS - flags_armor_protection = NONE + inventory_flags = COVEREYES + inv_hide_flags = HIDEEARS + armor_protection_flags = NONE siemens_coefficient = 0.8 - flags_item = SYNTH_RESTRICTED + item_flags = SYNTH_RESTRICTED /obj/item/clothing/head/helmet/HoS/dermal name = "Dermal Armour Patch" @@ -49,25 +49,25 @@ name = "warden's hat" desc = "It's a special helmet issued to the Warden of a securiy force. Protects the head from impacts." icon_state = "policehelm" - flags_inventory = NONE - flags_inv_hide = NONE - flags_armor_protection = NONE + inventory_flags = NONE + inv_hide_flags = NONE + armor_protection_flags = NONE /obj/item/clothing/head/helmet/hop name = "crew resource's hat" desc = "A stylish hat that both protects you from enraged former-crewmembers and gives you a false sense of authority." icon_state = "hopcap" - flags_inventory = NONE - flags_inv_hide = NONE - flags_armor_protection = NONE + inventory_flags = NONE + inv_hide_flags = NONE + armor_protection_flags = NONE /obj/item/clothing/head/helmet/formalcaptain name = "parade hat" desc = "No one in a commanding position should be without a perfect, white hat of ultimate authority." icon_state = "officercap" - flags_inventory = NONE - flags_inv_hide = NONE - flags_armor_protection = NONE + inventory_flags = NONE + inv_hide_flags = NONE + armor_protection_flags = NONE /obj/item/clothing/head/helmet/swat name = "\improper SWAT helmet" @@ -75,23 +75,23 @@ icon_state = "swat" item_state = "swat" soft_armor = list(MELEE = 80, BULLET = 60, LASER = 50, ENERGY = 25, BOMB = 50, BIO = 10, FIRE = 25, ACID = 25) - flags_inventory = COVEREYES|BLOCKSHARPOBJ - flags_inv_hide = HIDEEARS|HIDEEYES - flags_cold_protection = HEAD + inventory_flags = COVEREYES|BLOCKSHARPOBJ + inv_hide_flags = HIDEEARS|HIDEEYES + cold_protection_flags = HEAD min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE siemens_coefficient = 0.5 anti_hug = 1 - flags_item = SYNTH_RESTRICTED + item_flags = SYNTH_RESTRICTED /obj/item/clothing/head/helmet/thunderdome name = "\improper Thunderdome helmet" desc = "'Let the battle commence!'" icon_state = "thunderdome" - flags_inventory = COVEREYES|BLOCKSHARPOBJ - flags_inv_hide = HIDEEARS|HIDEEYES + inventory_flags = COVEREYES|BLOCKSHARPOBJ + inv_hide_flags = HIDEEARS|HIDEEYES item_state = "thunderdome" soft_armor = list(MELEE = 80, BULLET = 60, LASER = 50, ENERGY = 10, BOMB = 25, BIO = 10, FIRE = 10, ACID = 10) - flags_cold_protection = HEAD + cold_protection_flags = HEAD min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE siemens_coefficient = 1 @@ -100,8 +100,8 @@ desc = "Ave, Imperator, morituri te salutant." icon_state = "gladiator" item_state = "gladiator" - flags_inventory = BLOCKSHARPOBJ - flags_inv_hide = HIDEMASK|HIDEEARS|HIDEEYES|HIDEALLHAIR + inventory_flags = BLOCKSHARPOBJ + inv_hide_flags = HIDEMASK|HIDEEARS|HIDEEYES|HIDEALLHAIR siemens_coefficient = 1 /*===========================MARINES HELMETS================================= @@ -114,14 +114,15 @@ icon = 'icons/obj/clothing/headwear/marine_helmets.dmi' item_icons = list( slot_head_str = 'icons/mob/clothing/headwear/marine_helmets.dmi', - slot_l_hand_str = 'icons/mob/items_lefthand_1.dmi', - slot_r_hand_str = 'icons/mob/items_righthand_1.dmi',) + slot_l_hand_str = 'icons/mob/inhands/items/items_left.dmi', + slot_r_hand_str = 'icons/mob/inhands/items/items_right.dmi', + ) icon_state = "helmet" soft_armor = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 50, BIO = 50, FIRE = 50, ACID = 50) max_integrity = 5 var/list/helmet_overlays - flags_inventory = BLOCKSHARPOBJ - flags_inv_hide = HIDEEARS + inventory_flags = BLOCKSHARPOBJ + inv_hide_flags = HIDEEARS attachments_by_slot = list( ATTACHMENT_SLOT_STORAGE, ) @@ -130,7 +131,7 @@ ) starting_attachments = list(/obj/item/armor_module/storage/helmet) ///marine helmet behaviour flags - var/flags_marine_helmet = HELMET_GARB_OVERLAY|HELMET_STORE_GARB + var/marine_helmet_flags = HELMET_GARB_OVERLAY|HELMET_STORE_GARB /// items that fit in the helmet: strict type = iconstate to show var/static/list/allowed_helmet_items = list( /obj/item/tool/lighter/random = "helmet_lighter_", @@ -161,14 +162,23 @@ . = ..() helmet_overlays = list("damage","band","item") //To make things simple. -/obj/item/clothing/head/helmet/marine/update_icon() +/obj/item/clothing/head/helmet/marine/on_pocket_insertion() + . = ..() + update_helmet_overlays() + +/obj/item/clothing/head/helmet/marine/on_pocket_removal() + . = ..() + update_helmet_overlays() + +///Updates the helmet_overlays list, inserting and removing images from it as necesarry +/obj/item/clothing/head/helmet/marine/proc/update_helmet_overlays() if(!attachments_by_slot[ATTACHMENT_SLOT_STORAGE]) return if(!istype(attachments_by_slot[ATTACHMENT_SLOT_STORAGE], /obj/item/armor_module/storage)) return var/obj/item/armor_module/storage/armor_storage = attachments_by_slot[ATTACHMENT_SLOT_STORAGE] - if(length(armor_storage.storage.contents) && (flags_marine_helmet & HELMET_GARB_OVERLAY)) + if(length(armor_storage.storage.contents) && (marine_helmet_flags & HELMET_GARB_OVERLAY)) if(!helmet_overlays["band"]) var/image/I = image('icons/obj/clothing/headwear/marine_hats.dmi', src, "helmet_band") helmet_overlays["band"] = I @@ -200,32 +210,34 @@ var/mutable_appearance/M for(var/i in helmet_overlays) M = helmet_overlays[i] - if(M) - M = mutable_appearance('icons/mob/modular/modular_helmet_storage.dmi',M.icon_state) - standing.overlays += M + if(!M) + continue + + M = mutable_appearance('icons/mob/modular/modular_helmet_storage.dmi', M.icon_state) + standing.overlays += M /obj/item/clothing/head/helmet/marine/specialist name = "\improper B18 helmet" desc = "The B18 Helmet that goes along with the B18 Defensive Armor. It's heavy, reinforced, and protects more of the face." icon_state = "minigunner_helmet" soft_armor = list(MELEE = 75, BULLET = 80, LASER = 75, ENERGY = 65, BOMB = 70, BIO = 65, FIRE = 65, ACID = 65) - flags_inv_hide = HIDEALLHAIR|HIDEEARS - flags_item = SYNTH_RESTRICTED + inv_hide_flags = HIDEALLHAIR|HIDEEARS + item_flags = SYNTH_RESTRICTED resistance_flags = UNACIDABLE anti_hug = 6 - flags_item_map_variant = (ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT|ITEM_PRISON_VARIANT|ITEM_ICE_PROTECTION) + item_map_variant_flags = (ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT|ITEM_PRISON_VARIANT|ITEM_ICE_PROTECTION) /obj/item/clothing/head/helmet/marine/grenadier name = "\improper B17 helmet" desc = "A heavy duty helmet created to complement the B17 marine armor. Practically explosive proof. Unless you stand next to a nuke or something like that." icon_state = "grenadier_helmet" soft_armor = list(MELEE = 75, BULLET = 70, LASER = 60, ENERGY = 65, BOMB = 100, BIO = 60, FIRE = 65, ACID = 60) - flags_inv_hide = HIDEALLHAIR|HIDEEARS + inv_hide_flags = HIDEALLHAIR|HIDEEARS max_heat_protection_temperature = HEAVYARMOR_MAX_HEAT_PROTECTION_TEMPERATURE resistance_flags = UNACIDABLE - flags_item = SYNTH_RESTRICTED + item_flags = SYNTH_RESTRICTED anti_hug = 4 - flags_item_map_variant = (ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT|ITEM_PRISON_VARIANT|ITEM_ICE_PROTECTION) + item_map_variant_flags = (ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT|ITEM_PRISON_VARIANT|ITEM_ICE_PROTECTION) /obj/item/clothing/head/helmet/marine/pilot name = "\improper M30 tactical helmet" @@ -233,10 +245,10 @@ icon_state = "helmetp2" soft_armor = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 50, BIO = 50, FIRE = 50, ACID = 50) min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROTECTION_TEMPERATURE - flags_inventory = BLOCKSHARPOBJ - flags_inv_hide = HIDEEARS|HIDETOPHAIR - flags_marine_helmet = NONE - flags_item_map_variant = null + inventory_flags = BLOCKSHARPOBJ + inv_hide_flags = HIDEEARS|HIDETOPHAIR + marine_helmet_flags = NONE + item_map_variant_flags = null /obj/item/clothing/head/helmet/marine/pilot/green name = "\improper M30 tactical helmet" @@ -249,14 +261,26 @@ desc = "A lightweight helmet with a small port in the back. Offers lower response times for TGMC mech pilots by integrating them directly into their mech suit's systems, though it certainly doesn't make them smarter." min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROTECTION_TEMPERATURE +/obj/item/clothing/head/helmet/marine/assault_crewman + name = "\improper M12B pattern tanker helmet" + icon_state = "assault_crewman_helmet" + desc = "A lightweight helmet. Offers the user protection from being hit in the hell by ejected shell casings, mostly." + min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROTECTION_TEMPERATURE + +/obj/item/clothing/head/helmet/marine/transport_crewman + name = "\improper M12A pattern transport helmet" + icon_state = "transport_crewman_helmet" + desc = "A lightweight helmet with a small port in the back. Offers decent protection against reckless driving." + min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROTECTION_TEMPERATURE + /obj/item/clothing/head/helmet/marine/riot name = "M8 riot helmet" desc = "It's a modified version of the widely used Riot Helmets for use against angry jarheads. Boasts high ballistic protection" icon_state = "marine_riot" soft_armor = list(MELEE = 65, BULLET = 110, LASER = 110, ENERGY = 5, BOMB = 50, BIO = 50, FIRE = 50, ACID = 30) - flags_inventory = COVEREYES|BLOCKSHARPOBJ - flags_inv_hide = HIDEEARS|HIDEEYES|HIDETOPHAIR - flags_item = SYNTH_RESTRICTED + inventory_flags = COVEREYES|BLOCKSHARPOBJ + inv_hide_flags = HIDEEARS|HIDEEYES|HIDETOPHAIR + item_flags = SYNTH_RESTRICTED /*=============================PMCS================================== =======================================================================*/ @@ -265,9 +289,10 @@ icon = 'icons/obj/clothing/headwear/ert_headwear.dmi' item_icons = list( slot_head_str = 'icons/mob/clothing/headwear/ert_headwear.dmi', - slot_l_hand_str = 'icons/mob/items_lefthand_1.dmi', - slot_r_hand_str = 'icons/mob/items_righthand_1.dmi',) - flags_item = SYNTH_RESTRICTED + slot_l_hand_str = 'icons/mob/inhands/items/items_left.dmi', + slot_r_hand_str = 'icons/mob/inhands/items/items_right.dmi', + ) + item_flags = SYNTH_RESTRICTED /obj/item/clothing/head/helmet/marine/veteran/pmc name = "\improper PMC tactical helmet" @@ -275,9 +300,9 @@ icon_state = "pmc_helmet" soft_armor = list(MELEE = 65, BULLET = 65, LASER = 60, ENERGY = 55, BOMB = 60, BIO = 50, FIRE = 55, ACID = 55) min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROTECTION_TEMPERATURE - flags_inventory = BLOCKSHARPOBJ - flags_inv_hide = NONE - flags_marine_helmet = NONE + inventory_flags = BLOCKSHARPOBJ + inv_hide_flags = NONE + marine_helmet_flags = NONE /obj/item/clothing/head/helmet/marine/veteran/pmc/leader name = "\improper PMC beret" @@ -289,28 +314,28 @@ name = "\improper PMC sniper helmet" desc = "A helmet worn by PMC Marksmen" icon_state = "pmc_sniper_hat" - flags_armor_protection = HEAD|FACE|EYES + armor_protection_flags = HEAD|FACE|EYES soft_armor = list(MELEE = 65, BULLET = 75, LASER = 55, ENERGY = 60, BOMB = 70, BIO = 50, FIRE = 60, ACID = 60) - flags_inventory = COVEREYES|COVERMOUTH|BLOCKSHARPOBJ - flags_inv_hide = HIDEEARS|HIDEEYES|HIDEFACE|HIDEMASK|HIDEALLHAIR + inventory_flags = COVEREYES|COVERMOUTH|BLOCKSHARPOBJ + inv_hide_flags = HIDEEARS|HIDEEYES|HIDEFACE|HIDEMASK|HIDEALLHAIR /obj/item/clothing/head/helmet/marine/veteran/pmc/gunner name = "\improper PMC gunner helmet" desc = "A modification of the standard helmet used by a lot of security firms, has a visor for added protection." icon_state = "pmc_heavyhelmet" - flags_armor_protection = HEAD|FACE|EYES + armor_protection_flags = HEAD|FACE|EYES soft_armor = list(MELEE = 75, BULLET = 85, LASER = 80, ENERGY = 65, BOMB = 80, BIO = 50, FIRE = 65, ACID = 65) - flags_inventory = COVEREYES|COVERMOUTH|BLOCKSHARPOBJ - flags_inv_hide = HIDEEARS|HIDEEYES|HIDEFACE|HIDEMASK|HIDEALLHAIR + inventory_flags = COVEREYES|COVERMOUTH|BLOCKSHARPOBJ + inv_hide_flags = HIDEEARS|HIDEEYES|HIDEFACE|HIDEMASK|HIDEALLHAIR /obj/item/clothing/head/helmet/marine/veteran/pmc/commando name = "\improper PMC commando helmet" desc = "A fully enclosed, armored helmet made for Nanotrasen elite commandos." icon_state = "commando_helmet" - flags_armor_protection = HEAD|FACE|EYES + armor_protection_flags = HEAD|FACE|EYES soft_armor = list(MELEE = 95, BULLET = 120, LASER = 200, ENERGY = 200, BOMB = 90, BIO = 100, FIRE = 90, ACID = 95) - flags_inventory = COVEREYES|COVERMOUTH|BLOCKSHARPOBJ|BLOCKGASEFFECT - flags_inv_hide = HIDEEARS|HIDEEYES|HIDEFACE|HIDEMASK|HIDEALLHAIR + inventory_flags = COVEREYES|COVERMOUTH|BLOCKSHARPOBJ|BLOCKGASEFFECT + inv_hide_flags = HIDEEARS|HIDEEYES|HIDEFACE|HIDEMASK|HIDEALLHAIR eye_protection = 2 anti_hug = 50 resistance_flags = UNACIDABLE @@ -327,10 +352,11 @@ icon_state = "guardhelm" item_icons = list( slot_head_str = 'icons/mob/clothing/headwear/ert_headwear.dmi', - slot_l_hand_str = 'icons/mob/items_lefthand_1.dmi', - slot_r_hand_str = 'icons/mob/items_righthand_1.dmi',) + slot_l_hand_str = 'icons/mob/inhands/items/items_left.dmi', + slot_r_hand_str = 'icons/mob/inhands/items/items_right.dmi', + ) item_state = "guardhelm" - flags_item = SYNTH_RESTRICTED + item_flags = SYNTH_RESTRICTED soft_armor = list(MELEE = 85, BULLET = 75, LASER = 70, ENERGY = 70, BOMB = 60, BIO = 50, FIRE = 50, ACID = 50) /obj/item/clothing/head/helmet/marine/imperial/sergeant @@ -351,10 +377,11 @@ icon = 'icons/obj/clothing/headwear/ert_headwear.dmi' item_icons = list( slot_head_str = 'icons/mob/clothing/headwear/ert_headwear.dmi', - slot_l_hand_str = 'icons/mob/items_lefthand_1.dmi', - slot_r_hand_str = 'icons/mob/items_righthand_1.dmi',) + slot_l_hand_str = 'icons/mob/inhands/items/items_left.dmi', + slot_r_hand_str = 'icons/mob/inhands/items/items_right.dmi', + ) icon_state = "upp_helmet1" - flags_item = SYNTH_RESTRICTED + item_flags = SYNTH_RESTRICTED soft_armor = list(MELEE = 70, BULLET = 55, LASER = 40, ENERGY = 35, BOMB = 35, BIO = 5, FIRE = 35, ACID = 35) min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROTECTION_TEMPERATURE @@ -373,12 +400,13 @@ icon = 'icons/obj/clothing/headwear/marine_hats.dmi' item_icons = list( slot_head_str = 'icons/mob/clothing/headwear/marine_hats.dmi', - slot_l_hand_str = 'icons/mob/items_lefthand_1.dmi', - slot_r_hand_str = 'icons/mob/items_righthand_1.dmi',) + slot_l_hand_str = 'icons/mob/inhands/items/items_left.dmi', + slot_r_hand_str = 'icons/mob/inhands/items/items_right.dmi', + ) icon_state = "spec" soft_armor = list(MELEE = 35, BULLET = 35, LASER = 35, ENERGY = 15, BOMB = 10, BIO = 0, FIRE = 15, ACID = 15) - flags_inventory = BLOCKSHARPOBJ - flags_inv_hide = HIDEEARS + inventory_flags = BLOCKSHARPOBJ + inv_hide_flags = HIDEEARS /*===========================HELGHAST - MERCENARY================================ =====================================================================*/ @@ -387,17 +415,17 @@ name = "\improper K12 ceramic helmet" desc = "A sturdy helmet worn by an unknown mercenary group." icon_state = "mercenary_heavy_helmet" - flags_armor_protection = HEAD|FACE|EYES + armor_protection_flags = HEAD|FACE|EYES soft_armor = list(MELEE = 80, BULLET = 80, LASER = 50, ENERGY = 60, BOMB = 70, BIO = 10, FIRE = 60, ACID = 60) - flags_inventory = COVEREYES|COVERMOUTH|BLOCKSHARPOBJ - flags_inv_hide = HIDEEARS|HIDEEYES|HIDEFACE|HIDEMASK|HIDEALLHAIR - flags_marine_helmet = NONE + inventory_flags = COVEREYES|COVERMOUTH|BLOCKSHARPOBJ + inv_hide_flags = HIDEEARS|HIDEEYES|HIDEFACE|HIDEMASK|HIDEALLHAIR + marine_helmet_flags = NONE /obj/item/clothing/head/helmet/marine/veteran/mercenary/miner name = "\improper Y8 miner helmet" desc = "A sturdy helmet worn by an unknown mercenary group." icon_state = "mercenary_miner_helmet" - flags_armor_protection = HEAD|FACE|EYES + armor_protection_flags = HEAD|FACE|EYES soft_armor = list(MELEE = 55, BULLET = 55, LASER = 45, ENERGY = 55, BOMB = 55, BIO = 10, FIRE = 55, ACID = 55) @@ -405,7 +433,7 @@ name = "\improper Z7 engineer helmet" desc = "A sturdy helmet worn by an unknown mercenary group." icon_state = "mercenary_engineer_helmet" - flags_armor_protection = HEAD|FACE|EYES + armor_protection_flags = HEAD|FACE|EYES soft_armor = list(MELEE = 55, BULLET = 60, LASER = 45, ENERGY = 55, BOMB = 60, BIO = 10, FIRE = 55, ACID = 55) @@ -417,14 +445,15 @@ icon_state = "som_helmet" item_icons = list( slot_head_str = 'icons/mob/clothing/headwear/ert_headwear.dmi', - slot_l_hand_str = 'icons/mob/items_lefthand_1.dmi', - slot_r_hand_str = 'icons/mob/items_righthand_1.dmi',) + slot_l_hand_str = 'icons/mob/inhands/items/items_left.dmi', + slot_r_hand_str = 'icons/mob/inhands/items/items_right.dmi', + ) item_state = "som_helmet" soft_armor = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 50, BIO = 50, FIRE = 50, ACID = 50) min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROTECTION_TEMPERATURE - flags_inventory = BLOCKSHARPOBJ - flags_inv_hide = NONE - flags_marine_helmet = NONE + inventory_flags = BLOCKSHARPOBJ + inv_hide_flags = NONE + marine_helmet_flags = NONE /obj/item/clothing/head/helmet/marine/som/veteran @@ -447,7 +476,7 @@ desc = "A field of invisible energy, it protects the wearer but prevents any clothing from being worn." icon = 'icons/effects/effects.dmi' icon_state = "shield-blue" - flags_item = DELONDROP + item_flags = DELONDROP soft_armor = list(MELEE = 65, BULLET = 60, LASER = 30, ENERGY = 20, BOMB = 25, BIO = 40, FIRE = 20, ACID = 20) anti_hug = 5 @@ -462,8 +491,9 @@ icon_state = "icc" item_icons = list( slot_head_str = 'icons/mob/clothing/headwear/ert_headwear.dmi', - slot_l_hand_str = 'icons/mob/items_lefthand_1.dmi', - slot_r_hand_str = 'icons/mob/items_righthand_1.dmi',) + slot_l_hand_str = 'icons/mob/inhands/items/items_left.dmi', + slot_r_hand_str = 'icons/mob/inhands/items/items_right.dmi', + ) item_state = "icc" soft_armor = list(MELEE = 50, BULLET = 60, LASER = 50, ENERGY = 60, BOMB = 70, BIO = 10, FIRE = 60, ACID = 50) @@ -473,3 +503,10 @@ icon_state = "icc_guard" item_state = "icc_guard" soft_armor = list(MELEE = 60, BULLET = 65, LASER = 40, ENERGY = 60, BOMB = 80, BIO = 10, FIRE = 55, ACID = 40) + +/obj/item/clothing/head/helmet/marine/icc/guard/heavy + name = "\improper Modelle/22 combat helmet" + desc = "A high-quality ICCGF helmet, mostly seen worn by the ICC's highest quality troops, better well known as 'Guardsmen'. Like most helmets of the ICC it is made to fit a utility and combat role with noticeably high resistance to explosions and bullets, this one is heavily reinforced." + icon_state = "icc_guard_heavy" + item_state = "icc_guard_heavy" + soft_armor = list(MELEE = 65, BULLET = 70, LASER = 40, ENERGY = 60, BOMB = 85, BIO = 10, FIRE = 55, ACID = 40) diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 54acc577bce85..dc7590ddd23d1 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -22,31 +22,31 @@ name = "captain's cap" desc = "You fear to wear it for the negligence it brings." icon_state = "capcap" - flags_inventory = NONE - flags_inv_hide = NONE - flags_armor_protection = NONE - flags_cold_protection = HEAD + inventory_flags = NONE + inv_hide_flags = NONE + armor_protection_flags = NONE + cold_protection_flags = HEAD min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE siemens_coefficient = 0.9 - flags_armor_protection = NONE + armor_protection_flags = NONE //Chaplain /obj/item/clothing/head/chaplain_hood name = "chaplain's hood" desc = "It's hood that covers the head. It keeps you warm during the space winters." icon_state = "chaplain_hood" - flags_inventory = COVEREYES - flags_inv_hide = HIDEEARS|HIDEALLHAIR + inventory_flags = COVEREYES + inv_hide_flags = HIDEEARS|HIDEALLHAIR siemens_coefficient = 0.9 - flags_armor_protection = HEAD|EYES + armor_protection_flags = HEAD|EYES //Chaplain /obj/item/clothing/head/nun_hood name = "nun hood" desc = "Maximum piety in this star system." icon_state = "nun_hood" - flags_inventory = COVEREYES - flags_inv_hide = HIDEEARS|HIDEALLHAIR + inventory_flags = COVEREYES + inv_hide_flags = HIDEEARS|HIDEALLHAIR siemens_coefficient = 0.9 //Mime @@ -56,7 +56,7 @@ icon_state = "beret" siemens_coefficient = 0.9 soft_armor = list(MELEE = 15, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 10, BIO = 5, FIRE = 5, ACID = 5) - flags_armor_features = ARMOR_NO_DECAP + armor_features_flags = ARMOR_NO_DECAP //Security /obj/item/clothing/head/beret/sec @@ -91,7 +91,7 @@ name = "surgical cap" desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs." icon_state = "surgcap_blue" - flags_inv_hide = HIDETOPHAIR + inv_hide_flags = HIDETOPHAIR /obj/item/clothing/head/surgery/purple desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is deep purple." @@ -116,7 +116,7 @@ allowed = list(/obj/item/reagent_containers/food/snacks/candy_corn, /obj/item/tool/pen) soft_armor = list(MELEE = 50, BULLET = 5, LASER = 25, ENERGY = 10, BOMB = 0, BIO = 0, FIRE = 10, ACID = 10) siemens_coefficient = 0.9 - flags_armor_protection = NONE + armor_protection_flags = NONE /obj/item/clothing/head/det_hat/black icon_state = "detective2" diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index e42e6667a54c4..c4cbb90011136 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -6,14 +6,14 @@ desc = "It's good to be emperor." item_state = "centhat" siemens_coefficient = 0.9 - flags_armor_protection = NONE + armor_protection_flags = NONE /obj/item/clothing/head/hairflower name = "hair flower pin" icon_state = "hairflower" desc = "Smells nice." item_state = "hairflower" - flags_armor_protection = NONE + armor_protection_flags = NONE w_class = WEIGHT_CLASS_TINY /obj/item/clothing/head/powdered_wig @@ -28,13 +28,13 @@ icon_state = "tophat" item_state = "that" siemens_coefficient = 0.9 - flags_armor_protection = NONE + armor_protection_flags = NONE /obj/item/clothing/head/redcoat name = "redcoat's hat" icon_state = "redcoat" desc = "'I guess it's a redhead.'" - flags_armor_protection = NONE + armor_protection_flags = NONE /obj/item/clothing/head/plaguedoctorhat name = "plague doctor's hat" @@ -42,69 +42,69 @@ icon_state = "plaguedoctor" permeability_coefficient = 0.01 siemens_coefficient = 0.9 - flags_armor_protection = NONE + armor_protection_flags = NONE /obj/item/clothing/head/hasturhood name = "hastur's hood" desc = "It's unspeakably stylish" icon_state = "hasturhood" - flags_inventory = COVEREYES - flags_inv_hide = HIDEEARS|HIDEALLHAIR - flags_armor_protection = HEAD|FACE|EYES + inventory_flags = COVEREYES + inv_hide_flags = HIDEEARS|HIDEALLHAIR + armor_protection_flags = HEAD|FACE|EYES /obj/item/clothing/head/nursehat name = "nurse's hat" desc = "It allows quick identification of trained medical personnel." icon_state = "nursehat" siemens_coefficient = 0.9 - flags_armor_protection = NONE + armor_protection_flags = NONE /obj/item/clothing/head/syndicatefake name = "red space-helmet replica" icon_state = "syndicate" item_state = "syndicate" desc = "A plastic replica of a syndicate agent's space helmet, you'll look just like a real murderous syndicate agent in this! This is a toy, it is not made for use in space!" - flags_inventory = COVEREYES|COVERMOUTH - flags_inv_hide = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEALLHAIR + inventory_flags = COVEREYES|COVERMOUTH + inv_hide_flags = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEALLHAIR siemens_coefficient = 2 - flags_armor_protection = HEAD|FACE|EYES + armor_protection_flags = HEAD|FACE|EYES anti_hug = 1 /obj/item/clothing/head/cueball name = "cueball helmet" desc = "A large, featureless white orb mean to be worn on your head. How do you even see out of this thing?" icon_state = "cueball" - flags_inventory = COVEREYES|COVERMOUTH - flags_inv_hide = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEALLHAIR + inventory_flags = COVEREYES|COVERMOUTH + inv_hide_flags = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEALLHAIR item_state="cueball" - flags_inventory = NONE - flags_armor_protection = HEAD|FACE|EYES + inventory_flags = NONE + armor_protection_flags = HEAD|FACE|EYES /obj/item/clothing/head/greenbandanna name = "green bandanna" desc = "It's a green bandanna with some fine nanotech lining." icon_state = "greenbandanna" item_state = "greenbandanna" - flags_inventory = NONE - flags_inv_hide = NONE - flags_armor_protection = NONE + inventory_flags = NONE + inv_hide_flags = NONE + armor_protection_flags = NONE /obj/item/clothing/head/cardborg name = "cardborg helmet" desc = "A helmet made out of a box." icon_state = "cardborg_h" item_state = "cardborg_h" - flags_inventory = COVERMOUTH|COVEREYES - flags_inv_hide = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEALLHAIR - flags_armor_protection = HEAD|FACE|EYES + inventory_flags = COVERMOUTH|COVEREYES + inv_hide_flags = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEALLHAIR + armor_protection_flags = HEAD|FACE|EYES /obj/item/clothing/head/justice name = "justice hat" desc = "fight for what's righteous!" icon_state = "justicered" item_state = "justicered" - flags_inventory = COVERMOUTH|COVEREYES - flags_inv_hide = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEALLHAIR + inventory_flags = COVERMOUTH|COVEREYES + inv_hide_flags = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEALLHAIR /obj/item/clothing/head/flatcap name = "flat cap" @@ -118,15 +118,15 @@ desc = "Yarr." icon_state = "pirate" item_state = "pirate" - flags_armor_protection = NONE + armor_protection_flags = NONE /obj/item/clothing/head/hgpiratecap name = "pirate hat" desc = "Yarr." icon_state = "hgpiratecap" item_state = "hgpiratecap" - flags_armor_protection = NONE - flags_item = SYNTH_RESTRICTED + armor_protection_flags = NONE + item_flags = SYNTH_RESTRICTED soft_armor = list(MELEE = 50, BULLET = 80, LASER = 50, ENERGY = 10, BOMB = 50, BIO = 0, FIRE = 10, ACID = 10) /obj/item/clothing/head/bandanna/brown @@ -152,7 +152,7 @@ desc = "Gentleman, elite aboard!" icon_state = "bowler" item_state = "bowler" - flags_armor_protection = NONE + armor_protection_flags = NONE //stylish bs12 hats @@ -161,7 +161,7 @@ icon_state = "bowler_hat" item_state = "bowler_hat" desc = "For the gentleman of distinction." - flags_armor_protection = NONE + armor_protection_flags = NONE /obj/item/clothing/head/beaverhat name = "beaver hat" @@ -200,8 +200,8 @@ desc = "Eeeee~heheheheheheh!" icon_state = "witch" item_state = "witch" - flags_inventory = NONE - flags_inv_hide = HIDEALLHAIR + inventory_flags = NONE + inv_hide_flags = HIDEALLHAIR siemens_coefficient = 2 /obj/item/clothing/head/chicken @@ -209,20 +209,20 @@ desc = "Bkaw!" icon_state = "chickenhead" item_state = "chickensuit" - flags_inventory = NONE - flags_inv_hide = HIDEALLHAIR + inventory_flags = NONE + inv_hide_flags = HIDEALLHAIR siemens_coefficient = 2 - flags_armor_protection = HEAD|FACE|EYES + armor_protection_flags = HEAD|FACE|EYES /obj/item/clothing/head/xenos name = "xenos helmet" icon_state = "xenos" item_state = "xenos_helm" desc = "A helmet made out of chitinous alien hide." - flags_inventory = COVERMOUTH|COVEREYES|BLOCKSHARPOBJ - flags_inv_hide = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEALLHAIR + inventory_flags = COVERMOUTH|COVEREYES|BLOCKSHARPOBJ + inv_hide_flags = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEALLHAIR siemens_coefficient = 2 - flags_armor_protection = HEAD|FACE|EYES + armor_protection_flags = HEAD|FACE|EYES anti_hug = 10 //Lel /obj/item/clothing/head/white_dress @@ -266,5 +266,5 @@ desc = "Praise the Omnissiah!" icon_state = "tp_hood" item_state = "tp_hood" - flags_inv_hide = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEALLHAIR - flags_armor_protection = HEAD|FACE|EYES + inv_hide_flags = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEALLHAIR + armor_protection_flags = HEAD|FACE|EYES diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 17dfb785f911c..1501d989906d1 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -17,10 +17,10 @@ item_state = "welding" var/up = FALSE soft_armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 0, ACID = 0) - flags_atom = CONDUCT - flags_inventory = COVEREYES|COVERMOUTH|BLOCKSHARPOBJ - flags_inv_hide = HIDEEARS|HIDEEYES|HIDEFACE - flags_armor_protection = HEAD|FACE|EYES + atom_flags = CONDUCT + inventory_flags = COVEREYES|COVERMOUTH|BLOCKSHARPOBJ + inv_hide_flags = HIDEEARS|HIDEEYES|HIDEFACE + armor_protection_flags = HEAD|FACE|EYES actions_types = list(/datum/action/item_action/toggle) siemens_coefficient = 0.9 w_class = WEIGHT_CLASS_NORMAL @@ -44,16 +44,16 @@ toggle_item_state(usr) /obj/item/clothing/head/welding/proc/flip_up() - DISABLE_BITFIELD(flags_inventory, COVEREYES|COVERMOUTH|BLOCKSHARPOBJ) - DISABLE_BITFIELD(flags_inv_hide, HIDEEARS|HIDEEYES|HIDEFACE) + DISABLE_BITFIELD(inventory_flags, COVEREYES|COVERMOUTH|BLOCKSHARPOBJ) + DISABLE_BITFIELD(inv_hide_flags, HIDEEARS|HIDEEYES|HIDEFACE) eye_protection = 0 hug_memory = anti_hug anti_hug = 0 icon_state = "[initial(icon_state)]up" /obj/item/clothing/head/welding/proc/flip_down() - ENABLE_BITFIELD(flags_inventory, COVEREYES|COVERMOUTH|BLOCKSHARPOBJ) - ENABLE_BITFIELD(flags_inv_hide, HIDEEARS|HIDEEYES|HIDEFACE) + ENABLE_BITFIELD(inventory_flags, COVEREYES|COVERMOUTH|BLOCKSHARPOBJ) + ENABLE_BITFIELD(inv_hide_flags, HIDEEARS|HIDEEYES|HIDEFACE) eye_protection = initial(eye_protection) anti_hug = hug_memory icon_state = initial(icon_state) @@ -88,11 +88,11 @@ name = "cake-hat" desc = "It's tasty looking!" icon_state = "cake0" - flags_inventory = COVEREYES + inventory_flags = COVEREYES var/onfire = 0 var/status = 0 var/processing = 0 //I dont think this is used anywhere. - flags_armor_protection = EYES + armor_protection_flags = EYES /obj/item/clothing/head/cakehat/process() if(!onfire) @@ -123,9 +123,9 @@ desc = "A jack o' lantern! Believed to ward off evil spirits." icon_state = "hardhat0_pumpkin"//Could stand to be renamed item_state = "hardhat0_pumpkin" - flags_inventory = COVEREYES|COVERMOUTH - flags_inv_hide = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEALLHAIR - flags_armor_protection = HEAD|EYES + inventory_flags = COVEREYES|COVERMOUTH + inv_hide_flags = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEALLHAIR + armor_protection_flags = HEAD|EYES w_class = WEIGHT_CLASS_NORMAL anti_hug = 1 diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index 3280889ddc896..86d6b25fcc413 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -3,11 +3,11 @@ desc = "It's a baseball hat in a tasteless yellow color." icon_state = "cargosoft" item_state = "cargosoft" - flags_inventory = COVEREYES + inventory_flags = COVEREYES var/cap_color = "cargo" var/flipped = 0 siemens_coefficient = 0.9 - flags_armor_protection = NONE + armor_protection_flags = NONE /obj/item/clothing/head/soft/dropped() icon_state = "[cap_color]soft" @@ -104,7 +104,7 @@ icon_state = "greysoft" cap_color = "grey" soft_armor = list(MELEE = 35, BULLET = 35, LASER = 35, ENERGY = 15, BOMB = 10, BIO = 0, FIRE = 15, ACID = 15) - flags_inventory = BLOCKSHARPOBJ + inventory_flags = BLOCKSHARPOBJ /obj/item/clothing/head/soft/marine/alpha name = "alpha squad sergeant cap" diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm index 6782a60a09518..9c023f2ada7a6 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -3,8 +3,8 @@ name = "breath mask" icon_state = "breath" item_state = "breath" - flags_inventory = COVERMOUTH - flags_armor_protection = NONE + inventory_flags = COVERMOUTH + armor_protection_flags = NONE w_class = WEIGHT_CLASS_SMALL gas_transfer_coefficient = 0.10 permeability_coefficient = 0.50 @@ -20,14 +20,14 @@ if(!src.hanging) src.hanging = !src.hanging gas_transfer_coefficient = 1 //gas is now escaping to the turf and vice versa - flags_inventory &= ~(COVERMOUTH) + inventory_flags &= ~(COVERMOUTH) icon_state = "breathdown" to_chat(usr, "Your mask is now hanging on your neck.") else src.hanging = !src.hanging gas_transfer_coefficient = 0.10 - flags_inventory |= COVERMOUTH + inventory_flags |= COVERMOUTH icon_state = "breath" to_chat(usr, "You pull the mask up to cover your face.") update_clothing_icon() @@ -48,9 +48,9 @@ desc = "A close-fitting device that instantly heats or cools down air when you inhale so it doesn't damage your lungs." icon_state = "rebreather" item_state = "rebreather" - flags_armor_protection = NONE - flags_inventory = COVERMOUTH|COVEREYES|BLOCKGASEFFECT - flags_inv_hide = HIDELOWHAIR + armor_protection_flags = NONE + inventory_flags = COVERMOUTH|COVEREYES|BLOCKGASEFFECT + inv_hide_flags = HIDELOWHAIR gas_transfer_coefficient = 0.01 permeability_coefficient = 0.01 @@ -59,8 +59,8 @@ desc = "A close-fitting cap that covers the top, back, and sides of the head. Can also be adjusted to cover the lower part of the face so it keeps the user warm in harsh conditions." icon_state = "coif" item_state = "coif" - flags_inv_hide = HIDEALLHAIR|HIDEEARS - flags_cold_protection = HEAD + inv_hide_flags = HIDEALLHAIR|HIDEEARS + cold_protection_flags = HEAD min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROTECTION_TEMPERATURE /obj/item/clothing/mask/rebreather/scarf/freelancer @@ -71,9 +71,9 @@ desc = "A colored, resilient, and insulating cloth to cover your face from the elements. This one is Desert Tan" icon_state = "bandanna" item_state = "bandanna" - flags_armor_protection = FACE - flags_inv_hide = HIDEFACE - flags_inventory = COVERMOUTH|BLOCKGASEFFECT + armor_protection_flags = FACE + inv_hide_flags = HIDEFACE + inventory_flags = COVERMOUTH|BLOCKGASEFFECT gas_transfer_coefficient = 0.01 permeability_coefficient = 0.01 @@ -87,9 +87,9 @@ active = !active icon_state = "[initial(icon_state)][!active ? "_down" : ""]" - flags_armor_protection ^= initial(flags_armor_protection) - flags_inv_hide ^= initial(flags_inv_hide) - flags_inventory ^= initial(flags_inventory) + armor_protection_flags ^= initial(armor_protection_flags) + inv_hide_flags ^= initial(inv_hide_flags) + inventory_flags ^= initial(inventory_flags) to_chat(usr, "You [active ? "pull [src] up to cover your face" : "pull [src] off your face"].") update_clothing_icon() diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 57f195bfadb14..07abd5d1da542 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -5,15 +5,14 @@ desc = "A face-covering mask that can be connected to an air supply. Filters harmful gases from the air." icon_state = "gas_alt" item_state = "gas_alt" - flags_inventory = COVERMOUTH | COVEREYES | BLOCKGASEFFECT - flags_inv_hide = HIDEEARS|HIDEFACE|HIDELOWHAIR - flags_cold_protection = HEAD + inventory_flags = COVERMOUTH | COVEREYES | BLOCKGASEFFECT + inv_hide_flags = HIDEEARS|HIDEFACE|HIDELOWHAIR + cold_protection_flags = HEAD min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROTECTION_TEMPERATURE w_class = WEIGHT_CLASS_SMALL gas_transfer_coefficient = 0.01 permeability_coefficient = 0.01 siemens_coefficient = 0.9 - voice_filter = "lowpass=f=750,volume=2" var/gas_filter_strength = 1 //For gas mask filters var/list/filtered_gases = list(/datum/reagent/toxin/phoron, "sleeping_agent", "carbon_dioxide") ///Does this particular mask have breath noises @@ -40,12 +39,13 @@ /obj/item/clothing/mask/gas/tactical name = "Tactical gas mask" icon_state = "gas_alt_tactical" + voice_filter = "lowpass=f=750,volume=2" /obj/item/clothing/mask/gas/tactical/coif name = "Tactical coifed gas mask" desc = "A face-covering coifed mask that can be connected to an air supply. Filters harmful gases from the air." icon_state = "gascoif" - flags_inv_hide = HIDEEARS|HIDEFACE|HIDEALLHAIR + inv_hide_flags = HIDEEARS|HIDEFACE|HIDEALLHAIR /obj/item/clothing/mask/gas/pmc name = "\improper M8 pattern armored balaclava" @@ -53,10 +53,10 @@ icon_state = "pmc_mask" item_state = "helmet" anti_hug = 3 - flags_inventory = COVERMOUTH|BLOCKGASEFFECT - flags_inv_hide = HIDEEARS|HIDEFACE|HIDEALLHAIR + inventory_flags = COVERMOUTH|BLOCKGASEFFECT + inv_hide_flags = HIDEEARS|HIDEFACE|HIDEALLHAIR breathy = FALSE - voice_filter = null + voice_filter = "lowpass=f=750,volume=2" /obj/item/clothing/mask/gas/pmc/damaged name = "damaged M8 pattern armored balaclava" @@ -77,7 +77,6 @@ icon_state = "wolf_mask" anti_hug = 2 breathy = FALSE - voice_filter = null /obj/item/clothing/mask/gas/icc name = "\improper Modelle/60 gas mask" @@ -91,7 +90,7 @@ icon_state = "plaguedoctor" item_state = "gas_mask" soft_armor = list(MELEE = 0, BULLET = 0, LASER = 2, ENERGY = 2, BOMB = 0, BIO = 75, FIRE = 2, ACID = 2) - flags_armor_protection = HEAD|FACE + armor_protection_flags = HEAD|FACE /obj/item/clothing/mask/gas/swat name = "\improper SWAT mask" @@ -99,7 +98,20 @@ icon_state = "swat" anti_hug = 1 siemens_coefficient = 0.7 - flags_armor_protection = FACE|EYES + armor_protection_flags = FACE|EYES + voice_filter = "lowpass=f=750,volume=2" + +/obj/item/clothing/mask/gas/specops + name = "Special Operations gasmask" + desc = "A close-fitting tactical mask that can be connected to an air supply. Based off an old design of gas masks." + icon = 'icons/mob/clothing/mask.dmi' + item_icons = list( + slot_wear_suit_str = 'icons/mob/clothing/mask.dmi' + ) + icon_state = "specop" + item_state = "specop" + siemens_coefficient = 0.7 + voice_filter = "lowpass=f=750,volume=2" /obj/item/clothing/mask/gas/syndicate name = "syndicate mask" @@ -128,7 +140,6 @@ icon_state = "clown" item_state = "clown_hat" breathy = FALSE - voice_filter = null /obj/item/clothing/mask/gas/sexyclown name = "sexy-clown wig and mask" @@ -136,7 +147,6 @@ icon_state = "sexyclown" item_state = "sexyclown" breathy = FALSE - voice_filter = null /obj/item/clothing/mask/gas/mime name = "mime mask" @@ -144,16 +154,14 @@ icon_state = "mime" item_state = "mime" breathy = FALSE - voice_filter = null /obj/item/clothing/mask/gas/monkeymask name = "monkey mask" desc = "A mask used when acting as a monkey." icon_state = "monkeymask" item_state = "monkeymask" - flags_armor_protection = HEAD|FACE|EYES + armor_protection_flags = HEAD|FACE|EYES breathy = FALSE - voice_filter = null /obj/item/clothing/mask/gas/sexymime name = "sexy mime mask" @@ -161,7 +169,6 @@ icon_state = "sexymime" item_state = "sexymime" breathy = FALSE - voice_filter = null /obj/item/clothing/mask/gas/death_commando name = "Death Commando Mask" @@ -174,7 +181,6 @@ desc = "Beep boop" icon_state = "death" breathy = FALSE - voice_filter = null /obj/item/clothing/mask/gas/owl_mask name = "owl mask" diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 020be3d630b4e..696b7b4b1ad27 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -3,8 +3,8 @@ desc = "To stop that awful noise." icon_state = "muzzle" item_state = "muzzle" - flags_inventory = COVERMOUTH - flags_armor_protection = NONE + inventory_flags = COVERMOUTH + armor_protection_flags = NONE w_class = WEIGHT_CLASS_SMALL gas_transfer_coefficient = 0.90 @@ -14,8 +14,8 @@ icon_state = "sterile" item_state = "sterile" w_class = WEIGHT_CLASS_SMALL - flags_inventory = COVERMOUTH - flags_armor_protection = NONE + inventory_flags = COVERMOUTH + armor_protection_flags = NONE gas_transfer_coefficient = 0.90 permeability_coefficient = 0.01 soft_armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 25, FIRE = 0, ACID = 0) @@ -24,15 +24,15 @@ name = "fake moustache" desc = "Warning: moustache is fake." icon_state = "fake-moustache" - flags_inv_hide = HIDEFACE - flags_armor_protection = NONE + inv_hide_flags = HIDEFACE + armor_protection_flags = NONE /obj/item/clothing/mask/snorkel name = "Snorkel" desc = "For the Swimming Savant." icon_state = "snorkel" - flags_inv_hide = HIDEFACE - flags_armor_protection = NONE + inv_hide_flags = HIDEFACE + armor_protection_flags = NONE //scarves (fit in in mask slot) @@ -41,7 +41,7 @@ desc = "A blue neck scarf." icon_state = "blueneckscarf" item_state = "blueneckscarf" - flags_inventory = COVERMOUTH + inventory_flags = COVERMOUTH w_class = WEIGHT_CLASS_SMALL gas_transfer_coefficient = 0.90 @@ -50,7 +50,7 @@ desc = "A red and white checkered neck scarf." icon_state = "redwhite_scarf" item_state = "redwhite_scarf" - flags_inventory = COVERMOUTH + inventory_flags = COVERMOUTH w_class = WEIGHT_CLASS_SMALL gas_transfer_coefficient = 0.90 @@ -59,7 +59,7 @@ desc = "A green neck scarf." icon_state = "green_scarf" item_state = "green_scarf" - flags_inventory = COVERMOUTH + inventory_flags = COVERMOUTH w_class = WEIGHT_CLASS_SMALL gas_transfer_coefficient = 0.90 @@ -68,7 +68,7 @@ desc = "A stealthy, dark scarf." icon_state = "ninja_scarf" item_state = "ninja_scarf" - flags_inventory = COVERMOUTH + inventory_flags = COVERMOUTH w_class = WEIGHT_CLASS_SMALL gas_transfer_coefficient = 0.90 siemens_coefficient = 0 @@ -78,20 +78,20 @@ desc = "A rubber pig mask." icon_state = "pig" item_state = "pig" - flags_inventory = COVERMOUTH|COVEREYES - flags_inv_hide = HIDEFACE|HIDEALLHAIR|HIDEEYES|HIDEEARS + inventory_flags = COVERMOUTH|COVEREYES + inv_hide_flags = HIDEFACE|HIDEALLHAIR|HIDEEYES|HIDEEARS w_class = WEIGHT_CLASS_SMALL siemens_coefficient = 0.9 - flags_armor_protection = HEAD|FACE|EYES + armor_protection_flags = HEAD|FACE|EYES /obj/item/clothing/mask/horsehead name = "horse head mask" desc = "A mask made of soft vinyl and latex, representing the head of a horse." icon_state = "horsehead" item_state = "horsehead" - flags_inventory = COVERMOUTH|COVEREYES - flags_inv_hide = HIDEFACE|HIDEALLHAIR|HIDEEYES|HIDEEARS - flags_armor_protection = HEAD|FACE|EYES + inventory_flags = COVERMOUTH|COVEREYES + inv_hide_flags = HIDEFACE|HIDEALLHAIR|HIDEEYES|HIDEEARS + armor_protection_flags = HEAD|FACE|EYES w_class = WEIGHT_CLASS_SMALL var/voicechange = 0 siemens_coefficient = 0.9 @@ -102,8 +102,8 @@ desc = "LOADSAMONEY" icon_state = "balaclava" item_state = "balaclava" - flags_inv_hide = HIDEFACE|HIDEALLHAIR - flags_armor_protection = FACE + inv_hide_flags = HIDEFACE|HIDEALLHAIR + armor_protection_flags = FACE w_class = WEIGHT_CLASS_SMALL /obj/item/clothing/mask/balaclava/tactical @@ -118,11 +118,11 @@ desc = "Worn by robust fighters, flying high to defeat their foes!" icon_state = "luchag" item_state = "luchag" - flags_inv_hide = HIDEFACE|HIDEALLHAIR - flags_cold_protection = HEAD + inv_hide_flags = HIDEFACE|HIDEALLHAIR + cold_protection_flags = HEAD min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROTECTION_TEMPERATURE - flags_armor_protection = HEAD|FACE - flags_inventory = COVERMOUTH + armor_protection_flags = HEAD|FACE + inventory_flags = COVERMOUTH w_class = WEIGHT_CLASS_SMALL siemens_coefficient = 3 diff --git a/code/modules/clothing/modular_armor/attachments.dm b/code/modules/clothing/modular_armor/attachments.dm index 3a78e5c120428..35441d9cd371d 100644 --- a/code/modules/clothing/modular_armor/attachments.dm +++ b/code/modules/clothing/modular_armor/attachments.dm @@ -26,7 +26,7 @@ ///Pixel shift for the item overlay on the Y axis. var/pixel_shift_y = 0 ///Bitfield flags of various features. - var/flags_attach_features = ATTACH_REMOVABLE|ATTACH_APPLY_ON_MOB + var/attach_features_flags = ATTACH_REMOVABLE|ATTACH_APPLY_ON_MOB ///Time it takes to attach. var/attach_delay = 1.5 SECONDS ///Time it takes to detach. @@ -65,7 +65,7 @@ /obj/item/armor_module/Initialize(mapload) . = ..() - AddElement(/datum/element/attachment, slot, attach_icon, on_attach, on_detach, null, can_attach, pixel_shift_x, pixel_shift_y, flags_attach_features, attach_delay, detach_delay, mob_overlay_icon = mob_overlay_icon, mob_pixel_shift_x = mob_pixel_shift_x, mob_pixel_shift_y = mob_pixel_shift_y, attachment_layer = attachment_layer) + AddElement(/datum/element/attachment, slot, attach_icon, on_attach, on_detach, null, can_attach, pixel_shift_x, pixel_shift_y, attach_features_flags, attach_delay, detach_delay, mob_overlay_icon = mob_overlay_icon, mob_pixel_shift_x = mob_pixel_shift_x, mob_pixel_shift_y = mob_pixel_shift_y, attachment_layer = attachment_layer) AddComponent(/datum/component/attachment_handler, attachments_by_slot, attachments_allowed, starting_attachments = starting_attachments) update_icon() @@ -81,7 +81,7 @@ parent.hard_armor = parent.hard_armor.attachArmor(hard_armor) parent.soft_armor = parent.soft_armor.attachArmor(soft_armor) parent.slowdown += slowdown - if(CHECK_BITFIELD(flags_attach_features, ATTACH_ACTIVATION)) + if(CHECK_BITFIELD(attach_features_flags, ATTACH_ACTIVATION)) RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(handle_actions)) base_icon = icon_state if(length(variants_by_parent_type)) @@ -107,7 +107,7 @@ ///Adds or removes actions based on whether the parent is in the correct slot. /obj/item/armor_module/proc/handle_actions(datum/source, mob/user, slot) SIGNAL_HANDLER - if(prefered_slot && (slot != prefered_slot) || !CHECK_BITFIELD(flags_attach_features, ATTACH_ACTIVATION)) + if(prefered_slot && (slot != prefered_slot) || !CHECK_BITFIELD(attach_features_flags, ATTACH_ACTIVATION)) LAZYREMOVE(actions_types, /datum/action/item_action/toggle) var/datum/action/item_action/toggle/old_action = locate(/datum/action/item_action/toggle) in actions old_action?.remove_action(user) @@ -121,7 +121,6 @@ /obj/item/armor_module/ui_action_click(mob/user, datum/action/item_action/toggle/action) action.set_toggle(activate(user)) - action.update_button_icon() ///Called on ui_action_click. Used for activating the module. /obj/item/armor_module/proc/activate(mob/living/user) @@ -145,9 +144,9 @@ greyscale_config = null greyscale_colors = ARMOR_PALETTE_DRAB - flags_attach_features = ATTACH_REMOVABLE|ATTACH_SAME_ICON|ATTACH_APPLY_ON_MOB + attach_features_flags = ATTACH_REMOVABLE|ATTACH_SAME_ICON|ATTACH_APPLY_ON_MOB - flags_item_map_variant = ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT|ITEM_PRISON_VARIANT + item_map_variant_flags = ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT|ITEM_PRISON_VARIANT ///If TRUE, this armor piece can be recolored when its parent is right clicked by facepaint. var/secondary_color = FALSE diff --git a/code/modules/clothing/modular_armor/attachments/arm_plates.dm b/code/modules/clothing/modular_armor/attachments/arm_plates.dm index 80a98f32ae2bd..03ecc155768f0 100644 --- a/code/modules/clothing/modular_armor/attachments/arm_plates.dm +++ b/code/modules/clothing/modular_armor/attachments/arm_plates.dm @@ -54,28 +54,11 @@ desc = "Designed for use with the Jaeger Combat Exoskeleton. It provides high protection and encumbrance when attached and is fairly easy to attach and remove from armor. Click on the armor frame to attach it. All arm plates have the same armor and slowdown, meaning that only changing the chestplate makes significant armor difference. This armor appears to be marked as a Trooper armor piece." greyscale_config = /datum/greyscale_config/armor_mk1/trooper -/obj/item/armor_module/armor/arms/marine/kabuto - name = "\improper Style Pattern Kabuto arm plates" - desc = "Designed for use with the Jaeger Combat Exoskeleton. It provides high protection and encumbrance when attached and is fairly easy to attach and remove from armor. Click on the armor frame to attach it. All arm plates have the same armor and slowdown, meaning that only changing the chestplate makes significant armor difference. This armor appears to be marked as a Kabuto armor piece." - greyscale_config = /datum/greyscale_config/armor_mk1/kabuto - -/obj/item/armor_module/armor/arms/marine/hotaru - name = "\improper Style Pattern Hotaru arm plates" - desc = "Designed for use with the Jaeger Combat Exoskeleton. It provides high protection and encumbrance when attached and is fairly easy to attach and remove from armor. Click on the armor frame to attach it. All arm plates have the same armor and slowdown, meaning that only changing the chestplate makes significant armor difference. This armor appears to be marked as a Hotaru armor piece." - greyscale_config = /datum/greyscale_config/armor_mk1/hotaru - -/obj/item/armor_module/armor/arms/marine/dashe - name = "\improper Style Pattern Dashe arm plates" - desc = "Designed for use with the Jaeger Combat Exoskeleton. It provides high protection and encumbrance when attached and is fairly easy to attach and remove from armor. Click on the armor frame to attach it. All arm plates have the same armor and slowdown, meaning that only changing the chestplate makes significant armor difference. This armor appears to be marked as a Dashe armor piece." - greyscale_config = /datum/greyscale_config/armor_mk1/dashe - // Hardsuit Arm Plates /obj/item/armor_module/armor/arms/marine/hardsuit_arms name = "\improper FleckTex Base arm plates" desc = "Designed for use with the FleckTex WY-01 Exoskeleton. It provides high protection and encumbrance when attached and is fairly easy to attach and remove from armor. Click on the armor frame to attach it. All arm plates have the same armor and slowdown, meaning that only changing the chestplate makes significant armor difference. This armor appears to be marked as a Base armor piece." starting_attachments = list(/obj/item/armor_module/armor/secondary_color/arm) - attachments_allowed = list(/obj/item/armor_module/armor/secondary_color/arm) - attachments_by_slot = list(ATTACHMENT_SLOT_ARM_SECONDARY_COLOR) greyscale_config = /datum/greyscale_config/hardsuit_variant /obj/item/armor_module/armor/arms/marine/hardsuit_arms/syndicate_markfive diff --git a/code/modules/clothing/modular_armor/attachments/badges.dm b/code/modules/clothing/modular_armor/attachments/badges.dm index 47de6414d3b0b..68e0107d30b01 100644 --- a/code/modules/clothing/modular_armor/attachments/badges.dm +++ b/code/modules/clothing/modular_armor/attachments/badges.dm @@ -4,11 +4,11 @@ greyscale_config = /datum/greyscale_config/badge/shield icon_state = "in_hand" slot = ATTACHMENT_SLOT_BADGE - flags_attach_features = ATTACH_REMOVABLE|ATTACH_APPLY_ON_MOB|ATTACH_NO_HANDS|ATTACH_SAME_ICON + attach_features_flags = ATTACH_REMOVABLE|ATTACH_APPLY_ON_MOB|ATTACH_NO_HANDS|ATTACH_SAME_ICON colorable_allowed = COLOR_WHEEL_ALLOWED greyscale_colors = COLOR_RED secondary_color = TRUE - flags_item_map_variant = NONE + item_map_variant_flags = NONE ///List of selectable styles for where the badge is worn. var/list/style_list = list( @@ -89,10 +89,10 @@ icon_state = "beret_badge" greyscale_config = /datum/greyscale_config/style_hat/badge slot = ATTACHMENT_SLOT_CAPE_HIGHLIGHT - flags_attach_features = ATTACH_APPLY_ON_MOB|ATTACH_DIFFERENT_MOB_ICON_STATE + attach_features_flags = ATTACH_APPLY_ON_MOB|ATTACH_DIFFERENT_MOB_ICON_STATE secondary_color = TRUE greyscale_colors = COLOR_RED - flags_item_map_variant = NONE + item_map_variant_flags = NONE colorable_allowed = COLOR_WHEEL_ALLOWED /obj/item/armor_module/armor/stylehat_badge/classic @@ -108,10 +108,10 @@ icon_state = "skull" greyscale_config = /datum/greyscale_config/visors/glyphs slot = ATTACHMENT_SLOT_CAPE_HIGHLIGHT - flags_attach_features = ATTACH_APPLY_ON_MOB|ATTACH_SAME_ICON + attach_features_flags = ATTACH_APPLY_ON_MOB|ATTACH_SAME_ICON secondary_color = TRUE greyscale_colors = COLOR_WHITE - flags_item_map_variant = NONE + item_map_variant_flags = NONE colorable_allowed = COLOR_WHEEL_ALLOWED /obj/item/armor_module/armor/visor_glyph/old diff --git a/code/modules/clothing/modular_armor/attachments/cape.dm b/code/modules/clothing/modular_armor/attachments/cape.dm index 21ed11c30d46c..2179af483dbdd 100644 --- a/code/modules/clothing/modular_armor/attachments/cape.dm +++ b/code/modules/clothing/modular_armor/attachments/cape.dm @@ -9,7 +9,7 @@ attachment_layer = CAPE_LAYER prefered_slot = SLOT_W_UNIFORM greyscale_config = /datum/greyscale_config/cape - flags_attach_features = ATTACH_REMOVABLE|ATTACH_SAME_ICON|ATTACH_APPLY_ON_MOB|ATTACH_ACTIVATION + attach_features_flags = ATTACH_REMOVABLE|ATTACH_SAME_ICON|ATTACH_APPLY_ON_MOB|ATTACH_ACTIVATION|ATTACH_NO_HANDS attach_delay = 0 SECONDS detach_delay = 0 SECONDS secondary_color = TRUE @@ -126,27 +126,6 @@ "none", ), ), - "overlord" = list( - HOOD = FALSE, - HIGHLIGHT_VARIANTS = list( - "overlord", - "none", - ), - ), - "overlord (alt 1)" = list( - HOOD = FALSE, - HIGHLIGHT_VARIANTS = list( - "overlord (alt)", - "none", - ), - ), - "overlord (alt 2)" = list( - HOOD = FALSE, - HIGHLIGHT_VARIANTS = list( - "overlord (alt 2)", - "none", - ), - ), "shoal" = list( HOOD = FALSE, HIGHLIGHT_VARIANTS = list( @@ -168,13 +147,6 @@ "none", ), ), - "star" = list( - HOOD = FALSE, - HIGHLIGHT_VARIANTS = list( - "star", - "none", - ), - ), "rapier (right)" = list( HOOD = FALSE, HIGHLIGHT_VARIANTS = list( @@ -189,19 +161,13 @@ "none", ), ), - "jacket" = list( - HOOD = FALSE, - HIGHLIGHT_VARIANTS = list( - "jacket", - "none", - ), - ), ) ///True if the hood is up, false if not. var/hood = FALSE /obj/item/armor_module/armor/cape/update_icon_state() + . = ..() var/obj/item/armor_module/highlight = attachments_by_slot[ATTACHMENT_SLOT_CAPE_HIGHLIGHT] if(hood) icon_state = initial(icon_state) + "_[current_variant]_h" @@ -228,8 +194,8 @@ return if(parent) UnregisterSignal(parent, COMSIG_ITEM_EQUIPPED) - icon_state_variants[current_variant][HOOD] ? ENABLE_BITFIELD(flags_attach_features, ATTACH_ACTIVATION) : DISABLE_BITFIELD(flags_attach_features, ATTACH_ACTIVATION) - if(CHECK_BITFIELD(flags_attach_features, ATTACH_ACTIVATION) && parent) + icon_state_variants[current_variant][HOOD] ? ENABLE_BITFIELD(attach_features_flags, ATTACH_ACTIVATION) : DISABLE_BITFIELD(attach_features_flags, ATTACH_ACTIVATION) + if(CHECK_BITFIELD(attach_features_flags, ATTACH_ACTIVATION) && parent) RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(handle_actions)) var/obj/item/armor_module/highlight = attachments_by_slot[ATTACHMENT_SLOT_CAPE_HIGHLIGHT] if(!icon_state_variants[current_variant][HOOD]) @@ -260,7 +226,7 @@ desc = "A chromatic kama to improve on the design of the 7E badge, this kama is capable of two colors, for all your fashion needs. Hanged from the belt, it serves to flourish the lower extremities. \n Interact with facepaint to color. Attaches onto a uniform." slot = ATTACHMENT_SLOT_KAMA attachment_layer = KAMA_LAYER - flags_attach_features = ATTACH_REMOVABLE|ATTACH_SAME_ICON|ATTACH_APPLY_ON_MOB + attach_features_flags = ATTACH_REMOVABLE|ATTACH_SAME_ICON|ATTACH_APPLY_ON_MOB|ATTACH_NO_HANDS starting_attachments = list(/obj/item/armor_module/armor/cape_highlight/kama) greyscale_config = /datum/greyscale_config/cape icon_state_variants = list( @@ -291,12 +257,12 @@ desc = "A cape to improve on the design of the 7E badge, this cape is capable of six colors, for all your fashion needs. This variation of the cape functions more as a scarf. \n Interact with facepaint to color. Attaches onto a uniform. Activate it to toggle the hood." icon_state = "highlight" slot = ATTACHMENT_SLOT_CAPE_HIGHLIGHT - flags_attach_features = ATTACH_SAME_ICON|ATTACH_APPLY_ON_MOB + attach_features_flags = ATTACH_SAME_ICON|ATTACH_APPLY_ON_MOB|ATTACH_NO_HANDS colorable_allowed = PRESET_COLORS_ALLOWED|ICON_STATE_VARIANTS_ALLOWED|COLOR_WHEEL_ALLOWED greyscale_config = /datum/greyscale_config/cape_highlight secondary_color = TRUE greyscale_colors = VISOR_PALETTE_GOLD - flags_item_map_variant = NONE + item_map_variant_flags = NONE colorable_colors = VISOR_PALETTES_LIST current_variant = "none" icon_state_variants = list( @@ -306,6 +272,7 @@ ) /obj/item/armor_module/armor/cape_highlight/update_icon_state() + . = ..() if(!parent) return var/obj/item/armor_module/armor/cape/cape_parent = parent diff --git a/code/modules/clothing/modular_armor/attachments/chest_plates.dm b/code/modules/clothing/modular_armor/attachments/chest_plates.dm index ca25651b55a00..1fd46f4c484f7 100644 --- a/code/modules/clothing/modular_armor/attachments/chest_plates.dm +++ b/code/modules/clothing/modular_armor/attachments/chest_plates.dm @@ -59,21 +59,6 @@ desc = "Designed for use with the Jaeger Combat Exoskeleton. It provides high protection and encumbrance when attached and is fairly easy to attach and remove from armor. Click on the armor frame to attach it. This armor appears to be marked as a Ranger armor piece." greyscale_config = /datum/greyscale_config/armor_mk1/ranger -/obj/item/armor_module/armor/chest/marine/kabuto - name = "\improper Style Pattern Kabuto chestplates" - desc = "Designed for use with the Jaeger Combat Exoskeleton. It provides high protection and encumbrance when attached and is fairly easy to attach and remove from armor. Click on the armor frame to attach it. This armor appears to be marked as a Kabuto armor piece." - greyscale_config = /datum/greyscale_config/armor_mk1/kabuto - -/obj/item/armor_module/armor/chest/marine/hotaru - name = "\improper Style Pattern Hotaru chestplates" - desc = "Designed for use with the Jaeger Combat Exoskeleton. It provides high protection and encumbrance when attached and is fairly easy to attach and remove from armor. Click on the armor frame to attach it. This armor appears to be marked as a Hotaru armor piece." - greyscale_config = /datum/greyscale_config/armor_mk1/hotaru - -/obj/item/armor_module/armor/chest/marine/dashe - name = "\improper Style Pattern Dashe chestplates" - desc = "Designed for use with the Jaeger Combat Exoskeleton. It provides high protection and encumbrance when attached and is fairly easy to attach and remove from armor. Click on the armor frame to attach it. This armor appears to be marked as a Dashe armor piece." - greyscale_config = /datum/greyscale_config/armor_mk1/dashe - // Hardsuit Chest Plates /obj/item/armor_module/armor/chest/marine/hardsuit icon_state_variants = list( @@ -85,8 +70,6 @@ colorable_colors = ARMOR_PALETTES_LIST colorable_allowed = ICON_STATE_VARIANTS_ALLOWED|PRESET_COLORS_ALLOWED starting_attachments = list(/obj/item/armor_module/armor/secondary_color/chest/webbing) - attachments_allowed = list(/obj/item/armor_module/armor/secondary_color/chest/webbing) - attachments_by_slot = list(ATTACHMENT_SLOT_CHEST_SECONDARY_COLOR) /obj/item/armor_module/armor/chest/marine/hardsuit/syndicate_markfive name = "\improper FleckTex Mark V Breacher chestplates" diff --git a/code/modules/clothing/modular_armor/attachments/leg_plates.dm b/code/modules/clothing/modular_armor/attachments/leg_plates.dm index 55ea2e5cb4268..a4b968b53731b 100644 --- a/code/modules/clothing/modular_armor/attachments/leg_plates.dm +++ b/code/modules/clothing/modular_armor/attachments/leg_plates.dm @@ -54,21 +54,6 @@ desc = "Designed for use with the Jaeger Combat Exoskeleton. It provides high protection and encumbrance when attached and is fairly easy to attach and remove from armor. Click on the armor frame to attach it. All leg plates have the same armor and slowdown, meaning that only changing the chestplate makes significant armor difference. This armor appears to be marked as a Trooper armor piece." greyscale_config = /datum/greyscale_config/armor_mk1/trooper -/obj/item/armor_module/armor/legs/marine/kabuto - name = "\improper Style Pattern Kabuto leg plates" - desc = "Designed for use with the Jaeger Combat Exoskeleton. It provides high protection and encumbrance when attached and is fairly easy to attach and remove from armor. Click on the armor frame to attach it. All leg plates have the same armor and slowdown, meaning that only changing the chestplate makes significant armor difference. This armor appears to be marked as a Kabuto armor piece." - greyscale_config = /datum/greyscale_config/armor_mk1/kabuto - -/obj/item/armor_module/armor/legs/marine/hotaru - name = "\improper Style Pattern Hotaru leg plates" - desc = "Designed for use with the Jaeger Combat Exoskeleton. It provides high protection and encumbrance when attached and is fairly easy to attach and remove from armor. Click on the armor frame to attach it. All leg plates have the same armor and slowdown, meaning that only changing the chestplate makes significant armor difference. This armor appears to be marked as a Hotaru armor piece." - greyscale_config = /datum/greyscale_config/armor_mk1/hotaru - -/obj/item/armor_module/armor/legs/marine/dashe - name = "\improper Style Pattern Dashe leg plates" - desc = "Designed for use with the Jaeger Combat Exoskeleton. It provides high protection and encumbrance when attached and is fairly easy to attach and remove from armor. Click on the armor frame to attach it. This armor appears to be marked as a Dashe armor piece." - greyscale_config = /datum/greyscale_config/armor_mk1/dashe - // Hardsuit Leg Plates // Base Hardsuit Legs @@ -76,8 +61,6 @@ name = "\improper FleckTex Base leg plates" desc = "Designed for use with the FleckTex WY-01 Exoskeleton. It provides high protection and encumbrance when attached and is fairly easy to attach and remove from armor. Click on the armor frame to attach it. All arm plates have the same armor and slowdown, meaning that only changing the chestplate makes significant armor difference. This armor appears to be marked as a Base armor piece." starting_attachments = list(/obj/item/armor_module/armor/secondary_color/leg) - attachments_allowed = list(/obj/item/armor_module/armor/secondary_color/leg) - attachments_by_slot = list(ATTACHMENT_SLOT_KNEE_SECONDARY_COLOR) greyscale_config = /datum/greyscale_config/hardsuit_variant /obj/item/armor_module/armor/legs/marine/hardsuit_legs/syndicate_markfive diff --git a/code/modules/clothing/modular_armor/attachments/modules.dm b/code/modules/clothing/modular_armor/attachments/modules.dm index fbd769166a856..1b61df1a06603 100644 --- a/code/modules/clothing/modular_armor/attachments/modules.dm +++ b/code/modules/clothing/modular_armor/attachments/modules.dm @@ -18,6 +18,7 @@ icon_state = "pt_belt" item_state = "pt_belt_a" slot = ATTACHMENT_SLOT_BELT + attach_features_flags = ATTACH_NO_HANDS /** * Shoulder lamp strength module @@ -82,11 +83,11 @@ /obj/item/armor_module/module/fire_proof/on_attach(obj/item/attaching_to, mob/user) . = ..() parent.max_heat_protection_temperature += FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE - parent.flags_armor_features |= ARMOR_FIRE_RESISTANT + parent.armor_features_flags |= ARMOR_FIRE_RESISTANT /obj/item/armor_module/module/fire_proof/on_detach(obj/item/detaching_from, mob/user) parent.max_heat_protection_temperature -= FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE - parent.flags_armor_features &= ~ARMOR_FIRE_RESISTANT + parent.armor_features_flags &= ~ARMOR_FIRE_RESISTANT return ..() /obj/item/armor_module/module/fire_proof/som @@ -134,9 +135,7 @@ icon_state = "lorica_armor" item_state = "lorica_armor_a" attachment_layer = null - soft_armor = list(MELEE = 10, BULLET = 10, LASER = 15, ENERGY = 15, BOMB = 15, BIO = 5, FIRE = 10, ACID = 5) - slowdown = 0.2 - slot = ATTACHMENT_SLOT_MODULE + soft_armor = list(MELEE = 10, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 15, BIO = 5, FIRE = 10, ACID = 5) /obj/item/armor_module/module/tyr_head name = "Tyr Helmet System" @@ -270,6 +269,7 @@ parent.update_icon() /obj/item/armor_module/module/chemsystem/update_icon_state() + . = ..() if(chemsystem_is_active) icon_state = "mod_chemsystem_active" return @@ -330,12 +330,14 @@ return ..() ///Called to give extra info on parent examine. -/obj/item/armor_module/module/eshield/proc/parent_examine(datum/source, mob/examiner) +/obj/item/armor_module/module/eshield/proc/parent_examine(datum/source, mob/user, list/examine_list) SIGNAL_HANDLER - to_chat(examiner, span_notice("Recharge Rate: [recharge_rate/2] health per second\nCurrent Shield Health: [shield_health]\nMaximum Shield Health: [max_shield_health]\n")) + examine_list += span_notice("Recharge Rate: [recharge_rate/2] health per second") + examine_list += span_notice("Current Shield Health: [shield_health]") + examine_list += span_notice("Maximum Shield Health: [max_shield_health]") if(!recharge_timer) return - to_chat(examiner, span_warning("Charging is delayed! It will start recharging again in [timeleft(recharge_timer) / 10] seconds!")) + examine_list += span_warning("Charging is delayed! It will start recharging again in [timeleft(recharge_timer) / 10] seconds!") ///Handles starting the shield when the parent is equiped to the correct slot. /obj/item/armor_module/module/eshield/proc/handle_equip(datum/source, mob/equipper, slot) @@ -423,11 +425,25 @@ affected.remove_filter("eshield") affected.add_filter("eshield", 2, outline_filter(1, new_color)) +/obj/item/armor_module/module/eshield/overclocked + max_shield_health = 75 + damaged_shield_cooldown = 5 SECONDS + shield_color_low = COLOR_MAROON + shield_color_mid = LIGHT_COLOR_RED_ORANGE + shield_color_full = LIGHT_COLOR_ELECTRIC_CYAN + //original Martian design, donutsteel /obj/item/armor_module/module/eshield/som name = "Aegis Energy Dispersion Module" desc = "A sophisticated shielding unit, designed to disperse the energy of incoming impacts, rendering them harmless to the user. If it sustains too much it will deactivate, and leave the user vulnerable. It is unclear if this was a purely SOM designed module, or whether it was reverse engineered from the TGMC's 'Svalinn' shield system which was developed around the same time." +/obj/item/armor_module/module/eshield/som/overclocked + max_shield_health = 75 + damaged_shield_cooldown = 5 SECONDS + shield_color_low = COLOR_MAROON + shield_color_mid = LIGHT_COLOR_RED_ORANGE + shield_color_full = LIGHT_COLOR_ELECTRIC_CYAN + /obj/item/armor_module/module/style name = "\improper Armor Equalizer" desc = "Designed for mounting on conventional clothing, this grants it a level of reinforcement against attacks." @@ -475,7 +491,7 @@ icon_state = "welding_head" item_state = "welding_head_a" slot = ATTACHMENT_SLOT_HEAD_MODULE - flags_attach_features = ATTACH_REMOVABLE|ATTACH_ACTIVATION|ATTACH_APPLY_ON_MOB + attach_features_flags = ATTACH_REMOVABLE|ATTACH_ACTIVATION|ATTACH_APPLY_ON_MOB active = FALSE prefered_slot = SLOT_HEAD toggle_signal = COMSIG_KB_HELMETMODULE @@ -498,14 +514,14 @@ /obj/item/armor_module/module/welding/activate(mob/living/user) if(active) - DISABLE_BITFIELD(parent.flags_inventory, COVEREYES) - DISABLE_BITFIELD(parent.flags_inv_hide, HIDEEYES) - DISABLE_BITFIELD(parent.flags_armor_protection, EYES) + DISABLE_BITFIELD(parent.inventory_flags, COVEREYES) + DISABLE_BITFIELD(parent.inv_hide_flags, HIDEEYES) + DISABLE_BITFIELD(parent.armor_protection_flags, EYES) parent.eye_protection -= eye_protection_mod // reset to the users base eye else - ENABLE_BITFIELD(parent.flags_inventory, COVEREYES) - ENABLE_BITFIELD(parent.flags_inv_hide, HIDEEYES) - ENABLE_BITFIELD(parent.flags_armor_protection, EYES) + ENABLE_BITFIELD(parent.inventory_flags, COVEREYES) + ENABLE_BITFIELD(parent.inv_hide_flags, HIDEEYES) + ENABLE_BITFIELD(parent.armor_protection_flags, EYES) parent.eye_protection += eye_protection_mod active = !active @@ -522,7 +538,7 @@ icon = 'icons/mob/modular/modular_armor_modules.dmi' icon_state = "welding_head_som" item_state = "welding_head_som_a" - flags_attach_features = ATTACH_ACTIVATION|ATTACH_APPLY_ON_MOB + attach_features_flags = ATTACH_ACTIVATION|ATTACH_APPLY_ON_MOB /obj/item/armor_module/module/welding/superior name = "Superior Welding Helmet Module" @@ -531,7 +547,7 @@ icon_state = "welding_head" item_state = "welding_head_a" slot = ATTACHMENT_SLOT_HEAD_MODULE - flags_attach_features = ATTACH_REMOVABLE|ATTACH_ACTIVATION|ATTACH_APPLY_ON_MOB + attach_features_flags = ATTACH_REMOVABLE|ATTACH_ACTIVATION|ATTACH_APPLY_ON_MOB active = FALSE prefered_slot = SLOT_HEAD @@ -546,10 +562,10 @@ icon_state = "binocular_head" item_state = "binocular_head_a" active = FALSE - flags_item = DOES_NOT_NEED_HANDS + item_flags = DOES_NOT_NEED_HANDS zoom_tile_offset = 11 zoom_viewsize = 15 //RU TGMC EDIT - flags_attach_features = ATTACH_REMOVABLE|ATTACH_ACTIVATION|ATTACH_APPLY_ON_MOB + attach_features_flags = ATTACH_REMOVABLE|ATTACH_ACTIVATION|ATTACH_APPLY_ON_MOB slot = ATTACHMENT_SLOT_HEAD_MODULE prefered_slot = SLOT_HEAD toggle_signal = COMSIG_KB_HELMETMODULE @@ -593,57 +609,85 @@ icon_state = "artemis_head" item_state = "artemis_head_a" slot = ATTACHMENT_SLOT_HEAD_MODULE - flags_attach_features = ATTACH_REMOVABLE|ATTACH_APPLY_ON_MOB + attach_features_flags = ATTACH_REMOVABLE|ATTACH_APPLY_ON_MOB prefered_slot = SLOT_HEAD /obj/item/armor_module/module/artemis/on_attach(obj/item/attaching_to, mob/user) . = ..() parent.AddComponent(/datum/component/blur_protection) +#define COMMS_OFF 0 +#define COMMS_SETTING 1 +#define COMMS_SETUP 2 + /obj/item/armor_module/module/antenna name = "Antenna helmet module" - desc = "Designed for mounting on a modular Helmet. This module is able to provide a readout of the user's coordinates and connect to the shipside supply console." + desc = "Designed for mounting on a modular Helmet. This module is able to shield against the interference of caves, allowing for normal messaging in shallow caves, and only minor interference when deep." icon = 'icons/mob/modular/modular_armor_modules.dmi' icon_state = "antenna_head" item_state = "antenna_head_a" - flags_attach_features = ATTACH_REMOVABLE|ATTACH_ACTIVATION|ATTACH_APPLY_ON_MOB + attach_features_flags = ATTACH_REMOVABLE|ATTACH_ACTIVATION|ATTACH_APPLY_ON_MOB slot = ATTACHMENT_SLOT_HEAD_MODULE prefered_slot = SLOT_HEAD toggle_signal = COMSIG_KB_HELMETMODULE - /// Reference to the datum used by the supply drop console - var/datum/supply_beacon/beacon_datum - -/obj/item/armor_module/module/antenna/Destroy() - if(beacon_datum) - UnregisterSignal(beacon_datum, COMSIG_QDELETING) - QDEL_NULL(beacon_datum) + ///If the comms system is configured. + var/comms_setup = FALSE + ///ID of the startup timer + var/startup_timer_id + +/obj/item/armor_module/module/antenna/handle_actions(datum/source, mob/user, slot) + if(slot != prefered_slot) + UnregisterSignal(user, COMSIG_CAVE_INTERFERENCE_CHECK) + comms_setup = COMMS_OFF + if(startup_timer_id) + deltimer(startup_timer_id) + startup_timer_id = null + else + RegisterSignal(user, COMSIG_CAVE_INTERFERENCE_CHECK, PROC_REF(on_interference_check)) + start_sync(user) return ..() +///Handles interacting with caves checking for if anything is reducing (or increasing) interference. +/obj/item/armor_module/module/antenna/proc/on_interference_check(source, list/inplace_interference) + SIGNAL_HANDLER + if(comms_setup != COMMS_SETUP) + return + inplace_interference[1] = max(0, inplace_interference[1] - 1) + /obj/item/armor_module/module/antenna/activate(mob/living/user) - var/turf/location = get_turf(src) - if(beacon_datum) - UnregisterSignal(beacon_datum, COMSIG_QDELETING) - QDEL_NULL(beacon_datum) - user.show_message(span_warning("The [src] beeps and states, \"Your last position is no longer accessible by the supply console"), EMOTE_AUDIBLE, span_notice("The [src] vibrates but you can not hear it!")) + if(comms_setup == COMMS_SETTING) + to_chat(user, span_notice("Your Antenna module is still in the process of starting up!")) return - if(!is_ground_level(user.z)) - to_chat(user, span_warning("You have to be on the planet to use this or it won't transmit.")) - return FALSE - beacon_datum = new /datum/supply_beacon(user.name, user.loc, user.faction, 4 MINUTES) - RegisterSignal(beacon_datum, COMSIG_QDELETING, PROC_REF(clean_beacon_datum)) - user.show_message(span_notice("The [src] beeps and states, \"Your current coordinates were registered by the supply console. LONGITUDE [location.x]. LATITUDE [location.y]. Area ID: [get_area(src)]\""), EMOTE_AUDIBLE, span_notice("The [src] vibrates but you can not hear it!")) - -/// Signal handler to nullify beacon datum -/obj/item/armor_module/module/antenna/proc/clean_beacon_datum() - SIGNAL_HANDLER - beacon_datum = null + if(comms_setup == COMMS_SETUP) + var/turf/location = get_turf(user) + user.show_message(span_notice("The [src] beeps and states, \"Uplink data: LONGITUDE [location.x]. LATITUDE [location.y]. Area ID: [get_area(src)]\""), EMOTE_AUDIBLE, span_notice("The [src] vibrates but you can not hear it!")) + return + +///Begins the startup sequence. +/obj/item/armor_module/module/antenna/proc/start_sync(mob/living/user) + if(comms_setup != COMMS_OFF) //Guh? + return + to_chat(user, span_notice("Setting up Antenna communication relay. Please wait.")) + comms_setup = COMMS_SETTING + startup_timer_id = addtimer(CALLBACK(src, PROC_REF(finish_startup), user), ANTENNA_SYNCING_TIME, TIMER_STOPPABLE) + +///Finishes startup, rendering the module effective. +/obj/item/armor_module/module/antenna/proc/finish_startup(mob/living/user) + comms_setup = COMMS_SETUP + user.show_message(span_notice("[src] beeps twice and states: \"Antenna configuration complete. Relay system active.\""), EMOTE_AUDIBLE, span_notice("[src] vibrates twice.")) + startup_timer_id = null + + +#undef COMMS_OFF +#undef COMMS_SETTING +#undef COMMS_SETUP /obj/item/armor_module/module/night_vision name = "\improper BE-35 night vision kit" desc = "Installation kit for the BE-35 night vision system. Slightly impedes movement." icon = 'icons/mob/modular/modular_armor_modules.dmi' icon_state = "night_vision" - flags_attach_features = ATTACH_REMOVABLE|ATTACH_NO_HANDS + attach_features_flags = ATTACH_REMOVABLE|ATTACH_NO_HANDS slot = ATTACHMENT_SLOT_HEAD_MODULE prefered_slot = SLOT_HEAD slowdown = 0.1 diff --git a/code/modules/clothing/modular_armor/attachments/secondary_color.dm b/code/modules/clothing/modular_armor/attachments/secondary_color.dm index 9504129c43f6b..d35d4f411bd1d 100644 --- a/code/modules/clothing/modular_armor/attachments/secondary_color.dm +++ b/code/modules/clothing/modular_armor/attachments/secondary_color.dm @@ -1,9 +1,9 @@ //A module you can use to add yet another color layer to your modular armor sets. icon name format is [prefix]_[bodypart]_secondary_color_[variant] , exclude _variant if you do not use it /obj/item/armor_module/armor/secondary_color - flags_attach_features = ATTACH_SAME_ICON|ATTACH_APPLY_ON_MOB + attach_features_flags = ATTACH_SAME_ICON|ATTACH_APPLY_ON_MOB|ATTACH_BYPASS_ALLOWED_LIST|ATTACH_GREYSCALE_PARENT_COPY secondary_color = TRUE - flags_item_map_variant = NONE + item_map_variant_flags = NONE /obj/item/armor_module/armor/secondary_color/update_greyscale() if(!parent) @@ -12,14 +12,24 @@ /obj/item/armor_module/armor/secondary_color/on_attach(obj/item/attaching_to, mob/user) . = ..() + if(!attaching_to) + return + RegisterSignal(attaching_to, COMSIG_ITEM_VARIANT_CHANGE, PROC_REF(on_variant_change)) + if(greyscale_config) + return greyscale_config = attaching_to.greyscale_config name = "[attaching_to.name] secondary color" update_icon() update_greyscale() - RegisterSignal(attaching_to, COMSIG_ITEM_VARIANT_CHANGE, PROC_REF(on_variant_change)) -/obj/item/armor_module/armor/secondary_color/proc/on_variant_change(mob/user, variant) +/obj/item/armor_module/armor/secondary_color/on_detach(obj/item/detaching_from, mob/user) + . = ..() + if(!detaching_from) + return + UnregisterSignal(detaching_from, COMSIG_ITEM_VARIANT_CHANGE) + +/obj/item/armor_module/armor/secondary_color/proc/on_variant_change(obj/item/parent, mob/user, variant) SIGNAL_HANDLER if(variant in icon_state_variants) current_variant = variant @@ -27,7 +37,7 @@ update_greyscale() /obj/item/armor_module/armor/secondary_color/chest - name = "chest secondary_color" + name = "chest secondary color" icon_state = "chest_secondary_color" slot = ATTACHMENT_SLOT_CHEST_SECONDARY_COLOR @@ -40,16 +50,16 @@ ) /obj/item/armor_module/armor/secondary_color/leg - name = "leg secondary_color" + name = "leg secondary color" icon_state = "leg_secondary_color" slot = ATTACHMENT_SLOT_KNEE_SECONDARY_COLOR /obj/item/armor_module/armor/secondary_color/arm - name = "arm secondary_color" + name = "arm secondary color" icon_state = "arm_secondary_color" slot = ATTACHMENT_SLOT_ARM_SECONDARY_COLOR /obj/item/armor_module/armor/secondary_color/helm - name = "helm secondary_color" + name = "helm secondary color" icon_state = "helm_secondary_color" slot = ATTACHMENT_SLOT_HELM_SECONDARY_COLOR diff --git a/code/modules/clothing/modular_armor/attachments/storage.dm b/code/modules/clothing/modular_armor/attachments/storage.dm index 65003ad088982..f86f5dbc350e4 100644 --- a/code/modules/clothing/modular_armor/attachments/storage.dm +++ b/code/modules/clothing/modular_armor/attachments/storage.dm @@ -115,7 +115,7 @@ /obj/item/armor_module/storage/pocket icon_state = "" item_state = "" - flags_attach_features = ATTACH_APPLY_ON_MOB + attach_features_flags = ATTACH_APPLY_ON_MOB storage = /obj/item/storage/internal/pocket /obj/item/storage/internal/pocket @@ -131,6 +131,7 @@ /obj/item/ammo_magazine/sniper, /obj/item/ammo_magazine/handful, ) + cant_hold = list(/obj/item/cell/lasgun/volkite/powerpack) /obj/item/storage/internal/pocket/insertion_message(obj/item/item, mob/user) var/visidist = item.w_class >= WEIGHT_CLASS_NORMAL ? 3 : 1 @@ -183,7 +184,9 @@ /obj/item/ammo_magazine/revolver, /obj/item/ammo_magazine/sniper, /obj/item/ammo_magazine/handful, + /obj/item/cell/lasgun/plasma, ) + cant_hold = list(/obj/item/cell/lasgun/volkite/powerpack) /obj/item/armor_module/storage/general/som name = "General Purpose Storage module" @@ -269,7 +272,7 @@ /obj/item/tool/multitool, /obj/item/binoculars/tactical/range, /obj/item/explosive/plastique, - /obj/item/explosive/grenade/chem_grenade/razorburn_smol, + /obj/item/explosive/grenade/chem_grenade/razorburn_small, /obj/item/explosive/grenade/chem_grenade/razorburn_large, /obj/item/cell/apc, /obj/item/cell/high, @@ -388,7 +391,7 @@ desc = "A small set of straps to hold something in your boot." icon_state = "" storage = /obj/item/storage/internal/shoes/boot_knife - flags_attach_features = ATTACH_APPLY_ON_MOB + attach_features_flags = ATTACH_APPLY_ON_MOB /obj/item/storage/internal/shoes/boot_knife max_storage_space = 3 @@ -421,7 +424,7 @@ icon_state = "" storage = /obj/item/storage/internal/marinehelmet show_storage = TRUE - flags_attach_features = NONE + attach_features_flags = NONE /obj/item/storage/internal/marinehelmet max_storage_space = 3 diff --git a/code/modules/clothing/modular_armor/attachments/uniform.dm b/code/modules/clothing/modular_armor/attachments/uniform.dm index fa800cf2b8add..acbc24eb3a08b 100644 --- a/code/modules/clothing/modular_armor/attachments/uniform.dm +++ b/code/modules/clothing/modular_armor/attachments/uniform.dm @@ -3,7 +3,7 @@ /obj/item/armor_module/storage/uniform slot = ATTACHMENT_SLOT_UNIFORM w_class = WEIGHT_CLASS_BULKY - flags_attach_features = ATTACH_REMOVABLE|ATTACH_APPLY_ON_MOB|ATTACH_SEPERATE_MOB_OVERLAY|ATTACH_NO_HANDS + attach_features_flags = ATTACH_REMOVABLE|ATTACH_APPLY_ON_MOB|ATTACH_SEPERATE_MOB_OVERLAY|ATTACH_NO_HANDS icon = 'icons/obj/clothing/ties.dmi' attach_icon = 'icons/obj/clothing/ties_overlay.dmi' mob_overlay_icon = 'icons/mob/ties.dmi' diff --git a/code/modules/clothing/modular_armor/attachments/visors.dm b/code/modules/clothing/modular_armor/attachments/visors.dm index 303764d46124f..6e4c502be38a7 100644 --- a/code/modules/clothing/modular_armor/attachments/visors.dm +++ b/code/modules/clothing/modular_armor/attachments/visors.dm @@ -8,12 +8,12 @@ name = "standard visor" icon_state = "visor" slot = ATTACHMENT_SLOT_VISOR - flags_attach_features = ATTACH_SAME_ICON|ATTACH_APPLY_ON_MOB + attach_features_flags = ATTACH_SAME_ICON|ATTACH_APPLY_ON_MOB greyscale_config = /datum/greyscale_config/visors greyscale_colors = VISOR_PALETTE_GOLD colorable_colors = VISOR_PALETTES_LIST secondary_color = TRUE - flags_item_map_variant = NONE + item_map_variant_flags = NONE ///whether this helmet should be using its emissive overlay or not var/visor_emissive_on = TRUE @@ -92,21 +92,6 @@ icon_state = "trooper_visor" colorable_allowed = COLOR_WHEEL_ALLOWED|PRESET_COLORS_ALLOWED -/obj/item/armor_module/armor/visor/marine/kabuto - name = "\improper Style Pattern Kabuto visor" - desc = "The visor attachment of the Jaeger modular helmets. This one is designed for the Kabuto class of helmet." - icon_state = "kabuto_visor" - -/obj/item/armor_module/armor/visor/marine/hotaru - name = "\improper Style Pattern Hotaru visor" - desc = "The visor attachment of the Jaeger modular helmets. This one is designed for the Hotaru class of helmet." - icon_state = "hotaru_visor" - -/obj/item/armor_module/armor/visor/marine/dashe - name = "\improper Style Pattern Dashe visor" - desc = "The visor attachment of the Jaeger modular helmets. This one is designed for the Dashe class of helmet." - icon_state = "dashe_visor" - /obj/item/armor_module/armor/visor/marine/eva name = "\improper Jaeger Pattern EVA visor" desc = "The visor attachment of the Jaeger modular helmets. This one is designed for the EVA class of helmet." diff --git a/code/modules/clothing/modular_armor/combat_robot.dm b/code/modules/clothing/modular_armor/combat_robot.dm index fdba31604e71a..30925cfba730b 100644 --- a/code/modules/clothing/modular_armor/combat_robot.dm +++ b/code/modules/clothing/modular_armor/combat_robot.dm @@ -39,7 +39,7 @@ allowed_uniform_type = /obj/item/clothing/under/marine/robotic - flags_item_map_variant = ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT|ITEM_DESERT_VARIANT + item_map_variant_flags = ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT|ITEM_DESERT_VARIANT /obj/item/clothing/suit/modular/robot/mob_can_equip(mob/user, slot, warning = TRUE, override_nodrop = FALSE, bitslot = FALSE) . = ..() @@ -78,13 +78,13 @@ name = "XN-1 upper armor plating" desc = "Medium armor plating designed for self mounting on the upper half of TerraGov combat robotics. It has self-sealing bolts for mounting on robotic owners inside." item_icons = list( - slot_l_hand_str = 'icons/mob/items_lefthand_1.dmi', - slot_r_hand_str = 'icons/mob/items_righthand_1.dmi', + slot_l_hand_str = 'icons/mob/inhands/items/items_left.dmi', + slot_r_hand_str = 'icons/mob/inhands/items/items_right.dmi', ) icon_state = "helmet" item_state = "helmet" species_exception = list(/datum/species/robot) - flags_item_map_variant = (ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT|ITEM_PRISON_VARIANT) + item_map_variant_flags = (ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT|ITEM_PRISON_VARIANT) soft_armor = list(MELEE = 50, BULLET = 70, LASER = 70, ENERGY = 60, BOMB = 55, BIO = 55, FIRE = 55, ACID = 60) colorable_colors = ARMOR_PALETTES_LIST @@ -111,7 +111,7 @@ //RUTGMC EDIT ADDITION END ) starting_attachments = list(/obj/item/armor_module/storage/helmet, /obj/item/armor_module/armor/visor/marine/robot) - flags_item_map_variant = ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT|ITEM_DESERT_VARIANT + item_map_variant_flags = ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT|ITEM_DESERT_VARIANT /obj/item/clothing/head/modular/robot/mob_can_equip(mob/user, slot, warning = TRUE, override_nodrop = FALSE, bitslot = FALSE) diff --git a/code/modules/clothing/modular_armor/jaeger.dm b/code/modules/clothing/modular_armor/jaeger.dm index b65584f73c26d..809c40359f85d 100644 --- a/code/modules/clothing/modular_armor/jaeger.dm +++ b/code/modules/clothing/modular_armor/jaeger.dm @@ -35,7 +35,7 @@ /obj/item/armor_module/armor/badge, ) - flags_item_map_variant = ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT|ITEM_DESERT_VARIANT + item_map_variant_flags = ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT|ITEM_DESERT_VARIANT greyscale_config = /datum/greyscale_config/armor_mk2/infantry colorable_allowed = PRESET_COLORS_ALLOWED @@ -60,11 +60,6 @@ desc = "A Ranger-pattern Jaeger combat exoskeleton made to work with modular attachments for the ability to function in many enviroments. This one seems to have a moderate amount of armor plating. Alt-Click to remove attached items. Use it to toggle the built-in flashlight." greyscale_config = /datum/greyscale_config/armor_mk2/ranger -/obj/item/clothing/suit/modular/jaeger/hotaru - name = "\improper Style Pattern Hotaru medium exoskeleton" - desc = "A Ranger-pattern Hotaru combat exoskeleton made to work with modular attachments for the ability to function in many enviroments. This one seems to have a moderate amount of armor plating. Alt-Click to remove attached items. Use it to toggle the built-in flashlight." - greyscale_config = /datum/greyscale_config/armor_mk2/hotaru - // Light /obj/item/clothing/suit/modular/jaeger/light @@ -107,8 +102,8 @@ name = "Jaeger Pattern Infantry Helmet" desc = "Usually paired with the Jaeger Combat Exoskeleton. Can mount utility functions on the helmet hard points. Has Infantry markings." item_icons = list( - slot_l_hand_str = 'icons/mob/items_lefthand_1.dmi', - slot_r_hand_str = 'icons/mob/items_righthand_1.dmi', + slot_l_hand_str = 'icons/mob/inhands/items/items_left.dmi', + slot_r_hand_str = 'icons/mob/inhands/items/items_right.dmi', ) icon_state = "helmet" item_state = "helmet" @@ -148,13 +143,9 @@ /obj/item/armor_module/armor/visor/marine/ranger, /obj/item/armor_module/armor/visor/marine/traditional, /obj/item/armor_module/armor/visor/marine/trooper, - /obj/item/armor_module/armor/visor/marine/kabuto, - /obj/item/armor_module/armor/visor/marine/hotaru, - /obj/item/armor_module/armor/visor/marine/dashe, /obj/item/armor_module/armor/visor/marine/fourvisor, /obj/item/armor_module/armor/visor/marine/foureyevisor, /obj/item/armor_module/armor/visor/marine/markonevisor, - /obj/item/armor_module/armor/secondary_color/helm, //RUTGMC EDIT ADDITION BEGIN - MOTION_DETECTOR /obj/item/armor_module/module/motion_detector, //RUTGMC EDIT ADDITION END @@ -162,7 +153,7 @@ starting_attachments = list(/obj/item/armor_module/armor/visor/marine, /obj/item/armor_module/storage/helmet) - flags_item_map_variant = ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT|ITEM_DESERT_VARIANT + item_map_variant_flags = ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT|ITEM_DESERT_VARIANT /obj/item/clothing/head/modular/marine/eva name = "Jaeger Pattern EVA Helmet" @@ -229,24 +220,6 @@ starting_attachments = list(/obj/item/armor_module/armor/visor/marine/trooper, /obj/item/armor_module/storage/helmet) greyscale_config = /datum/greyscale_config/armor_mk2/trooper -/obj/item/clothing/head/modular/marine/kabuto - name = "Style Pattern Kabuto Helmet" - desc = "Usually paired with the Jaeger Combat Exoskeleton. Can mount utility functions on the helmet hard points. Has Kabuto markings" - starting_attachments = list(/obj/item/armor_module/armor/visor/marine/kabuto, /obj/item/armor_module/storage/helmet) - greyscale_config = /datum/greyscale_config/armor_mk1/kabuto - -/obj/item/clothing/head/modular/marine/hotaru - name = "Style Pattern Hotaru Helmet" - desc = "Usually paired with the Jaeger Combat Exoskeleton. Can mount utility functions on the helmet hard points. Has Hotaru markings" - starting_attachments = list(/obj/item/armor_module/armor/visor/marine/hotaru, /obj/item/armor_module/storage/helmet) - greyscale_config = /datum/greyscale_config/armor_mk1/hotaru - -/obj/item/clothing/head/modular/marine/dashe - name = "Style Pattern Dashe Helmet" - desc = "Usually paired with the Jaeger Combat Exoskeleton. Can mount utility functions on the helmet hard points. Has Dashe markings" - starting_attachments = list(/obj/item/armor_module/armor/visor/marine/dashe, /obj/item/armor_module/storage/helmet) - greyscale_config = /datum/greyscale_config/armor_mk1/dashe - // Hardsuit Helmets /obj/item/clothing/head/modular/marine/hardsuit_helm @@ -254,13 +227,6 @@ desc = "Usually paired with the FleckTex WY-01 modular exoskeleton. Can mount utility functions on the helmet hard points. Has Base markings" greyscale_config = /datum/greyscale_config/hardsuit_variant starting_attachments = list(/obj/item/armor_module/armor/visor/marine, /obj/item/armor_module/storage/helmet, /obj/item/armor_module/armor/secondary_color/helm) - attachments_by_slot = list( - ATTACHMENT_SLOT_VISOR, - ATTACHMENT_SLOT_STORAGE, - ATTACHMENT_SLOT_HEAD_MODULE, - ATTACHMENT_SLOT_BADGE, - ATTACHMENT_SLOT_HELM_SECONDARY_COLOR, - ) /obj/item/clothing/head/modular/marine/hardsuit_helm/markfive name = "FleckTex Mark V Breacher Helmet" diff --git a/code/modules/clothing/modular_armor/mark_one.dm b/code/modules/clothing/modular_armor/mark_one.dm index b3d1519922c8b..4b992a5f9455a 100644 --- a/code/modules/clothing/modular_armor/mark_one.dm +++ b/code/modules/clothing/modular_armor/mark_one.dm @@ -5,8 +5,8 @@ icon_state = "helmet" item_state = "helmet" item_icons = list( - slot_l_hand_str = 'icons/mob/items_lefthand_1.dmi', - slot_r_hand_str = 'icons/mob/items_righthand_1.dmi', + slot_l_hand_str = 'icons/mob/inhands/items/items_left.dmi', + slot_r_hand_str = 'icons/mob/inhands/items/items_right.dmi', ) attachments_allowed = list( diff --git a/code/modules/clothing/modular_armor/modular.dm b/code/modules/clothing/modular_armor/modular.dm index 3249f84d45137..5547a63b6fa63 100644 --- a/code/modules/clothing/modular_armor/modular.dm +++ b/code/modules/clothing/modular_armor/modular.dm @@ -18,9 +18,9 @@ item_state_worn = TRUE item_icons = list(slot_wear_suit_str = 'icons/mob/modular/modular_armor.dmi') - flags_atom = CONDUCT - flags_armor_protection = CHEST|GROIN|ARMS|LEGS|FEET|HANDS - flags_item = SYNTH_RESTRICTED|IMPEDE_JETPACK + atom_flags = CONDUCT + armor_protection_flags = CHEST|GROIN|ARMS|LEGS|FEET|HANDS + item_flags = SYNTH_RESTRICTED|IMPEDE_JETPACK /// What is allowed to be equipped in suit storage allowed = list( /obj/item/weapon/gun, @@ -38,7 +38,7 @@ /obj/item/tool/shovel/etool, /obj/item/weapon/energy/sword, ) - flags_equip_slot = ITEM_SLOT_OCLOTHING + equip_slot_flags = ITEM_SLOT_OCLOTHING w_class = WEIGHT_CLASS_BULKY equip_delay_self = 2 SECONDS unequip_delay_self = 1 SECONDS @@ -96,17 +96,6 @@ /obj/item/armor_module/armor/legs/marine/ranger, /obj/item/armor_module/armor/arms/marine/ranger, - /obj/item/armor_module/armor/chest/marine/kabuto, - /obj/item/armor_module/armor/legs/marine/kabuto, - /obj/item/armor_module/armor/arms/marine/kabuto, - - /obj/item/armor_module/armor/chest/marine/hotaru, - /obj/item/armor_module/armor/legs/marine/hotaru, - /obj/item/armor_module/armor/arms/marine/hotaru, - - /obj/item/armor_module/armor/chest/marine/dashe, - /obj/item/armor_module/armor/arms/marine/dashe, - /obj/item/armor_module/armor/legs/marine/dashe, /obj/item/armor_module/module/better_shoulder_lamp, /obj/item/armor_module/module/valkyrie_autodoc, @@ -159,7 +148,6 @@ return FALSE return ..() - /obj/item/clothing/suit/modular/attack_self(mob/user) . = ..() if(.) @@ -172,8 +160,8 @@ var/mob/living/carbon/human/H = user if(H.wear_suit != src) return - turn_light(user, !light_on) - return TRUE + if(turn_light(user, !light_on) == CHECKS_PASSED) + return TRUE /obj/item/clothing/suit/modular/item_action_slot_check(mob/user, slot) if(!light_range) // No light no ability @@ -201,6 +189,24 @@ if(attachments_by_slot[ATTACHMENT_SLOT_STORAGE]) . += "
It has a [attachments_by_slot[ATTACHMENT_SLOT_STORAGE]] installed." +/obj/item/clothing/suit/modular/examine(mob/user) + . = ..() + var/armor_info + var/obj/item/clothing/suit/modular/wear_modular_suit = src + if(wear_modular_suit.attachments_by_slot[ATTACHMENT_SLOT_CHESTPLATE]) + armor_info += " - [wear_modular_suit.attachments_by_slot[ATTACHMENT_SLOT_CHESTPLATE]].\n" + if(wear_modular_suit.attachments_by_slot[ATTACHMENT_SLOT_SHOULDER]) + armor_info += " - [wear_modular_suit.attachments_by_slot[ATTACHMENT_SLOT_SHOULDER]].\n" + if(wear_modular_suit.attachments_by_slot[ATTACHMENT_SLOT_KNEE]) + armor_info += " - [wear_modular_suit.attachments_by_slot[ATTACHMENT_SLOT_KNEE]].\n" + if(wear_modular_suit.attachments_by_slot[ATTACHMENT_SLOT_STORAGE]) + armor_info += " - [wear_modular_suit.attachments_by_slot[ATTACHMENT_SLOT_STORAGE]].\n" + if(wear_modular_suit.attachments_by_slot[ATTACHMENT_SLOT_MODULE]) + armor_info += " - [wear_modular_suit.attachments_by_slot[ATTACHMENT_SLOT_MODULE]].\n" + if(armor_info) + . += " It has the following attachments:" + . += armor_info + /obj/item/clothing/suit/modular/rownin name = "\improper Rownin Skeleton" desc = "A light armor, if you can even call it that, for marines that want to have agility in exchange for protection. Alt-Click to remove attached items. Use it to toggle the built-in flashlight." @@ -293,12 +299,12 @@ greyscale_config = /datum/greyscale_config/armor_mk1 greyscale_colors = ARMOR_PALETTE_DESERT - flags_armor_protection = HEAD - flags_armor_features = ARMOR_NO_DECAP - flags_inventory = BLOCKSHARPOBJ - flags_inv_hide = HIDEEARS|HIDE_EXCESS_HAIR + armor_protection_flags = HEAD + armor_features_flags = ARMOR_NO_DECAP + inventory_flags = BLOCKSHARPOBJ + inv_hide_flags = HIDEEARS|HIDE_EXCESS_HAIR allowed = null - flags_equip_slot = ITEM_SLOT_HEAD + equip_slot_flags = ITEM_SLOT_HEAD w_class = WEIGHT_CLASS_NORMAL soft_armor = list(MELEE = 15, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 15, BIO = 15, FIRE = 15, ACID = 15) @@ -369,12 +375,21 @@ . += "
This is a piece of modular armor, It can equip different attachments.
" . += "
It currently has [attachments_by_slot[ATTACHMENT_SLOT_HEAD_MODULE] ? attachments_by_slot[ATTACHMENT_SLOT_HEAD_MODULE] : "nothing"] installed." +/obj/item/clothing/head/modular/examine(mob/user) + . = ..() + var/armor_info + var/obj/item/clothing/head/modular/wear_modular_suit = src + if(wear_modular_suit.attachments_by_slot[ATTACHMENT_SLOT_HEAD_MODULE]) + armor_info += " - [wear_modular_suit.attachments_by_slot[ATTACHMENT_SLOT_HEAD_MODULE]].\n" + if(armor_info) + . += " It has the following attachments:" + . += armor_info + /** Colorable masks */ /obj/item/clothing/mask/gas/modular name = "style mask" desc = "A cool sylish mask that through some arcane magic blocks gas attacks. How? Who knows. How did you even get this?" breathy = FALSE - voice_filter = null icon_state = "gas_alt" item_state = "gas_alt" item_icons = list(slot_wear_mask_str) diff --git a/code/modules/clothing/modular_armor/som.dm b/code/modules/clothing/modular_armor/som.dm index 180ef33deb370..0f22e8547de02 100644 --- a/code/modules/clothing/modular_armor/som.dm +++ b/code/modules/clothing/modular_armor/som.dm @@ -3,7 +3,7 @@ /obj/item/clothing/suit/modular/som name = "\improper SOM light battle armor" desc = "The M-21 battle armor is typically used by SOM light infantry, or other specialists that require more mobility at the cost of some protection. Provides good protection without minor impairment to the users mobility. Alt-Click to remove attached items. Use it to toggle the built-in flashlight." - soft_armor = list(MELEE = 45, BULLET = 70, LASER = 60, ENERGY = 60, BOMB = 50, BIO = 50, FIRE = 55, ACID = 50) + soft_armor = list(MELEE = 45, BULLET = 65, LASER = 60, ENERGY = 60, BOMB = 50, BIO = 50, FIRE = 55, ACID = 50) icon = 'icons/mob/modular/som_armor.dmi' item_icons = list( slot_wear_suit_str = 'icons/mob/modular/som_armor.dmi', @@ -22,6 +22,7 @@ /obj/item/armor_module/module/mimir_environment_protection/som, /obj/item/armor_module/module/hlin_explosive_armor, /obj/item/armor_module/module/eshield/som, + /obj/item/armor_module/module/eshield/som/overclocked, /obj/item/armor_module/storage/general, /obj/item/armor_module/storage/ammo_mag, /obj/item/armor_module/storage/engineering, @@ -60,10 +61,28 @@ /obj/item/armor_module/storage/medical/som, ) +/obj/item/clothing/suit/modular/som/shield_overclocked + starting_attachments = list( + /obj/item/armor_module/module/eshield/som/overclocked, + /obj/item/armor_module/storage/medical/som, + ) + +/obj/item/clothing/suit/modular/som/shield_overclocked/medic + starting_attachments = list( + /obj/item/armor_module/module/eshield/som/overclocked, + /obj/item/armor_module/storage/general/som, + ) + +/obj/item/clothing/suit/modular/som/shield_overclocked/engineer + starting_attachments = list( + /obj/item/armor_module/module/eshield/som/overclocked, + /obj/item/armor_module/storage/engineering, + ) + /obj/item/clothing/suit/modular/som/light name = "\improper SOM scout armor" desc = "The M-11 scout armor is a lightweight suit that that allows for minimal encumberance while still providing reasonable protection. Often seen on scouts or other specialist units that aren't normally getting shot at. Alt-Click to remove attached items. Use it to toggle the built-in flashlight." - soft_armor = list(MELEE = 35, BULLET = 60, LASER = 50, ENERGY = 50, BOMB = 45, BIO = 45, FIRE = 50, ACID = 40) + soft_armor = list(MELEE = 35, BULLET = 55, LASER = 50, ENERGY = 50, BOMB = 45, BIO = 45, FIRE = 50, ACID = 40) icon_state = "som_light" item_state = "som_light" slowdown = SLOWDOWN_ARMOR_LIGHT @@ -74,11 +93,41 @@ /obj/item/armor_module/storage/medical/som, ) +/obj/item/clothing/suit/modular/som/light/shield_overclocked + starting_attachments = list( + /obj/item/armor_module/module/eshield/som/overclocked, + /obj/item/armor_module/storage/medical/som, + ) + +/obj/item/clothing/suit/modular/som/light/shield_overclocked/medic + starting_attachments = list( + /obj/item/armor_module/module/eshield/som/overclocked, + /obj/item/armor_module/storage/general/som, + ) + +/obj/item/clothing/suit/modular/som/light/shield_overclocked/engineer + starting_attachments = list( + /obj/item/armor_module/module/eshield/som/overclocked, + /obj/item/armor_module/storage/engineering, + ) + +/obj/item/clothing/suit/modular/som/light/engineer + starting_attachments = list( + /obj/item/armor_module/module/better_shoulder_lamp, + /obj/item/armor_module/storage/engineering, + ) + +/obj/item/clothing/suit/modular/som/light/medic + starting_attachments = list( + /obj/item/armor_module/module/better_shoulder_lamp, + /obj/item/armor_module/storage/general/som, + ) + /obj/item/clothing/suit/modular/som/heavy name = "\improper SOM heavy battle armor" desc = "A standard suit of M-31 heavy duty combat armor worn by SOM shock troops. Provides excellent protection however it does reduce mobility somewhat. Alt-Click to remove attached items. Use it to toggle the built-in flashlight." - soft_armor = list(MELEE = 50, BULLET = 75, LASER = 65, ENERGY = 65, BOMB = 55, BIO = 55, FIRE = 60, ACID = 55) + soft_armor = list(MELEE = 50, BULLET = 70, LASER = 65, ENERGY = 65, BOMB = 55, BIO = 55, FIRE = 60, ACID = 55) icon_state = "som_heavy" item_state = "som_heavy" slowdown = SLOWDOWN_ARMOR_HEAVY @@ -107,10 +156,16 @@ /obj/item/armor_module/storage/medical/som, ) +/obj/item/clothing/suit/modular/som/heavy/shield_overclocked + starting_attachments = list( + /obj/item/armor_module/module/eshield/som/overclocked, + /obj/item/armor_module/storage/medical/som, + ) + /obj/item/clothing/suit/modular/som/heavy/leader name = "\improper SOM Gorgon pattern assault armor" desc = "A bulky suit of heavy combat armor, the M-35 'Gorgon' armor provides the user with superior protection without severely impacting mobility. Typically seen on SOM leaders or their most elite combat units due to the significant construction and maintenance requirements. You'll need serious firepower to punch through this. Alt-Click to remove attached items. Use it to toggle the built-in flashlight." - soft_armor = list(MELEE = 60, BULLET = 80, LASER = 70, ENERGY = 70, BOMB = 60, BIO = 55, FIRE = 65, ACID = 55) + soft_armor = list(MELEE = 60, BULLET = 75, LASER = 70, ENERGY = 70, BOMB = 60, BIO = 55, FIRE = 65, ACID = 55) icon_state = "som_leader" item_state = "som_leader" @@ -124,6 +179,7 @@ /obj/item/armor_module/module/mimir_environment_protection/som, /obj/item/armor_module/module/hlin_explosive_armor, /obj/item/armor_module/module/eshield/som, + /obj/item/armor_module/module/eshield/som/overclocked, /obj/item/armor_module/storage/general, /obj/item/armor_module/storage/ammo_mag, /obj/item/armor_module/storage/engineering, @@ -165,9 +221,9 @@ ) icon_state = "som_helmet" item_state = "som_helmet" - soft_armor = list(MELEE = 45, BULLET = 70, LASER = 60, ENERGY = 60, BOMB = 50, BIO = 50, FIRE = 55, ACID = 50) - flags_inv_hide = HIDEEARS|HIDEALLHAIR - flags_armor_protection = HEAD|FACE|EYES + soft_armor = list(MELEE = 45, BULLET = 65, LASER = 60, ENERGY = 60, BOMB = 50, BIO = 50, FIRE = 55, ACID = 50) + inv_hide_flags = HIDEEARS|HIDEALLHAIR + armor_protection_flags = HEAD|FACE|EYES attachments_allowed = list( /obj/item/armor_module/module/binoculars, /obj/item/armor_module/module/binoculars/artemis_mark_two, @@ -201,7 +257,7 @@ desc = "This specialised helmet is worn by SOM personel equipped to deal with dangerous chemical, radiological or otherwise hazard substances. Typical unleashed by the SOM themselves." icon_state = "som_helmet_bio" item_state = "som_helmet_bio" - soft_armor = list(MELEE = 45, BULLET = 70, LASER = 60, ENERGY = 60, BOMB = 50, BIO = 75, FIRE = 50, ACID = 70) + soft_armor = list(MELEE = 45, BULLET = 65, LASER = 60, ENERGY = 60, BOMB = 50, BIO = 75, FIRE = 50, ACID = 70) siemens_coefficient = 0.1 permeability_coefficient = 0 gas_transfer_coefficient = 0.1 @@ -215,7 +271,7 @@ desc = "A helmet paired with the 'Hades' armor module, designed for significantly improved protection from fire, without compromising normal durability." icon_state = "som_helmet_light" item_state = "som_helmet_light" - soft_armor = list(MELEE = 45, BULLET = 70, LASER = 60, ENERGY = 60, BOMB = 50, BIO = 50, FIRE = 90, ACID = 50) + soft_armor = list(MELEE = 45, BULLET = 65, LASER = 60, ENERGY = 60, BOMB = 50, BIO = 50, FIRE = 90, ACID = 50) attachments_allowed = list( /obj/item/armor_module/storage/helmet, /obj/item/armor_module/armor/badge, @@ -224,14 +280,14 @@ /obj/item/clothing/head/modular/som/veteran name = "\improper SOM veteran helmet" desc = "The standard combat helmet worn by SOM combat specialists. State of the art materials provides more protection for more valuable brains." - soft_armor = list(MELEE = 50, BULLET = 75, LASER = 65, ENERGY = 65, BOMB = 55, BIO = 55, FIRE = 60, ACID = 55) + soft_armor = list(MELEE = 50, BULLET = 70, LASER = 65, ENERGY = 65, BOMB = 55, BIO = 55, FIRE = 60, ACID = 55) /obj/item/clothing/head/modular/som/lorica name = "\improper Lorica Helmet System" desc = "A bulky helmet paired with the 'Lorica' armor module, designed for outstanding protection at the cost of significant weight and reduced flexibility. Substantial additional armor improves protection against all damage." icon_state = "som_helmet_lorica" item_state = "som_helmet_lorica" - soft_armor = list(MELEE = 60, BULLET = 85, LASER = 80, ENERGY = 80, BOMB = 65, BIO = 55, FIRE = 70, ACID = 60) + soft_armor = list(MELEE = 60, BULLET = 80, LASER = 80, ENERGY = 80, BOMB = 65, BIO = 55, FIRE = 70, ACID = 60) attachments_allowed = list( /obj/item/armor_module/storage/helmet, /obj/item/armor_module/armor/badge, @@ -242,7 +298,7 @@ desc = "Made for use with Gorgon pattern assault armor, providing superior protection. Typically seen on SOM leaders or their most elite combat units." icon_state = "som_helmet_leader" item_state = "som_helmet_leader" - soft_armor = list(MELEE = 60, BULLET = 80, LASER = 70, ENERGY = 70, BOMB = 60, BIO = 55, FIRE = 65, ACID = 55) + soft_armor = list(MELEE = 60, BULLET = 75, LASER = 70, ENERGY = 70, BOMB = 60, BIO = 55, FIRE = 65, ACID = 55) attachments_allowed = list( /obj/item/armor_module/module/binoculars, /obj/item/armor_module/module/binoculars/artemis_mark_two, diff --git a/code/modules/clothing/modular_armor/style_line.dm b/code/modules/clothing/modular_armor/style_line.dm index b420fad0a493e..d0e7ca96fa911 100644 --- a/code/modules/clothing/modular_armor/style_line.dm +++ b/code/modules/clothing/modular_armor/style_line.dm @@ -4,13 +4,13 @@ /obj/item/clothing/suit/modular/style name = "\improper Drip" desc = "They got that drip, doe." - flags_item_map_variant = NONE + item_map_variant_flags = NONE allowed_uniform_type = /obj/item/clothing/under icon = 'icons/obj/clothing/suits/marine_suits.dmi' item_icons = list( slot_wear_suit_str = 'icons/mob/clothing/suits/marine_suits.dmi', - slot_l_hand_str = 'icons/mob/items_lefthand_1.dmi', - slot_r_hand_str = 'icons/mob/items_righthand_1.dmi', + slot_l_hand_str = 'icons/mob/inhands/items/items_left.dmi', + slot_r_hand_str = 'icons/mob/inhands/items/items_right.dmi', ) attachments_allowed = list( // Armor Modules @@ -81,7 +81,7 @@ /obj/item/clothing/head/modular/style name = "\improper Nice Hat" desc = "Nice hat bro. How did you find this?" - flags_item_map_variant = ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT|ITEM_DESERT_VARIANT + item_map_variant_flags = ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT|ITEM_DESERT_VARIANT attachments_allowed = list( /obj/item/armor_module/armor/badge, /obj/item/armor_module/storage/helmet, @@ -102,7 +102,7 @@ visorless_offset_y = 0 - flags_inv_hide = NONE + inv_hide_flags = NONE soft_armor = list(MELEE = 50, BULLET = 70, LASER = 70, ENERGY = 60, BOMB = 50, BIO = 50, FIRE = 50, ACID = 60) starting_attachments = list(/obj/item/armor_module/storage/helmet) @@ -116,6 +116,7 @@ icon_state = "beret_inhand" item_state = "beret" starting_attachments = list(/obj/item/armor_module/storage/helmet, /obj/item/armor_module/armor/stylehat_badge) + inv_hide_flags = HIDE_EXCESS_HAIR /obj/item/clothing/head/modular/style/classic_beret @@ -124,18 +125,21 @@ icon_state = "classic_beret_inhand" item_state = "classic_beret" starting_attachments = list(/obj/item/armor_module/storage/helmet, /obj/item/armor_module/armor/stylehat_badge/classic) + inv_hide_flags = HIDE_EXCESS_HAIR /obj/item/clothing/head/modular/style/boonie name = "TGMC boonie" desc = "A boonie hat used by the TGMC, purpose made for operations in enviroments with a lot of sun, or dense vegetation." icon_state = "boonie_inhand" item_state = "boonie" + inv_hide_flags = HIDE_EXCESS_HAIR /obj/item/clothing/head/modular/style/cap name = "TGMC cap" desc = "A common patrol cap used by the TGMC, stylish and comes in many colors. Mostly useful to keep the sun and officers away." icon_state = "cap_inhand" item_state = "cap" + inv_hide_flags = HIDE_EXCESS_HAIR /obj/item/clothing/head/modular/style/slouchhat @@ -143,6 +147,7 @@ desc = "A slouch hat, makes you feel down under, doesn't it? Has 'PROPERTY OF THE TGMC' markings under the hat." icon_state = "slouch_inhand" item_state = "slouch" + inv_hide_flags = HIDE_EXCESS_HAIR /obj/item/clothing/head/modular/style/ushanka name = "TGMC ushanka" @@ -150,6 +155,7 @@ icon_state = "ushanka_inhand" item_state = "ushanka" starting_attachments = list(/obj/item/armor_module/storage/helmet, /obj/item/armor_module/armor/stylehat_badge/ushanka) + inv_hide_flags = HIDE_EXCESS_HAIR /obj/item/clothing/head/modular/style/campaignhat @@ -157,6 +163,7 @@ desc = "A campaign hat, you can feel the menacing aura that this hat erodes just by looking at it." icon_state = "campaign_inhand" item_state = "campaign" + inv_hide_flags = HIDE_EXCESS_HAIR /obj/item/clothing/head/modular/style/beanie @@ -164,6 +171,7 @@ desc = "A beanie, just looking at it makes you feel like an 'Oussama', or in better terms- A modern phenomenon of people suddenly needing to bench once they put on a beanie." icon_state = "beanie_inhand" item_state = "beanie" + inv_hide_flags = HIDE_EXCESS_HAIR /obj/item/clothing/head/modular/style/headband name = "TGMC headband" @@ -177,6 +185,7 @@ desc = "A bandana that goes on your head. Has TGMC markings on the back tie, and it seems that the knot will never come undone somehow." icon_state = "headbandana_inhand" item_state = "headbandana" + inv_hide_flags = HIDE_EXCESS_HAIR // style masks /obj/item/clothing/mask/gas/modular/skimask @@ -184,8 +193,8 @@ desc = "A stylish skimask, can be recolored. Makes you feel like an operator just looking at it." icon_state = "ski_inhand" item_state = "ski" - flags_inv_hide = HIDEALLHAIR|HIDEEARS - flags_item_map_variant = ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT|ITEM_DESERT_VARIANT + inv_hide_flags = HIDEALLHAIR|HIDEEARS + item_map_variant_flags = ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT|ITEM_DESERT_VARIANT greyscale_config = /datum/greyscale_config/style_hat @@ -194,5 +203,5 @@ desc = "The CFCC is a prime and readied, yet stylish facemask ready to... cover your face." icon_state = "coof_inhand" item_state = "coof" - flags_item_map_variant = ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT|ITEM_DESERT_VARIANT + item_map_variant_flags = ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT|ITEM_DESERT_VARIANT greyscale_config = /datum/greyscale_config/style_hat diff --git a/code/modules/clothing/modular_armor/xenonauten.dm b/code/modules/clothing/modular_armor/xenonauten.dm index 7b9d5caee7108..7b3531efcbdce 100644 --- a/code/modules/clothing/modular_armor/xenonauten.dm +++ b/code/modules/clothing/modular_armor/xenonauten.dm @@ -22,6 +22,7 @@ /obj/item/armor_module/module/ballistic_armor, /obj/item/armor_module/module/chemsystem, /obj/item/armor_module/module/eshield, + /obj/item/armor_module/module/eshield/overclocked, /obj/item/armor_module/storage/general, /obj/item/armor_module/storage/ammo_mag, @@ -36,7 +37,7 @@ /obj/item/armor_module/armor/badge, ) - flags_item_map_variant = ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT|ITEM_DESERT_VARIANT + item_map_variant_flags = ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT|ITEM_DESERT_VARIANT greyscale_config = /datum/greyscale_config/xenonaut colorable_allowed = PRESET_COLORS_ALLOWED colorable_colors = ARMOR_PALETTES_LIST @@ -44,24 +45,66 @@ allowed_uniform_type = /obj/item/clothing/under +/obj/item/clothing/suit/modular/xenonauten/hodgrenades + starting_attachments = list( + /obj/item/armor_module/module/ballistic_armor, + /obj/item/armor_module/storage/grenade, + ) + /obj/item/clothing/suit/modular/xenonauten/engineer starting_attachments = list( /obj/item/armor_module/module/better_shoulder_lamp, /obj/item/armor_module/storage/engineering, ) +/obj/item/clothing/suit/modular/xenonauten/lightmedical + starting_attachments = list( + /obj/item/armor_module/module/better_shoulder_lamp, + /obj/item/armor_module/storage/medical, + ) + +/obj/item/clothing/suit/modular/xenonauten/lightgeneral + starting_attachments = list( + /obj/item/armor_module/module/better_shoulder_lamp, + /obj/item/armor_module/storage/general, + ) + /obj/item/clothing/suit/modular/xenonauten/mimir starting_attachments = list( /obj/item/armor_module/module/mimir_environment_protection/mark1, /obj/item/armor_module/storage/general, ) +/obj/item/clothing/suit/modular/xenonauten/mimirinjector + starting_attachments = list( + /obj/item/armor_module/module/mimir_environment_protection/mark1, + /obj/item/armor_module/storage/injector, + ) + /obj/item/clothing/suit/modular/xenonauten/shield starting_attachments = list( /obj/item/armor_module/module/eshield, /obj/item/armor_module/storage/medical, ) +/obj/item/clothing/suit/modular/xenonauten/shield_overclocked + starting_attachments = list( + /obj/item/armor_module/module/eshield/overclocked, + /obj/item/armor_module/storage/medical, + ) + +/obj/item/clothing/suit/modular/xenonauten/shield_overclocked/medic + starting_attachments = list( + /obj/item/armor_module/module/eshield/overclocked, + /obj/item/armor_module/storage/general, + ) + +/obj/item/clothing/suit/modular/xenonauten/shield_overclocked/engineer + starting_attachments = list( + /obj/item/armor_module/module/eshield/overclocked, + /obj/item/armor_module/storage/engineering, + ) + /obj/item/clothing/suit/modular/xenonauten/valk starting_attachments = list( /obj/item/armor_module/module/valkyrie_autodoc, @@ -81,6 +124,30 @@ /obj/item/armor_module/storage/medical, ) +/obj/item/clothing/suit/modular/xenonauten/light/shield_overclocked + starting_attachments = list( + /obj/item/armor_module/module/eshield/overclocked, + /obj/item/armor_module/storage/medical, + ) + +/obj/item/clothing/suit/modular/xenonauten/light/shield_overclocked/medic + starting_attachments = list( + /obj/item/armor_module/module/eshield/overclocked, + /obj/item/armor_module/storage/general, + ) + +/obj/item/clothing/suit/modular/xenonauten/light/shield_overclocked/engineer + starting_attachments = list( + /obj/item/armor_module/module/eshield/overclocked, + /obj/item/armor_module/storage/engineering, + ) + +/obj/item/clothing/suit/modular/xenonauten/light/lightmedical + starting_attachments = list( + /obj/item/armor_module/module/better_shoulder_lamp, + /obj/item/armor_module/storage/medical, + ) + /obj/item/clothing/suit/modular/xenonauten/heavy name = "\improper Xenonauten-H pattern armored vest" desc = "A XN-H vest, also known as Xenonauten, a set vest with modular attachments made to work in many enviroments. This one seems to be a heavy variant. Alt-Click to remove attached items. Use it to toggle the built-in flashlight." @@ -88,12 +155,24 @@ slowdown = SLOWDOWN_ARMOR_HEAVY greyscale_config = /datum/greyscale_config/xenonaut/heavy +/obj/item/clothing/suit/modular/xenonauten/heavy/mimirengi + starting_attachments = list( + /obj/item/armor_module/module/mimir_environment_protection/mark1, + /obj/item/armor_module/storage/engineering, + ) + /obj/item/clothing/suit/modular/xenonauten/heavy/leader starting_attachments = list( /obj/item/armor_module/module/valkyrie_autodoc, /obj/item/armor_module/storage/medical, ) +/obj/item/clothing/suit/modular/xenonauten/heavy/tyr_onegeneral + starting_attachments = list( + /obj/item/armor_module/module/tyr_extra_armor/mark1, + /obj/item/armor_module/storage/general, + ) + /obj/item/clothing/suit/modular/xenonauten/heavy/tyr_one starting_attachments = list( /obj/item/armor_module/module/tyr_extra_armor/mark1, @@ -106,6 +185,12 @@ /obj/item/armor_module/storage/medical, ) +/obj/item/clothing/suit/modular/xenonauten/heavy/grenadier //Literally grenades + starting_attachments = list( + /obj/item/armor_module/module/ballistic_armor, + /obj/item/armor_module/storage/grenade, + ) + /obj/item/clothing/suit/modular/xenonauten/heavy/surt starting_attachments = list( /obj/item/armor_module/module/fire_proof, @@ -118,10 +203,16 @@ /obj/item/armor_module/storage/medical, ) +/obj/item/clothing/suit/modular/xenonauten/heavy/shield_overclocked + starting_attachments = list( + /obj/item/armor_module/module/eshield/overclocked, + /obj/item/armor_module/storage/medical, + ) + /obj/item/clothing/suit/modular/xenonauten/pilot name = "\improper TerraGov standard flak jacket" desc = "A flak jacket used by dropship pilots to protect themselves while flying in the cockpit. Excels in protecting the wearer against high-velocity solid projectiles." - flags_item = NONE + item_flags = NONE soft_armor = list(MELEE = 40, BULLET = 50, LASER = 50, ENERGY = 25, BOMB = 30, BIO = 5, FIRE = 25, ACID = 30) slowdown = 0.25 @@ -130,6 +221,49 @@ attachments_allowed = list() + allowed = list( + /obj/item/weapon/gun, + /obj/item/tank/emergency_oxygen, + /obj/item/flashlight, + /obj/item/ammo_magazine, + /obj/item/storage/fancy/cigarettes, + /obj/item/tool/lighter, + /obj/item/weapon/baton, + /obj/item/restraints/handcuffs, + /obj/item/explosive/grenade, + /obj/item/binoculars, + /obj/item/weapon/combat_knife, + /obj/item/attachable/bayonetknife, + /obj/item/storage/belt/sparepouch, + /obj/item/storage/holster/blade, + /obj/item/storage/holster/belt, + /obj/item/weapon/energy/sword, + ) + +/obj/item/clothing/suit/storage/marine/ballistic + name = "\improper Crasher multi-threat ballistic armor" + desc = "A reused design of a old body armor system from the 21st century." + soft_armor = list(MELEE = 40, BULLET = 50, LASER = 50, ENERGY = 25, BOMB = 30, BIO = 5, FIRE = 25, ACID = 30) + slowdown = 0.25 + armor_protection_flags = CHEST|GROIN|ARMS|LEGS|FEET|HANDS + icon = 'icons/mob/clothing/suits/marine_armor.dmi' + icon_state = "ballistic_vest" + item_icons = list( + slot_wear_suit_str = 'icons/mob/clothing/suits/marine_armor.dmi' + ) + equip_delay_self = 2 SECONDS + unequip_delay_self = 0 SECONDS + armor_features_flags = NONE + + icon_state_variants = list( + "urban", + "jungle", + "desert", + "snow", + ) + colorable_allowed = ICON_STATE_VARIANTS_ALLOWED + current_variant = "urban" + allowed = list( /obj/item/weapon/gun, /obj/item/tank/emergency_oxygen, @@ -176,16 +310,28 @@ //RUTGMC EDIT ADDITION END ) starting_attachments = list(/obj/item/armor_module/storage/helmet) - flags_item_map_variant = ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT|ITEM_DESERT_VARIANT + item_map_variant_flags = ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT|ITEM_DESERT_VARIANT greyscale_config = /datum/greyscale_config/xenonaut/helm greyscale_colors = ARMOR_PALETTE_DRAB visorless_offset_y = 0 +/obj/item/clothing/head/modular/m10x/hod + starting_attachments = list(/obj/item/armor_module/storage/helmet, /obj/item/armor_module/module/hod_head) + +/obj/item/clothing/head/modular/m10x/freyr + starting_attachments = list(/obj/item/armor_module/storage/helmet, /obj/item/armor_module/module/artemis) + +/obj/item/clothing/head/modular/m10x/antenna + starting_attachments = list(/obj/item/armor_module/storage/helmet, /obj/item/armor_module/module/antenna) + /obj/item/clothing/head/modular/m10x/welding starting_attachments = list(/obj/item/armor_module/storage/helmet, /obj/item/armor_module/module/welding) +/obj/item/clothing/head/modular/m10x/superiorwelding + starting_attachments = list(/obj/item/armor_module/storage/helmet, /obj/item/armor_module/module/welding/superior) + /obj/item/clothing/head/modular/m10x/mimir starting_attachments = list(/obj/item/armor_module/storage/helmet, /obj/item/armor_module/module/mimir_environment_protection/mimir_helmet/mark1) diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm index 584a50987f776..f93b6c8002e76 100644 --- a/code/modules/clothing/shoes/colour.dm +++ b/code/modules/clothing/shoes/colour.dm @@ -3,9 +3,9 @@ icon_state = "black" desc = "A pair of black shoes." - flags_cold_protection = FEET + cold_protection_flags = FEET min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE - flags_heat_protection = FEET + heat_protection_flags = FEET max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE /obj/item/clothing/shoes/brown @@ -81,7 +81,7 @@ remove_cuffs(user) /obj/item/clothing/shoes/orange/attackby(obj/item/I, mob/user, params) - . = ..() - if(istype(I, /obj/item/restraints/handcuffs)) attach_cuffs(I, user) + return + return ..() diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index de8bac8ae89e8..f59661fb62c49 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -7,13 +7,13 @@ /obj/item/clothing/shoes/magboots/attack_self(mob/user) if(magpulse) - flags_inventory &= ~NOSLIPPING + inventory_flags &= ~NOSLIPPING slowdown = SHOES_SLOWDOWN magpulse = 0 icon_state = "magboots0" to_chat(user, "You disable the mag-pulse traction system.") else - flags_inventory |= NOSLIPPING + inventory_flags |= NOSLIPPING slowdown = 2 magpulse = 1 icon_state = "magboots1" @@ -26,6 +26,6 @@ /obj/item/clothing/shoes/magboots/examine(mob/user) . = ..() var/state = "disabled" - if(flags_inventory&NOSLIPPING) + if(inventory_flags&NOSLIPPING) state = "enabled" . += "Its mag-pulse traction system appears to be [state]." diff --git a/code/modules/clothing/shoes/marine_shoes.dm b/code/modules/clothing/shoes/marine_shoes.dm index d9a18311802ed..aa3a304f868c6 100644 --- a/code/modules/clothing/shoes/marine_shoes.dm +++ b/code/modules/clothing/shoes/marine_shoes.dm @@ -3,10 +3,10 @@ desc = "Standard issue combat boots for combat scenarios or combat situations. All combat, all the time." icon_state = "marine" item_state = "marine" - flags_armor_protection = FEET - flags_cold_protection = FEET - flags_heat_protection = FEET - flags_inventory = NOQUICKEQUIP|NOSLIPPING + armor_protection_flags = FEET + cold_protection_flags = FEET + heat_protection_flags = FEET + inventory_flags = NOQUICKEQUIP|NOSLIPPING min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE siemens_coefficient = 0.7 @@ -26,6 +26,7 @@ update_icon() /obj/item/clothing/shoes/marine/update_icon_state() + . = ..() icon_state = initial(icon_state) if(!attachments_by_slot[ATTACHMENT_SLOT_STORAGE]) return @@ -58,7 +59,7 @@ desc = "Only a small amount of monkeys, kittens, and orphans were killed in making this." icon_state = "laceups" soft_armor = list(MELEE = 35, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 30, BIO = 20, FIRE = 20, ACID = 25) - flags_inventory = NOSLIPPING + inventory_flags = NOSLIPPING siemens_coefficient = 0.6 /obj/item/clothing/shoes/marinechief/captain @@ -81,13 +82,13 @@ desc = "The height of fashion, but these look to be woven with protective fiber." icon_state = "jackboots" item_state = "jackboots" - flags_armor_protection = FEET + armor_protection_flags = FEET soft_armor = list(MELEE = 30, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 30, BIO = 20, FIRE = 20, ACID = 15) min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE - flags_cold_protection = FEET - flags_heat_protection = FEET - flags_inventory = NOSLIPPING + cold_protection_flags = FEET + heat_protection_flags = FEET + inventory_flags = NOSLIPPING siemens_coefficient = 0.6 /obj/item/clothing/shoes/marine/deathsquad @@ -96,12 +97,12 @@ icon_state = "commando_boots" item_state = "commando_boots" permeability_coefficient = 0.01 - flags_armor_protection = FEET + armor_protection_flags = FEET soft_armor = list(MELEE = 40, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 30, BIO = 20, FIRE = 20, ACID = 25) min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE - flags_cold_protection = FEET - flags_heat_protection = FEET + cold_protection_flags = FEET + heat_protection_flags = FEET siemens_coefficient = 0.2 resistance_flags = UNACIDABLE starting_attachments = list(/obj/item/armor_module/storage/boot/full) @@ -129,9 +130,9 @@ desc = "A field of invisible energy, it protects the wearer but prevents any clothing from being worn." icon = 'icons/effects/effects.dmi' icon_state = "shield-blue" - flags_item = DELONDROP + item_flags = DELONDROP soft_armor = list(MELEE = 30, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 30, BIO = 20, FIRE = 20, ACID = 25) - flags_inventory = NOSLIPPING + inventory_flags = NOSLIPPING /obj/item/clothing/shoes/sectoid/Initialize(mapload) . = ..() diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 50cfa8a563d46..b30b842ba7863 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -8,7 +8,7 @@ icon_state = "brown" item_state = "brown" permeability_coefficient = 0.05 - flags_inventory = NOSLIPPING + inventory_flags = NOSLIPPING var/list/clothing_choices = list() siemens_coefficient = 0.8 @@ -21,8 +21,8 @@ desc = "When you want to turn up the heat." icon_state = "swat" soft_armor = list(MELEE = 80, BULLET = 60, LASER = 50, ENERGY = 25, BOMB = 50, BIO = 10, FIRE = 25, ACID = 25) - flags_inventory = NOSLIPPING - flags_item = SYNTH_RESTRICTED + inventory_flags = NOSLIPPING + item_flags = SYNTH_RESTRICTED siemens_coefficient = 0.6 /obj/item/clothing/shoes/ruggedboot @@ -30,22 +30,22 @@ desc = "A pair of boots used by workers in dangerous environments." icon_state = "swat" soft_armor = list(MELEE = 20, BULLET = 20, LASER = 20, ENERGY = 25, BOMB = 20, BIO = 20, FIRE = 20, ACID = 20) - flags_inventory = NOSLIPPING - flags_item = SYNTH_RESTRICTED + inventory_flags = NOSLIPPING + item_flags = SYNTH_RESTRICTED siemens_coefficient = 0.6 /obj/item/clothing/shoes/combat //Basically SWAT shoes combined with galoshes. name = "combat boots" desc = "When you REALLY want to turn up the heat" icon_state = "swat" - flags_item = SYNTH_RESTRICTED + item_flags = SYNTH_RESTRICTED soft_armor = list(MELEE = 80, BULLET = 60, LASER = 50, ENERGY = 25, BOMB = 50, BIO = 10, FIRE = 25, ACID = 25) - flags_inventory = NOSLIPPING + inventory_flags = NOSLIPPING siemens_coefficient = 0.6 - flags_cold_protection = FEET + cold_protection_flags = FEET min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE - flags_heat_protection = FEET + heat_protection_flags = FEET max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE /obj/item/clothing/shoes/space_ninja @@ -53,33 +53,33 @@ desc = "A pair of running shoes. Excellent for running and even better for smashing skulls." icon_state = "s-ninja" permeability_coefficient = 0.01 - flags_inventory = NOSLIPPING + inventory_flags = NOSLIPPING soft_armor = list(MELEE = 60, BULLET = 50, LASER = 30, ENERGY = 15, BOMB = 30, BIO = 30, FIRE = 15, ACID = 15) siemens_coefficient = 0.2 - flags_cold_protection = FEET + cold_protection_flags = FEET min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE - flags_heat_protection = FEET + heat_protection_flags = FEET max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE /obj/item/clothing/shoes/sandal desc = "A pair of rather plain, wooden sandals." name = "sandals" icon_state = "wizard" - flags_armor_protection = NONE + armor_protection_flags = NONE /obj/item/clothing/shoes/sandal/marisa desc = "A pair of magic, black shoes." name = "magic shoes" icon_state = "black" - flags_armor_protection = FEET + armor_protection_flags = FEET /obj/item/clothing/shoes/galoshes desc = "Rubber boots" name = "galoshes" icon_state = "galoshes" permeability_coefficient = 0.05 - flags_inventory = NOSLIPPING + inventory_flags = NOSLIPPING slowdown = SHOES_SLOWDOWN+1 /obj/item/clothing/shoes/clown_shoes @@ -109,9 +109,9 @@ item_state = "cult" siemens_coefficient = 0.7 - flags_cold_protection = FEET + cold_protection_flags = FEET min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE - flags_heat_protection = FEET + heat_protection_flags = FEET max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE /obj/item/clothing/shoes/cyborg @@ -142,7 +142,7 @@ desc = "Help you swim good." name = "swimming fins" icon_state = "flippers" - flags_inventory = NOSLIPPING + inventory_flags = NOSLIPPING slowdown = SHOES_SLOWDOWN+1 @@ -151,8 +151,8 @@ desc = "When you feet are as cold as your heart" icon_state = "swat" siemens_coefficient = 0.6 - flags_cold_protection = FEET - flags_heat_protection = FEET + cold_protection_flags = FEET + heat_protection_flags = FEET min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE @@ -161,6 +161,6 @@ desc = "Praise the machine spirit!" icon_state = "tp_boots" item_state = "tp_boots" - flags_inventory = NOSLIPPING + inventory_flags = NOSLIPPING diff --git a/code/modules/clothing/spacesuits/rig.dm b/code/modules/clothing/spacesuits/rig.dm index 5152ebdfde39b..9181e55479d2c 100644 --- a/code/modules/clothing/spacesuits/rig.dm +++ b/code/modules/clothing/spacesuits/rig.dm @@ -8,7 +8,7 @@ var/brightness_on = 4 //luminosity when on var/on = FALSE actions_types = list(/datum/action/item_action/toggle) - flags_heat_protection = HEAD + heat_protection_flags = HEAD max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE /obj/item/clothing/head/helmet/space/rig/attack_self(mob/user) @@ -37,7 +37,7 @@ slowdown = 1 soft_armor = list(MELEE = 40, BULLET = 5, LASER = 20, ENERGY = 5, BOMB = 35, BIO = 100, FIRE = 5, ACID = 5) allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit) - flags_heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + heat_protection_flags = CHEST|GROIN|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE //Engineering rig diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm index 491b26213d4d3..504d8a60d5a4b 100644 --- a/code/modules/clothing/spacesuits/spacesuits.dm +++ b/code/modules/clothing/spacesuits/spacesuits.dm @@ -9,10 +9,10 @@ desc = "A special helmet designed for work in a hazardous, low-pressure environment." permeability_coefficient = 0.01 soft_armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 100, FIRE = 0, ACID = 0) - flags_inventory = COVEREYES|COVERMOUTH|NOPRESSUREDMAGE|BLOCKSHARPOBJ - flags_inv_hide = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEALLHAIR - flags_armor_protection = HEAD|FACE|EYES - flags_cold_protection = HEAD + inventory_flags = COVEREYES|COVERMOUTH|NOPRESSUREDMAGE|BLOCKSHARPOBJ + inv_hide_flags = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEALLHAIR + armor_protection_flags = HEAD|FACE|EYES + cold_protection_flags = HEAD min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE siemens_coefficient = 0.9 eye_protection = 2 @@ -26,12 +26,12 @@ w_class = WEIGHT_CLASS_BULKY gas_transfer_coefficient = 0.01 permeability_coefficient = 0.02 - flags_armor_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + armor_protection_flags = CHEST|GROIN|LEGS|FEET|ARMS|HANDS allowed = list(/obj/item/flashlight,/obj/item/tank/emergency_oxygen,/obj/item/suit_cooling_unit) slowdown = 3 soft_armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 100, FIRE = 0, ACID = 0) - flags_inventory = BLOCKSHARPOBJ|NOPRESSUREDMAGE - flags_inv_hide = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT - flags_cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + inventory_flags = BLOCKSHARPOBJ|NOPRESSUREDMAGE + inv_hide_flags = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT + cold_protection_flags = CHEST|GROIN|LEGS|FEET|ARMS|HANDS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE siemens_coefficient = 0.9 diff --git a/code/modules/clothing/spacesuits/standard_space_suits.dm b/code/modules/clothing/spacesuits/standard_space_suits.dm index 0680ae66ec9a2..4723d9b559be8 100644 --- a/code/modules/clothing/spacesuits/standard_space_suits.dm +++ b/code/modules/clothing/spacesuits/standard_space_suits.dm @@ -26,13 +26,13 @@ w_class = WEIGHT_CLASS_BULKY gas_transfer_coefficient = 0.01 permeability_coefficient = 0.02 - flags_armor_protection = CHEST|GROIN|LEGS|FEET|ARMS + armor_protection_flags = CHEST|GROIN|LEGS|FEET|ARMS allowed = list(/obj/item/tank/emergency_oxygen, /obj/item/flashlight,/obj/item/weapon/gun, /obj/item/ammo_magazine, /obj/item/weapon/baton,/obj/item/restraints/handcuffs) slowdown = 1.5 soft_armor = list(MELEE = 40, BULLET = 50, LASER = 50, ENERGY = 25, BOMB = 50, BIO = 100, FIRE = 25, ACID = 25) - flags_inventory = NOPRESSUREDMAGE - flags_inv_hide = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT - flags_cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + inventory_flags = NOPRESSUREDMAGE + inv_hide_flags = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT + cold_protection_flags = CHEST|GROIN|LEGS|FEET|ARMS|HANDS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE siemens_coefficient = 0.7 @@ -41,9 +41,9 @@ name = "Santa's hat" desc = "Ho ho ho. Merrry X-mas!" icon_state = "santahat" - flags_inventory = NOPRESSUREDMAGE|BLOCKSHARPOBJ - flags_inv_hide = HIDEEYES - flags_armor_protection = HEAD + inventory_flags = NOPRESSUREDMAGE|BLOCKSHARPOBJ + inv_hide_flags = HIDEEYES + armor_protection_flags = HEAD /obj/item/clothing/suit/space/santa name = "Santa's suit" diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index d90038f4cae4a..27631ca64b2b9 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -1,9 +1,9 @@ /obj/item/clothing/suit/armor - flags_inventory = BLOCKSHARPOBJ - flags_armor_protection = CHEST|GROIN - flags_cold_protection = CHEST|GROIN - flags_heat_protection = CHEST|GROIN + inventory_flags = BLOCKSHARPOBJ + armor_protection_flags = CHEST|GROIN + cold_protection_flags = CHEST|GROIN + heat_protection_flags = CHEST|GROIN min_cold_protection_temperature = ARMOR_MIN_COLD_PROTECTION_TEMPERATURE max_heat_protection_temperature = ARMOR_MAX_HEAT_PROTECTION_TEMPERATURE siemens_coefficient = 0.6 @@ -35,7 +35,7 @@ item_state = "armor" blood_overlay_type = "armor" permeability_coefficient = 0.8 - flags_armor_protection = CHEST + armor_protection_flags = CHEST soft_armor = list(MELEE = 20, BULLET = 30, LASER = 25, ENERGY = 10, BOMB = 15, BIO = 0, FIRE = 10, ACID = 10) allowed = list ( /obj/item/flashlight, @@ -50,7 +50,7 @@ desc = "An armoured jacket with gold regalia" icon_state = "admiral_jacket" item_state = "admiral_jacket" - flags_armor_protection = CHEST|GROIN|ARMS + armor_protection_flags = CHEST|GROIN|ARMS w_class = WEIGHT_CLASS_NORMAL /obj/item/clothing/suit/armor/vest/security @@ -65,7 +65,7 @@ desc = "An armoured jacket with silver rank pips and livery." icon_state = "warden_jacket" item_state = "warden_jacket" - flags_armor_protection = CHEST|GROIN|ARMS + armor_protection_flags = CHEST|GROIN|ARMS /obj/item/clothing/suit/armor/bulletproof name = "bulletproof vest" @@ -73,8 +73,8 @@ icon_state = "bulletproof" item_state = "bulletproof" blood_overlay_type = "armor" - flags_armor_protection = CHEST - soft_armor = list(MELEE = 30, BULLET = 55, LASER = 0, ENERGY = 0, BOMB = 30, BIO = 0, FIRE = 0, ACID = 15) + armor_protection_flags = CHEST + soft_armor = list(MELEE = 30, BULLET = 75, LASER = 15, ENERGY = 15, BOMB = 30, BIO = 0, FIRE = 0, ACID = 15) hard_armor = list(MELEE = 0, BULLET = 20, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 0, ACID = 5) siemens_coefficient = 0.7 permeability_coefficient = 0.9 @@ -93,12 +93,12 @@ desc = "A suit of armor with heavy padding to protect against melee attacks. Looks like it might impair movement." icon_state = "riot" item_state = "swat" - flags_armor_protection = CHEST|GROIN|LEGS|ARMS + armor_protection_flags = CHEST|GROIN|LEGS|ARMS slowdown = 1.2 soft_armor = list(MELEE = 65, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 0, BIO = 0, FIRE = 10, ACID = 10) - flags_inventory = BLOCKSHARPOBJ - flags_inv_hide = HIDEJUMPSUIT - flags_item = SYNTH_RESTRICTED + inventory_flags = BLOCKSHARPOBJ + inv_hide_flags = HIDEJUMPSUIT + item_flags = SYNTH_RESTRICTED siemens_coefficient = 0.5 permeability_coefficient = 0.7 equip_delay_self = 20 @@ -111,14 +111,14 @@ item_state = "swat" gas_transfer_coefficient = 0.01 permeability_coefficient = 0.01 - flags_armor_protection = CHEST|GROIN|LEGS|FEET|ARMS + armor_protection_flags = CHEST|GROIN|LEGS|FEET|ARMS allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/baton,/obj/item/restraints/handcuffs,/obj/item/tank/emergency_oxygen) slowdown = 1 soft_armor = list(MELEE = 50, BULLET = 60, LASER = 50, ENERGY = 25, BOMB = 50, BIO = 100, FIRE = 25, ACID = 25) - flags_inventory = BLOCKSHARPOBJ|NOPRESSUREDMAGE - flags_item = SYNTH_RESTRICTED - flags_inv_hide = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT - flags_cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + inventory_flags = BLOCKSHARPOBJ|NOPRESSUREDMAGE + item_flags = SYNTH_RESTRICTED + inv_hide_flags = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT + cold_protection_flags = CHEST|GROIN|LEGS|FEET|ARMS|HANDS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE siemens_coefficient = 0.6 @@ -129,9 +129,9 @@ icon_state = "detective" item_state = "det_suit" blood_overlay_type = "coat" - flags_inventory = NONE - flags_inv_hide = NONE - flags_armor_protection = CHEST|ARMS + inventory_flags = NONE + inv_hide_flags = NONE + armor_protection_flags = CHEST|ARMS /obj/item/clothing/suit/armor/det_suit @@ -140,8 +140,8 @@ icon_state = "detective-armor" item_state = "detective-armor" blood_overlay_type = "armor" - flags_armor_protection = CHEST|GROIN - flags_item = SYNTH_RESTRICTED + armor_protection_flags = CHEST|GROIN + item_flags = SYNTH_RESTRICTED soft_armor = list(MELEE = 50, BULLET = 15, LASER = 50, ENERGY = 10, BOMB = 25, BIO = 0, FIRE = 10, ACID = 10) /obj/item/clothing/suit/armor/rugged @@ -150,8 +150,8 @@ icon_state = "swatarmor" item_state = "swatarmor" var/obj/item/weapon/gun/holstered = null - flags_armor_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS - flags_item = SYNTH_RESTRICTED + armor_protection_flags = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + item_flags = SYNTH_RESTRICTED slowdown = 0 soft_armor = list(MELEE = 50, BULLET = 40, LASER = 40, ENERGY = 40, BOMB = 50, BIO = 40, FIRE = 50, ACID = 50) siemens_coefficient = 0.7 @@ -162,8 +162,8 @@ desc = "A field of invisible energy, it protects the wearer but prevents any clothing from being worn." icon = 'icons/effects/effects.dmi' icon_state = "shield-blue" - flags_item = DELONDROP - flags_armor_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + item_flags = DELONDROP + armor_protection_flags = CHEST|GROIN|LEGS|FEET|ARMS|HANDS soft_armor = list(MELEE = 55, BULLET = 55, LASER = 35, ENERGY = 20, BOMB = 40, BIO = 40, FIRE = 40, ACID = 40) allowed = list()//how would you put a gun onto a field of energy? @@ -173,7 +173,7 @@ /obj/item/clothing/suit/armor/sectoid/shield name = "powerful psionic field" - flags_armor_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + armor_protection_flags = CHEST|GROIN|LEGS|FEET|ARMS|HANDS soft_armor = list(MELEE = 55, BULLET = 55, LASER = 35, ENERGY = 20, BOMB = 40, BIO = 40, FIRE = 40, ACID = 40) /obj/item/clothing/suit/armor/sectoid/shield/Initialize(mapload) @@ -190,11 +190,11 @@ icon_state = "centcom" item_state = "centcom" w_class = WEIGHT_CLASS_BULKY//bulky item - flags_armor_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + armor_protection_flags = CHEST|GROIN|LEGS|FEET|ARMS|HANDS allowed = list(/obj/item/weapon/gun,/obj/item/weapon/baton,/obj/item/restraints/handcuffs,/obj/item/tank/emergency_oxygen) - flags_inventory = NONE - flags_inv_hide = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT - flags_cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + inventory_flags = NONE + inv_hide_flags = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT + cold_protection_flags = CHEST|GROIN|LEGS|FEET|ARMS|HANDS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE siemens_coefficient = 0 @@ -205,14 +205,14 @@ item_state = "swat_suit" w_class = WEIGHT_CLASS_BULKY//bulky item gas_transfer_coefficient = 0.90 - flags_armor_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + armor_protection_flags = CHEST|GROIN|LEGS|FEET|ARMS|HANDS slowdown = 3 - flags_inv_hide = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT + inv_hide_flags = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT siemens_coefficient = 0 /obj/item/clothing/suit/armor/tdome - flags_armor_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS - flags_inv_hide = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT + armor_protection_flags = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + inv_hide_flags = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT /obj/item/clothing/suit/armor/tdome/red name = "Thunderdome suit (red)" @@ -233,11 +233,11 @@ desc = "A greatcoat enhanced with a special alloy for some protection and style." icon_state = "hos" item_state = "hos" - flags_armor_protection = CHEST|GROIN|ARMS|LEGS - flags_item = SYNTH_RESTRICTED + armor_protection_flags = CHEST|GROIN|ARMS|LEGS + item_flags = SYNTH_RESTRICTED soft_armor = list(MELEE = 65, BULLET = 30, LASER = 50, ENERGY = 10, BOMB = 25, BIO = 0, FIRE = 10, ACID = 10) - flags_inventory = NONE - flags_inv_hide = HIDEJUMPSUIT + inventory_flags = NONE + inv_hide_flags = HIDEJUMPSUIT siemens_coefficient = 0.6 /obj/item/clothing/suit/armor/hos/jensen @@ -245,7 +245,7 @@ desc = "A trenchcoat augmented with a special alloy for some protection and style." icon_state = "jensencoat" item_state = "jensencoat" - flags_inv_hide = NONE + inv_hide_flags = NONE siemens_coefficient = 0.6 - flags_armor_protection = CHEST|ARMS + armor_protection_flags = CHEST|ARMS diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index 8f1e72456e806..e631d9be42085 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -5,9 +5,9 @@ desc = "A hood that protects the head and face from biological comtaminants." permeability_coefficient = 0.01 soft_armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 100, FIRE = 0, ACID = 0) - flags_inventory = COVEREYES|COVERMOUTH - flags_inv_hide = HIDEFACE|HIDEMASK|HIDEEARS|HIDEALLHAIR - flags_armor_protection = HEAD|FACE|EYES + inventory_flags = COVEREYES|COVERMOUTH + inv_hide_flags = HIDEFACE|HIDEMASK|HIDEEARS|HIDEALLHAIR + armor_protection_flags = HEAD|FACE|EYES siemens_coefficient = 0.9 /obj/item/clothing/suit/bio_suit @@ -18,11 +18,11 @@ w_class = WEIGHT_CLASS_BULKY//bulky item gas_transfer_coefficient = 0.01 permeability_coefficient = 0.01 - flags_armor_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + armor_protection_flags = CHEST|GROIN|LEGS|FEET|ARMS|HANDS slowdown = 1 allowed = list(/obj/item/tank/emergency_oxygen,/obj/item/tool/pen,/obj/item/flashlight/pen) soft_armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 100, FIRE = 0, ACID = 0) - flags_inv_hide = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT + inv_hide_flags = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT siemens_coefficient = 0.9 //Virology biosuit, green stripe @@ -31,8 +31,8 @@ /obj/item/clothing/suit/bio_suit/virology icon_state = "bio_virology" - flags_armor_protection = CHEST|GROIN|LEGS|ARMS - flags_inv_hide = HIDEGLOVES|HIDEJUMPSUIT + armor_protection_flags = CHEST|GROIN|LEGS|ARMS + inv_hide_flags = HIDEGLOVES|HIDEJUMPSUIT //Security biosuit, grey with red stripe across the chest /obj/item/clothing/head/bio_hood/security @@ -40,8 +40,8 @@ /obj/item/clothing/suit/bio_suit/security icon_state = "bio_security" - flags_armor_protection = CHEST|GROIN|LEGS|ARMS - flags_inv_hide = HIDEGLOVES|HIDEJUMPSUIT + armor_protection_flags = CHEST|GROIN|LEGS|ARMS + inv_hide_flags = HIDEGLOVES|HIDEJUMPSUIT //Janitor's biosuit, grey with purple arms /obj/item/clothing/head/bio_hood/janitor @@ -49,8 +49,8 @@ /obj/item/clothing/suit/bio_suit/janitor icon_state = "bio_janitor" - flags_armor_protection = CHEST|GROIN|LEGS|ARMS - flags_inv_hide = HIDEGLOVES|HIDEJUMPSUIT + armor_protection_flags = CHEST|GROIN|LEGS|ARMS + inv_hide_flags = HIDEGLOVES|HIDEJUMPSUIT //Scientist's biosuit, white with a pink-ish hue @@ -59,14 +59,14 @@ /obj/item/clothing/suit/bio_suit/scientist icon_state = "bio_scientist" - flags_armor_protection = CHEST|GROIN|LEGS|ARMS - flags_inv_hide = HIDEGLOVES|HIDEJUMPSUIT + armor_protection_flags = CHEST|GROIN|LEGS|ARMS + inv_hide_flags = HIDEGLOVES|HIDEJUMPSUIT //CMO's biosuit, blue stripe /obj/item/clothing/suit/bio_suit/cmo icon_state = "bio_cmo" - flags_armor_protection = CHEST|GROIN|LEGS|ARMS - flags_inv_hide = HIDEGLOVES|HIDEJUMPSUIT + armor_protection_flags = CHEST|GROIN|LEGS|ARMS + inv_hide_flags = HIDEGLOVES|HIDEJUMPSUIT /obj/item/clothing/head/bio_hood/cmo icon_state = "bio_cmo" @@ -78,4 +78,4 @@ desc = "It protected doctors from the Black Death, back then. You bet your arse it's gonna help you against viruses." icon_state = "plaguedoctor" item_state = "bio_suit" - flags_inv_hide = HIDEGLOVES|HIDEJUMPSUIT + inv_hide_flags = HIDEGLOVES|HIDEJUMPSUIT diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index d82c86293bb8a..5f320b47c166d 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -3,13 +3,13 @@ */ //Botonist -/obj/item/clothing/suit/apron +/obj/item/clothing/suit/storage/apron name = "apron" desc = "A basic blue apron." icon_state = "apron" item_state = "apron" blood_overlay_type = "armor" - flags_armor_protection = NONE + armor_protection_flags = NONE allowed = list ( /obj/item/reagent_containers/spray/plantbgone, /obj/item/tool/analyzer/plant_analyzer, @@ -29,7 +29,7 @@ desc = "A plastic covering to prevent the passage of bodily fluids during surgery." icon_state = "surgical" item_state = "surgical" - flags_armor_protection = CHEST + armor_protection_flags = CHEST allowed = list( /obj/item/tank/emergency_oxygen, /obj/item/healthanalyzer, @@ -57,16 +57,16 @@ desc = "Worn by a Captain to show their class." icon_state = "captunic" item_state = "bio_suit" - flags_armor_protection = CHEST|ARMS - flags_inv_hide = HIDEJUMPSUIT + armor_protection_flags = CHEST|ARMS + inv_hide_flags = HIDEJUMPSUIT /obj/item/clothing/suit/captunic/capjacket name = "captain's uniform jacket" desc = "A less formal jacket for everyday captain use." icon_state = "capjacket" item_state = "bio_suit" - flags_armor_protection = CHEST|GROIN|LEGS|ARMS - flags_inv_hide = HIDEJUMPSUIT + armor_protection_flags = CHEST|GROIN|LEGS|ARMS + inv_hide_flags = HIDEJUMPSUIT //Chaplain /obj/item/clothing/suit/chaplain_hoodie @@ -74,40 +74,40 @@ desc = "This suit says to you 'hush'!" icon_state = "chaplain_hoodie" item_state = "chaplain_hoodie" - flags_armor_protection = CHEST|ARMS + armor_protection_flags = CHEST|ARMS /obj/item/clothing/suit/nun name = "nun robe" desc = "Maximum piety in this star system." icon_state = "nun" item_state = "nun" - flags_armor_protection = CHEST|GROIN|LEGS|ARMS - flags_inv_hide = HIDESHOES|HIDEJUMPSUIT + armor_protection_flags = CHEST|GROIN|LEGS|ARMS + inv_hide_flags = HIDESHOES|HIDEJUMPSUIT //Chef -/obj/item/clothing/suit/chef +/obj/item/clothing/suit/storage/chef name = "Chef's apron" desc = "An apron used by a high class chef." icon_state = "chef" item_state = "chef" gas_transfer_coefficient = 0.90 permeability_coefficient = 0.50 - flags_armor_protection = CHEST|GROIN|ARMS + armor_protection_flags = CHEST|GROIN|ARMS allowed = list (/obj/item/tool/kitchen/knife, /obj/item/tool/kitchen/knife/butcher) -/obj/item/clothing/suit/chef/classic +/obj/item/clothing/suit/storage/chef/classic name = "A classic chef's apron." desc = "A basic, dull, white chef's apron." icon_state = "apronchef" item_state = "apronchef" blood_overlay_type = "armor" - flags_armor_protection = NONE + armor_protection_flags = NONE //Security /obj/item/clothing/suit/security desc = "You shouldn't see this" - flags_armor_protection = CHEST|GROIN|ARMS + armor_protection_flags = CHEST|GROIN|ARMS /obj/item/clothing/suit/security/formal name = "formal jacket" @@ -125,12 +125,12 @@ /obj/item/clothing/suit/security/formal/officer/tan icon_state = "wardentanjacket" -/obj/item/clothing/suit/security/formal/senior_officer +/obj/item/clothing/suit/storage/security/formal/senior_officer name = "senior officer's jacket" desc = "This piece of clothing was specifically designed for asserting superior authority." icon_state = "hosbluejacket" -/obj/item/clothing/suit/security/formal/senior_officer/tan +/obj/item/clothing/suit/storage/security/formal/senior_officer/tan icon_state = "hostanjacket" //Detective @@ -140,7 +140,7 @@ icon_state = "detective" item_state = "det_suit" blood_overlay_type = "coat" - flags_armor_protection = CHEST|ARMS + armor_protection_flags = CHEST|ARMS allowed = list( /obj/item/tank/emergency_oxygen, /obj/item/flashlight, @@ -167,7 +167,7 @@ name = "jacket" desc = "A forensics technician jacket." item_state = "det_suit" - flags_armor_protection = CHEST|ARMS + armor_protection_flags = CHEST|ARMS allowed = list( /obj/item/tank/emergency_oxygen, /obj/item/flashlight, @@ -214,7 +214,7 @@ /obj/item/clothing/mask/gas, /obj/item/tool/taperoll/engineering, ) - flags_armor_protection = CHEST + armor_protection_flags = CHEST /obj/item/clothing/suit/storage/hazardvest/lime name = "lime reflective safety vest" @@ -233,7 +233,7 @@ icon_state = "suitjacket_blue_open" item_state = "suitjacket_blue_open" blood_overlay_type = "coat" - flags_armor_protection = CHEST|ARMS + armor_protection_flags = CHEST|ARMS /obj/item/clothing/suit/storage/lawyer/purpjacket name = "Purple Suit Jacket" @@ -241,7 +241,7 @@ icon_state = "suitjacket_purp" item_state = "suitjacket_purp" blood_overlay_type = "coat" - flags_armor_protection = CHEST|ARMS + armor_protection_flags = CHEST|ARMS //Internal Affairs /obj/item/clothing/suit/storage/internalaffairs @@ -250,7 +250,7 @@ icon_state = "ia_jacket_open" item_state = "ia_jacket" blood_overlay_type = "coat" - flags_armor_protection = CHEST|ARMS + armor_protection_flags = CHEST|ARMS /obj/item/clothing/suit/storage/internalaffairs/verb/toggle() set name = "Toggle Coat Buttons" @@ -289,7 +289,7 @@ /obj/item/radio, /obj/item/tank/emergency_oxygen, ) - flags_armor_protection = CHEST|ARMS + armor_protection_flags = CHEST|ARMS /obj/item/clothing/suit/storage/fr_jacket/verb/toggle() set name = "Toggle Jacket Buttons" @@ -315,14 +315,14 @@ icon = 'icons/obj/clothing/belts.dmi' icon_state = "suspenders" blood_overlay_type = "armor" //it's the less thing that I can put here - flags_armor_protection = NONE + armor_protection_flags = NONE /obj/item/clothing/suit/storage/snow_suit name = "snow suit" desc = "A standard snow suit. It can protect the wearer from extreme cold." icon_state = "snowsuit_alpha" - flags_armor_protection = CHEST|GROIN|ARMS - flags_cold_protection = CHEST|GROIN|ARMS|LEGS + armor_protection_flags = CHEST|GROIN|ARMS + cold_protection_flags = CHEST|GROIN|ARMS|LEGS soft_armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 0, ACID = 0) min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROTECTION_TEMPERATURE blood_overlay_type = "armor" diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index c90d2fee6a8c9..4497024be51ed 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -3,7 +3,7 @@ desc = "A suit that protects against minor chemical spills." icon_state = "labcoat" blood_overlay_type = "coat" - flags_armor_protection = CHEST|ARMS + armor_protection_flags = CHEST|ARMS permeability_coefficient = 0.6 soft_armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 50, FIRE = 0, ACID = 0) allowed = list( @@ -63,33 +63,37 @@ name = "chief medical officer's labcoat" desc = "Bluer than the standard model." icon_state = "labcoat_cmo" - /obj/item/clothing/suit/storage/labcoat/mad name = "The Mad's labcoat" desc = "It makes you look capable of konking someone on the noggin and shooting them into space." icon_state = "labgreen" -/obj/item/clothing/suit/storage/labcoat/genetics - name = "Geneticist labcoat" - desc = "A suit that protects against minor chemical spills. Has a blue stripe on the shoulder." - icon_state = "labcoat_gen" +/obj/item/clothing/suit/storage/labcoat/paramedic + name = "paramedic's labcoat" + desc = "A suit that holds small medical items for responding and tending to emergencies." + icon_state = "labcoat_paramedic" /obj/item/clothing/suit/storage/labcoat/chemist - name = "Chemist labcoat" + name = "chemist labcoat" desc = "A suit that protects against minor chemical spills. Has an orange stripe on the shoulder." icon_state = "labcoat_chem" /obj/item/clothing/suit/storage/labcoat/virologist - name = "Virologist labcoat" + name = "virologist labcoat" desc = "A suit that protects against minor chemical spills. Offers slightly more protection against biohazards than the standard model. Has a green stripe on the shoulder." icon_state = "labcoat_viro" +/obj/item/clothing/suit/storage/labcoat/genetics + name = "geneticist labcoat" + desc = "A suit that protects against minor chemical spills. Has a blue stripe on the shoulder." + icon_state = "labcoat_gen" + /obj/item/clothing/suit/storage/labcoat/science - name = "Scientist labcoat" + name = "scientist labcoat" desc = "A suit that protects against minor chemical spills. Has a purple stripe on the shoulder." icon_state = "labcoat_sci" /obj/item/clothing/suit/storage/labcoat/researcher - name = "Researcher's labcoat" + name = "researcher's labcoat" desc = "A high quality labcoat, seemingly worn by scholars and researchers alike. It has a distinct rough feel to it, and goads you towards adventure." icon_state = "labcoat_researcher" diff --git a/code/modules/clothing/suits/marine_armor.dm b/code/modules/clothing/suits/marine_armor.dm index 1e672f8b7cd95..51febd51386ba 100644 --- a/code/modules/clothing/suits/marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor.dm @@ -9,13 +9,13 @@ item_state = "armor" item_icons = list( slot_wear_suit_str = 'icons/mob/clothing/suits/marine_armor.dmi', - slot_l_hand_str = 'icons/mob/items_lefthand_1.dmi', - slot_r_hand_str = 'icons/mob/items_righthand_1.dmi', + slot_l_hand_str = 'icons/mob/inhands/items/items_left.dmi', + slot_r_hand_str = 'icons/mob/inhands/items/items_right.dmi', ) - flags_atom = CONDUCT - flags_armor_protection = CHEST|GROIN|ARMS|LEGS|HANDS|FEET - flags_cold_protection = CHEST|GROIN|ARMS|LEGS|HANDS|FEET - flags_heat_protection = CHEST|GROIN|ARMS|LEGS|HANDS|FEET + atom_flags = CONDUCT + armor_protection_flags = CHEST|GROIN|ARMS|LEGS|HANDS|FEET + cold_protection_flags = CHEST|GROIN|ARMS|LEGS|HANDS|FEET + heat_protection_flags = CHEST|GROIN|ARMS|LEGS|HANDS|FEET min_cold_protection_temperature = ARMOR_MIN_COLD_PROTECTION_TEMPERATURE max_heat_protection_temperature = ARMOR_MAX_HEAT_PROTECTION_TEMPERATURE blood_overlay_type = "armor" @@ -38,32 +38,31 @@ /obj/item/tool/pickaxe/plasmacutter, ) var/locate_cooldown = 0 //Cooldown for SL locator - var/list/armor_overlays + var/list/armor_overlays = list() actions_types = list(/datum/action/item_action/toggle/suit_toggle) - flags_armor_features = ARMOR_LAMP_OVERLAY - flags_item = SYNTH_RESTRICTED|IMPEDE_JETPACK + armor_features_flags = ARMOR_LAMP_OVERLAY + item_flags = SYNTH_RESTRICTED|IMPEDE_JETPACK w_class = WEIGHT_CLASS_HUGE equip_delay_self = 2 SECONDS unequip_delay_self = 2 SECONDS - flags_item_map_variant = (ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT|ITEM_PRISON_VARIANT) + item_map_variant_flags = (ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT|ITEM_PRISON_VARIANT) /obj/item/clothing/suit/storage/marine/Initialize(mapload) . = ..() - armor_overlays = list("lamp") //Just one for now, can add more later. update_icon() -/obj/item/clothing/suit/storage/marine/update_icon(mob/user) - var/image/I - I = armor_overlays["lamp"] - overlays -= I - qdel(I) - if(flags_armor_features & ARMOR_LAMP_OVERLAY) - I = image(icon, src, flags_armor_features & ARMOR_LAMP_ON? "lamp-on" : "lamp-off") +/obj/item/clothing/suit/storage/marine/turn_light(mob/user, toggle_on) + . = ..() + user?.update_inv_wear_suit() + +/obj/item/clothing/suit/storage/marine/update_overlays() + . = ..() + if(armor_features_flags & ARMOR_LAMP_OVERLAY) + var/image/I = image(icon, src, armor_features_flags & ARMOR_LAMP_ON? "lamp-on" : "lamp-off") armor_overlays["lamp"] = I - overlays += I + . += I else armor_overlays["lamp"] = null - user?.update_inv_wear_suit() /obj/item/clothing/suit/storage/marine/apply_custom(mutable_appearance/standing, inhands, icon_used, state_used) if(inhands) @@ -87,8 +86,8 @@ var/mob/living/carbon/human/H = user if(H.wear_suit != src) return - turn_light(user, !light_on) - return TRUE + if(turn_light(user, !light_on) == CHECKS_PASSED) + return TRUE /obj/item/clothing/suit/storage/marine/item_action_slot_check(mob/user, slot) if(!ishuman(user)) @@ -104,7 +103,25 @@ item_state = "mech_pilot_suit" slowdown = SLOWDOWN_ARMOR_LIGHT soft_armor = list(MELEE = 45, BULLET = 55, LASER = 55, ENERGY = 20, BOMB = 45, BIO = 30, FIRE = 25, ACID = 35) - flags_item_map_variant = NONE + item_map_variant_flags = NONE + +/obj/item/clothing/suit/storage/marine/assault_crewman + name = "\improper PAS-73 pattern tanker armor" + desc = "A somewhat sparsely armored but robust armored vest. Used by tankers, mostly to absorb bumps in the road as they drive over enemies." + icon_state = "assault_crewman_suit" + item_state = "assault_crewman_suit" + slowdown = SLOWDOWN_ARMOR_LIGHT + soft_armor = list(MELEE = 45, BULLET = 55, LASER = 55, ENERGY = 20, BOMB = 45, BIO = 30, FIRE = 25, ACID = 35) + item_map_variant_flags = NONE + +/obj/item/clothing/suit/storage/marine/transport_crewman + name = "\improper PAS-74 pattern transport armor" + desc = "A somewhat sparsely armored but robust armored vest. Used by transport crewmen so that they can pretend that they may survice when their vehicle is overrun." + icon_state = "transport_crewman_suit" + item_state = "transport_crewman_suit" + slowdown = SLOWDOWN_ARMOR_LIGHT + soft_armor = list(MELEE = 45, BULLET = 55, LASER = 55, ENERGY = 20, BOMB = 45, BIO = 30, FIRE = 25, ACID = 35) + item_map_variant_flags = NONE /obj/item/clothing/suit/storage/marine/riot name = "\improper M5 riot control armor" @@ -124,7 +141,7 @@ /obj/item/storage/belt/knifepouch, /obj/item/weapon/twohanded, ) - flags_item_map_variant = NONE + item_map_variant_flags = NONE //===========================SPECIALIST================================ @@ -137,23 +154,23 @@ slowdown = SLOWDOWN_ARMOR_MEDIUM supporting_limbs = CHEST | GROIN | ARM_LEFT | ARM_RIGHT | HAND_LEFT | HAND_RIGHT | LEG_LEFT | LEG_RIGHT | FOOT_LEFT | FOOT_RIGHT | HEAD //B18 effectively stabilizes these. resistance_flags = UNACIDABLE - obj_flags = AUTOBALANCE_CHECK + item_flags = AUTOBALANCE_CHECK /obj/item/clothing/suit/storage/marine/specialist/Initialize(mapload, ...) . = ..() AddComponent(/datum/component/suit_autodoc) AddComponent(/datum/component/stun_mitigation, slot_override = SLOT_WEAR_SUIT, shield_cover = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 50, BIO = 50, FIRE = 50, ACID = 50)) AddElement(/datum/element/limb_support, supporting_limbs) - if(obj_flags & AUTOBALANCE_CHECK) + if(item_flags & AUTOBALANCE_CHECK) SSmonitor.stats.b18_in_use += src /obj/item/clothing/suit/storage/marine/specialist/Destroy() - if(obj_flags & AUTOBALANCE_CHECK) + if(item_flags & AUTOBALANCE_CHECK) SSmonitor.stats.b18_in_use -= src return ..() /obj/item/clothing/suit/storage/marine/specialist/valhalla - obj_flags = NONE + item_flags = NONE /obj/item/clothing/suit/storage/marine/B17 name = "\improper B17 defensive armor" @@ -162,20 +179,20 @@ soft_armor = list(MELEE = 75, BULLET = 75, LASER = 50, ENERGY = 55, BOMB = 100, BIO = 55, FIRE = 75, ACID = 65) max_heat_protection_temperature = HEAVYARMOR_MAX_HEAT_PROTECTION_TEMPERATURE slowdown = SLOWDOWN_ARMOR_MEDIUM - obj_flags = AUTOBALANCE_CHECK + item_flags = AUTOBALANCE_CHECK /obj/item/clothing/suit/storage/marine/B17/Initialize(mapload, ...) . = ..() - if(obj_flags & AUTOBALANCE_CHECK) + if(item_flags & AUTOBALANCE_CHECK) SSmonitor.stats.b17_in_use += src /obj/item/clothing/suit/storage/marine/B17/Destroy() - if(obj_flags & AUTOBALANCE_CHECK) + if(item_flags & AUTOBALANCE_CHECK) SSmonitor.stats.b17_in_use -= src return ..() /obj/item/clothing/suit/storage/marine/B17/valhalla - obj_flags = NONE + item_flags = NONE //////////////////////////////// @@ -184,7 +201,7 @@ desc = "A somewhat outdated but robust armored vest, still in use despite the rise of exoskeleton armor due to ease of use and manufacturing. It offers more protection against the exotic dangers that technicians face." icon_state = "tanker" soft_armor = list(MELEE = 40, BULLET = 55, LASER = 60, ENERGY = 45, BOMB = 60, BIO = 45, FIRE = 45, ACID = 65) - flags_item_map_variant = NONE + item_map_variant_flags = NONE /obj/item/clothing/suit/storage/marine/officer name = "\improper PAS-N3 pattern officer armor" @@ -192,7 +209,7 @@ icon_state = "officer" soft_armor = list(MELEE = 40, BULLET = 60, LASER = 60, ENERGY = 45, BOMB = 45, BIO = 45, FIRE = 45, ACID = 50) slowdown = 0.5 - flags_item_map_variant = NONE + item_map_variant_flags = NONE allowed = list( /obj/item/weapon/gun, /obj/item/tank/emergency_oxygen, @@ -223,16 +240,16 @@ icon = 'icons/obj/clothing/suits/ert_suits.dmi' item_icons = list( slot_wear_suit_str = 'icons/mob/clothing/suits/ert_suits.dmi', - slot_l_hand_str = 'icons/mob/items_lefthand_1.dmi', - slot_r_hand_str = 'icons/mob/items_righthand_1.dmi', + slot_l_hand_str = 'icons/mob/inhands/items/items_left.dmi', + slot_r_hand_str = 'icons/mob/inhands/items/items_right.dmi', ) - flags_armor_features = ARMOR_LAMP_OVERLAY + armor_features_flags = ARMOR_LAMP_OVERLAY /obj/item/clothing/suit/storage/marine/veteran/pmc name = "\improper M4 pattern PMC armor" desc = "A common armor vest that is designed for high-profile security operators and corporate mercenaries in mind." icon_state = "pmc_armor" - soft_armor = list(MELEE = 55, BULLET = 70, LASER = 60, ENERGY = 38, BOMB = 50, BIO = 15, FIRE = 38, ACID = 45) + soft_armor = list(MELEE = 55, BULLET = 70, LASER = 60, ENERGY = 55, BOMB = 50, BIO = 15, FIRE = 38, ACID = 45) slowdown = SLOWDOWN_ARMOR_LIGHT allowed = list( /obj/item/weapon/gun, @@ -248,7 +265,7 @@ /obj/item/weapon/claymore/mercsword/machete, /obj/item/weapon/combat_knife, ) - flags_item_map_variant = NONE + item_map_variant_flags = NONE /obj/item/clothing/suit/storage/marine/veteran/pmc/leader name = "\improper M4 pattern PMC leader armor" @@ -261,8 +278,8 @@ name = "\improper M4 pattern PMC sniper armor" icon_state = "pmc_sniper" soft_armor = list(MELEE = 55, BULLET = 65, LASER = 55, ENERGY = 60, BOMB = 75, BIO = 10, FIRE = 60, ACID = 60) - flags_inventory = BLOCKSHARPOBJ - flags_inv_hide = HIDELOWHAIR + inventory_flags = BLOCKSHARPOBJ + inv_hide_flags = HIDELOWHAIR /obj/item/clothing/suit/storage/marine/veteran/pmc/gunner name = "\improper PMC gunner armor" @@ -270,7 +287,7 @@ icon_state = "pmc_heavyarmor" slowdown = SLOWDOWN_ARMOR_HEAVY soft_armor = list(MELEE = 65, BULLET = 80, LASER = 70, ENERGY = 70, BOMB = 80, BIO = 30, FIRE = 65, ACID = 65) - flags_item_map_variant = NONE + item_map_variant_flags = NONE /*===========================Death Commando============================*/ /obj/item/clothing/suit/storage/marine/veteran/pmc/commando @@ -297,12 +314,12 @@ icon = 'icons/obj/clothing/suits/ert_suits.dmi' item_icons = list( slot_wear_suit_str = 'icons/mob/clothing/suits/ert_suits.dmi', - slot_l_hand_str = 'icons/mob/items_lefthand_1.dmi', - slot_r_hand_str = 'icons/mob/items_righthand_1.dmi', + slot_l_hand_str = 'icons/mob/inhands/items/items_left.dmi', + slot_r_hand_str = 'icons/mob/inhands/items/items_right.dmi', ) icon_state = "guardarmor" soft_armor = list(MELEE = 75, BULLET = 65, LASER = 60, ENERGY = 60, BOMB = 50, BIO = 0, FIRE = 60, ACID = 60) - flags_item_map_variant = NONE + item_map_variant_flags = NONE /obj/item/clothing/suit/storage/marine/imperial/sergeant // SL armour, better than flak, covers more @@ -338,6 +355,17 @@ icon_state = "commissar_coat" item_state = "commissar_coat" soft_armor = list(MELEE = 75, BULLET = 60, LASER = 55, ENERGY = 40, BOMB = 45, BIO = 15, FIRE = 40, ACID = 40) + allowed = list( + /obj/item/weapon/gun, + /obj/item/instrument, + /obj/item/storage/belt/sparepouch, + /obj/item/storage/holster/blade, + /obj/item/weapon/claymore, + /obj/item/storage/holster/belt, + /obj/item/storage/belt/knifepouch, + /obj/item/weapon/twohanded, + /obj/item/tool/pickaxe/plasmacutter, + ) /*===========================U.S.L================================*/ @@ -345,13 +373,13 @@ icon = 'icons/obj/clothing/suits/ert_suits.dmi' item_icons = list( slot_wear_suit_str = 'icons/mob/clothing/suits/ert_suits.dmi', - slot_l_hand_str = 'icons/mob/items_lefthand_1.dmi', - slot_r_hand_str = 'icons/mob/items_righthand_1.dmi', + slot_l_hand_str = 'icons/mob/inhands/items/items_left.dmi', + slot_r_hand_str = 'icons/mob/inhands/items/items_right.dmi', ) - flags_atom = CONDUCT - flags_armor_protection = CHEST|GROIN|ARMS|LEGS|FEET|HANDS - flags_cold_protection = CHEST|GROIN|ARMS|LEGS|FEET|HANDS - flags_heat_protection =CHEST|GROIN|ARMS|LEGS|FEET|HANDS + atom_flags = CONDUCT + armor_protection_flags = CHEST|GROIN|ARMS|LEGS|FEET|HANDS + cold_protection_flags = CHEST|GROIN|ARMS|LEGS|FEET|HANDS + heat_protection_flags =CHEST|GROIN|ARMS|LEGS|FEET|HANDS min_cold_protection_temperature = ARMOR_MIN_COLD_PROTECTION_TEMPERATURE max_heat_protection_temperature = ARMOR_MAX_HEAT_PROTECTION_TEMPERATURE blood_overlay_type = "armor" @@ -371,8 +399,8 @@ /obj/item/storage/holster/blade, /obj/item/weapon/twohanded, ) - flags_armor_features = ARMOR_LAMP_OVERLAY - flags_item = SYNTH_RESTRICTED + armor_features_flags = ARMOR_LAMP_OVERLAY + item_flags = SYNTH_RESTRICTED var/locate_cooldown = 0 //Cooldown for SL locator var/armor_overlays["lamp"] actions_types = list(/datum/action/item_action/toggle) @@ -382,18 +410,14 @@ armor_overlays = list("lamp") update_icon() -/obj/item/clothing/suit/storage/faction/update_icon(mob/user) - var/image/I - I = armor_overlays["lamp"] - overlays -= I - qdel(I) - if(flags_armor_features & ARMOR_LAMP_OVERLAY) - I = image(icon, src, flags_armor_features & ARMOR_LAMP_ON? "lamp-on" : "lamp-off") +/obj/item/clothing/suit/storage/faction/update_overlays() + . = ..() + if(armor_features_flags & ARMOR_LAMP_OVERLAY) + var/image/I = image(icon, src, armor_features_flags & ARMOR_LAMP_ON? "lamp-on" : "lamp-off") armor_overlays["lamp"] = I - overlays += I - else armor_overlays["lamp"] = null - if(user) user.update_inv_wear_suit() - + . += I + else + armor_overlays["lamp"] = null /obj/item/clothing/suit/storage/faction/attack_self(mob/user) if(!isturf(user.loc)) @@ -407,8 +431,8 @@ var/mob/living/carbon/human/H = user if(H.wear_suit != src) return - turn_light(user, !light_on) - return 1 + if(turn_light(user, !light_on) == CHECKS_PASSED) + return TRUE /obj/item/clothing/suit/storage/faction/item_action_slot_check(mob/user, slot) if(!ishuman(user)) return FALSE @@ -420,7 +444,7 @@ desc = "Standard body armor of the USL pirates, the UM5 (United Medium MK5) is a medium body armor, roughly on par with the venerable M3 pattern body armor in service with the TGMC." icon_state = "upp_armor" slowdown = SLOWDOWN_ARMOR_MEDIUM - flags_armor_protection = CHEST|GROIN|ARMS|LEGS|FEET|HANDS + armor_protection_flags = CHEST|GROIN|ARMS|LEGS|FEET|HANDS soft_armor = list(MELEE = 55, BULLET = 60, LASER = 60, ENERGY = 60, BOMB = 55, BIO = 10, FIRE = 60, ACID = 60) /// Modified version of the armor for HvH combat. Stats are based on medium armor, with tyr mark 2. @@ -467,9 +491,9 @@ desc = "A armored protective chestplate scrapped together from various plates. It keeps up remarkably well, as the craftsmanship is solid, and the design mirrors such armors in the UPP and the TGMC." icon_state = "freelancer_armor" slowdown = SLOWDOWN_ARMOR_LIGHT - flags_armor_protection = CHEST|GROIN|ARMS|LEGS|FEET|HANDS - flags_cold_protection = CHEST|GROIN|ARMS|LEGS|FEET|HANDS - flags_heat_protection =CHEST|GROIN|ARMS|LEGS|FEET|HANDS + armor_protection_flags = CHEST|GROIN|ARMS|LEGS|FEET|HANDS + cold_protection_flags = CHEST|GROIN|ARMS|LEGS|FEET|HANDS + heat_protection_flags =CHEST|GROIN|ARMS|LEGS|FEET|HANDS soft_armor = list(MELEE = 50, BULLET = 60, LASER = 50, ENERGY = 60, BOMB = 40, BIO = 10, FIRE = 60, ACID = 50) attachments_by_slot = list( ATTACHMENT_SLOT_STORAGE, @@ -540,10 +564,10 @@ desc = "The hauberk of a colonist militia member, created from boiled leather and some modern armored plates. While primitive compared to most modern suits of armor, it gives the wearer almost perfect mobility, which suits the needs of the local colonists. " icon_state = "rebel_armor" slowdown = SLOWDOWN_ARMOR_VERY_LIGHT - flags_armor_protection = CHEST|GROIN|ARMS|LEGS|FEET|HANDS - flags_cold_protection = CHEST|GROIN|ARMS|LEGS|FEET|HANDS - flags_heat_protection =CHEST|GROIN|ARMS|LEGS|FEET|HANDS - flags_item = SYNTH_RESTRICTED + armor_protection_flags = CHEST|GROIN|ARMS|LEGS|FEET|HANDS + cold_protection_flags = CHEST|GROIN|ARMS|LEGS|FEET|HANDS + heat_protection_flags =CHEST|GROIN|ARMS|LEGS|FEET|HANDS + item_flags = SYNTH_RESTRICTED soft_armor = list(MELEE = 40, BULLET = 40, LASER = 40, ENERGY = 30, BOMB = 60, BIO = 30, FIRE = 30, ACID = 30) allowed = list( /obj/item/weapon/twohanded, @@ -580,9 +604,9 @@ desc = "A green jacket worn by TGMC personnel. The back has the flag of the TerraGov on it." icon_state = "RO_jacket" blood_overlay_type = "coat" - flags_armor_protection = CHEST|GROIN|ARMS|LEGS|FEET|HANDS - flags_cold_protection = CHEST|GROIN|ARMS|LEGS|FEET|HANDS - flags_heat_protection =CHEST|GROIN|ARMS|LEGS|FEET|HANDS + armor_protection_flags = CHEST|GROIN|ARMS|LEGS|FEET|HANDS + cold_protection_flags = CHEST|GROIN|ARMS|LEGS|FEET|HANDS + heat_protection_flags =CHEST|GROIN|ARMS|LEGS|FEET|HANDS /*===========================HELGHAST - MERCENARY================================*/ @@ -655,15 +679,15 @@ icon = 'icons/obj/clothing/suits/ert_suits.dmi' item_icons = list( slot_wear_suit_str = 'icons/mob/clothing/suits/ert_suits.dmi', - slot_l_hand_str = 'icons/mob/items_lefthand_1.dmi', - slot_r_hand_str = 'icons/mob/items_righthand_1.dmi', + slot_l_hand_str = 'icons/mob/inhands/items/items_left.dmi', + slot_r_hand_str = 'icons/mob/inhands/items/items_right.dmi', ) icon_state = "som_armor" item_state = "som_armor" slowdown = SLOWDOWN_ARMOR_LIGHT - flags_armor_protection = CHEST|GROIN|ARMS|LEGS|HANDS|FEET + armor_protection_flags = CHEST|GROIN|ARMS|LEGS|HANDS|FEET soft_armor = list(MELEE = 50, BULLET = 55, LASER = 55, ENERGY = 55, BOMB = 55, BIO = 55, FIRE = 55, ACID = 55) - flags_item_map_variant = NONE + item_map_variant_flags = NONE /obj/item/clothing/suit/storage/marine/som/veteran name = "\improper S12 combat Hauberk" @@ -671,7 +695,7 @@ icon_state = "som_armor_veteran" item_state = "som_armor_veteran" slowdown = SLOWDOWN_ARMOR_HEAVY - flags_armor_protection = CHEST|GROIN|ARMS|LEGS|HANDS|FEET + armor_protection_flags = CHEST|GROIN|ARMS|LEGS|HANDS|FEET soft_armor = list(MELEE = 65, BULLET = 70, LASER = 70, ENERGY = 55, BOMB = 55, BIO = 55, FIRE = 55, ACID = 60) /obj/item/clothing/suit/storage/marine/som/leader @@ -680,7 +704,7 @@ icon_state = "som_armor_leader" item_state = "som_armor_leader" slowdown = SLOWDOWN_ARMOR_MEDIUM - flags_armor_protection = CHEST|GROIN|ARMS|LEGS|HANDS|FEET + armor_protection_flags = CHEST|GROIN|ARMS|LEGS|HANDS|FEET soft_armor = list(MELEE = 55, BULLET = 50, LASER = 40, ENERGY = 55, BOMB = 55, BIO = 55, FIRE = 55, ACID = 60) /obj/item/clothing/suit/storage/marine/icc @@ -689,19 +713,57 @@ icon = 'icons/obj/clothing/suits/ert_suits.dmi' item_icons = list( slot_wear_suit_str = 'icons/mob/clothing/suits/ert_suits.dmi', - slot_l_hand_str = 'icons/mob/items_lefthand_1.dmi', - slot_r_hand_str = 'icons/mob/items_righthand_1.dmi', + slot_l_hand_str = 'icons/mob/inhands/items/items_left.dmi', + slot_r_hand_str = 'icons/mob/inhands/items/items_right.dmi', ) icon_state = "icc" slowdown = SLOWDOWN_ARMOR_MEDIUM - flags_armor_protection = CHEST|GROIN|ARMS|LEGS|FEET|HANDS - flags_cold_protection = CHEST|GROIN|ARMS|LEGS|FEET|HANDS - flags_heat_protection =CHEST|GROIN|ARMS|LEGS|FEET|HANDS + armor_protection_flags = CHEST|GROIN|ARMS|LEGS|FEET|HANDS + cold_protection_flags = CHEST|GROIN|ARMS|LEGS|FEET|HANDS + heat_protection_flags =CHEST|GROIN|ARMS|LEGS|FEET|HANDS soft_armor = list(MELEE = 50, BULLET = 60, LASER = 50, ENERGY = 60, BOMB = 70, BIO = 10, FIRE = 60, ACID = 50) - flags_item_map_variant = NONE + item_map_variant_flags = NONE /obj/item/clothing/suit/storage/marine/icc/guard name = "\improper Modelle/19 combat armor" desc = "A piece of ICCGF body armor, worn by specialized infantry. Most Infantry actions in the ICC forces are done by adhoc personnel due to constant shortages of manpower, however most real Infantry divisions are of high quality, and are better known as 'Guardsmen'. Protects well from most sources, and will entirely protect from explosions." icon_state = "icc_guard" soft_armor = list(MELEE = 60, BULLET = 65, LASER = 40, ENERGY = 60, BOMB = 85, BIO = 10, FIRE = 55, ACID = 40) + +/obj/item/clothing/suit/storage/marine/icc/guard/heavy + name = "\improper Modelle/22 'Cuirassier' combat armor" + desc = "A piece of ICCGF body armor, worn by specialized infantry. Most Infantry actions in the ICC forces are done by adhoc personnel due to constant shortages of manpower, however most real Infantry divisions are of high quality, and are better known as 'Guardsmen'. Protects well from most sources, and will entirely protect from explosions." + icon_state = "icc_guard_heavy" + soft_armor = list(MELEE = 70, BULLET = 75, LASER = 40, ENERGY = 60, BOMB = 90, BIO = 10, FIRE = 55, ACID = 40) + +//===========================SPEC OPS================================ + +/obj/item/clothing/suit/storage/marine/specops + name = "Ballistic vest" + desc = "Civilian type armor, made to combat both melee and projectiles." + icon = 'icons/mob/clothing/suits/ert_suits.dmi' + item_icons = list( + slot_wear_suit_str = 'icons/mob/clothing/suits/ert_suits.dmi', + ) + icon_state = "specops_vest" + soft_armor = list(MELEE = 30, BULLET = 50, LASER = 20, ENERGY = 25, BOMB = 30, BIO = 5, FIRE = 25, ACID = 30) + slowdown = SLOWDOWN_ARMOR_LIGHT + armor_protection_flags = CHEST|GROIN + armor_features_flags = NONE + +/obj/item/clothing/suit/storage/marine/specops/support + name = "Ballistic vest" + desc = "Civilian type armor, made to combat both melee and projectiles." + icon_state = "specops_vest_support" + +/obj/item/clothing/suit/storage/marine/specops/medic + name = "Ballistic vest" + desc = "Civilian type armor, made to combat both melee and projectiles." + icon_state = "specops_vest_medic" + +/obj/item/clothing/suit/storage/marine/specops/leader + name = "Ballistic vest" + desc = "Civilian type armor, made to combat both melee and projectiles. Comes with tactical elbow pads." + icon_state = "specops_vest_leader" + soft_armor = list(MELEE = 50, BULLET = 50, LASER = 40, ENERGY = 35, BOMB = 30, BIO = 5, FIRE = 25, ACID = 30) + slowdown = SLOWDOWN_ARMOR_MEDIUM diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 6605025912769..f181cb246c69d 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -14,7 +14,7 @@ icon_state = "bluetag" item_state = "bluetag" blood_overlay_type = "armor" - flags_armor_protection = CHEST + armor_protection_flags = CHEST allowed = list (/obj/item/weapon/gun) siemens_coefficient = 3 @@ -24,7 +24,7 @@ icon_state = "redtag" item_state = "redtag" blood_overlay_type = "armor" - flags_armor_protection = CHEST + armor_protection_flags = CHEST allowed = list (/obj/item/weapon/gun) siemens_coefficient = 3 @@ -36,7 +36,7 @@ desc = "Yarr." icon_state = "pirate" item_state = "pirate" - flags_armor_protection = CHEST|ARMS + armor_protection_flags = CHEST|ARMS /obj/item/clothing/suit/hgpirate @@ -44,9 +44,9 @@ desc = "Yarr." icon_state = "hgpirate" item_state = "hgpirate" - flags_inv_hide = HIDEJUMPSUIT - flags_armor_protection = CHEST|GROIN|ARMS|LEGS - flags_item = SYNTH_RESTRICTED + inv_hide_flags = HIDEJUMPSUIT + armor_protection_flags = CHEST|GROIN|ARMS|LEGS + item_flags = SYNTH_RESTRICTED soft_armor = list(MELEE = 60, BULLET = 90, LASER = 60, ENERGY = 20, BOMB = 25, BIO = 10, FIRE = 20, ACID = 20) @@ -55,8 +55,8 @@ desc = "Suit for a cyborg costume." icon_state = "death" item_state = "death" - flags_atom = CONDUCT - flags_inv_hide = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT + atom_flags = CONDUCT + inv_hide_flags = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT /obj/item/clothing/suit/johnny_coat name = "johnny~~ coat" @@ -69,17 +69,17 @@ desc = "This pretty much looks ridiculous." icon_state = "justice" item_state = "justice" - flags_inv_hide = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT - flags_armor_protection = CHEST|GROIN|ARMS|HANDS|LEGS|FEET + inv_hide_flags = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT + armor_protection_flags = CHEST|GROIN|ARMS|HANDS|LEGS|FEET /obj/item/clothing/suit/judgerobe name = "judge's robe" desc = "This robe commands authority." icon_state = "judge" item_state = "judge" - flags_armor_protection = CHEST|GROIN|LEGS|ARMS + armor_protection_flags = CHEST|GROIN|LEGS|ARMS allowed = list(/obj/item/storage/fancy/cigarettes,/obj/item/spacecash) - flags_inv_hide = HIDEJUMPSUIT + inv_hide_flags = HIDEJUMPSUIT /obj/item/clothing/suit/wcoat name = "waistcoat" @@ -87,15 +87,15 @@ icon_state = "vest" item_state = "wcoat" blood_overlay_type = "armor" - flags_armor_protection = CHEST|GROIN + armor_protection_flags = CHEST|GROIN -/obj/item/clothing/suit/apron/overalls +/obj/item/clothing/suit/storage/apron/overalls name = "coveralls" desc = "A set of denim overalls." icon_state = "overalls" item_state = "overalls" - flags_armor_protection = CHEST|GROIN|LEGS + armor_protection_flags = CHEST|GROIN|LEGS /obj/item/clothing/suit/syndicatefake @@ -105,16 +105,16 @@ desc = "A plastic replica of the syndicate space suit, you'll look just like a real murderous syndicate agent in this! This is a toy, it is not made for use in space!" w_class = WEIGHT_CLASS_NORMAL allowed = list(/obj/item/flashlight,/obj/item/tank/emergency_oxygen,/obj/item/toy) - flags_inv_hide = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT - flags_armor_protection = CHEST|GROIN|ARMS|HANDS|LEGS|FEET + inv_hide_flags = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT + armor_protection_flags = CHEST|GROIN|ARMS|HANDS|LEGS|FEET /obj/item/clothing/suit/hastur name = "Hastur's Robes" desc = "Robes not meant to be worn by man" icon_state = "hastur" item_state = "hastur" - flags_armor_protection = CHEST|GROIN|LEGS|FEET|ARMS - flags_inv_hide = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT + armor_protection_flags = CHEST|GROIN|LEGS|FEET|ARMS + inv_hide_flags = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT /obj/item/clothing/suit/imperium_monk @@ -122,8 +122,8 @@ desc = "Have YOU killed a xenos today?" icon_state = "imperium_monk" item_state = "imperium_monk" - flags_armor_protection = HEAD|CHEST|GROIN|LEGS|FEET|ARMS - flags_inv_hide = HIDESHOES|HIDEJUMPSUIT + armor_protection_flags = HEAD|CHEST|GROIN|LEGS|FEET|ARMS + inv_hide_flags = HIDESHOES|HIDEJUMPSUIT /obj/item/clothing/suit/chickensuit @@ -131,8 +131,8 @@ desc = "A suit made long ago by the ancient empire KFC." icon_state = "chickensuit" item_state = "chickensuit" - flags_armor_protection = CHEST|ARMS|GROIN|LEGS|FEET - flags_inv_hide = HIDESHOES|HIDEJUMPSUIT + armor_protection_flags = CHEST|ARMS|GROIN|LEGS|FEET + inv_hide_flags = HIDESHOES|HIDEJUMPSUIT siemens_coefficient = 2 @@ -141,8 +141,8 @@ desc = "A suit that looks like a primate" icon_state = "monkeysuit" item_state = "monkeysuit" - flags_armor_protection = CHEST|ARMS|GROIN|LEGS|FEET|HANDS - flags_inv_hide = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT + armor_protection_flags = CHEST|ARMS|GROIN|LEGS|FEET|HANDS + inv_hide_flags = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT siemens_coefficient = 2 @@ -151,8 +151,8 @@ desc = "This is a nice holiday my son." icon_state = "holidaypriest" item_state = "holidaypriest" - flags_armor_protection = CHEST|GROIN|LEGS|ARMS - flags_inv_hide = HIDEJUMPSUIT + armor_protection_flags = CHEST|GROIN|LEGS|ARMS + inv_hide_flags = HIDEJUMPSUIT /obj/item/clothing/suit/cardborg @@ -160,8 +160,8 @@ desc = "An ordinary cardboard box with holes cut in the sides." icon_state = "cardborg" item_state = "cardborg" - flags_armor_protection = CHEST|GROIN - flags_inv_hide = HIDEJUMPSUIT + armor_protection_flags = CHEST|GROIN + inv_hide_flags = HIDEJUMPSUIT /obj/item/clothing/suit/white_dress_jacket @@ -183,8 +183,8 @@ desc = "A suit that completely restrains the wearer." icon_state = "straight_jacket" item_state = "straight_jacket" - flags_armor_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS - flags_inv_hide = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT + armor_protection_flags = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + inv_hide_flags = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT /obj/item/clothing/suit/straight_jacket/equipped(mob/living/carbon/user, slot) @@ -209,7 +209,7 @@ desc = "A worn out, curiously comfortable t-shirt with a picture of Ian. You wouldn't go so far as to say it feels like being hugged when you wear it but it's pretty close. Good for sleeping in." icon_state = "ianshirt" item_state = "ianshirt" - flags_armor_protection = CHEST|ARMS + armor_protection_flags = CHEST|ARMS //Blue suit jacket toggle /obj/item/clothing/suit/suit/verb/toggle() @@ -241,14 +241,14 @@ desc = "Slightly old-fashioned sleepwear." icon_state = "blue_pyjamas" item_state = "blue_pyjamas" - flags_armor_protection = CHEST|GROIN|ARMS|LEGS + armor_protection_flags = CHEST|GROIN|ARMS|LEGS /obj/item/clothing/under/redpyjamas name = "red pyjamas" desc = "Slightly old-fashioned sleepwear." icon_state = "red_pyjamas" item_state = "red_pyjamas" - flags_armor_protection = CHEST|GROIN|ARMS|LEGS + armor_protection_flags = CHEST|GROIN|ARMS|LEGS //coats @@ -275,13 +275,13 @@ desc = "A suit made out of chitinous alien hide." icon_state = "xenos" item_state = "xenos_helm" - flags_armor_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS - flags_inv_hide = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT + armor_protection_flags = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + inv_hide_flags = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT siemens_coefficient = 2 //swimsuit /obj/item/clothing/under/swimsuit/ siemens_coefficient = 1 - flags_armor_protection = NONE + armor_protection_flags = NONE /obj/item/clothing/under/swimsuit/black name = "black swimsuit" @@ -328,12 +328,12 @@ desc = "Your classic, non-racist poncho. This one is red." icon_state = "redponcho" -/obj/item/clothing/suit/bomber +/obj/item/clothing/suit/storage/bomber name = "bomber jacket" desc = "A well-worn WW2 leather bomber jacket." icon_state = "bomber" - flags_armor_protection = CHEST|ARMS - flags_cold_protection = CHEST|ARMS + armor_protection_flags = CHEST|ARMS + cold_protection_flags = CHEST|ARMS min_cold_protection_temperature = T0C siemens_coefficient = 0.7 allowed = list ( @@ -350,17 +350,17 @@ icon = 'icons/obj/clothing/suits/ert_suits.dmi' item_icons = list( slot_wear_suit_str = 'icons/mob/clothing/suits/marine_armor.dmi', - slot_l_hand_str = 'icons/mob/items_lefthand_1.dmi', - slot_r_hand_str = 'icons/mob/items_righthand_1.dmi', + slot_l_hand_str = 'icons/mob/inhands/items/items_left.dmi', + slot_r_hand_str = 'icons/mob/inhands/items/items_right.dmi', ) icon_state = "rebel_armor" item_state = "rebel_armor" - flags_armor_protection = CHEST|GROIN|LEGS + armor_protection_flags = CHEST|GROIN|LEGS /obj/item/clothing/suit/techpriest name = "Techpriest Robes" desc = "Praise the omnissiah!" icon_state = "tp_bodyrobes" item_state = "tp_bodyrobes" - flags_armor_protection = CHEST|GROIN|LEGS|ARMS + armor_protection_flags = CHEST|GROIN|LEGS|ARMS diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index bd218054515a3..bdbdb87ceb7e6 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -18,15 +18,15 @@ w_class = WEIGHT_CLASS_BULKY//bulky item gas_transfer_coefficient = 0.90 permeability_coefficient = 0.50 - flags_item = IMPEDE_JETPACK - flags_armor_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + item_flags = IMPEDE_JETPACK + armor_protection_flags = CHEST|GROIN|LEGS|FEET|ARMS|HANDS allowed = list(/obj/item/flashlight,/obj/item/tank/emergency_oxygen,/obj/item/tool/extinguisher) slowdown = 1 - flags_inventory = NOPRESSUREDMAGE - flags_inv_hide = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT - flags_heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + inventory_flags = NOPRESSUREDMAGE + inv_hide_flags = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT + heat_protection_flags = CHEST|GROIN|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE - flags_cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + cold_protection_flags = CHEST|GROIN|LEGS|FEET|ARMS|HANDS /obj/item/clothing/suit/fire/heavy name = "firesuit" @@ -45,9 +45,9 @@ desc = "Use in case of bomb." icon_state = "bombsuit" soft_armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 100, BIO = 0, FIRE = 0, ACID = 0) - flags_inventory = COVEREYES|COVERMOUTH - flags_inv_hide = HIDEFACE|HIDEMASK|HIDEEARS|HIDEALLHAIR - flags_armor_protection = HEAD|FACE|EYES + inventory_flags = COVEREYES|COVERMOUTH + inv_hide_flags = HIDEFACE|HIDEMASK|HIDEEARS|HIDEALLHAIR + armor_protection_flags = HEAD|FACE|EYES siemens_coefficient = 0 @@ -61,21 +61,21 @@ permeability_coefficient = 0.01 slowdown = 2 soft_armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 100, BIO = 0, FIRE = 0, ACID = 0) - flags_inv_hide = HIDEJUMPSUIT - flags_heat_protection = CHEST|GROIN + inv_hide_flags = HIDEJUMPSUIT + heat_protection_flags = CHEST|GROIN max_heat_protection_temperature = ARMOR_MAX_HEAT_PROTECTION_TEMPERATURE siemens_coefficient = 0 /obj/item/clothing/head/bomb_hood/security icon_state = "bombsuitsec" item_state = "bombsuitsec" - flags_armor_protection = HEAD + armor_protection_flags = HEAD /obj/item/clothing/suit/bomb_suit/security icon_state = "bombsuitsec" item_state = "bombsuitsec" allowed = list(/obj/item/weapon/gun,/obj/item/weapon/baton,/obj/item/restraints/handcuffs) - flags_armor_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + armor_protection_flags = CHEST|GROIN|LEGS|FEET|ARMS|HANDS /* * Radiation protection @@ -84,9 +84,9 @@ name = "Radiation Hood" icon_state = "rad" desc = "A hood with radiation protective properties. Label: Made with lead, do not eat insulation" - flags_inventory = COVEREYES|COVERMOUTH - flags_inv_hide = HIDEFACE|HIDEMASK|HIDEEARS|HIDEALLHAIR - flags_armor_protection = HEAD|FACE|EYES + inventory_flags = COVEREYES|COVERMOUTH + inv_hide_flags = HIDEFACE|HIDEMASK|HIDEEARS|HIDEALLHAIR + armor_protection_flags = HEAD|FACE|EYES soft_armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 60, FIRE = 0, ACID = 0) @@ -98,8 +98,8 @@ w_class = WEIGHT_CLASS_BULKY//bulky item gas_transfer_coefficient = 0.90 permeability_coefficient = 0.50 - flags_armor_protection = CHEST|GROIN|LEGS|ARMS|HANDS|FEET + armor_protection_flags = CHEST|GROIN|LEGS|ARMS|HANDS|FEET allowed = list(/obj/item/flashlight,/obj/item/tank/emergency_oxygen,/obj/item/clothing/head/radiation,/obj/item/clothing/mask/gas) slowdown = 1.5 soft_armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 60, FIRE = 0, ACID = 0) - flags_inv_hide = HIDEJUMPSUIT + inv_hide_flags = HIDEJUMPSUIT diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm index b5c3122d3b9da..272d2a8d72d23 100644 --- a/code/modules/clothing/suits/wiz_robe.dm +++ b/code/modules/clothing/suits/wiz_robe.dm @@ -4,7 +4,7 @@ icon_state = "wizard" //Not given any special protective value since the magic robes are full-body protection --NEO siemens_coefficient = 0.8 - flags_armor_protection = NONE + armor_protection_flags = NONE /obj/item/clothing/head/wizard/red name = "red wizard hat" @@ -16,7 +16,7 @@ name = "wizard hat" desc = "It has WIZZARD written across it in sequins. Comes with a cool beard." icon_state = "wizard-fake" - flags_armor_protection = HEAD|FACE + armor_protection_flags = HEAD|FACE /obj/item/clothing/head/wizard/marisa name = "Witch Hat" @@ -30,7 +30,7 @@ icon_state = "magus" item_state = "magus" siemens_coefficient = 0.8 - flags_armor_protection = HEAD|FACE|EYES + armor_protection_flags = HEAD|FACE|EYES /obj/item/clothing/head/wizard/amp name = "psychic amplifier" @@ -53,7 +53,7 @@ permeability_coefficient = 0.01 soft_armor = list(MELEE = 30, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 20, BIO = 20, FIRE = 20, ACID = 20) allowed = list() - flags_inv_hide = HIDEJUMPSUIT + inv_hide_flags = HIDEJUMPSUIT siemens_coefficient = 0.8 /obj/item/clothing/suit/wizrobe/red @@ -74,14 +74,14 @@ desc = "A set of armoured robes that seem to radiate a dark power" icon_state = "magusblue" item_state = "magusblue" - flags_armor_protection = CHEST|GROIN|ARMS|HANDS|LEGS|FEET + armor_protection_flags = CHEST|GROIN|ARMS|HANDS|LEGS|FEET /obj/item/clothing/suit/wizrobe/magusred name = "Magus Robe" desc = "A set of armoured robes that seem to radiate a dark power" icon_state = "magusred" item_state = "magusred" - flags_armor_protection = CHEST|GROIN|ARMS|HANDS|LEGS|FEET + armor_protection_flags = CHEST|GROIN|ARMS|HANDS|LEGS|FEET /obj/item/clothing/suit/wizrobe/psypurple name = "purple robes" @@ -89,13 +89,13 @@ icon_state = "psyamp" item_state = "psyamp" -/obj/item/clothing/suit/wizrobe/gentlecoat +/obj/item/clothing/suit/storage/wizrobe/gentlecoat name = "Gentlemans Coat" desc = "A heavy threaded twead gray jacket. For a different sort of Gentleman." icon_state = "gentlecoat" item_state = "gentlecoat" - flags_armor_protection = CHEST|GROIN|ARMS - flags_inv_hide = NONE + armor_protection_flags = CHEST|GROIN|ARMS + inv_hide_flags = NONE /obj/item/clothing/suit/wizrobe/fake name = "wizard robe" @@ -117,7 +117,7 @@ desc = "Magic is all about the spell power, ZE!" icon_state = "marisa" item_state = "marisarobe" - flags_armor_protection = CHEST|GROIN|ARMS|LEGS + armor_protection_flags = CHEST|GROIN|ARMS|LEGS soft_armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 0, ACID = 0) siemens_coefficient = 1 diff --git a/code/modules/clothing/under/gimmick.dm b/code/modules/clothing/under/gimmick.dm index 5260f7e1b712b..8bb9ed5bb9620 100644 --- a/code/modules/clothing/under/gimmick.dm +++ b/code/modules/clothing/under/gimmick.dm @@ -28,16 +28,16 @@ name = "combat pants" desc = "The only thing a man needs when he's up agains the world." icon_state = "rambo_suit" - flags_armor_protection = LEGS|GROIN - flags_cold_protection = LEGS|GROIN - flags_heat_protection = LEGS|GROIN + armor_protection_flags = LEGS|GROIN + cold_protection_flags = LEGS|GROIN + heat_protection_flags = LEGS|GROIN /obj/item/clothing/suit/gimmick/rambo name = "pendant" desc = "It's a precious stone and something of a talisman of protection." - flags_armor_protection = CHEST - flags_cold_protection = CHEST - flags_heat_protection = CHEST + armor_protection_flags = CHEST + cold_protection_flags = CHEST + heat_protection_flags = CHEST icon_state = "rambo_pendant" //MCCLANE @@ -45,26 +45,26 @@ name = "holiday attire" desc = "The perfect outfit for a Christmas holiday with family. Shoes not included." icon_state = "mcclane_suit" - flags_armor_protection = CHEST|GROIN|LEGS - flags_cold_protection = CHEST|GROIN|LEGS - flags_heat_protection = CHEST|GROIN|LEGS + armor_protection_flags = CHEST|GROIN|LEGS + cold_protection_flags = CHEST|GROIN|LEGS + heat_protection_flags = CHEST|GROIN|LEGS //DUTCH /obj/item/clothing/under/gimmick/dutch name = "combat fatigues" desc = "Just another pair of military fatigues for a grueling tour in a jungle." icon_state = "dutch_suit" - flags_armor_protection = LEGS|GROIN - flags_cold_protection = LEGS|GROIN - flags_heat_protection = LEGS|GROIN + armor_protection_flags = LEGS|GROIN + cold_protection_flags = LEGS|GROIN + heat_protection_flags = LEGS|GROIN /obj/item/clothing/suit/armor/gimmick/dutch name = "armored jacket" desc = "It's hot in the jungle. Sometimes it's hot and heavy, and sometimes it's hell on earth." icon_state = "dutch_armor" - flags_armor_protection = CHEST - flags_cold_protection = CHEST - flags_heat_protection = CHEST + armor_protection_flags = CHEST + cold_protection_flags = CHEST + heat_protection_flags = CHEST soft_armor = list(MELEE = 45, BULLET = 45, LASER = 35, ENERGY = 25, BOMB = 25, BIO = 0, FIRE = 25, ACID = 25) allowed = list( /obj/item/weapon/gun, @@ -85,20 +85,20 @@ name = "metal body" desc = "It may be metallic, but it contains the heart and soul of Alex J. Murphy." icon_state = "robocop_suit" - flags_atom = CONDUCT + atom_flags = CONDUCT /obj/item/clothing/shoes/gimmick/robocop name = "polished metal boots" desc = "The perfect size to stomp on the scum of Detroit." icon_state = "robocop_shoes" soft_armor = list(MELEE = 87, BULLET = 87, LASER = 87, ENERGY = 87, BOMB = 87, BIO = 50, FIRE = 87, ACID = 87) - flags_inventory = CONDUCT|NOSLIPPING + inventory_flags = CONDUCT|NOSLIPPING /obj/item/clothing/gloves/gimmick/robocop name = "metal hands" desc = "The cold, unfeeling hands of the law." icon_state = "black" - flags_atom = CONDUCT + atom_flags = CONDUCT soft_armor = list(MELEE = 87, BULLET = 87, LASER = 87, ENERGY = 87, BOMB = 87, BIO = 50, FIRE = 87, ACID = 87) /obj/item/clothing/head/helmet/gimmick/robocop @@ -107,8 +107,8 @@ icon_state = "robocop_helmet" item_state = "robocop_helmet" soft_armor = list(MELEE = 87, BULLET = 87, LASER = 87, ENERGY = 87, BOMB = 87, BIO = 50, FIRE = 87, ACID = 87) - flags_inventory = COVEREYES|BLOCKSHARPOBJ - flags_inv_hide = HIDEEARS|HIDEEYES|HIDETOPHAIR + inventory_flags = COVEREYES|BLOCKSHARPOBJ + inv_hide_flags = HIDEEARS|HIDEEYES|HIDETOPHAIR anti_hug = 100 /obj/item/clothing/suit/armor/gimmick/robocop @@ -117,11 +117,11 @@ icon_state = "robocop_armor" item_state = "robocop_armor" slowdown = 1 - flags_atom = CONDUCT - flags_inventory = BLOCKSHARPOBJ - flags_armor_protection = CHEST|GROIN|ARMS|LEGS - flags_cold_protection = CHEST|GROIN|ARMS|LEGS - flags_heat_protection = CHEST|GROIN|ARMS|LEGS + atom_flags = CONDUCT + inventory_flags = BLOCKSHARPOBJ + armor_protection_flags = CHEST|GROIN|ARMS|LEGS + cold_protection_flags = CHEST|GROIN|ARMS|LEGS + heat_protection_flags = CHEST|GROIN|ARMS|LEGS allowed = list(/obj/item/weapon/gun/pistol/auto9) soft_armor = list(MELEE = 87, BULLET = 87, LASER = 87, ENERGY = 87, BOMB = 87, BIO = 50, FIRE = 87, ACID = 87) @@ -135,7 +135,7 @@ name = "black boots" desc = "Perfectly functional, this pair of boots has stomped on many planets and starships." icon_state = "skywalker_shoes" - flags_inventory = NOSLIPPING + inventory_flags = NOSLIPPING /obj/item/clothing/gloves/gimmick/skywalker name = "black glove" diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index cbe1456fd64b4..b7c832e4bb8a8 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -24,7 +24,7 @@ desc = "Shooooorts! They're comfy and easy to wear!" icon_state = "cargotech" item_state = "lb_suit" - flags_armor_protection = CHEST|GROIN|ARMS + armor_protection_flags = CHEST|GROIN|ARMS /obj/item/clothing/under/rank/chaplain desc = "It's a black jumpsuit, often worn by religious folk." diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index 77f515a31dc99..0ab72e9d89afb 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -16,7 +16,7 @@ name = "research director dress uniform" desc = "Feminine fashion for the style concious RD. Its fabric provides minor protection from biological contaminants." icon_state = "dress_rd" - flags_armor_protection = CHEST|GROIN|ARMS + armor_protection_flags = CHEST|GROIN|ARMS /obj/item/clothing/under/rank/scientist desc = "It's made of a special fiber that provides minor protection against small explosions. It has markings that denote the wearer as a scientist." @@ -61,14 +61,14 @@ name = "nurse's suit" icon_state = "nursesuit" permeability_coefficient = 0.50 - flags_armor_protection = CHEST|GROIN + armor_protection_flags = CHEST|GROIN /obj/item/clothing/under/rank/nurse desc = "A dress commonly worn by the nursing staff in the medical department." name = "nurse's dress" icon_state = "nurse" permeability_coefficient = 0.50 - flags_armor_protection = CHEST|GROIN + armor_protection_flags = CHEST|GROIN adjustment_variants = list() /obj/item/clothing/under/rank/orderly diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 31afc17a16e5d..9d527dd68dd3d 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -38,7 +38,7 @@ name = "dispatcher's uniform" desc = "A dress shirt and khakis with a security patch sewn on." icon_state = "dispatch" - flags_armor_protection = CHEST|GROIN|LEGS + armor_protection_flags = CHEST|GROIN|LEGS siemens_coefficient = 0.9 adjustment_variants = list() diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm index 5d12a98926b8a..d78f579e658b7 100644 --- a/code/modules/clothing/under/marine_uniform.dm +++ b/code/modules/clothing/under/marine_uniform.dm @@ -9,8 +9,8 @@ icon_state = "marine_jumpsuit" item_icons = list( slot_w_uniform_str = 'icons/mob/clothing/uniforms/marine_uniforms.dmi', - slot_l_hand_str = 'icons/mob/items_lefthand_1.dmi', - slot_r_hand_str = 'icons/mob/items_righthand_1.dmi', + slot_l_hand_str = 'icons/mob/inhands/items/items_left.dmi', + slot_r_hand_str = 'icons/mob/inhands/items/items_right.dmi', ) has_sensor = 2 adjustment_variants = list( @@ -19,6 +19,12 @@ "No Top" = "_r", ) +/obj/item/clothing/under/marine/holster + starting_attachments = list(/obj/item/armor_module/storage/uniform/holster) + +/obj/item/clothing/under/marine/corpman_vest + starting_attachments = list(/obj/item/armor_module/storage/uniform/white_vest) + /obj/item/clothing/under/marine/hyperscale name = "\improper 8E Chameleon TGMC uniform" desc = "A standard-issue, kevlar-weaved, hazmat-tested, EMF-augmented marine uniform BUT colorable with a facepaint! You suspect it's not as robust-proof as advertised." @@ -32,6 +38,9 @@ /obj/item/clothing/under/marine/black_vest starting_attachments = list(/obj/item/armor_module/storage/uniform/black_vest) +/obj/item/clothing/under/marine/brown_vest + starting_attachments = list(/obj/item/armor_module/storage/uniform/brown_vest) + //Squad colored turtlenecks /obj/item/clothing/under/marine/squad/neck name = "\improper TGMC Delta turtleneck" @@ -98,7 +107,7 @@ icon_state = "marine_undersuit" adjustment_variants = list() has_sensor = 2 - flags_item_map_variant = null + item_map_variant_flags = null /obj/item/clothing/under/marine/mp name = "military police uniform" @@ -115,6 +124,9 @@ "Down" = "_d", ) +/obj/item/clothing/under/marine/orion_fatigue/black_vest + starting_attachments = list(/obj/item/armor_module/storage/uniform/black_vest) + /obj/item/clothing/under/marine/red_fatigue name = "\improper Big Red fatigues" desc = "Originated from Big Red. Designed for dry, low humid, and Mars-eqse environments, they're meant for recon, stealth, and evac operations. They come with a built in cassette player hearable only to the user to help pass time, during any possible long waits. They make you feel like one with the desert, forged by the beating Sun. Rumors had it that it can recycle your sweat and urine for drinkable water!" @@ -124,6 +136,9 @@ "Down" = "_d", ) +/obj/item/clothing/under/marine/red_fatigue/black_vest + starting_attachments = list(/obj/item/armor_module/storage/uniform/black_vest) + /obj/item/clothing/under/marine/lv_fatigue name = "\improper LV-624 fatigues" desc = "Originated from LV-624. Designed for wet, high humid, and jungle environments, they're meant for recon, stealth, and evac operations. They come with a built in cassette player hearable only to the user to help pass time, during any possible long waits. Somewhere, someone is playing 'Fortunate Sons' in the background, and you can smell napalm and Agent Orange in the air..." @@ -133,12 +148,19 @@ "Down" = "_d", ) +/obj/item/clothing/under/marine/lv_fatigue/black_vest + starting_attachments = list(/obj/item/armor_module/storage/uniform/black_vest) + /obj/item/clothing/under/marine/striped name = "\improper Striped fatigues" desc = "A simple set of camo pants and a striped shirt." icon_state = "marine_striped" item_state = "marine_striped" adjustment_variants = list() + +/obj/item/clothing/under/marine/striped/black_vest + starting_attachments = list(/obj/item/armor_module/storage/uniform/black_vest) + /obj/item/clothing/under/marine/black_suit name = "\improper marine black suit" desc = "A easy fitting black suit, somehow exactly your size." @@ -174,7 +196,7 @@ name = "marine officer uniform" desc = "A standard-issue, kevlar-weaved, hazmat-tested, EMF-augmented uniform worn by logistics officers of the TGMC. Do the corps proud." icon_state = "BO_jumpsuit" - flags_item_map_variant = (ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT) + item_map_variant_flags = (ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT) /obj/item/clothing/under/marine/officer/ro_suit name = "requisition officer suit" @@ -186,8 +208,8 @@ name = "pilot officer flightsuit" desc = "A standard-issue, kevlar-weaved, hazmat-tested, EMF-augmented, survival-friendly pilot flightsuit. Fly the marines onwards to glory." icon_state = "pilot_flightsuit" - flags_cold_protection = ICE_PLANET_MIN_COLD_PROTECTION_TEMPERATURE - flags_item_map_variant = null + cold_protection_flags = ICE_PLANET_MIN_COLD_PROTECTION_TEMPERATURE + item_map_variant_flags = null adjustment_variants = list( "Half" = "_h", ) @@ -197,17 +219,27 @@ desc = "A standard-issue, kevlar-weaved, hazmat-tested, EMF-augmented uniform worn by mech pilots. Not as impressive as a titanium robot but good enough." icon_state = "marine_mech_pilot" +/obj/item/clothing/under/marine/officer/assault_crewman + name = "assault crewman uniform" + desc = "A standard-issue, carbon fibre uniform optimised for operating heavy equipment. Feels like a hand-me-down from last decade." + icon_state = "marine_assault_crewman" + +/obj/item/clothing/under/marine/officer/transport_crewman + name = "transport crewman uniform" + desc = "A standard issue comfortable uniform designed for sitting all day." + icon_state = "marine_transport_crewman" + /obj/item/clothing/under/marine/officer/bridge name = "staff officer uniform" desc = "A standard-issue, kevlar-weaved, hazmat-tested, EMF-augmented staff officer uniform. Do the navy proud." icon_state = "BO_jumpsuit" - flags_item_map_variant = (ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT) + item_map_variant_flags = (ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT) /obj/item/clothing/under/marine/officer/exec name = "field commander uniform" desc = "A special-issue, kevlar-weaved, hazmat-tested, EMF-augmented worn by a field-grade officer of the TGMC. You suspect it's not as robust-proof as advertised." icon_state = "XO_jumpsuit" - flags_item_map_variant = (ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT) + item_map_variant_flags = (ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT) /obj/item/clothing/under/marine/officer/exec/webbing starting_attachments = list(/obj/item/armor_module/storage/uniform/black_vest) @@ -216,7 +248,7 @@ name = "captain uniform" desc = "A special-issue, well-ironed, kevlar-weaved, hazmat-tested, EMF-augmented uniform worth of a TerraGov Naval Captain. Even looking at it the wrong way could result in being court-martialed." icon_state = "CO_jumpsuit" - flags_item_map_variant = (ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT) + item_map_variant_flags = (ITEM_JUNGLE_VARIANT|ITEM_ICE_VARIANT) /obj/item/clothing/under/marine/officer/admiral name = "admiral uniform" @@ -272,8 +304,8 @@ icon_state = "guardjumpsuit" item_icons = list( slot_w_uniform_str = 'icons/mob/clothing/uniforms/ert_uniforms.dmi', - slot_l_hand_str = 'icons/mob/items_lefthand_1.dmi', - slot_r_hand_str = 'icons/mob/items_righthand_1.dmi', + slot_l_hand_str = 'icons/mob/inhands/items/items_left.dmi', + slot_r_hand_str = 'icons/mob/inhands/items/items_right.dmi', ) item_state = "guardjumpsuit" soft_armor = list(MELEE = 10, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 10, BIO = 10, FIRE = 10, ACID = 10) @@ -290,8 +322,8 @@ icon = 'icons/obj/clothing/uniforms/ert_uniforms.dmi' item_icons = list( slot_w_uniform_str = 'icons/mob/clothing/uniforms/ert_uniforms.dmi', - slot_l_hand_str = 'icons/mob/items_lefthand_1.dmi', - slot_r_hand_str = 'icons/mob/items_righthand_1.dmi', + slot_l_hand_str = 'icons/mob/inhands/items/items_left.dmi', + slot_r_hand_str = 'icons/mob/inhands/items/items_right.dmi', ) adjustment_variants = list() @@ -433,7 +465,7 @@ adjustment_variants = list() /obj/item/clothing/under/som - name = "\improper SOM officer uniform" + name = "\improper SOM uniform" desc = "The standard uniform of SOM military personnel. Its design shows a clear lineage from mining uniforms used in the old mining colonies." icon = 'icons/obj/clothing/uniforms/ert_uniforms.dmi' icon_state = "som_uniform" @@ -478,7 +510,7 @@ /obj/item/clothing/under/som/officer name = "\improper SOM officer uniform" - desc = "The distinct black uniform of a SOM officer. Usually worn by junior officers" + desc = "The distinct black uniform of a SOM officer. Usually worn by junior officers." icon_state = "som_officer_uniform" item_state = "som_officer_uniform" adjustment_variants = list() @@ -488,7 +520,7 @@ /obj/item/clothing/under/som/officer/senior name = "\improper SOM officer uniform" - desc = "The distinct jacketed black uniform of a SOM officer. Usually worn by senior officers" + desc = "The distinct jacketed black uniform of a SOM officer. Usually worn by senior officers." icon_state = "som_senior_officer_uniform" item_state = "som_senior_officer_uniform" @@ -499,8 +531,8 @@ icon_state = "icc" item_icons = list( slot_w_uniform_str = 'icons/mob/clothing/uniforms/ert_uniforms.dmi', - slot_l_hand_str = 'icons/mob/items_lefthand_1.dmi', - slot_r_hand_str = 'icons/mob/items_righthand_1.dmi', + slot_l_hand_str = 'icons/mob/inhands/items/items_left.dmi', + slot_r_hand_str = 'icons/mob/inhands/items/items_right.dmi', ) item_state = "icc" has_sensor = FALSE @@ -513,7 +545,7 @@ desc = "A field of invisible energy, it protects the wearer but prevents any clothing from being worn." icon = 'icons/effects/effects.dmi' icon_state = "shield-blue" - flags_item = DELONDROP + item_flags = DELONDROP /obj/item/clothing/under/sectoid/Initialize(mapload) . = ..() @@ -535,3 +567,16 @@ /obj/item/clothing/under/marine/robotic/webbing starting_attachments = list(/obj/item/armor_module/storage/uniform/black_vest) + +/obj/item/clothing/under/marine/specops + name = "Tactical turtleneck" + desc = "A TGMC turtleneck issued to special operation units" + icon = 'icons/mob/clothing/uniforms/ert_uniforms.dmi' + icon_state = "specops_uniform" + item_icons = list( + slot_w_uniform_str = 'icons/mob/clothing/uniforms/ert_uniforms.dmi', + ) + starting_attachments = list(/obj/item/armor_module/storage/uniform/holster) + item_state = "specops_uniform" + min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROTECTION_TEMPERATURE + has_sensor = 0 diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 88a815e14a1ed..4d3b4564a0f1a 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -43,7 +43,7 @@ desc = "It makes you look HONKable!" icon_state = "sexyclown" item_state = "sexyclown" - flags_armor_protection = CHEST|GROIN + armor_protection_flags = CHEST|GROIN /obj/item/clothing/under/rank/vice name = "vice officer's jumpsuit" @@ -87,8 +87,8 @@ w_class = WEIGHT_CLASS_BULKY//bulky item gas_transfer_coefficient = 0.01 permeability_coefficient = 0.02 - flags_armor_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS - flags_cold_protection = CHEST|GROIN|LEGS|ARMS //Needs gloves and shoes with cold protection to be fully protected. + armor_protection_flags = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + cold_protection_flags = CHEST|GROIN|LEGS|ARMS //Needs gloves and shoes with cold protection to be fully protected. min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE /obj/item/clothing/under/acj @@ -98,9 +98,9 @@ desc = "it's a cybernetically enhanced jumpsuit used for administrative duties." gas_transfer_coefficient = 0.01 permeability_coefficient = 0.01 - flags_armor_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + armor_protection_flags = CHEST|GROIN|LEGS|FEET|ARMS|HANDS soft_armor = list(MELEE = 100, BULLET = 100, LASER = 100, ENERGY = 100, BOMB = 100, BIO = 100, FIRE = 100, ACID = 100) - flags_cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + cold_protection_flags = CHEST|GROIN|LEGS|FEET|ARMS|HANDS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE siemens_coefficient = 0 @@ -128,7 +128,7 @@ name = "dark undersuit" desc = "A thick, layered grey undersuit lined with power cables. Feels a little like wearing an electrical storm." icon_state = "psysuit" - flags_armor_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + armor_protection_flags = CHEST|GROIN|LEGS|FEET|ARMS|HANDS /obj/item/clothing/under/gentlesuit name = "Gentlemans Suit" @@ -174,7 +174,7 @@ name = "pirate outfit" desc = "Yarr." icon_state = "pirate" - flags_armor_protection = CHEST|GROIN|LEGS + armor_protection_flags = CHEST|GROIN|LEGS /obj/item/clothing/under/soviet name = "soviet uniform" @@ -190,23 +190,23 @@ name = "kilt" desc = "Includes shoes and plaid" icon_state = "kilt" - flags_armor_protection = CHEST|GROIN|FEET + armor_protection_flags = CHEST|GROIN|FEET /obj/item/clothing/under/sexymime name = "sexy mime outfit" desc = "The only time when you DON'T enjoy looking at someone's rack." icon_state = "sexymime" - flags_armor_protection = CHEST|GROIN + armor_protection_flags = CHEST|GROIN /obj/item/clothing/under/gladiator name = "gladiator uniform" desc = "Are you not entertained? Is that not why you are here?" icon_state = "gladiator" - flags_armor_protection = GROIN + armor_protection_flags = GROIN //dress /obj/item/clothing/under/dress/ - flags_armor_protection = CHEST|GROIN + armor_protection_flags = CHEST|GROIN /obj/item/clothing/under/dress/dress_fire name = "flame dress" @@ -243,19 +243,19 @@ name = "captain's dress uniform" desc = "Feminine fashion for the style concious captain." icon_state = "dress_cap" - flags_armor_protection = CHEST|GROIN|ARMS + armor_protection_flags = CHEST|GROIN|ARMS /obj/item/clothing/under/dress/dress_hop name = "head of personnel dress uniform" desc = "Feminine fashion for the style concious HoP." icon_state = "dress_hop" - flags_armor_protection = CHEST|GROIN|ARMS + armor_protection_flags = CHEST|GROIN|ARMS /obj/item/clothing/under/dress/dress_hr name = "human resources director uniform" desc = "Superior class for the nosy H.R. Director." icon_state = "huresource" - flags_armor_protection = CHEST|GROIN|ARMS + armor_protection_flags = CHEST|GROIN|ARMS /obj/item/clothing/under/dress/plaid_blue name = "blue plaid skirt" @@ -274,44 +274,44 @@ //wedding stuff /obj/item/clothing/under/wedding/ - flags_armor_protection = CHEST|GROIN|LEGS + armor_protection_flags = CHEST|GROIN|LEGS /obj/item/clothing/under/wedding/bride_orange name = "orange wedding dress" desc = "A big and puffy orange dress." icon_state = "bride_orange" - flags_inv_hide = HIDESHOES + inv_hide_flags = HIDESHOES /obj/item/clothing/under/wedding/bride_purple name = "purple wedding dress" desc = "A big and puffy purple dress." icon_state = "bride_purple" - flags_inv_hide = HIDESHOES + inv_hide_flags = HIDESHOES /obj/item/clothing/under/wedding/bride_blue name = "blue wedding dress" desc = "A big and puffy blue dress." icon_state = "bride_blue" - flags_inv_hide = HIDESHOES + inv_hide_flags = HIDESHOES /obj/item/clothing/under/wedding/bride_red name = "red wedding dress" desc = "A big and puffy red dress." icon_state = "bride_red" - flags_inv_hide = HIDESHOES + inv_hide_flags = HIDESHOES /obj/item/clothing/under/wedding/bride_white name = "silky wedding dress" desc = "A white wedding gown made from the finest silk." icon_state = "bride_white" - flags_inv_hide = HIDESHOES - flags_armor_protection = CHEST|GROIN + inv_hide_flags = HIDESHOES + armor_protection_flags = CHEST|GROIN /obj/item/clothing/under/sundress name = "sundress" desc = "Makes you want to frolic in a field of daisies." icon_state = "sundress" - flags_armor_protection = CHEST|GROIN + armor_protection_flags = CHEST|GROIN /obj/item/clothing/under/captainformal name = "captain's formal uniform" @@ -373,9 +373,9 @@ icon_state = "pilot_spec" item_state = "pilot_spec" resistance_flags = UNACIDABLE - flags_armor_protection = CHEST|GROIN|LEGS|ARMS + armor_protection_flags = CHEST|GROIN|LEGS|ARMS soft_armor = list(MELEE = 70, BULLET = 70, LASER = 70, ENERGY = 70, BOMB = 70, BIO = 70, FIRE = 70, ACID = 70) - flags_cold_protection = CHEST|GROIN|LEGS|ARMS + cold_protection_flags = CHEST|GROIN|LEGS|ARMS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE siemens_coefficient = 0 slowdown= -1 @@ -387,5 +387,5 @@ desc = "Praise the omnissiah!" icon_state = "tp_bodyrobes" item_state = "tp_bodyrobes" - flags_armor_protection = CHEST|GROIN|LEGS|ARMS + armor_protection_flags = CHEST|GROIN|LEGS|ARMS diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm index 0617b56f7c416..3161764d35e7c 100644 --- a/code/modules/clothing/under/shorts.dm +++ b/code/modules/clothing/under/shorts.dm @@ -2,7 +2,7 @@ name = "athletic shorts" desc = "95% Polyester, 5% Spandex!" gender = PLURAL - flags_armor_protection = GROIN + armor_protection_flags = GROIN /obj/item/clothing/under/shorts/red name = "red athletic shorts" diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm index b3a2d9118c007..5ed053b460ccd 100644 --- a/code/modules/clothing/under/ties.dm +++ b/code/modules/clothing/under/ties.dm @@ -3,12 +3,12 @@ desc = "A neosilk clip-on tie." icon = 'icons/obj/clothing/ties.dmi' icon_state = "bluetie" - flags_equip_slot = NONE + equip_slot_flags = NONE w_class = WEIGHT_CLASS_SMALL /obj/item/clothing/tie/Initialize(mapload) . = ..() - AddElement(/datum/element/attachment, ATTACHMENT_SLOT_UNIFORM_TIE, 'icons/obj/clothing/ties_overlay.dmi', flags_attach_features = (ATTACH_REMOVABLE|ATTACH_APPLY_ON_MOB), mob_overlay_icon = 'icons/mob/ties.dmi') + AddElement(/datum/element/attachment, ATTACHMENT_SLOT_UNIFORM_TIE, 'icons/obj/clothing/ties_overlay.dmi', attach_features_flags = (ATTACH_REMOVABLE|ATTACH_APPLY_ON_MOB), mob_overlay_icon = 'icons/mob/ties.dmi') /obj/item/clothing/tie/blue name = "blue tie" @@ -161,13 +161,13 @@ name = "holobadge" desc = "This glowing blue badge marks the holder as THE LAW." icon_state = "holobadge" - flags_equip_slot = ITEM_SLOT_BELT + equip_slot_flags = ITEM_SLOT_BELT var/stored_name = null /obj/item/clothing/tie/holobadge/cord icon_state = "holobadge-cord" - flags_equip_slot = ITEM_SLOT_MASK + equip_slot_flags = ITEM_SLOT_MASK /obj/item/clothing/tie/holobadge/attack_self(mob/user as mob) if(!stored_name) @@ -178,6 +178,8 @@ /obj/item/clothing/tie/holobadge/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/card/id)) var/obj/item/card/id/id_card = I diff --git a/code/modules/clothing/under/under.dm b/code/modules/clothing/under/under.dm index 36c8c3fc47d31..e81a0f541e092 100644 --- a/code/modules/clothing/under/under.dm +++ b/code/modules/clothing/under/under.dm @@ -6,11 +6,11 @@ slot_r_hand_str = 'icons/mob/inhands/clothing/uniforms_right.dmi', ) name = "under" - flags_armor_protection = CHEST|GROIN|LEGS|ARMS - flags_cold_protection = CHEST|GROIN|LEGS|ARMS - flags_heat_protection = CHEST|GROIN|LEGS|ARMS + armor_protection_flags = CHEST|GROIN|LEGS|ARMS + cold_protection_flags = CHEST|GROIN|LEGS|ARMS + heat_protection_flags = CHEST|GROIN|LEGS|ARMS permeability_coefficient = 0.90 - flags_equip_slot = ITEM_SLOT_ICLOTHING + equip_slot_flags = ITEM_SLOT_ICLOTHING soft_armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 0, ACID = 0) w_class = WEIGHT_CLASS_BULKY blood_sprite_state = "uniformblood" @@ -144,6 +144,23 @@ . += "Its vital tracker appears to be enabled." if(3) . += "Its vital tracker and tracking beacon appear to be enabled." + var/armor_info + var/obj/item/clothing/under/wear_modular_suit = src + if(wear_modular_suit.attachments_by_slot[ATTACHMENT_SLOT_UNIFORM]) + armor_info += " - [wear_modular_suit.attachments_by_slot[ATTACHMENT_SLOT_UNIFORM]].\n" + if(wear_modular_suit.attachments_by_slot[ATTACHMENT_SLOT_BADGE]) + armor_info += " - [wear_modular_suit.attachments_by_slot[ATTACHMENT_SLOT_BADGE]].\n" + if(wear_modular_suit.attachments_by_slot[ATTACHMENT_SLOT_UNIFORM_TIE]) + armor_info += " - [wear_modular_suit.attachments_by_slot[ATTACHMENT_SLOT_UNIFORM_TIE]].\n" + if(wear_modular_suit.attachments_by_slot[ATTACHMENT_SLOT_CAPE]) + armor_info += " - [wear_modular_suit.attachments_by_slot[ATTACHMENT_SLOT_CAPE]].\n" + if(wear_modular_suit.attachments_by_slot[ATTACHMENT_SLOT_CAPE_HIGHLIGHT]) + armor_info += " - [wear_modular_suit.attachments_by_slot[ATTACHMENT_SLOT_CAPE_HIGHLIGHT]].\n" + if(wear_modular_suit.attachments_by_slot[ATTACHMENT_SLOT_KAMA]) + armor_info += " - [wear_modular_suit.attachments_by_slot[ATTACHMENT_SLOT_KAMA]].\n" + if(armor_info) + . += " It has the following attachments:" + . += armor_info //we only want to quick equip from actual 'holster' type webbings /obj/item/clothing/under/do_quick_equip(mob/user) diff --git a/code/modules/codex/entries/ammunition_codex.dm b/code/modules/codex/entries/ammunition_codex.dm index 5fcea85747341..bb5af652336fa 100644 --- a/code/modules/codex/entries/ammunition_codex.dm +++ b/code/modules/codex/entries/ammunition_codex.dm @@ -20,16 +20,16 @@ if(ammo.damage_type) entry.mechanics_text += "Damage type: [ammo.damage_type]
" - if(ammo.flags_ammo_behavior & AMMO_INCENDIARY) + if(ammo.ammo_behavior_flags & AMMO_INCENDIARY) entry.mechanics_text += "Secondary effect: set target on fire.
" - if(ammo.flags_ammo_behavior & AMMO_EXPLOSIVE) - entry.mechanics_text += "Secondary effect: explosion.
" + if(ammo.ammo_behavior_flags & AMMO_TARGET_TURF) + entry.mechanics_text += "Secondary effect: Hits the turf clicked on.
" - if(ammo.flags_ammo_behavior & AMMO_SPECIAL_PROCESS) + if(ammo.ammo_behavior_flags & AMMO_SPECIAL_PROCESS) entry.mechanics_text += "Secondary effect: hits nearby targets in-flight.
" - if(ammo.flags_ammo_behavior & AMMO_LEAVE_TURF) + if(ammo.ammo_behavior_flags & AMMO_LEAVE_TURF) entry.mechanics_text += "Secondary effect: affects tiles travelled through.
" if(ammo.penetration) diff --git a/code/modules/codex/entries/clothing_codex.dm b/code/modules/codex/entries/clothing_codex.dm index 1ac214c36f997..aff9924b86990 100644 --- a/code/modules/codex/entries/clothing_codex.dm +++ b/code/modules/codex/entries/clothing_codex.dm @@ -74,10 +74,10 @@ GLOBAL_LIST_INIT(string_equip_flags, list("suit slot" = ITEM_SLOT_OCLOTHING, if(accuracy_mod) armor_strings += "
This will alter your shooting accuracy by up to [accuracy_mod]% when worn." - if(flags_inventory & NOPRESSUREDMAGE) + if(inventory_flags & NOPRESSUREDMAGE) armor_strings += "Wearing this will protect you from the vacuum of space." - if(flags_inventory & BLOCKSHARPOBJ) + if(inventory_flags & BLOCKSHARPOBJ) armor_strings += "The material is exceptionally thick." if(max_heat_protection_temperature >= FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE) @@ -91,10 +91,10 @@ GLOBAL_LIST_INIT(string_equip_flags, list("suit slot" = ITEM_SLOT_OCLOTHING, var/list/covers = list() var/list/slots = list() for(var/name in GLOB.string_part_flags) - if(flags_armor_protection & GLOB.string_part_flags[name]) + if(armor_protection_flags & GLOB.string_part_flags[name]) covers += name for(var/name in GLOB.string_equip_flags) - if(flags_equip_slot & GLOB.string_equip_flags[name]) + if(equip_slot_flags & GLOB.string_equip_flags[name]) slots += name if(length(covers)) diff --git a/code/modules/codex/entries/guns_codex.dm b/code/modules/codex/entries/guns_codex.dm index 48e352e6f530d..f66367a631154 100644 --- a/code/modules/codex/entries/guns_codex.dm +++ b/code/modules/codex/entries/guns_codex.dm @@ -14,7 +14,25 @@ . = ..() var/list/traits = list() - if(flags_gun_features & GUN_WIELDED_FIRING_ONLY) + var/skill_name + switch(gun_skill_category) + if(SKILL_RIFLES) + skill_name = "rifle skill" + if(SKILL_SMGS) + skill_name = "SMG skill" + if(SKILL_HEAVY_WEAPONS) + skill_name = "heavy weapon skill" + if(SKILL_SMARTGUN) + skill_name = "smartgun skill" + if(SKILL_SHOTGUNS) + skill_name = "shotgun skill" + if(SKILL_PISTOLS) + skill_name = "pistol skill" + + if(skill_name) + traits += "This weapons is effected by the user's [skill_name] rating.
" + + if(gun_features_flags & GUN_WIELDED_FIRING_ONLY) traits += "This can only be fired with a two-handed grip." else traits += "It's best fired with a two-handed grip." @@ -146,6 +164,16 @@ traditional chargers and their capability to switch their lens, allowing more flexibility, something that a ballistic weapon \ aren't capable of." +/datum/codex_entry/plasma_weapons + display_name = "plasma weapons" + mechanics_text = "This weapon is a plasma weapon; it fires bursts of superheated gas that have been ionized and electrically charged. You can \ + unload it by holding it and clicking it with an empty hand, and reload it by clicking it with a power cell or a plasma cartridge, depending on the model of \ + the weapon. \ +
" + lore_text = "Plasma weapons are rare and powerful due to the high cost and difficulty of producing and controlling plasma \ + pulses. They have a devastating effect on most targets, as the plasma can melt, burn, or vaporize them. Using a plasma weapon in a confined space is very risky, \ + as the plasma can damage the surroundings or harm friendly units with its intense heat and radiation." + /datum/codex_entry/ballistic_weapons display_name = "ballistic weapons" mechanics_text = "This weapon is a ballistic weapon; it fires solid shots using a magazine or loaded rounds of ammunition. You can \ @@ -185,16 +213,16 @@ /datum/codex_entry/sniper_rifle associated_paths = list(/obj/item/weapon/gun/rifle/sniper/antimaterial) lore_text = "A rather strange gun in the TGMC's arsenal. The M42A \"Express\" originally was born out of it's younger brother the M42. Made by the same \ - company who eventually went on to design the M56 smartgun system. Which the M42As specialized scope eventually adopted a modified IFF system similar to it's cousin the smartgun.
\ + company who eventually went on to design the HSG-102 smartgun system. Which the M42As specialized scope eventually adopted a modified IFF system similar to it's cousin the smartgun.
\ It was at first marketed to PMCs and civilians as an expensive accurate long range rifle but it failed due to the lack of need for such a thing for PMCs and the wide variety of options \ - already available for civilians in a more affordable package. The company after the failure went onto design the M56 smartgun and succeeded there however. Which kept them afloat after the failure of the M42.
\ + already available for civilians in a more affordable package. The company after the failure went onto design the HS-102 smartgun and succeeded there however. Which kept them afloat after the failure of the M42.
\ Later however an announcement by the Marine Corps who decided to replace the aging supply of the current adopted Sniper Rifle after complaints that the frames were starting to wear out due to long-term use and thus trials would be announced to replace them.
\ Eventually, the board of directors decided to give that reviving the M42 design was a worthwhile possibility. And thus the design was decided to be modernized and equipped with an IFF-capable scope, after that it was named as the M42A and submitted to go the trials.
\ Though high unit cost didn't allow it to be more widely adopted it was eventually decided that it would meet limited adoption for Marksmen and be designated the SR-26." /datum/codex_entry/battle_rifle associated_paths = list(/obj/item/weapon/gun/rifle/tx8) - lore_text = "The M45A was born from a commission order from the TGMC to the company which made the M42A and M56 smartgun systems.
\ + lore_text = "The M45A was born from a commission order from the TGMC to the company which made the M42A and HS-102 smartgun systems.
\ The reason for this commission order resulted from complaints from light infantry and scout units about the poor accuracy of the new SR-26 \ carbine at longer ranges and the large size of the SG-29 making close combat uncomfortable eventually reached the higher ups, who kept getting \ the same complaints over and over. So they eventually reached out to a trusted company to do it.
\ diff --git a/code/modules/codex/entries/magazine_codex.dm b/code/modules/codex/entries/magazine_codex.dm index 0d44f7803f7a6..bd7aac50a3f20 100644 --- a/code/modules/codex/entries/magazine_codex.dm +++ b/code/modules/codex/entries/magazine_codex.dm @@ -26,7 +26,7 @@ if(wield_delay_mod) traits += "Wield delay modifier: [wield_delay_mod] seconds
" - if(flags_magazine & MAGAZINE_WORN) + if(magazine_flags & MAGAZINE_WORN) traits += "This magazine is worn instead of inserted into a gun.
" traits += "Basic statistics for ammunition in this magazine are as follows:
" @@ -56,16 +56,16 @@ if(default_ammo.max_range) traits += "Maximum range: [default_ammo.max_range]
" - if(default_ammo.flags_ammo_behavior & AMMO_INCENDIARY) + if(default_ammo.ammo_behavior_flags & AMMO_INCENDIARY) traits += "Secondary effect: Set target on fire
" - if(default_ammo.flags_ammo_behavior & AMMO_EXPLOSIVE) - traits += "Secondary effect: Explosive
" + if(default_ammo.ammo_behavior_flags & AMMO_TARGET_TURF) + traits += "Secondary effect: Targets turfs
" - if(default_ammo.flags_ammo_behavior & AMMO_SPECIAL_PROCESS) + if(default_ammo.ammo_behavior_flags & AMMO_SPECIAL_PROCESS) traits += "Secondary effect: Hits nearby targets in-flight
" - if(default_ammo.flags_ammo_behavior & AMMO_LEAVE_TURF) + if(default_ammo.ammo_behavior_flags & AMMO_LEAVE_TURF) traits += "Secondary effect: Affects tiles travelled through
" if(default_ammo.accuracy) diff --git a/code/modules/codex/entries/misc_codex.dm b/code/modules/codex/entries/misc_codex.dm index baf907f71f102..36a6c41bb01ed 100644 --- a/code/modules/codex/entries/misc_codex.dm +++ b/code/modules/codex/entries/misc_codex.dm @@ -20,7 +20,7 @@ var/list/slots = list() for(var/name in GLOB.string_equip_flags) - if(flags_equip_slot & GLOB.string_equip_flags[name]) + if(equip_slot_flags & GLOB.string_equip_flags[name]) slots += name if(length(slots)) diff --git a/code/modules/codex/entries/mobs_codex.dm b/code/modules/codex/entries/mobs_codex.dm index f2ad6de3157f2..32e35ba65ee7a 100644 --- a/code/modules/codex/entries/mobs_codex.dm +++ b/code/modules/codex/entries/mobs_codex.dm @@ -40,7 +40,7 @@ if(xeno_caste.caste_flags & CASTE_EVOLUTION_ALLOWED) xeno_strings += "
This can evolve to:" - for(var/type in xeno_caste.evolves_to) + for(var/type in get_evolution_options()) xeno_strings += "[GLOB.xeno_caste_datums[type][XENO_UPGRADE_BASETYPE].caste_name]" if(length(actions)) diff --git a/code/modules/codex/entries/stacks_codex.dm b/code/modules/codex/entries/stacks_codex.dm index 55d271c6437fc..d9532c90b3551 100644 --- a/code/modules/codex/entries/stacks_codex.dm +++ b/code/modules/codex/entries/stacks_codex.dm @@ -5,7 +5,7 @@ Clicking on a floor without any tiles will reinforce the floor. You can make reinforced glass by combining rods and normal glass sheets." /datum/codex_entry/glass - associated_paths = list(/obj/item/stack/sheet/glass) + associated_paths = list(/obj/item/stack/sheet/glass/glass) mechanics_text = "Use in your hand to build a window. Can be upgraded to reinforced glass by adding metal rods, which are made from metal sheets." /datum/codex_entry/glass_reinf diff --git a/code/modules/codex/entries/weapons_codex.dm b/code/modules/codex/entries/weapons_codex.dm index 6f84521cc4c5d..55d51ee3e131b 100644 --- a/code/modules/codex/entries/weapons_codex.dm +++ b/code/modules/codex/entries/weapons_codex.dm @@ -28,10 +28,10 @@ if(slot == ATTACHMENT_SLOT_UNDER) attach_strings += "This attaches to the underbarrel slot on most weapons.
" - if(flags_attach_features & ATTACH_REMOVABLE) + if(attach_features_flags & ATTACH_REMOVABLE) attach_strings += "This can be field stripped off the weapon if needed." - if(flags_attach_features & ATTACH_ACTIVATION) + if(attach_features_flags & ATTACH_ACTIVATION) attach_strings += "This needs to be activated to be used." attach_strings += "
Always on modifications:
" diff --git a/code/modules/condor/cas_chair.dm b/code/modules/condor/cas_chair.dm index c33aadcc24e11..0e56de61fe3e7 100644 --- a/code/modules/condor/cas_chair.dm +++ b/code/modules/condor/cas_chair.dm @@ -144,15 +144,15 @@ occupant.forceMove(get_step(loc, WEST)) occupant = null -/obj/structure/caspart/caschair/attack_alien(mob/living/carbon/xenomorph/X, damage_amount, damage_type, damage_flag, effects, armor_penetration, isrightclick) +/obj/structure/caspart/caschair/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) if(!occupant) - to_chat(X, span_xenowarning("There is nothing of interest in there.")) + to_chat(xeno_attacker, span_xenowarning("There is nothing of interest in there.")) return - if(X.status_flags & INCORPOREAL || X.do_actions) + if(xeno_attacker.status_flags & INCORPOREAL || xeno_attacker.do_actions) return - visible_message(span_warning("[X] begins to pry the [src]'s cover!"), 3) + visible_message(span_warning("[xeno_attacker] begins to pry the [src]'s cover!"), 3) playsound(src,'sound/effects/metal_creaking.ogg', 25, 1) - if(!do_after(X, 2 SECONDS)) + if(!do_after(xeno_attacker, 2 SECONDS)) return playsound(loc, 'sound/effects/metal_creaking.ogg', 25, 1) eject_user(TRUE) @@ -204,12 +204,12 @@ switch(action) if("launch") if(!cas_usable) - to_chat(usr, "Combat has not yet initiated, CAS unavailable.") + to_chat(usr, span_warning("Combat has not yet initiated, CAS unavailable.")) return if(owner.state == PLANE_STATE_FLYING || owner.mode != SHUTTLE_IDLE) return - if(owner.fuel_left <= LOW_FUEL_THRESHOLD) - to_chat(usr, "Unable to launch, low fuel.") + if(owner.fuel_left <= LOW_FUEL_TAKEOFF_THRESHOLD) + to_chat(usr, span_warning("Unable to launch, low fuel.")) return SSshuttle.moveShuttleToDock(owner.id, SSshuttle.generate_transit_dock(owner), TRUE) owner.currently_returning = FALSE diff --git a/code/modules/condor/cas_shuttle.dm b/code/modules/condor/cas_shuttle.dm index a8a799d61b2d9..a0e49ed127bd6 100644 --- a/code/modules/condor/cas_shuttle.dm +++ b/code/modules/condor/cas_shuttle.dm @@ -57,8 +57,11 @@ /obj/docking_port/mobile/marine_dropship/casplane/process() #ifndef TESTING fuel_left-- + if((fuel_max*LOW_FUEL_WARNING_THRESHOLD) == fuel_left) + chair.occupant?.playsound_local(loc, 'sound/voice/plane_vws/low_fuel.ogg', 70, FALSE) if((fuel_left <= LOW_FUEL_LANDING_THRESHOLD) && (state == PLANE_STATE_FLYING)) to_chat(chair.occupant, span_warning("Out of fuel, landing.")) + chair.occupant?.playsound_local(loc, 'sound/voice/plane_vws/no_fuel.ogg', 70, FALSE) SSshuttle.moveShuttle(id, SHUTTLE_CAS_DOCK, TRUE) currently_returning = TRUE end_cas_mission(chair.occupant) @@ -194,6 +197,7 @@ #endif to_chat(user, span_warning("Targets detected, routing to area of operations.")) + user.playsound_local(chair, 'sound/voice/plane_vws/flightcomputer_hot.ogg', 70, FALSE) give_eye_control(user) eyeobj.setLoc(get_turf(starting_point)) @@ -261,7 +265,7 @@ if(A.ceiling >= CEILING_UNDERGROUND) to_chat(source, span_warning("That target is too deep underground!")) return - if(A.flags_area & OB_CAS_IMMUNE) + if(A.area_flags & OB_CAS_IMMUNE) to_chat(source, span_warning("Our payload won't reach this target!")) return if(active_weapon.ammo_equipped?.ammo_count <= 0) diff --git a/code/modules/detectivework/footprints_and_rag.dm b/code/modules/detectivework/footprints_and_rag.dm index 172c26ebfc24a..0eedb5d5ebafc 100644 --- a/code/modules/detectivework/footprints_and_rag.dm +++ b/code/modules/detectivework/footprints_and_rag.dm @@ -17,7 +17,7 @@ amount_per_transfer_from_this = 5 possible_transfer_amounts = list(5) volume = 5 - flags_item = NOBLUDGEON + item_flags = NOBLUDGEON /obj/item/reagent_containers/glass/rag/attack_self(mob/user as mob) return diff --git a/code/modules/detectivework/forensics.dm b/code/modules/detectivework/forensics.dm index a2a05eeeb6915..82ae7324e20b9 100644 --- a/code/modules/detectivework/forensics.dm +++ b/code/modules/detectivework/forensics.dm @@ -24,14 +24,14 @@ fibertext = "Material from \a [M.wear_suit]." if(prob(10*item_multiplier) && !(fibertext in suit_fibers)) suit_fibers += fibertext - suit_coverage = M.wear_suit.flags_armor_protection + suit_coverage = M.wear_suit.armor_protection_flags - if(M.w_uniform && (M.w_uniform.flags_armor_protection & ~suit_coverage)) + if(M.w_uniform && (M.w_uniform.armor_protection_flags & ~suit_coverage)) fibertext = "Fibers from \a [M.w_uniform]." if(prob(15*item_multiplier) && !(fibertext in suit_fibers)) suit_fibers += fibertext - if(M.gloves && (M.gloves.flags_armor_protection & ~suit_coverage)) + if(M.gloves && (M.gloves.armor_protection_flags & ~suit_coverage)) fibertext = "Material from a pair of [M.gloves.name]." if(prob(20*item_multiplier) && !(fibertext in suit_fibers)) suit_fibers += "Material from a pair of [M.gloves.name]." diff --git a/code/modules/detectivework/scanner.dm b/code/modules/detectivework/scanner.dm index f8ded08499344..09b3a47fcdb48 100644 --- a/code/modules/detectivework/scanner.dm +++ b/code/modules/detectivework/scanner.dm @@ -10,9 +10,9 @@ slot_r_hand_str = 'icons/mob/inhands/equipment/engineering_right.dmi', ) item_state = "electronic" - flags_atom = CONDUCT - flags_item = NOBLUDGEON - flags_equip_slot = ITEM_SLOT_BELT + atom_flags = CONDUCT + item_flags = NOBLUDGEON + equip_slot_flags = ITEM_SLOT_BELT /obj/item/detective_scanner/attack(mob/living/carbon/human/M as mob, mob/user as mob) to_chat(user, span_warning("This device is non-functional.")) diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm index 5ebc598dc5a7f..06d7c058e2eb7 100644 --- a/code/modules/economy/ATM.dm +++ b/code/modules/economy/ATM.dm @@ -65,6 +65,8 @@ log transactions /obj/machinery/atm/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/card)) var/obj/item/card/id/idcard = I diff --git a/code/modules/economy/EFTPOS.dm b/code/modules/economy/EFTPOS.dm index 1da5cd8857d4f..0706983d80db9 100644 --- a/code/modules/economy/EFTPOS.dm +++ b/code/modules/economy/EFTPOS.dm @@ -117,6 +117,8 @@ /obj/item/eftpos/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/card)) var/obj/item/card/C = I diff --git a/code/modules/economy/cash.dm b/code/modules/economy/cash.dm index 186f6404acbc8..50af2fd224207 100644 --- a/code/modules/economy/cash.dm +++ b/code/modules/economy/cash.dm @@ -18,6 +18,8 @@ /obj/item/spacecash/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/spacecash) && !istype(I, /obj/item/spacecash/ewallet)) var/obj/item/spacecash/bundle/bundle @@ -45,8 +47,12 @@ desc = "They are worth 0 dollars." worth = 0 -/obj/item/spacecash/bundle/update_icon() - overlays.Cut() +/obj/item/spacecash/bundle/update_desc(updates) + . = ..() + desc = "They are worth [worth] dollars." + +/obj/item/spacecash/bundle/update_overlays() + . = ..() var/sum = worth var/num = 0 for(var/i in list(1000,500,200,100,50,20,10,1)) @@ -58,15 +64,14 @@ M.Translate(rand(-6, 6), rand(-4, 8)) M.Turn(pick(-45, -27.5, 0, 0, 0, 0, 0, 0, 0, 27.5, 45)) banknote.transform = M - overlays += banknote + . += banknote if(num == 0) // Less than one thaler, let's just make it look like 1 for ease var/image/banknote = image('icons/obj/stack_objects.dmi', "spacecash1") var/matrix/M = matrix() M.Translate(rand(-6, 6), rand(-4, 8)) M.Turn(pick(-45, -27.5, 0, 0, 0, 0, 0, 0, 0, 27.5, 45)) banknote.transform = M - overlays += banknote - desc = "They are worth [worth] dollars." + . += banknote /obj/item/spacecash/bundle/attack_self(mob/user) var/oldloc = loc @@ -76,7 +81,7 @@ if(gc_destroyed || loc != oldloc) return src.worth -= amount - src.update_icon() + src.update_appearance() if(!worth) usr.temporarilyRemoveItemFromInventory(src) if(amount in list(1000,500,200,100,50,20,1)) @@ -86,7 +91,7 @@ else var/obj/item/spacecash/bundle/bundle = new (usr.loc) bundle.worth = amount - bundle.update_icon() + bundle.update_appearance() user.put_in_hands(bundle) if(!worth) qdel(src) @@ -143,7 +148,7 @@ return var/obj/item/spacecash/bundle/bundle = new (spawnloc) bundle.worth = sum - bundle.update_icon() + bundle.update_appearance() if (ishuman(human_user) && !human_user.get_active_held_item()) human_user.put_in_hands(bundle) diff --git a/code/modules/events/intel_computer.dm b/code/modules/events/intel_computer.dm index a8a58cd29135d..8a2a0a34f0c60 100644 --- a/code/modules/events/intel_computer.dm +++ b/code/modules/events/intel_computer.dm @@ -20,6 +20,6 @@ /datum/round_event/intel_computer/proc/activate(obj/machinery/computer/intel_computer/I) I.active = TRUE - SSminimaps.add_marker(I, MINIMAP_FLAG_ALL, image('modular_RUtgmc/icons/UI_icons/map_blips.dmi', null, "intel", ABOVE_FLOAT_LAYER)) - priority_announce("Our data sifting algorithm has detected valuable classified information on a access point in [get_area(I)]. Should this data be recovered by ground forces, a reward will be given in the form of increased assets.", title = "TGMC Intel Division") + SSminimaps.add_marker(I, MINIMAP_FLAG_ALL, image('modular_RUtgmc/icons/UI_icons/map_blips.dmi', null, "intel", ABOVE_FLOAT_LAYER)) //RUTGMC EDIT + minor_announce("Our data sifting algorithm has detected valuable classified information on a access point in [get_area(I)]. Should this data be recovered by ground forces, a reward will be given in the form of increased assets.", title = "TGMC Intel Division") xeno_message("We sense a looming threat from [get_area(I)]. We must keep the hosts away from there.") diff --git a/code/modules/factory/howtopaper.dm b/code/modules/factory/howtopaper.dm index 36e56666bb0a8..fcd1ff0f0128a 100644 --- a/code/modules/factory/howtopaper.dm +++ b/code/modules/factory/howtopaper.dm @@ -10,15 +10,15 @@ Machines will always output in the direction they are facing and input from the opposite direction.
RECIPES:
- WP GRENADE:
- UNBOXER -> CUTTER -> HEATER -> FORMER
-
- M15 GRENADE:
- UNBOXER -> CUTTER -> FORMER
+ ALL GRENADES:
+ UNBOXER -> CUTTER -> HEATER -> FORMER -> COMPRESSOR
PIZZA:
UNBOXER -> CUTTER -> HEATER
+ ALL C4 PLASTIQUES AND DETPACKS:
+ UNBOXER -> CUTTER -> FLATTER
+
ALL SADAR AMMO TYPES:
UNBOXER -> CUTTER -> HEATER -> FLATTER -> ATOMIC RECONSTRUCTOR
@@ -34,14 +34,14 @@ MATEBA SPEEDLOADER:
UNBOXER -> CUTTER -> FLATTER
- RAILGUN MAGAZINE:
+ ALL RAILGUN AMMO:
UNBOXER -> CUTTER -> FLATTER -> ATOMIC RECONSTRUCTOR
MINIGUN POWERPACK:
UNBOXER -> CUTTER -> ATMOIC RECONSTRUCTOR -> FORMER
- RAZORFOAM GRENADES:
- UNBOXER -> CUTTER -> FORMER -> HEATER
+ SR-127 FLAK AMMO:
+ UNBOXER -> CUTTER -> ATOMIC RECONSTRUCTOR
ALL AMR AMMO:
UNBOXER -> CUTTER -> ATOMIC RECONSTRUCTOR
@@ -49,25 +49,37 @@ ALL HOWITZER SHELL TYPES:
UNBOXER -> CUTTER -> DRILLER -> COMPRESSOR -> GALVANIZER
- SWAT MASKS:
- UNBOXER -> COMPRESSOR -> GALVANIZER -> CUTTER
-
- MEDICAL EQUIPMENT:
- UNBOXER -> FLATTER -> COMPRESSOR -> DRILLER -> GALVANIZER
-
- ALL MODULES:
- UNBOXER -> CUTTER -> FLATTER -> DRILLER -> HEATER -> COMPRESSOR -> GALVANIZER
-
ALL MORTAR AMMO:
UNBOXER -> CUTTER -> HEATER -> DRILLER -> ATOMIC RECONSTRUCTOR -> GALVANIZER
MLRS ROCKETS:
UNBOXER -> CUTTER -> HEATER -> DRILLER -> COMPRESSOR -> GALVANIZER
+ ALL AGLS AMMO:
+ UNBOXER -> CUTTER -> HEATER -> CONSTRUCTOR -> FLATTER -> GALVANIZER
+
+ ALL TAT AMMO:
+ UNBOXER -> CUTTER -> HEATER -> FLATTER -> COMPRESSOR -> GALVANIZER
+
+ ALL FK-88 AMMO:
+ UNBOXER -> HEATER -> COMPRESSOR -> DRILLER -> GALVANIZER -> FORMER
+
+ ALL ATR-22 AMMO:
+ UNBOXER -> HEATER -> COMPRESSOR -> GALVANIZER -> FORMER
+
THERMOBARIC WP ROCKETS:
UNBOXER -> CUTTER -> HEATER -> FLATTER -> ATOMIC RECONSTRUCTOR -> GALVANIZER
- DROP PODS:
+ SWAT MASKS:
+ UNBOXER -> COMPRESSOR -> GALVANIZER -> CUTTER
+
+ MEDICAL EQUIPMENT:
+ UNBOXER -> FLATTER -> COMPRESSOR -> DRILLER -> GALVANIZER
+
+ ALL MODULES:
+ UNBOXER -> CUTTER -> FLATTER -> DRILLER -> HEATER -> COMPRESSOR -> GALVANIZER
+
+ MISCELLANEOUS EQUIPMENT (DROP PODS, FLOODLIGHTS, CAMERAS):
UNBOXER -> CUTTER -> HEATER -> ATOMIC RECONSTRUCTOR-> FORMER
"} diff --git a/code/modules/factory/machines.dm b/code/modules/factory/machines.dm index 346ba5d1c2308..7a18e8bf0da86 100644 --- a/code/modules/factory/machines.dm +++ b/code/modules/factory/machines.dm @@ -6,7 +6,7 @@ density = TRUE anchored = FALSE // start off unanchored so its easier to move resistance_flags = XENO_DAMAGEABLE - flags_atom = PREVENT_CONTENTS_EXPLOSION + atom_flags = PREVENT_CONTENTS_EXPLOSION ///process type we will use to determine what step of the production process this machine will do var/process_type = FACTORY_MACHINE_HEATER ///Time in ticks that this machine takes to process one item diff --git a/code/modules/factory/parts.dm b/code/modules/factory/parts.dm index 38ce1b08a701e..c57da30dcbe3e 100644 --- a/code/modules/factory/parts.dm +++ b/code/modules/factory/parts.dm @@ -39,35 +39,111 @@ next_machine = recipe[stage][STEP_NEXT_MACHINE] icon_state = recipe[stage][STEP_ICON_STATE] -GLOBAL_LIST_INIT(phosnade_recipe, list( +GLOBAL_LIST_INIT(grenade, list( list(STEP_NEXT_MACHINE = FACTORY_MACHINE_CUTTER, STEP_ICON_STATE = "uncutplate"), list(STEP_NEXT_MACHINE = FACTORY_MACHINE_HEATER, STEP_ICON_STATE = "cutplate"), - list(STEP_NEXT_MACHINE = FACTORY_MACHINE_FORMER, STEP_ICON_STATE = "hotplate"), + list(STEP_NEXT_MACHINE = FACTORY_MACHINE_FORMER, STEP_ICON_STATE = "roundplate"), + list(STEP_NEXT_MACHINE = FACTORY_MACHINE_COMPRESSOR, STEP_ICON_STATE = "hotplate"), )) +/obj/item/factory_part/bignade + name = "\improper M15 grenade assembly" + desc = "An incomplete M15 grenade." + result = /obj/item/explosive/grenade/m15 + +/obj/item/factory_part/bignade/Initialize(mapload) + . = ..() + recipe = GLOB.grenade + +/obj/item/factory_part/incennade + name = "incendiary grenade assembly" + desc = "An incomplete incendiary grenade casing." + result = /obj/item/explosive/grenade/incendiary + +/obj/item/factory_part/incennade/Initialize(mapload) + . = ..() + recipe = GLOB.grenade + +/obj/item/factory_part/stickynade + name = "adhesive grenade assembly." + desc = "An incomplete adhesive grenade casing." + result = /obj/item/explosive/grenade/sticky + +/obj/item/factory_part/stickynade/Initialize(mapload) + . = ..() + recipe = GLOB.grenade + /obj/item/factory_part/phosnade name = "phosphorus grenade assembly" - desc = "A incomplete phosphorus grenade assembly" + desc = "An incomplete phosphorus grenade casing." result = /obj/item/explosive/grenade/phosphorus /obj/item/factory_part/phosnade/Initialize(mapload) . = ..() - recipe = GLOB.phosnade_recipe + recipe = GLOB.grenade +/obj/item/factory_part/cloaknade + name = "cloaking grenade assembly" + desc = "An incomplete cloaking grenade casing." + result = /obj/item/explosive/grenade/smokebomb/cloak -GLOBAL_LIST_INIT(bignade_recipe, list( - list(STEP_NEXT_MACHINE = FACTORY_MACHINE_CUTTER, STEP_ICON_STATE = "uncutplate"), - list(STEP_NEXT_MACHINE = FACTORY_MACHINE_FORMER, STEP_ICON_STATE = "roundplate"), - )) +/obj/item/factory_part/cloaknade/Initialize(mapload) + . = ..() + recipe = GLOB.grenade -/obj/item/factory_part/bignade - name = "\improper M15 grenade assembly" - desc = "An incomplete M15 grenade." - result = /obj/item/explosive/grenade/m15 +/obj/item/factory_part/tfootnade + name = "tanglefoot grenade assembly" + desc ="An incomplete tanglefoot grenade casing." + result = /obj/item/explosive/grenade/smokebomb/drain -/obj/item/factory_part/bignade/Initialize(mapload) +/obj/item/factory_part/tfootnade/Initialize(mapload) + . = ..() + recipe = GLOB.grenade + +/obj/item/factory_part/trailblazer + name = "trailblazer grenade assembly" + desc = "An incomplete trailblazer grenade casing." + result = /obj/item/explosive/grenade/sticky/trailblazer + +/obj/item/factory_part/trailblazer/Initialize(mapload) . = ..() - recipe = GLOB.bignade_recipe + recipe = GLOB.grenade + +/obj/item/factory_part/lasenade + name = "laser grenade assembly" + desc = "An incomplete laser grenade casing." + result = /obj/item/explosive/grenade/bullet/laser + +/obj/item/factory_part/lasenade/Initialize(mapload) + . = ..() + recipe = GLOB.grenade + +/obj/item/factory_part/hefanade + name = "HEFA fragmentation grenade assembly" + desc = "An incomplete HEFA fragmentation grenade casing." + result = /obj/item/explosive/grenade/bullet/hefa + +/obj/item/factory_part/hefanade/Initialize(mapload) + . = ..() + recipe = GLOB.grenade + +/obj/item/factory_part/antigas + name = "anti-gas smoke grenade assembly" + desc = "An incomplete anti-gas smoke grenade casing." + result = /obj/item/explosive/grenade/smokebomb/antigas + +/obj/item/factory_part/antigas/Initialize(mapload) + . = ..() + recipe = GLOB.grenade + +/obj/item/factory_part/razornade + name = "razorfoam grenade assembly" + desc = "An unfinished Razorfoam grenade casing." + result = /obj/item/explosive/grenade/chem_grenade/razorburn_small + +/obj/item/factory_part/razornade/Initialize(mapload) + . = ..() + recipe = GLOB.grenade GLOBAL_LIST_INIT(pizza_recipe, list( list(STEP_NEXT_MACHINE = FACTORY_MACHINE_CUTTER, STEP_ICON_STATE = "dough"), @@ -83,6 +159,38 @@ GLOBAL_LIST_INIT(pizza_recipe, list( . = ..() recipe = GLOB.pizza_recipe +GLOBAL_LIST_INIT(plastique_recipe, list( + list(STEP_NEXT_MACHINE = FACTORY_MACHINE_CUTTER, STEP_ICON_STATE = "cutplate"), + list(STEP_NEXT_MACHINE = FACTORY_MACHINE_FLATTER, STEP_ICON_STATE = "hotplate"), +)) + +/obj/item/factory_part/plastique + name = "\improper C4 explosive assembly" + desc = "An unfinshed C4 plastique explosive assembly." + result = /obj/item/explosive/plastique + +/obj/item/factory_part/plastique/Initialize(mapload) + . = ..() + recipe = GLOB.plastique_recipe + +/obj/item/factory_part/plastique_incendiary + name = "\improper EX-62 Genghis incendiary assembly" + desc = "An unfinshed EX-62 Genghis incendiary charge assembly." + result = /obj/item/explosive/plastique/genghis_charge + +/obj/item/factory_part/plastique_incendiary/Initialize(mapload) + . = ..() + recipe = GLOB.plastique_recipe + +/obj/item/factory_part/detpack + name = "\improper Detpack assembly" + desc = "An unfinished Detpack charge assembly" + result = /obj/item/detpack + +/obj/item/factory_part/detpack/Initialize(mapload) + . = ..() + recipe = GLOB.plastique_recipe + GLOBAL_LIST_INIT(sadar_ammo_recipe, list( list(STEP_NEXT_MACHINE = FACTORY_MACHINE_CUTTER, STEP_ICON_STATE = "uncutplate"), list(STEP_NEXT_MACHINE = FACTORY_MACHINE_HEATER, STEP_ICON_STATE = "cutplate"), @@ -277,6 +385,24 @@ GLOBAL_LIST_INIT(IFF_ammo, list( . = ..() recipe = GLOB.IFF_ammo +/obj/item/factory_part/sniper_flak_magazine + name = "\improper FLAK sniper bullet box" + desc = "A box with unfinished flak sniper rounds inside." + result = /obj/item/ammo_magazine/rifle/chamberedrifle/flak + +/obj/item/factory_part/sniper_flak_magazine/Initialize(mapload) + . = ..() + recipe = GLOB.IFF_ammo + +/obj/item/factory_part/sniper_flak_magazine + name = "\improper FLAK sniper bullet box" + desc = "A box with unfinished flak sniper rounds inside." + result = /obj/item/ammo_magazine/rifle/chamberedrifle/flak + +/obj/item/factory_part/sniper_flak_magazine/Initialize(mapload) + . = ..() + recipe = GLOB.IFF_ammo + GLOBAL_LIST_INIT(mateba_speedloader, list( list(STEP_NEXT_MACHINE = FACTORY_MACHINE_CUTTER, STEP_ICON_STATE = "uncutplate"), list(STEP_NEXT_MACHINE = FACTORY_MACHINE_FLATTER, STEP_ICON_STATE = "bulletbox"), @@ -306,6 +432,24 @@ GLOBAL_LIST_INIT(railgun_magazine, list( . = ..() recipe = GLOB.railgun_magazine +/obj/item/factory_part/railgun_hvap_magazine + name = "railgun round" + desc = "An unfinished magnetically propelled steel rod." + result = /obj/item/ammo_magazine/railgun/hvap + +/obj/item/factory_part/railgun_hvap_magazine/Initialize(mapload) + . = ..() + recipe = GLOB.railgun_magazine + +/obj/item/factory_part/railgun_smart_magazine + name = "railgun round" + desc = "An unfinished magnetically propelled steel rod." + result = /obj/item/ammo_magazine/railgun/smart + +/obj/item/factory_part/railgun_smart_magazine/Initialize(mapload) + . = ..() + recipe = GLOB.railgun_magazine + GLOBAL_LIST_INIT(minigun_powerpack, list( list(STEP_NEXT_MACHINE = FACTORY_MACHINE_CUTTER, STEP_ICON_STATE = "uncutplate"), list(STEP_NEXT_MACHINE = FACTORY_MACHINE_CONSTRUCTOR, STEP_ICON_STATE = "cutplate"), @@ -320,62 +464,6 @@ GLOBAL_LIST_INIT(minigun_powerpack, list( . = ..() recipe = GLOB.minigun_powerpack -GLOBAL_LIST_INIT(razornade, list( - list(STEP_NEXT_MACHINE = FACTORY_MACHINE_CUTTER, STEP_ICON_STATE = "uncutplate"), - list(STEP_NEXT_MACHINE = FACTORY_MACHINE_FORMER, STEP_ICON_STATE = "roundplate"), - list(STEP_NEXT_MACHINE = FACTORY_MACHINE_HEATER, STEP_ICON_STATE = "cutplate"), - )) -/obj/item/factory_part/razornade - name = "razorfoam grenade" - desc = "An unfinished Razorfoam grenade casing." - result = /obj/item/explosive/grenade/chem_grenade/razorburn_smol - -/obj/item/factory_part/razornade/Initialize(mapload) - . = ..() - recipe = GLOB.razornade - -GLOBAL_LIST_INIT(howitzer_shell, list( - list(STEP_NEXT_MACHINE = FACTORY_MACHINE_CUTTER, STEP_ICON_STATE = "uncutplate"), - list(STEP_NEXT_MACHINE = FACTORY_MACHINE_DRILLER, STEP_ICON_STATE = "cutplate"), - list(STEP_NEXT_MACHINE = FACTORY_MACHINE_COMPRESSOR, STEP_ICON_STATE = "barrelplate"), - list(STEP_NEXT_MACHINE = FACTORY_MACHINE_GALVANIZER, STEP_ICON_STATE = "rockettube"), - )) -/obj/item/factory_part/howitzer_shell_he - name = "howitzer shell" - desc = "An unfinished high explosive howitzer shell." - result = /obj/item/mortal_shell/howitzer/he - -/obj/item/factory_part/howitzer_shell_he/Initialize(mapload) - . = ..() - recipe = GLOB.howitzer_shell - -/obj/item/factory_part/howitzer_shell_incen - name = "howitzer shell" - desc = "An unfinished incendiary howitzer shell." - result = /obj/item/mortal_shell/howitzer/incendiary - -/obj/item/factory_part/howitzer_shell_incen/Initialize(mapload) - . = ..() - recipe = GLOB.howitzer_shell - -/obj/item/factory_part/howitzer_shell_wp - name = "howitzer shell" - desc = "An unfinished white phosphorus Howitzer shell." - result = /obj/item/mortal_shell/howitzer/white_phos - -/obj/item/factory_part/howitzer_shell_wp/Initialize(mapload) - . = ..() - recipe = GLOB.howitzer_shell - -/obj/item/factory_part/howitzer_shell_tfoot - name = "howitzer shell" - desc = "An unfinished high explosive howitzer shell." - result = /obj/item/mortal_shell/howitzer/plasmaloss - -/obj/item/factory_part/howitzer_shell_tfoot/Initialize(mapload) - . = ..() - recipe = GLOB.howitzer_shell - GLOBAL_LIST_INIT(swat_mask, list( list(STEP_NEXT_MACHINE = FACTORY_MACHINE_COMPRESSOR, STEP_ICON_STATE = "cutplate"), list(STEP_NEXT_MACHINE = FACTORY_MACHINE_GALVANIZER, STEP_ICON_STATE = "steelingot"), @@ -391,38 +479,6 @@ GLOBAL_LIST_INIT(swat_mask, list( . = ..() recipe = GLOB.swat_mask -GLOBAL_LIST_INIT(meds, list( - list(STEP_NEXT_MACHINE = FACTORY_MACHINE_FLATTER, STEP_ICON_STATE = "uncutplate"), - list(STEP_NEXT_MACHINE = FACTORY_MACHINE_COMPRESSOR, STEP_ICON_STATE = "req_bag3"), - list(STEP_NEXT_MACHINE = FACTORY_MACHINE_DRILLER, STEP_ICON_STATE = "req_bag1"), - list(STEP_NEXT_MACHINE = FACTORY_MACHINE_GALVANIZER, STEP_ICON_STATE = "req_bag2"), - )) - -/obj/item/factory_part/med_advpack - name = "advanced first-aid kit" - desc = "An unfinished advanced first-aid ." - result = list( - /obj/item/stack/medical/heal_pack/advanced/bruise_pack, - /obj/item/stack/medical/heal_pack/advanced/bruise_pack, - /obj/item/stack/medical/heal_pack/advanced/bruise_pack, - /obj/item/stack/medical/heal_pack/advanced/bruise_pack, - /obj/item/stack/medical/heal_pack/advanced/bruise_pack, - /obj/item/stack/medical/heal_pack/advanced/burn_pack, - /obj/item/stack/medical/heal_pack/advanced/burn_pack, - /obj/item/stack/medical/heal_pack/advanced/burn_pack, - /obj/item/stack/medical/heal_pack/advanced/burn_pack, - /obj/item/stack/medical/heal_pack/advanced/burn_pack, - /obj/item/stack/medical/splint, - /obj/item/stack/medical/splint, - /obj/item/stack/medical/splint, - /obj/item/stack/medical/splint, - /obj/item/stack/medical/splint, - ) - -/obj/item/factory_part/med_advpack/Initialize(mapload) - . = ..() - recipe = GLOB.meds - GLOBAL_LIST_INIT(module, list( list(STEP_NEXT_MACHINE = FACTORY_MACHINE_CUTTER, STEP_ICON_STATE = "cutplate"), list(STEP_NEXT_MACHINE = FACTORY_MACHINE_FLATTER, STEP_ICON_STATE = "roundplate"), @@ -483,6 +539,8 @@ GLOBAL_LIST_INIT(module, list( . = ..() recipe = GLOB.module +// Mortar + GLOBAL_LIST_INIT(mortar_shell, list( list(STEP_NEXT_MACHINE = FACTORY_MACHINE_CUTTER, STEP_ICON_STATE = "uncutplate"), list(STEP_NEXT_MACHINE = FACTORY_MACHINE_HEATER, STEP_ICON_STATE = "cutplate"), @@ -536,7 +594,55 @@ GLOBAL_LIST_INIT(mortar_shell, list( . = ..() recipe = GLOB.mortar_shell +// +// Howitzer +// + +GLOBAL_LIST_INIT(howitzer_shell, list( + list(STEP_NEXT_MACHINE = FACTORY_MACHINE_CUTTER, STEP_ICON_STATE = "uncutplate"), + list(STEP_NEXT_MACHINE = FACTORY_MACHINE_DRILLER, STEP_ICON_STATE = "cutplate"), + list(STEP_NEXT_MACHINE = FACTORY_MACHINE_COMPRESSOR, STEP_ICON_STATE = "barrelplate"), + list(STEP_NEXT_MACHINE = FACTORY_MACHINE_GALVANIZER, STEP_ICON_STATE = "rockettube"), + )) +/obj/item/factory_part/howitzer_shell_he + name = "howitzer shell" + desc = "An unfinished high explosive howitzer shell." + result = /obj/item/mortal_shell/howitzer/he + +/obj/item/factory_part/howitzer_shell_he/Initialize(mapload) + . = ..() + recipe = GLOB.howitzer_shell + +/obj/item/factory_part/howitzer_shell_incen + name = "howitzer shell" + desc = "An unfinished incendiary howitzer shell." + result = /obj/item/mortal_shell/howitzer/incendiary +/obj/item/factory_part/howitzer_shell_incen/Initialize(mapload) + . = ..() + recipe = GLOB.howitzer_shell + +/obj/item/factory_part/howitzer_shell_wp + name = "howitzer shell" + desc = "An unfinished white phosphorus Howitzer shell." + result = /obj/item/mortal_shell/howitzer/white_phos + +/obj/item/factory_part/howitzer_shell_wp/Initialize(mapload) + . = ..() + recipe = GLOB.howitzer_shell + +/obj/item/factory_part/howitzer_shell_tfoot + name = "howitzer shell" + desc = "An unfinished high explosive howitzer shell." + result = /obj/item/mortal_shell/howitzer/plasmaloss + +/obj/item/factory_part/howitzer_shell_tfoot/Initialize(mapload) + . = ..() + recipe = GLOB.howitzer_shell + +// +// MLRS +// GLOBAL_LIST_INIT(mlrs_rocket, list( list(STEP_NEXT_MACHINE = FACTORY_MACHINE_CUTTER, STEP_ICON_STATE = "uncutplate"), @@ -555,6 +661,23 @@ GLOBAL_LIST_INIT(mlrs_rocket, list( . = ..() recipe = GLOB.mlrs_rocket +/obj/item/factory_part/mlrs_rocket/gas + name = "\improper MLRS mustard gas rocket" + desc = "An unfinished mustard gas rocket." + result = /obj/item/storage/box/mlrs_rockets/gas + +/obj/item/factory_part/mlrs_rocket/cloak + name = "\improper MLRS cloak rocket" + desc = "An unfinished cloak gas rocket." + result = /obj/item/storage/box/mlrs_rockets/cloak + +/obj/item/factory_part/mlrs_rocket/incendiary + name = "\improper MLRS Incendiary rocket" + desc = "An unfinished incendiary rocket." + result = /obj/item/storage/box/mlrs_rockets/incendiary + +// Thermobaric + GLOBAL_LIST_INIT(thermobaric_wp_recipe, list( list(STEP_NEXT_MACHINE = FACTORY_MACHINE_CUTTER, STEP_ICON_STATE = "uncutplate"), list(STEP_NEXT_MACHINE = FACTORY_MACHINE_HEATER, STEP_ICON_STATE = "cutplate"), @@ -572,7 +695,7 @@ GLOBAL_LIST_INIT(thermobaric_wp_recipe, list( . = ..() recipe = GLOB.thermobaric_wp_recipe -GLOBAL_LIST_INIT(drop_pod_recipe, list( +GLOBAL_LIST_INIT(equipment_recipe, list( list(STEP_NEXT_MACHINE = FACTORY_MACHINE_CUTTER, STEP_ICON_STATE = "uncutplate"), list(STEP_NEXT_MACHINE = FACTORY_MACHINE_HEATER, STEP_ICON_STATE = "cutplate"), list(STEP_NEXT_MACHINE = FACTORY_MACHINE_CONSTRUCTOR, STEP_ICON_STATE = "hotplate"), @@ -581,10 +704,193 @@ GLOBAL_LIST_INIT(drop_pod_recipe, list( /obj/item/factory_part/drop_pod name = "TGMC Zeus orbital drop pod assembly" - desc = "An incomplete Zeus orbital drop pod assembly" + desc = "An incomplete Zeus orbital drop pod assembly." result = /obj/structure/droppod /obj/item/factory_part/drop_pod/Initialize(mapload) . = ..() - recipe = GLOB.drop_pod_recipe + recipe = GLOB.equipment_recipe + +/obj/item/factory_part/deployable_floodlight + name = "\improper deployable floodlight assembly" + desc = "An incomplete deployable floodlight assembly." + result = /obj/item/deployable_floodlight + +/obj/item/factory_part/deployable_floodlight/Initialize(mapload) + . = ..() + recipe = GLOB.equipment_recipe + +/obj/item/factory_part/deployable_camera + name = "\improper deployable security camera assembly" + desc = "An incomplete deployable security camera assembly." + result = /obj/item/deployable_camera + +/obj/item/factory_part/deployable_camera/Initialize(mapload) + . = ..() + recipe = GLOB.equipment_recipe + +GLOBAL_LIST_INIT(agls_recipe, list( + list(STEP_NEXT_MACHINE = FACTORY_MACHINE_CUTTER, STEP_ICON_STATE = "uncutplate"), + list(STEP_NEXT_MACHINE = FACTORY_MACHINE_HEATER, STEP_ICON_STATE = "cutplate"), + list(STEP_NEXT_MACHINE = FACTORY_MACHINE_CONSTRUCTOR, STEP_ICON_STATE = "hotplate"), + list(STEP_NEXT_MACHINE = FACTORY_MACHINE_FLATTER, STEP_ICON_STATE = "rockettube"), + list(STEP_NEXT_MACHINE = FACTORY_MACHINE_GALVANIZER, STEP_ICON_STATE = "hotplate"), + )) + +/obj/item/factory_part/agls_he + name = "\improper AGLS HE magazine assembly" + desc = "An incomplete AGLS HE magazine assembly." + result = /obj/item/ammo_magazine/standard_agls + +/obj/item/factory_part/obj/item/factory_part/agls_he/Initialize(mapload) + . = ..() + recipe = GLOB.agls_recipe + +/obj/item/factory_part/agls_frag + name = "\improper AGLS Frag magazine assembly" + desc = "An incomplete AGLS Frag magazine assembly." + result = /obj/item/ammo_magazine/standard_agls/fragmentation + +/obj/item/factory_part/agls_frag/Initialize(mapload) + . = ..() + recipe = GLOB.agls_recipe + +/obj/item/factory_part/agls_incendiary + name = "\improper AGLS HE magazine assembly" + desc = "An incomplete AGLS HE magazine assembly." + result = /obj/item/ammo_magazine/standard_agls/incendiary + +/obj/item/factory_part/agls_incendiary/Initialize(mapload) + . = ..() + recipe = GLOB.agls_recipe + +/obj/item/factory_part/agls_flare + name = "\improper AGLS HE magazine assembly" + desc = "An incomplete AGLS HE magazine assembly." + result = /obj/item/ammo_magazine/standard_agls/flare + +/obj/item/factory_part/agls_flare/Initialize(mapload) + . = ..() + recipe = GLOB.agls_recipe + +/obj/item/factory_part/agls_cloak + name = "\improper AGLS HE magazine assembly" + desc = "An incomplete AGLS HE magazine assembly." + result = /obj/item/ammo_magazine/standard_agls/cloak + +/obj/item/factory_part/agls_cloak/Initialize(mapload) + . = ..() + recipe = GLOB.agls_recipe + +/obj/item/factory_part/agls_tanglefoot + name = "\improper AGLS HE magazine assembly" + desc = "An incomplete AGLS HE magazine assembly." + result = /obj/item/ammo_magazine/standard_agls/tanglefoot + +/obj/item/factory_part/agls_tanglefoot/Initialize(mapload) + . = ..() + recipe = GLOB.agls_recipe + +GLOBAL_LIST_INIT(atgun_recipe, list( + list(STEP_NEXT_MACHINE = FACTORY_MACHINE_CUTTER, STEP_ICON_STATE = "uncutplate"), + list(STEP_NEXT_MACHINE = FACTORY_MACHINE_HEATER, STEP_ICON_STATE = "cutplate"), + list(STEP_NEXT_MACHINE = FACTORY_MACHINE_FLATTER, STEP_ICON_STATE = "hotplate"), + list(STEP_NEXT_MACHINE = FACTORY_MACHINE_COMPRESSOR, STEP_ICON_STATE = "rockettube"), + list(STEP_NEXT_MACHINE = FACTORY_MACHINE_GALVANIZER, STEP_ICON_STATE = "rockettube"), + )) + +/obj/item/factory_part/atgun_aphe + name = "\improper AT-36 APHE shell assembly" + desc = "An incomplete AT-36 APHE shell assembly." + result = /obj/item/ammo_magazine/standard_atgun + +/obj/item/factory_part/atgun_aphe/Initialize(mapload) + . = ..() + recipe = GLOB.atgun_recipe + +/obj/item/factory_part/atgun_apcr + name = "\improper AT-36 APCR shell assembly" + desc = "An incomplete AT-36 APCR shell assembly." + result = /obj/item/ammo_magazine/standard_atgun/apcr +/obj/item/factory_part/atgun_apcr/Initialize(mapload) + . = ..() + recipe = GLOB.atgun_recipe + +/obj/item/factory_part/atgun_he + name = "\improper AT-36 HE shell assembly" + desc = "An incomplete AT-36 HE shell assembly." + result = /obj/item/ammo_magazine/standard_atgun/he + +/obj/item/factory_part/atgun_he/Initialize(mapload) + . = ..() + recipe = GLOB.atgun_recipe + +/obj/item/factory_part/atgun_beehive + name = "\improper AT-36 Beehive shell assembly" + desc = "An incomplete AT-36 Beehive shell assembly." + result = /obj/item/ammo_magazine/standard_atgun/beehive + +/obj/item/factory_part/atgun_beehive/Initialize(mapload) + . = ..() + recipe = GLOB.atgun_recipe + +/obj/item/factory_part/atgun_incend + name = "\improper AT-36 Napalm shell assembly" + desc = "An incomplete AT-36 Napalm shell assembly." + result = /obj/item/ammo_magazine/standard_atgun/incend + +/obj/item/factory_part/atgun_incend/Initialize(mapload) + . = ..() + recipe = GLOB.atgun_recipe + +GLOBAL_LIST_INIT(heavy_isg_recipe, list( + list(STEP_NEXT_MACHINE = FACTORY_MACHINE_HEATER, STEP_ICON_STATE = "uncutplate"), + list(STEP_NEXT_MACHINE = FACTORY_MACHINE_COMPRESSOR, STEP_ICON_STATE = "cutplate"), + list(STEP_NEXT_MACHINE = FACTORY_MACHINE_DRILLER, STEP_ICON_STATE = "hotplate"), + list(STEP_NEXT_MACHINE = FACTORY_MACHINE_GALVANIZER, STEP_ICON_STATE = "rockettube"), + list(STEP_NEXT_MACHINE = FACTORY_MACHINE_FORMER, STEP_ICON_STATE = "rockettube"), + )) + +/obj/item/factory_part/heavy_isg_he + name = "\improper FK-88 HE shell assembly" + desc = "An incomplete FK-88 HE shell assembly." + result = /obj/item/ammo_magazine/heavy_isg/he + +/obj/item/factory_part/heavy_isg_he/Initialize(mapload) + . = ..() + recipe = GLOB.heavy_isg_recipe + +/obj/item/factory_part/heavy_isg_sabot + name = "\improper FK-88 HE shell assembly" + desc = "An incomplete FK-88 APFDS shell assembly." + result = /obj/item/ammo_magazine/heavy_isg/sabot + +/obj/item/factory_part/heavy_isg_sabot/Initialize(mapload) + . = ..() + recipe = GLOB.heavy_isg_recipe + +GLOBAL_LIST_INIT(ac_recipe, list( + list(STEP_NEXT_MACHINE = FACTORY_MACHINE_HEATER, STEP_ICON_STATE = "uncutplate"), + list(STEP_NEXT_MACHINE = FACTORY_MACHINE_COMPRESSOR, STEP_ICON_STATE = "cutplate"), + list(STEP_NEXT_MACHINE = FACTORY_MACHINE_GALVANIZER, STEP_ICON_STATE = "rockettube"), + list(STEP_NEXT_MACHINE = FACTORY_MACHINE_FORMER, STEP_ICON_STATE = "rockettube"), + )) + +/obj/item/factory_part/ac_hv + name = "\improper ATR-22 high velocity magazine assembly" + desc = "An incomplete ATR-22 high velocity magazine assembly." + result = /obj/item/ammo_magazine/auto_cannon + +/obj/item/factory_part/ac_hv/Initialize(mapload) + . = ..() + recipe = GLOB.ac_recipe + +/obj/item/factory_part/ac_flak + name = "\improper ATR-22 flak magazine assembly" + desc = "An incomplete ATR-22 flak magazine assembly." + result = /obj/item/ammo_magazine/auto_cannon/flak + +/obj/item/factory_part/ac_flak/Initialize(mapload) + . = ..() + recipe = GLOB.ac_recipe diff --git a/code/modules/factory/unboxer.dm b/code/modules/factory/unboxer.dm index 154ec3d995a05..1228d6e986c43 100644 --- a/code/modules/factory/unboxer.dm +++ b/code/modules/factory/unboxer.dm @@ -54,6 +54,7 @@ balloon_alert(user, "Facing [dir2text(dir)]") /obj/machinery/unboxer/update_icon_state() + . = ..() if(datum_flags & DF_ISPROCESSING) icon_state = "unboxer" return @@ -105,22 +106,95 @@ qdel(refill) new /obj/item/stack/sheet/metal(user.loc)//simulates leftover trash +/obj/item/factory_refill/bignade_refill + name = "box of rounded metal plates" + desc = "A box with round metal plates inside. Used to refill Unboxers." + refill_type = /obj/item/factory_part/bignade + refill_amount = 50 + +/obj/item/factory_refill/incennade_refill + name = "box of incendiary grenade plates" + desc = "A box with round metal plates inside that could be used to construct Incendiary genades. Used to refill Unboxers." + refill_type = /obj/item/factory_part/incennade + refill_amount = 50 + +/obj/item/factory_refill/stickynade_refill + name = "box of adhesive genade plates" + desc = "A box with round metal plates inside that could be used to construct Adhesive grenades. Used to refill Unboxers." + refill_type = /obj/item/factory_part/stickynade + refill_amount = 50 + /obj/item/factory_refill/phosnade_refill name = "box of rounded metal plates" desc = "A box with round metal plates inside. Used to refill Unboxers." refill_type = /obj/item/factory_part/phosnade - refill_amount = 25 + refill_amount = 50 + +/obj/item/factory_refill/cloaknade_refill + name = "box of cloaking grenade plates" + desc = "A box with round metal plates inside that could be used to construct Cloaking grenades. Used to refill Unboxers." + refill_type = /obj/item/factory_part/cloaknade + refill_amount = 50 + +/obj/item/factory_refill/tfootnade_refill + name = "box of tangle grenade plates" + desc = "A box with round metal plates inside that could be used to construct Tanglefoot grenades. Used to refill Unboxers." + refill_type = /obj/item/factory_part/tfootnade + refill_amount = 50 + +/obj/item/factory_refill/trailblazer_refill + name = "box of trailblazer grenade plates" + desc = "A box with round metal plates inside that could be used to construct Trailblazer genades. Used to refill Unboxers." + refill_type = /obj/item/factory_part/trailblazer + refill_amount = 50 + +/obj/item/factory_refill/lasenade_refill + name = "box of laser grenade plates and cells." + desc = "A box with plates and cells inside that could be used to construct Laser grenades. Used to refill Unboxers." + refill_type = /obj/item/factory_part/lasenade + refill_amount = 50 + +/obj/item/factory_refill/hefanade_refill + name = "box of hefa nade plates and shells." + desc = "A box with plates and shells inside that could be used to construct HEFA grenades. Used to refill Unboxers." + refill_type = /obj/item/factory_part/hefanade + refill_amount = 50 + +/obj/item/factory_refill/antigas_refill + name = "box of Anti-Gas plates." + desc = "A box with plates inside that could be used to construct M40-AG grenades. Used to refill Unboxers." + refill_type = /obj/item/factory_part/antigas + refill_amount = 50 -/obj/item/factory_refill/bignade_refill +/obj/item/factory_refill/razornade_refill name = "box of rounded metal plates" desc = "A box with round metal plates inside. Used to refill Unboxers." - refill_type = /obj/item/factory_part/bignade + refill_type = /obj/item/factory_part/razornade + refill_amount = 50 /obj/item/factory_refill/pizza_refill name = "box of rounded metal plates" desc = "A box with round metal plates inside. Used to refill Unboxers." refill_type = /obj/item/factory_part/pizza +/obj/item/factory_refill/plastique_refill + name = "box of rounded metal plates" + desc = "A box with round metal plates inside. Used to refill Unboxers." + refill_type = /obj/item/factory_part/plastique + refill_amount = 10 + +/obj/item/factory_refill/plastique_incendiary_refill + name = "box of rounded metal plates" + desc = "A box with round metal plates inside. Used to refill Unboxers." + refill_type = /obj/item/factory_part/plastique_incendiary + refill_amount = 5 + +/obj/item/factory_refill/detpack_refill + name = "box of rounded metal plates" + desc = "A box with round metal plates inside. Used to refill Unboxers." + refill_type = /obj/item/factory_part/detpack + refill_amount = 10 + /obj/item/factory_refill/sadar_wp_refill name = "box of rounded metal plates" desc = "A box with round metal plates inside. Used to refill Unboxers." @@ -226,17 +300,29 @@ refill_type = /obj/item/factory_part/railgun_magazine refill_amount = 20 +/obj/item/factory_refill/railgun_hvap_magazine_refill + name = "box of rounded metal plates" + desc = "A box with round metal plates inside. Used to refill Unboxers." + refill_type = /obj/item/factory_part/railgun_hvap_magazine + refill_amount = 20 + +/obj/item/factory_refill/railgun_smart_magazine_refill + name = "box of rounded metal plates" + desc = "A box with round metal plates inside. Used to refill Unboxers." + refill_type = /obj/item/factory_part/railgun_smart_magazine + refill_amount = 20 + /obj/item/factory_refill/minigun_powerpack_refill name = "box of rounded metal plates" desc = "A box with round metal plates inside. Used to refill Unboxers." refill_type = /obj/item/factory_part/minigun_powerpack refill_amount = 10 -/obj/item/factory_refill/razornade_refill +/obj/item/factory_refill/sniper_flak_magazine_refill name = "box of rounded metal plates" desc = "A box with round metal plates inside. Used to refill Unboxers." - refill_type = /obj/item/factory_part/razornade - refill_amount = 30 + refill_type = /obj/item/factory_part/sniper_flak_magazine + refill_amount = 20 /obj/item/factory_refill/amr_magazine_refill name = "box of rounded metal plates" @@ -286,12 +372,6 @@ refill_type = /obj/item/factory_part/swat_mask refill_amount = 20 -/obj/item/factory_refill/med_advpack_refill - name = "box of rounded metal plates" - desc = "A box of round metal plates inside. Used to refill Unboxers." - refill_type = /obj/item/factory_part/med_advpack - refill_amount = 10 - /obj/item/factory_refill/module_valk_refill name = "box of rounded metal plates" desc = "A box of round metal plates inside. Used to refill Unboxers." @@ -354,9 +434,117 @@ /obj/item/factory_refill/mlrs_rocket_refill name = "box of rounded metal plates" - desc = "A box with round metal plates inside. Used to refill Unboxers." + desc = "A box with round metal plates inside. Used to refill Unboxers. These will become High Explosive rockets for an MLRS, once finished." refill_type = /obj/item/factory_part/mlrs_rocket refill_amount = 6 + +/obj/item/factory_refill/mlrs_rocket_refill_gas + name = "box of rounded metal plates" + desc = "A box with round metal plates inside. Used to refill Unboxers. These will become deadly Gas rockets for an MLRS, once finished." + refill_type = /obj/item/factory_part/mlrs_rocket/gas + refill_amount = 6 + +/obj/item/factory_refill/mlrs_rocket_refill_cloak + name = "box of rounded metal plates" + desc = "A box with round metal plates inside. Used to refill Unboxers. These will become Cloaking Smoke rockets for an MLRS, once finished." + refill_type = /obj/item/factory_part/mlrs_rocket/cloak + refill_amount = 6 + +/obj/item/factory_refill/mlrs_rocket_refill_incendiary + name = "box of rounded metal plates" + desc = "A box with round metal plates inside. Used to refill Unboxers. These will become Incendiary rockets for an MLRS, once finished." + refill_type = /obj/item/factory_part/mlrs_rocket/incendiary + refill_amount = 6 + +/obj/item/factory_refill/agls_he_refill + name = "box of rounded metal plates" + desc = "A box with round metal plates inside. Used to refill Unboxers." + refill_type = /obj/item/factory_part/agls_he + refill_amount = 10 + +/obj/item/factory_refill/agls_frag_refill + name = "box of rounded metal plates" + desc = "A box with round metal plates inside. Used to refill Unboxers." + refill_type = /obj/item/factory_part/agls_frag + refill_amount = 10 + +/obj/item/factory_refill/agls_incendiary_refill + name = "box of rounded metal plates" + desc = "A box with round metal plates inside. Used to refill Unboxers." + refill_type = /obj/item/factory_part/agls_incendiary + refill_amount = 10 + +/obj/item/factory_refill/agls_flare_refill + name = "box of rounded metal plates" + desc = "A box with round metal plates inside. Used to refill Unboxers." + refill_type = /obj/item/factory_part/agls_he + refill_amount = 10 + +/obj/item/factory_refill/agls_cloak_refill + name = "box of rounded metal plates" + desc = "A box with round metal plates inside. Used to refill Unboxers." + refill_type = /obj/item/factory_part/agls_cloak + refill_amount = 10 + +/obj/item/factory_refill/agls_tanglefoot_refill + name = "box of rounded metal plates" + desc = "A box with round metal plates inside. Used to refill Unboxers." + refill_type = /obj/item/factory_part/agls_tanglefoot + refill_amount = 10 + +/obj/item/factory_refill/atgun_aphe_refill + name = "box of rounded metal plates" + desc = "A box with round metal plates inside. Used to refill Unboxers." + refill_type = /obj/item/factory_part/atgun_aphe + refill_amount = 30 + +/obj/item/factory_refill/atgun_apcr_refill + name = "box of rounded metal plates" + desc = "A box with round metal plates inside. Used to refill Unboxers." + refill_type = /obj/item/factory_part/atgun_apcr + refill_amount = 30 + +/obj/item/factory_refill/atgun_he_refill + name = "box of rounded metal plates" + desc = "A box with round metal plates inside. Used to refill Unboxers." + refill_type = /obj/item/factory_part/atgun_he + refill_amount = 30 + +/obj/item/factory_refill/atgun_beehive_refill + name = "box of rounded metal plates" + desc = "A box with round metal plates inside. Used to refill Unboxers." + refill_type = /obj/item/factory_part/atgun_beehive + refill_amount = 30 + +/obj/item/factory_refill/atgun_incend_refill + name = "box of rounded metal plates" + desc = "A box with round metal plates inside. Used to refill Unboxers." + refill_type = /obj/item/factory_part/atgun_incend + refill_amount = 30 + +/obj/item/factory_refill/heavy_isg_he_refill + name = "box of rounded metal plates" + desc = "A box with round metal plates inside. Used to refill Unboxers." + refill_type = /obj/item/factory_part/heavy_isg_he + refill_amount = 5 + +/obj/item/factory_refill/heavy_isg_sabot_refill + name = "box of rounded metal plates" + desc = "A box with round metal plates inside. Used to refill Unboxers." + refill_type = /obj/item/factory_part/heavy_isg_sabot + refill_amount = 5 + +/obj/item/factory_refill/ac_hv_refill + name = "box of rounded metal plates" + desc = "A box with round metal plates inside. Used to refill Unboxers." + refill_type = /obj/item/factory_part/ac_hv + refill_amount = 10 + +/obj/item/factory_refill/ac_flak_refill + name = "box of rounded metal plates" + desc = "A box with round metal plates inside. Used to refill Unboxers." + refill_type = /obj/item/factory_part/ac_flak + refill_amount = 10 /obj/item/factory_refill/thermobaric_wp_refill name = "box of rounded metal plates" @@ -369,3 +557,27 @@ desc = "A box with round metal plates inside. Used to refill Unboxers." refill_type = /obj/item/factory_part/drop_pod refill_amount = 6 + +/obj/item/factory_refill/deployable_floodlight_refill + name = "box of rounded metal plates" + desc = "A box with round metal plates inside. Used to refill Unboxers." + refill_type = /obj/item/factory_part/deployable_floodlight + refill_amount = 10 + +/obj/item/factory_refill/deployable_camera_refill + name = "box of rounded metal plates" + desc = "A box with round metal plates inside. Used to refill Unboxers." + refill_type = /obj/item/factory_part/deployable_camera + refill_amount = 30 + +/obj/item/factory_refill/deployable_floodlight_refill + name = "box of rounded metal plates" + desc = "A box with round metal plates inside. Used to refill Unboxers." + refill_type = /obj/item/factory_part/deployable_floodlight + refill_amount = 10 + +/obj/item/factory_refill/deployable_camera_refill + name = "box of rounded metal plates" + desc = "A box with round metal plates inside. Used to refill Unboxers." + refill_type = /obj/item/factory_part/deployable_camera + refill_amount = 30 diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index f5b046043353f..4f9a8438e90a5 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -114,16 +114,6 @@ GLOBAL_LIST_INIT(hallucination_list, list( if(target.client) target.client.images |= current_image -/obj/effect/hallucination/simple/update_icon(new_state,new_icon,new_px=0,new_py=0) - icon_state = new_state - if(new_icon) - icon = new_icon - else - icon = initial(icon) - px = new_px - py = new_py - Show() - /obj/effect/hallucination/simple/Moved(atom/OldLoc, Dir) Show() diff --git a/code/modules/food_and_drinks/kitchen_machinery/griddle.dm b/code/modules/food_and_drinks/kitchen_machinery/griddle.dm index eb42c4380fdb3..f40a51729fa0d 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/griddle.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/griddle.dm @@ -31,7 +31,7 @@ /obj/machinery/griddle/crowbar_act(mob/living/user, obj/item/I) . = ..() - if(flags_atom & NODECONSTRUCT) + if(atom_flags & NODECONSTRUCT) return if(default_deconstruction_crowbar(I, ignore_panel = TRUE)) return diff --git a/code/modules/food_and_drinks/kitchen_machinery/grill.dm b/code/modules/food_and_drinks/kitchen_machinery/grill.dm index e56bf20bf98e6..351f4244a5368 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/grill.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/grill.dm @@ -46,39 +46,21 @@ update_icon() return + if(isgrabitem(I) && grab_interact(I, user)) + user.changeNext_move(GRAB_SLAM_DELAY) + return TRUE + if(grill_fuel <= 0) to_chat(user, span_warning("No fuel!")) return ..() - if(isgrabitem(I)) - var/obj/item/grab/grab_item = I - if(!isliving(grab_item.grabbed_thing)) - return - var/mob/living/living_victim = grab_item.grabbed_thing - if(user.grab_state < GRAB_AGGRESSIVE) - to_chat(user, span_warning("You need a better grip to do that!")) - return - if(user.do_actions) - return - - user.visible_message(span_danger("[user] starts to press [living_victim] onto the [src]!")) - - if(!do_after(user, 0.5 SECONDS, NONE, living_victim, BUSY_ICON_DANGER) || QDELETED(src)) - return - - user.visible_message(span_danger("[user] slams [living_victim] onto the [src]!")) - living_victim.apply_damage(40, BURN, BODY_ZONE_HEAD, FIRE, updating_health = TRUE) - playsound(src, "sound/machines/grill/frying.ogg", 100, null, 9) - living_victim.emote("scream") - return - if(I.resistance_flags & INDESTRUCTIBLE) to_chat(user, span_warning("You don't feel it would be wise to grill [I]...")) return ..() //else if(IS_EDIBLE(I)) else if(istype(I, /obj/item/reagent_containers/food)) - if(HAS_TRAIT(I, TRAIT_NODROP) || (I.flags_item & (ITEM_ABSTRACT|DELONDROP))) + if(HAS_TRAIT(I, TRAIT_NODROP) || (I.item_flags & (ITEM_ABSTRACT|DELONDROP))) return ..() else if(HAS_TRAIT(I, TRAIT_FOOD_GRILLED)) to_chat(user, span_notice("[I] has already been grilled!")) @@ -98,6 +80,35 @@ return ..() +/obj/machinery/grill/grab_interact(obj/item/grab/grab, mob/user, base_damage = BASE_OBJ_SLAM_DAMAGE, is_sharp = FALSE) + if(grill_fuel <= 0) + return ..() + + if(!isliving(grab.grabbed_thing)) + return + + var/mob/living/grabbed_mob = grab.grabbed_thing + if(user.a_intent != INTENT_HARM) + return + + if(user.grab_state <= GRAB_AGGRESSIVE) + to_chat(user, span_warning("You need a better grip to do that!")) + return + + if(user.do_actions) + return + + user.visible_message(span_danger("[user] starts to press [grabbed_mob] onto the [src]!")) + + if(!do_after(user, 0.5 SECONDS, NONE, grabbed_mob, BUSY_ICON_DANGER) || QDELETED(src)) + return + + user.visible_message(span_danger("[user] slams [grabbed_mob] onto the [src]!")) + grabbed_mob.apply_damage(40, BURN, BODY_ZONE_HEAD, FIRE, updating_health = TRUE) + playsound(src, "sound/machines/grill/frying.ogg", 100, null, 9) + grabbed_mob.emote("scream") + return TRUE + /obj/machinery/grill/process(delta_time) ..() update_icon() @@ -141,7 +152,7 @@ /obj/machinery/grill/deconstruct(disassembled = TRUE) finish_grill() - if(!(flags_atom & NODECONSTRUCT)) + if(!(atom_flags & NODECONSTRUCT)) new /obj/item/stack/sheet/metal(loc, 5) new /obj/item/stack/rods(loc, 5) ..() diff --git a/code/modules/hydroponics/grown_inedible.dm b/code/modules/hydroponics/grown_inedible.dm index 6dfb26a90d20d..5cebedbc7f907 100644 --- a/code/modules/hydroponics/grown_inedible.dm +++ b/code/modules/hydroponics/grown_inedible.dm @@ -40,7 +40,7 @@ icon = 'icons/obj/items/harvest.dmi' icon_state = "logs" force = 5 - flags_atom = NONE + atom_flags = NONE throwforce = 5 w_class = WEIGHT_CLASS_NORMAL throw_speed = 3 @@ -50,6 +50,8 @@ /obj/item/grown/log/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(I.sharp != IS_SHARP_ITEM_BIG) return @@ -68,7 +70,7 @@ icon_state = "sunflower" damtype = BURN force = 0 - flags_atom = NONE + atom_flags = NONE throwforce = 1 w_class = WEIGHT_CLASS_TINY throw_speed = 1 @@ -86,7 +88,7 @@ icon_state = "nettle" damtype = BURN force = 15 - flags_atom = NONE + atom_flags = NONE throwforce = 1 w_class = WEIGHT_CLASS_SMALL throw_speed = 1 @@ -173,6 +175,8 @@ /obj/item/corncob/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(I.sharp == IS_SHARP_ITEM_ACCURATE) to_chat(user, span_notice("You use [I] to fashion a pipe out of the corn cob!")) diff --git a/code/modules/hydroponics/hydro_tray.dm b/code/modules/hydroponics/hydro_tray.dm index 8f50c4d7dd787..b6f736c300f1d 100644 --- a/code/modules/hydroponics/hydro_tray.dm +++ b/code/modules/hydroponics/hydro_tray.dm @@ -366,19 +366,22 @@ //Refreshes the icon and sets the luminosity /obj/machinery/hydroponics/update_icon() + update_bioluminescence() + return ..() - overlays.Cut() +/obj/machinery/hydroponics/update_overlays() + . = ..() // Updates the plant overlay. if(!isnull(seed)) if(draw_warnings && health <= (seed.endurance / 2)) - overlays += "over_lowhealth3" + . += "over_lowhealth3" if(dead) - overlays += "[seed.plant_icon]-dead" + . += "[seed.plant_icon]-dead" else if(harvest) - overlays += "[seed.plant_icon]-harvest" + . += "[seed.plant_icon]-harvest" else if(age < seed.maturation) var/t_growthstate @@ -387,26 +390,27 @@ else t_growthstate = round(seed.maturation / seed.growth_stages) - overlays += "[seed.plant_icon]-grow[t_growthstate]" + . += "[seed.plant_icon]-grow[t_growthstate]" lastproduce = age else - overlays += "[seed.plant_icon]-grow[seed.growth_stages]" + . += "[seed.plant_icon]-grow[seed.growth_stages]" //Draw the cover. if(closed_system) - overlays += "hydrocover" + . += "hydrocover" //Updated the various alert icons. if(draw_warnings) if(waterlevel <= 10) - overlays += "over_lowwater3" + . += "over_lowwater3" if(nutrilevel <= 2) - overlays += "over_lownutri3" + . += "over_lownutri3" if(weedlevel >= 5 || pestlevel >= 5 || toxins >= 40) - overlays += "over_alert3" + . += "over_alert3" if(harvest) - overlays += "over_harvest3" + . += "over_harvest3" +/obj/machinery/hydroponics/proc/update_bioluminescence() // Update bioluminescence. if(seed) if(seed.biolum) @@ -418,7 +422,6 @@ set_light(0) - // If a weed growth is sufficient, this proc is called. /obj/machinery/hydroponics/proc/weed_invasion() @@ -494,6 +497,8 @@ /obj/machinery/hydroponics/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(I.is_open_container()) return @@ -660,6 +665,8 @@ /obj/machinery/hydroponics/soil/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/tool/shovel)) to_chat(user, "You clear up [src]!") diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm index d7414880596dd..4ab1301d3e156 100644 --- a/code/modules/hydroponics/seed_datums.dm +++ b/code/modules/hydroponics/seed_datums.dm @@ -21,10 +21,10 @@ GLOBAL_LIST_EMPTY(gene_tag_masks) // Gene obfuscation for delicious trial and while(length(gene_tags)) var/gene_tag = pick(gene_tags) - var/gene_mask = "[num2hex(rand(0,255))]" + var/gene_mask = "[num2hex(rand(0,255), 2)]" while(gene_mask in used_masks) - gene_mask = "[num2hex(rand(0,255))]" + gene_mask = "[num2hex(rand(0,255), 2)]" used_masks += gene_mask gene_tags -= gene_tag diff --git a/code/modules/hydroponics/seed_machines.dm b/code/modules/hydroponics/seed_machines.dm index 5e7dd016e4aa4..abe1e1400fd15 100644 --- a/code/modules/hydroponics/seed_machines.dm +++ b/code/modules/hydroponics/seed_machines.dm @@ -75,6 +75,8 @@ /obj/machinery/botany/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/seeds)) if(seed) diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index b376eb7c549bd..b56a3d077f1bb 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -3,7 +3,7 @@ name = "packet of seeds" icon = 'icons/obj/items/seeds.dmi' icon_state = "seed" - flags_atom = NONE + atom_flags = NONE w_class = WEIGHT_CLASS_TINY var/seed_type @@ -20,12 +20,17 @@ seed = GLOB.seed_types[seed_type] update_appearance() -//Updates strings and icon appropriately based on seed datum. -/obj/item/seeds/proc/update_appearance() +/obj/item/seeds/update_appearance() + . = ..() icon_state = seed.packet_icon + +/obj/item/seeds/update_name(updates) + . = ..() name = "packet of [seed.seed_name] [seed.seed_noun]" - desc = "It has a picture of [seed.display_name] on the front." +/obj/item/seeds/update_desc(updates) + . = ..() + desc = "It has a picture of [seed.display_name] on the front." /obj/item/seeds/poppyseed name = "poppy seed" diff --git a/code/modules/hydroponics/vines.dm b/code/modules/hydroponics/vines.dm index 9c0ca80b6ccf9..ebc6f9b6d531c 100644 --- a/code/modules/hydroponics/vines.dm +++ b/code/modules/hydroponics/vines.dm @@ -31,7 +31,8 @@ /obj/effect/plantsegment/attackby(obj/item/I, mob/user, params) . = ..() - + if(.) + return if(iswelder(I)) var/obj/item/tool/weldingtool/WT = I if(!WT.remove_fuel(0, user)) diff --git a/code/modules/instruments/items.dm b/code/modules/instruments/items.dm index 5b3ba0b888023..6eb2aff8518d4 100644 --- a/code/modules/instruments/items.dm +++ b/code/modules/instruments/items.dm @@ -151,7 +151,7 @@ icon_state = "harmonica" item_state = "harmonica" allowed_instrument_ids = list("crharmony", "harmonica") - flags_equip_slot = ITEM_SLOT_MASK + equip_slot_flags = ITEM_SLOT_MASK force = 5 w_class = WEIGHT_CLASS_SMALL actions_types = list(/datum/action/item_action/instrument) diff --git a/code/modules/keybindings/bindings_atom.dm b/code/modules/keybindings/bindings_atom.dm index aac9cf5835025..c0ad4d84b96cb 100644 --- a/code/modules/keybindings/bindings_atom.dm +++ b/code/modules/keybindings/bindings_atom.dm @@ -1,18 +1,18 @@ // You might be wondering why this isn't client level. If focus is null, we don't want you to move. // Only way to do that is to tie the behavior into the focus's keyLoop(). /atom/movable/keyLoop(client/user) - if(user.keys_held["Ctrl"]) + if(user?.keys_held["Ctrl"]) return var/movement_dir = NONE for(var/_key in user.keys_held) movement_dir = movement_dir | user.movement_keys[_key] - if(user.next_move_dir_add) + if(user?.next_move_dir_add) movement_dir |= user.next_move_dir_add - if(user.next_move_dir_sub) + if(user?.next_move_dir_sub) movement_dir &= ~user.next_move_dir_sub // Sanity checks in case you hold left and right and up to make sure you only go up if((movement_dir & NORTH) && (movement_dir & SOUTH)) movement_dir &= ~(NORTH|SOUTH) if((movement_dir & EAST) && (movement_dir & WEST)) movement_dir &= ~(EAST|WEST) - user.Move(get_step(src, movement_dir), movement_dir) + user?.Move(get_step(src, movement_dir), movement_dir) diff --git a/code/modules/language/sectoid.dm b/code/modules/language/sectoid.dm index 06c6cdc484310..455d953a76f21 100644 --- a/code/modules/language/sectoid.dm +++ b/code/modules/language/sectoid.dm @@ -9,5 +9,11 @@ key = "p" sentence_chance = 0 default_priority = 80 - syllables = list("wreh", "breh", "ayy", "gji", "pks", "jok",) + syllables = list("wreh", + "breh", + "ayy", + "gji", + "pks", + "jok", + ) icon_state = "aphasia" diff --git a/code/modules/lighting/lighting_turf.dm b/code/modules/lighting/lighting_turf.dm index 71107ca43df13..801b3e4da0a33 100644 --- a/code/modules/lighting/lighting_turf.dm +++ b/code/modules/lighting/lighting_turf.dm @@ -85,7 +85,7 @@ return directional_opacity = NONE for(var/atom/movable/opacity_source AS in opacity_sources) - if(opacity_source.flags_atom & ON_BORDER) + if(opacity_source.atom_flags & ON_BORDER) directional_opacity |= opacity_source.dir else //If fulltile and opaque, then the whole tile blocks view, no need to continue checking. directional_opacity = ALL_CARDINALS diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm old mode 100644 new mode 100755 index ff602912d3036..8ba9dd799f0ac --- a/code/modules/mapping/mapping_helpers.dm +++ b/code/modules/mapping/mapping_helpers.dm @@ -101,25 +101,6 @@ /obj/effect/mapping_helpers/airlock layer = DOOR_HELPER_LAYER -/obj/effect/mapping_helpers/airlock/cyclelink_helper - name = "airlock cyclelink helper" - icon_state = "airlock_cyclelink_helper" - -/obj/effect/mapping_helpers/airlock/cyclelink_helper/Initialize(mapload) - . = ..() - if(!mapload) - log_world("### MAP WARNING, [src] spawned outside of mapload!") - return - //var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in loc - //if(airlock) - // if(airlock.cyclelinkeddir) - // log_world("### MAP WARNING, [src] at [AREACOORD(src)] tried to set [airlock] cyclelinkeddir, but it's already set!") - // else - // airlock.cyclelinkeddir = dir - //else - //log_world("### MAP WARNING, [src] failed to find an airlock at [AREACOORD(src)]") - - /obj/effect/mapping_helpers/airlock/locked name = "airlock lock helper" icon_state = "airlock_locked_helper" @@ -131,13 +112,12 @@ return var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in loc if(!airlock) - stack_trace("### MAP WARNING, [src] failed to find an airlock at [AREACOORD(src)]") - return + CRASH("### MAP WARNING, [src] failed to find an airlock at [AREACOORD(src)]") if(airlock.locked) stack_trace("### MAP WARNING, [src] at [AREACOORD(src)] tried to bolt [airlock] but it's already locked!") airlock.locked = TRUE var/turf/current_turf = get_turf(airlock) - current_turf.flags_atom |= AI_BLOCKED + current_turf.atom_flags |= AI_BLOCKED /obj/effect/mapping_helpers/airlock/abandoned name = "airlock abandoned helper" @@ -150,13 +130,12 @@ return var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in loc if(!airlock) - stack_trace("### MAP WARNING, [src] failed to find an airlock at [AREACOORD(src)]") - return + CRASH("### MAP WARNING, [src] failed to find an airlock at [AREACOORD(src)]") if(airlock.abandoned) stack_trace("### MAP WARNING, [src] at [AREACOORD(src)] tried to make [airlock] abandoned but it's already abandoned!") airlock.abandoned = TRUE var/turf/current_turf = get_turf(airlock) - current_turf.flags_atom |= AI_BLOCKED + current_turf.atom_flags |= AI_BLOCKED /obj/effect/mapping_helpers/airlock/welded name = "airlock welded helper" @@ -169,13 +148,12 @@ return var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in loc if(!airlock) - stack_trace("### MAP WARNING, [src] failed to find an airlock at [AREACOORD(src)]") - return + CRASH("### MAP WARNING, [src] failed to find an airlock at [AREACOORD(src)]") if(airlock.welded) stack_trace("### MAP WARNING, [src] at [AREACOORD(src)] tried to bolt [airlock] but it's already welded!") airlock.welded = TRUE var/turf/current_turf = get_turf(airlock) - current_turf.flags_atom |= AI_BLOCKED + current_turf.atom_flags |= AI_BLOCKED /obj/effect/mapping_helpers/broken_apc name = "broken apc helper" @@ -192,12 +170,26 @@ return var/obj/machinery/power/apc/apc = locate(/obj/machinery/power/apc) in loc if(!apc) - stack_trace("### MAP WARNING, [src] failed to find an apc at [AREACOORD(src)]") - return + CRASH("### MAP WARNING, [src] failed to find an apc at [AREACOORD(src)]") if(apc.machine_stat && (BROKEN)) //there's a small chance of APCs being broken on round start, just return if it's already happened return apc.do_break() +/obj/effect/mapping_helpers/apc_unlocked + name = "apc unlocked interface helper" + icon_state = "apc_unlocked_interface_helper" + +/obj/effect/mapping_helpers/apc_unlocked/Initialize(mapload) + . = ..() + var/obj/machinery/power/apc/apc = locate(/obj/machinery/power/apc) in loc + if(!apc) + CRASH("### MAP WARNING, [src] failed to find an apc at [AREACOORD(src)]") + if(!apc.coverlocked || !apc.locked) + var/area/apc_area = get_area(apc) + log_mapping("[src] at [AREACOORD(src)] [(apc_area.type)] tried to unlock the [apc] but it's already unlocked!") + apc.coverlocked = FALSE + apc.locked = FALSE + /obj/effect/mapping_helpers/broken_apc/lowchance breakchance = 25 @@ -208,6 +200,20 @@ name = "airlock autoname helper" icon_state = "airlock_autoname_helper" +/obj/effect/mapping_helpers/airlock/hackProof + name = "airlock block ai control helper" + icon_state = "hackproof" + +/obj/effect/mapping_helpers/airlock/hackProof/Initialize(mapload) + . = ..() + var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in loc + if(!airlock) + CRASH("### MAP WARNING, [src] failed to find an airlock at [AREACOORD(src)]") + if(airlock.aiControlDisabled) + log_mapping("[src] at [AREACOORD(src)] tried to make [airlock] hackproof but it's already hackproof!") + else + airlock.hackProof = TRUE + /obj/effect/mapping_helpers/airlock_autoname/Initialize(mapload) . = ..() if(!mapload) @@ -215,8 +221,7 @@ return var/obj/machinery/door/door = locate(/obj/machinery/door) in loc if(!door) - stack_trace("### MAP WARNING, [src] failed to find a nameable door at [AREACOORD(src)]") - return + CRASH("### MAP WARNING, [src] failed to find a nameable door at [AREACOORD(src)]") door.name = get_area_name(door) /obj/effect/mapping_helpers/airlock/unres @@ -238,7 +243,7 @@ /obj/effect/mapping_helpers/area_flag_injector/Initialize(mapload) . = ..() var/area/area = get_area(src) - area.flags_area |= flag_type + area.area_flags |= flag_type /obj/effect/mapping_helpers/area_flag_injector/marine_base flag_type = MARINE_BASE @@ -340,6 +345,165 @@ qdel(src) +/obj/effect/mapping_helpers/light + name = "generic placeholder for light map helpers, do not place in game" + layer = DOOR_HELPER_LAYER + +/obj/effect/mapping_helpers/light/broken + name = "light broken map helper" + icon_state = "light_flicker_broken" + +/obj/effect/mapping_helpers/light/broken/Initialize(mapload) + . = ..() + var/obj/machinery/light/light = locate(/obj/machinery/light) in loc + if(!light) + CRASH("### MAP WARNING, [src] failed to find an light at [AREACOORD(src)]") + if(light.status == LIGHT_BROKEN || light.status == LIGHT_EMPTY) + log_mapping("[src] at [AREACOORD(src)] tried to make [light] broken, but it couldn't be done!") + else + light.broken() + +/obj/effect/mapping_helpers/light/turnedoff + name = "light area turnoff helper" + icon_state = "light_flicker_area_off" + +/obj/effect/mapping_helpers/light/turnedoff/Initialize(mapload) + . = ..() + var/area/area = get_area(src) + + area.lightswitch = area.lightswitch ? FALSE : TRUE + area.update_icon() + +/obj/effect/mapping_helpers/light/flickering + name = "light flickering helper" + icon_state = "light_flicker" + +/obj/effect/mapping_helpers/light/flickering/Initialize(mapload) + . = ..() + var/obj/machinery/light/light = locate(/obj/machinery/light) in loc + if(!light) + CRASH("### MAP WARNING, [src] failed to find an light at [AREACOORD(src)]") + if(light.flickering || light.status != LIGHT_OK) + log_mapping("[src] at [AREACOORD(src)] tried to make [light] flicker, but it couldn't be done!") + else + light.lightambient = new(null, FALSE) + light.flicker(TRUE) + +///enable random flickering on lights, to make this effect happen the light has be flickering in the first place +/obj/effect/mapping_helpers/light/flickering/enable_random_flickering + name = "light enable random flicker timing helper" + icon_state = "light_flicker_random" + +/obj/effect/mapping_helpers/light/flickering/enable_random_flickering/Initialize(mapload) + . = ..() + var/obj/machinery/light/light = locate(/obj/machinery/light) in loc + if(!light) + CRASH("### MAP WARNING, [src] failed to find an light at [AREACOORD(src)]") + if(light.random_flicker || light.status != LIGHT_OK) + log_mapping("[src] at [AREACOORD(src)] tried to make [light] randomly flicker, but it couldn't be done!") + else + light.random_flicker = TRUE + +/obj/effect/mapping_helpers/light/flickering/flicker_random_settings + name = "light random flicker settings helper" + icon_state = "light_flicker_random_settings" + var/flicker_time_upper_max = 10 SECONDS + var/flicker_time_lower_min = 0.2 SECONDS + +/obj/effect/mapping_helpers/light/flickering/flicker_random_settings/Initialize(mapload) + . = ..() + var/obj/machinery/light/light = locate(/obj/machinery/light) in loc + if(!light) + CRASH("### MAP WARNING, [src] failed to find an light at [AREACOORD(src)]") + if(flicker_time_lower_min > flicker_time_upper_max) + CRASH("Invalid random flicker setting for light at [AREACOORD(src)]") + light.flicker_time_upper_max = flicker_time_upper_max + light.flicker_time_lower_min = flicker_time_lower_min + +/obj/effect/mapping_helpers/light/flickering/flicker_random_settings/lowset + flicker_time_upper_max = 3 SECONDS + flicker_time_lower_min = 0.4 SECONDS + +/obj/effect/mapping_helpers/light/flickering/flicker_random_settings/highset + flicker_time_upper_max = 6 SECONDS + flicker_time_lower_min = 3 SECONDS + +/obj/effect/mapping_helpers/light/power + name = "light power helper" + icon_state = "light_flicker_power" + var/lighting_power = 1 + +/obj/effect/mapping_helpers/light/power/Initialize(mapload) + . = ..() + var/obj/machinery/light/light = locate(/obj/machinery/light) in loc + if(!light) + CRASH("### MAP WARNING, [src] failed to find an light at [AREACOORD(src)]") + light.bulb_power = lighting_power + light.update() + +/obj/effect/mapping_helpers/light/power/dim + lighting_power = 0.5 + +/obj/effect/mapping_helpers/light/power/bright + lighting_power = 2.0 + +/obj/effect/mapping_helpers/light/color + name = "light color mapping helper" + icon_state = "light_flicker_color" + var/lighting_color = LIGHT_COLOR_WHITE + +/obj/effect/mapping_helpers/light/color/Initialize(mapload) + . = ..() + var/obj/machinery/light/light = locate(/obj/machinery/light) in loc + if(!light) + CRASH("### MAP WARNING, [src] failed to find an light at [AREACOORD(src)]") + light.light_color = lighting_color + light.update() + +/obj/effect/mapping_helpers/light/color/red + light_color = LIGHT_COLOR_RED + +/obj/effect/mapping_helpers/light/color/blue + light_color = LIGHT_COLOR_ORANGE + +/obj/effect/mapping_helpers/light/bulb_colour + name = "light bulb color helper" + icon_state = "light_flicker_color_bulb" + var/bulb_colour = LIGHT_COLOR_WHITE + +/obj/effect/mapping_helpers/light/bulb_colour/Initialize(mapload) + . = ..() + var/obj/machinery/light/light = locate(/obj/machinery/light) in loc + if(!light) + CRASH("### MAP WARNING, [src] failed to find an light at [AREACOORD(src)]") + light.bulb_colour = bulb_colour + light.update() + +/obj/effect/mapping_helpers/light/bulb_colour/red + bulb_colour = LIGHT_COLOR_RED + +/obj/effect/mapping_helpers/light/bulb_colour/blue + bulb_colour = LIGHT_COLOR_BLUE + +/obj/effect/mapping_helpers/light/brightness + name = "light brightness mapping helper" + icon_state = "light_flicker_brightness" + var/brightness_intensity = 4 + +/obj/effect/mapping_helpers/light/brightness/Initialize(mapload) + . = ..() + var/obj/machinery/light/light = locate(/obj/machinery/light) in loc + if(!light) + CRASH("### MAP WARNING, [src] failed to find an light at [AREACOORD(src)]") + light.brightness = brightness_intensity + light.update() + +/obj/effect/mapping_helpers/light/brightness/dim + brightness_intensity = 3 + +/obj/effect/mapping_helpers/light/brightness/bright + brightness_intensity = 6 + /// spawn the pipe /obj/effect/mapping_helpers/simple_pipes/proc/spawn_pipe(direction, type) var/obj/machinery/atmospherics/pipe/pipe = new type(get_turf(src), TRUE, text2dir(direction)) @@ -348,12 +512,120 @@ pipe.update_layer() pipe.paint(pipe_color) -// var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in loc -// if(airlock) -// airlock.unres_sides ^= dir -// else -// log_world("### MAP WARNING, [src] failed to find an airlock at [AREACOORD(src)]") +/obj/effect/mapping_helpers/airlock/unres + name = "airlock unrestricted side helper" + icon_state = "airlock_unres_helper" + +/obj/effect/mapping_helpers/airlock/unres/Initialize(mapload) + . = ..() + var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in loc + if(!airlock) + CRASH("### MAP WARNING, [src] failed to find an airlock at [AREACOORD(src)]") + airlock.unres_sides ^= dir +/obj/effect/mapping_helpers/airlock/cyclelink_helper + name = "airlock cyclelink helper" + icon_state = "airlock_cyclelink_helper" + +/obj/effect/mapping_helpers/airlock/cyclelink_helper/Initialize(mapload) + . = ..() + var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in loc + if(!airlock) + log_world("### MAP WARNING, [src] failed to find an airlock at [AREACOORD(src)]") + if(airlock.cyclelinkeddir) + log_world("### MAP WARNING, [src] at [AREACOORD(src)] tried to set [airlock] cyclelinkeddir, but it's already set!") + else + airlock.cyclelinkeddir = dir + +/obj/effect/mapping_helpers/barricade + name = "base barricade helper" + +/obj/effect/mapping_helpers/barricade/wired + name = "wired barricade helper" + icon_state = "barricade_wired" + +/obj/effect/mapping_helpers/barricade/wired/Initialize(mapload) + . = ..() + if(!mapload) + log_world("### MAP WARNING, [src] spawned outside of mapload!") + return + var/obj/structure/barricade/foundbarricade = locate(/obj/structure/barricade) in loc + if(!foundbarricade) + CRASH("### MAP WARNING, [src] failed to find a barricade at [AREACOORD(src)]") + if(foundbarricade.is_wired || !foundbarricade.can_wire) + stack_trace("### MAP WARNING, [src] at [AREACOORD(src)] tried to make [foundbarricade] wired but it's already wired!") + foundbarricade.wire() + +/obj/effect/mapping_helpers/barricade/bomb + name = "bomb armor barricade helper" + icon_state = "barricade_bomb" + +/obj/effect/mapping_helpers/barricade/bomb/Initialize(mapload) + . = ..() + if(!mapload) + log_world("### MAP WARNING, [src] spawned outside of mapload!") + return + var/obj/structure/barricade/metal/foundbarricade = locate(/obj/structure/barricade/metal) in loc + if(!foundbarricade) + CRASH("### MAP WARNING, [src] failed to find a barricade at [AREACOORD(src)]") + if(foundbarricade.barricade_upgrade_type) + stack_trace("### MAP WARNING, [src] at [AREACOORD(src)] tried to upgrade [foundbarricade] but it already has armor!") + foundbarricade.soft_armor = soft_armor.modifyRating(bomb = 50) + foundbarricade.barricade_upgrade_type = CADE_TYPE_BOMB + foundbarricade.update_icon() + +/obj/effect/mapping_helpers/barricade/acid + name = "acid armor barricade helper" + icon_state = "barricade_acid" + +/obj/effect/mapping_helpers/barricade/acid/Initialize(mapload) + . = ..() + if(!mapload) + log_world("### MAP WARNING, [src] spawned outside of mapload!") + return + var/obj/structure/barricade/metal/foundbarricade = locate(/obj/structure/barricade/metal) in loc + if(!foundbarricade) + CRASH("### MAP WARNING, [src] failed to find a barricade at [AREACOORD(src)]") + if(foundbarricade.barricade_upgrade_type) + stack_trace("### MAP WARNING, [src] at [AREACOORD(src)] tried to upgrade [foundbarricade] but it already has armor!") + foundbarricade.barricade_upgrade_type = CADE_TYPE_ACID + foundbarricade.soft_armor = soft_armor.modifyRating(acid = 20) + foundbarricade.resistance_flags |= UNACIDABLE + foundbarricade.update_icon() + +/obj/effect/mapping_helpers/barricade/melee + name = "melee armor barricade helper" + icon_state = "barricade_melee" + +/obj/effect/mapping_helpers/barricade/melee/Initialize(mapload) + . = ..() + if(!mapload) + log_world("### MAP WARNING, [src] spawned outside of mapload!") + return + var/obj/structure/barricade/metal/foundbarricade = locate(/obj/structure/barricade/metal) in loc + if(!foundbarricade) + CRASH("### MAP WARNING, [src] failed to find a barricade at [AREACOORD(src)]") + if(foundbarricade.barricade_upgrade_type) + stack_trace("### MAP WARNING, [src] at [AREACOORD(src)] tried to upgrade [foundbarricade] but it already has armor!") + foundbarricade.barricade_upgrade_type = CADE_TYPE_MELEE + foundbarricade.soft_armor = soft_armor.modifyRating(melee = 30, bullet = 30, laser = 30, energy = 30) + foundbarricade.update_icon() + +/obj/effect/mapping_helpers/barricade/closed + name = "closed plasteel barricade helper" + icon_state = "barricade_closed" + +/obj/effect/mapping_helpers/barricade/closed/Initialize(mapload) + . = ..() + if(!mapload) + log_world("### MAP WARNING, [src] spawned outside of mapload!") + return + var/obj/structure/barricade/plasteel/foundbarricade = locate(/obj/structure/barricade/plasteel) in loc + if(!foundbarricade) + CRASH("### MAP WARNING, [src] failed to find a plasteel barricade at [AREACOORD(src)]") + if(!foundbarricade.closed) + stack_trace("### MAP WARNING, [src] at [AREACOORD(src)] tried to open [foundbarricade] but it's already open!") + foundbarricade.toggle_open() //needs to do its thing before spawn_rivers() is called /* diff --git a/code/modules/mapping/modular_mapping.dm b/code/modules/mapping/modular_mapping.dm index 643ff278a2409..cfad8de30cd14 100644 --- a/code/modules/mapping/modular_mapping.dm +++ b/code/modules/mapping/modular_mapping.dm @@ -471,13 +471,6 @@ template_width = 28 template_height = 23 -/datum/map_template/modular/bigred/officefour - name = "Big red office" - mappath = "_maps/modularmaps/big_red/bigredofficevar4.dmm" - modular_id = "broffice" - template_width = 28 - template_height = 23 - /datum/map_template/modular/bigred/atmosone name = "Big red atmos" mappath = "_maps/modularmaps/big_red/bigredatmosvar1.dmm" @@ -1208,3 +1201,122 @@ modular_id = "EORG" template_width = 46 template_height = 46 + +/datum/map_template/modular/jungle_outpost/westtowerone + name = "Western Dome" + mappath = "_maps/modularmaps/jungle_outpost/joutpostwtower1.dmm" + modular_id = "jowesttower" + template_width = 12 + template_height = 14 + +/datum/map_template/modular/jungle_outpost/westtowertwo + name = "Western Bar Dome" + mappath = "_maps/modularmaps/jungle_outpost/joutpostwtower2.dmm" + modular_id = "jowesttower" + template_width = 12 + template_height = 14 + +/datum/map_template/modular/jungle_outpost/westtowerthree + name = "Western Bungalow" + mappath = "_maps/modularmaps/jungle_outpost/joutpostwtower3.dmm" + modular_id = "jowesttower" + template_width = 12 + template_height = 14 + +/datum/map_template/modular/jungle_outpost/westtowerfour + name = "Western Pond" + mappath = "_maps/modularmaps/jungle_outpost/joutpostwtower4.dmm" + modular_id = "jowesttower" + template_width = 12 + template_height = 14 + +/datum/map_template/modular/jungle_outpost/southcratesone + name = "South Crates" + mappath = "_maps/modularmaps/jungle_outpost/joutpostscrates1.dmm" + modular_id = "josouthcrates" + template_width = 12 + template_height = 14 + +/datum/map_template/modular/jungle_outpost/southcratestwo + name = "South Office" + mappath = "_maps/modularmaps/jungle_outpost/joutpostscrates2.dmm" + modular_id = "josouthcrates" + template_width = 12 + template_height = 14 + +/datum/map_template/modular/jungle_outpost/southcratesthree + name = "South Crates " + mappath = "_maps/modularmaps/jungle_outpost/joutpostscrates3.dmm" + modular_id = "josouthcrates" + template_width = 12 + template_height = 14 + +/datum/map_template/modular/jungle_outpost/southcratesfour + name = "South Garage" + mappath = "_maps/modularmaps/jungle_outpost/joutpostscrates4.dmm" + modular_id = "josouthcrates" + template_width = 12 + template_height = 14 + +/datum/map_template/modular/jungle_outpost/hydroponicsone + name = "Hydroponics" + mappath = "_maps/modularmaps/jungle_outpost/joutposthydro1.dmm" + modular_id = "johydroponics" + template_width = 19 + template_height = 18 + +/datum/map_template/modular/jungle_outpost/hydroponicstwo + name = "Hydroponics" + mappath = "_maps/modularmaps/jungle_outpost/joutposthydro2.dmm" + modular_id = "johydroponics" + template_width = 19 + template_height = 18 + +/datum/map_template/modular/jungle_outpost/hydroponicsthree + name = "Hydroponics Shack" + mappath = "_maps/modularmaps/jungle_outpost/joutposthydro3.dmm" + modular_id = "johydroponics" + template_width = 19 + template_height = 18 + +/datum/map_template/modular/jungle_outpost/medicalone + name = "Medical" + mappath = "_maps/modularmaps/jungle_outpost/joutpostmedbay1.dmm" + modular_id = "jomedbay" + template_width = 16 + template_height = 24 + +/datum/map_template/modular/jungle_outpost/medicaltwo + name = "Medical" + mappath = "_maps/modularmaps/jungle_outpost/joutpostmedbay2.dmm" + modular_id = "jomedbay" + template_width = 16 + template_height = 24 + +/datum/map_template/modular/jungle_outpost/medicalthree + name = "Outdoor Medical" + mappath = "_maps/modularmaps/jungle_outpost/joutpostmedbay3.dmm" + modular_id = "jomedbay" + template_width = 16 + template_height = 24 + +/datum/map_template/modular/jungle_outpost/engineeringone + name = "Engineering" + mappath = "_maps/modularmaps/jungle_outpost/joutpostengi1.dmm" + modular_id = "joengineering" + template_width = 21 + template_height = 21 + +/datum/map_template/modular/jungle_outpost/engineeringtwo + name = "Engineering" + mappath = "_maps/modularmaps/jungle_outpost/joutpostengi2.dmm" + modular_id = "joengineering" + template_width = 21 + template_height = 21 + +/datum/map_template/modular/jungle_outpost/engineeringthree + name = "Outdoor Engineering" + mappath = "_maps/modularmaps/jungle_outpost/joutpostengi3.dmm" + modular_id = "joengineering" + template_width = 21 + template_height = 21 diff --git a/code/modules/mapping/space_management/space_reservation.dm b/code/modules/mapping/space_management/space_reservation.dm index 860fd9e3bc647..adb3039e11799 100644 --- a/code/modules/mapping/space_management/space_reservation.dm +++ b/code/modules/mapping/space_management/space_reservation.dm @@ -34,12 +34,12 @@ for(var/i in avail) CHECK_TICK BL = i - if(!(BL.flags_atom & UNUSED_RESERVATION_TURF_1)) + if(!(BL.atom_flags & UNUSED_RESERVATION_TURF_1)) continue if(BL.x + width > world.maxx || BL.y + height > world.maxy) continue TR = locate(BL.x + width - 1, BL.y + height - 1, BL.z) - if(!(TR.flags_atom & UNUSED_RESERVATION_TURF_1)) + if(!(TR.atom_flags & UNUSED_RESERVATION_TURF_1)) continue final = block(BL, TR) if(!final) @@ -47,7 +47,7 @@ passing = TRUE for(var/I in final) var/turf/checking = I - if(!(checking.flags_atom & UNUSED_RESERVATION_TURF_1)) + if(!(checking.atom_flags & UNUSED_RESERVATION_TURF_1)) passing = FALSE break if(!passing) @@ -60,7 +60,7 @@ for(var/i in final) var/turf/T = i reserved_turfs |= T - T.flags_atom &= ~UNUSED_RESERVATION_TURF_1 + T.atom_flags &= ~UNUSED_RESERVATION_TURF_1 SSmapping.unused_turfs["[T.z]"] -= T SSmapping.used_turfs[T] = src T.ChangeTurf(turf_type, turf_type) diff --git a/code/modules/mining/money_bag.dm b/code/modules/mining/money_bag.dm index 83f626b04f38f..0f8b479392d0f 100644 --- a/code/modules/mining/money_bag.dm +++ b/code/modules/mining/money_bag.dm @@ -54,6 +54,8 @@ /obj/item/moneybag/attackby(obj/item/I, mob/user, params) . = ..() + if(.) + return if(istype(I, /obj/item/coin)) var/obj/item/coin/C = I diff --git a/code/modules/mining/remote_fob/remote_fob_actions_misc.dm b/code/modules/mining/remote_fob/remote_fob_actions_misc.dm index 7fcc74937805a..b7b10e17cd8ad 100644 --- a/code/modules/mining/remote_fob/remote_fob_actions_misc.dm +++ b/code/modules/mining/remote_fob/remote_fob_actions_misc.dm @@ -54,7 +54,7 @@ for(var/obj/thing in buildplace) if(!thing.density) //not dense, move on continue - if(!(thing.flags_atom & ON_BORDER)) //dense and non-directional, end + if(!(thing.atom_flags & ON_BORDER)) //dense and non-directional, end fobdrone.balloon_alert(owner, "No space here for a barricade") return if(thing.dir != fobdrone.dir) @@ -96,7 +96,7 @@ for(var/obj/thing in buildplace) if(!thing.density) //not dense, move on continue - if(!(thing.flags_atom & ON_BORDER)) //dense and non-directional, end + if(!(thing.atom_flags & ON_BORDER)) //dense and non-directional, end fobdrone.balloon_alert(owner, "No space here for a barricade") return if(thing.dir != fobdrone.dir) @@ -139,14 +139,14 @@ for(var/obj/thing in buildplace) if(!thing.density) //not dense, move on continue - if(!(thing.flags_atom & ON_BORDER)) //dense and non-directional, end + if(!(thing.atom_flags & ON_BORDER)) //dense and non-directional, end fobdrone.balloon_alert(owner, "No space here for a barricade") return if(thing.dir != fobdrone.dir) continue fobdrone.balloon_alert(owner, "No space here for a barricade") return - if(!do_after(fobdrone, 1.5 SECONDS, FALSE, buildplace, BUSY_ICON_BUILD)) + if(!do_after(fobdrone, 1.5 SECONDS, IGNORE_HELD_ITEM, buildplace, BUSY_ICON_BUILD)) return console.plasteel_remaining -= 4 cade = new /obj/structure/barricade/metal/plasteel(buildplace) @@ -184,14 +184,14 @@ for(var/obj/thing in buildplace) if(!thing.density) //not dense, move on continue - if(!(thing.flags_atom & ON_BORDER)) //dense and non-directional, end + if(!(thing.atom_flags & ON_BORDER)) //dense and non-directional, end fobdrone.balloon_alert(owner, "No space here for a barricade") return if(thing.dir != fobdrone.dir) continue fobdrone.balloon_alert(owner, "No space here for a barricade") return - if(!do_after(fobdrone, 1.5 SECONDS, FALSE, buildplace, BUSY_ICON_BUILD)) + if(!do_after(fobdrone, 1.5 SECONDS, IGNORE_HELD_ITEM, buildplace, BUSY_ICON_BUILD)) return //console.plasteel_remaining -= 5 //ORIGINAL console.plasteel_remaining -= 6 //RUTGMC EDIT diff --git a/code/modules/mob/dead/observer/login.dm b/code/modules/mob/dead/observer/login.dm index 4c1a14f54b7a4..dd7b0dc9b7e4c 100644 --- a/code/modules/mob/dead/observer/login.dm +++ b/code/modules/mob/dead/observer/login.dm @@ -32,23 +32,36 @@ ghost_others = client.prefs.ghost_others - update_icon(client.prefs.ghost_form) + pick_form(client.prefs.ghost_form) updateghostimages() for(var/path in subtypesof(/datum/action/observer_action)) if(!actions_by_path[path]) - var/datum/action/observer_action/A = new path() + var/datum/action/observer_action/A = new path(src) A.give_action(src) + if(!SSticker.mode) + RegisterSignal(SSdcs, COMSIG_GLOB_GAMEMODE_LOADED, PROC_REF(load_ghost_gamemode_actions)) + else + load_ghost_gamemode_actions() client.AddComponent(/datum/component/larva_queue) if(!actions_by_path[/datum/action/minimap/observer]) - var/datum/action/minimap/observer/mini = new + var/datum/action/minimap/observer/mini = new(src) mini.give_action(src) if(length(GLOB.offered_mob_list)) to_chat(src, span_boldnotice("There's mobs available for taking! Ghost > Take Offered Mob")) //RUTGMC EDIT - if(SSticker.mode && SSticker.mode.flags_round_type & MODE_PREDATOR) + if(SSticker.mode && SSticker.mode.round_type_flags & MODE_PREDATOR) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), src, "This is a PREDATOR ROUND! If you are whitelisted, you may Join the Hunt!"), 2 SECONDS) //RUTGMC EDIT + +///Loads any gamemode specific ghost actions +/mob/dead/observer/proc/load_ghost_gamemode_actions() + SIGNAL_HANDLER + UnregisterSignal(SSdcs, COMSIG_GLOB_GAMEMODE_LOADED) + for(var/path in SSticker.mode.ghost_verbs()) + if(!actions_by_path[path]) + var/datum/action/action = new path(src) + action.give_action(src) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 0b934215a5a56..31f554c2ebbfb 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -96,7 +96,8 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER) name = random_unique_name(gender) real_name = name - animate(src, pixel_y = 2, time = 10, loop = -1) + animate(src, pixel_y = 2, time = 10, loop = -1, flags = ANIMATION_RELATIVE) + animate(pixel_y = -2, time = 10, loop = -1, flags = ANIMATION_RELATIVE) grant_all_languages() @@ -123,7 +124,8 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER) SSmobs.dead_players_by_zlevel[old_z] -= src SSmobs.dead_players_by_zlevel[new_z] += src -/mob/dead/observer/update_icon(new_form) +///Changes our sprite +/mob/dead/observer/proc/pick_form(new_form) if(client) //We update our preferences in case they changed right before update_icon was called. ghost_others = client.prefs.ghost_others @@ -134,7 +136,6 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER) else ghostimage_default.icon_state = new_form - /mob/dead/observer/Topic(href, href_list) . = ..() if(.) @@ -684,7 +685,8 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER) /mob/dead/observer/stop_orbit(datum/component/orbiter/orbits) . = ..() pixel_y = 0 - animate(src, pixel_y = 2, time = 10, loop = -1) + animate(src, pixel_y = 2, time = 10, loop = -1, flags = ANIMATION_RELATIVE) + animate(pixel_y = -2, time = 10, loop = -1, flags = ANIMATION_RELATIVE) /mob/dead/observer/verb/toggle_zoom() @@ -899,7 +901,8 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER) ADD_TRAIT(new_xeno, TRAIT_VALHALLA_XENO, VALHALLA_TRAIT) var/datum/job/xallhala_job = SSjob.GetJobType(/datum/job/fallen/xenomorph) new_xeno.apply_assigned_role_to_spawn(xallhala_job) - SSpoints.xeno_points_by_hive[XENO_HIVE_FALLEN] = 10000 + SSpoints.xeno_strategic_points_by_hive[XENO_HIVE_FALLEN] = 10000 + SSpoints.xeno_tactical_points_by_hive[XENO_HIVE_FALLEN] = 10000 mind.transfer_to(new_xeno, TRUE) xallhala_job.after_spawn(new_xeno) return diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm index ead168be837a6..a09352e1e5f16 100644 --- a/code/modules/mob/emote.dm +++ b/code/modules/mob/emote.dm @@ -54,7 +54,7 @@ key = "me" key_third_person = "custom" message = null - flags_emote = NO_KEYBIND //This shouldn't have a keybind + emote_flags = NO_KEYBIND //This shouldn't have a keybind /datum/emote/custom/run_emote(mob/user, params, type_override, intentional = FALSE, prefix) @@ -65,7 +65,7 @@ /datum/emote/spin key = "spin" key_third_person = "spins" - flags_emote = EMOTE_RESTRAINT_CHECK + emote_flags = EMOTE_RESTRAINT_CHECK mob_type_allowed_typecache = list(/mob/living, /mob/dead/observer) mob_type_ignore_stat_typecache = list(/mob/dead/observer) diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index 726fb57b4e9e3..962c8663eb90c 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -55,12 +55,12 @@ if(!l_hand) W.forceMove(src) l_hand = W - W.equipped(src,SLOT_L_HAND) W.layer = ABOVE_HUD_LAYER W.plane = ABOVE_HUD_PLANE update_inv_l_hand() W.pixel_x = initial(W.pixel_x) W.pixel_y = initial(W.pixel_y) + W.equipped(src,SLOT_L_HAND) return TRUE return FALSE @@ -83,12 +83,12 @@ if(!r_hand) W.forceMove(src) r_hand = W - W.equipped(src,SLOT_R_HAND) W.layer = ABOVE_HUD_LAYER W.plane = ABOVE_HUD_PLANE update_inv_r_hand() W.pixel_x = initial(W.pixel_x) W.pixel_y = initial(W.pixel_y) + W.equipped(src,SLOT_R_HAND) return TRUE return FALSE @@ -173,7 +173,9 @@ return FALSE //nonliving mobs don't have hands /mob/living/put_in_hand_check(obj/item/I, hand_index) - if((I.flags_item & ITEM_ABSTRACT)) + if((I.item_flags & ITEM_ABSTRACT) || !istype(I)) + return FALSE + if(incapacitated() || lying_angle || (status_flags & INCORPOREAL)) return FALSE return TRUE @@ -328,7 +330,7 @@ /mob/living/proc/get_equipped_items(include_pockets = FALSE, include_accessories = FALSE) var/list/items = list() for(var/obj/item/item_contents in contents) - if(item_contents.flags_item & IN_INVENTORY) + if(item_contents.item_flags & IN_INVENTORY) items += item_contents items -= get_active_held_item() items -= get_inactive_held_item() @@ -369,7 +371,7 @@ var/hidden_slots = NONE for(var/obj/item/I in get_equipped_items()) - hidden_slots |= I.flags_inv_hide + hidden_slots |= I.inv_hide_flags if(hidden_slots & HIDEMASK) obscured |= ITEM_SLOT_MASK diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm index 7c70846878885..7666c669814f3 100644 --- a/code/modules/mob/living/blood.dm +++ b/code/modules/mob/living/blood.dm @@ -11,98 +11,69 @@ if(species.species_flags & NO_BLOOD) return - if(stat != DEAD && bodytemperature >= 170) //Dead or cryosleep people do not pump the blood. - if(blood_volume > BLOOD_VOLUME_MAXIMUM) //Warning: contents under pressure. - var/spare_blood = blood_volume - ((BLOOD_VOLUME_MAXIMUM + BLOOD_VOLUME_NORMAL) / 2) //Knock you to the midpoint between max and normal to not spam. - //RUTGMC EDIT CHANGE BEGIN - BLOOD_FIX - //if(drip(spare_blood)) RUTGMC EDIT - ORIGINAL - if(spare_blood) - //RUTGMC EDIT CHANGE END - var/bleed_range = 0 - switch(spare_blood) - if(0 to 30) //20 is the functional minimum due to midpoint calc - to_chat(src, span_notice("Some spare blood leaks out of your nose.")) - if(30 to 100) - to_chat(src, span_notice("Spare blood gushes out of your ears and mouth. Must've had too much.")) - bleed_range = 1 - if(100 to INFINITY) - visible_message(span_notice("Several jets of blood open up across [src]'s body and paint the surroundings red. How'd [p_they()] do that?"), \ - span_notice("Several jets of blood open up across your body and paint your surroundings red. You feel like you aren't under as much pressure any more.")) - bleed_range = 3 - if(bleed_range) - for(var/turf/canvas in RANGE_TURFS(bleed_range, src)) - add_splatter_floor(canvas) - for(var/mob/canvas in viewers(bleed_range, src)) - canvas.add_blood(species.blood_color) //Splash zone - playsound(loc, 'sound/effects/splat.ogg', 25, TRUE, 7) - - //RUTGMC EDIT ADDITION BEGIN - BLOOD_FIX - blood_volume -= spare_blood - //RUTGMC EDIT ADDITION END - + if(stat == DEAD || bodytemperature <= 170) //Dead or cryosleep people do not pump the blood. + return //Effects of bloodloss - switch(blood_volume) - - if(BLOOD_VOLUME_OKAY to BLOOD_VOLUME_SAFE) - if(prob(1)) - var/word = pick("dizzy","woozy","faint") - to_chat(src, span_warning("You feel [word]")) - if(oxyloss < 20) - adjustOxyLoss(3) - if(BLOOD_VOLUME_BAD to BLOOD_VOLUME_OKAY) - if(eye_blurry < 50) - adjust_blurriness(5) - if(oxyloss < 40) - adjustOxyLoss(6) - else - adjustOxyLoss(3) - if(prob(10) && stat == UNCONSCIOUS) - adjustToxLoss(1) - if(prob(15)) - Unconscious(rand(2 SECONDS,6 SECONDS)) - var/word = pick("dizzy","woozy","faint") - to_chat(src, span_warning("You feel extremely [word]")) - if(BLOOD_VOLUME_SURVIVE to BLOOD_VOLUME_BAD) - adjustOxyLoss(5) - adjustToxLoss(2) - if(prob(15)) - var/word = pick("dizzy","woozy","faint") - to_chat(src, span_warning("You feel extremely [word]")) - if(0 to BLOOD_VOLUME_SURVIVE) - death() - - - // Blood regens using food, more food = more blood. - switch(blood_volume) - if(BLOOD_VOLUME_SAFE to BLOOD_VOLUME_NORMAL) //Passively regens blood very slowly from 90% to 100% without a tradeoff. - blood_volume += 0.1 - if(BLOOD_VOLUME_SURVIVE to BLOOD_VOLUME_SAFE) //Regens blood from 60% ish to 90% using nutrition. - switch(nutrition) - if(NUTRITION_OVERFED to INFINITY) - adjust_nutrition(-10) - blood_volume += 1 // regenerate blood quickly. - if(NUTRITION_HUNGRY to NUTRITION_OVERFED) - adjust_nutrition(-5) - blood_volume += 0.5 // regenerate blood slowly. - if(0 to NUTRITION_HUNGRY) - adjust_nutrition(-1) - blood_volume += 0.1 // Regenerate blood VERY slowly. - - //Bleeding out - var/blood_max = 0 - for(var/l in limbs) - var/datum/limb/temp = l - if(!(temp.limb_status & LIMB_BLEEDING) || temp.limb_status & LIMB_ROBOT) - continue - blood_max += temp.brute_dam / 60 - if (temp.surgery_open_stage) - blood_max += 0.6 //Yer stomach is cut open - - if(blood_max) - drip(blood_max) - - - + switch(blood_volume) + if(BLOOD_VOLUME_OKAY to BLOOD_VOLUME_SAFE) + if(prob(1)) + var/word = pick("dizzy","woozy","faint") + to_chat(src, span_warning("You feel [word].")) + if(oxyloss < 20) + adjustOxyLoss(3) + if(BLOOD_VOLUME_BAD to BLOOD_VOLUME_OKAY) + if(eye_blurry < 50) + adjust_blurriness(5) + if(oxyloss < 40) + adjustOxyLoss(6) + else + adjustOxyLoss(3) + if(prob(10) && stat == UNCONSCIOUS) + adjustToxLoss(1) + if(prob(15)) + Unconscious(rand(2 SECONDS,6 SECONDS)) + var/word = pick("dizzy","woozy","faint") + to_chat(src, span_warning("You feel extremely [word]!")) + if(BLOOD_VOLUME_SURVIVE to BLOOD_VOLUME_BAD) + adjustOxyLoss(5) + adjustToxLoss(2) + if(prob(15)) + var/word = pick("dizzy","woozy","faint") + to_chat(src, span_warning("You feel extremely [word]!")) + if(0 to BLOOD_VOLUME_SURVIVE) + death() + + + // Blood regens using food, more food = more blood. + switch(blood_volume) + if(BLOOD_VOLUME_SAFE to BLOOD_VOLUME_NORMAL) //Passively regens blood very slowly from 90% to 100% without a tradeoff. + adjust_blood_volume(0.1) + if(BLOOD_VOLUME_SURVIVE to BLOOD_VOLUME_SAFE) //Regens blood from 60% ish to 90% using nutrition. + switch(nutrition) + if(NUTRITION_OVERFED to INFINITY) + adjust_nutrition(-10) + adjust_blood_volume(1)// regenerate blood quickly. + + if(NUTRITION_HUNGRY to NUTRITION_OVERFED) + adjust_nutrition(-5) + adjust_blood_volume(0.5) // regenerate blood slowly. + + if(0 to NUTRITION_HUNGRY) + adjust_nutrition(-1) + adjust_blood_volume(0.1) // Regenerate blood VERY slowly. + + //Bleeding out + var/blood_max = 0 + for(var/l in limbs) + var/datum/limb/temp = l + if(!(temp.limb_status & LIMB_BLEEDING) || temp.limb_status & LIMB_ROBOT) + continue + blood_max += temp.brute_dam / 60 + if(temp.surgery_open_stage) + blood_max += 0.6 //Yer stomach is cut open + + if(blood_max) + drip(blood_max) //Makes a blood drop, leaking amt units of blood from the mob /mob/living/carbon/proc/drip(amt) @@ -116,7 +87,7 @@ //RUTGMC EDIT if(blood_volume) - blood_volume = max(blood_volume - amt, 0) + adjust_blood_volume(-amt) if(isturf(src.loc)) //Blood loss still happens in locker, floor stays clean if(amt >= 10) add_splatter_floor(loc) @@ -134,10 +105,10 @@ /mob/living/proc/restore_blood() - blood_volume = initial(blood_volume) + set_blood_volume(initial(blood_volume)) /mob/living/carbon/human/restore_blood() - blood_volume = BLOOD_VOLUME_NORMAL + set_blood_volume(BLOOD_VOLUME_NORMAL) @@ -145,40 +116,6 @@ /**************************************************** BLOOD TRANSFERS ****************************************************/ -/* -//Gets blood from mob to a container or other mob, preserving all data in it. -/mob/living/proc/transfer_blood_to(atom/movable/AM, amount, forced) - if(!blood_volume || !AM.reagents) - return 0 - if(blood_volume < BLOOD_VOLUME_BAD && !forced) - return 0 - - if(blood_volume < amount) - amount = blood_volume - - var/blood_id = get_blood_id() - if(!blood_id) - return 0 - - blood_volume -= amount - - var/list/blood_data = get_blood_data() - - if(iscarbon(AM)) - var/mob/living/carbon/C = AM - if(blood_id == C.get_blood_id())//both mobs have the same blood substance - if(blood_id == "blood") //normal blood - if(!(blood_data["blood_type"] in get_safe_blood(C.dna.b_type))) - C.reagents.add_reagent(/datum/reagent/toxin, amount * 0.5) - return 1 - - C.blood_volume = min(C.blood_volume + round(amount, 0.1), BLOOD_VOLUME_MAXIMUM) - return 1 - - AM.reagents.add_reagent(blood_id, amount, blood_data, bodytemperature) - return 1 -*/ - //Transfers blood from container to mob /mob/living/carbon/proc/inject_blood(obj/item/reagent_containers/container, amount) @@ -197,7 +134,7 @@ if(b_id == "blood" && R.data && !(R.data["blood_type"] in get_safe_blood(blood_type))) reagents.add_reagent(/datum/reagent/toxin, amount * 0.5) else - blood_volume += round(amount, 0.1) + adjust_blood_volume(round(amount, 0.1)) else reagents.add_reagent(R.type, amount, R.data) reagents.update_total() @@ -225,7 +162,7 @@ O.reagents.add_reagent(/datum/reagent/blood, amount, data) - blood_volume = max(0, blood_volume - amount) // Removes blood if human + adjust_blood_volume(-amount) return 1 diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm index 3a48746ea92cc..ee03d90895678 100644 --- a/code/modules/mob/living/brain/brain_item.dm +++ b/code/modules/mob/living/brain/brain_item.dm @@ -3,7 +3,7 @@ max_integrity = 400 //They need to live awhile longer than other organs. desc = "A piece of juicy meat found in a person's head." icon_state = "brain2" - flags_atom = NONE + atom_flags = NONE force = 1 w_class = WEIGHT_CLASS_SMALL throwforce = 1 diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index cf3a0970e0a47..1b9cecd9aacc5 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -16,7 +16,7 @@ to_chat(src,"[span_deadsay("
[species.special_death_message]
")]") return ..() -/mob/living/carbon/Moved(oldLoc, dir) +/mob/living/carbon/Moved(atom/old_loc, movement_dir, forced = FALSE, list/old_locs) . = ..() if(nutrition && stat != DEAD) adjust_nutrition(-HUNGER_FACTOR * 0.1 * ((m_intent == MOVE_INTENT_RUN) ? 2 : 1)) @@ -157,11 +157,11 @@ . = ..() throw_mode_off() if(is_ventcrawling) //NOPE - return + return FALSE if(stat || !target) - return + return FALSE if(target.type == /atom/movable/screen) - return + return FALSE var/atom/movable/thrown_thing var/obj/item/I = get_active_held_item() @@ -198,9 +198,11 @@ thrown_thing.throw_at(target, thrown_thing.throw_range + throw_modifiers["range_modifier"], max(1, thrown_thing.throw_speed + throw_modifiers["speed_modifier"]), src, spin_throw, !throw_modifiers["targetted_throw"], throw_modifiers["targetted_throw"]) + return TRUE + ///Called by the carbon throw_item() proc. Returns null if the item negates the throw, or a reference to the thing to suffer the throw else. /obj/item/proc/on_thrown(mob/living/carbon/user, atom/target) - if((flags_item & ITEM_ABSTRACT) || HAS_TRAIT(src, TRAIT_NODROP)) + if((item_flags & ITEM_ABSTRACT) || HAS_TRAIT(src, TRAIT_NODROP)) return user.dropItemToGround(src, TRUE) return src @@ -266,12 +268,33 @@ if(!lying_angle) break - /mob/living/carbon/vv_get_dropdown() . = ..() - . += "---" - . -= "Update Icon" - .["Regenerate Icons"] = "?_src_=vars;[HrefToken()];regenerateicons=[REF(src)]" + VV_DROPDOWN_OPTION("", "---------") + VV_DROPDOWN_OPTION(VV_HK_REGENERATE_ICON, "Regenerate Icons") + +/mob/living/carbon/vv_do_topic(list/href_list) + . = ..() + + if(!.) + return + + if(href_list[VV_HK_REGENERATE_ICON]) + if(!check_rights(NONE)) + return + regenerate_icons() + +/mob/living/carbon/vv_edit_var(var_name, var_value) + switch(var_name) + if(NAMEOF(src, nutrition)) + set_nutrition(var_value) + . = TRUE + + if(!isnull(.)) + datum_flags |= DF_VAR_EDITED + return + + return ..() /mob/living/carbon/update_tracking(mob/living/carbon/C) var/atom/movable/screen/LL_dir = hud_used.SL_locator @@ -317,14 +340,14 @@ sight = initial(sight) lighting_alpha = initial(lighting_alpha) - see_in_dark = species.darksight + see_in_dark = initial(see_in_dark) see_invisible = initial(see_invisible) if(species) if(species.lighting_alpha) - lighting_alpha = initial(species.lighting_alpha) + lighting_alpha = species.lighting_alpha if(species.see_in_dark) - see_in_dark = initial(species.see_in_dark) + see_in_dark = species.see_in_dark if(client.eye != src) var/atom/A = client.eye diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm index afb36e4cdf30d..1c339628b02e2 100644 --- a/code/modules/mob/living/carbon/carbon_defines.dm +++ b/code/modules/mob/living/carbon/carbon_defines.dm @@ -48,6 +48,8 @@ var/list/datum/action/ability/mob_abilities = list() ///Currently selected ability var/datum/action/ability/activable/selected_ability + ///carbon overlay layers + var/list/overlays_standing[TOTAL_LAYERS] /mob/living/carbon/proc/transfer_identity(mob/living/carbon/destination) if(!istype(destination)) diff --git a/code/modules/mob/living/carbon/carbon_helpers.dm b/code/modules/mob/living/carbon/carbon_helpers.dm index b3f86cb7506aa..c6e229fda6958 100644 --- a/code/modules/mob/living/carbon/carbon_helpers.dm +++ b/code/modules/mob/living/carbon/carbon_helpers.dm @@ -33,7 +33,7 @@ else return get_limb(BODY_ZONE_PRECISE_R_HAND) -/mob/Living/carbon/put_in_hand_check(obj/item/I, hand_index) +/mob/living/carbon/put_in_hand_check(obj/item/I, hand_index) if(!index_to_hand(hand_index)) return FALSE return ..() diff --git a/code/modules/mob/living/carbon/carbon_stripping.dm b/code/modules/mob/living/carbon/carbon_stripping.dm index 35e87f5fa33ae..3e42ce3ad9be2 100644 --- a/code/modules/mob/living/carbon/carbon_stripping.dm +++ b/code/modules/mob/living/carbon/carbon_stripping.dm @@ -48,7 +48,7 @@ var/mob/mob_source = source if(!mob_source.can_put_in_hand(equipping, hand_index)) - to_chat(src, "\The [equipping] doesn't fit in that place!") + to_chat(user, "[mob_source] can't hold [equipping] right now!") return FALSE return TRUE @@ -105,6 +105,9 @@ hand_index = 1 /datum/strippable_item/hand/left/get_alternate_action(atom/source, mob/user) + var/obj/item/source_item = get_item(source) + if(!HAS_TRAIT(source_item, TRAIT_STRAPPABLE)) + return null return get_strippable_alternate_action_strap(get_item(source), source) /datum/strippable_item/hand/left/alternate_action(atom/source, mob/user) @@ -115,6 +118,9 @@ hand_index = 2 /datum/strippable_item/hand/right/get_alternate_action(atom/source, mob/user) + var/obj/item/source_item = get_item(source) + if(!HAS_TRAIT(source_item, TRAIT_STRAPPABLE)) + return null return get_strippable_alternate_action_strap(get_item(source), source) /datum/strippable_item/hand/right/alternate_action(atom/source, mob/user) @@ -131,6 +137,10 @@ /datum/strippable_item/proc/strippable_alternate_action_strap(obj/item/item, atom/source, mob/user) if(!HAS_TRAIT(item, TRAIT_STRAPPABLE)) return + + if(length(user.do_actions)) + user.balloon_alert(user, "Busy!") + return var/strapped = HAS_TRAIT_FROM(item, TRAIT_NODROP, STRAPPABLE_ITEM_TRAIT) user.balloon_alert_to_viewers("[strapped ? "Loosening" : "Tightening"] strap...") diff --git a/code/modules/mob/living/carbon/give.dm b/code/modules/mob/living/carbon/give.dm index 684c348a26212..e1bafabdb799c 100644 --- a/code/modules/mob/living/carbon/give.dm +++ b/code/modules/mob/living/carbon/give.dm @@ -31,7 +31,7 @@ item = l_hand else if(!hand) item = r_hand - if(!istype(item) || HAS_TRAIT(src, TRAIT_NODROP) || (item.flags_item & DELONDROP)) + if(!istype(item) || HAS_TRAIT(src, TRAIT_NODROP) || (item.item_flags & DELONDROP)) return if(to_give_to.r_hand && to_give_to.l_hand) to_chat(src, span_warning("[to_give_to]'s hands are full.")) diff --git a/code/modules/mob/living/carbon/human/_species.dm b/code/modules/mob/living/carbon/human/_species.dm new file mode 100644 index 0000000000000..198f192868152 --- /dev/null +++ b/code/modules/mob/living/carbon/human/_species.dm @@ -0,0 +1,576 @@ +/** + * # The base species datum + * + * This datum handles different species in the game, such as synthetics, mothmen, combat robots, skeletons, etc. + * It is used in [mob/living/carbon/human] to determine many things about them, including damage resistance, appearance, special behaviors, and more. +*/ +/datum/species + ///Species name + var/name + ///what kind of species it is considered (See: Species defines) + var/species_type = SPECIES_HUMAN + ///Special effects that are inherent to our species + var/species_flags = NONE + + //----Icon stuff here + ///Normal icon file + var/icobase = 'icons/mob/human_races/r_human.dmi' + ///icon state for calculating brute damage icons + var/brute_damage_icon_state = "human_brute" + ///icon state for calculating brute damage icons + var/burn_damage_icon_state = "human_burn" + ///damage mask icon we want to use when drawing wounds + var/damage_mask_icon = 'icons/mob/dam_mask.dmi' + ///icon for eyes + var/eyes = "eyes_s" + ///Color of the blood specific to our species + var/blood_color = "#A10808" + ///Color of the gibs that spawn from our species [/mob/living/carbon/human/spawn_gibs] + var/flesh_color = "#FFC896" + ///Used when setting species + var/base_color + ///If the species only has one hair color + var/hair_color + ///Used in icon caching + var/race_key = 0 + ///Used in icon caching + var/icon/icon_template + + //----Grouped these because they get set on New() + ///hud that our mob uses, gets given the type stored in hud_type on New() + var/datum/hud_data/hud + ///type that our hud gets set to on New() + var/hud_type + ///For empty hand harm-intent attack + var/datum/unarmed_attack/unarmed + ///type that our unarmed gets set to on New() + var/unarmed_type = /datum/unarmed_attack + ///For empty hand harm-intent attack if the first fails + var/datum/unarmed_attack/secondary_unarmed + ///type that our secondary_unarmed gets set to on New() + var/secondary_unarmed_type = /datum/unarmed_attack/bite + + //----Health/Stamina + Modifiers + ///new maxHealth [/mob/living/carbon/human/var/maxHealth] of the human mob once species is applied + var/total_health = 100 + ///Brute damage modifier + var/brute_mod = null + ///Burn damage modifier + var/burn_mod = null + ///new max_stamina [/mob/living/var/max_stamina] of the human mob once species is applied + var/max_stamina = 50 + + //----Somewhat "gameplay" relevant + ///how much the knocked_down effect is reduced per Life call + var/knock_down_reduction = 1 + ///how much the stunned effect is reduced per Life call + var/stun_reduction = 1 + ///how much the stunned effect is reduced per Life call + var/knock_out_reduction = 1 + ///How much slowdown is innate to our species + var/slowdown = 0 + ///Inventory slots the race can't equip stuff to. Golems cannot wear jumpsuits, for example + var/list/no_equip = list() + + //----Related to dying in some way + ///species-specific gibbing animation + var/gibbed_anim = "gibbed-h" + ///species-specific dusting animation + var/dusted_anim = "dust-h" + ///used to determine what item is left behind in /spawn_dust_remains() + var/remains_type = /obj/effect/decal/cleanable/ash + ///Sound that gets played on death() + var/death_sound + ///Message that gets sent on death() + var/death_message = "seizes up and falls limp, their eyes dead and lifeless..." + ///Special death message that gets overwritten if possible + var/special_death_message = "You have perished." + + //----Temperature/Pressure + ///Cold damage level 1 below this point + var/cold_level_1 = BODYTEMP_COLD_DAMAGE_LIMIT_ONE + ///Cold damage level 2 below this point + var/cold_level_2 = BODYTEMP_COLD_DAMAGE_LIMIT_TWO + ///Cold damage level 3 below this point + var/cold_level_3 = BODYTEMP_COLD_DAMAGE_LIMIT_THREE + ///Heat damage level 1 above this point + var/heat_level_1 = BODYTEMP_HEAT_DAMAGE_LIMIT_ONE + ///Heat damage level 2 above this point + var/heat_level_2 = BODYTEMP_HEAT_DAMAGE_LIMIT_TWO + ///Heat damage level 2 above this point + var/heat_level_3 = BODYTEMP_HEAT_DAMAGE_LIMIT_THREE + ///non-IS_SYNTHETIC species will try to stabilize at this temperature. (also affects temperature processing) + var/body_temperature = BODYTEMP_NORMAL + ///Dangerously high pressure + var/hazard_high_pressure = HAZARD_HIGH_PRESSURE + ///High pressure warning + var/warning_high_pressure = WARNING_HIGH_PRESSURE + ///Low pressure warning + var/warning_low_pressure = WARNING_LOW_PRESSURE + ///Dangerously low pressure + var/hazard_low_pressure = HAZARD_LOW_PRESSURE + + ///used in mob/living/proc/taste + var/taste_sensitivity = TASTE_NORMAL + ///type that gets set as our language_holder on proc/set_species + var/default_language_holder = /datum/language_holder + + ///Sets mob/var/see_in_dark on [/mob/living/carbon/human/update_sight] + var/see_in_dark = 2 + ///Sets our mobs lighting_alpha on [/mob/living/carbon/human/update_sight] + var/lighting_alpha + + ///Used for metabolizing reagents + var/reagent_tag + + ///List of sounds for certain emotes [/datum/emote/living/carbon/human/scream/get_sound] + var/list/screams = list() + ///List of sounds for certain emotes [/datum/emote/living/carbon/human/pain/get_sound] + var/list/paincries = list() + ///List of sounds for certain emotes [/datum/emote/living/carbon/human/gored/get_sound] + var/list/goredcries = list() + ///List of sounds for certain emotes [/datum/emote/living/carbon/human/gasp/get_sound] + var/list/gasps = list() + ///List of sounds for certain emotes [/datum/emote/living/carbon/human/cough/get_sound] + var/list/coughs = list() + ///List of sounds for certain emotes [/datum/emote/living/carbon/human/burstscream/get_sound] + var/list/burstscreams = list() + ///List of sounds for certain emotes [/datum/emote/living/carbon/human/warcry/get_sound] + var/list/warcries = list() + + ///Generic traits tied to having the species + var/list/inherent_traits = list() + ///inherent Species-specific verbs + var/list/inherent_verbs + ///inherent species-specific actions + var/list/inherent_actions + ///Associated list of our organs + var/list/has_organ = list( + "heart" = /datum/internal_organ/heart, + "lungs" = /datum/internal_organ/lungs, + "liver" = /datum/internal_organ/liver, + "kidneys" = /datum/internal_organ/kidneys, + "brain" = /datum/internal_organ/brain, + "appendix" = /datum/internal_organ/appendix, + "eyes" = /datum/internal_organ/eyes + ) + + ///List of names for random generation based on a given pool + var/datum/namepool/namepool = /datum/namepool + ///Whether it is possible to select this species and join as it + var/joinable_roundstart = FALSE + ///If this species counts as a human + var/count_human = FALSE + +/datum/species/New() + if(hud_type) + hud = new hud_type() + else + hud = new() + + if(unarmed_type) + unarmed = new unarmed_type() + if(secondary_unarmed_type) + secondary_unarmed = new secondary_unarmed_type() + if(species_flags & GREYSCALE_BLOOD) + brute_damage_icon_state = "grayscale" + +///Handles creation of mob organs and limbs +/datum/species/proc/create_organs(mob/living/carbon/human/organless_human) + organless_human.limbs = list() + organless_human.internal_organs = list() + organless_human.internal_organs_by_name = list() + + //This is a basic humanoid limb setup + var/datum/limb/chest/new_chest = new(null, organless_human) + organless_human.limbs += new_chest + var/datum/limb/groin/new_groin = new(new_chest, organless_human) + organless_human.limbs += new_groin + organless_human.limbs += new/datum/limb/head(new_chest, organless_human) + var/datum/limb/l_arm/new_l_arm = new(new_chest, organless_human) + organless_human.limbs += new_l_arm + var/datum/limb/r_arm/new_r_arm = new(new_chest, organless_human) + organless_human.limbs += new_r_arm + var/datum/limb/l_leg/new_l_leg = new(new_groin, organless_human) + organless_human.limbs += new_l_leg + var/datum/limb/r_leg/new_r_leg = new(new_groin, organless_human) + organless_human.limbs += new_r_leg + organless_human.limbs += new/datum/limb/hand/l_hand(new_l_arm, organless_human) + organless_human.limbs += new/datum/limb/hand/r_hand(new_r_arm, organless_human) + organless_human.limbs += new/datum/limb/foot/l_foot(new_l_leg, organless_human) + organless_human.limbs += new/datum/limb/foot/r_foot(new_r_leg, organless_human) + + for(var/organ in has_organ) + var/organ_type = has_organ[organ] + organless_human.internal_organs_by_name[organ] = new organ_type(organless_human) + + if(species_flags & ROBOTIC_LIMBS) + for(var/datum/limb/robotic_limb AS in organless_human.limbs) + if(robotic_limb.limb_status & LIMB_DESTROYED) + continue + robotic_limb.add_limb_flags(LIMB_ROBOT) + for(var/datum/internal_organ/my_cold_heart in organless_human.internal_organs) + my_cold_heart.mechanize() + +///Called by [/mob/living/carbon/proc/help_shake_act], the act of hugging someone +/datum/species/proc/hug(mob/living/carbon/human/H, mob/living/target) + if(H.zone_selected == "head") + H.visible_message(span_notice("[H] pats [target] on the head."), \ + span_notice("You pat [target] on the head."), null, 4) + else if(H.zone_selected == "l_hand" && CONFIG_GET(flag/fun_allowed)) + H.visible_message(span_notice("[H] holds [target] 's left hand."), \ + span_notice("You hold [target]'s left hand."), null, 4) + else if (H.zone_selected == "r_hand" && CONFIG_GET(flag/fun_allowed)) + H.visible_message(span_notice("[H] holds [target] 's right hand."), \ + span_notice("You hold [target]'s right hand."), null, 4) + else + H.visible_message(span_notice("[H] hugs [target] to make [target.p_them()] feel better!"), \ + span_notice("You hug [target] to make [target.p_them()] feel better!"), null, 4) + +///Generates a random name from namepool +/datum/species/proc/random_name(gender) + return GLOB.namepool[namepool].get_random_name(gender) + +///Returns the name if there is one in prefs +/datum/species/proc/prefs_name(datum/preferences/prefs) + return prefs.real_name + +///Called when we turn into a species, called by [/mob/living/carbon/human/proc/set_species()] +///drops things we shouldn't be allowed to equip, adds relevant traits, and adjusts the max health of our mob +/datum/species/proc/on_species_gain(mob/living/carbon/human/H, datum/species/old_species) + SHOULD_CALL_PARENT(TRUE) + for(var/slot_id in no_equip) + var/obj/item/thing = H.get_item_by_slot(slot_id) + if(thing && !is_type_in_list(src,thing.species_exception)) + H.dropItemToGround(thing) + for(var/newtrait in inherent_traits) + ADD_TRAIT(H, newtrait, SPECIES_TRAIT) + H.maxHealth += total_health - (old_species ? old_species.total_health : initial(H.maxHealth)) + +///special things to change after we're no longer that species +/datum/species/proc/post_species_loss(mob/living/carbon/human/H) + SHOULD_CALL_PARENT(TRUE) + for(var/oldtrait in inherent_traits) + REMOVE_TRAIT(H, oldtrait, SPECIES_TRAIT) + +///Removes all species-specific verbs and actions +/datum/species/proc/remove_inherent_abilities(mob/living/carbon/human/H) + if(inherent_verbs) + remove_verb(H, inherent_verbs) + if(inherent_actions) + for(var/action_path in inherent_actions) + var/datum/action/old_species_action = H.actions_by_path[action_path] + qdel(old_species_action) + return + +///Adds all species-specific verbs and actions +/datum/species/proc/add_inherent_abilities(mob/living/carbon/human/H) + if(inherent_verbs) + add_verb(H, inherent_verbs) + if(inherent_actions) + for(var/action_path in inherent_actions) + var/datum/action/new_species_action = new action_path(H) + new_species_action.give_action(H) + return + +///Handles anything not already covered by basic species assignment +/datum/species/proc/handle_post_spawn(mob/living/carbon/human/H) + add_inherent_abilities(H) + +///Handles any species-specific death events +/datum/species/proc/handle_death(mob/living/carbon/human/H) + return + +//TODO KILL ME +///Snowflake proc for monkeys so they can call attackpaw +/datum/species/proc/spec_unarmedattack(mob/living/carbon/human/user, atom/target) + return FALSE + +///Called on Life(), used for special behavior when the carbon human with this species is alive +/datum/species/proc/handle_unique_behavior(mob/living/carbon/human/H) + return + +///Used to update alien icons for aliens +/datum/species/proc/handle_login_special(mob/living/carbon/human/H) + return + +///As above +/datum/species/proc/handle_logout_special(mob/living/carbon/human/H) + return + +///Builds the HUD using species-specific icons and usable slots +/datum/species/proc/build_hud(mob/living/carbon/human/H) + return + +///Grabs the window recieved when you click-drag someone onto you +/datum/species/proc/get_inventory_dialogue(mob/living/carbon/human/H) + return + +///Used by xenos understanding larvae and dionaea understanding nymphs +/datum/species/proc/can_understand(mob/other) + return + +///Called on Life(), special behaviour if we are on fire +/datum/species/proc/handle_fire(mob/living/carbon/human/H) + return + +///Basically just used to update moth wings +/datum/species/proc/update_body(mob/living/carbon/human/H) + return + +///Basically just used to update moth wings +/datum/species/proc/update_inv_head(mob/living/carbon/human/H) + return + +///Basically just used to update moth wings +/datum/species/proc/update_inv_w_uniform(mob/living/carbon/human/H) + return + +///Basically just used to update moth wings //Man moths are giga shitcoded +/datum/species/proc/update_inv_wear_suit(mob/living/carbon/human/H) + return + +///Called by [/mob/living/carbon/human/reagent_check] +///Returns TRUE if we can't metabolize chems, or can't be poisoned by a toxin +/datum/species/proc/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H) + if(CHECK_BITFIELD(species_flags, NO_CHEM_METABOLIZATION)) //explicit + H.reagents.del_reagent(chem.type) //for the time being + return TRUE + if(CHECK_BITFIELD(species_flags, NO_POISON) && istype(chem, /datum/reagent/toxin)) + H.reagents.remove_reagent(chem.type, chem.custom_metabolism * H.metabolism_efficiency) + return TRUE + if(CHECK_BITFIELD(species_flags, NO_OVERDOSE)) //no stacking + if(chem.overdose_threshold && chem.volume > chem.overdose_threshold) + H.reagents.remove_reagent(chem.type, chem.volume - chem.overdose_threshold) + return FALSE + +///Called when using the shredding behavior +/datum/species/proc/can_shred(mob/living/carbon/human/H) + if(H.a_intent != INTENT_HARM) + return FALSE + + if(unarmed.is_usable(H)) + if(unarmed.shredding) + return TRUE + else if(secondary_unarmed.is_usable(H)) + if(secondary_unarmed.shredding) + return TRUE + return FALSE + +//Species unarmed attacks +/datum/unarmed_attack + ///Empty hand hurt intent verb + var/attack_verb = list("attack") + ///Extra empty hand attack damage + var/damage = 0 + ///Sound that plays when you land a punch + var/attack_sound = "punch" + ///Sound that plays when you miss a punch + var/miss_sound = 'sound/weapons/punchmiss.ogg' + ///Calls the old attack_alien() behavior on objects/mobs when on harm intent + var/shredding = 0 + ///whether our unarmed attack cuts + var/sharp = 0 + // whether our unarmed attack is more likely to dismember + var/edge = 0 + +/datum/unarmed_attack/proc/is_usable(mob/living/carbon/human/user) + if(user.restrained()) + return FALSE + + // Check if they have a functioning hand + var/datum/limb/E = user.get_limb("l_hand") + if(E?.is_usable()) + return TRUE + + E = user.get_limb("r_hand") + if(E?.is_usable()) + return TRUE + return FALSE + +/datum/unarmed_attack/bite + attack_verb = list("bite") // 'x has biteed y', needs work + attack_sound = 'sound/weapons/bite.ogg' + shredding = 0 + damage = 5 + sharp = 1 + edge = 1 + +/datum/unarmed_attack/bite/is_usable(mob/living/carbon/human/user) + if (user.wear_mask && istype(user.wear_mask, /obj/item/clothing/mask/muzzle)) + return FALSE + return TRUE + +/datum/unarmed_attack/punch + attack_verb = list("punch") + damage = 3 + +/datum/unarmed_attack/punch/strong + attack_verb = list("punch","bust","jab") + damage = 10 + +/datum/unarmed_attack/claws + attack_verb = list("scratch", "claw") + attack_sound = 'sound/weapons/slice.ogg' + miss_sound = 'sound/weapons/slashmiss.ogg' + damage = 5 + sharp = 1 + edge = 1 + +/datum/unarmed_attack/claws/strong + attack_verb = list("slash") + damage = 10 + shredding = 1 + +/datum/unarmed_attack/bite/strong + attack_verb = list("maul") + damage = 15 + shredding = 1 + +/datum/hud_data + ///If set, overrides ui_style + var/icon + ///Set to draw intent box + var/has_a_intent = TRUE + ///Set to draw move intent box + var/has_m_intent = TRUE + ///Set to draw environment warnings + var/has_warnings = TRUE + ///Draw the pressure indicator + var/has_pressure = TRUE + ///Draw the nutrition indicator + var/has_nutrition = TRUE + ///Draw the bodytemp indicator + var/has_bodytemp = TRUE + ///Set to draw shand + var/has_hands = TRUE + ///Set to draw drop button + var/has_drop = TRUE + ///Set to draw throw button + var/has_throw = TRUE + ///Set to draw resist button + var/has_resist = TRUE + ///Checked by mob_can_equip() + var/list/equip_slots = list() + + /** + * Contains information on the position and tag for all inventory slots + * to be drawn for the mob. This is fairly delicate, try to avoid messing with it + * unless you know exactly what it does + */ + var/list/gear = list( + "i_clothing" = list("loc" = ui_iclothing, "slot" = SLOT_W_UNIFORM, "state" = "uniform", "toggle" = TRUE), + "o_clothing" = list("loc" = ui_oclothing, "slot" = SLOT_WEAR_SUIT, "state" = "suit", "toggle" = TRUE), + "mask" = list("loc" = ui_mask, "slot" = SLOT_WEAR_MASK, "state" = "mask", "toggle" = TRUE), + "gloves" = list("loc" = ui_gloves, "slot" = SLOT_GLOVES, "state" = "gloves", "toggle" = TRUE), + "eyes" = list("loc" = ui_glasses, "slot" = SLOT_GLASSES, "state" = "glasses","toggle" = TRUE), + "wear_ear" = list("loc" = ui_wear_ear, "slot" = SLOT_EARS, "state" = "ears", "toggle" = TRUE), + "head" = list("loc" = ui_head, "slot" = SLOT_HEAD, "state" = "head", "toggle" = TRUE), + "shoes" = list("loc" = ui_shoes, "slot" = SLOT_SHOES, "state" = "shoes", "toggle" = TRUE), + "suit storage" = list("loc" = ui_sstore1, "slot" = SLOT_S_STORE, "state" = "suit_storage"), + "back" = list("loc" = ui_back, "slot" = SLOT_BACK, "state" = "back"), + "id" = list("loc" = ui_id, "slot" = SLOT_WEAR_ID, "state" = "id"), + "storage1" = list("loc" = ui_storage1, "slot" = SLOT_L_STORE, "state" = "pocket"), + "storage2" = list("loc" = ui_storage2, "slot" = SLOT_R_STORE, "state" = "pocket"), + "belt" = list("loc" = ui_belt, "slot" = SLOT_BELT, "state" = "belt") + ) + +/datum/hud_data/New() + . = ..() + for(var/slot in gear) + equip_slots |= gear[slot]["slot"] + + if(has_hands) + equip_slots |= SLOT_L_HAND + equip_slots |= SLOT_R_HAND + equip_slots |= SLOT_HANDCUFFED + if(SLOT_HEAD in equip_slots) + equip_slots |= SLOT_IN_HEAD + if(SLOT_BACK in equip_slots) + equip_slots |= SLOT_IN_BACKPACK + equip_slots |= SLOT_IN_B_HOLSTER + if(SLOT_BELT in equip_slots) + equip_slots |= SLOT_IN_HOLSTER + equip_slots |= SLOT_IN_BELT + if(SLOT_WEAR_SUIT in equip_slots) + equip_slots |= SLOT_IN_S_HOLSTER + equip_slots |= SLOT_IN_SUIT + if(SLOT_SHOES in equip_slots) + equip_slots |= SLOT_IN_BOOT + if(SLOT_W_UNIFORM in equip_slots) + equip_slots |= SLOT_IN_STORAGE + equip_slots |= SLOT_IN_L_POUCH + equip_slots |= SLOT_IN_R_POUCH + equip_slots |= SLOT_ACCESSORY + equip_slots |= SLOT_IN_ACCESSORY + +/datum/hud_data/robotic + has_nutrition = FALSE + +///damage override at the species level, called by /mob/living/proc/apply_damage +/datum/species/proc/apply_damage(damage = 0, damagetype = BRUTE, def_zone, blocked = 0, sharp = FALSE, edge = FALSE, updating_health = FALSE, penetration, mob/living/carbon/human/victim, mob/attacker) + var/datum/limb/organ = null + if(isorgan(def_zone)) //Got sent a limb datum, convert to a zone define + organ = def_zone + def_zone = organ.name + + if(!def_zone) + def_zone = ran_zone(def_zone) + if(!organ) + organ = victim.get_limb(check_zone(def_zone)) + if(!organ) + return FALSE + + if(isnum(blocked)) + damage -= clamp(damage * (blocked - penetration) * 0.01, 0, damage) + else + damage = victim.modify_by_armor(damage, blocked, penetration, def_zone) + + if(victim.protection_aura) + damage = round(damage * ((20 - victim.protection_aura) / 20), 0.1) + + if(!damage) + return 0 + + switch(damagetype) + if(BRUTE) + victim.damageoverlaytemp = 20 + if(brute_mod) + damage *= brute_mod + var/old_status = organ.limb_status + if(organ.take_damage_limb(damage, 0, sharp, edge)) + victim.UpdateDamageIcon() + record_internal_injury(victim, attacker, old_status, organ.limb_status) + if(BURN) + victim.damageoverlaytemp = 20 + if(burn_mod) + damage *= burn_mod + if(organ.take_damage_limb(0, damage, sharp, edge)) + victim.UpdateDamageIcon() + return + switch(damage) + if(-INFINITY to 0) + return FALSE + if(25 to 50) + if(prob(20)) + victim.emote("pain") + if(50 to INFINITY) + if(prob(60)) + victim.emote("pain") + if(TOX) + victim.adjustToxLoss(damage) + if(OXY) + victim.adjustOxyLoss(damage) + if(CLONE) + victim.adjustCloneLoss(damage) + if(STAMINA) + if(species_flags & NO_STAMINA) + return + victim.adjustStaminaLoss(damage) + + // Will set our damageoverlay icon to the next level, which will then be set back to the normal level the next mob.Life() + SEND_SIGNAL(victim, COMSIG_HUMAN_DAMAGE_TAKEN, damage) + + if(updating_health) + victim.updatehealth() + return damage diff --git a/code/modules/mob/living/carbon/human/dummy.dm b/code/modules/mob/living/carbon/human/dummy.dm index 999b52ae61a12..8fe1a78442d98 100644 --- a/code/modules/mob/living/carbon/human/dummy.dm +++ b/code/modules/mob/living/carbon/human/dummy.dm @@ -8,9 +8,9 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy) /mob/living/carbon/human/dummy/Initialize(mapload) SHOULD_CALL_PARENT(FALSE)// just dummies, shouldnt register - if(flags_atom & INITIALIZED) + if(atom_flags & INITIALIZED) stack_trace("Warning: [src]([type]) initialized multiple times!") - flags_atom |= INITIALIZED + atom_flags |= INITIALIZED set_species() return INITIALIZE_HINT_NORMAL // This stops dummies being setup and registered in the human_mob_list diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 3309d8ac920c8..298e6abe9531a 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -31,7 +31,7 @@ key_third_person = "bows" message = "bows." message_param = "bows to %t." - flags_emote = EMOTE_RESTRAINT_CHECK + emote_flags = EMOTE_RESTRAINT_CHECK /datum/emote/living/carbon/human/chuckle @@ -45,14 +45,14 @@ key = "cross" key_third_person = "crosses" message = "crosses their arms." - flags_emote = EMOTE_RESTRAINT_CHECK + emote_flags = EMOTE_RESTRAINT_CHECK /datum/emote/living/carbon/human/clap key = "clap" key_third_person = "claps" message = "claps." - flags_emote = EMOTE_RESTRAINT_CHECK|EMOTE_VARY|EMOTE_MUZZLE_IGNORE + emote_flags = EMOTE_RESTRAINT_CHECK|EMOTE_VARY|EMOTE_MUZZLE_IGNORE emote_type = EMOTE_AUDIBLE sound = 'sound/misc/clap.ogg' @@ -312,14 +312,6 @@ key_third_person = "grimaces" message = "grimaces." - -/datum/emote/living/carbon/human/jump - key = "jump" - key_third_person = "jumps" - message = "jumps!" - flags_emote = EMOTE_RESTRAINT_CHECK - - /datum/emote/living/carbon/human/grumble key = "grumble" key_third_person = "grumbles" @@ -338,7 +330,7 @@ key = "signal" key_third_person = "signals" message_param = "raises %t fingers." - flags_emote = EMOTE_RESTRAINT_CHECK + emote_flags = EMOTE_RESTRAINT_CHECK /datum/emote/living/carbon/human/signal/select_param(mob/user, params) @@ -407,7 +399,7 @@ key_third_person = "snaps" message = "snaps their fingers" emote_type = EMOTE_AUDIBLE - flags_emote = EMOTE_RESTRAINT_CHECK|EMOTE_MUZZLE_IGNORE|EMOTE_ARMS_CHECK + emote_flags = EMOTE_RESTRAINT_CHECK|EMOTE_MUZZLE_IGNORE|EMOTE_ARMS_CHECK sound = 'sound/misc/fingersnap.ogg' /datum/emote/living/carbon/human/hug @@ -415,7 +407,7 @@ key_third_person = "hugs" message = "hugs themself" message_param = "hugs %t." - flags_emote = EMOTE_RESTRAINT_CHECK + emote_flags = EMOTE_RESTRAINT_CHECK emote_type = EMOTE_AUDIBLE @@ -430,7 +422,7 @@ key = "handshake" message = "shakes their own hands." message_param = "shakes hands with %t." - flags_emote = EMOTE_RESTRAINT_CHECK + emote_flags = EMOTE_RESTRAINT_CHECK emote_type = EMOTE_AUDIBLE @@ -439,7 +431,7 @@ key_third_person = "salutes" message = "salutes." message_param = "salutes to %t." - flags_emote = EMOTE_RESTRAINT_CHECK + emote_flags = EMOTE_RESTRAINT_CHECK sound = 'sound/misc/salute.ogg' @@ -447,7 +439,7 @@ key = "golfclap" key_third_person = "golfclaps" message = "claps, clearly unimpressed." - flags_emote = EMOTE_RESTRAINT_CHECK + emote_flags = EMOTE_RESTRAINT_CHECK sound = 'sound/misc/golfclap.ogg' @@ -533,7 +525,7 @@ key = "gored" message = "gags out in pain!" emote_type = EMOTE_AUDIBLE - flags_emote = EMOTE_FORCED_AUDIO + emote_flags = EMOTE_FORCED_AUDIO /datum/emote/living/carbon/human/gored/get_sound(mob/living/carbon/human/user) @@ -557,7 +549,7 @@ key = "burstscream" message = "screams in agony!" emote_type = EMOTE_AUDIBLE - flags_emote = EMOTE_FORCED_AUDIO + emote_flags = EMOTE_FORCED_AUDIO stat_allowed = UNCONSCIOUS diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index dca2c21dd0e33..a871de0758cdc 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -11,19 +11,19 @@ //exosuits and helmets obscure our view and stuff. if(wear_suit) - skipgloves = wear_suit.flags_inv_hide & HIDEGLOVES - skipsuitstorage = wear_suit.flags_inv_hide & HIDESUITSTORAGE - skipjumpsuit = wear_suit.flags_inv_hide & HIDEJUMPSUIT - skipshoes = wear_suit.flags_inv_hide & HIDESHOES + skipgloves = wear_suit.inv_hide_flags & HIDEGLOVES + skipsuitstorage = wear_suit.inv_hide_flags & HIDESUITSTORAGE + skipjumpsuit = wear_suit.inv_hide_flags & HIDEJUMPSUIT + skipshoes = wear_suit.inv_hide_flags & HIDESHOES if(head) - skipmask = head.flags_inv_hide & HIDEMASK - skipeyes = head.flags_inv_hide & HIDEEYES - skipears = head.flags_inv_hide & HIDEEARS - skipface = head.flags_inv_hide & HIDEFACE + skipmask = head.inv_hide_flags & HIDEMASK + skipeyes = head.inv_hide_flags & HIDEEYES + skipears = head.inv_hide_flags & HIDEEARS + skipface = head.inv_hide_flags & HIDEFACE if(wear_mask) - skipface |= wear_mask.flags_inv_hide & HIDEFACE + skipface |= wear_mask.inv_hide_flags & HIDEFACE var/t_He = p_they(TRUE) //capitalised for use at the start of each line. var/t_he = p_they() @@ -42,14 +42,14 @@ //uniform if(w_uniform && !skipjumpsuit) if(w_uniform.blood_overlay) - msg += "[span_warning("[t_He] [t_is] wearing [icon2html(w_uniform, user)] [w_uniform.gender==PLURAL?"some":"a"] [(w_uniform.blood_color != "#030303") ? "blood" : "oil"]-stained [w_uniform.name]!")]\n" + msg += "[span_alert("[t_He] [t_is] wearing [icon2html(w_uniform, user)] [w_uniform.gender==PLURAL?"some":"a"] [(w_uniform.blood_color != "#030303") ? "blood" : "oil"]-stained [w_uniform.name]!")]\n" else msg += "[t_He] [t_is] wearing [icon2html(w_uniform, user)] \a [w_uniform].\n" //head if(head) if(head.blood_overlay) - msg += "[span_warning("[t_He] [t_is] wearing [icon2html(head, user)] [head.gender==PLURAL?"some":"a"] [(head.blood_color != "#030303") ? "blood" : "oil"]-stained [head.name] on [t_his] head!")]\n" + msg += "[span_alert("[t_He] [t_is] wearing [icon2html(head, user)] [head.gender==PLURAL?"some":"a"] [(head.blood_color != "#030303") ? "blood" : "oil"]-stained [head.name] on [t_his] head!")]\n" else msg += "[t_He] [t_is] wearing [icon2html(head, user)] \a [head] on [t_his] head.\n" if(istype(head, /obj/item/clothing/head/modular)) @@ -64,7 +64,7 @@ //suit/armour if(wear_suit) if(wear_suit.blood_overlay) - msg += "[span_warning("[t_He] [t_is] wearing [icon2html(wear_suit, user)] [wear_suit.gender==PLURAL?"some":"a"] [(wear_suit.blood_color != "#030303") ? "blood" : "oil"]-stained [wear_suit.name]!")]\n" + msg += "[span_alert("[t_He] [t_is] wearing [icon2html(wear_suit, user)] [wear_suit.gender==PLURAL?"some":"a"] [(wear_suit.blood_color != "#030303") ? "blood" : "oil"]-stained [wear_suit.name]!")]\n" else msg += "[t_He] [t_is] wearing [icon2html(wear_suit, user)] \a [wear_suit].\n" if(istype(wear_suit, /obj/item/clothing/suit/modular)) @@ -87,62 +87,62 @@ //suit/armour storage if(s_store && !skipsuitstorage) if(s_store.blood_overlay) - msg += "[span_warning("[t_He] [t_is] carrying [icon2html(s_store, user)] [s_store.gender==PLURAL?"some":"a"] [(s_store.blood_color != "#030303") ? "blood" : "oil"]-stained [s_store.name] on [t_his] [wear_suit.name]!")]\n" + msg += "[span_alert("[t_He] [t_is] carrying [icon2html(s_store, user)] [s_store.gender==PLURAL?"some":"a"] [(s_store.blood_color != "#030303") ? "blood" : "oil"]-stained [s_store.name] on [t_his] [wear_suit.name]!")]\n" else msg += "[t_He] [t_is] carrying [icon2html(s_store, user)] \a [s_store] on [t_his] [wear_suit.name].\n" //back if(back) if(back.blood_overlay) - msg += "[span_warning("[t_He] [t_has] [icon2html(back, user)] [back.gender==PLURAL?"some":"a"] [(back.blood_color != "#030303") ? "blood" : "oil"]-stained [back] on [t_his] back.")]\n" + msg += "[span_alert("[t_He] [t_has] [icon2html(back, user)] [back.gender==PLURAL?"some":"a"] [(back.blood_color != "#030303") ? "blood" : "oil"]-stained [back] on [t_his] back.")]\n" else msg += "[t_He] [t_has] [icon2html(back, user)] \a [back] on [t_his] back.\n" //left hand if(l_hand) if(l_hand.blood_overlay) - msg += "[span_warning("[t_He] [t_is] holding [icon2html(l_hand, user)] [l_hand.gender==PLURAL?"some":"a"] [(l_hand.blood_color != "#030303") ? "blood" : "oil"]-stained [l_hand.name] in [t_his] left hand!")]\n" + msg += "[span_alert("[t_He] [t_is] holding [icon2html(l_hand, user)] [l_hand.gender==PLURAL?"some":"a"] [(l_hand.blood_color != "#030303") ? "blood" : "oil"]-stained [l_hand.name] in [t_his] left hand!")]\n" else msg += "[t_He] [t_is] holding [icon2html(l_hand, user)] \a [l_hand] in [t_his] left hand.\n" //right hand if(r_hand) if(r_hand.blood_overlay) - msg += "[span_warning("[t_He] [t_is] holding [icon2html(r_hand, user)] [r_hand.gender==PLURAL?"some":"a"] [(r_hand.blood_color != "#030303") ? "blood" : "oil"]-stained [r_hand.name] in [t_his] right hand!")]\n" + msg += "[span_alert("[t_He] [t_is] holding [icon2html(r_hand, user)] [r_hand.gender==PLURAL?"some":"a"] [(r_hand.blood_color != "#030303") ? "blood" : "oil"]-stained [r_hand.name] in [t_his] right hand!")]\n" else msg += "[t_He] [t_is] holding [icon2html(r_hand, user)] \a [r_hand] in [t_his] right hand.\n" //gloves if(gloves && !skipgloves) if(gloves.blood_overlay) - msg += "[span_warning("[t_He] [t_has] [icon2html(gloves, user)] [gloves.gender==PLURAL?"some":"a"] [(gloves.blood_color != "#030303") ? "blood" : "oil"]-stained [gloves.name] on [t_his] hands!")]\n" + msg += "[span_alert("[t_He] [t_has] [icon2html(gloves, user)] [gloves.gender==PLURAL?"some":"a"] [(gloves.blood_color != "#030303") ? "blood" : "oil"]-stained [gloves.name] on [t_his] hands!")]\n" else msg += "[t_He] [t_has] [icon2html(gloves, user)] \a [gloves] on [t_his] hands.\n" else if(blood_color) - msg += "[span_warning("[t_He] [t_has] [(blood_color != "#030303") ? "blood" : "oil"]-stained hands!")]\n" + msg += "[span_alert("[t_He] [t_has] [(blood_color != "#030303") ? "blood" : "oil"]-stained hands!")]\n" //handcuffed? if(handcuffed) if(istype(handcuffed, /obj/item/restraints/handcuffs/cable)) - msg += "[span_warning("[t_He] [t_is] [icon2html(handcuffed, user)] restrained with cable!")]\n" + msg += "[span_alert("[t_He] [t_is] [icon2html(handcuffed, user)] restrained with cable!")]\n" else - msg += "[span_warning("[t_He] [t_is] [icon2html(handcuffed, user)] handcuffed!")]\n" + msg += "[span_alert("[t_He] [t_is] [icon2html(handcuffed, user)] handcuffed!")]\n" //belt if(belt) if(belt.blood_overlay) - msg += "[span_warning("[t_He] [t_has] [icon2html(belt, user)] [belt.gender==PLURAL?"some":"a"] [(belt.blood_color != "#030303") ? "blood" : "oil"]-stained [belt.name] about [t_his] waist!")]\n" + msg += "[span_alert("[t_He] [t_has] [icon2html(belt, user)] [belt.gender==PLURAL?"some":"a"] [(belt.blood_color != "#030303") ? "blood" : "oil"]-stained [belt.name] about [t_his] waist!")]\n" else msg += "[t_He] [t_has] [icon2html(belt, user)] \a [belt] about [t_his] waist.\n" //shoes if(shoes && !skipshoes) if(shoes.blood_overlay) - msg += "[span_warning("[t_He] [t_is] wearing [icon2html(shoes, user)] [shoes.gender==PLURAL?"some":"a"] [(shoes.blood_color != "#030303") ? "blood" : "oil"]-stained [shoes.name] on [t_his] feet!")]\n" + msg += "[span_alert("[t_He] [t_is] wearing [icon2html(shoes, user)] [shoes.gender==PLURAL?"some":"a"] [(shoes.blood_color != "#030303") ? "blood" : "oil"]-stained [shoes.name] on [t_his] feet!")]\n" else msg += "[t_He] [t_is] wearing [icon2html(shoes, user)] \a [shoes] on [t_his] feet.\n" else if(feet_blood_color) - msg += "[span_warning("[t_He] [t_has] [(feet_blood_color != "#030303") ? "blood" : "oil"]-stained feet!")]\n" + msg += "[span_alert("[t_He] [t_has] [(feet_blood_color != "#030303") ? "blood" : "oil"]-stained feet!")]\n" //mask if(wear_mask && !skipmask) @@ -152,14 +152,14 @@ else msg += "[span_warning("[t_He] [t_has] [icon2html(wear_mask, user)] \a [wear_mask] on [t_his] face!")]\n" else if(wear_mask.blood_overlay) - msg += "[span_warning("[t_He] [t_has] [icon2html(wear_mask, user)] [wear_mask.gender==PLURAL?"some":"a"] [(wear_mask.blood_color != "#030303") ? "blood" : "oil"]-stained [wear_mask.name] on [t_his] face!")]\n" + msg += "[span_alert("[t_He] [t_has] [icon2html(wear_mask, user)] [wear_mask.gender==PLURAL?"some":"a"] [(wear_mask.blood_color != "#030303") ? "blood" : "oil"]-stained [wear_mask.name] on [t_his] face!")]\n" else msg += "[t_He] [t_has] [icon2html(wear_mask, user)] \a [wear_mask] on [t_his] face.\n" //eyes if(glasses && !skipeyes) if(glasses.blood_overlay) - msg += "[span_warning("[t_He] [t_has] [icon2html(glasses, user)] [glasses.gender==PLURAL?"some":"a"] [(glasses.blood_color != "#030303") ? "blood" : "oil"]-stained [glasses] covering [t_his] eyes!")]\n" + msg += "[span_alert("[t_He] [t_has] [icon2html(glasses, user)] [glasses.gender==PLURAL?"some":"a"] [(glasses.blood_color != "#030303") ? "blood" : "oil"]-stained [glasses] covering [t_his] eyes!")]\n" else msg += "[t_He] [t_has] [icon2html(glasses, user)] \a [glasses] covering [t_his] eyes.\n" @@ -174,7 +174,7 @@ //jitters if(stat != DEAD) if(jitteriness >= 300) - msg += "[span_warning("[t_He] [t_is] convulsing violently!")]\n" + msg += "[span_boldwarning("[t_He] [t_is] convulsing violently!")]\n" else if(jitteriness >= 200) msg += "[span_warning("[t_He] [t_is] extremely jittery.")]\n" else if(jitteriness >= 100) @@ -189,25 +189,27 @@ if(o.limb_status & LIMB_STABILIZED) msg += "[span_warning("[t_He] [t_has] a suit brace stabilizing [t_his] [o.display_name]!")]\n" if(o.limb_status & LIMB_NECROTIZED) - msg += "[span_warning("An infection has rotted [t_his] [o.display_name] into uselessness!")]\n" + msg += "[span_deadsay("An infection has rotted [t_his] [o.display_name] into uselessness!")]\n" if(holo_card_color) msg += "[t_He] [t_has] a [holo_card_color] holo card on [t_his] chest.\n" if(suiciding) - msg += "[span_warning("[t_He] appear[p_s()] to have commited suicide... there is no hope of recovery.")]\n" + msg += "[span_deadsay("[t_He] appear[p_s()] to have commited suicide... there is no hope of recovery.")]\n" if(stat) - msg += "[span_warning("[t_He] [t_is]n't responding to anything around [t_him] and seem[p_s()] to be asleep.")]\n" - if(stat == DEAD || health < get_crit_threshold()) - msg += "[span_warning("[t_He] [p_do()]n't appear to be breathing.")]\n" + if(stat == UNCONSCIOUS) + msg += "[span_info("[t_He] [t_is]n't responding to anything around [t_him] and seem[p_s()] to be asleep.")]\n" + if(stat == DEAD) + msg += "[span_deadsay("[t_He] [t_is] limp and unresponsive; there are no signs of life")]" if(HAS_TRAIT(src, TRAIT_UNDEFIBBABLE)) - msg += "[span_deadsay("[t_He] [t_has] gone cold.")]\n" + msg += "[span_deadsay(" and [t_he] won't be coming back...")]\n" + else + msg += "[span_deadsay("...")]\n" if(ishuman(user) && !user.stat && Adjacent(user)) user.visible_message("[user] checks [src]'s pulse.", "You check [src]'s pulse.", null, 4) addtimer(CALLBACK(src, PROC_REF(take_pulse), user), 15) - - msg += "" + msg += "" if(nutrition < NUTRITION_STARVING) msg += "[t_He] [t_is] severely malnourished.\n" @@ -221,58 +223,84 @@ if((!species.has_organ["brain"] || has_brain()) && stat != DEAD) if(!key) - if(species.is_sentient) - msg += "[span_deadsay("[t_He] [t_is] fast asleep. It doesn't look like they are waking up anytime soon.")]\n" + msg += "[span_deadsay("[t_He] [t_is] fast asleep. It doesn't look like [t_he] [t_is] waking up anytime soon.")]\n" else if(!client) if(isxeno(user)) msg += "[span_xenowarning("[t_He] [p_do()]n't seem responsive.")]\n" else - msg += "[t_He] [t_has] suddenly fallen asleep.\n" + msg += "[span_deadsay("[t_He] [t_is] completely unresponsive to anything and has fallen asleep, as if affected by Space Sleep Disorder. [t_He] may snap out of it soon.")]\n" + + var/total_brute = getBruteLoss() + var/total_burn = getFireLoss() + var/total_clone = getCloneLoss() + if(total_brute) + if (total_brute < 25) + msg += "[span_warning("[t_He] [t_has] minor bruising.")]\n" + else if (total_brute < 50) + msg += "[span_warning("[t_He] [t_has] moderate bruising.")]\n" + else + msg += "[span_warning("[t_He] [t_has] severe bruising.")]\n" + + if(total_burn) + if (total_burn < 25) + msg += "[span_warning("[t_He] [t_has] minor burns.")]\n" + else if (total_burn < 50) + msg += "[span_warning("[t_He] [t_has] moderate burns.")]\n" + else + msg += "[span_warning("[t_He] [t_has] severe burns.")]\n" + + if(total_clone) + if(total_clone < 25) + msg += "[t_He] [t_is] slightly disfigured, with light signs of cellular damage.\n" + else if (total_clone < 50) + msg += "[span_deadsay("[t_He] [t_is] significantly disfigured, with growing clouds of cellular damage.")]\n" + else + msg += "[span_deadsay("[t_He] [t_is] absolutely fucked up, with streaks of sickening, deformed flesh on [t_his] skin.")]\n" if(fire_stacks > 0) msg += "[t_He] [t_is] covered in something flammable.\n" if(fire_stacks < 0) msg += "[t_He] look[p_s()] a little soaked.\n" if(on_fire) - msg += "[span_warning("[t_He] [t_is] on fire!")]\n" + msg += "[span_boldwarning("[t_He] [t_is] on fire!")]\n" var/list/wound_flavor_text = list() //List mapping each limb's display_name to its wound description var/list/is_destroyed = list() var/list/is_bleeding = list() - for(var/datum/limb/temp AS in limbs) - if(temp.limb_status & LIMB_DESTROYED) - is_destroyed["[temp.display_name]"] = 1 - wound_flavor_text["[temp.display_name]"] = "[span_warning("[t_He] [t_is] missing [t_his] [temp.display_name].")]\n" + for(var/datum/limb/temp_limb AS in limbs) + if(temp_limb.limb_status & LIMB_DESTROYED) + is_destroyed["[temp_limb.display_name]"] = 1 + wound_flavor_text["[temp_limb.display_name]"] = "[span_boldwarning("[t_He] [t_is] missing [t_his] [temp_limb.display_name].")]\n" continue - if(temp.limb_status & LIMB_ROBOT) - if(!(temp.brute_dam + temp.burn_dam)) + if(temp_limb.limb_status & LIMB_ROBOT) + if(!(temp_limb.brute_dam + temp_limb.burn_dam)) if(!(species.species_flags & IS_SYNTHETIC)) - wound_flavor_text["[temp.display_name]"] = "[span_warning("[t_He] [t_has] a robot [temp.display_name]!")]\n" + wound_flavor_text["[temp_limb.display_name]"] = "[span_tinynotice("[t_He] [t_has] a robot [temp_limb.display_name].")]\n" continue else - wound_flavor_text["[temp.display_name]"] = "[t_He] [t_has] a robot [temp.display_name]. It has" - if(temp.brute_dam) - switch(temp.brute_dam) + wound_flavor_text["[temp_limb.display_name]"] = "[t_He] [t_has] a robot [temp_limb.display_name]. It has" + if(temp_limb.brute_dam) + switch(temp_limb.brute_dam) if(0 to 20) - wound_flavor_text["[temp.display_name]"] += " some dents" + wound_flavor_text["[temp_limb.display_name]"] += " some dents" if(21 to INFINITY) - wound_flavor_text["[temp.display_name]"] += pick(" a lot of dents"," severe denting") - if(temp.brute_dam && temp.burn_dam) - wound_flavor_text["[temp.display_name]"] += " and" - if(temp.burn_dam) - switch(temp.burn_dam) + wound_flavor_text["[temp_limb.display_name]"] += pick(" a lot of dents"," severe denting") + if(temp_limb.brute_dam && temp_limb.burn_dam) + wound_flavor_text["[temp_limb.display_name]"] += " and" + if(temp_limb.burn_dam) + switch(temp_limb.burn_dam) if(0 to 20) - wound_flavor_text["[temp.display_name]"] += " some burns" + wound_flavor_text["[temp_limb.display_name]"] += " some burns" if(21 to INFINITY) - wound_flavor_text["[temp.display_name]"] += pick(" a lot of burns"," severe melting") - if(wound_flavor_text["[temp.display_name]"]) - wound_flavor_text["[temp.display_name]"] += "!\n" + wound_flavor_text["[temp_limb.display_name]"] += pick(" a lot of burns"," severe melting") + if(wound_flavor_text["[temp_limb.display_name]"]) + wound_flavor_text["[temp_limb.display_name]"] += "!\n" else - if(temp.limb_status & LIMB_BLEEDING) - is_bleeding["[temp.display_name]"] = 1 + if(temp_limb.limb_status & LIMB_BLEEDING) + is_bleeding["[temp_limb.display_name]"] = 1 var/healthy = TRUE var/brute_desc = "" - switch(temp.brute_dam) + switch(temp_limb.brute_dam) if(0.01 to 5) brute_desc = "minor scrapes" if(5 to 20) @@ -283,10 +311,10 @@ brute_desc = "gaping wounds" if(brute_desc) healthy = FALSE - brute_desc = (temp.limb_wound_status & LIMB_WOUND_BANDAGED ? "bandaged " : "") + brute_desc + brute_desc = (temp_limb.limb_wound_status & LIMB_WOUND_BANDAGED ? "bandaged " : "") + brute_desc var/burn_desc = "" - switch(temp.burn_dam) + switch(temp_limb.burn_dam) if(0.01 to 5) brute_desc = "minor burns" if(5 to 20) @@ -297,10 +325,10 @@ brute_desc = "charring" if(burn_desc) healthy = FALSE - burn_desc = (temp.limb_wound_status & LIMB_WOUND_SALVED ? "salved " : "") + burn_desc + burn_desc = (temp_limb.limb_wound_status & LIMB_WOUND_SALVED ? "salved " : "") + burn_desc var/germ_desc = "" - switch(temp.germ_level) + switch(temp_limb.germ_level) if(INFECTION_LEVEL_ONE to INFECTION_LEVEL_TWO - 1) germ_desc = "mildly infected " if(INFECTION_LEVEL_TWO to INFINITY) @@ -310,16 +338,16 @@ var/overall_desc = "" if(healthy) - overall_desc = span_notice("[t_He] [t_has] a healthy [temp.display_name].") + overall_desc = span_tinynotice("[t_He] [t_has] a healthy [temp_limb.display_name].") else - overall_desc = "[t_He] [t_has] a [germ_desc][temp.display_name]" + overall_desc = "[t_He] [t_has] a [germ_desc][temp_limb.display_name]" if(brute_desc || burn_desc) overall_desc += " with [brute_desc]" if(brute_desc && burn_desc) overall_desc += " and " overall_desc += burn_desc overall_desc = span_warning(overall_desc + ".") - wound_flavor_text["[temp.display_name]"] = overall_desc + "\n" + wound_flavor_text["[temp_limb.display_name]"] = overall_desc + "\n" //Handles the text strings being added to the actual description. //If they have something that covers the limb, and it is not missing, put flavortext. If it is covered but bleeding, add other flavortext. @@ -381,68 +409,68 @@ display_foot_right = 1 if (display_head) - msg += "[span_warning("[t_He] [t_has] blood dripping from [t_his] face!")]\n" + msg += "[span_warning("[t_He] [t_has] blood dripping from [t_his] face!")]\n" if (display_chest && display_groin && display_arm_left && display_arm_right && display_hand_left && display_hand_right && display_leg_left && display_leg_right && display_foot_left && display_foot_right) - msg += "[span_warning("[t_He] [t_has] blood soaking through [t_his] clothes from [t_his] entire body!")]\n" + msg += "[span_warning("[t_He] [t_has] blood soaking through [t_his] clothes from [t_his] entire body!")]\n" else if (display_chest && display_arm_left && display_arm_right && display_hand_left && display_hand_right) - msg += "[span_warning("[t_He] [t_has] blood soaking through [t_his] clothes from [t_his] upper body!")]\n" + msg += "[span_warning("[t_He] [t_has] blood soaking through [t_his] clothes from [t_his] upper body!")]\n" else if (display_chest) - msg += "[span_warning("[t_He] [t_has] blood soaking through [t_his] shirt!")]\n" + msg += "[span_warning("[t_He] [t_has] blood soaking through [t_his] shirt!")]\n" if (display_arm_left && display_arm_right && display_hand_left && display_hand_left) - msg += "[span_warning("[t_He] [t_has] blood soaking through [t_his] gloves and sleeves!")]\n" + msg += "[span_warning("[t_He] [t_has] blood soaking through [t_his] gloves and sleeves!")]\n" else if (display_arm_left && display_arm_right) - msg += "[span_warning("[t_He] [t_has] blood soaking through [t_his] sleeves!")]\n" + msg += "[span_warning("[t_He] [t_has] blood soaking through [t_his] sleeves!")]\n" else if (display_arm_left) - msg += "[span_warning("[t_He] [t_has] soaking through [t_his] left sleeve!")]\n" + msg += "[span_warning("[t_He] [t_has] blood soaking through [t_his] left sleeve!")]\n" if (display_arm_right) - msg += "[span_warning("[t_He] [t_has] soaking through [t_his] right sleeve!")]\n" + msg += "[span_warning("[t_He] [t_has] blood soaking through [t_his] right sleeve!")]\n" if (display_hand_left && display_hand_right) - msg += "[span_warning("[t_He] [t_has] blood running out from under [t_his] gloves!")]\n" + msg += "[span_warning("[t_He] [t_has] blood running out from under [t_his] gloves!")]\n" else if (display_hand_left) - msg += "[span_warning("[t_He] [t_has] blood running out from under [t_his] left glove!")]\n" + msg += "[span_warning("[t_He] [t_has] blood running out from under [t_his] left glove!")]\n" if (display_hand_right) - msg += "[span_warning("[t_He] [t_has] blood running out from under [t_his] right glove!")]\n" + msg += "[span_warning("[t_He] [t_has] blood running out from under [t_his] right glove!")]\n" if (display_groin && display_leg_left && display_leg_right && display_foot_left && display_foot_right) msg += "[span_warning("[t_He] [t_has] blood soaking through [t_his] clothes from [t_his] lower body!")]\n" else if (display_groin) - msg += "[span_warning("[t_He] [t_has] blood dripping from [t_his] groin!")]\n" + msg += "[span_warning("[t_He] [t_has] blood dripping from [t_his] groin!")]\n" if (display_leg_left && display_leg_right && display_foot_left && display_foot_right) - msg += "[span_warning("[t_He] [t_has] blood soaking through [t_his] pant legs and boots!")]\n" + msg += "[span_warning("[t_He] [t_has] blood soaking through [t_his] pant legs and boots!")]\n" else if (display_leg_left && display_leg_right) - msg += "[span_warning("[t_He] [t_has] blood soaking through [t_his] pant legs!")]\n" + msg += "[span_warning("[t_He] [t_has] blood soaking through [t_his] pant legs!")]\n" else if (display_leg_left) - msg += "[span_warning("[t_He] [t_has] blood soaking through [t_his] left pant leg!")]\n" + msg += "[span_warning("[t_He] [t_has] blood soaking through [t_his] left pant leg!")]\n" if (display_leg_right) - msg += "[span_warning("[t_He] [t_has] blood soaking through [t_his] right pant leg!")]\n" + msg += "[span_warning("[t_He] [t_has] blood soaking through [t_his] right pant leg!")]\n" if (display_foot_left && display_foot_right) - msg += "[span_warning("[t_He] [t_has] blood pooling around[t_his] boots!")]\n" + msg += "[span_warning("[t_He] [t_has] blood pooling around[t_his] boots!")]\n" else if (display_foot_left) - msg += "[span_warning("[t_He] [t_has] blood pooling around [t_his] left boot!")]\n" + msg += "[span_warning("[t_He] [t_has] blood pooling around [t_his] left boot!")]\n" if (display_foot_right) - msg += "[span_warning("[t_He] [t_has] blood pooling around [t_his] right boot!")]\n" + msg += "[span_warning("[t_He] [t_has] blood pooling around [t_his] right boot!")]\n" if(chestburst == 2) if(isxeno(user)) msg += "[span_xenowarning("A larva escaped from [t_him]!")]\n" else - msg += "[span_warning("[t_He] [t_has] a giant hole in [t_his] chest!")]\n" + msg += "[span_boldwarning("[t_He] [t_has] a giant hole in [t_his] chest!")]\n" for(var/i in embedded_objects) var/obj/item/embedded = i if(!(embedded.embedding.embedded_flags & EMBEDDED_CAN_BE_YANKED_OUT)) continue - msg += "[span_warning("[t_He] [t_has] \a [embedded] sticking out of [t_his] flesh!")]\n" + msg += "[span_boldwarning("[t_He] [t_has] \a [embedded] sticking out of [t_his] flesh!")]\n" if(hasHUD(user,"security")) var/perpname = "wot" @@ -493,7 +521,7 @@ if(isxeno(user)) msg += "[t_He] [t_is] hollow. Useless.\n" else - msg += "[span_warning("[t_He] [t_is] hollowed out!")]\n" + msg += "[span_deadsay("[t_He] [t_is] hollowed out!")]\n" RU TGMC EDIT PUPPETEER REMOVAL */ if(isxeno(user)) if(species.species_flags & IS_SYNTHETIC) @@ -542,7 +570,7 @@ RU TGMC EDIT PUPPETEER REMOVAL */ return var/pulse_taken = get_pulse(GETPULSE_HAND) if(pulse_taken == PULSE_NONE) - to_chat(user, span_deadsay("[p_they(TRUE)] [p_have()] no pulse[client ? "" : " and [p_their()] soul has departed, although they may be revivable"]...")) + to_chat(user, span_deadsay("[p_they(TRUE)] [p_have()] no pulse...")) else to_chat(user, span_deadsay("[p_their(TRUE)] pulse is [pulse_taken].")) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 373716f5f3adc..eaac7b6a28568 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1,7 +1,5 @@ /mob/living/carbon/human/Initialize(mapload) - add_verb(src, /mob/living/proc/lay_down) - b_type = pick(7;"O-", 38;"O+", 6;"A-", 34;"A+", 2;"B-", 9;"B+", 1;"AB-", 3;"AB+") - blood_type = b_type + blood_type = pick(7;"O-", 38;"O+", 6;"A-", 34;"A+", 2;"B-", 9;"B+", 1;"AB-", 3;"AB+") if(!species) set_species() @@ -12,25 +10,9 @@ GLOB.alive_human_list += src LAZYADD(GLOB.humans_by_zlevel["[z]"], src) - var/datum/action/skill/toggle_orders/toggle_orders_action = new - toggle_orders_action.give_action(src) - var/datum/action/skill/issue_order/move/issue_order_move = new - issue_order_move.give_action(src) - var/datum/action/skill/issue_order/hold/issue_order_hold = new - issue_order_hold.give_action(src) - var/datum/action/skill/issue_order/focus/issue_order_focus = new - issue_order_focus.give_action(src) - var/datum/action/innate/order/attack_order/personal/send_attack_order = new - send_attack_order.give_action(src) - var/datum/action/innate/order/defend_order/personal/send_defend_order = new - send_defend_order.give_action(src) - var/datum/action/innate/order/retreat_order/personal/send_retreat_order = new - send_retreat_order.give_action(src) - var/datum/action/innate/order/rally_order/personal/send_rally_order = new - send_rally_order.give_action(src) - var/datum/action/innate/message_squad/screen_orders = new - screen_orders.give_action(src) - + for(var/action in GLOB.human_init_actions) + var/datum/action/human_action = new action(src) + human_action.give_action(src) //makes order hud visible var/datum/atom_hud/H = GLOB.huds[DATA_HUD_ORDER] @@ -50,12 +32,28 @@ LAZYREMOVE(GLOB.humans_by_zlevel["[old_z]"], src) LAZYADD(GLOB.humans_by_zlevel["[new_z]"], src) +/mob/living/carbon/human/vv_edit_var(var_name, var_value) + return ..() + /mob/living/carbon/human/vv_get_dropdown() . = ..() - . += "---" - .["Drop Everything"] = "?_src_=vars;[HrefToken()];dropeverything=[REF(src)]" - .["Copy Outfit"] = "?_src_=vars;[HrefToken()];copyoutfit=[REF(src)]" + VV_DROPDOWN_OPTION("", "---------") + VV_DROPDOWN_OPTION(VV_HK_SET_SPECIES, "Set Species") + +/mob/living/carbon/human/vv_do_topic(list/href_list) + . = ..() + + if(!.) + return + if(href_list[VV_HK_SET_SPECIES]) + if(!check_rights(R_SPAWN)) + return + var/result = input(usr, "Please choose a new species","Species") as null|anything in GLOB.all_species + if(result) + var/newtype = GLOB.all_species[result] + admin_ticket_log("[key_name_admin(usr)] has modified the bodyparts of [src] to [result]") + set_species(newtype) /mob/living/carbon/human/prepare_huds() ..() @@ -229,9 +227,9 @@ //repurposed proc. Now it combines get_id_name() and get_face_name() to determine a mob's name variable. Made into a seperate proc as it'll be useful elsewhere /mob/living/carbon/human/get_visible_name() - if( wear_mask && (wear_mask.flags_inv_hide & HIDEFACE) ) //Wearing a mask which hides our face, use id-name if possible + if( wear_mask && (wear_mask.inv_hide_flags & HIDEFACE) ) //Wearing a mask which hides our face, use id-name if possible return get_id_name("Unknown") - if( head && (head.flags_inv_hide & HIDEFACE) ) + if( head && (head.inv_hide_flags & HIDEFACE) ) return get_id_name("Unknown") //Likewise for hats var/face_name = get_face_name() var/id_name = get_id_name("") @@ -604,7 +602,6 @@ else if(newcolor != holo_card_color) holo_card_color = newcolor to_chat(usr, span_notice("You add a [newcolor] holo card on [src].")) - update_targeted() if(href_list["scanreport"]) if(!hasHUD(usr,"medical")) @@ -694,10 +691,10 @@ /mob/living/carbon/human/abiotic(full_body = 0) - if(full_body && ((src.l_hand && !( src.l_hand.flags_item & ITEM_ABSTRACT)) || (src.r_hand && !( src.r_hand.flags_item & ITEM_ABSTRACT)) || (src.back || src.wear_mask || src.head || src.shoes || src.w_uniform || src.wear_suit || src.glasses || src.wear_ear || src.gloves))) + if(full_body && ((src.l_hand && !( src.l_hand.item_flags & ITEM_ABSTRACT)) || (src.r_hand && !( src.r_hand.item_flags & ITEM_ABSTRACT)) || (src.back || src.wear_mask || src.head || src.shoes || src.w_uniform || src.wear_suit || src.glasses || src.wear_ear || src.gloves))) return 1 - if( (src.l_hand && !(src.l_hand.flags_item & ITEM_ABSTRACT)) || (src.r_hand && !(src.r_hand.flags_item & ITEM_ABSTRACT)) ) + if( (src.l_hand && !(src.l_hand.item_flags & ITEM_ABSTRACT)) || (src.r_hand && !(src.r_hand.item_flags & ITEM_ABSTRACT)) ) return 1 return 0 @@ -813,7 +810,7 @@ species.create_organs(src) - dextrous = species.has_fine_manipulation + dextrous = TRUE if(species.default_language_holder) language_holder = new species.default_language_holder(src) @@ -855,7 +852,7 @@ return species.handle_chemicals(R,src) // if it returns 0, it will run the usual on_mob_life for that reagent. otherwise, it will stop after running handle_chemicals for the species. /mob/living/carbon/human/slip(slip_source_name, stun_level, weaken_level, run_only, override_noslip, slide_steps) - if((shoes?.flags_inventory & NOSLIPPING) && !override_noslip) //If our shoes are noslip just return immediately unless we don't care about the noslip + if((shoes?.inventory_flags & NOSLIPPING) && !override_noslip) //If our shoes are noslip just return immediately unless we don't care about the noslip return FALSE return ..() @@ -1124,3 +1121,8 @@ if(buckled) return return ..() + +/mob/living/carbon/human/get_up() + if(!do_after(src, 2 SECONDS, IGNORE_LOC_CHANGE|IGNORE_HELD_ITEM, src)) + return + return ..() diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index b9f48bc818e99..5c5f0d2556e66 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -6,120 +6,124 @@ if(!ishuman(user)) return - var/mob/living/carbon/human/H = user + var/mob/living/carbon/human/human_user = user - if(user != src && !check_shields(COMBAT_TOUCH_ATTACK, H.melee_damage, "melee")) + if(user != src && !check_shields(COMBAT_TOUCH_ATTACK, human_user.melee_damage, "melee")) visible_message(span_danger("[user] attempted to touch [src]!"), null, null, 5) return FALSE - H.changeNext_move(7) - switch(H.a_intent) + human_user.changeNext_move(7) + switch(human_user.a_intent) if(INTENT_HELP) - if(on_fire && H != src) + if(on_fire && human_user != src) fire_stacks = max(fire_stacks - 1, 0) playsound(src.loc, 'sound/weapons/thudswoosh.ogg', 25, 1, 7) - H.visible_message(span_danger("[H] tries to put out the fire on [src]!"), \ + human_user.visible_message(span_danger("[human_user] tries to put out the fire on [src]!"), \ span_warning("You try to put out the fire on [src]!"), null, 5) if(fire_stacks <= 0) - H.visible_message(span_danger("[H] has successfully extinguished the fire on [src]!"), \ + human_user.visible_message(span_danger("[human_user] has successfully extinguished the fire on [src]!"), \ span_notice("You extinguished the fire on [src]."), null, 5) ExtinguishMob() return TRUE - if(istype(wear_mask, /obj/item/clothing/mask/facehugger) && H != src) - H.stripPanelUnequip(wear_mask, src, SLOT_WEAR_MASK) + if(istype(wear_mask, /obj/item/clothing/mask/facehugger) && human_user != src) + human_user.stripPanelUnequip(wear_mask, src, SLOT_WEAR_MASK) return TRUE if(health >= get_crit_threshold()) - help_shake_act(H) + help_shake_act(human_user) return TRUE if(HAS_TRAIT(src, TRAIT_UNDEFIBBABLE)) - to_chat(H, span_boldnotice("Can't help this one. Body has gone cold.")) + to_chat(human_user, span_boldnotice("Can't help this one. Body has gone cold.")) return FALSE if(species?.species_flags & ROBOTIC_LIMBS) - to_chat(H, span_boldnotice("You can't help this one, [p_they()] [p_have()] no lungs!")) + to_chat(human_user, span_boldnotice("You can't help this one, [p_they()] [p_have()] no lungs!")) return FALSE - if((head && (head.flags_inventory & COVERMOUTH)) || (wear_mask && (wear_mask.flags_inventory & COVERMOUTH))) - to_chat(H, span_boldnotice("Remove [p_their()] mask!")) + if((head && (head.inventory_flags & COVERMOUTH)) || (wear_mask && (wear_mask.inventory_flags & COVERMOUTH))) + to_chat(human_user, span_boldnotice("Remove [p_their()] mask!")) return FALSE - if((H.head && (H.head.flags_inventory & COVERMOUTH)) || (H.wear_mask && (H.wear_mask.flags_inventory & COVERMOUTH))) - to_chat(H, span_boldnotice("Remove your mask!")) + if((human_user.head && (human_user.head.inventory_flags & COVERMOUTH)) || (human_user.wear_mask && (human_user.wear_mask.inventory_flags & COVERMOUTH))) + to_chat(human_user, span_boldnotice("Remove your mask!")) return FALSE //CPR - if(H.do_actions) + if(human_user.do_actions) return TRUE - H.visible_message(span_danger("[H] is trying perform CPR on [src]!"), null, null, 4) + human_user.visible_message(span_danger("[human_user] is trying perform CPR on [src]!"), null, null, 4) - if(!do_after(H, HUMAN_STRIP_DELAY, NONE, src, BUSY_ICON_FRIENDLY, BUSY_ICON_MEDICAL)) + if(!do_after(human_user, HUMAN_STRIP_DELAY, NONE, src, BUSY_ICON_FRIENDLY, BUSY_ICON_MEDICAL)) return TRUE if(health > get_death_threshold() && health < get_crit_threshold()) var/suff = min(getOxyLoss(), 5) //Pre-merge level, less healing, more prevention of dieing. adjustOxyLoss(-suff) updatehealth() - visible_message(span_warning(" [H] performs CPR on [src]!"), + visible_message(span_warning(" [human_user] performs CPR on [src]!"), span_boldnotice("You feel a breath of fresh air enter your lungs. It feels good."), vision_distance = 3) - to_chat(H, span_warning("Repeat at least every 7 seconds.")) + to_chat(human_user, span_warning("Repeat at least every 7 seconds.")) else if(!HAS_TRAIT(src, TRAIT_UNDEFIBBABLE) && !TIMER_COOLDOWN_CHECK(src, COOLDOWN_CPR)) TIMER_COOLDOWN_START(src, COOLDOWN_CPR, 7 SECONDS) dead_ticks -= 5 - visible_message(span_warning(" [H] performs CPR on [src]!"), vision_distance = 3) - to_chat(H, span_warning("The patient gains a little more time. Repeat every 7 seconds.")) + visible_message(span_warning(" [human_user] performs CPR on [src]!"), vision_distance = 3) + to_chat(human_user, span_warning("The patient gains a little more time. Repeat every 7 seconds.")) else - to_chat(H, span_warning("You fail to aid [src].")) + to_chat(human_user, span_warning("You fail to aid [src].")) return TRUE if(INTENT_GRAB) - if(H == src || anchored) + if(human_user == src || anchored) return FALSE - H.start_pulling(src) + human_user.start_pulling(src) return TRUE if(INTENT_HARM) // See if they can attack, and which attacks to use. - if(H == src && !H.do_self_harm) + if(human_user == src && !human_user.do_self_harm) return FALSE - var/datum/unarmed_attack/attack = H.species.unarmed - if(!attack.is_usable(H)) - attack = H.species.secondary_unarmed - if(!attack.is_usable(H)) + var/datum/unarmed_attack/attack = human_user.species.unarmed + if(!attack.is_usable(human_user)) + attack = human_user.species.secondary_unarmed + if(!attack.is_usable(human_user)) return FALSE - if(!H.melee_damage) - H.do_attack_animation(src) + var/attack_verb = pick(attack.attack_verb) + //if you're lying/buckled, the miss chance is ignored anyway + var/target_zone = get_zone_with_miss_chance(human_user.zone_selected, src, 10 - (human_user.skills.getRating(SKILL_CQC) - skills.getRating(SKILL_CQC)) * 5) + + if(!human_user.melee_damage || !target_zone) + human_user.do_attack_animation(src) playsound(loc, attack.miss_sound, 25, TRUE) - visible_message(span_danger("[H] tried to [pick(attack.attack_verb)] [src]!"), null, null, 5) - log_combat(H, src, "[pick(attack.attack_verb)]ed", "(missed)") - if(!H.mind?.bypass_ff && !mind?.bypass_ff && H.faction == faction) + visible_message(span_danger("[human_user] tried to [attack_verb] [src]!"), null, null, 5) + log_combat(human_user, src, "[attack_verb]ed", "(missed)") + if(!human_user.mind?.bypass_ff && !mind?.bypass_ff && human_user.faction == faction) var/turf/T = get_turf(src) - log_ffattack("[key_name(H)] missed a punch against [key_name(src)] in [AREACOORD(T)].") - msg_admin_ff("[ADMIN_TPMONTY(H)] missed a punch against [ADMIN_TPMONTY(src)] in [ADMIN_VERBOSEJMP(T)].") + log_ffattack("[key_name(human_user)] missed a [attack_verb] against [key_name(src)] in [AREACOORD(T)].") + msg_admin_ff("[ADMIN_TPMONTY(human_user)] missed a [attack_verb] against [ADMIN_TPMONTY(src)] in [ADMIN_VERBOSEJMP(T)].") return FALSE - H.do_attack_animation(src, ATTACK_EFFECT_YELLOWPUNCH) - var/max_dmg = H.melee_damage + H.skills.getRating(SKILL_CQC) - var/damage = rand(1, max_dmg) - - var/target_zone = ran_zone(H.zone_selected) + human_user.do_attack_animation(src, ATTACK_EFFECT_YELLOWPUNCH) + var/max_dmg = max(human_user.melee_damage + (human_user.skills.getRating(SKILL_CQC) * CQC_SKILL_DAMAGE_MOD), 3) + var/damage = max_dmg + if(!lying_angle) + damage = rand(1, max_dmg) playsound(loc, attack.attack_sound, 25, TRUE) - visible_message(span_danger("[H] [pick(attack.attack_verb)]ed [src]!"), null, null, 5) + visible_message(span_danger("[human_user] [attack_verb]ed [src]!"), null, null, 5) var/list/hit_report = list() /* RU TGMC EDIT //FUCK MELEE STUNS - if(damage >= 5 && prob(50)) - visible_message(span_danger("[H] has weakened [src]!"), null, null, 5) - apply_effect(modify_by_armor(6 SECONDS, MELEE, def_zone = target_zone), WEAKEN) + if(damage >= 4 && prob(25)) + visible_message(span_danger("[human_user] has weakened [src]!"), null, null, 5) + apply_effect(3 SECONDS, WEAKEN) hit_report += "(KO)" RU TGMC EDIT */ damage += attack.damage @@ -127,21 +131,19 @@ RU TGMC EDIT */ hit_report += "(RAW DMG: [damage])" - log_combat(H, src, "[pick(attack.attack_verb)]ed", "[hit_report.Join(" ")]") - if(!H.mind?.bypass_ff && !mind?.bypass_ff && H.faction == faction) + log_combat(human_user, src, "[attack_verb]ed", "[hit_report.Join(" ")]") + if(!human_user.mind?.bypass_ff && !mind?.bypass_ff && human_user.faction == faction) var/turf/T = get_turf(src) - H.ff_check(damage, src) - log_ffattack("[key_name(H)] punched [key_name(src)] in [AREACOORD(T)] [hit_report.Join(" ")].") - msg_admin_ff("[ADMIN_TPMONTY(H)] punched [ADMIN_TPMONTY(src)] in [ADMIN_VERBOSEJMP(T)] [hit_report.Join(" ")].") + human_user.ff_check(damage, src) + log_ffattack("[key_name(human_user)] punched [key_name(src)] in [AREACOORD(T)] [hit_report.Join(" ")].") + msg_admin_ff("[ADMIN_TPMONTY(human_user)] punched [ADMIN_TPMONTY(src)] in [ADMIN_VERBOSEJMP(T)] [hit_report.Join(" ")].") if(INTENT_DISARM) - H.do_attack_animation(src, ATTACK_EFFECT_DISARM) - - var/target_zone = ran_zone(H.zone_selected) + human_user.do_attack_animation(src, ATTACK_EFFECT_DISARM) //Accidental gun discharge - if(user.skills.getRating(SKILL_CQC) < SKILL_CQC_MP) + if(human_user.skills.getRating(SKILL_CQC) < SKILL_CQC_MP) if (istype(r_hand,/obj/item/weapon/gun) || istype(l_hand,/obj/item/weapon/gun)) var/obj/item/weapon/gun/W = null var/chance = 0 @@ -156,39 +158,38 @@ RU TGMC EDIT */ if(prob(chance)) visible_message("[src]'s [W] goes off during struggle!", null, null, 5) - log_combat(H, src, "disarmed", "making their [W] go off") + log_combat(human_user, src, "disarmed", "making their [W] go off") var/list/turfs = list() for(var/turf/T in view()) turfs += T var/turf/target = pick(turfs) return W.afterattack(target,src) - var/randn = rand(1, 100) + skills.getRating(SKILL_CQC) * CQC_SKILL_DISARM_MOD - H.skills.getRating(SKILL_CQC) * CQC_SKILL_DISARM_MOD + var/randn = rand(1, 100) + skills.getRating(SKILL_CQC) * CQC_SKILL_DISARM_MOD - human_user.skills.getRating(SKILL_CQC) * CQC_SKILL_DISARM_MOD if (randn <= 25) - apply_effect(modify_by_armor(6 SECONDS, MELEE, def_zone = target_zone), WEAKEN) + apply_effect(3 SECONDS, WEAKEN) playsound(loc, 'sound/weapons/thudswoosh.ogg', 25, 1, 7) - visible_message(span_danger("[H] has pushed [src]!"), null, null, 5) - log_combat(user, src, "pushed") + visible_message(span_danger("[human_user] has pushed [src]!"), null, null, 5) + log_combat(human_user, src, "pushed") return if(randn <= 60) //BubbleWrap: Disarming breaks a pull if(pulling) - visible_message(span_danger("[H] has broken [src]'s grip on [pulling]!"), null, null, 5) + visible_message(span_danger("[human_user] has broken [src]'s grip on [pulling]!"), null, null, 5) stop_pulling() else drop_held_item() - visible_message(span_danger("[H] has disarmed [src]!"), null, null, 5) + visible_message(span_danger("[human_user] has disarmed [src]!"), null, null, 5) playsound(loc, 'sound/weapons/thudswoosh.ogg', 25, 1, 7) log_combat(user, src, "disarmed") return playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, 7) - visible_message(span_danger("[H] attempted to disarm [src]!"), null, null, 5) - log_combat(user, src, "missed a disarm") - return + visible_message(span_danger("[human_user] attempted to disarm [src]!"), null, null, 5) + log_combat(human_user, src, "missed a disarm") /mob/living/carbon/human/proc/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, inrange, params) return @@ -198,7 +199,6 @@ RU TGMC EDIT */ if(src == M) if(holo_card_color) //if we have a triage holocard printed on us, we remove it. holo_card_color = null - update_targeted() visible_message(span_notice("[src] removes the holo card on [p_them()]self."), span_notice("You remove the holo card on yourself."), null, 3) return @@ -280,7 +280,7 @@ RU TGMC EDIT */ else if(burn_treated && burndamage > 0) treat += "(Salved)" var/msg = "My [org.display_name] is [status]. [treat]" - final_msg += status=="OK" ? span_notice(msg) : span_warning (msg) + final_msg += status=="OK" ? span_notice(msg) : span_alert (msg) switch(staminaloss) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 63ff8480470a6..c0b406e882aa8 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -16,7 +16,7 @@ Contains most of the procs that are called when a mob is attacked by something var/list/clothing_items = list(head, wear_mask, wear_suit, w_uniform, gloves, shoes) // What all are we checking? for(var/obj/item/clothing/C in clothing_items) - if(istype(C) && (C.flags_armor_protection & def_zone.body_part)) // Is that body part being targeted covered? + if(istype(C) && (C.armor_protection_flags & def_zone.body_part)) // Is that body part being targeted covered? siemens_coefficient *= C.siemens_coefficient return siemens_coefficient @@ -24,7 +24,7 @@ Contains most of the procs that are called when a mob is attacked by something /mob/living/carbon/human/proc/add_limb_armor(obj/item/armor_item) for(var/i in limbs) var/datum/limb/limb_to_check = i - if(!(limb_to_check.body_part & armor_item.flags_armor_protection)) + if(!(limb_to_check.body_part & armor_item.armor_protection_flags)) continue limb_to_check.add_limb_soft_armor(armor_item.soft_armor) limb_to_check.add_limb_hard_armor(armor_item.hard_armor) @@ -37,7 +37,7 @@ Contains most of the procs that are called when a mob is attacked by something /mob/living/carbon/human/proc/remove_limb_armor(obj/item/armor_item) for(var/i in limbs) var/datum/limb/limb_to_check = i - if(!(limb_to_check.body_part & armor_item.flags_armor_protection)) + if(!(limb_to_check.body_part & armor_item.armor_protection_flags)) continue limb_to_check.remove_limb_soft_armor(armor_item.soft_armor) limb_to_check.remove_limb_hard_armor(armor_item.hard_armor) @@ -54,7 +54,7 @@ Contains most of the procs that are called when a mob is attacked by something if(!bp) continue if(bp && istype(bp ,/obj/item/clothing)) var/obj/item/clothing/C = bp - if(C.flags_armor_protection & HEAD) + if(C.armor_protection_flags & HEAD) return 1 return 0 @@ -72,13 +72,13 @@ Contains most of the procs that are called when a mob is attacked by something ..() /mob/living/carbon/human/has_smoke_protection() - if(istype(wear_mask) && wear_mask.flags_inventory & BLOCKGASEFFECT) + if(istype(wear_mask) && wear_mask.inventory_flags & BLOCKGASEFFECT) return TRUE - if(istype(glasses) && glasses.flags_inventory & BLOCKGASEFFECT) + if(istype(glasses) && glasses.inventory_flags & BLOCKGASEFFECT) return TRUE if(head && istype(head, /obj/item/clothing)) var/obj/item/clothing/CH = head - if(CH.flags_inventory & BLOCKGASEFFECT) + if(CH.inventory_flags & BLOCKGASEFFECT) return TRUE return ..() @@ -106,6 +106,19 @@ Contains most of the procs that are called when a mob is attacked by something else target_zone = def_zone ? check_zone(def_zone) : get_zone_with_miss_chance(user.zone_selected, src) + var/attack_verb = LAZYLEN(I.attack_verb) ? pick(I.attack_verb) : "attacked" + + if(!target_zone) + user.do_attack_animation(src) + playsound(loc, 'sound/weapons/punchmiss.ogg', 25, TRUE) + visible_message(span_danger("[user] tried to hit [src] with [I]!"), null, null, 5) + log_combat(user, src, "[attack_verb]", "(missed)") + if(!user.mind?.bypass_ff && !mind?.bypass_ff && user.faction == faction) + var/turf/T = get_turf(src) + log_ffattack("[key_name(user)] missed a attack against [key_name(src)] with [I] in [AREACOORD(T)].") + msg_admin_ff("[ADMIN_TPMONTY(user)] missed an against [ADMIN_TPMONTY(src)] with [I] in [ADMIN_VERBOSEJMP(T)].") + return FALSE + var/datum/limb/affecting = get_limb(target_zone) if(affecting.limb_status & LIMB_DESTROYED) to_chat(user, "What [affecting.display_name]?") @@ -127,7 +140,6 @@ Contains most of the procs that are called when a mob is attacked by something var/applied_damage = modify_by_armor(damage, MELEE, I.penetration, target_zone) var/percentage_penetration = applied_damage / damage * 100 - var/attack_verb = LAZYLEN(I.attack_verb) ? pick(I.attack_verb) : "attacked" var/armor_verb switch(percentage_penetration) if(-INFINITY to 0) @@ -212,14 +224,7 @@ Contains most of the procs that are called when a mob is attacked by something //Melee weapon embedded object code. if(affecting.limb_status & LIMB_DESTROYED) hit_report += "(delimbed [affecting.display_name])" -//RUTGMC edit - item embed disable -/* - else if(I.damtype == BRUTE && !(HAS_TRAIT(I, TRAIT_NODROP) || (I.flags_item & DELONDROP))) - if (percentage_penetration && weapon_sharp && prob(I.embedding.embed_chance)) - user.dropItemToGround(I, TRUE) - I.embed_into(src, affecting) - hit_report += "(embedded in [affecting.display_name])" -*/ + record_melee_damage(user, applied_damage, affecting.limb_status & LIMB_DESTROYED) log_combat(user, src, "attacked", I, "(INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(I.damtype)]) [hit_report.Join(" ")]") if(damage && !user.mind?.bypass_ff && !mind?.bypass_ff && user.faction == faction) @@ -309,11 +314,6 @@ Contains most of the procs that are called when a mob is attacked by something hit_report += "(RAW DMG: [throw_damage])" - if(thrown_item.item_fire_stacks) - fire_stacks += thrown_item.item_fire_stacks - IgniteMob() - hit_report += "(set ablaze)" - //thrown weapon embedded object code. if(affecting.limb_status & LIMB_DESTROYED) hit_report += "(delimbed [affecting.display_name])" diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index 6a4b044f198c9..ae842807b2a48 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -37,8 +37,8 @@ var/g_eyes = 0 var/b_eyes = 0 - var/ethnicity = "Western" // Ethnicity - var/species_type = "" + ///The character's ethnicity + var/ethnicity = "Western" //Skin colour var/r_skin = 0 @@ -48,44 +48,64 @@ //Species specific var/moth_wings = "Plain" - var/lip_style //no lipstick by default- arguably misleading, as it could be used for general makeup + ///The style of the makeup the mob currently has applied. Used to determine the right icon state for on the mob. + var/makeup_style = "" - var/age = 30 //Player's age (pure fluff) - var/b_type = "A+" //Player's bloodtype + ///Character's age (pure fluff) + var/age = 30 - var/underwear = 1 //Which underwear the player wants - var/undershirt = 0 //Which undershirt the player wants. + ///Which underwear the player wants + var/underwear = 1 + ///Which undershirt the player wants. + var/undershirt = 0 - // General information + //The character's citizenship. Fluff. var/citizenship = "" + ///The character's religion. Fluff. var/religion = "" - //Equipment slots - var/obj/item/wear_suit = null - var/obj/item/clothing/under/w_uniform = null - var/obj/item/clothing/shoes/shoes = null - var/obj/item/belt = null - var/obj/item/clothing/gloves/gloves = null - var/obj/item/clothing/glasses/glasses = null - var/obj/item/head = null - var/obj/item/wear_ear = null - var/obj/item/card/id/wear_id = null - var/obj/item/r_store = null - var/obj/item/l_store = null - var/obj/item/s_store = null - - var/icon/stand_icon = null - - var/special_voice = "" // For changing our voice. Used by a symptom. - - var/last_dam = -1 //Used for determining if we need to process all limbs or just some or even none. - - var/mob/remoteview_target - + //Equipment slots. These are all references to items. + + ///The item currently being worn in the suit slot (usually armor) + var/obj/item/wear_suit + ///The item currently inside the suit storage slot (not inside the armor itself) + var/obj/item/s_store + ///The jumpsuit/uniform that's currently being worn. + var/obj/item/clothing/under/w_uniform + ///The shoes currently being worn. + var/obj/item/clothing/shoes/shoes + ///The belt being worn. + var/obj/item/belt + ///The gloves being worn. + var/obj/item/clothing/gloves/gloves + ///The glasses being worn. + var/obj/item/clothing/glasses/glasses + ///The item currently on the character's head. + var/obj/item/head + ///The headset/ear item being worn. + var/obj/item/wear_ear + ///The ID being worn. + var/obj/item/card/id/wear_id + ///The item currently in the right pocket + var/obj/item/r_store + ///The item currently in the left pocket + var/obj/item/l_store + + ///The current standing icon + var/icon/stand_icon + + ///Used for determining if we need to process all limbs or just some or even none. + var/last_dam = -1 + + ///This human's flavor text. Shows up when they're examined. var/flavor_text = "" + ///This human's custom medical record. Fluff. var/med_record = "" + ///This human's custom security record. Fluff. var/sec_record = "" + ///This human's custom employment record. Fluff. var/gen_record = "" + ///This human's custom exploit record. Fluff. var/exploit_record = "" @@ -94,10 +114,13 @@ ///How long the human is dead, in life ticks, which is 2 seconds var/dead_ticks = 0 - var/holo_card_color = "" //which color type of holocard is printed on us + ///Which color type of holocard is printed on us + var/holo_card_color = "" + ///A list of our limb datums var/list/limbs = list() - var/list/internal_organs_by_name = list() // so internal organs have less ickiness too + ///A list of internal organs by name ["organ name"] = /datum/internal_organ + var/list/internal_organs_by_name = list() ///How much dirt the mob's accumulated. Harmless by itself, but can trigger issues with open wounds or surgery. var/germ_level = 0 @@ -106,25 +129,18 @@ ///Whether we can use another command order yet. Either null or a timer ID. var/command_aura_cooldown + ///Strength of the move order aura affecting us var/mobility_aura = 0 + ///Strength of the hold order aura affecting us var/protection_aura = 0 + ///Strength of the focus order aura affecting us var/marksman_aura = 0 - var/datum/squad/assigned_squad //the squad assigned to - - var/cloaking = FALSE - - var/image/SL_directional = null - + ///The squad this human is assigned to + var/datum/squad/assigned_squad + ///Used to help determine the severity icon state for our damage hud overlays var/damageoverlaytemp = 0 - - var/specset //Simple way to track which set has the player taken - - var/static/list/can_ride_typecache = typecacheof(list(/mob/living/carbon/human, /mob/living/simple_animal/parrot)) - - ///Amount of deciseconds gained from the braindeath timer, usually by CPR. - var/revive_grace_time = 0 - + ///The cooldown for being pushed by xenos on harm intent COOLDOWN_DECLARE(xeno_push_delay) /// This is the cooldown on suffering additional effects for when shock gets high diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index b74dc0c3cc617..def861f386480 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -173,10 +173,10 @@ if(!penetrate_thick) switch(target_zone) if("head") - if(head?.flags_inventory & BLOCKSHARPOBJ) + if(head?.inventory_flags & BLOCKSHARPOBJ) . = FALSE else - if(wear_suit?.flags_inventory & BLOCKSHARPOBJ) + if(wear_suit?.inventory_flags & BLOCKSHARPOBJ) . = FALSE if(!. && error_msg && user) // Might need re-wording. @@ -219,19 +219,19 @@ /mob/living/carbon/human/get_permeability_protection() var/list/prot = list("hands"=0, "chest"=0, "groin"=0, "legs"=0, "feet"=0, "arms"=0, "head"=0) for(var/obj/item/I in get_equipped_items()) - if(I.flags_armor_protection & HANDS) + if(I.armor_protection_flags & HANDS) prot["hands"] = max(1 - I.permeability_coefficient, prot["hands"]) - if(I.flags_armor_protection & CHEST) + if(I.armor_protection_flags & CHEST) prot["chest"] = max(1 - I.permeability_coefficient, prot["chest"]) - if(I.flags_armor_protection & GROIN) + if(I.armor_protection_flags & GROIN) prot["groin"] = max(1 - I.permeability_coefficient, prot["groin"]) - if(I.flags_armor_protection & LEGS) + if(I.armor_protection_flags & LEGS) prot["legs"] = max(1 - I.permeability_coefficient, prot["legs"]) - if(I.flags_armor_protection & FEET) + if(I.armor_protection_flags & FEET) prot["feet"] = max(1 - I.permeability_coefficient, prot["feet"]) - if(I.flags_armor_protection & ARMS) + if(I.armor_protection_flags & ARMS) prot["arms"] = max(1 - I.permeability_coefficient, prot["arms"]) - if(I.flags_armor_protection & HEAD) + if(I.armor_protection_flags & HEAD) prot["head"] = max(1 - I.permeability_coefficient, prot["head"]) var/protection = (prot["head"] + prot["arms"] + prot["feet"] + prot["legs"] + prot["groin"] + prot["chest"] + prot["hands"])/7 return protection @@ -243,3 +243,9 @@ . = ..() if(species.name) . += species.name + +///wrapper for a signal to handle opening the squad selector ui just before drop +/mob/living/carbon/human/proc/suggest_squad_assign() + SIGNAL_HANDLER + UnregisterSignal(SSdcs, COMSIG_GLOB_DEPLOY_TIMELOCK_ENDED) + GLOB.squad_selector.interact(src) diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 98dbc24280609..dce5172d6f026 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -8,40 +8,6 @@ var/obj/item/clothing/shoes/S = shoes S.step_action() - -/mob/living/carbon/human/proc/Process_Cloaking_Router(mob/living/carbon/human/user) - if(!user.cloaking) - return - if(istype(back, /obj/item/storage/backpack/marine/satchel/scout_cloak/scout) ) - Process_Cloaking_Scout(user) - else if(istype(back, /obj/item/storage/backpack/marine/satchel/scout_cloak/sniper) ) - Process_Cloaking_Sniper(user) - -/mob/living/carbon/human/proc/Process_Cloaking_Scout(mob/living/carbon/human/user) - var/obj/item/storage/backpack/marine/satchel/scout_cloak/scout/S = back - if(!S.camo_active) - return - if(S.camo_last_shimmer > world.time - SCOUT_CLOAK_STEALTH_DELAY) //Shimmer after taking aggressive actions - alpha = SCOUT_CLOAK_RUN_ALPHA //50% invisible - S.camo_adjust_energy(src, SCOUT_CLOAK_RUN_DRAIN) - else if(S.camo_last_stealth > world.time - SCOUT_CLOAK_STEALTH_DELAY) //We have an initial reprieve at max invisibility allowing us to reposition, albeit at a high drain rate - alpha = SCOUT_CLOAK_STILL_ALPHA //95% invisible - S.camo_adjust_energy(src, SCOUT_CLOAK_RUN_DRAIN) - //Walking stealth - else if(m_intent == MOVE_INTENT_WALK) - alpha = SCOUT_CLOAK_WALK_ALPHA //80% invisible - S.camo_adjust_energy(src, SCOUT_CLOAK_WALK_DRAIN) - //Running and post-attack stealth - else - alpha = SCOUT_CLOAK_RUN_ALPHA //50% invisible - S.camo_adjust_energy(src, SCOUT_CLOAK_RUN_DRAIN) - -/mob/living/carbon/human/proc/Process_Cloaking_Sniper(mob/living/carbon/human/user) - var/obj/item/storage/backpack/marine/satchel/scout_cloak/sniper/S = back - if(!S.camo_active) - return - alpha = initial(alpha) //Sniper variant has *no* mobility stealth, but no drain on movement either - /mob/living/carbon/human/Process_Spacemove() if(restrained()) return FALSE @@ -56,7 +22,7 @@ prob_slip = 0 // Changing this to zero to make it line up with the comment, and also, make more sense. //Do we have magboots or such on if so no slip - if(istype(shoes, /obj/item/clothing/shoes/magboots) && (shoes.flags_inventory & NOSLIPPING)) + if(istype(shoes, /obj/item/clothing/shoes/magboots) && (shoes.inventory_flags & NOSLIPPING)) prob_slip = 0 //Check hands and mod slip @@ -69,8 +35,7 @@ return(prob_slip) -/mob/living/carbon/human/Moved(atom/oldloc, direction) - Process_Cloaking_Router(src) +/mob/living/carbon/human/Moved(atom/old_loc, movement_dir, forced = FALSE, list/old_locs) // Moving around increases germ_level faster if(germ_level < GERM_LEVEL_MOVE_CAP && prob(8)) germ_level++ diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index e6116db991e47..e6b4d5d404d5c 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -138,15 +138,15 @@ if(ITEM_UNEQUIP_UNEQUIPPED) return if(I == wear_suit) + wear_suit = null if(s_store) dropItemToGround(s_store) - wear_suit = null I.unequipped(src, SLOT_WEAR_SUIT) - if(I.flags_inv_hide & HIDESHOES) + if(I.inv_hide_flags & HIDESHOES) update_inv_shoes() - if(I.flags_inv_hide & (HIDEALLHAIR|HIDETOPHAIR|HIDELOWHAIR) ) + if(I.inv_hide_flags & (HIDEALLHAIR|HIDETOPHAIR|HIDELOWHAIR) ) update_hair() - if(I.flags_inv_hide & HIDEJUMPSUIT) + if(I.inv_hide_flags & HIDEJUMPSUIT) update_inv_w_uniform() update_inv_wear_suit() . = ITEM_UNEQUIP_UNEQUIPPED @@ -166,19 +166,19 @@ . = ITEM_UNEQUIP_UNEQUIPPED else if(I == head) var/updatename = 0 - if(head.flags_inv_hide & HIDEFACE) + if(head.inv_hide_flags & HIDEFACE) updatename = 1 head = null I.unequipped(src, SLOT_HEAD) if(updatename) name = get_visible_name() - if(I.flags_inv_hide & (HIDEALLHAIR|HIDETOPHAIR|HIDELOWHAIR|HIDE_EXCESS_HAIR)) + if(I.inv_hide_flags & (HIDEALLHAIR|HIDETOPHAIR|HIDELOWHAIR|HIDE_EXCESS_HAIR)) update_hair() //rebuild hair - if(I.flags_inv_hide & HIDEEARS) + if(I.inv_hide_flags & HIDEEARS) update_inv_ears() - if(I.flags_inv_hide & HIDEMASK) + if(I.inv_hide_flags & HIDEMASK) update_inv_wear_mask() - if(I.flags_inv_hide & HIDEEYES) + if(I.inv_hide_flags & HIDEEYES) update_inv_glasses() update_inv_head() . = ITEM_UNEQUIP_UNEQUIPPED @@ -236,11 +236,11 @@ /mob/living/carbon/human/wear_mask_update(obj/item/I, equipping) name = get_visible_name() // doing this without a check, still cheaper than doing it every Life() tick -spookydonut - if(I.flags_inv_hide & (HIDEALLHAIR|HIDETOPHAIR|HIDELOWHAIR)) + if(I.inv_hide_flags & (HIDEALLHAIR|HIDETOPHAIR|HIDELOWHAIR)) update_hair() //rebuild hair - if(I.flags_inv_hide & HIDEEARS) + if(I.inv_hide_flags & HIDEEARS) update_inv_ears() - if(I.flags_inv_hide & HIDEEYES) + if(I.inv_hide_flags & HIDEEYES) update_inv_glasses() return ..() @@ -326,15 +326,15 @@ update_inv_gloves() if(SLOT_HEAD) head = W - if(head.flags_inv_hide & HIDEFACE) + if(head.inv_hide_flags & HIDEFACE) name = get_visible_name() - if(head.flags_inv_hide & (HIDEALLHAIR|HIDETOPHAIR|HIDELOWHAIR|HIDE_EXCESS_HAIR)) + if(head.inv_hide_flags & (HIDEALLHAIR|HIDETOPHAIR|HIDELOWHAIR|HIDE_EXCESS_HAIR)) update_hair() //rebuild hair - if(head.flags_inv_hide & HIDEEARS) + if(head.inv_hide_flags & HIDEEARS) update_inv_ears() - if(head.flags_inv_hide & HIDEMASK) + if(head.inv_hide_flags & HIDEMASK) update_inv_wear_mask() - if(head.flags_inv_hide & HIDEEYES) + if(head.inv_hide_flags & HIDEEYES) update_inv_glasses() W.equipped(src, slot) update_inv_head() @@ -344,11 +344,11 @@ update_inv_shoes() if(SLOT_WEAR_SUIT) wear_suit = W - if(wear_suit.flags_inv_hide & HIDESHOES) + if(wear_suit.inv_hide_flags & HIDESHOES) update_inv_shoes() - if(wear_suit.flags_inv_hide & HIDEJUMPSUIT) + if(wear_suit.inv_hide_flags & HIDEJUMPSUIT) update_inv_w_uniform() - if( wear_suit.flags_inv_hide & (HIDEALLHAIR|HIDETOPHAIR|HIDELOWHAIR) ) + if( wear_suit.inv_hide_flags & (HIDEALLHAIR|HIDETOPHAIR|HIDELOWHAIR) ) update_hair() W.equipped(src, slot) update_inv_wear_suit() @@ -505,6 +505,10 @@ return s_store if(ITEM_SLOT_HANDCUFF) return handcuffed + if(ITEM_SLOT_L_HAND) + return l_hand + if(ITEM_SLOT_R_HAND) + return r_hand /mob/living/carbon/human/get_equipped_slot(obj/equipped_item) if(..()) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index d8c90a1d10992..aec21dbf65931 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -33,9 +33,10 @@ else //Dead dead_ticks ++ - var/mob/dead/observer/related_ghost = get_ghost() + var/mob/dead/observer/related_ghost = get_ghost(TRUE) + var/datum/limb/headcheck = get_limb("head") // boolean, determines if the body's ghost can reenter the body - var/ghost_left = !client && !related_ghost?.can_reenter_corpse + var/ghost_left = !mind && (!(!headcheck || (headcheck.limb_status & LIMB_DESTROYED)) || (!(species.species_flags & DETACHABLE_HEAD))) && !related_ghost?.can_reenter_corpse if(dead_ticks > TIME_BEFORE_DNR || ghost_left) set_undefibbable(ghost_left) else @@ -65,8 +66,8 @@ qdel(parasite) DISABLE_BITFIELD(status_flags, XENO_HOST) - if((SSticker.mode?.flags_round_type & MODE_TWO_HUMAN_FACTIONS) && job?.job_cost) - job.add_job_positions(1) + if((SSticker.mode?.round_type_flags & MODE_TWO_HUMAN_FACTIONS) && job?.job_cost) + job.free_job_positions(1) if(hud_list) med_hud_set_status() @@ -74,10 +75,13 @@ if(species.species_flags & NO_BREATHE) return - if(losebreath <= 10) - adjust_Losebreath(-1) //Since this happens before checking to take/heal oxyloss, a losebreath of 1 or less won't do anything. - else + if(pulledby?.grab_state >= GRAB_KILL) + Losebreath(1) + adjustOxyLoss(4) + else if(losebreath > 10) set_Losebreath(10) //Any single hit is functionally capped - to keep someone suffocating, you need continued losebreath applications. + else if(losebreath > 0) + adjust_Losebreath(-1) //Since this happens before checking to take/heal oxyloss, a losebreath of 1 or less won't do anything. if(health < get_crit_threshold() || losebreath) if(HAS_TRAIT(src, TRAIT_IGNORE_SUFFOCATION)) //Prevent losing health from asphyxiation, but natural recovery can still happen. diff --git a/code/modules/mob/living/carbon/human/life/handle_environment.dm b/code/modules/mob/living/carbon/human/life/handle_environment.dm index 18e84cc271094..f5bb141eb4b38 100644 --- a/code/modules/mob/living/carbon/human/life/handle_environment.dm +++ b/code/modules/mob/living/carbon/human/life/handle_environment.dm @@ -18,12 +18,12 @@ //Body temperature adjusts depending on surrounding atmosphere based on your thermal protection var/temp_adj = 0 if(loc_temp < bodytemperature) //Place is colder than we are - var/thermal_protection = get_flags_cold_protection(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to. + var/thermal_protection = get_cold_protection_flags(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to. if(thermal_protection < 1) temp_adj = (1 - thermal_protection) * ((loc_temp - bodytemperature) / BODYTEMP_COLD_DIVISOR) //This will be negative else if (loc_temp > bodytemperature) //Place is hotter than we are - var/thermal_protection = get_flags_heat_protection(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to. + var/thermal_protection = get_heat_protection_flags(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to. if(thermal_protection < 1) temp_adj = (1 - thermal_protection) * ((loc_temp - bodytemperature) / BODYTEMP_HEAT_DIVISOR) diff --git a/code/modules/mob/living/carbon/human/life/handle_fire.dm b/code/modules/mob/living/carbon/human/life/handle_fire.dm index 4eeaa7bf5d865..e5c1d7c0b73c9 100644 --- a/code/modules/mob/living/carbon/human/life/handle_fire.dm +++ b/code/modules/mob/living/carbon/human/life/handle_fire.dm @@ -4,7 +4,7 @@ . = ..() if(.) return - var/thermal_protection = get_flags_heat_protection(30000) //If you don't have fire suit level protection, you get a temperature increase and burns + var/thermal_protection = get_heat_protection_flags(30000) //If you don't have fire suit level protection, you get a temperature increase and burns if((1 - thermal_protection) > 0.0001) adjust_bodytemperature(BODYTEMP_HEATING_MAX) apply_damage(10, BURN, blocked = FIRE) diff --git a/code/modules/mob/living/carbon/human/life/handle_organs.dm b/code/modules/mob/living/carbon/human/life/handle_organs.dm index e76851d836857..e69ebcb3e3f95 100644 --- a/code/modules/mob/living/carbon/human/life/handle_organs.dm +++ b/code/modules/mob/living/carbon/human/life/handle_organs.dm @@ -48,7 +48,7 @@ E.germ_level++ //Hard to stay upright - if(leg_tally > 0 && prob(2.5 * leg_tally)) + if(leg_tally > 0 && prob(2.5 * leg_tally) && !is_buckled()) if(!(species.species_flags & NO_PAIN)) emote("pain") visible_message(span_warning("[src] collapses to the ground!"), \ diff --git a/code/modules/mob/living/carbon/human/life/handle_regular_hud_updates.dm b/code/modules/mob/living/carbon/human/life/handle_regular_hud_updates.dm index 6fe5999cf8231..9a6ddd6fa1f6e 100644 --- a/code/modules/mob/living/carbon/human/life/handle_regular_hud_updates.dm +++ b/code/modules/mob/living/carbon/human/life/handle_regular_hud_updates.dm @@ -12,19 +12,6 @@ clear_fullscreen("brute") clear_fullscreen("oxy") clear_fullscreen("crit") - - if(!hud_used) - return - if(hud_used.nutrition_icon) - hud_used.nutrition_icon.icon_state = "nutrition1" - if(hud_used.toxin_icon) - hud_used.toxin_icon.icon_state = "tox0" - if(hud_used.oxygen_icon) - hud_used.oxygen_icon.icon_state = "oxy0" - if(hud_used.fire_icon) - hud_used.fire_icon.icon_state = "fire0" - if(hud_used.bodytemp_icon) - hud_used.bodytemp_icon.icon_state = "temp0" return if(stat == UNCONSCIOUS && health <= get_crit_threshold()) @@ -102,86 +89,17 @@ if(!hud_used) return - if(hud_used.nutrition_icon) - switch(nutrition) - if(NUTRITION_OVERFED to INFINITY) - hud_used.nutrition_icon.icon_state = "nutrition0" - if(NUTRITION_HUNGRY to NUTRITION_OVERFED) //Not-hungry. - hud_used.nutrition_icon.icon_state = "nutrition1" //Empty icon. - if(NUTRITION_STARVING to NUTRITION_HUNGRY) - hud_used.nutrition_icon.icon_state = "nutrition3" - else - hud_used.nutrition_icon.icon_state = "nutrition4" - - if(hud_used.pressure_icon) - hud_used.pressure_icon.icon_state = "pressure[pressure_alert]" - - if(hud_used.toxin_icon) - if(hal_screwyhud == 4) - hud_used.toxin_icon.icon_state = "tox1" - else - hud_used.toxin_icon.icon_state = "tox0" - if(hud_used.oxygen_icon) - if(hal_screwyhud == 3 || oxygen_alert) - hud_used.oxygen_icon.icon_state = "oxy1" - else - hud_used.oxygen_icon.icon_state = "oxy0" - if(hud_used.fire_icon) - if(fire_alert) - hud_used.fire_icon.icon_state = "fire[fire_alert]" //fire_alert is either 0 if no alert, 1 for cold and 2 for heat. - else - hud_used.fire_icon.icon_state = "fire0" - - if(hud_used.bodytemp_icon) - if(!species) - switch(bodytemperature) //310.055 optimal body temp - if(370 to INFINITY) - hud_used.bodytemp_icon.icon_state = "temp4" - if(350 to 370) - hud_used.bodytemp_icon.icon_state = "temp3" - if(335 to 350) - hud_used.bodytemp_icon.icon_state = "temp2" - if(320 to 335) - hud_used.bodytemp_icon.icon_state = "temp1" - if(300 to 320) - hud_used.bodytemp_icon.icon_state = "temp0" - if(295 to 300) - hud_used.bodytemp_icon.icon_state = "temp-1" - if(280 to 295) - hud_used.bodytemp_icon.icon_state = "temp-2" - if(260 to 280) - hud_used.bodytemp_icon.icon_state = "temp-3" - else - hud_used.bodytemp_icon.icon_state = "temp-4" - else - var/temp_step - if(bodytemperature >= species.body_temperature) - temp_step = (species.heat_level_1 - species.body_temperature) / 4 - - if(bodytemperature >= species.heat_level_1) - hud_used.bodytemp_icon.icon_state = "temp4" - else if(bodytemperature >= species.body_temperature + temp_step * 3) - hud_used.bodytemp_icon.icon_state = "temp3" - else if(bodytemperature >= species.body_temperature + temp_step * 2) - hud_used.bodytemp_icon.icon_state = "temp2" - else if(bodytemperature >= species.body_temperature + temp_step * 1) - hud_used.bodytemp_icon.icon_state = "temp1" - else - hud_used.bodytemp_icon.icon_state = "temp0" - - else if(bodytemperature < species.body_temperature) - temp_step = (species.body_temperature - species.cold_level_1)/4 - - if(bodytemperature <= species.cold_level_1) - hud_used.bodytemp_icon.icon_state = "temp-4" - else if(bodytemperature <= species.body_temperature - temp_step * 3) - hud_used.bodytemp_icon.icon_state = "temp-3" - else if(bodytemperature <= species.body_temperature - temp_step * 2) - hud_used.bodytemp_icon.icon_state = "temp-2" - else if(bodytemperature <= species.body_temperature - temp_step * 1) - hud_used.bodytemp_icon.icon_state = "temp-1" - else - hud_used.bodytemp_icon.icon_state = "temp0" + hud_used?.nutrition_icon?.update_icon() + + hud_used?.pressure_icon?.update_icon() + + hud_used?.toxin_icon?.update_icon() + + hud_used?.oxygen_icon?.update_icon() + + hud_used?.fire_icon?.update_icon() + + hud_used?.bodytemp_icon?.update_icon() /mob/living/carbon/human/handle_healths_hud_updates() diff --git a/code/modules/mob/living/carbon/human/life/life_helpers.dm b/code/modules/mob/living/carbon/human/life/life_helpers.dm index e67bd115cb2f0..e339c5c7d0a4c 100644 --- a/code/modules/mob/living/carbon/human/life/life_helpers.dm +++ b/code/modules/mob/living/carbon/human/life/life_helpers.dm @@ -13,7 +13,7 @@ var/pressure_adjustment_coefficient = 1 // Assume no protection at first. - if(wear_suit && (wear_suit.flags_inventory & NOPRESSUREDMAGE) && head && (head.flags_inventory & NOPRESSUREDMAGE)) //Complete set of pressure-proof suit worn, assume fully sealed. + if(wear_suit && (wear_suit.inventory_flags & NOPRESSUREDMAGE) && head && (head.inventory_flags & NOPRESSUREDMAGE)) //Complete set of pressure-proof suit worn, assume fully sealed. pressure_adjustment_coefficient = 0 pressure_adjustment_coefficient = min(1, max(pressure_adjustment_coefficient, 0)) //So it isn't less than 0 or larger than 1. @@ -70,35 +70,35 @@ //This proc returns a number made up of the flags for body parts which you are protected on. (such as HEAD, CHEST, GROIN, etc. See setup.dm for the full list) -/mob/living/carbon/human/proc/get_flags_heat_protection_flags(temperature) //Temperature is the temperature you're being exposed to. +/mob/living/carbon/human/proc/get_heat_protection_flags_flags(temperature) //Temperature is the temperature you're being exposed to. var/thermal_protection_flags = NONE //Handle normal clothing if(head) if(head.max_heat_protection_temperature && head.max_heat_protection_temperature >= temperature) - thermal_protection_flags |= head.flags_heat_protection + thermal_protection_flags |= head.heat_protection_flags if(wear_suit) if(wear_suit.max_heat_protection_temperature && wear_suit.max_heat_protection_temperature >= temperature) - thermal_protection_flags |= wear_suit.flags_heat_protection + thermal_protection_flags |= wear_suit.heat_protection_flags if(w_uniform) if(w_uniform.max_heat_protection_temperature && w_uniform.max_heat_protection_temperature >= temperature) - thermal_protection_flags |= w_uniform.flags_heat_protection + thermal_protection_flags |= w_uniform.heat_protection_flags if(shoes) if(shoes.max_heat_protection_temperature && shoes.max_heat_protection_temperature >= temperature) - thermal_protection_flags |= shoes.flags_heat_protection + thermal_protection_flags |= shoes.heat_protection_flags if(gloves) if(gloves.max_heat_protection_temperature && gloves.max_heat_protection_temperature >= temperature) - thermal_protection_flags |= gloves.flags_heat_protection + thermal_protection_flags |= gloves.heat_protection_flags if(wear_mask) if(wear_mask.max_heat_protection_temperature && wear_mask.max_heat_protection_temperature >= temperature) - thermal_protection_flags |= wear_mask.flags_heat_protection + thermal_protection_flags |= wear_mask.heat_protection_flags return thermal_protection_flags -/mob/living/carbon/human/proc/get_flags_heat_protection(temperature) //Temperature is the temperature you're being exposed to. - var/thermal_protection_flags = get_flags_heat_protection_flags(temperature) +/mob/living/carbon/human/proc/get_heat_protection_flags(temperature) //Temperature is the temperature you're being exposed to. + var/thermal_protection_flags = get_heat_protection_flags_flags(temperature) var/thermal_protection = 0 if(thermal_protection_flags) if(thermal_protection_flags & HEAD) @@ -128,42 +128,42 @@ -//See proc/get_flags_heat_protection_flags(temperature) for the description of this proc. -/mob/living/carbon/human/proc/get_flags_cold_protection_flags(temperature, deficit = 0) +//See proc/get_heat_protection_flags_flags(temperature) for the description of this proc. +/mob/living/carbon/human/proc/get_cold_protection_flags_flags(temperature, deficit = 0) var/thermal_protection_flags = NONE //Handle normal clothing if(head) if(head.min_cold_protection_temperature && head.min_cold_protection_temperature <= temperature) - thermal_protection_flags |= head.flags_cold_protection + thermal_protection_flags |= head.cold_protection_flags if(wear_suit) if(wear_suit.min_cold_protection_temperature && wear_suit.min_cold_protection_temperature <= temperature) - thermal_protection_flags |= wear_suit.flags_cold_protection + thermal_protection_flags |= wear_suit.cold_protection_flags if(w_uniform) if(w_uniform.min_cold_protection_temperature && w_uniform.min_cold_protection_temperature <= temperature) - thermal_protection_flags |= w_uniform.flags_cold_protection + thermal_protection_flags |= w_uniform.cold_protection_flags if(shoes) if(shoes.min_cold_protection_temperature && shoes.min_cold_protection_temperature <= temperature) - thermal_protection_flags |= shoes.flags_cold_protection + thermal_protection_flags |= shoes.cold_protection_flags if(gloves) if(gloves.min_cold_protection_temperature && gloves.min_cold_protection_temperature <= temperature) - thermal_protection_flags |= gloves.flags_cold_protection + thermal_protection_flags |= gloves.cold_protection_flags if(wear_mask) if(wear_mask.min_cold_protection_temperature && wear_mask.min_cold_protection_temperature <= temperature) - thermal_protection_flags |= wear_mask.flags_cold_protection + thermal_protection_flags |= wear_mask.cold_protection_flags return thermal_protection_flags -/mob/living/carbon/human/proc/get_flags_cold_protection(temperature) +/mob/living/carbon/human/proc/get_cold_protection_flags(temperature) temperature = max(temperature, 2.7) //There is an occasional bug where the temperature is miscalculated in ares with a small amount of gas on them, so this is necessary to ensure that that bug does not affect this calculation. Space's temperature is 2.7K and most suits that are intended to protect against any cold, protect down to 2.0K. - var/thermal_protection_flags = get_flags_cold_protection_flags(temperature) + var/thermal_protection_flags = get_cold_protection_flags_flags(temperature) var/thermal_protection = 0 if(thermal_protection_flags) diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index f655e631a0c75..37e4e13961bbb 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -8,24 +8,8 @@ /mob/living/carbon/human/GetVoice() - if(GetSpecialVoice()) - return GetSpecialVoice() return real_name - -/mob/living/carbon/human/proc/SetSpecialVoice(new_voice) - if(new_voice) - special_voice = new_voice - - -/mob/living/carbon/human/proc/UnsetSpecialVoice() - special_voice = "" - - -/mob/living/carbon/human/proc/GetSpecialVoice() - return special_voice - - /mob/living/carbon/human/binarycheck() if(wear_ear) var/obj/item/radio/headset/H = wear_ear diff --git a/code/modules/mob/living/carbon/human/species_types/combat_robots.dm b/code/modules/mob/living/carbon/human/species_types/combat_robots.dm new file mode 100644 index 0000000000000..5cbeae0d31083 --- /dev/null +++ b/code/modules/mob/living/carbon/human/species_types/combat_robots.dm @@ -0,0 +1,121 @@ +/datum/species/robot + name = "Combat Robot" + species_type = SPECIES_COMBAT_ROBOT + icobase = 'icons/mob/human_races/r_robot.dmi' + damage_mask_icon = 'icons/mob/dam_mask_robot.dmi' + brute_damage_icon_state = "robot_brute" + burn_damage_icon_state = "robot_burn" + eyes = "blank_eyes" + hud_type = /datum/hud_data/robotic + default_language_holder = /datum/language_holder/robot + namepool = /datum/namepool/robotic + + unarmed_type = /datum/unarmed_attack/punch/strong + total_health = 100 + slowdown = SHOES_SLOWDOWN //because they don't wear boots + + cold_level_1 = -1 + cold_level_2 = -1 + cold_level_3 = -1 + + heat_level_1 = 500 + heat_level_2 = 1000 + heat_level_3 = 2000 + + body_temperature = 350 + + inherent_traits = list(TRAIT_NON_FLAMMABLE, TRAIT_IMMEDIATE_DEFIB) + species_flags = NO_BREATHE|NO_BLOOD|NO_POISON|NO_PAIN|NO_CHEM_METABOLIZATION|NO_STAMINA|DETACHABLE_HEAD|HAS_NO_HAIR|ROBOTIC_LIMBS|IS_INSULATED + + no_equip = list( + SLOT_W_UNIFORM, + SLOT_HEAD, + SLOT_WEAR_MASK, + SLOT_WEAR_SUIT, + SLOT_SHOES, + SLOT_GLOVES, + SLOT_GLASSES, + ) + blood_color = "#2d2055" //an oil-like color - a little note, robots cannot shed blood in any way, due to their flags + hair_color = "#00000000" + has_organ = list() + + + screams = list(MALE = "robot_scream", FEMALE = "robot_scream", PLURAL = "robot_scream", NEUTER = "robot_scream") + paincries = list(MALE = "robot_pain", FEMALE = "robot_pain", PLURAL = "robot_pain", NEUTER = "robot_pain") + goredcries = list(MALE = "robot_scream", FEMALE = "robot_scream", PLURAL = "robot_scream", NEUTER = "robot_scream") + warcries = list(MALE = "robot_warcry", FEMALE = "robot_warcry", PLURAL = "robot_warcry", NEUTER = "robot_warcry") + death_message = "shudders violently whilst spitting out error text before collapsing, their visual sensor darkening..." + special_death_message = "You have been shut down.But it is not the end of you yet... if you still have your body, wait until somebody can resurrect you..." + joinable_roundstart = TRUE + + inherent_actions = list(/datum/action/repair_self) + +/datum/species/robot/on_species_gain(mob/living/carbon/human/H, datum/species/old_species) + . = ..() + H.speech_span = SPAN_ROBOT + H.voice_filter = "afftfilt=real='hypot(re,im)*sin(0)':imag='hypot(re,im)*cos(0)':win_size=512:overlap=1,rubberband=pitch=0.8" + H.health_threshold_crit = -100 + +/datum/species/robot/post_species_loss(mob/living/carbon/human/H) + . = ..() + H.speech_span = initial(H.speech_span) + H.voice_filter = initial(H.voice_filter) + H.health_threshold_crit = -50 + +/datum/species/robot/handle_unique_behavior(mob/living/carbon/human/H) + if(H.health <= 0 && H.health > -50) + H.clear_fullscreen("robotlow") + H.overlay_fullscreen("robothalf", /atom/movable/screen/fullscreen/machine/robothalf) + else if(H.health <= -50) + H.clear_fullscreen("robothalf") + H.overlay_fullscreen("robotlow", /atom/movable/screen/fullscreen/machine/robotlow) + else + H.clear_fullscreen("robothalf") + H.clear_fullscreen("robotlow") + if(H.health > -25) //Staggerslowed if below crit threshold + return + H.Stagger(2 SECONDS) + H.adjust_slowdown(1) + +///Lets a robot repair itself over time at the cost of being stunned and blind +/datum/action/repair_self + name = "Activate autorepair" + action_icon_state = "suit_configure" + keybinding_signals = list( + KEYBINDING_NORMAL = COMSIG_KB_ROBOT_AUTOREPAIR, + ) + +/datum/action/repair_self/can_use_action() + . = ..() + if(!.) + return + return !owner.incapacitated() + +/datum/action/repair_self/action_activate() + . = ..() + if(!. || !ishuman(owner)) + return + var/mob/living/carbon/human/howner = owner + howner.apply_status_effect(STATUS_EFFECT_REPAIR_MODE, 10 SECONDS) + howner.balloon_alert_to_viewers("Repairing") + +/datum/species/robot/alpharii + name = "Hammerhead Combat Robot" + icobase = 'icons/mob/human_races/r_robot_alpharii.dmi' + joinable_roundstart = FALSE + +/datum/species/robot/charlit + name = "Chilvaris Combat Robot" + icobase = 'icons/mob/human_races/r_robot_charlit.dmi' + joinable_roundstart = FALSE + +/datum/species/robot/deltad + name = "Ratcher Combat Robot" + icobase = 'icons/mob/human_races/r_robot_deltad.dmi' + joinable_roundstart = FALSE + +/datum/species/robot/bravada + name = "Sterling Combat Robot" + icobase = 'icons/mob/human_races/r_robot_bravada.dmi' + joinable_roundstart = FALSE diff --git a/code/modules/mob/living/carbon/human/species_types/humans.dm b/code/modules/mob/living/carbon/human/species_types/humans.dm new file mode 100644 index 0000000000000..730774a6a18ed --- /dev/null +++ b/code/modules/mob/living/carbon/human/species_types/humans.dm @@ -0,0 +1,22 @@ +/datum/species/human + name = "Human" + unarmed_type = /datum/unarmed_attack/punch + species_flags = HAS_SKIN_TONE|HAS_LIPS|HAS_UNDERWEAR + count_human = TRUE + + screams = list(MALE = "male_scream", FEMALE = "female_scream") + paincries = list(MALE = "male_pain", FEMALE = "female_pain") + goredcries = list(MALE = "male_gored", FEMALE = "female_gored") + gasps = list(MALE = "male_gasp", FEMALE = "female_gasp") + coughs = list(MALE = "male_cough", FEMALE = "female_cough") + burstscreams = list(MALE = "male_preburst", FEMALE = "female_preburst") + warcries = list(MALE = "male_warcry", FEMALE = "female_warcry") + special_death_message = "You have perished.
But it is not the end of you yet... if you still have your body with your head still attached, wait until somebody can resurrect you..." + joinable_roundstart = TRUE + +/datum/species/human/prefs_name(datum/preferences/prefs) + . = ..() + if(CONFIG_GET(flag/humans_need_surnames)) + var/firstspace = findtext(., " ") + if(!firstspace || firstspace == length(.)) + . += " " + pick(SSstrings.get_list_from_file("names/last_name")) diff --git a/code/modules/mob/living/carbon/human/species_types/monkeys.dm b/code/modules/mob/living/carbon/human/species_types/monkeys.dm new file mode 100644 index 0000000000000..8895dfba2dfeb --- /dev/null +++ b/code/modules/mob/living/carbon/human/species_types/monkeys.dm @@ -0,0 +1,63 @@ +/datum/species/monkey + name = "Monkey" + icobase = 'icons/mob/human_races/r_monkey.dmi' + species_flags = HAS_NO_HAIR|NO_STAMINA|DETACHABLE_HEAD + inherent_traits = list(TRAIT_CAN_VENTCRAWL) + reagent_tag = IS_MONKEY + eyes = "blank_eyes" + unarmed_type = /datum/unarmed_attack/bite/strong + secondary_unarmed_type = /datum/unarmed_attack/punch/strong + joinable_roundstart = FALSE + death_message = "lets out a faint chimper as it collapses and stops moving..." + dusted_anim = "dust-m" + gibbed_anim = "gibbed-m" + +/datum/species/monkey/handle_unique_behavior(mob/living/carbon/human/H) + if(!H.client && H.stat == CONSCIOUS) + if(prob(33) && H.canmove && !H.buckled && isturf(H.loc) && !H.pulledby) //won't move if being pulled + step(H, pick(GLOB.cardinals)) + + if(prob(1)) + H.emote(pick("scratch","jump","roll","tail")) + +/datum/species/monkey/on_species_gain(mob/living/carbon/human/H, datum/species/old_species) + . = ..() + H.allow_pass_flags |= PASS_LOW_STRUCTURE + +/datum/species/monkey/spec_unarmedattack(mob/living/carbon/human/user, atom/target) + if(!iscarbon(target)) + return FALSE + var/mob/living/carbon/victim = target + if(prob(25)) + victim.visible_message(span_danger("[user]'s bite misses [victim]!"), + span_danger("You avoid [user]'s bite!"), span_hear("You hear jaws snapping shut!")) + to_chat(user, span_danger("Your bite misses [victim]!")) + return TRUE + victim.apply_damage(rand(10, 20), BRUTE, "chest", updating_health = TRUE) + victim.visible_message(span_danger("[name] bites [victim]!"), + span_userdanger("[name] bites you!"), span_hear("You hear a chomp!")) + to_chat(user, span_danger("You bite [victim]!")) + target.attack_hand(user) + return TRUE + +/datum/species/monkey/random_name(gender,unique,lastname) + return "[lowertext(name)] ([rand(1,999)])" + +/datum/species/monkey/farwa + name = "Farwa" + icobase = 'icons/mob/human_races/r_farwa.dmi' + +/datum/species/monkey/naera + name = "Naera" + icobase = 'icons/mob/human_races/r_naera.dmi' + +/datum/species/monkey/stok + name = "Stok" + icobase = 'icons/mob/human_races/r_stok.dmi' + +/datum/species/monkey/yiren + name = "Yiren" + icobase = 'icons/mob/human_races/r_yiren.dmi' + cold_level_1 = ICE_COLONY_TEMPERATURE - 20 + cold_level_2 = ICE_COLONY_TEMPERATURE - 40 + cold_level_3 = ICE_COLONY_TEMPERATURE - 80 diff --git a/code/modules/mob/living/carbon/human/species_types/mothmen.dm b/code/modules/mob/living/carbon/human/species_types/mothmen.dm new file mode 100644 index 0000000000000..528e2dac53cbc --- /dev/null +++ b/code/modules/mob/living/carbon/human/species_types/mothmen.dm @@ -0,0 +1,53 @@ +/datum/species/moth + name = "Moth" + icobase = 'icons/mob/human_races/r_moth.dmi' + default_language_holder = /datum/language_holder/moth + eyes = "blank_eyes" + count_human = TRUE + species_flags = HAS_LIPS|HAS_NO_HAIR + screams = list("neuter" = 'sound/voice/moth_scream.ogg') + paincries = list("neuter" = 'sound/voice/human_male_pain_3.ogg') + goredcries = list("neuter" = 'sound/voice/moth_scream.ogg') + burstscreams = list("neuter" = 'sound/voice/moth_scream.ogg') + warcries = list("neuter" = 'sound/voice/moth_scream.ogg') + + flesh_color = "#E5CD99" + + reagent_tag = IS_MOTH + + namepool = /datum/namepool/moth + +/datum/species/moth/handle_fire(mob/living/carbon/human/H) + if(H.moth_wings != "Burnt Off" && H.bodytemperature >= 400 && H.fire_stacks > 0) + to_chat(H, span_danger("Your precious wings burn to a crisp!")) + H.moth_wings = "Burnt Off" + H.update_body() + +/datum/species/moth/proc/update_moth_wings(mob/living/carbon/human/H) + H.remove_overlay(MOTH_WINGS_LAYER) + H.remove_underlay(MOTH_WINGS_BEHIND_LAYER) + + var/datum/sprite_accessory/moth_wings/wings = GLOB.moth_wings_list[H.moth_wings] + + if(wings) + H.overlays_standing[MOTH_WINGS_LAYER] = image(wings.icon, icon_state = "m_moth_wings_[wings.icon_state]_FRONT") + H.underlays_standing[MOTH_WINGS_BEHIND_LAYER] = image(wings.icon, icon_state = "m_moth_wings_[wings.icon_state]_BEHIND") + H.apply_overlay(MOTH_WINGS_LAYER) + H.apply_underlay(MOTH_WINGS_BEHIND_LAYER) + +/datum/species/moth/update_body(mob/living/carbon/human/H) + update_moth_wings(H) + +/datum/species/moth/update_inv_head(mob/living/carbon/human/H) + update_moth_wings(H) + +/datum/species/moth/update_inv_w_uniform(mob/living/carbon/human/H) + update_moth_wings(H) + +/datum/species/moth/update_inv_wear_suit(mob/living/carbon/human/H) + update_moth_wings(H) + +/datum/species/moth/post_species_loss(mob/living/carbon/human/H) + . = ..() + H.remove_overlay(MOTH_WINGS_LAYER) + H.remove_underlay(MOTH_WINGS_BEHIND_LAYER) diff --git a/code/modules/mob/living/carbon/human/species_types/sectoids.dm b/code/modules/mob/living/carbon/human/species_types/sectoids.dm new file mode 100644 index 0000000000000..926693eb8924d --- /dev/null +++ b/code/modules/mob/living/carbon/human/species_types/sectoids.dm @@ -0,0 +1,20 @@ +/datum/species/sectoid + name = "Sectoid" + icobase = 'icons/mob/human_races/r_sectoid.dmi' + default_language_holder = /datum/language_holder/sectoid + eyes = "blank_eyes" + count_human = TRUE + total_health = 80 + + species_flags = HAS_NO_HAIR|NO_BREATHE|NO_POISON|NO_PAIN|USES_ALIEN_WEAPONS|NO_DAMAGE_OVERLAY + + paincries = list("neuter" = 'sound/voice/sectoid_death.ogg') + death_sound = 'sound/voice/sectoid_death.ogg' + + blood_color = "#00FF00" + flesh_color = "#C0C0C0" + + reagent_tag = IS_SECTOID + + namepool = /datum/namepool/sectoid + special_death_message = "You have perished." diff --git a/code/modules/mob/living/carbon/human/species_types/skeletons.dm b/code/modules/mob/living/carbon/human/species_types/skeletons.dm new file mode 100644 index 0000000000000..d9473f4c7dc3d --- /dev/null +++ b/code/modules/mob/living/carbon/human/species_types/skeletons.dm @@ -0,0 +1,16 @@ +/datum/species/skeleton + name = "Skeleton" + icobase = 'icons/mob/human_races/r_skeleton.dmi' + unarmed_type = /datum/unarmed_attack/punch + count_human = TRUE + + species_flags = NO_BREATHE|NO_SCAN|NO_BLOOD|NO_POISON|NO_CHEM_METABOLIZATION|DETACHABLE_HEAD // Where we're going, we don't NEED underwear + + screams = list("neuter" = 'sound/voice/skeleton_scream.ogg') // RATTLE ME BONES + paincries = list("neuter" = 'sound/voice/skeleton_scream.ogg') + goredcries = list("neuter" = 'sound/voice/skeleton_scream.ogg') + burstscreams = list("neuter" = 'sound/voice/moth_scream.ogg') + death_message = "collapses in a pile of bones, with a final rattle..." + death_sound = list("neuter" = 'sound/voice/skeleton_scream.ogg') + warcries = list("neuter" = 'sound/voice/skeleton_warcry.ogg') // AAAAAAAAAAAAAAAAAAAAAAAAAAAAA + namepool = /datum/namepool/skeleton diff --git a/code/modules/mob/living/carbon/human/species_types/synthetics.dm b/code/modules/mob/living/carbon/human/species_types/synthetics.dm new file mode 100644 index 0000000000000..159c996e4eb84 --- /dev/null +++ b/code/modules/mob/living/carbon/human/species_types/synthetics.dm @@ -0,0 +1,143 @@ +/datum/species/synthetic + name = "Synthetic" + hud_type = /datum/hud_data/robotic + default_language_holder = /datum/language_holder/synthetic + unarmed_type = /datum/unarmed_attack/punch + + total_health = 125 //more health than regular humans + + brute_mod = 0.7 + burn_mod = 0.8 // A slight amount of burn resistance. Changed from 0.7 due to their critical condition phase + + cold_level_1 = -1 + cold_level_2 = -1 + cold_level_3 = -1 + + heat_level_1 = 500 + heat_level_2 = 1000 + heat_level_3 = 2000 + + body_temperature = 350 + + species_flags = NO_BREATHE|NO_SCAN|NO_BLOOD|NO_POISON|NO_PAIN|IS_SYNTHETIC|NO_CHEM_METABOLIZATION|NO_STAMINA|DETACHABLE_HEAD|HAS_LIPS|HAS_UNDERWEAR|HAS_SKIN_COLOR|ROBOTIC_LIMBS|GREYSCALE_BLOOD + + blood_color = "#EEEEEE" + + has_organ = list() + + lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE + see_in_dark = 8 + + screams = list(MALE = "male_scream", FEMALE = "female_scream") + paincries = list(MALE = "male_pain", FEMALE = "female_pain") + goredcries = list(MALE = "male_gored", FEMALE = "female_gored") + warcries = list(MALE = "male_warcry", FEMALE = "female_warcry") + special_death_message = "You have been shut down.
But it is not the end of you yet... if you still have your body, wait until somebody can resurrect you..." + +/datum/species/synthetic/handle_unique_behavior(mob/living/carbon/human/H) + if(H.health <= -30 && H.stat != DEAD) // Instead of having a critical condition, they overheat and slowly die. + H.apply_effect(4 SECONDS, STUTTER) // Added flavor + H.adjustFireLoss(rand(5, 16)) // Melting!!! + if(prob(12)) + H.visible_message(span_boldwarning("[H] shudders violently and shoots out sparks!"), span_warning("Critical damage sustained. Internal temperature regulation systems offline. Shutdown imminent. Estimated integrity: [round(H.health)]%.")) + do_sparks(4, TRUE, H) + +/datum/species/synthetic/on_species_gain(mob/living/carbon/human/H, datum/species/old_species) + . = ..() + var/datum/atom_hud/AH = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED_SYNTH] + AH.add_hud_to(H) + H.health_threshold_crit = -100 // You overheat below -30 health + + +/datum/species/synthetic/post_species_loss(mob/living/carbon/human/H) + . = ..() + var/datum/atom_hud/AH = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED_SYNTH] + AH.remove_hud_from(H) + H.health_threshold_crit = -50 + +/mob/living/carbon/human/species/synthetic/binarycheck(mob/H) + return TRUE + +/datum/species/synthetic/prefs_name(datum/preferences/prefs) + . = prefs.synthetic_name + if(!. || . == "Undefined") //In case they don't have a name set + switch(prefs.gender) + if(MALE) + . = "David" + if(FEMALE) + . = "Anna" + else + . = "Jeri" + to_chat(prefs.parent, span_warning("You forgot to set your synthetic name in your preferences. Please do so next time.")) + +/datum/species/early_synthetic // Worse at medical, better at engineering. Tougher in general than later synthetics + name = "Early Synthetic" + icobase = 'icons/mob/human_races/r_synthetic.dmi' + hud_type = /datum/hud_data/robotic + default_language_holder = /datum/language_holder/synthetic + unarmed_type = /datum/unarmed_attack/punch + slowdown = 1.15 //Slower than Late Synths + total_health = 200 //Tough boys, very tough boys + brute_mod = 0.6 + burn_mod = 0.6 + + cold_level_1 = -1 + cold_level_2 = -1 + cold_level_3 = -1 + + heat_level_1 = 500 + heat_level_2 = 1000 + heat_level_3 = 2000 + + body_temperature = 350 + + species_flags = NO_BREATHE|NO_SCAN|NO_BLOOD|NO_POISON|NO_PAIN|IS_SYNTHETIC|NO_CHEM_METABOLIZATION|NO_STAMINA|DETACHABLE_HEAD|HAS_UNDERWEAR|ROBOTIC_LIMBS|GREYSCALE_BLOOD + + blood_color = "#EEEEEE" + hair_color = "#000000" + has_organ = list() + + lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE + see_in_dark = 8 + + screams = list(MALE = "male_scream", FEMALE = "female_scream") + paincries = list(MALE = "male_pain", FEMALE = "female_pain") + goredcries = list(MALE = "male_gored", FEMALE = "female_gored") + warcries = list(MALE = "male_warcry", FEMALE = "female_warcry") + special_death_message = "You have been shut down.
But it is not the end of you yet... if you still have your body, wait until somebody can resurrect you..." + +/datum/species/early_synthetic/handle_unique_behavior(mob/living/carbon/human/H) + if(H.health <= -30 && H.stat != DEAD) // Instead of having a critical condition, they overheat and slowly die. + H.apply_effect(4 SECONDS, STUTTER) // Added flavor + H.adjustFireLoss(rand(7, 19)) // Melting even more!!! + if(prob(12)) + H.visible_message(span_boldwarning("[H] shudders violently and shoots out sparks!"), span_warning("Critical damage sustained. Internal temperature regulation systems offline. Shutdown imminent. Estimated integrity: [round(H.health)]%.")) + do_sparks(4, TRUE, H) + +/datum/species/early_synthetic/on_species_gain(mob/living/carbon/human/H, datum/species/old_species) + . = ..() + var/datum/atom_hud/AH = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED_SYNTH] + AH.add_hud_to(H) + H.health_threshold_crit = -100 // You overheat below -30 health + + +/datum/species/early_synthetic/post_species_loss(mob/living/carbon/human/H) + . = ..() + var/datum/atom_hud/AH = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED_SYNTH] + AH.remove_hud_from(H) + H.health_threshold_crit = -50 + +/mob/living/carbon/human/species/early_synthetic/binarycheck(mob/H) + return TRUE + +/datum/species/early_synthetic/prefs_name(datum/preferences/prefs) + . = prefs.synthetic_name + if(!. || . == "Undefined") //In case they don't have a name set + switch(prefs.gender) + if(MALE) + . = "David" + if(FEMALE) + . = "Anna" + else + . = "Jeri" + to_chat(prefs.parent, span_warning("You forgot to set your synthetic name in your preferences. Please do so next time.")) diff --git a/code/modules/mob/living/carbon/human/species_types/vatborns.dm b/code/modules/mob/living/carbon/human/species_types/vatborns.dm new file mode 100644 index 0000000000000..3997b3e1caf6e --- /dev/null +++ b/code/modules/mob/living/carbon/human/species_types/vatborns.dm @@ -0,0 +1,49 @@ +/datum/species/human/vatborn + name = "Vatborn" + icobase = 'icons/mob/human_races/r_vatborn.dmi' + namepool = /datum/namepool/vatborn + +/datum/species/human/vatborn/prefs_name(datum/preferences/prefs) + return prefs.real_name + +/datum/species/human/vatgrown + name = "Vat-Grown Human" + icobase = 'icons/mob/human_races/r_vatgrown.dmi' + brute_mod = 1.05 + burn_mod = 1.05 + slowdown = 0.05 + joinable_roundstart = FALSE + +/datum/species/human/vatgrown/random_name(gender) + return "CS-[gender == FEMALE ? "F": "M"]-[rand(111,999)]" + +/datum/species/human/vatgrown/prefs_name(datum/preferences/prefs) + return prefs.real_name + +/datum/species/human/vatgrown/handle_post_spawn(mob/living/carbon/human/H) + . = ..() + H.h_style = "Bald" + H.set_skills(getSkillsType(/datum/skills/vatgrown)) + +/datum/species/human/vatgrown/early + name = "Early Vat-Grown Human" + brute_mod = 1.3 + burn_mod = 1.3 + slowdown = 0.3 + + var/timerid + +/datum/species/human/vatgrown/early/handle_post_spawn(mob/living/carbon/human/H) + . = ..() + H.set_skills(getSkillsType(/datum/skills/vatgrown/early)) + timerid = addtimer(CALLBACK(src, PROC_REF(handle_age), H), 15 MINUTES, TIMER_STOPPABLE) + +/datum/species/human/vatgrown/early/post_species_loss(mob/living/carbon/human/H) + . = ..() + // Ensure we don't update the species again + if(timerid) + deltimer(timerid) + timerid = null + +/datum/species/human/vatgrown/early/proc/handle_age(mob/living/carbon/human/H) + H.set_species("Vat-Grown Human") diff --git a/code/modules/mob/living/carbon/human/species_types/zombies.dm b/code/modules/mob/living/carbon/human/species_types/zombies.dm new file mode 100644 index 0000000000000..11076f6335e97 --- /dev/null +++ b/code/modules/mob/living/carbon/human/species_types/zombies.dm @@ -0,0 +1,142 @@ +/datum/species/zombie + name = "Zombie" + icobase = 'icons/mob/human_races/r_husk.dmi' + total_health = 125 + species_flags = NO_BREATHE|NO_SCAN|NO_BLOOD|NO_POISON|NO_PAIN|NO_CHEM_METABOLIZATION|NO_STAMINA|HAS_UNDERWEAR|HEALTH_HUD_ALWAYS_DEAD|PARALYSE_RESISTANT + lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE + see_in_dark = 8 + blood_color = "#110a0a" + hair_color = "#000000" + slowdown = 0.5 + default_language_holder = /datum/language_holder/zombie + has_organ = list( + "heart" = /datum/internal_organ/heart, + "lungs" = /datum/internal_organ/lungs, + "liver" = /datum/internal_organ/liver, + "kidneys" = /datum/internal_organ/kidneys, + "brain" = /datum/internal_organ/brain/zombie, + "appendix" = /datum/internal_organ/appendix, + "eyes" = /datum/internal_organ/eyes + ) + ///Sounds made randomly by the zombie + var/list/sounds = list('sound/hallucinations/growl1.ogg','sound/hallucinations/growl2.ogg','sound/hallucinations/growl3.ogg','sound/hallucinations/veryfar_noise.ogg','sound/hallucinations/wail.ogg') + ///Time before resurrecting if dead + var/revive_time = 1 MINUTES + ///How much burn and burn damage can you heal every Life tick (half a sec) + var/heal_rate = 10 + var/faction = FACTION_ZOMBIE + var/claw_type = /obj/item/weapon/zombie_claw + +/datum/species/zombie/on_species_gain(mob/living/carbon/human/H, datum/species/old_species) + . = ..() + H.set_undefibbable() + H.faction = faction + H.language_holder = new default_language_holder() + H.setOxyLoss(0) + H.setToxLoss(0) + H.setCloneLoss(0) + H.dropItemToGround(H.r_hand, TRUE) + H.dropItemToGround(H.l_hand, TRUE) + if(istype(H.wear_id, /obj/item/card/id)) + var/obj/item/card/id/id = H.wear_id + id.access = list() // A bit gamey, but let's say ids have a security against zombies + id.iff_signal = NONE + H.equip_to_slot_or_del(new claw_type, SLOT_R_HAND) + H.equip_to_slot_or_del(new claw_type, SLOT_L_HAND) + var/datum/atom_hud/health_hud = GLOB.huds[DATA_HUD_MEDICAL_OBSERVER] + health_hud.add_hud_to(H) + H.job = new /datum/job/zombie //Prevent from skewing the respawn timer if you take a zombie, it's a ghost role after all + for(var/datum/action/action AS in H.actions) + action.remove_action(H) + var/datum/action/rally_zombie/rally_zombie = new + rally_zombie.give_action(H) + var/datum/action/set_agressivity/set_zombie_behaviour = new + set_zombie_behaviour.give_action(H) + +/datum/species/zombie/post_species_loss(mob/living/carbon/human/H) + . = ..() + var/datum/atom_hud/health_hud = GLOB.huds[DATA_HUD_MEDICAL_OBSERVER] + health_hud.remove_hud_from(H) + qdel(H.r_hand) + qdel(H.l_hand) + for(var/datum/action/action AS in H.actions) + action.remove_action(H) + +/datum/species/zombie/handle_unique_behavior(mob/living/carbon/human/H) + if(prob(10)) + playsound(get_turf(H), pick(sounds), 50) + for(var/datum/limb/limb AS in H.limbs) //Regrow some limbs + if(limb.limb_status & LIMB_DESTROYED && !(limb.parent?.limb_status & LIMB_DESTROYED) && prob(10)) + limb.remove_limb_flags(LIMB_DESTROYED) + if(istype(limb, /datum/limb/hand/l_hand)) + H.equip_to_slot_or_del(new /obj/item/weapon/zombie_claw, SLOT_L_HAND) + else if (istype(limb, /datum/limb/hand/r_hand)) + H.equip_to_slot_or_del(new /obj/item/weapon/zombie_claw, SLOT_R_HAND) + H.update_body() + else if(limb.limb_status & LIMB_BROKEN && prob(20)) + limb.remove_limb_flags(LIMB_BROKEN | LIMB_SPLINTED | LIMB_STABILIZED) + + if(H.health != total_health) + H.heal_limbs(heal_rate) + + for(var/organ_slot in has_organ) + var/datum/internal_organ/internal_organ = H.internal_organs_by_name[organ_slot] + internal_organ?.heal_organ_damage(1) + H.updatehealth() + +/datum/species/zombie/handle_death(mob/living/carbon/human/H) + SSmobs.stop_processing(H) + if(!H.on_fire && H.has_working_organs()) + addtimer(CALLBACK(H, TYPE_PROC_REF(/mob/living/carbon/human, revive_to_crit), TRUE, FALSE), revive_time) + +/datum/species/zombie/create_organs(mob/living/carbon/human/organless_human) + . = ..() + for(var/datum/limb/limb AS in organless_human.limbs) + if(!istype(limb, /datum/limb/head)) + continue + limb.vital = FALSE + return + +/datum/species/zombie/fast + name = "Fast zombie" + slowdown = 0 + +/datum/species/zombie/fast/on_species_gain(mob/living/carbon/human/H, datum/species/old_species) + . = ..() + H.transform = matrix().Scale(0.8, 0.8) + +/datum/species/zombie/fast/post_species_loss(mob/living/carbon/human/H) + . = ..() + H.transform = matrix().Scale(1/(0.8), 1/(0.8)) + +/datum/species/zombie/tank + name = "Tank zombie" + slowdown = 1 + heal_rate = 20 + total_health = 250 + +/datum/species/zombie/tank/on_species_gain(mob/living/carbon/human/H, datum/species/old_species) + . = ..() + H.transform = matrix().Scale(1.2, 1.2) + +/datum/species/zombie/tank/post_species_loss(mob/living/carbon/human/H) + . = ..() + H.transform = matrix().Scale(1/(1.2), 1/(1.2)) + +/datum/species/zombie/strong + name = "Strong zombie" //These are zombies created from marines, they are stronger, but of course rarer + slowdown = -0.5 + heal_rate = 20 + total_health = 200 + +/datum/species/zombie/strong/on_species_gain(mob/living/carbon/human/H, datum/species/old_species) + . = ..() + H.color = COLOR_MAROON + +/datum/species/zombie/psi_zombie + name = "Psi zombie" //reanimated by psionic ability + slowdown = -0.5 + heal_rate = 20 + total_health = 200 + faction = FACTION_SECTOIDS + claw_type = /obj/item/weapon/zombie_claw/no_zombium diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 32546524cb0fa..71607841b6dc0 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -52,7 +52,6 @@ There are several things that need to be remembered: update_body() //Handles updating your mob's icon to reflect their gender/race/complexion etc update_hair() //Handles updating your hair overlay (used to be update_face, but mouth and ...eyes were merged into update_body) - update_targeted() // Updates the target overlay when someone points a gun at you > If you need to update all overlays you can use regenerate_icons(). it works exactly like update_clothing used to. @@ -63,7 +62,6 @@ There are several things that need to be remembered: /mob/living/carbon/human - var/list/overlays_standing[TOTAL_LAYERS] var/list/underlays_standing[TOTAL_UNDERLAYS] var/previous_damage_appearance // store what the body last looked like, so we only have to update it if something changed @@ -285,8 +283,8 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) stand_icon.Blend(eyes, ICON_OVERLAY) //Mouth (lipstick!) - if(lip_style && (species?.species_flags & HAS_LIPS)) //skeletons are allowed to wear lipstick no matter what you think, agouri. - stand_icon.Blend(new/icon('icons/mob/human_face.dmi', "camo_[lip_style]_s"), ICON_OVERLAY) + if(makeup_style && (species?.species_flags & HAS_LIPS)) //skeletons are allowed to wear lipstick no matter what you think, agouri. + stand_icon.Blend(new/icon('icons/mob/human_face.dmi', "camo_[makeup_style]_s"), ICON_OVERLAY) if(species.species_flags & HAS_UNDERWEAR) @@ -310,13 +308,13 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) return //masks and helmets can obscure our hair. - if((head?.flags_inv_hide & HIDEALLHAIR) || (wear_mask?.flags_inv_hide & HIDEALLHAIR)) + if((head?.inv_hide_flags & HIDEALLHAIR) || (wear_mask?.inv_hide_flags & HIDEALLHAIR)) return //base icons var/icon/face_standing = new /icon('icons/mob/human_face.dmi',"bald_s") - if(f_style && !(wear_suit?.flags_inv_hide & HIDELOWHAIR) && !(wear_mask?.flags_inv_hide & HIDELOWHAIR)) + if(f_style && !(wear_suit?.inv_hide_flags & HIDELOWHAIR) && !(wear_mask?.inv_hide_flags & HIDELOWHAIR)) var/datum/sprite_accessory/facial_hair_style = GLOB.facial_hair_styles_list[f_style] if(facial_hair_style?.species_allowed && (species.name in facial_hair_style.species_allowed)) var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s") @@ -328,7 +326,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) face_standing.Blend(facial_s, ICON_OVERLAY) - if(h_style && !(head?.flags_inv_hide & HIDETOPHAIR)) + if(h_style && !(head?.inv_hide_flags & HIDETOPHAIR)) var/datum/sprite_accessory/hair_style = GLOB.hair_styles_list[h_style] if(hair_style && (species.name in hair_style.species_allowed)) var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s") @@ -347,7 +345,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) var/mutable_appearance/hair_final = mutable_appearance(face_standing, layer =-HAIR_LAYER) - if(head?.flags_inv_hide & HIDE_EXCESS_HAIR) + if(head?.inv_hide_flags & HIDE_EXCESS_HAIR) var/image/mask = image('icons/mob/human_face.dmi', null, "Jeager_Mask") mask.render_target = "*[REF(src)]" hair_final.overlays += mask @@ -356,20 +354,6 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) overlays_standing[HAIR_LAYER] = hair_final apply_overlay(HAIR_LAYER) -//Call when target overlay should be added/removed -/mob/living/carbon/human/update_targeted() - remove_overlay(TARGETED_LAYER) - var/image/I - if(holo_card_color) - if(I) - I.overlays += image("icon" = 'icons/effects/Targeted.dmi', "icon_state" = "holo_card_[holo_card_color]") - else - I = image("icon" = 'icons/effects/Targeted.dmi', "icon_state" = "holo_card_[holo_card_color]", "layer" =-TARGETED_LAYER) - if(I) - overlays_standing[TARGETED_LAYER] = I - apply_overlay(TARGETED_LAYER) - - /* --------------------------------------- */ //For legacy support. /mob/living/carbon/human/regenerate_icons() @@ -408,7 +392,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) w_uniform.screen_loc = ui_iclothing client.screen += w_uniform - if(wear_suit?.flags_inv_hide & HIDEJUMPSUIT) + if(wear_suit?.inv_hide_flags & HIDEJUMPSUIT) return overlays_standing[UNIFORM_LAYER] = w_uniform.make_worn_icon(species_type = species.name, slot_name = slot_w_uniform_str, default_icon = 'icons/mob/clothing/uniforms/uniform_0.dmi', default_layer = UNIFORM_LAYER) @@ -484,7 +468,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) if(client && hud_used?.hud_shown && hud_used.inventory_shown) wear_ear.screen_loc = ui_wear_ear client.screen += wear_ear - if((head?.flags_inv_hide & HIDEEARS) || (wear_mask?.flags_inv_hide & HIDEEARS)) + if((head?.inv_hide_flags & HIDEEARS) || (wear_mask?.inv_hide_flags & HIDEEARS)) return overlays_standing[EARS_LAYER] = wear_ear.make_worn_icon(species_type = species.name, slot_name = slot_ear_str, default_icon = 'icons/mob/clothing/ears.dmi', default_layer = EARS_LAYER) @@ -496,7 +480,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) if(client && hud_used?.hud_shown && hud_used.inventory_shown) shoes.screen_loc = ui_shoes client.screen += shoes - if(wear_suit?.flags_inv_hide & HIDESHOES) + if(wear_suit?.inv_hide_flags & HIDESHOES) return if(shoes) @@ -580,7 +564,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) if(!wear_mask) return - if(head?.flags_inv_hide & HIDEMASK) + if(head?.inv_hide_flags & HIDEMASK) return if(client && hud_used?.hud_shown && hud_used.inventory_shown) @@ -621,7 +605,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) client.screen += r_hand r_hand.screen_loc = ui_rhand - overlays_standing[R_HAND_LAYER] = r_hand.make_worn_icon(species_type = species.name, inhands = TRUE, slot_name = slot_r_hand_str, default_icon = 'icons/mob/items_righthand_1.dmi', default_layer = R_HAND_LAYER) + overlays_standing[R_HAND_LAYER] = r_hand.make_worn_icon(species_type = species.name, inhands = TRUE, slot_name = slot_r_hand_str, default_icon = 'icons/mob/inhands/items/items_right.dmi', default_layer = R_HAND_LAYER) apply_overlay(R_HAND_LAYER) @@ -635,7 +619,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) client.screen += l_hand l_hand.screen_loc = ui_lhand - overlays_standing[L_HAND_LAYER] = l_hand.make_worn_icon(species_type = species.name, inhands = TRUE, slot_name = slot_l_hand_str, default_icon = 'icons/mob/items_lefthand_1.dmi', default_layer = L_HAND_LAYER) + overlays_standing[L_HAND_LAYER] = l_hand.make_worn_icon(species_type = species.name, inhands = TRUE, slot_name = slot_l_hand_str, default_icon = 'icons/mob/inhands/items/items_left.dmi', default_layer = L_HAND_LAYER) apply_overlay(L_HAND_LAYER) @@ -668,8 +652,8 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) eyes_l.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD) face_lying.Blend(eyes_l, ICON_OVERLAY) - if(lip_style) - face_lying.Blend(new/icon('icons/mob/human_face.dmi', "lips_[lip_style]_l"), ICON_OVERLAY) + if(makeup_style) + face_lying.Blend(new/icon('icons/mob/human_face.dmi', "lips_[makeup_style]_l"), ICON_OVERLAY) var/image/face_lying_image = new /image(icon = face_lying) return face_lying_image diff --git a/code/modules/mob/living/carbon/human/zombie.dm b/code/modules/mob/living/carbon/human/zombie.dm index 871bbe5304e2f..4e57a29f16802 100644 --- a/code/modules/mob/living/carbon/human/zombie.dm +++ b/code/modules/mob/living/carbon/human/zombie.dm @@ -1,100 +1,28 @@ -/datum/species/zombie - name = "Zombie" - name_plural = "Zombies" - icobase = 'icons/mob/human_races/r_husk.dmi' - total_health = 125 - species_flags = NO_BREATHE|NO_SCAN|NO_BLOOD|NO_POISON|NO_PAIN|NO_CHEM_METABOLIZATION|NO_STAMINA|HAS_UNDERWEAR|HEALTH_HUD_ALWAYS_DEAD|PARALYSE_RESISTANT - lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE - see_in_dark = 8 - blood_color = "#110a0a" - hair_color = "#000000" - slowdown = 0.5 - default_language_holder = /datum/language_holder/zombie - has_organ = list( - "heart" = /datum/internal_organ/heart, - "lungs" = /datum/internal_organ/lungs, - "liver" = /datum/internal_organ/liver, - "kidneys" = /datum/internal_organ/kidneys, - "brain" = /datum/internal_organ/brain/zombie, - "appendix" = /datum/internal_organ/appendix, - "eyes" = /datum/internal_organ/eyes - ) - ///Sounds made randomly by the zombie - var/list/sounds = list('sound/hallucinations/growl1.ogg','sound/hallucinations/growl2.ogg','sound/hallucinations/growl3.ogg','sound/hallucinations/veryfar_noise.ogg','sound/hallucinations/wail.ogg') - ///Time before resurrecting if dead - var/revive_time = 1 MINUTES - ///How much burn and burn damage can you heal every Life tick (half a sec) - var/heal_rate = 10 - -/datum/species/zombie/on_species_gain(mob/living/carbon/human/H, datum/species/old_species) - . = ..() - H.set_undefibbable() - H.faction = FACTION_ZOMBIE - H.language_holder = new default_language_holder() - H.setOxyLoss(0) - H.setToxLoss(0) - H.setCloneLoss(0) - H.dropItemToGround(H.r_hand, TRUE) - H.dropItemToGround(H.l_hand, TRUE) - if(istype(H.wear_id, /obj/item/card/id)) - var/obj/item/card/id/id = H.wear_id - id.access = list() // A bit gamey, but let's say ids have a security against zombies - id.iff_signal = NONE - H.equip_to_slot_or_del(new /obj/item/weapon/zombie_claw, SLOT_R_HAND) - H.equip_to_slot_or_del(new /obj/item/weapon/zombie_claw, SLOT_L_HAND) - var/datum/atom_hud/health_hud = GLOB.huds[DATA_HUD_MEDICAL_OBSERVER] - health_hud.add_hud_to(H) - H.job = new /datum/job/zombie //Prevent from skewing the respawn timer if you take a zombie, it's a ghost role after all - for(var/datum/action/action AS in H.actions) - action.remove_action(H) - var/datum/action/rally_zombie/rally_zombie = new - rally_zombie.give_action(H) - var/datum/action/set_agressivity/set_zombie_behaviour = new - set_zombie_behaviour.give_action(H) - -/datum/species/zombie/post_species_loss(mob/living/carbon/human/H) - . = ..() - var/datum/atom_hud/health_hud = GLOB.huds[DATA_HUD_MEDICAL_OBSERVER] - health_hud.remove_hud_from(H) - qdel(H.r_hand) - qdel(H.l_hand) - for(var/datum/action/action AS in H.actions) - action.remove_action(H) - -/datum/species/zombie/handle_unique_behavior(mob/living/carbon/human/H) - if(prob(10)) - playsound(get_turf(H), pick(sounds), 50) - for(var/datum/limb/limb AS in H.limbs) //Regrow some limbs - if(limb.limb_status & LIMB_DESTROYED && !(limb.parent?.limb_status & LIMB_DESTROYED) && prob(10)) - limb.remove_limb_flags(LIMB_DESTROYED) - if(istype(limb, /datum/limb/hand/l_hand)) - H.equip_to_slot_or_del(new /obj/item/weapon/zombie_claw, SLOT_L_HAND) - else if (istype(limb, /datum/limb/hand/r_hand)) - H.equip_to_slot_or_del(new /obj/item/weapon/zombie_claw, SLOT_R_HAND) - H.update_body() - else if(limb.limb_status & LIMB_BROKEN && prob(20)) - limb.remove_limb_flags(LIMB_BROKEN | LIMB_SPLINTED | LIMB_STABILIZED) +/datum/action/rally_zombie + name = "Rally Zombies" + action_icon_state = "rally_minions" - if(H.health != total_health) - H.heal_limbs(heal_rate) +/datum/action/rally_zombie/action_activate() + owner.emote("roar") + SEND_GLOBAL_SIGNAL(COMSIG_GLOB_AI_MINION_RALLY, owner) + var/datum/action/set_agressivity/set_agressivity = owner.actions_by_path[/datum/action/set_agressivity] + if(set_agressivity) + SEND_SIGNAL(owner, COMSIG_ESCORTING_ATOM_BEHAVIOUR_CHANGED, set_agressivity.zombies_agressive) //New escorting ais should have the same behaviour as old one - for(var/organ_slot in has_organ) - var/datum/internal_organ/internal_organ = H.internal_organs_by_name[organ_slot] - internal_organ?.heal_organ_damage(1) - H.updatehealth() +/datum/action/set_agressivity + name = "Set other zombie behavior" + action_icon_state = "minion_agressive" + ///If zombies should be agressive + var/zombies_agressive = TRUE -/datum/species/zombie/handle_death(mob/living/carbon/human/H) - SSmobs.stop_processing(H) - if(!H.on_fire && H.has_working_organs()) - addtimer(CALLBACK(H, TYPE_PROC_REF(/mob/living/carbon/human, revive_to_crit), TRUE, FALSE), revive_time) +/datum/action/set_agressivity/action_activate() + zombies_agressive = !zombies_agressive + SEND_SIGNAL(owner, COMSIG_ESCORTING_ATOM_BEHAVIOUR_CHANGED, zombies_agressive) + update_button_icon() -/datum/species/zombie/create_organs(mob/living/carbon/human/organless_human) - . = ..() - for(var/datum/limb/limb AS in organless_human.limbs) - if(!istype(limb, /datum/limb/head)) - continue - limb.vital = FALSE - return +/datum/action/set_agressivity/update_button_icon() + action_icon_state = zombies_agressive ? "minion_agressive" : "minion_passive" + return ..() /obj/item/weapon/zombie_claw name = "claws" @@ -104,7 +32,7 @@ sharp = IS_SHARP_ITEM_BIG edge = TRUE attack_verb = list("clawed", "slashed", "torn", "ripped", "diced", "cut", "bit") - flags_item = CAN_BUMP_ATTACK|DELONDROP + item_flags = CAN_BUMP_ATTACK|DELONDROP attack_speed = 8 //Same as unarmed delay pry_capable = IS_PRY_CAPABLE_FORCE ///How much zombium are transferred per hit. Set to zero to remove transmission @@ -145,64 +73,5 @@ if(door.density) //Make sure it's still closed door.open(TRUE) -/datum/species/zombie/fast - name = "Fast zombie" - slowdown = 0 - -/datum/species/zombie/fast/on_species_gain(mob/living/carbon/human/H, datum/species/old_species) - . = ..() - H.transform = matrix().Scale(0.8, 0.8) - -/datum/species/zombie/fast/post_species_loss(mob/living/carbon/human/H) - . = ..() - H.transform = matrix().Scale(1/(0.8), 1/(0.8)) - -/datum/species/zombie/tank - name = "Tank zombie" - slowdown = 1 - heal_rate = 20 - total_health = 250 - -/datum/species/zombie/tank/on_species_gain(mob/living/carbon/human/H, datum/species/old_species) - . = ..() - H.transform = matrix().Scale(1.2, 1.2) - -/datum/species/zombie/tank/post_species_loss(mob/living/carbon/human/H) - . = ..() - H.transform = matrix().Scale(1/(1.2), 1/(1.2)) - -/datum/species/zombie/strong - name = "Strong zombie" //These are zombies created from marines, they are stronger, but of course rarer - slowdown = -0.5 - heal_rate = 20 - total_health = 200 - -/datum/species/zombie/strong/on_species_gain(mob/living/carbon/human/H, datum/species/old_species) - . = ..() - H.color = COLOR_MAROON - -/datum/action/rally_zombie - name = "Rally Zombies" - action_icon_state = "rally_minions" - -/datum/action/rally_zombie/action_activate() - owner.emote("roar") - SEND_GLOBAL_SIGNAL(COMSIG_GLOB_AI_MINION_RALLY, owner) - var/datum/action/set_agressivity/set_agressivity = owner.actions_by_path[/datum/action/set_agressivity] - if(set_agressivity) - SEND_SIGNAL(owner, COMSIG_ESCORTING_ATOM_BEHAVIOUR_CHANGED, set_agressivity.zombies_agressive) //New escorting ais should have the same behaviour as old one - -/datum/action/set_agressivity - name = "Set other zombie behavior" - action_icon_state = "minion_agressive" - ///If zombies should be agressive - var/zombies_agressive = TRUE - -/datum/action/set_agressivity/action_activate() - zombies_agressive = !zombies_agressive - SEND_SIGNAL(owner, COMSIG_ESCORTING_ATOM_BEHAVIOUR_CHANGED, zombies_agressive) - update_button_icon() - -/datum/action/set_agressivity/update_button_icon() - action_icon_state = zombies_agressive ? "minion_agressive" : "minion_passive" - return ..() +/obj/item/weapon/zombie_claw/no_zombium + zombium_per_hit = 0 diff --git a/code/modules/mob/living/carbon/shock.dm b/code/modules/mob/living/carbon/shock.dm index 86d24b3aec93f..dd4d6f19d8ed4 100644 --- a/code/modules/mob/living/carbon/shock.dm +++ b/code/modules/mob/living/carbon/shock.dm @@ -70,6 +70,7 @@ traumatic_shock -= 10 if(analgesic) traumatic_shock = 0 + return traumatic_shock //Broken or ripped off organs and limbs will add quite a bit of pain @@ -94,6 +95,10 @@ traumatic_shock -= 20 + M.protection_aura * 20 //-40 pain for SLs, -80 for Commanders traumatic_shock += reagent_pain_modifier + if(HAS_TRAIT(src, TRAIT_MEDIUM_PAIN_RESIST)) + traumatic_shock += PAIN_REDUCTION_HEAVY + else if(HAS_TRAIT(src, TRAIT_LIGHT_PAIN_RESIST)) + traumatic_shock += PAIN_REDUCTION_MEDIUM return traumatic_shock diff --git a/code/modules/mob/living/carbon/xenomorph/abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities.dm index faed0a4052d5e..78adc784bfc11 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities.dm @@ -15,7 +15,7 @@ var/mob/living/carbon/xenomorph/X = owner if(!istype(X)) return - X.lay_down() + X.toggle_resting() return succeed_activate() // *************************************** @@ -158,7 +158,7 @@ /datum/action/ability/activable/xeno/plant_weeds/ranged/can_use_ability(atom/A, silent = FALSE, override_flags) var/area/area = get_area(A) - if(area.flags_area & MARINE_BASE) + if(area.area_flags & MARINE_BASE) if(!silent) to_chat(owner, span_xenowarning("You cannot weed here!")) return FALSE @@ -223,7 +223,7 @@ /// Extra handling for adding the action for draggin functionality (for instant building) /datum/action/ability/activable/xeno/secrete_resin/give_action(mob/living/L) . = ..() - if(!CHECK_BITFIELD(SSticker.mode?.flags_round_type, MODE_ALLOW_XENO_QUICKBUILD) || !SSresinshaping.active) + if(!CHECK_BITFIELD(SSticker.mode?.round_type_flags, MODE_ALLOW_XENO_QUICKBUILD) || !SSresinshaping.active) return var/mutable_appearance/build_maptext = mutable_appearance(icon = null,icon_state = null, layer = ACTION_LAYER_MAPTEXT) @@ -240,7 +240,7 @@ /// Extra handling to remove the stuff needed for dragging /datum/action/ability/activable/xeno/secrete_resin/remove_action(mob/living/carbon/xenomorph/X) - if(!CHECK_BITFIELD(SSticker.mode?.flags_round_type, MODE_ALLOW_XENO_QUICKBUILD)) + if(!CHECK_BITFIELD(SSticker.mode?.round_type_flags, MODE_ALLOW_XENO_QUICKBUILD)) return ..() UnregisterSignal(owner, list(COMSIG_MOB_MOUSEDRAG, COMSIG_MOB_MOUSEUP, COMSIG_MOB_MOUSEDOWN)) UnregisterSignal(SSdcs, list(COMSIG_GLOB_OPEN_SHUTTERS_EARLY, COMSIG_GLOB_OPEN_TIMED_SHUTTERS_LATE,COMSIG_GLOB_OPEN_TIMED_SHUTTERS_XENO_HIVEMIND,COMSIG_GLOB_TADPOLE_LAUNCHED,COMSIG_GLOB_DROPPOD_LANDED)) @@ -252,7 +252,7 @@ var/mob/living/carbon/xenomorph/X = owner var/atom/A = X.selected_resin action_icon_state = initial(A.name) - if(SSmonitor.gamestate == SHUTTERS_CLOSED && CHECK_BITFIELD(SSticker.mode?.flags_round_type, MODE_ALLOW_XENO_QUICKBUILD) && SSresinshaping.active) + if(SSmonitor.gamestate == SHUTTERS_CLOSED && CHECK_BITFIELD(SSticker.mode?.round_type_flags, MODE_ALLOW_XENO_QUICKBUILD) && SSresinshaping.active) button.cut_overlay(visual_references[VREF_MUTABLE_BUILDING_COUNTER]) var/mutable_appearance/number = visual_references[VREF_MUTABLE_BUILDING_COUNTER] number.maptext = MAPTEXT("[SSresinshaping.quickbuild_points_by_hive[owner.get_xeno_hivenumber()]]") @@ -295,7 +295,7 @@ /datum/action/ability/activable/xeno/secrete_resin/use_ability(atom/A) var/mob/living/carbon/xenomorph/xowner = owner - if(SSmonitor.gamestate == SHUTTERS_CLOSED && CHECK_BITFIELD(SSticker.mode?.flags_round_type, MODE_ALLOW_XENO_QUICKBUILD) && SSresinshaping.active) + if(SSmonitor.gamestate == SHUTTERS_CLOSED && CHECK_BITFIELD(SSticker.mode?.round_type_flags, MODE_ALLOW_XENO_QUICKBUILD) && SSresinshaping.active) preshutter_build_resin(A) else if(get_dist(owner, A) > xowner.xeno_caste.resin_max_range) //Maximum range is defined in the castedatum with resin_max_range, defaults to 0 build_resin(get_turf(owner)) @@ -445,6 +445,169 @@ ability_cost = initial(ability_cost) //Reset the plasma cost owner.record_structures_built() +// Secrete Special Resin +/datum/action/ability/activable/xeno/secrete_special_resin + name = "Secrete Special Resin" + action_icon_state = RESIN_WALL + desc = "Builds whatever special resin you selected" + target_flags = ABILITY_TURF_TARGET + ability_cost = 75 + action_type = ACTION_TOGGLE + keybinding_signals = list( + KEYBINDING_NORMAL = COMSIG_XENOABILITY_SECRETE_SPECIAL_RESIN, + ) + ///Minimum time to build a special resin structure + var/base_wait = 2 SECONDS + ///Multiplicator factor to add to the building time, depends on the health of builder. + var/scaling_wait = 1 SECONDS + ///List of buildable structures. Order corresponds with resin_special_images_list. + var/list/buildable_special_structures = list( + /turf/closed/wall/resin/regenerating/special/bulletproof, + /turf/closed/wall/resin/regenerating/special/fireproof, + /turf/closed/wall/resin/regenerating/special/hardy, + ) + +/datum/action/ability/activable/xeno/secrete_special_resin/give_action(mob/living/L) + . = ..() + var/mutable_appearance/build_maptext = mutable_appearance(icon = null,icon_state = null, layer = ACTION_LAYER_MAPTEXT) + build_maptext.pixel_x = 0 + build_maptext.pixel_y = 25 + build_maptext.maptext = MAPTEXT(GLOB.hive_datums[owner.get_xeno_hivenumber()].special_build_points) + visual_references[VREF_MUTABLE_SPECIAL_RESIN_COUNTER] = build_maptext + +/datum/action/ability/activable/xeno/secrete_special_resin/update_button_icon() + var/mob/living/carbon/xenomorph/X = owner + var/atom/A = X.selected_special_resin + action_icon_state = initial(A.name) + button.cut_overlay(visual_references[VREF_MUTABLE_SPECIAL_RESIN_COUNTER]) + var/mutable_appearance/number = visual_references[VREF_MUTABLE_SPECIAL_RESIN_COUNTER] + number.maptext = MAPTEXT("[GLOB.hive_datums[owner.get_xeno_hivenumber()].special_build_points]") + visual_references[VREF_MUTABLE_SPECIAL_RESIN_COUNTER] = number + button.add_overlay(visual_references[VREF_MUTABLE_SPECIAL_RESIN_COUNTER]) + return ..() + +/datum/action/ability/activable/xeno/secrete_special_resin/action_activate() + //Left click on the secrete resin button opens up radial menu (new type of changing structures). + var/mob/living/carbon/xenomorph/X = owner + if(X.selected_ability != src) + return ..() + . = ..() + var/resin_choice = show_radial_menu(owner, owner, GLOB.resin_special_images_list, radius = 35) + if(!resin_choice) + return + var/i = GLOB.resin_special_images_list.Find(resin_choice) + X.selected_special_resin = buildable_special_structures[i] + var/atom/A = X.selected_special_resin + X.balloon_alert(X, initial(A.name)) + update_button_icon() + +/datum/action/ability/activable/xeno/secrete_special_resin/alternate_action_activate() + //Right click on secrete resin button cycles through to the next construction type (old method of changing structures). + var/mob/living/carbon/xenomorph/X = owner + if(X.selected_ability != src) + return ..() + var/i = buildable_special_structures.Find(X.selected_special_resin) + if(length(buildable_special_structures) == i) + X.selected_special_resin = buildable_special_structures[1] + else + X.selected_special_resin = buildable_special_structures[i+1] + var/atom/A = X.selected_special_resin + X.balloon_alert(X, initial(A.name)) + update_button_icon() + +/datum/action/ability/activable/xeno/secrete_special_resin/use_ability(atom/A) + var/mob/living/carbon/xenomorph/xowner = owner + if(get_dist(owner, A) > xowner.xeno_caste.resin_max_range) //Maximum range is defined in the castedatum with resin_max_range, defaults to 0 + build_special_resin(get_turf(owner)) + else + build_special_resin(get_turf(A)) + +/datum/action/ability/activable/xeno/secrete_special_resin/proc/get_wait() + . = base_wait + if(!scaling_wait) + return + var/mob/living/carbon/xenomorph/X = owner + + return (base_wait + scaling_wait - max(0, (scaling_wait * X.health / X.maxHealth))) + +/datum/action/ability/activable/xeno/secrete_special_resin/proc/build_special_resin(turf/T) + var/mob/living/carbon/xenomorph/X = owner + if(GLOB.hive_datums[owner.get_xeno_hivenumber()].special_build_points <= 0) + owner.balloon_alert(owner, span_notice("There is not enough special build points to build this structure!")) + return + switch(is_valid_for_resin_structure(T, X.selected_special_resin == /obj/structure/mineral_door/resin)) + if(ERROR_CANT_WEED) + owner.balloon_alert(owner, span_notice("This spot cannot support a garden!")) + return + if(ERROR_NO_WEED) + owner.balloon_alert(owner, span_notice("This spot has no weeds to serve as support!")) + return + if(ERROR_NO_SUPPORT) + owner.balloon_alert(owner, span_notice("This spot has no adjaecent support for the structure!")) + return + if(ERROR_NOT_ALLOWED) + owner.balloon_alert(owner, span_notice("The queen mother prohibits us from building here.")) + return + if(ERROR_BLOCKER) + owner.balloon_alert(owner, span_notice("There's another xenomorph blocking the spot!")) + return + if(ERROR_FOG) + owner.balloon_alert(owner, span_notice("The fog will prevent the resin from ever taking shape!")) + return + if(ERROR_CONSTRUCT) + return + if(TRUE) + return + if(!line_of_sight(owner, T)) + owner.balloon_alert(owner, span_notice("You cannot secrete resin without line of sight!")) + return fail_activate() + if(!do_after(X, get_wait(), NONE, T, BUSY_ICON_BUILD)) + return fail_activate() + if(GLOB.hive_datums[owner.get_xeno_hivenumber()].special_build_points <= 0) + owner.balloon_alert(owner, span_notice("There is not enough special build points to build this structure!")) + return + switch(is_valid_for_resin_structure(T, X.selected_special_resin == /obj/structure/mineral_door/resin)) + if(ERROR_CANT_WEED) + owner.balloon_alert(owner, span_notice("This spot cannot support a garden!")) + return + if(ERROR_NO_WEED) + owner.balloon_alert(owner, span_notice("This spot has no weeds to serve as support!")) + return + if(ERROR_NO_SUPPORT) + owner.balloon_alert(owner, span_notice("This spot has no adjaecent support for the structure!")) + return + if(ERROR_NOT_ALLOWED) + owner.balloon_alert(owner, span_notice("The queen mother prohibits us from building here.")) + return + if(ERROR_BLOCKER) + owner.balloon_alert(owner, span_notice("There's another xenomorph blocking the spot!")) + return + if(ERROR_FOG) + owner.balloon_alert(owner, span_notice("The fog will prevent the resin from ever taking shape!")) + return + if(ERROR_CONSTRUCT) + return + if(TRUE) + return + var/atom/AM = X.selected_special_resin + X.visible_message(span_xenowarning("\The [X] regurgitates a thick substance and shapes it into \a [initial(AM.name)]!"), \ + span_xenonotice("We regurgitate some resin and shape it into \a [initial(AM.name)]."), null, 5) + playsound(owner.loc, "alien_resin_build", 25) + var/atom/new_resin + if(ispath(X.selected_resin, /turf)) // We should change turfs, not spawn them in directly + var/list/baseturfs = islist(T.baseturfs) ? T.baseturfs : list(T.baseturfs) + baseturfs |= T.type + T.ChangeTurf(X.selected_special_resin, baseturfs) + new_resin = T + else + new_resin = new X.selected_special_resin(T) + if(new_resin) + add_cooldown(SSmonitor.gamestate == SHUTTERS_CLOSED ? get_cooldown()/2 : get_cooldown()) + succeed_activate(SSmonitor.gamestate == SHUTTERS_CLOSED ? ability_cost/2 : ability_cost) + GLOB.hive_datums[owner.get_xeno_hivenumber()].special_build_points-- + ability_cost = initial(ability_cost) //Reset the plasma cost + owner.record_structures_built() + /datum/action/ability/xeno_action/pheromones name = "Emit Pheromones" action_icon_state = "emit_pheromones" @@ -605,6 +768,9 @@ use_state_flags = ABILITY_USE_BUCKLED /datum/action/ability/activable/xeno/corrosive_acid/can_use_ability(atom/A, silent = FALSE, override_flags) + var/obj/effect/xenomorph/acid/current_acid_type = acid_type + if(SSmonitor.gamestate == SHUTTERS_CLOSED && CHECK_BITFIELD(SSticker.mode?.round_type_flags, MODE_ALLOW_XENO_QUICKBUILD) && SSresinshaping.active) + current_acid_type = /obj/effect/xenomorph/acid/strong //if it is before shutters open, everyone gets strong acid // Check if it's an acid object we're upgrading if (istype(A, /obj/effect/xenomorph/acid)) var/obj/effect/xenomorph/acid/existing_acid = A @@ -620,24 +786,26 @@ if(!silent) owner.balloon_alert(owner, "We can't melt [A]") return FALSE - if(A.resistance_flags & UNACIDABLE || !A.dissolvability(initial(acid_type.acid_strength))) + if(A.resistance_flags & UNACIDABLE || !A.dissolvability(initial(current_acid_type.acid_strength))) if(!silent) owner.balloon_alert(owner, "We cannot dissolve [A]") return FALSE - if(!A.should_apply_acid(initial(acid_type.acid_strength)) || initial(acid_type.acid_strength) <= A.current_acid?.acid_strength) + if(!A.should_apply_acid(initial(acid_type.acid_strength)) || initial(current_acid_type.acid_strength) <= A.current_acid?.acid_strength) if(!silent) owner.balloon_alert(owner, "[A] is already subject to a more or equally powerful acid") return FALSE /datum/action/ability/activable/xeno/corrosive_acid/use_ability(atom/A) var/mob/living/carbon/xenomorph/X = owner - + var/obj/effect/xenomorph/acid/current_acid_type = acid_type + if(SSmonitor.gamestate == SHUTTERS_CLOSED && CHECK_BITFIELD(SSticker.mode?.round_type_flags, MODE_ALLOW_XENO_QUICKBUILD) && SSresinshaping.active) + current_acid_type = /obj/effect/xenomorph/acid/strong //if it is before shutters open, everyone gets strong acid // Check if it's an acid object we're upgrading - if (istype(A, /obj/effect/xenomorph/acid)) + if(istype(A, /obj/effect/xenomorph/acid)) var/obj/effect/xenomorph/acid/existing_acid = A A = existing_acid.acid_t // Swap the target to the target of the acid - if(!A.dissolvability(initial(acid_type.acid_strength))) + if(!A.dissolvability(initial(current_acid_type.acid_strength))) return fail_activate() X.face_atom(A) @@ -651,7 +819,7 @@ var/old_acid_ticks = A.current_acid?.ticks QDEL_NULL(A.current_acid) - A.current_acid = new acid_type(get_turf(A), A, A.dissolvability(initial(acid_type.acid_strength)), old_acid_ticks) + A.current_acid = new current_acid_type(get_turf(A), A, A.dissolvability(initial(current_acid_type.acid_strength)), old_acid_ticks) succeed_activate() @@ -718,7 +886,7 @@ keybinding_signals = list( KEYBINDING_NORMAL = COMSIG_XENOABILITY_XENO_SPIT, ) - use_state_flags = ABILITY_USE_LYING|ABILITY_USE_BUCKLED|ABILITY_DO_AFTER_ATTACK + use_state_flags = ABILITY_USE_LYING|ABILITY_USE_BUCKLED|ABILITY_DO_AFTER_ATTACK|ABILITY_USE_STAGGERED target_flags = ABILITY_MOB_TARGET ///Current target that the xeno is targeting. This is for aiming. var/current_target @@ -813,7 +981,7 @@ ability_cost = X.ammo.spit_cost newspit.generate_bullet(X.ammo, X.ammo.damage * SPIT_UPGRADE_BONUS(X)) newspit.def_zone = X.get_limbzone_target() - newspit.fire_at(current_target, X, null, X.ammo.max_range, X.ammo.shell_speed) + newspit.fire_at(current_target, X, X, X.ammo.max_range, X.ammo.shell_speed) if(can_use_ability(current_target) && X.client) //X.client to make sure autospit doesn't continue for non player mobs. succeed_activate() @@ -1109,8 +1277,8 @@ /mob/living/carbon/xenomorph/proc/add_abilities() for(var/action_path in xeno_caste.actions) - var/datum/action/ability/xeno_action/action = new action_path() - if(!SSticker.mode || SSticker.mode.flags_xeno_abilities & action.gamemode_flags) + var/datum/action/ability/xeno_action/action = new action_path(src) + if(!SSticker.mode || SSticker.mode.xeno_abilities_flags & action.gamemode_flags) action.give_action(src) @@ -1128,12 +1296,12 @@ name = "Psy drain" action_icon_state = "headbite" desc = "Drain the victim of its life force to gain larva and psych points" + ability_cost = 50 use_state_flags = ABILITY_USE_STAGGERED|ABILITY_USE_FORTIFIED|ABILITY_USE_CRESTED //can't use while staggered, defender fortified or crest down keybinding_signals = list( KEYBINDING_NORMAL = COMSIG_XENOABILITY_HEADBITE, ) gamemode_flags = ABILITY_NUCLEARWAR - ability_cost = 100 ///How much larva points it gives (8 points for one larva in distress) var/larva_point_reward = 1 @@ -1206,7 +1374,8 @@ if(HAS_TRAIT(victim, TRAIT_HIVE_TARGET)) SEND_GLOBAL_SIGNAL(COMSIG_GLOB_HIVE_TARGET_DRAINED, X) psy_points_reward = psy_points_reward * 3 - SSpoints.add_psy_points(X.hivenumber, psy_points_reward) + SSpoints.add_strategic_psy_points(X.hivenumber, psy_points_reward) + SSpoints.add_tactical_psy_points(X.hivenumber, psy_points_reward*0.25) var/datum/job/xeno_job = SSjob.GetJobType(/datum/job/xenomorph) xeno_job.add_job_points(larva_point_reward) X.hive.update_tier_limits() diff --git a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm index 0e3c5ec8aecdb..60a7cd6f6b09c 100644 --- a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm +++ b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm @@ -47,7 +47,7 @@ else if(SEND_SIGNAL(X, COMSIG_XENOMORPH_ZONE_SELECT) & COMSIG_ACCURATE_ZONE) affecting = get_limb(X.zone_selected) else - affecting = get_limb(ran_zone(X.zone_selected, 70)) + affecting = get_limb(ran_zone(X.zone_selected, XENO_DEFAULT_ACCURACY - X.xeno_caste.accuracy_malus)) if(!affecting || (random_location && !set_location) || (ignore_destroyed && !affecting.is_usable())) //No organ or it's destroyed, just get a random one affecting = get_limb(ran_zone(null, 0)) if(!affecting || (no_head && affecting == get_limb("head")) || (ignore_destroyed && !affecting.is_usable())) @@ -81,7 +81,7 @@ for(var/i in damage_mod) damage += i - var/armor_pen + var/armor_pen = X.xeno_caste.melee_ap for(var/i in armor_mod) armor_pen += i @@ -166,7 +166,7 @@ if(stat == DEAD) if(istype(wear_ear, /obj/item/radio/headset/mainship)) var/obj/item/radio/headset/mainship/cam_headset = wear_ear - if(cam_headset.camera.status) + if(cam_headset?.camera?.status) cam_headset.camera.toggle_cam(null, FALSE) playsound(loc, "alien_claw_metal", 25, 1) X.do_attack_animation(src, ATTACK_EFFECT_CLAW) @@ -210,29 +210,30 @@ return FALSE //Every other type of nonhuman mob //MARKER OVERRIDE -/mob/living/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) - if(X.status_flags & INCORPOREAL) +/mob/living/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) + if(xeno_attacker.status_flags & INCORPOREAL) return FALSE - if (X.fortify || X.behemoth_charging) + if (xeno_attacker.fortify || xeno_attacker.behemoth_charging) return FALSE - SEND_SIGNAL(X, COMSIG_XENOMORPH_ATTACK_LIVING, src, damage_amount, X.xeno_caste.melee_damage * X.xeno_melee_damage_modifier) + SEND_SIGNAL(xeno_attacker, COMSIG_XENOMORPH_ATTACK_LIVING, src, damage_amount, xeno_attacker.xeno_caste.melee_damage * xeno_attacker.xeno_melee_damage_modifier) - switch(X.a_intent) + switch(xeno_attacker.a_intent) if(INTENT_HELP) if(on_fire) - X.visible_message(span_danger("[X] stares at [src]."), span_notice("We stare at the roasting [src], toasty."), null, 5) + xeno_attacker.visible_message(span_danger("[xeno_attacker] stares at [src]."), span_notice("We stare at the roasting [src], toasty."), null, 5) return FALSE - X.visible_message(span_notice("\The [X] caresses [src] with its scythe-like arm."), \ + + xeno_attacker.visible_message(span_notice("\The [xeno_attacker] caresses [src] with its scythe-like arm."), \ span_notice("We caress [src] with our scythe-like arm."), null, 5) return FALSE if(INTENT_GRAB) - return attack_alien_grab(X) + return attack_alien_grab(xeno_attacker) if(INTENT_HARM, INTENT_DISARM) - return attack_alien_harm(X) + return attack_alien_harm(xeno_attacker) return FALSE /mob/living/attack_larva(mob/living/carbon/xenomorph/larva/M) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/behemoth/abilities_behemoth.dm b/code/modules/mob/living/carbon/xenomorph/castes/behemoth/abilities_behemoth.dm index 609aeec8a7758..b7cd5f6c0d9ed 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/behemoth/abilities_behemoth.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/behemoth/abilities_behemoth.dm @@ -131,7 +131,7 @@ #define LANDSLIDE_ENDING_COLLISION_DELAY 0.3 SECONDS #define LANDSLIDE_KNOCKDOWN_DURATION 1 SECONDS #define LANDSLIDE_DAMAGE_MULTIPLIER 1.2 -#define LANDSLIDE_DAMAGE_MECHA_MODIFIER 20 +#define LANDSLIDE_DAMAGE_VEHICLE_MODIFIER 20 #define LANDSLIDE_OBJECT_INTEGRITY_THRESHOLD 150 #define LANDSLIDE_ENDED_CANCELLED (1<<0) @@ -321,7 +321,6 @@ animate(pixel_y = xeno_owner.pixel_y + (LANDSLIDE_RANGE / 2), time = animation_time / 2, easing = CIRCULAR_EASING|EASE_OUT) animate(pixel_y = initial(xeno_owner.pixel_y), time = animation_time / 2, easing = CIRCULAR_EASING|EASE_IN) return - addtimer(CALLBACK(owner, TYPE_PROC_REF(/atom, balloon_alert), owner, "Use [name] again to cancel"), LANDSLIDE_WIND_UP) add_cooldown(LANDSLIDE_WIND_UP) addtimer(CALLBACK(src, PROC_REF(do_charge), owner_turf, direction, charge_damage, which_step), LANDSLIDE_WIND_UP) @@ -392,9 +391,9 @@ var/obj/structure/earth_pillar/affected_pillar = affected_atom affected_pillar.throw_pillar(get_ranged_target_turf(xeno_owner, xeno_owner.dir, 7), TRUE) continue - if(ismecha(affected_atom)) - var/obj/vehicle/sealed/mecha/affected_mecha = affected_atom - affected_mecha.take_damage(damage * LANDSLIDE_DAMAGE_MECHA_MODIFIER, MELEE) + if(isvehicle(affected_atom)) + var/obj/vehicle/veh_victim = affected_atom + veh_victim.take_damage(damage * LANDSLIDE_DAMAGE_VEHICLE_MODIFIER, MELEE) continue var/obj/affected_object = affected_atom if(!affected_object.density || affected_object.allow_pass_flags & PASS_MOB || affected_object.resistance_flags & INDESTRUCTIBLE) @@ -454,9 +453,9 @@ var/obj/structure/earth_pillar/affected_pillar = affected_atom affected_pillar.throw_pillar(get_ranged_target_turf(xeno_owner, xeno_owner.dir, 7), TRUE) continue - if(ismecha(affected_atom)) - var/obj/vehicle/sealed/mecha/affected_mecha = affected_atom - affected_mecha.take_damage(damage * LANDSLIDE_DAMAGE_MECHA_MODIFIER, MELEE) + if(isvehicle(affected_atom)) + var/obj/vehicle/veh_victim = affected_atom + veh_victim.take_damage(damage * LANDSLIDE_DAMAGE_VEHICLE_MODIFIER, MELEE) continue var/obj/affected_object = affected_atom if(!affected_object.density || affected_object.allow_pass_flags & PASS_MOB || affected_object.resistance_flags & INDESTRUCTIBLE) @@ -687,7 +686,7 @@ qdel(oldest_pillar) update_button_icon() -/* RU TGMC EDIT + // *************************************** // *********** Seismic Fracture // *************************************** @@ -695,7 +694,7 @@ #define SEISMIC_FRACTURE_ATTACK_RADIUS 3 #define SEISMIC_FRACTURE_ATTACK_RADIUS_ENHANCED 5 #define SEISMIC_FRACTURE_ENHANCED_DELAY 1 SECONDS -RU TGMC EDIT */ + /obj/effect/temp_visual/behemoth/seismic_fracture icon = 'icons/effects/64x64.dmi' icon_state = "seismic_fracture" @@ -748,7 +747,7 @@ RU TGMC EDIT */ if(EAST) pixel_x += 18 pixel_y -= 8 -/* RU TGMC EDIT //moved to modular + /datum/action/ability/xeno_action/seismic_fracture name = "Seismic Fracture" action_icon_state = "seismic_fracture" @@ -845,7 +844,7 @@ RU TGMC EDIT */ excepted_turfs += turfs_to_attack iteration++ addtimer(CALLBACK(src, PROC_REF(do_attack_extra), origin_turf, extra_turfs, excepted_turfs, enhanced, range, iteration), SEISMIC_FRACTURE_ENHANCED_DELAY) -RU TGMC EDIT*/ + // *************************************** // *********** Primal Wrath @@ -856,7 +855,7 @@ RU TGMC EDIT*/ #define PRIMAL_WRATH_SPEED_BONUS -0.3 #define PRIMAL_WRATH_DECAY_MULTIPLIER 1.2 #define PRIMAL_WRATH_ACTIVE_DECAY_DIVISION 40 -//#define PRIMAL_WRATH_GAIN_MULTIPLIER 0.3 //RUTGMC EDIT +//#define PRIMAL_WRATH_GAIN_MULTIPLIER 0.3 // RUTGMC EDIT #define PRIMAL_WRATH_LANDSLIDE_CHARGES 3 /particles/primal_wrath @@ -921,14 +920,12 @@ RU TGMC EDIT*/ block_overlay = new(null, src) owner.vis_contents += block_overlay START_PROCESSING(SSprocessing, src) - RegisterSignals(owner, list(COMSIG_QDELETING, COMSIG_MOB_DEATH, COMSIG_XENOMORPH_EVOLVED, COMSIG_XENOMORPH_DEEVOLVED), PROC_REF(stop_ability)) + RegisterSignals(owner, list(COMSIG_MOB_DEATH, COMSIG_XENOMORPH_EVOLVED, COMSIG_XENOMORPH_DEEVOLVED), PROC_REF(stop_ability)) RegisterSignals(owner, list(COMSIG_XENOMORPH_BRUTE_DAMAGE, COMSIG_XENOMORPH_BURN_DAMAGE), PROC_REF(taking_damage)) -/datum/action/ability/xeno_action/primal_wrath/remove_action(mob/living/L) - . = ..() - stop_ability() - /datum/action/ability/xeno_action/primal_wrath/process() + if(!owner) + return PROCESS_KILL var/mob/living/carbon/xenomorph/xeno_owner = owner if(xeno_owner.hivenumber == XENO_HIVE_FALLEN) if(xeno_owner.wrath_stored < xeno_owner.xeno_caste.wrath_max) @@ -1093,7 +1090,7 @@ RU TGMC EDIT*/ earth_riser_action?.cooldown_duration = EARTH_RISER_PRIMAL_WRATH_COOLDOWN earth_riser_action?.change_maximum_pillars() earth_riser_action?.clear_cooldown() - var/datum/action/ability/activable/xeno/seismic_fracture/seismic_fracture_action = xeno_owner.actions_by_path[/datum/action/ability/activable/xeno/seismic_fracture] + var/datum/action/ability/xeno_action/seismic_fracture/seismic_fracture_action = xeno_owner.actions_by_path[/datum/action/ability/xeno_action/seismic_fracture] seismic_fracture_action?.clear_cooldown() RegisterSignal(xeno_owner, COMSIG_ABILITY_SUCCEED_ACTIVATE, PROC_REF(change_cost)) @@ -1242,29 +1239,29 @@ RU TGMC EDIT*/ // Attacking an Earth Pillar as a xeno has a few possible interactions, based on intent: // - Harm intent will reduce a counter in this structure. When the counter hits zero, the structure is destroyed, meaning it is much easier to break it as a xeno. // - Help intent as a Behemoth will trigger an easter egg. Does nothing, just fluff. -/obj/structure/earth_pillar/attack_alien(mob/living/carbon/xenomorph/xeno_user, isrightclick = FALSE) +/obj/structure/earth_pillar/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) var/current_turf = get_turf(src) - switch(xeno_user.a_intent) + switch(xeno_attacker.a_intent) if(INTENT_DISARM, INTENT_GRAB, INTENT_HARM) if(attacks_to_destroy <= 1) - xeno_user.do_attack_animation(src) - xeno_user.balloon_alert(xeno_user, "Destroyed") + xeno_attacker.do_attack_animation(src) + xeno_attacker.balloon_alert(xeno_attacker, "Destroyed") new /obj/effect/temp_visual/behemoth/landslide/hit(current_turf) qdel(src) return TRUE attacks_to_destroy-- - xeno_user.do_attack_animation(src) + xeno_attacker.do_attack_animation(src) do_jitter_animation(jitter_loops = 1) playsound(src, get_sfx("behemoth_earth_pillar_hit"), 40) - xeno_user.balloon_alert(xeno_user, "Attack [attacks_to_destroy] more time(s) to destroy") + xeno_attacker.balloon_alert(xeno_attacker, "Attack [attacks_to_destroy] more time(s) to destroy") new /obj/effect/temp_visual/behemoth/landslide/hit(current_turf) return TRUE if(INTENT_HELP) - if(isxenobehemoth(xeno_user)) - xeno_user.do_attack_animation(src) + if(isxenobehemoth(xeno_attacker)) + xeno_attacker.do_attack_animation(src) do_jitter_animation(jitter_loops = 1) playsound(src, 'sound/effects/behemoth/earth_pillar_eating.ogg', 30, TRUE) - xeno_user.visible_message(span_xenowarning("\The [xeno_user] eats away at the [src.name]!"), \ + xeno_attacker.visible_message(span_xenowarning("\The [xeno_attacker] eats away at the [src.name]!"), \ span_xenonotice(pick( "We eat away at the stone. It tastes good, as expected of our primary diet.", "Mmmmm... Delicious rock. A fitting meal for the hardiest of creatures.", @@ -1300,10 +1297,10 @@ RU TGMC EDIT*/ UnregisterSignal(xeno_owner, COMSIG_QDELETING) xeno_owner = null -/// Calls update_icon_state(). +/// Calls update_appearance, this exists to discard the arguments we get from the signals. /obj/structure/earth_pillar/proc/call_update_icon_state() SIGNAL_HANDLER - update_icon_state() + update_appearance() /// Deletes the pillar and creates a projectile on the same tile, to be fired at the target atom. /obj/structure/earth_pillar/proc/throw_pillar(atom/target_atom, landslide) @@ -1318,7 +1315,7 @@ RU TGMC EDIT*/ var/datum/ammo/xeno/earth_pillar/projectile = landslide? GLOB.ammo_list[/datum/ammo/xeno/earth_pillar/landslide] : GLOB.ammo_list[/datum/ammo/xeno/earth_pillar] var/obj/projectile/new_projectile = new /obj/projectile(source_turf) new_projectile.generate_bullet(projectile) - new_projectile.fire_at(get_turf(target_atom), usr, null, new_projectile.ammo.max_range, loc_override = source_turf) + new_projectile.fire_at(get_turf(target_atom), usr, source_turf, new_projectile.ammo.max_range) /// Seismic Fracture (as in the ability) has a special interaction with any Earth Pillars caught in its attack range. /// Those Earth Pillars will reflect the same attack in a similar range around it, destroying itself afterwards. @@ -1341,7 +1338,7 @@ RU TGMC EDIT*/ icon_state = "earth_pillar" ping = null bullet_color = COLOR_LIGHT_ORANGE - flags_ammo_behavior = AMMO_XENO|AMMO_SKIPS_ALIENS + ammo_behavior_flags = AMMO_XENO|AMMO_SKIPS_ALIENS shell_speed = 1 max_range = 10 damage_falloff = 0 @@ -1396,7 +1393,7 @@ RU TGMC EDIT*/ // *************************************** // *********** Global Procs // *************************************** -#define AREA_ATTACK_DAMAGE_MECHA_MODIFIER 10 +#define AREA_ATTACK_DAMAGE_VEHICLE_MODIFIER 10 /** * Checks for any atoms caught in the attack's range, and applies several effects based on the atom's type. @@ -1427,7 +1424,7 @@ RU TGMC EDIT*/ shake_camera(affected_living, 1, 0.8) affected_living.Paralyze(paralyze_duration) affected_living.apply_damage(attack_damage, BRUTE, blocked = MELEE) - else if(isearthpillar(affected_atom) || ismecha(affected_atom) || istype(affected_atom, /obj/structure/reagent_dispensers/fueltank)) + else if(isearthpillar(affected_atom) || isvehicle(affected_atom) || istype(affected_atom, /obj/structure/reagent_dispensers/fueltank)) affected_atom.do_jitter_animation() new /obj/effect/temp_visual/behemoth/landslide/hit(affected_atom.loc) playsound(affected_atom.loc, get_sfx("behemoth_earth_pillar_hit"), 40) @@ -1441,9 +1438,9 @@ RU TGMC EDIT*/ do_warning(xeno_owner, spread_turfs, wind_up_duration) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(behemoth_area_attack), xeno_owner, spread_turfs, enhanced), wind_up_duration) continue - if(ismecha(affected_atom)) - var/obj/vehicle/sealed/mecha/affected_mecha = affected_atom - affected_mecha.take_damage(attack_damage * AREA_ATTACK_DAMAGE_MECHA_MODIFIER, MELEE) + if(isvehicle(affected_atom)) + var/obj/vehicle/veh_victim = affected_atom + veh_victim.take_damage(attack_damage * AREA_ATTACK_DAMAGE_VEHICLE_MODIFIER, MELEE) continue if(istype(affected_atom, /obj/structure/reagent_dispensers/fueltank)) var/obj/structure/reagent_dispensers/fueltank/affected_tank = affected_atom diff --git a/code/modules/mob/living/carbon/xenomorph/castes/behemoth/behemoth.dm b/code/modules/mob/living/carbon/xenomorph/castes/behemoth/behemoth.dm index 6c9363ba67f66..a1e009ef6386e 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/behemoth/behemoth.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/behemoth/behemoth.dm @@ -26,7 +26,7 @@ if(!behemoth_roll_action || !behemoth_roll_action.charge_ability_on) return FALSE if(behemoth_roll_action.valid_steps_taken == behemoth_roll_action.max_steps_buildup) - icon_state = "Behemoth[is_a_rouny ? " rouny" : ""] Charging" + icon_state = "Behemoth[(xeno_flags & XENO_ROUNY) ? " rouny" : ""] Charging" else icon_state = "Behemoth Rolling" return TRUE diff --git a/code/modules/mob/living/carbon/xenomorph/castes/boiler/abilities_boiler.dm b/code/modules/mob/living/carbon/xenomorph/castes/boiler/abilities_boiler.dm index 520ab6b0ccfbe..ff7f9589ce744 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/boiler/abilities_boiler.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/boiler/abilities_boiler.dm @@ -33,23 +33,22 @@ GLOBAL_LIST_INIT(boiler_glob_image_list, list( keybinding_signals = list( KEYBINDING_NORMAL = COMSIG_XENOABILITY_LONG_RANGE_SIGHT, ) - use_state_flags = ABILITY_USE_ROOTED /datum/action/ability/xeno_action/toggle_long_range/action_activate() var/mob/living/carbon/xenomorph/boiler/X = owner - if(X.is_zoomed) + if(X.xeno_flags & XENO_ZOOMED) X.zoom_out() X.visible_message(span_notice("[X] stops looking off into the distance."), \ span_notice("We stop looking off into the distance."), null, 5) else X.visible_message(span_notice("[X] starts looking off into the distance."), \ span_notice("We start focusing your sight to look off into the distance."), null, 5) - if(!do_after(X, 1 SECONDS, IGNORE_HELD_ITEM, null, BUSY_ICON_GENERIC) || X.is_zoomed) + if(!do_after(X, 1 SECONDS, IGNORE_HELD_ITEM, null, BUSY_ICON_GENERIC) || (X.xeno_flags & XENO_ZOOMED)) return X.zoom_in(4.5) //RU TGMC EDIT ..() -/* RU TGMC EDIT // moved to modular + // *************************************** // *********** Gas type toggle // *************************************** @@ -58,7 +57,7 @@ GLOBAL_LIST_INIT(boiler_glob_image_list, list( name = "Toggle Bombard Type" action_icon_state = "toggle_bomb0" desc = "Switches Boiler Bombard type between available glob types." - use_state_flags = ABILITY_USE_BUSY|ABILITY_USE_LYING|ABILITY_USE_ROOTED + use_state_flags = ABILITY_USE_BUSY|ABILITY_USE_LYING keybinding_signals = list( KEYBINDING_NORMAL = COMSIG_XENOABILITY_TOGGLE_BOMB, KEYBINDING_ALTERNATE = COMSIG_XENOABILITY_TOGGLE_BOMB_RADIAL, @@ -102,6 +101,7 @@ GLOBAL_LIST_INIT(boiler_glob_image_list, list( * * On selecting nothing, merely keeps current ammo. * * Dynamically adjusts depending on which globs a boiler has access to, provided the global lists are maintained, though this fact isn't too relevant unless someone adds more. **/ +/* Moved to modular /datum/action/ability/xeno_action/toggle_bomb/proc/select_glob_radial() var/mob/living/carbon/xenomorph/boiler/X = owner var/list/available_globs = list() @@ -119,7 +119,7 @@ GLOBAL_LIST_INIT(boiler_glob_image_list, list( var/datum/ammo/xeno/boiler_gas/boiler_glob = X.ammo to_chat(X, span_notice(boiler_glob.select_text)) update_button_icon() - +*/ /datum/action/ability/xeno_action/toggle_bomb/update_button_icon() var/mob/living/carbon/xenomorph/boiler/X = owner var/datum/ammo/xeno/boiler_gas/boiler_glob = X.ammo //Should be safe as this always selects a ammo. @@ -136,7 +136,7 @@ GLOBAL_LIST_INIT(boiler_glob_image_list, list( action_icon = 'icons/xeno/actions_boiler_glob.dmi' desc = "Creates a Boiler Bombard of the type currently selected." ability_cost = 200 - use_state_flags = ABILITY_USE_BUSY|ABILITY_USE_LYING|ABILITY_USE_ROOTED + use_state_flags = ABILITY_USE_BUSY|ABILITY_USE_LYING keybinding_signals = list( KEYBINDING_NORMAL = COMSIG_XENOABILITY_CREATE_BOMB, ) @@ -148,7 +148,7 @@ GLOBAL_LIST_INIT(boiler_glob_image_list, list( /datum/action/ability/xeno_action/create_boiler_bomb/action_activate() var/mob/living/carbon/xenomorph/boiler/X = owner - if(X.is_zoomed) + if(X.xeno_flags & XENO_ZOOMED) to_chat(X, span_notice("We can not prepare globules as we are now. We must stop concentrating into the distance!")) return @@ -181,10 +181,8 @@ GLOBAL_LIST_INIT(boiler_glob_image_list, list( desc = "Launch a glob of neurotoxin or acid. Must be rooted to use." keybinding_signals = list( KEYBINDING_NORMAL = COMSIG_XENOABILITY_BOMBARD, - KEYBINDING_ALTERNATE = COMSIG_XENOABILITY_ROOT, ) target_flags = ABILITY_TURF_TARGET - use_state_flags = ABILITY_USE_ROOTED /datum/action/ability/activable/xeno/bombard/get_cooldown() var/mob/living/carbon/xenomorph/boiler/X = owner @@ -192,20 +190,39 @@ GLOBAL_LIST_INIT(boiler_glob_image_list, list( /datum/action/ability/activable/xeno/bombard/on_cooldown_finish() to_chat(owner, span_notice("We feel your toxin glands swell. We are able to bombard an area again.")) + var/mob/living/carbon/xenomorph/boiler/firer = owner + if(firer.selected_ability == src) + firer.set_bombard_pointer() return ..() /datum/action/ability/activable/xeno/bombard/on_selection() + var/mob/living/carbon/xenomorph/boiler/firer = owner + var/current_ammo = firer.corrosive_ammo + firer.neuro_ammo + if(current_ammo <= 0) + to_chat(firer, span_notice("We have nothing prepared to fire.")) + return FALSE + + firer.visible_message(span_notice("\The [firer] begins digging their claws into the ground."), \ + span_notice("We begin digging ourselves into place."), null, 5) + if(!do_after(firer, 3 SECONDS, FALSE, null, BUSY_ICON_HOSTILE)) + on_deselection() + firer.selected_ability = null + firer.update_action_button_icons() + firer.reset_bombard_pointer() + return FALSE + + firer.visible_message(span_notice("\The [firer] digs itself into the ground!"), \ + span_notice("We dig ourselves into place! If we move, we must wait again to fire."), null, 5) + firer.set_bombard_pointer() RegisterSignal(owner, COMSIG_MOB_ATTACK_RANGED, TYPE_PROC_REF(/datum/action/ability/activable/xeno/bombard, on_ranged_attack)) /datum/action/ability/activable/xeno/bombard/on_deselection() + var/mob/living/carbon/xenomorph/boiler/firer = owner + if(firer.selected_ability == src) + firer.reset_bombard_pointer() + to_chat(firer, span_notice("We relax our stance.")) UnregisterSignal(owner, COMSIG_MOB_ATTACK_RANGED) -/// Signal proc for clicking at a distance -/datum/action/ability/activable/xeno/bombard/proc/on_ranged_attack(mob/living/carbon/xenomorph/X, atom/A, params) - SIGNAL_HANDLER - if(can_use_ability(A, TRUE)) - INVOKE_ASYNC(src, PROC_REF(use_ability), A) - /datum/action/ability/activable/xeno/bombard/can_use_ability(atom/A, silent = FALSE, override_flags) . = ..() if(!.) @@ -214,11 +231,6 @@ GLOBAL_LIST_INIT(boiler_glob_image_list, list( var/turf/S = get_turf(owner) var/mob/living/carbon/xenomorph/boiler/boiler_owner = owner - if(!HAS_TRAIT_FROM(owner, TRAIT_IMMOBILE, BOILER_ROOTED_TRAIT)) - if(!silent) - to_chat(owner, span_warning("We need to be rooted to fire!")) - return FALSE - if(istype(boiler_owner.ammo, /datum/ammo/xeno/boiler_gas/corrosive)) if(boiler_owner.corrosive_ammo <= 0) boiler_owner.balloon_alert(boiler_owner, "No corrosive globules.") @@ -228,10 +240,6 @@ GLOBAL_LIST_INIT(boiler_glob_image_list, list( boiler_owner.balloon_alert(boiler_owner, "No neurotoxin globules.") return FALSE - if(!HAS_TRAIT_FROM(boiler_owner, TRAIT_IMMOBILE, BOILER_ROOTED_TRAIT)) - boiler_owner.balloon_alert(boiler_owner, "We need to be rooted to the ground to fire!") - return FALSE - if(!isturf(T) || T.z != S.z) if(!silent) boiler_owner.balloon_alert(boiler_owner, "Invalid target.") @@ -263,7 +271,7 @@ GLOBAL_LIST_INIT(boiler_glob_image_list, list( var/obj/projectile/P = new /obj/projectile(boiler_owner.loc) P.generate_bullet(boiler_owner.ammo) - P.fire_at(target, boiler_owner, null, boiler_owner.ammo.max_range, boiler_owner.ammo.shell_speed) + P.fire_at(target, boiler_owner, boiler_owner, boiler_owner.ammo.max_range, boiler_owner.ammo.shell_speed) playsound(boiler_owner, 'sound/effects/blobattack.ogg', 25, 1) if(istype(boiler_owner.ammo, /datum/ammo/xeno/boiler_gas/corrosive)) GLOB.round_statistics.boiler_acid_smokes++ @@ -279,54 +287,38 @@ GLOBAL_LIST_INIT(boiler_glob_image_list, list( update_button_icon() add_cooldown() +/datum/action/ability/activable/xeno/bombard/clean_action() + var/mob/living/carbon/xenomorph/boiler/firer = owner + firer.reset_bombard_pointer() + return ..() -/datum/action/ability/activable/xeno/bombard/alternate_action_activate() - INVOKE_ASYNC(src, PROC_REF(root)) - return COMSIG_KB_ACTIVATED - - -/// The alternative action of bombard, rooting. It begins the rooting/unrooting process. -/datum/action/ability/activable/xeno/bombard/proc/root() - if(HAS_TRAIT_FROM(owner, TRAIT_IMMOBILE, BOILER_ROOTED_TRAIT)) - owner.balloon_alert_to_viewers("Rooting out of place...") - if(!do_after(owner, 1 SECONDS, IGNORE_HELD_ITEM, null, BUSY_ICON_HOSTILE)) //RUTGMC EDIT - owner.balloon_alert(owner, "Interrupted!") - return - owner.balloon_alert(owner, "Unrooted!") - set_rooted(FALSE) - return - - if(HAS_TRAIT_FROM(owner, TRAIT_FLOORED, RESTING_TRAIT)) - owner.balloon_alert(owner, "Cannot while lying down!") - return - - owner.balloon_alert_to_viewers("Rooting into place...") - if(!do_after(owner, 1 SECONDS, IGNORE_HELD_ITEM, null, BUSY_ICON_HOSTILE)) //RUTGMC EDIT - owner.balloon_alert(owner, "Interrupted!") - return - - owner.balloon_alert_to_viewers("Rooted into place!") - set_rooted(TRUE) - - -/// Proc that actually does the rooting, makes us immobile and anchors us in place. Similar to defender's fortify. -/datum/action/ability/activable/xeno/bombard/proc/set_rooted(on) - var/mob/living/carbon/xenomorph/boiler/boiler_owner = owner - if(on) - ADD_TRAIT(boiler_owner, TRAIT_IMMOBILE, BOILER_ROOTED_TRAIT) - if(boiler_owner.client) - boiler_owner.client.mouse_pointer_icon = 'icons/mecha/mecha_mouse.dmi' - else - REMOVE_TRAIT(boiler_owner, TRAIT_IMMOBILE, BOILER_ROOTED_TRAIT) - if(boiler_owner.client) - boiler_owner.client.mouse_pointer_icon = initial(boiler_owner.client.mouse_pointer_icon) +/// Signal proc for clicking at a distance +/datum/action/ability/activable/xeno/bombard/proc/on_ranged_attack(mob/living/carbon/xenomorph/X, atom/A, params) + SIGNAL_HANDLER + if(can_use_ability(A, TRUE)) + INVOKE_ASYNC(src, PROC_REF(use_ability), A) - boiler_owner.anchored = on -RU TGMC EDIT END*/ +/mob/living/carbon/xenomorph/boiler/Moved(atom/OldLoc,Dir) + . = ..() + if(selected_ability?.type == /datum/action/ability/activable/xeno/bombard) + var/datum/action/ability/activable/bomb = actions_by_path[/datum/action/ability/activable/xeno/bombard] + bomb.on_deselection() + selected_ability.button.icon_state = "template" + selected_ability = null + update_action_button_icons() + +/// Set the boiler's mouse cursor to the green firing cursor. +/mob/living/carbon/xenomorph/boiler/proc/set_bombard_pointer() + if(client) + client.mouse_pointer_icon = 'icons/mecha/mecha_mouse.dmi' + +/// Resets the boiler's mouse cursor to the default cursor. +/mob/living/carbon/xenomorph/boiler/proc/reset_bombard_pointer() + if(client) + client.mouse_pointer_icon = initial(client.mouse_pointer_icon) // *************************************** // *********** Acid spray // *************************************** /datum/action/ability/activable/xeno/spray_acid/line/boiler cooldown_duration = 9 SECONDS - use_state_flags = ABILITY_USE_ROOTED diff --git a/code/modules/mob/living/carbon/xenomorph/castes/boiler/boiler.dm b/code/modules/mob/living/carbon/xenomorph/castes/boiler/boiler.dm index 09ec7333e25c7..f3066d36cd865 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/boiler/boiler.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/boiler/boiler.dm @@ -48,16 +48,6 @@ RU TGMC EDIT */ ammo = GLOB.ammo_list[/datum/ammo/xeno/boiler_gas/corrosive] // RU TGMC EDIT update_boiler_glow() RegisterSignal(src, COMSIG_XENOMORPH_GIBBING, PROC_REF(gib_explode)) -/* RUTGMC EDIT BEGIN - RegisterSignal(src, COMSIG_MOB_STAT_CHANGED, PROC_REF(on_stat_change)) - RegisterSignals(src, list(COMSIG_LIVING_STATUS_STUN, - COMSIG_LIVING_STATUS_KNOCKDOWN, - COMSIG_LIVING_STATUS_PARALYZE, - COMSIG_LIVING_STATUS_IMMOBILIZE, - COMSIG_LIVING_STATUS_UNCONSCIOUS, - COMSIG_LIVING_STATUS_SLEEP, - COMSIG_LIVING_STATUS_STAGGER), PROC_REF(on_stun)) -RUTGMC EDIT END*/ // *************************************** // *********** Gibbing behaviour @@ -68,20 +58,3 @@ RUTGMC EDIT END*/ smoke.set_up(2, get_turf(src)) smoke.start() -/* RUTGMC EDIT BEGIN -/// Handles boilers changing stat, you unroot yourself if you change stat, like going from conscious to unconscious -/mob/living/carbon/xenomorph/boiler/proc/on_stat_change(datum/source, old_state, new_state) - SIGNAL_HANDLER - var/datum/action/ability/activable/xeno/bombard/bombard_action = actions_by_path[/datum/action/ability/activable/xeno/bombard] - if(HAS_TRAIT_FROM(src, TRAIT_IMMOBILE, BOILER_ROOTED_TRAIT)) - bombard_action.set_rooted(FALSE) - -/// Handles getting staggered, stunned and other various debuffs -/mob/living/carbon/xenomorph/boiler/proc/on_stun(datum/source, amount) - SIGNAL_HANDLER - if(!(amount > 0) || !HAS_TRAIT_FROM(src, TRAIT_IMMOBILE, BOILER_ROOTED_TRAIT)) - return - var/datum/action/ability/activable/xeno/bombard/bombard_action = actions_by_path[/datum/action/ability/activable/xeno/bombard] - balloon_alert_to_viewers("[src] scrambles out of the ground from the impact!") - bombard_action.set_rooted(FALSE) -RUTGMC EDIT END */ diff --git a/code/modules/mob/living/carbon/xenomorph/castes/boiler/castedatum_boiler.dm b/code/modules/mob/living/carbon/xenomorph/castes/boiler/castedatum_boiler.dm index 113fc5ef2005c..f3db8f70d23b7 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/boiler/castedatum_boiler.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/boiler/castedatum_boiler.dm @@ -52,7 +52,7 @@ RU TGMC EDIT */ // *** Boiler Abilities *** // max_ammo = 7 bomb_strength = 1.3 //Multiplier to the effectiveness of the boiler glob. - bomb_delay = 27 SECONDS + bomb_delay = 32 SECONDS acid_spray_duration = 10 SECONDS acid_spray_damage = 16 diff --git a/code/modules/mob/living/carbon/xenomorph/castes/bull/abilities_bull.dm b/code/modules/mob/living/carbon/xenomorph/castes/bull/abilities_bull.dm index 7908d22e02b9d..3a2e1ce82cec6 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/bull/abilities_bull.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/bull/abilities_bull.dm @@ -65,7 +65,7 @@ charge_duration = addtimer(CALLBACK(src, PROC_REF(acid_charge_deactivate)), 2 SECONDS, TIMER_UNIQUE|TIMER_STOPPABLE|TIMER_OVERRIDE) RegisterSignals(X, list(COMSIG_LIVING_STATUS_PARALYZE, COMSIG_LIVING_STATUS_STAGGER), PROC_REF(acid_charge_deactivate)) RegisterSignal(X, COMSIG_MOVABLE_MOVED, PROC_REF(acid_puddle)) - X.icon_state = "[X.xeno_caste.caste_name][X.is_a_rouny ? " rouny" : ""] Charging" + X.icon_state = "[X.xeno_caste.caste_name][(X.xeno_flags & XENO_ROUNY) ? " rouny" : ""] Charging" succeed_activate() add_cooldown() @@ -117,7 +117,7 @@ RegisterSignals(X, list(COMSIG_LIVING_STATUS_PARALYZE, COMSIG_LIVING_STATUS_STAGGER), PROC_REF(headbutt_charge_deactivate)) RegisterSignal(X, COMSIG_XENOMORPH_ATTACK_LIVING, PROC_REF(bull_charge_slash)) RegisterSignal(X, COMSIG_MOVABLE_MOVED, PROC_REF(afterimage)) - X.icon_state = "[X.xeno_caste.caste_name][X.is_a_rouny ? " rouny" : ""] Charging" + X.icon_state = "[X.xeno_caste.caste_name][(X.xeno_flags & XENO_ROUNY) ? " rouny" : ""] Charging" succeed_activate() add_cooldown() @@ -184,7 +184,7 @@ RegisterSignals(X, list(COMSIG_LIVING_STATUS_PARALYZE, COMSIG_LIVING_STATUS_STAGGER), PROC_REF(gore_charge_deactivate)) RegisterSignal(X, COMSIG_XENOMORPH_ATTACK_LIVING, PROC_REF(bull_charge_slash)) RegisterSignal(X, COMSIG_MOVABLE_MOVED, PROC_REF(afterimage)) - X.icon_state = "[X.xeno_caste.caste_name][X.is_a_rouny ? " rouny" : ""] Charging" + X.icon_state = "[X.xeno_caste.caste_name][(X.xeno_flags & XENO_ROUNY) ? " rouny" : ""] Charging" succeed_activate() add_cooldown() diff --git a/code/modules/mob/living/carbon/xenomorph/castes/bull/bull.dm b/code/modules/mob/living/carbon/xenomorph/castes/bull/bull.dm index 329dd2101d41d..145d6b4698e7b 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/bull/bull.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/bull/bull.dm @@ -10,6 +10,7 @@ plasma_stored = 200 tier = XENO_TIER_TWO upgrade = XENO_UPGRADE_NORMAL + mob_size = MOB_SIZE_BIG pixel_x = -16 pixel_y = -3 @@ -19,7 +20,7 @@ /mob/living/carbon/xenomorph/bull/handle_special_state() if(is_charging >= CHARGE_ON) - icon_state = "[xeno_caste.caste_name][is_a_rouny ? " rouny" : ""] Charging" + icon_state = "[xeno_caste.caste_name][(xeno_flags & XENO_ROUNY) ? " rouny" : ""] Charging" return TRUE return FALSE diff --git a/code/modules/mob/living/carbon/xenomorph/castes/bull/castedatum_bull.dm b/code/modules/mob/living/carbon/xenomorph/castes/bull/castedatum_bull.dm index 5207c1a34d23e..b0220eb95ea61 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/bull/castedatum_bull.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/bull/castedatum_bull.dm @@ -25,10 +25,6 @@ evolution_threshold = 225 // upgrade_threshold = TIER_TWO_THRESHOLD // RUTGMC DELETION - evolves_to = list( - /mob/living/carbon/xenomorph/crusher, - /mob/living/carbon/xenomorph/behemoth, - ) deevolves_to = list( /mob/living/carbon/xenomorph/runner, ) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/carrier/abilities_carrier.dm b/code/modules/mob/living/carbon/xenomorph/castes/carrier/abilities_carrier.dm index 56e1fa74dd775..e9c8392eb83e5 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/carrier/abilities_carrier.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/carrier/abilities_carrier.dm @@ -1,14 +1,16 @@ #define LARVAL_HUGGER "larval hugger" #define CLAWED_HUGGER "clawed hugger" -#define NEURO_HUGGER "neuro hugger" +#define NEURO_HUGGER "neurotoxin hugger" #define ACID_HUGGER "acid hugger" #define RESIN_HUGGER "resin hugger" +#define OZELOMELYN_HUGGER "ozelomelyn hugger" //List of huggie types GLOBAL_LIST_INIT(hugger_type_list, list( /obj/item/clothing/mask/facehugger/larval, /obj/item/clothing/mask/facehugger/combat/slash, -// /obj/item/clothing/mask/facehugger/combat/neuro, RU TGMC EDIT + /obj/item/clothing/mask/facehugger/combat/chem_injector/neuro, + /obj/item/clothing/mask/facehugger/combat/chem_injector/ozelomelyn, /obj/item/clothing/mask/facehugger/combat/acid, /obj/item/clothing/mask/facehugger/combat/resin, )) @@ -16,7 +18,8 @@ GLOBAL_LIST_INIT(hugger_type_list, list( GLOBAL_LIST_INIT(hugger_to_ammo, list( /obj/item/clothing/mask/facehugger/larval = /datum/ammo/xeno/hugger, /obj/item/clothing/mask/facehugger/combat/slash = /datum/ammo/xeno/hugger/slash, -// /obj/item/clothing/mask/facehugger/combat/neuro = /datum/ammo/xeno/hugger/neuro, RU TGMC EDIT + /obj/item/clothing/mask/facehugger/combat/chem_injector/neuro = /datum/ammo/xeno/hugger/neuro, + /obj/item/clothing/mask/facehugger/combat/chem_injector/ozelomelyn = /datum/ammo/xeno/hugger/ozelomelyn, /obj/item/clothing/mask/facehugger/combat/acid = /datum/ammo/xeno/hugger/acid, /obj/item/clothing/mask/facehugger/combat/resin = /datum/ammo/xeno/hugger/resin, )) @@ -25,7 +28,8 @@ GLOBAL_LIST_INIT(hugger_to_ammo, list( GLOBAL_LIST_INIT(hugger_images_list, list( LARVAL_HUGGER = image('icons/Xeno/actions.dmi', icon_state = LARVAL_HUGGER), CLAWED_HUGGER = image('icons/Xeno/actions.dmi', icon_state = CLAWED_HUGGER), -// NEURO_HUGGER = image('icons/Xeno/actions.dmi', icon_state = NEURO_HUGGER ), RU TGMC EDIT + NEURO_HUGGER = image('icons/Xeno/actions.dmi', icon_state = NEURO_HUGGER), + OZELOMELYN_HUGGER = image('icons/Xeno/actions.dmi', icon_state = OZELOMELYN_HUGGER), ACID_HUGGER = image('icons/Xeno/actions.dmi', icon_state = ACID_HUGGER), RESIN_HUGGER = image('icons/Xeno/actions.dmi', icon_state = RESIN_HUGGER), )) @@ -115,6 +119,7 @@ GLOBAL_LIST_INIT(hugger_images_list, list( keybinding_signals = list( KEYBINDING_NORMAL = COMSIG_XENOABILITY_PLACE_TRAP, ) + use_state_flags = ABILITY_USE_LYING /datum/action/ability/xeno_action/place_trap/can_use_action(silent = FALSE, override_flags) . = ..() diff --git a/code/modules/mob/living/carbon/xenomorph/castes/carrier/castedatum_carrier.dm b/code/modules/mob/living/carbon/xenomorph/castes/carrier/castedatum_carrier.dm index 84c915d125bf9..eaeb9ae6d3b73 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/carrier/castedatum_carrier.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/carrier/castedatum_carrier.dm @@ -29,8 +29,6 @@ deevolves_to = /mob/living/carbon/xenomorph/drone - //evolves_to = list(/mob/living/carbon/xenomorph/defiler, /mob/living/carbon/xenomorph/widow) // RUTGMC DELETION, WIDOW DELETION, moved to modular - // *** Flags *** // caste_flags = CASTE_EVOLUTION_ALLOWED can_hold_eggs = CAN_HOLD_ONE_HAND diff --git a/code/modules/mob/living/carbon/xenomorph/castes/crusher/abilities_crusher.dm b/code/modules/mob/living/carbon/xenomorph/castes/crusher/abilities_crusher.dm index 47d1e2b4e19fc..b21ee6269e1ac 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/crusher/abilities_crusher.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/crusher/abilities_crusher.dm @@ -26,7 +26,7 @@ X.create_stomp() //Adds the visual effect. Wom wom wom for(var/mob/living/M in range(1, get_turf(X))) - if(X.issamexenohive(M) || M.stat == DEAD || isnestedhost(M)) + if(X.issamexenohive(M) || M.stat == DEAD || isnestedhost(M) || !X.Adjacent(M)) continue var/distance = get_dist(M, X) var/damage = X.xeno_caste.stomp_damage/max(1, distance + 1) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/crusher/castedatum_crusher.dm b/code/modules/mob/living/carbon/xenomorph/castes/crusher/castedatum_crusher.dm index 22048c18a588d..4b1c90adaf1f9 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/crusher/castedatum_crusher.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/crusher/castedatum_crusher.dm @@ -30,11 +30,14 @@ // *** Flags *** // can_flags = CASTE_CAN_BE_QUEEN_HEALED|CASTE_CAN_BE_GIVEN_PLASMA|CASTE_CAN_BE_LEADER - caste_traits = null + caste_traits = list(TRAIT_STOPS_TANK_COLLISION) // *** Defense *** // soft_armor = list(MELEE = 90, BULLET = 75, LASER = 75, ENERGY = 75, BOMB = 130, BIO = 100, FIRE = 40, ACID = 100) + // *** Sunder *** // + sunder_multiplier = 0.7 + // *** Minimap Icon *** // minimap_icon = "crusher" diff --git a/code/modules/mob/living/carbon/xenomorph/castes/crusher/crusher.dm b/code/modules/mob/living/carbon/xenomorph/castes/crusher/crusher.dm index f92b62b98ebaa..df9cb370c33a7 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/crusher/crusher.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/crusher/crusher.dm @@ -22,7 +22,7 @@ /mob/living/carbon/xenomorph/crusher/handle_special_state() if(is_charging >= CHARGE_ON) - icon_state = "[xeno_caste.caste_name][is_a_rouny ? " rouny" : ""] Charging" + icon_state = "[xeno_caste.caste_name][(xeno_flags & XENO_ROUNY) ? " rouny" : ""] Charging" return TRUE return FALSE diff --git a/code/modules/mob/living/carbon/xenomorph/castes/defender/abilities_defender.dm b/code/modules/mob/living/carbon/xenomorph/castes/defender/abilities_defender.dm index c4c82237c7f49..f28ff29214271 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/defender/abilities_defender.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/defender/abilities_defender.dm @@ -42,7 +42,7 @@ //RU TGMC GRENADE TURF THROW END for (var/mob/living/carbon/human/H in L) - if(H.stat == DEAD) + if(H.stat == DEAD || !X.Adjacent(H)) continue H.add_filter("defender_tail_sweep", 2, gauss_blur_filter(1)) //Add cool SFX; motion blur addtimer(CALLBACK(H, TYPE_PROC_REF(/atom, remove_filter), "defender_tail_sweep"), 0.5 SECONDS) //Remove cool SFX @@ -138,6 +138,7 @@ . = TRUE if(living_target.stat || isxeno(living_target) || !(iscarbon(living_target))) //we leap past xenos return + var/mob/living/carbon/xenomorph/xeno_owner = owner var/mob/living/carbon/carbon_victim = living_target var/extra_dmg = xeno_owner.xeno_caste.melee_damage * xeno_owner.xeno_melee_damage_modifier * 0.5 // 50% dmg reduction @@ -154,7 +155,6 @@ action_activate() LAZYINCREMENT(owner.do_actions, target) addtimer(CALLBACK(src, PROC_REF(decrease_do_action), target), windup_time) - return TRUE ///Decrease the do_actions of the owner /datum/action/ability/activable/xeno/charge/forward_charge/proc/decrease_do_action(atom/target) @@ -306,6 +306,7 @@ SSblackbox.record_feedback("tally", "round_statistics", 1, "defender_fortifiy_toggles") if(on) ADD_TRAIT(X, TRAIT_IMMOBILE, FORTIFY_TRAIT) + ADD_TRAIT(X, TRAIT_STOPS_TANK_COLLISION, FORTIFY_TRAIT) if(!silent) to_chat(X, span_xenowarning("We tuck ourselves into a defensive stance.")) X.soft_armor = X.soft_armor.modifyAllRatings(last_fortify_bonus) @@ -316,6 +317,7 @@ X.soft_armor = X.soft_armor.modifyAllRatings(-last_fortify_bonus) X.soft_armor = X.soft_armor.modifyRating(BOMB = -last_fortify_bonus) REMOVE_TRAIT(X, TRAIT_IMMOBILE, FORTIFY_TRAIT) + REMOVE_TRAIT(X, TRAIT_STOPS_TANK_COLLISION, FORTIFY_TRAIT) X.fortify = on X.anchored = on diff --git a/code/modules/mob/living/carbon/xenomorph/castes/defender/castedatum_defender.dm b/code/modules/mob/living/carbon/xenomorph/castes/defender/castedatum_defender.dm index 77a3012fb0e78..775ac326909e7 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/defender/castedatum_defender.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/defender/castedatum_defender.dm @@ -26,13 +26,7 @@ // *** Evolution *** // evolution_threshold = 100 // upgrade_threshold = TIER_ONE_THRESHOLD // RUTGMC DELETION -/* RU TGMC EDIT - evolves_to = list( - /mob/living/carbon/xenomorph/warrior, - /mob/living/carbon/xenomorph/bull, - /mob/living/carbon/xenomorph/puppeteer, - ) -RU TGMC EDIT*/ + // *** Flags *** // caste_flags = CASTE_EVOLUTION_ALLOWED can_flags = CASTE_CAN_BE_QUEEN_HEALED|CASTE_CAN_BE_GIVEN_PLASMA|CASTE_CAN_BE_LEADER diff --git a/code/modules/mob/living/carbon/xenomorph/castes/defender/defender.dm b/code/modules/mob/living/carbon/xenomorph/castes/defender/defender.dm index d462099bec20e..e23a5e1d1a2a2 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/defender/defender.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/defender/defender.dm @@ -19,10 +19,10 @@ // *************************************** /mob/living/carbon/xenomorph/defender/handle_special_state() if(fortify) - icon_state = "[xeno_caste.caste_name][is_a_rouny ? " rouny" : ""] Fortify" + icon_state = "[xeno_caste.caste_name][(xeno_flags & XENO_ROUNY) ? " rouny" : ""] Fortify" return TRUE if(crest_defense) - icon_state = "[xeno_caste.caste_name][is_a_rouny ? " rouny" : ""] Crest" + icon_state = "[xeno_caste.caste_name][(xeno_flags & XENO_ROUNY) ? " rouny" : ""] Crest" return TRUE return FALSE diff --git a/code/modules/mob/living/carbon/xenomorph/castes/defiler/abilities_defiler.dm b/code/modules/mob/living/carbon/xenomorph/castes/defiler/abilities_defiler.dm index ed117606f630d..5bfbce8b478fc 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/defiler/abilities_defiler.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/defiler/abilities_defiler.dm @@ -191,16 +191,16 @@ X.emitting_gas = TRUE //We gain bump movement immunity while we're emitting gas. - X.icon_state = "[X.xeno_caste.caste_name][X.is_a_rouny ? " rouny" : ""] Power Up" + X.icon_state = "[X.xeno_caste.caste_name][(X.xeno_flags & XENO_ROUNY) ? " rouny" : ""] Power Up" if(!do_after(X, DEFILER_GAS_CHANNEL_TIME, NONE, null, BUSY_ICON_HOSTILE)) if(!QDELETED(src)) to_chat(X, span_xenodanger("We abort emitting fumes, our expended plasma resulting in nothing.")) X.emitting_gas = FALSE - X.icon_state = "[X.xeno_caste.caste_name][X.is_a_rouny ? " rouny" : ""] Running" + X.icon_state = "[X.xeno_caste.caste_name][(X.xeno_flags & XENO_ROUNY) ? " rouny" : ""] Running" return fail_activate() X.emitting_gas = FALSE - X.icon_state = "[X.xeno_caste.caste_name][X.is_a_rouny ? " rouny" : ""] Running" + X.icon_state = "[X.xeno_caste.caste_name][(X.xeno_flags & XENO_ROUNY) ? " rouny" : ""] Running" add_cooldown() succeed_activate() @@ -332,6 +332,11 @@ span_xenodanger("Our stinger retracts, leaving the egg and little one alive.")) return fail_activate() + if(alien_egg.maturity_stage != alien_egg.stage_ready_to_burst) + alien_egg.balloon_alert(X, "Egg not mature") + return fail_activate() + + alien_egg.balloon_alert_to_viewers("Injected") succeed_activate() add_cooldown() diff --git a/code/modules/mob/living/carbon/xenomorph/castes/drone/abilities_drone.dm b/code/modules/mob/living/carbon/xenomorph/castes/drone/abilities_drone.dm index 2bde8ec324b16..801426cbfbafc 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/drone/abilities_drone.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/drone/abilities_drone.dm @@ -23,6 +23,8 @@ KEYBINDING_NORMAL = COMSIG_XENOABILITY_ESSENCE_LINK, KEYBINDING_ALTERNATE = COMSIG_XENOABILITY_ESSENCE_LINK_REMOVE, ) + use_state_flags = ABILITY_USE_LYING + /// Used to determine whether there is an existing Essence Link or not. Also allows access to its vars. var/datum/status_effect/stacking/essence_link/existing_link /// The target of an existing link, if applicable. @@ -146,7 +148,7 @@ KEYBINDING_NORMAL = COMSIG_XENOABILITY_ENHANCEMENT, ) /// References Essence Link and its vars. - var/datum/action/ability/activable/xeno/essence_link/essence_link_action + var/datum/action/ability/activable/xeno/essence_link/essence_link_action //todo: All this link stuff is handled in a stinky way /// Used to determine whether Enhancement is already active or not. Also allows access to its vars. var/datum/status_effect/drone_enhancement/existing_enhancement /// Damage bonus given by this ability. @@ -154,12 +156,14 @@ /// Speed bonus given by this ability. var/speed_addition = -0.4 +/datum/action/ability/xeno_action/enhancement/New(Target) + . = ..() + INVOKE_NEXT_TICK(src, PROC_REF(link_essence_action)) + /datum/action/ability/xeno_action/enhancement/can_use_action() - var/mob/living/carbon/xenomorph/X = owner - essence_link_action = X.actions_by_path[/datum/action/ability/activable/xeno/essence_link] if(existing_enhancement) return TRUE - if(!HAS_TRAIT(X, TRAIT_ESSENCE_LINKED)) + if(!HAS_TRAIT(owner, TRAIT_ESSENCE_LINKED)) return FALSE if(!essence_link_action.existing_link.was_within_range) return FALSE @@ -176,6 +180,21 @@ existing_enhancement = essence_link_action.linked_target.has_status_effect(STATUS_EFFECT_XENO_ENHANCEMENT) succeed_activate() +///Links this action to +/datum/action/ability/xeno_action/enhancement/proc/link_essence_action() + if(essence_link_action) + return + var/mob/living/carbon/xenomorph/X = owner + essence_link_action = X.actions_by_path[/datum/action/ability/activable/xeno/essence_link] + if(!essence_link_action) + CRASH("[type] loaded with a drone_enhancement to link to") + RegisterSignal(essence_link_action, COMSIG_QDELETING, PROC_REF(unlink_essence_action)) + +///Signal proc to delink essence_link. Should only happen when the owner is being deleted to begin with +/datum/action/ability/xeno_action/enhancement/proc/unlink_essence_action() + SIGNAL_HANDLER + essence_link_action = null + /// Ends the ability if the Enhancement buff is removed. /datum/action/ability/xeno_action/enhancement/proc/end_ability() if(existing_enhancement) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/drone/castedatum_drone.dm b/code/modules/mob/living/carbon/xenomorph/castes/drone/castedatum_drone.dm index 2a4b74bfe720b..42862df809a06 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/drone/castedatum_drone.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/drone/castedatum_drone.dm @@ -29,15 +29,6 @@ evolution_threshold = 100 //upgrade_threshold = TIER_ONE_THRESHOLD // RUTGMC DELETION - evolves_to = list( - /mob/living/carbon/xenomorph/shrike, - /mob/living/carbon/xenomorph/queen, - /mob/living/carbon/xenomorph/king, - /mob/living/carbon/xenomorph/carrier, - /mob/living/carbon/xenomorph/hivelord, - /mob/living/carbon/xenomorph/hivemind, - ) - // *** Flags *** // caste_flags = CASTE_EVOLUTION_ALLOWED|CASTE_IS_BUILDER can_hold_eggs = CAN_HOLD_TWO_HANDS @@ -61,6 +52,8 @@ /datum/action/ability/activable/xeno/cocoon, /datum/action/ability/activable/xeno/plant_weeds, /datum/action/ability/activable/xeno/secrete_resin, + /datum/action/ability/activable/xeno/secrete_special_resin, + /datum/action/ability/xeno_action/place_acidwell, /datum/action/ability/activable/xeno/essence_link, /datum/action/ability/activable/xeno/psychic_cure/acidic_salve, /datum/action/ability/activable/xeno/transfer_plasma/drone, @@ -89,6 +82,8 @@ /datum/action/ability/activable/xeno/cocoon, /datum/action/ability/activable/xeno/plant_weeds, /datum/action/ability/activable/xeno/secrete_resin, + /datum/action/ability/activable/xeno/secrete_special_resin, + /datum/action/ability/xeno_action/place_acidwell, /datum/action/ability/activable/xeno/essence_link, /datum/action/ability/activable/xeno/psychic_cure/acidic_salve, /datum/action/ability/activable/xeno/transfer_plasma/drone, diff --git a/code/modules/mob/living/carbon/xenomorph/castes/gorger/abilities_gorger.dm b/code/modules/mob/living/carbon/xenomorph/castes/gorger/abilities_gorger.dm index a6c35adaf7e8a..34b9b364e9b45 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/gorger/abilities_gorger.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/gorger/abilities_gorger.dm @@ -243,46 +243,53 @@ return can_use_ability(target, TRUE) // *************************************** -// *********** Rejuvenate +// *********** oppose // *************************************** -#define REJUVENATE_MISCLICK_CD "rejuvenate_misclick" -/datum/action/ability/activable/xeno/rejuvenate - name = "Rejuvenate" + +/datum/action/ability/activable/xeno/oppose + name = "Oppose" action_icon_state = "rejuvenation" - desc = "Drains blood continuosly, slows you down and reduces damage taken, while restoring some health over time. Cancel by activating again." - cooldown_duration = 4 SECONDS - ability_cost = GORGER_REJUVENATE_COST - target_flags = ABILITY_MOB_TARGET + desc = "Violently suffuse the nearby ground with stored blood, staggering nearby marines and healing nearby xenomorphs." + cooldown_duration = 30 SECONDS + ability_cost = GORGER_OPPOSE_COST keybinding_signals = list( - KEYBINDING_NORMAL = COMSIG_XENOABILITY_REJUVENATE, + KEYBINDING_NORMAL = COMSIG_XENOABILITY_OPPOSE, ) keybind_flags = ABILITY_KEYBIND_USE_ABILITY - use_state_flags = ABILITY_USE_STAGGERED -/datum/action/ability/activable/xeno/rejuvenate/can_use_ability(atom/A, silent, override_flags) - . = ..() - if(!.) - return - if(TIMER_COOLDOWN_CHECK(owner, REJUVENATE_MISCLICK_CD)) - return FALSE - -/datum/action/ability/activable/xeno/rejuvenate/use_ability(atom/A) +/datum/action/ability/activable/xeno/oppose/use_ability(atom/A) . = ..() var/mob/living/carbon/xenomorph/owner_xeno = owner - if(owner_xeno.has_status_effect(STATUS_EFFECT_XENO_REJUVENATE)) - owner_xeno.remove_status_effect(STATUS_EFFECT_XENO_REJUVENATE) - add_cooldown() - return - owner_xeno.apply_status_effect(STATUS_EFFECT_XENO_REJUVENATE, GORGER_REJUVENATE_DURATION, owner_xeno.maxHealth * GORGER_REJUVENATE_THRESHOLD) - to_chat(owner_xeno, span_notice("We tap into our reserves for nourishment, our carapace thickening.")) + add_cooldown() succeed_activate() - TIMER_COOLDOWN_START(owner_xeno, REJUVENATE_MISCLICK_CD, 1 SECONDS) -/datum/action/ability/activable/xeno/rejuvenate/ai_should_use(atom/target) + playsound(owner_xeno.loc, 'sound/effects/bang.ogg', 25, 0) + owner_xeno.visible_message(span_xenodanger("[owner_xeno] smashes her fists into the ground into the ground!"), \ + span_xenodanger("We smash our fists into the ground!")) + owner_xeno.create_stomp() //Adds the visual effect. Wom wom wom + for(var/mob/living/M in range(3)) + if(M.stat == DEAD) + continue + var/distance = get_dist(M, owner_xeno) + if(owner_xeno.issamexenohive(M)) //Xenos can be healed up to three tiles away from you + var/mob/living/carbon/xenomorph/target_xeno = M + var/heal_amount = M.maxHealth * GORGER_OPPOSE_HEAL + HEAL_XENO_DAMAGE(target_xeno, heal_amount, FALSE) + adjustOverheal(target_xeno, heal_amount) + else if(distance == 0) //if we're right on top of them, they take actual damage + M.take_overall_damage(12, BRUTE, MELEE, updating_health = TRUE, max_limbs = 3) + to_chat(M, span_highdanger("[owner_xeno] slams her fists into you, crushing you to the ground!")) + shake_camera(M, 3, 3) + else if(distance <= 1) //marines will only be staggerslowed if they're one tile away from you + shake_camera(M, 2, 2) + to_chat(M, span_highdanger("Blood swells up from the ground around you!")) + M.adjust_stagger(2 SECONDS) + M.adjust_slowdown(3) + + +/datum/action/ability/activable/xeno/oppose/ai_should_use(atom/target) return FALSE -#undef REJUVENATE_MISCLICK_CD - // *************************************** // *********** Psychic Link // *************************************** diff --git a/code/modules/mob/living/carbon/xenomorph/castes/gorger/castedatum_gorger.dm b/code/modules/mob/living/carbon/xenomorph/castes/gorger/castedatum_gorger.dm index 972f8e6dc3ad3..1e3fc46bdb3a5 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/gorger/castedatum_gorger.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/gorger/castedatum_gorger.dm @@ -75,7 +75,7 @@ /datum/action/ability/activable/xeno/psychic_link, /datum/action/ability/activable/xeno/drain, /datum/action/ability/activable/xeno/transfusion, - /datum/action/ability/activable/xeno/rejuvenate, + /datum/action/ability/activable/xeno/oppose, /datum/action/ability/activable/xeno/carnage, /datum/action/ability/activable/xeno/feast, /datum/action/ability/activable/xeno/devour, diff --git a/code/modules/mob/living/carbon/xenomorph/castes/hivelord/abilities_hivelord.dm b/code/modules/mob/living/carbon/xenomorph/castes/hivelord/abilities_hivelord.dm index 7dd72944b86d0..efd4fe1ab14e0 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/hivelord/abilities_hivelord.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/hivelord/abilities_hivelord.dm @@ -245,6 +245,7 @@ keybinding_signals = list( KEYBINDING_NORMAL = COMSIG_XENOABILITY_PLACE_JELLY_POD, ) + use_state_flags = ABILITY_USE_LYING /datum/action/ability/xeno_action/place_jelly_pod/can_use_action(silent = FALSE, override_flags) . = ..() @@ -285,6 +286,7 @@ keybinding_signals = list( KEYBINDING_NORMAL = COMSIG_XENOABILITY_CREATE_JELLY, ) + use_state_flags = ABILITY_USE_LYING /datum/action/ability/xeno_action/create_jelly/can_use_action(silent = FALSE, override_flags) . = ..() @@ -298,7 +300,7 @@ /datum/action/ability/xeno_action/create_jelly/action_activate() var/obj/item/resin_jelly/jelly = new(owner.loc) owner.put_in_hands(jelly) - to_chat(owner, span_xenonotice("We create a globule of resin from our ovipostor.")) // Ewww... + to_chat(owner, span_xenonotice("We create a globule of resin from our ovipositor.")) // Ewww... add_cooldown() succeed_activate() diff --git a/code/modules/mob/living/carbon/xenomorph/castes/hivelord/castedatum_hivelord.dm b/code/modules/mob/living/carbon/xenomorph/castes/hivelord/castedatum_hivelord.dm index f685211178887..f6250736921e0 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/hivelord/castedatum_hivelord.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/hivelord/castedatum_hivelord.dm @@ -30,8 +30,6 @@ deevolves_to = /mob/living/carbon/xenomorph/drone - evolves_to = list(/mob/living/carbon/xenomorph/defiler, /mob/living/carbon/xenomorph/gorger) - // *** Flags *** // caste_flags = CASTE_EVOLUTION_ALLOWED|CASTE_IS_BUILDER can_hold_eggs = CAN_HOLD_TWO_HANDS @@ -64,6 +62,7 @@ /datum/action/ability/activable/xeno/healing_infusion, /datum/action/ability/xeno_action/place_acidwell, /datum/action/ability/activable/xeno/secrete_resin/hivelord, + /datum/action/ability/activable/xeno/secrete_special_resin, /datum/action/ability/xeno_action/blessing_menu, /datum/action/ability/activable/xeno/transfer_plasma/improved, /datum/action/ability/activable/xeno/corrosive_acid, @@ -99,6 +98,7 @@ /datum/action/ability/activable/xeno/healing_infusion, /datum/action/ability/xeno_action/place_acidwell, /datum/action/ability/activable/xeno/secrete_resin/hivelord, + /datum/action/ability/activable/xeno/secrete_special_resin, /datum/action/ability/xeno_action/blessing_menu, /datum/action/ability/activable/xeno/transfer_plasma/improved, /datum/action/ability/activable/xeno/corrosive_acid/strong, diff --git a/code/modules/mob/living/carbon/xenomorph/castes/hivemind/abilities_hivemind.dm b/code/modules/mob/living/carbon/xenomorph/castes/hivemind/abilities_hivemind.dm index d4fdd73138353..6d716dbd46e78 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/hivemind/abilities_hivemind.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/hivemind/abilities_hivemind.dm @@ -13,6 +13,11 @@ return FALSE return ..() +/datum/action/ability/activable/xeno/secrete_special_resin/hivemind/can_use_action(silent = FALSE, override_flags, selecting = FALSE) + if (owner.status_flags & INCORPOREAL) + return FALSE + return ..() + /datum/action/ability/xeno_action/change_form name = "Change form" action_icon_state = "manifest" diff --git a/code/modules/mob/living/carbon/xenomorph/castes/hivemind/castedatum_hivemind.dm b/code/modules/mob/living/carbon/xenomorph/castes/hivemind/castedatum_hivemind.dm index c89a1c1b0fa78..32fff1412c34f 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/hivemind/castedatum_hivemind.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/hivemind/castedatum_hivemind.dm @@ -58,6 +58,7 @@ /datum/action/ability/xeno_action/pheromones/emit_warding, /datum/action/ability/xeno_action/pheromones/emit_frenzy, /datum/action/ability/activable/xeno/secrete_resin/hivemind, + /datum/action/ability/activable/xeno/secrete_special_resin/hivemind, ) /datum/xeno_caste/hivemind/on_caste_applied(mob/xenomorph) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/hivemind/hivemind.dm b/code/modules/mob/living/carbon/xenomorph/castes/hivemind/hivemind.dm index 63992f3c2f1ae..f3f9fa7da75ad 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/hivemind/hivemind.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/hivemind/hivemind.dm @@ -119,7 +119,7 @@ setDir(SOUTH) addtimer(CALLBACK(src, PROC_REF(do_change_form)), TIME_TO_TRANSFORM) -/mob/living/carbon/xenomorph/hivemind/set_jump_component(duration = 0.5 SECONDS, cooldown = 2 SECONDS, cost = 0, height = 16, sound = null, flags = JUMP_SHADOW, flags_pass = PASS_LOW_STRUCTURE|PASS_FIRE) +/mob/living/carbon/xenomorph/hivemind/set_jump_component(duration = 0.5 SECONDS, cooldown = 2 SECONDS, cost = 0, height = 16, sound = null, flags = JUMP_SHADOW, pass_flags = PASS_LOW_STRUCTURE|PASS_FIRE|PASS_TANK) return //no jumping, bad hivemind ///Finish the form changing of the hivemind and give the needed stats @@ -248,6 +248,7 @@ /// handles hivemind updating with their respective weedtype /mob/living/carbon/xenomorph/hivemind/update_icon_state() + . = ..() if(status_flags & INCORPOREAL) icon_state = "hivemind_marker" return @@ -352,17 +353,17 @@ //hivemind cores -/obj/structure/xeno/hivemindcore/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) - if(isxenoqueen(X)) - var/choice = tgui_alert(X, "Are you sure you want to destroy the hivemind?", "Destroy hivemind", list("Yes", "Cancel")) +/obj/structure/xeno/hivemindcore/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) + if(isxenoqueen(xeno_attacker)) + var/choice = tgui_alert(xeno_attacker, "Are you sure you want to destroy the hivemind?", "Destroy hivemind", list("Yes", "Cancel")) if(choice == "Yes") deconstruct(FALSE) return - X.visible_message(span_danger("[X] nudges its head against [src]."), \ + xeno_attacker.visible_message(span_danger("[xeno_attacker] nudges its head against [src]."), \ span_danger("You nudge your head against [src].")) -/obj/structure/xeno/hivemindcore/take_damage(damage_amount, damage_type, damage_flag, sound_effect, attack_dir, armour_penetration) +/obj/structure/xeno/hivemindcore/take_damage(damage_amount, damage_type = BRUTE, armor_type = null, effects = TRUE, attack_dir, armour_penetration = 0, mob/living/blame_mob) . = ..() var/mob/living/carbon/xenomorph/hivemind/our_parent = get_parent() if(isnull(our_parent)) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/hunter/abilities_hunter.dm b/code/modules/mob/living/carbon/xenomorph/castes/hunter/abilities_hunter.dm index 1c98d43adf82d..256f511c2d283 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/hunter/abilities_hunter.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/hunter/abilities_hunter.dm @@ -1,4 +1,4 @@ -/* RU TGMC EDIT + // *************************************** // *********** Stealth // *************************************** @@ -212,8 +212,6 @@ keybinding_signals = list( KEYBINDING_NORMAL = COMSIG_XENOABILITY_TOGGLE_DISGUISE, ) - ///the regular appearance of the hunter - var/old_appearance /datum/action/ability/xeno_action/stealth/disguise/action_activate() if(stealth) @@ -230,33 +228,28 @@ if(ishuman(mark.marked_target)) to_chat(owner, "You cannot turn into a human!") return - old_appearance = xenoowner.appearance - ADD_TRAIT(xenoowner, TRAIT_MOB_ICON_UPDATE_BLOCKED, STEALTH_TRAIT) + var/image/disguised_icon = image(icon = mark.marked_target.icon, icon_state = mark.marked_target.icon_state, loc = owner) + disguised_icon.override = TRUE + xenoowner.add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/everyone, "hunter_disguise", disguised_icon) + ADD_TRAIT(xenoowner, TRAIT_XENOMORPH_INVISIBLE_BLOOD, STEALTH_TRAIT) xenoowner.update_wounds() return ..() /datum/action/ability/xeno_action/stealth/disguise/cancel_stealth() . = ..() - owner.appearance = old_appearance - REMOVE_TRAIT(owner, TRAIT_MOB_ICON_UPDATE_BLOCKED, STEALTH_TRAIT) var/mob/living/carbon/xenomorph/xenoowner = owner + REMOVE_TRAIT(xenoowner, TRAIT_XENOMORPH_INVISIBLE_BLOOD, STEALTH_TRAIT) + xenoowner.remove_alt_appearance("hunter_disguise") xenoowner.update_wounds() /datum/action/ability/xeno_action/stealth/disguise/handle_stealth() var/mob/living/carbon/xenomorph/xenoowner = owner - var/datum/action/ability/activable/xeno/hunter_mark/mark = xenoowner.actions_by_path[/datum/action/ability/activable/xeno/hunter_mark] - var/old_layer = xenoowner.layer - xenoowner.appearance = mark.marked_target.appearance - //Retaining old rendering layer to prevent rendering under objects. - xenoowner.layer = old_layer - xenoowner.underlays.Cut() if(owner.last_move_intent >= world.time - HUNTER_STEALTH_STEALTH_DELAY) xenoowner.use_plasma(owner.m_intent == MOVE_INTENT_WALK ? HUNTER_STEALTH_WALK_PLASMADRAIN : HUNTER_STEALTH_RUN_PLASMADRAIN) //If we have 0 plasma after expending stealth's upkeep plasma, end stealth. if(!xenoowner.plasma_stored) to_chat(xenoowner, span_xenodanger("We lack sufficient plasma to remain disguised.")) cancel_stealth() -RU TGMC EDIT */ // *************************************** // *********** Hunter's Pounce @@ -343,7 +336,6 @@ RU TGMC EDIT */ /datum/action/ability/activable/xeno/pounce/proc/trigger_pounce_effect(mob/living/living_target) playsound(get_turf(living_target), 'sound/voice/alien_pounce.ogg', 25, TRUE) var/mob/living/carbon/xenomorph/xeno_owner = owner - xeno_owner.set_throwing(FALSE) xeno_owner.Immobilize(XENO_POUNCE_STANDBY_DURATION) xeno_owner.forceMove(get_turf(living_target)) living_target.Knockdown(XENO_POUNCE_STUN_DURATION) @@ -563,7 +555,7 @@ RU TGMC EDIT */ var/swap_used = FALSE /datum/action/ability/xeno_action/mirage/remove_action() - clean_illusions() + illusions = list() //the actual illusions fade on their own, and the cooldown object may be qdel'd return ..() /datum/action/ability/xeno_action/mirage/can_use_action(silent = FALSE, override_flags) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/hunter/castedatum_hunter.dm b/code/modules/mob/living/carbon/xenomorph/castes/hunter/castedatum_hunter.dm index a8aa09aabf867..2530fbd949d6b 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/hunter/castedatum_hunter.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/hunter/castedatum_hunter.dm @@ -14,10 +14,11 @@ // *** Melee Attacks *** // melee_damage = 24 + melee_ap = 5 attack_delay = 7 // *** Speed *** // - speed = -1.4 + speed = -1.5 weeds_speed_mod = -0.1 // *** Plasma *** // @@ -31,7 +32,6 @@ evolution_threshold = 225 //upgrade_threshold = TIER_TWO_THRESHOLD // RUTGMC DELETION - //evolves_to = list(/mob/living/carbon/xenomorph/ravager, /mob/living/carbon/xenomorph/widow) // RUTGMC DELETION, WIDOW DELETION, moved to the other file deevolves_to = /mob/living/carbon/xenomorph/runner // *** Flags *** // @@ -105,6 +105,9 @@ // *** Health *** // max_health = 330 + regen_delay = 5 SECONDS + regen_ramp_amount = 0.03 + sunder_recover = 1 // *** Flags *** // caste_flags = CASTE_INNATE_HEALING|CASTE_INNATE_PLASMA_REGEN|CASTE_HIDE_IN_STATUS diff --git a/code/modules/mob/living/carbon/xenomorph/castes/king/abilities_king.dm b/code/modules/mob/living/carbon/xenomorph/castes/king/abilities_king.dm index 8650bb8bc9940..81cd14b0dfcb2 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/king/abilities_king.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/king/abilities_king.dm @@ -46,6 +46,12 @@ keybinding_signals = list( KEYBINDING_NORMAL = COMSIG_XENOABILITY_PETRIFY, ) + ///List of mobs currently petrified + var/list/mob/living/carbon/human/petrified_humans = list() + +/datum/action/ability/xeno_action/petrify/clean_action() + end_effects() + return ..() /* TGMC Delete Begin /datum/action/ability/xeno_action/petrify/action_activate() @@ -65,7 +71,6 @@ finish_charging() playsound(owner, 'sound/effects/petrify_activate.ogg', 50) - var/list/mob/living/carbon/human/humans = list() for(var/mob/living/carbon/human/human in view(PETRIFY_RANGE, owner.loc)) if(is_blind(human)) continue @@ -87,16 +92,16 @@ stone_overlay.overlays += mask human.overlays += stone_overlay - humans[human] = stone_overlay + petrified_humans[human] = stone_overlay - if(!length(humans)) + if(!length(petrified_humans)) flick("eye_closing", eye) addtimer(CALLBACK(src, PROC_REF(remove_eye), eye), 7, TIMER_CLIENT_TIME) return addtimer(CALLBACK(src, PROC_REF(remove_eye), eye), 10, TIMER_CLIENT_TIME) flick("eye_explode", eye) - addtimer(CALLBACK(src, PROC_REF(end_effects), humans), PETRIFY_DURATION) + addtimer(CALLBACK(src, PROC_REF(end_effects)), PETRIFY_DURATION) add_cooldown() succeed_activate() TGMC DELETE END*/ @@ -111,14 +116,15 @@ ADD_TRAIT(owner, TRAIT_STAGGER_RESISTANT, XENO_TRAIT) ///ends all combat-relazted effects -/datum/action/ability/xeno_action/petrify/proc/end_effects(list/humans) - for(var/mob/living/carbon/human/human AS in humans) +/datum/action/ability/xeno_action/petrify/proc/end_effects() + for(var/mob/living/carbon/human/human AS in petrified_humans) human.notransform = FALSE human.status_flags &= ~GODMODE REMOVE_TRAIT(human, TRAIT_HANDS_BLOCKED, REF(src)) human.move_resist = initial(human.move_resist) human.remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, COLOR_GRAY) - human.overlays -= humans[human] + human.overlays -= petrified_humans[human] + petrified_humans.Cut() ///callback for removing the eye from viscontents /datum/action/ability/xeno_action/petrify/proc/remove_eye(obj/effect/eye) @@ -260,9 +266,9 @@ shake_camera(carbon_victim, 3 * severity, 3 * severity) carbon_victim.apply_effect(1 SECONDS, WEAKEN) to_chat(carbon_victim, "You are smashed to the ground!") - else if(ismecha(victim)) - var/obj/vehicle/sealed/mecha/mecha_victim = victim - mecha_victim.take_damage(SHATTERING_ROAR_DAMAGE * 5 * severity, BRUTE, MELEE) + else if(isvehicle(victim)) + var/obj/vehicle/veh_victim = victim + veh_victim.take_damage(SHATTERING_ROAR_DAMAGE * 5 * severity, BRUTE, MELEE) else if(istype(victim, /obj/structure/window)) var/obj/structure/window/window_victim = victim if(window_victim.damageable) @@ -331,7 +337,7 @@ . = ..() if(!.) return - if(is_ground_level(owner.z) && CHECK_BITFIELD(SSticker.mode?.flags_round_type, MODE_ALLOW_XENO_QUICKBUILD) && SSresinshaping.active) // RUTGMC EDIT, tad lasering + if(is_ground_level(owner.z) && CHECK_BITFIELD(SSticker.mode?.round_type_flags, MODE_ALLOW_XENO_QUICKBUILD) && SSresinshaping.active) // RUTGMC EDIT, tad lasering if(!silent) owner.balloon_alert(owner, "too early") return FALSE @@ -398,9 +404,9 @@ human_victim.take_overall_damage(15, BURN, updating_health = TRUE) human_victim.flash_weak_pain() animation_flash_color(human_victim) - else if(ismecha(victim)) - var/obj/vehicle/sealed/mecha/mech_victim = victim - mech_victim.take_damage(75, BURN, ENERGY, armour_penetration = 60) + else if(isvehicle(victim)) + var/obj/vehicle/veh_victim = victim + veh_victim.take_damage(75, BURN, ENERGY, armour_penetration = 60) timer_ref = addtimer(CALLBACK(src, PROC_REF(execute_attack)), ZEROFORM_TICK_RATE, TIMER_STOPPABLE) ///ends and cleans up beam @@ -480,6 +486,8 @@ owner.balloon_alert(owner, "noone to call") return FALSE +GLOBAL_LIST_EMPTY(active_summons) + /datum/action/ability/xeno_action/psychic_summon/action_activate() var/mob/living/carbon/xenomorph/X = owner @@ -491,7 +499,9 @@ continue sister.add_filter("summonoutline", 2, outline_filter(1, COLOR_VIOLET)) - if(!do_after(X, 10 SECONDS, IGNORE_HELD_ITEM, X, BUSY_ICON_HOSTILE)) + GLOB.active_summons += X + request_admins() + if(!do_after(X, 10 SECONDS, IGNORE_HELD_ITEM, X, BUSY_ICON_HOSTILE, extra_checks = CALLBACK(src, PROC_REF(is_active_summon)))) add_cooldown(5 SECONDS) for(var/mob/living/carbon/xenomorph/sister AS in allxenos) sister.remove_filter("summonoutline") @@ -514,3 +524,23 @@ add_cooldown() succeed_activate() + +///Sends a message to admins, prompting them if they want to cancel a psychic summon +/datum/action/ability/xeno_action/psychic_summon/proc/request_admins() + var/mob/living/carbon/xenomorph/caster = owner + var/canceltext = "[caster] is using [name] at [AREACOORD(caster)] [ADMIN_TPMONTY(caster)] \[CANCEL SUMMON\]" + message_admins("[span_prefix("PSYCHIC SUMMON:")] ") + log_game("psychic summon started by [caster] at [AREACOORD(caster)], timerid to cancel: [10 SECONDS]") + notify_ghosts("[caster] has begun to summon at [AREACOORD(caster)]!", action = NOTIFY_JUMP) + +///Checks if our summon was cancelled +/datum/action/ability/xeno_action/psychic_summon/proc/is_active_summon() + var/mob/living/carbon/xenomorph/caster = owner + if(!(caster in GLOB.active_summons)) + return FALSE + return TRUE + +/datum/action/ability/xeno_action/psychic_summon/succeed_activate() + . = ..() + var/mob/living/carbon/xenomorph/caster = owner + GLOB.active_summons -= caster //Remove ourselves from the list once we have completed our summon diff --git a/code/modules/mob/living/carbon/xenomorph/castes/king/king.dm b/code/modules/mob/living/carbon/xenomorph/castes/king/king.dm index 878ed936a858a..9306789b51929 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/king/king.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/king/king.dm @@ -30,17 +30,17 @@ var/prefix = (hive.prefix || xeno_caste.upgrade_name) ? "[hive.prefix][xeno_caste.upgrade_name] " : "" switch(playtime_mins) if(0 to 600) - name = prefix + "Hatchling King ([nicknumber])" - if(601 to 1500) name = prefix + "Young King ([nicknumber])" + if(601 to 1500) + name = prefix + "Mature King ([nicknumber])" if(1501 to 4200) - name = prefix + "Mature Emperor ([nicknumber])" - if(4201 to 10500) name = prefix + "Elder Emperor ([nicknumber])" - if(10501 to INFINITY) + if(4201 to 10500) name = prefix + "Ancient Emperor ([nicknumber])" + if(10501 to INFINITY) + name = prefix + "Prime Emperor ([nicknumber])" else - name = prefix + "Hatchling King ([nicknumber])" + name = prefix + "Young King ([nicknumber])" real_name = name if(mind) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/larva/castedatum_larva.dm b/code/modules/mob/living/carbon/xenomorph/castes/larva/castedatum_larva.dm index 989af58038431..5eaad6751e512 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/larva/castedatum_larva.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/larva/castedatum_larva.dm @@ -26,12 +26,6 @@ // *** Evolution *** // evolution_threshold = 50 - evolves_to = list( - /mob/living/carbon/xenomorph/drone, - /mob/living/carbon/xenomorph/runner, - /mob/living/carbon/xenomorph/sentinel, - /mob/living/carbon/xenomorph/defender, - ) // *** Flags *** // caste_flags = CASTE_EVOLUTION_ALLOWED|CASTE_INNATE_HEALING diff --git a/code/modules/mob/living/carbon/xenomorph/castes/mantis/abilities_mantis.dm b/code/modules/mob/living/carbon/xenomorph/castes/mantis/abilities_mantis.dm index 0b712f283d15c..e9172b38c5886 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/mantis/abilities_mantis.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/mantis/abilities_mantis.dm @@ -1,21 +1,4 @@ /datum/action/ability/activable/xeno/ravage/slow ///How long is the windup before ravaging - var/windup_time = 0.5 SECONDS cooldown_duration = 30 SECONDS - -/datum/action/ability/activable/xeno/ravage/slow/use_ability(atom/A) - if(!do_after(owner, windup_time, IGNORE_HELD_ITEM, owner, BUSY_ICON_GENERIC, extra_checks = CALLBACK(src, PROC_REF(can_use_action), FALSE, ABILITY_USE_BUSY))) - return fail_activate() - return ..() - -/datum/action/ability/activable/xeno/ravage/slow/ai_should_use(atom/target) - . = ..() - if(!.) - return - action_activate() - LAZYINCREMENT(owner.do_actions, target) - addtimer(CALLBACK(src, PROC_REF(decrease_do_action), target), windup_time) - -///Decrease the do_actions of the owner -/datum/action/ability/activable/xeno/ravage/slow/proc/decrease_do_action(atom/target) - LAZYDECREMENT(owner.do_actions, target) + ability_cost = 250 diff --git a/code/modules/mob/living/carbon/xenomorph/castes/mantis/castedatum_mantis.dm b/code/modules/mob/living/carbon/xenomorph/castes/mantis/castedatum_mantis.dm index d30cac46a6a2e..4aece66c96653 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/mantis/castedatum_mantis.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/mantis/castedatum_mantis.dm @@ -12,12 +12,13 @@ // *** Melee Attacks *** // melee_damage = 20 + melee_ap = 5 // *** Speed *** // speed = -0.6 // *** Plasma *** // - plasma_max = 600 //3 ravage + plasma_max = 500 //2 ravages plasma_gain = 20 // *** Health *** // @@ -25,7 +26,7 @@ // *** Flags *** // caste_flags = CASTE_DO_NOT_ALERT_LOW_LIFE|CASTE_IS_A_MINION - can_flags = CASTE_CAN_BE_QUEEN_HEALED + can_flags = CASTE_CAN_BE_QUEEN_HEALED|CASTE_CAN_BE_GIVEN_PLASMA caste_traits = null // *** Defense *** // diff --git a/code/modules/mob/living/carbon/xenomorph/castes/praetorian/abilities_praetorian.dm b/code/modules/mob/living/carbon/xenomorph/castes/praetorian/abilities_praetorian.dm index a647a46513b6c..623c57f1b46c1 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/praetorian/abilities_praetorian.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/praetorian/abilities_praetorian.dm @@ -57,7 +57,7 @@ RU TGMC EDIT */ return FALSE return TRUE -GLOBAL_LIST_INIT(acid_spray_hit, typecacheof(list(/obj/structure/barricade, /obj/vehicle/multitile/root/cm_armored, /obj/structure/razorwire))) +GLOBAL_LIST_INIT(acid_spray_hit, typecacheof(list(/obj/structure/barricade, /obj/hitbox, /obj/structure/razorwire))) #define CONE_PART_MIDDLE (1<<0) #define CONE_PART_LEFT (1<<1) @@ -98,7 +98,7 @@ GLOBAL_LIST_INIT(acid_spray_hit, typecacheof(list(/obj/structure/barricade, /obj var/turf/next_normal_turf = get_step(T, facing) for (var/atom/movable/A AS in T) A.acid_spray_act(owner) - if(((A.density && !(A.allow_pass_flags & PASS_PROJECTILE) && !(A.flags_atom & ON_BORDER)) || !A.Exit(source_spray, facing)) && !isxeno(A)) + if(((A.density && !(A.allow_pass_flags & PASS_PROJECTILE) && !(A.atom_flags & ON_BORDER)) || !A.Exit(source_spray, facing)) && !isxeno(A)) is_blocked = TRUE if(!is_blocked) if(!skip_timer) @@ -123,11 +123,12 @@ GLOBAL_LIST_INIT(acid_spray_hit, typecacheof(list(/obj/structure/barricade, /obj do_acid_cone_spray(next_normal_turf, distance_left - 1, facing, CONE_PART_DIAG_LEFT|CONE_PART_DIAG_RIGHT, spray) do_acid_cone_spray(next_normal_turf, distance_left - 2, facing, (distance_left < 5) ? CONE_PART_MIDDLE : CONE_PART_MIDDLE_DIAG, spray) + // *************************************** // *********** Dash // *************************************** -/datum/action/ability/activable/xeno/charge/dash - name = "Dash" +/datum/action/ability/activable/xeno/charge/acid_dash + name = "Acid Dash" action_icon_state = "pounce" desc = "Instantly dash to the selected tile." ability_cost = 100 @@ -143,33 +144,56 @@ GLOBAL_LIST_INIT(acid_spray_hit, typecacheof(list(/obj/structure/barricade, /obj ///The last tile we dashed through, used when swapping with a human var/turf/last_turf -/datum/action/ability/activable/xeno/charge/dash/use_ability(atom/A) +/datum/action/ability/activable/xeno/charge/acid_dash/use_ability(atom/A) if(!A) return var/mob/living/carbon/xenomorph/xeno_owner = owner + + RegisterSignal(xeno_owner, COMSIG_XENO_OBJ_THROW_HIT, PROC_REF(obj_hit)) RegisterSignal(xeno_owner, COMSIG_MOVABLE_POST_THROW, PROC_REF(charge_complete)) RegisterSignal(xeno_owner, COMSIG_XENOMORPH_LEAP_BUMP, PROC_REF(mob_hit)) + RegisterSignal(owner, COMSIG_MOVABLE_MOVED, PROC_REF(acid_steps)) //We drop acid on every tile we pass through + xeno_owner.visible_message(span_danger("[xeno_owner] slides towards \the [A]!"), \ + span_danger("We dash towards \the [A], spraying acid down our path!") ) + xeno_owner.emote("roar") xeno_owner.xeno_flags |= XENO_LEAPING //This has to come before throw_at, which checks impact. So we don't do end-charge specials when thrown - - add_cooldown() succeed_activate() last_turf = get_turf(owner) owner.pass_flags = PASS_LOW_STRUCTURE|PASS_DEFENSIVE_STRUCTURE|PASS_FIRE owner.throw_at(A, charge_range, 2, owner) - add_cooldown() - succeed_activate() - -/datum/action/ability/activable/xeno/charge/dash/mob_hit(datum/source, mob/living/living_target) +/datum/action/ability/activable/xeno/charge/acid_dash/mob_hit(datum/source, mob/living/living_target) . = TRUE if(living_target.stat || isxeno(living_target) || !(iscarbon(living_target))) //we leap past xenos return + recast_available = TRUE var/mob/living/carbon/carbon_victim = living_target - carbon_victim.ParalyzeNoChain(0.1 SECONDS) + carbon_victim.ParalyzeNoChain(0.5 SECONDS) + + to_chat(carbon_victim, span_highdanger("The [owner] tackles us, sending us behind them!")) + owner.visible_message(span_xenodanger("\The [owner] tackles [carbon_victim], swapping location with them!"), \ + span_xenodanger("We push [carbon_victim] in our acid trail!"), visible_message_flags = COMBAT_MESSAGE) -/datum/action/ability/activable/xeno/charge/dash/charge_complete() +/datum/action/ability/activable/xeno/charge/acid_dash/charge_complete() . = ..() var/mob/living/carbon/xenomorph/xeno_owner = owner + if(recast_available) + addtimer(CALLBACK(src, PROC_REF(charge_complete)), 2 SECONDS) //Delayed recursive call, this time you won't gain a recast so it will go on cooldown in 2 SECONDS. + recast = TRUE + else + recast = FALSE + add_cooldown() + UnregisterSignal(owner, COMSIG_MOVABLE_MOVED) xeno_owner.pass_flags = initial(xeno_owner.pass_flags) + recast_available = FALSE + +///Drops an acid puddle on the current owner's tile, will do 0 damage if the owner has no acid_spray_damage +/datum/action/ability/activable/xeno/charge/acid_dash/proc/acid_steps(atom/A, atom/OldLoc, Dir, Forced) + SIGNAL_HANDLER + last_turf = OldLoc + var/mob/living/carbon/xenomorph/xeno_owner = owner + new /obj/effect/xenomorph/spray(get_turf(xeno_owner), 5 SECONDS, xeno_owner.xeno_caste.acid_spray_damage) //Add a modifier here to buff the damage if needed + for(var/obj/O in get_turf(xeno_owner)) + O.acid_spray_act(xeno_owner) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/praetorian/castedatum_praetorian.dm b/code/modules/mob/living/carbon/xenomorph/castes/praetorian/castedatum_praetorian.dm index 4db3eed279c49..984100186792f 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/praetorian/castedatum_praetorian.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/praetorian/castedatum_praetorian.dm @@ -58,7 +58,7 @@ RU TGMC EDIT */ /datum/action/ability/activable/xeno/corrosive_acid, /datum/action/ability/activable/xeno/xeno_spit, /datum/action/ability/activable/xeno/spray_acid/cone, - /datum/action/ability/activable/xeno/charge/dash, + /datum/action/ability/activable/xeno/charge/acid_dash, /datum/action/ability/xeno_action/pheromones, /datum/action/ability/xeno_action/pheromones/emit_recovery, /datum/action/ability/xeno_action/pheromones/emit_warding, @@ -82,7 +82,7 @@ RU TGMC EDIT */ /datum/action/ability/activable/xeno/corrosive_acid, /datum/action/ability/activable/xeno/xeno_spit, /datum/action/ability/activable/xeno/spray_acid/cone, - /datum/action/ability/activable/xeno/charge/dash, + /datum/action/ability/activable/xeno/charge/acid_dash, /datum/action/ability/xeno_action/pheromones, /datum/action/ability/xeno_action/pheromones/emit_recovery, /datum/action/ability/xeno_action/pheromones/emit_warding, diff --git a/code/modules/mob/living/carbon/xenomorph/castes/praetorian/praetorian.dm b/code/modules/mob/living/carbon/xenomorph/castes/praetorian/praetorian.dm index c51b2f66b5187..7d1704604b61f 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/praetorian/praetorian.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/praetorian/praetorian.dm @@ -14,4 +14,3 @@ tier = XENO_TIER_THREE upgrade = XENO_UPGRADE_NORMAL bubble_icon = "alienroyal" - diff --git a/code/modules/mob/living/carbon/xenomorph/castes/puppet/castedatum_puppet.dm b/code/modules/mob/living/carbon/xenomorph/castes/puppet/castedatum_puppet.dm index 24d9fc87b4b63..09289f196d89a 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/puppet/castedatum_puppet.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/puppet/castedatum_puppet.dm @@ -11,6 +11,7 @@ tier = XENO_TIER_MINION upgrade = XENO_UPGRADE_BASETYPE melee_damage = 15 + accuracy_malus = 65 speed = -0.8 plasma_max = 2 plasma_gain = 0 diff --git a/code/modules/mob/living/carbon/xenomorph/castes/puppeteer/abilities_puppeteer.dm b/code/modules/mob/living/carbon/xenomorph/castes/puppeteer/abilities_puppeteer.dm index ce2a725f6f634..611ed7415a03e 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/puppeteer/abilities_puppeteer.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/puppeteer/abilities_puppeteer.dm @@ -83,7 +83,7 @@ var/obj/projectile/spine = new /obj/projectile(current_turf) spine.generate_bullet(/datum/ammo/xeno/spine) spine.def_zone = xeno.get_limbzone_target() - spine.fire_at(victim, xeno, null, range = 6, speed = 1) + spine.fire_at(victim, xeno, xeno, range = 6, speed = 1) add_cooldown() // *************************************** @@ -194,7 +194,7 @@ var/mob/living/carbon/xenomorph/owner_xeno = owner if(target.stat == DEAD) return - owner_xeno.plasma_stored = min(owner_xeno.plasma_stored + round(damage / 0.9), owner_xeno.xeno_caste.plasma_max) + owner_xeno.gain_plasma(floor(damage / 0.9)) // *************************************** // *********** Stitch Puppet @@ -275,7 +275,7 @@ return fail_activate() RegisterSignal(victim, COMSIG_XENOMORPH_ATTACK_LIVING, PROC_REF(start_exploding)) RegisterSignal(victim, COMSIG_MOB_DEATH, PROC_REF(detonate)) - addtimer(CALLBACK(src, PROC_REF(detonate), victim), 15 SECONDS) + addtimer(CALLBACK(src, PROC_REF(start_exploding), victim), 5 SECONDS) add_cooldown() ///asynchronous signal handler for start_exploding_async diff --git a/code/modules/mob/living/carbon/xenomorph/castes/puppeteer/castedatum_puppeteer.dm b/code/modules/mob/living/carbon/xenomorph/castes/puppeteer/castedatum_puppeteer.dm index 6c2970dad807e..328c2cd229d2f 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/puppeteer/castedatum_puppeteer.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/puppeteer/castedatum_puppeteer.dm @@ -20,7 +20,6 @@ //upgrade_threshold = TIER_TWO_THRESHOLD // RUTGMC DELETION evolution_threshold = 225 - //evolves_to = list(/mob/living/carbon/xenomorph/widow, /mob/living/carbon/xenomorph/warlock) // RUTGMC DELETION, WIDOW DELETION, moved to the other file deevolves_to = list(/mob/living/carbon/xenomorph/defender) caste_flags = CASTE_INNATE_PLASMA_REGEN|CASTE_PLASMADRAIN_IMMUNE|CASTE_EVOLUTION_ALLOWED can_flags = CASTE_CAN_BE_QUEEN_HEALED|CASTE_CAN_BE_LEADER diff --git a/code/modules/mob/living/carbon/xenomorph/castes/puppeteer/puppeteer.dm b/code/modules/mob/living/carbon/xenomorph/castes/puppeteer/puppeteer.dm index 20f08f48c956e..7a3c13f965866 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/puppeteer/puppeteer.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/puppeteer/puppeteer.dm @@ -24,6 +24,6 @@ SIGNAL_HANDLER if(target.stat == DEAD) return - plasma_stored = min(plasma_stored + round(damage / 0.8), xeno_caste.plasma_max) + gain_plasma(floor(damage / 0.8)) SEND_SIGNAL(src, COMSIG_PUPPET_CHANGE_ALL_ORDER, PUPPET_ATTACK, target) //we are on harm intent so it probably means we want to kill the target RU TGMC EDIT*/ diff --git a/code/modules/mob/living/carbon/xenomorph/castes/queen/abilities_queen.dm b/code/modules/mob/living/carbon/xenomorph/castes/queen/abilities_queen.dm index 2648cff07184f..9e0cf2f3b9fa1 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/queen/abilities_queen.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/queen/abilities_queen.dm @@ -39,17 +39,17 @@ var/sound/queen_sound = sound(get_sfx("queen"), channel = CHANNEL_ANNOUNCEMENTS) var/sound/king_sound = sound('sound/voice/xenos_roaring.ogg', channel = CHANNEL_ANNOUNCEMENTS) for(var/mob/living/carbon/xenomorph/X AS in Q.hive.get_all_xenos()) + to_chat(X, assemble_alert( + title = "Hive Announcement", + subtitle = "From [Q.name]", + message = input, + color_override = "purple" + )) switch(Q.caste_base_type) - if(/mob/living/carbon/xenomorph/queen) + if(/mob/living/carbon/xenomorph/queen, /mob/living/carbon/xenomorph/shrike) SEND_SOUND(X, queen_sound) - //In case in combat, couldn't read fast enough, or needs to copy paste into a translator. Here's the old hive message. - to_chat(X, span_xenoannounce("
The words of the queen reverberate in your head...
[span_alert(input)]
")) if(/mob/living/carbon/xenomorph/king) SEND_SOUND(X, king_sound) - to_chat(X, span_xenoannounce("
The words of the king reverberate in your head...
[span_alert(input)]
")) - if(/mob/living/carbon/xenomorph/shrike) - SEND_SOUND(X, queen_sound) - to_chat(X, span_xenoannounce("
The words of the shrike reverberate in your head...
[span_alert(input)]
")) //Display the ruler's hive message at the top of the game screen. X.play_screen_text(queens_word, /atom/movable/screen/text/screen_text/queen_order) @@ -76,38 +76,42 @@ return ..() /datum/action/ability/activable/xeno/screech/use_ability(atom/A) - var/mob/living/carbon/xenomorph/queen/X = owner + var/mob/living/carbon/xenomorph/queen/xeno_owner = owner //screech is so powerful it kills huggers in our hands - if(istype(X.r_hand, /obj/item/clothing/mask/facehugger)) - var/obj/item/clothing/mask/facehugger/FH = X.r_hand + if(istype(xeno_owner.r_hand, /obj/item/clothing/mask/facehugger)) + var/obj/item/clothing/mask/facehugger/FH = xeno_owner.r_hand if(FH.stat != DEAD) FH.kill_hugger() - if(istype(X.l_hand, /obj/item/clothing/mask/facehugger)) - var/obj/item/clothing/mask/facehugger/FH = X.l_hand + if(istype(xeno_owner.l_hand, /obj/item/clothing/mask/facehugger)) + var/obj/item/clothing/mask/facehugger/FH = xeno_owner.l_hand if(FH.stat != DEAD) FH.kill_hugger() succeed_activate() add_cooldown() - playsound(X.loc, 'sound/voice/alien_queen_screech.ogg', 75, 0) - X.visible_message(span_xenohighdanger("\The [X] emits an ear-splitting guttural roar!")) + playsound(xeno_owner.loc, 'sound/voice/alien_queen_screech.ogg', 75, 0) + xeno_owner.visible_message(span_xenohighdanger("\The [xeno_owner] emits an ear-splitting guttural roar!")) GLOB.round_statistics.queen_screech++ SSblackbox.record_feedback("tally", "round_statistics", 1, "queen_screech") - X.create_shriekwave() //Adds the visual effect. Wom wom wom - //stop_momentum(charge_dir) //Screech kills a charge - - var/list/nearby_living = list() - for(var/mob/living/L in hearers(WORLD_VIEW, X)) - nearby_living.Add(L) + xeno_owner.create_shriekwave() //Adds the visual effect. Wom wom wom - for(var/i in GLOB.mob_living_list) - var/mob/living/L = i - if(get_dist(L, X) > WORLD_VIEW_NUM) + for(var/obj/vehicle/sealed/armored/tank AS in GLOB.tank_list) + if(get_dist(tank, xeno_owner) > WORLD_VIEW_NUM) + continue + if(tank.z != owner.z) continue - L.screech_act(X, WORLD_VIEW_NUM, L in nearby_living) + for(var/mob/living/living_victim AS in tank.occupants) + living_victim.screech_act(xeno_owner, WORLD_VIEW_NUM) //todo: The effects of screech are weird due to relying on get_dist for a mob on a diff z-level + + var/list/nearby_living = list() //if you're a hearer you get effected more severely + for(var/mob/living/living_victim in hearers(WORLD_VIEW, xeno_owner)) + nearby_living.Add(living_victim) + + for(var/mob/living/living_victim AS in cheap_get_living_near(xeno_owner, WORLD_VIEW_NUM)) + living_victim.screech_act(xeno_owner, WORLD_VIEW_NUM, living_victim in nearby_living) /datum/action/ability/activable/xeno/screech/ai_should_start_consider() return TRUE @@ -230,10 +234,10 @@ var/mob/living/carbon/xenomorph/queen/xeno = owner if(xeno.do_actions) return - if(xeno.is_zoomed) + if(xeno.xeno_flags & XENO_ZOOMED) zoom_xeno_out(xeno.observed_xeno ? FALSE : TRUE) return - if(!do_after(xeno, 1 SECONDS, IGNORE_HELD_ITEM, null, BUSY_ICON_GENERIC) || xeno.is_zoomed) + if(!do_after(xeno, 1 SECONDS, IGNORE_HELD_ITEM, null, BUSY_ICON_GENERIC) || (xeno.xeno_flags & XENO_ZOOMED)) return zoom_xeno_in(xeno.observed_xeno ? FALSE : TRUE) //No need for feedback message if our eye is elsewhere. @@ -292,7 +296,7 @@ /datum/action/ability/xeno_action/set_xeno_lead/proc/select_xeno_leader(mob/living/carbon/xenomorph/selected_xeno) var/mob/living/carbon/xenomorph/queen/xeno_ruler = owner - if(selected_xeno.queen_chosen_lead) + if(selected_xeno.xeno_flags & XENO_LEADER) unset_xeno_leader(selected_xeno) return @@ -448,7 +452,7 @@ /datum/action/ability/xeno_action/bulwark name = "Royal Bulwark" action_icon_state = "bulwark" - desc = "Creates a field of defensive energy, filling chinks in the armor of nearby sisters, making them more resilient." + desc = "Creates a field of defensive energy, filling gaps in the armor of nearby sisters, making them more resilient." ability_cost = 100 cooldown_duration = 20 SECONDS keybinding_signals = list( diff --git a/code/modules/mob/living/carbon/xenomorph/castes/queen/castedatum_queen.dm b/code/modules/mob/living/carbon/xenomorph/castes/queen/castedatum_queen.dm index e1fcb83e09373..2143f888ae9ed 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/queen/castedatum_queen.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/queen/castedatum_queen.dm @@ -23,6 +23,9 @@ // *** Health *** // max_health = 500 + // *** Sunder *** // + sunder_multiplier = 0.8 + // *** Evolution *** // //upgrade_threshold = TIER_THREE_THRESHOLD // RUTGMC DELETION evolve_min_xenos = 8 @@ -56,6 +59,7 @@ /datum/action/ability/activable/xeno/cocoon, /datum/action/ability/activable/xeno/plant_weeds, /datum/action/ability/activable/xeno/secrete_resin, + /datum/action/ability/activable/xeno/secrete_special_resin, /datum/action/ability/xeno_action/blessing_menu, /datum/action/ability/xeno_action/place_acidwell, /datum/action/ability/xeno_action/lay_egg, @@ -95,6 +99,7 @@ /datum/action/ability/activable/xeno/cocoon, /datum/action/ability/activable/xeno/plant_weeds, /datum/action/ability/activable/xeno/secrete_resin, + /datum/action/ability/activable/xeno/secrete_special_resin, /datum/action/ability/xeno_action/blessing_menu, /datum/action/ability/xeno_action/place_acidwell, /datum/action/ability/xeno_action/lay_egg, diff --git a/code/modules/mob/living/carbon/xenomorph/castes/queen/queen.dm b/code/modules/mob/living/carbon/xenomorph/castes/queen/queen.dm index 340acfb0a0d2b..c3a1ea78f0b2e 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/queen/queen.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/queen/queen.dm @@ -76,17 +76,17 @@ var/prefix = (hive.prefix || xeno_caste.upgrade_name) ? "[hive.prefix][xeno_caste.upgrade_name] " : "" switch(playtime_mins) if(0 to 600) - name = prefix + "Hatchling Queen ([nicknumber])" - if(601 to 1500) name = prefix + "Young Queen ([nicknumber])" + if(601 to 1500) + name = prefix + "Mature Queen ([nicknumber])" if(1501 to 4200) - name = prefix + "Mature Empress ([nicknumber])" - if(4201 to 10500) name = prefix + "Elder Empress ([nicknumber])" - if(10501 to INFINITY) + if(4201 to 10500) name = prefix + "Ancient Empress ([nicknumber])" + if(10501 to INFINITY) + name = prefix + "Prime Empress ([nicknumber])" else - name = prefix + "Hatchling Queen ([nicknumber])" + name = prefix + "Young Queen ([nicknumber])" real_name = name if(mind) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/ravager/abilities_ravager.dm b/code/modules/mob/living/carbon/xenomorph/castes/ravager/abilities_ravager.dm index aac732b46d432..440f0e78aa2a6 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/ravager/abilities_ravager.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/ravager/abilities_ravager.dm @@ -122,7 +122,7 @@ atoms_to_ravage += get_step(owner, turn(owner.dir, -45)).contents atoms_to_ravage += get_step(owner, turn(owner.dir, 45)).contents for(var/atom/movable/ravaged AS in atoms_to_ravage) - if(!(ravaged.resistance_flags & XENO_DAMAGEABLE)) + if(!(ravaged.resistance_flags & XENO_DAMAGEABLE) || !X.Adjacent(ravaged)) continue if(!ishuman(ravaged)) ravaged.attack_alien(X, X.xeno_caste.melee_damage) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/ravager/castedatum_ravager.dm b/code/modules/mob/living/carbon/xenomorph/castes/ravager/castedatum_ravager.dm index 0bd20765a77b5..17043f7597a05 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/ravager/castedatum_ravager.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/ravager/castedatum_ravager.dm @@ -9,7 +9,8 @@ wound_type = "ravager" //used to match appropriate wound overlays // *** Melee Attacks *** // - melee_damage = 30 + melee_damage = 25 + melee_ap = 15 attack_delay = 7 // *** Speed *** // diff --git a/code/modules/mob/living/carbon/xenomorph/castes/runner/abilities_runner.dm b/code/modules/mob/living/carbon/xenomorph/castes/runner/abilities_runner.dm index 82154957c04a4..c2b5ab3a9c33b 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/runner/abilities_runner.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/runner/abilities_runner.dm @@ -77,7 +77,8 @@ /datum/action/ability/xeno_action/evasion name = "Evasion" action_icon_state = "evasion_on" - desc = "Take evasive action, forcing non-friendly projectiles that would hit you to miss for a short duration so long as you keep moving. Alternate use toggles Auto Evasion off or on." + desc = "Take evasive action, forcing non-friendly projectiles that would hit you to miss for a short duration so long as you keep moving. \ + Alternate use toggles Auto Evasion off or on. Click again while active to deactivate early." ability_cost = 75 cooldown_duration = 10 SECONDS keybinding_signals = list( @@ -113,6 +114,15 @@ update_button_icon() /datum/action/ability/xeno_action/evasion/action_activate() + //Since both the button and the evasion extension call this proc directly, check if the cooldown timer exists + //The evasion extension removes the cooldown before calling this proc again, so use that to differentiate if it was the player trying to cancel + if(evade_active && cooldown_timer) + if(TIMER_COOLDOWN_CHECK(src, COOLDOWN_EVASION_ACTIVATION)) + return + evasion_deactivate() + return + + use_state_flags = ABILITY_IGNORE_COOLDOWN|ABILITY_IGNORE_PLASMA //To allow the ability button to be clicked while on cooldown for deactivation purposes succeed_activate() add_cooldown() if(evade_active) @@ -137,6 +147,7 @@ RegisterSignal(owner, COMSIG_LIVING_PRE_THROW_IMPACT, PROC_REF(evasion_throw_dodge)) GLOB.round_statistics.runner_evasions++ SSblackbox.record_feedback("tally", "round_statistics", 1, "runner_evasions") + TIMER_COOLDOWN_START(src, COOLDOWN_EVASION_ACTIVATION, 1 SECONDS) /datum/action/ability/xeno_action/evasion/process() var/mob/living/carbon/xenomorph/runner/runner_owner = owner @@ -152,7 +163,7 @@ */ /datum/action/ability/xeno_action/evasion/proc/evasion_flamer_hit(datum/source, obj/projectile/proj) SIGNAL_HANDLER - if(!(proj.ammo.flags_ammo_behavior & AMMO_FLAME)) + if(!(proj.ammo.ammo_behavior_flags & AMMO_FLAME)) return evasion_stacks = max(0, evasion_stacks - proj.damage) // We lose evasion stacks equal to the burn damage. if(evasion_stacks) @@ -173,6 +184,7 @@ /// Deactivates Evasion, clearing signals, vars, etc. /datum/action/ability/xeno_action/evasion/proc/evasion_deactivate() + use_state_flags = NONE //To prevent the ability from being used while on cooldown now that it can no longer be deactivated STOP_PROCESSING(SSprocessing, src) UnregisterSignal(owner, list( COMSIG_LIVING_STATUS_STUN, @@ -218,12 +230,12 @@ return FALSE if(xeno_owner.issamexenohive(proj.firer)) //We automatically dodge allied projectiles at no cost, and no benefit to our evasion stacks return COMPONENT_PROJECTILE_DODGE - if(proj.ammo.flags_ammo_behavior & AMMO_FLAME) //We can't dodge literal fire + if(proj.ammo.ammo_behavior_flags & AMMO_FLAME) //We can't dodge literal fire return FALSE if(proj.original_target == xeno_owner && proj.distance_travelled < 2) //Pointblank shot. return FALSE - if(!(proj.ammo.flags_ammo_behavior & AMMO_SENTRY) && !xeno_owner.fire_stacks) //We ignore projectiles from automated sources/sentries for the purpose of contributions towards our cooldown refresh; also fire prevents accumulation of evasion stacks - evasion_stacks += proj.damage //Add to evasion stacks for the purposes of determining whether or not our cooldown refreshes + if(!xeno_owner.fire_stacks) + evasion_stacks += proj.damage //Add to evasion stacks for the purposes of determining whether or not our cooldown refreshes, fire negates this evasion_dodge_fx(proj) return COMPONENT_PROJECTILE_DODGE @@ -299,7 +311,6 @@ return FALSE /datum/action/ability/activable/xeno/snatch/use_ability(atom/A) - succeed_activate() var/mob/living/carbon/xenomorph/X = owner if(!do_after(owner, 0.5 SECONDS, IGNORE_HELD_ITEM, A, BUSY_ICON_DANGER, extra_checks = CALLBACK(owner, TYPE_PROC_REF(/mob, break_do_after_checks), list("health" = X.health)))) return FALSE @@ -333,6 +344,7 @@ RegisterSignal(owner, COMSIG_ATOM_DIR_CHANGE, PROC_REF(owner_turned)) owner.add_movespeed_modifier(MOVESPEED_ID_SNATCH, TRUE, 0, NONE, TRUE, 2) owner_turned(null, null, owner.dir) + succeed_activate() add_cooldown() ///Signal handler to update the item overlay when the owner is changing dir diff --git a/code/modules/mob/living/carbon/xenomorph/castes/runner/castedatum_runner.dm b/code/modules/mob/living/carbon/xenomorph/castes/runner/castedatum_runner.dm index 3dcab32f8d909..3329c5835fa70 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/runner/castedatum_runner.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/runner/castedatum_runner.dm @@ -27,14 +27,8 @@ // *** Evolution *** // evolution_threshold = 100 - //upgrade_threshold = TIER_ONE_THRESHOLD // RUTGMC DELETION -/* RU TGMC EDIT - evolves_to = list( - /mob/living/carbon/xenomorph/hunter, - /mob/living/carbon/xenomorph/bull, - /mob/living/carbon/xenomorph/wraith, - ) -RU TGMC EDIT */ + //upgrade_threshold = TIER_ONE_THRESHOLD + // *** Flags *** // caste_flags = CASTE_EVOLUTION_ALLOWED can_flags = CASTE_CAN_BE_QUEEN_HEALED|CASTE_CAN_BE_GIVEN_PLASMA|CASTE_CAN_BE_LEADER|CASTE_CAN_RIDE_CRUSHER diff --git a/code/modules/mob/living/carbon/xenomorph/castes/runner/runner.dm b/code/modules/mob/living/carbon/xenomorph/castes/runner/runner.dm index ce11e90bc7d15..6284e284f1490 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/runner/runner.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/runner/runner.dm @@ -28,6 +28,14 @@ if(. == CONSCIOUS && layer != initial(layer)) layer = MOB_LAYER +/mob/living/carbon/xenomorph/runner/UnarmedAttack(atom/A, has_proximity, modifiers) + /// Runner should not be able to slash while evading. + var/datum/action/ability/xeno_action/evasion/evasion_action = actions_by_path[/datum/action/ability/xeno_action/evasion] + if(evasion_action.evade_active) + balloon_alert(src, "Cannot slash while evading") + return + return ..() + /mob/living/carbon/xenomorph/runner/med_hud_set_status() . = ..() hud_set_evasion() diff --git a/code/modules/mob/living/carbon/xenomorph/castes/scorpion/castedatum_scorpion.dm b/code/modules/mob/living/carbon/xenomorph/castes/scorpion/castedatum_scorpion.dm index 0bf0da0ec3ca6..aa5442ecd1b0c 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/scorpion/castedatum_scorpion.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/scorpion/castedatum_scorpion.dm @@ -25,7 +25,7 @@ // *** Flags *** // caste_flags = CASTE_DO_NOT_ALERT_LOW_LIFE|CASTE_IS_A_MINION - can_flags = CASTE_CAN_BE_QUEEN_HEALED + can_flags = CASTE_CAN_BE_QUEEN_HEALED|CASTE_CAN_BE_GIVEN_PLASMA caste_traits = null // *** Defense *** // @@ -41,4 +41,5 @@ actions = list( /datum/action/ability/xeno_action/xeno_resting, /datum/action/ability/activable/xeno/xeno_spit, + /datum/action/ability/activable/xeno/corrosive_acid/drone, ) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/sentinel/abilities_sentinel.dm b/code/modules/mob/living/carbon/xenomorph/castes/sentinel/abilities_sentinel.dm index 929fe567b5ed4..e3ac16b40bc91 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/sentinel/abilities_sentinel.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/sentinel/abilities_sentinel.dm @@ -14,7 +14,7 @@ bullet_color = COLOR_PALE_GREEN_GRAY damage = 16 spit_cost = 30 - flags_ammo_behavior = AMMO_XENO|AMMO_SKIPS_ALIENS + ammo_behavior_flags = AMMO_XENO|AMMO_SKIPS_ALIENS /// The amount of stacks applied on hit. var/intoxication_stacks = 5 diff --git a/code/modules/mob/living/carbon/xenomorph/castes/sentinel/castedatum_sentinel.dm b/code/modules/mob/living/carbon/xenomorph/castes/sentinel/castedatum_sentinel.dm index a9ff1952802cc..882a6d88ab981 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/sentinel/castedatum_sentinel.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/sentinel/castedatum_sentinel.dm @@ -27,8 +27,6 @@ evolution_threshold = 100 //upgrade_threshold = TIER_ONE_THRESHOLD // RUTGMC DELETION - evolves_to = list(/mob/living/carbon/xenomorph/spitter) - // *** Flags *** // caste_flags = CASTE_EVOLUTION_ALLOWED can_flags = CASTE_CAN_BE_QUEEN_HEALED|CASTE_CAN_BE_GIVEN_PLASMA|CASTE_CAN_BE_LEADER|CASTE_CAN_RIDE_CRUSHER diff --git a/code/modules/mob/living/carbon/xenomorph/castes/shrike/abilities_shrike.dm b/code/modules/mob/living/carbon/xenomorph/castes/shrike/abilities_shrike.dm index 8002d5e8bfc25..d7405439d14d8 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/shrike/abilities_shrike.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/shrike/abilities_shrike.dm @@ -160,7 +160,7 @@ RU TGMC EDIT */ add_cooldown() addtimer(CALLBACK(owner, TYPE_PROC_REF(/mob, update_icons)), 1 SECONDS) var/mob/living/carbon/xenomorph/xeno = owner - owner.icon_state = "[xeno.xeno_caste.caste_name][xeno.is_a_rouny ? " rouny" : ""] Screeching" + owner.icon_state = "[xeno.xeno_caste.caste_name][(xeno.xeno_flags & XENO_ROUNY) ? " rouny" : ""] Screeching" if(target) // Keybind use doesn't have a target owner.face_atom(target) @@ -180,23 +180,26 @@ RU TGMC EDIT */ lower_left = locate(owner.x + 1, owner.y - 1, owner.z) upper_right = locate(owner.x + 3, owner.y + 1, owner.z) - for(var/turf/affected_tile in block(lower_left, upper_right)) //everything in the 2x3 block is found. + var/list/things_to_throw = list() + for(var/turf/affected_tile in block(lower_left, upper_right)) //everything in the 3x3 block is found. affected_tile.Shake(duration = 0.5 SECONDS) - for(var/i in affected_tile) - var/atom/movable/affected = i + for(var/atom/movable/affected AS in affected_tile) if(!ishuman(affected) && !istype(affected, /obj/item) && !isdroid(affected)) affected.Shake(duration = 0.5 SECONDS) continue - if(ishuman(affected)) //if they're human, they also should get knocked off their feet from the blast. + if(ishuman(affected)) var/mob/living/carbon/human/H = affected - if(H.stat == DEAD) //unless they are dead, then the blast mysteriously ignores them. + if(H.stat == DEAD) continue - H.apply_effects(2 SECONDS, 2 SECONDS) // Stun + H.apply_effects(2 SECONDS, 2 SECONDS) shake_camera(H, 2, 1) - var/throwlocation = affected.loc //first we get the target's location - for(var/x in 1 to 6) - throwlocation = get_step(throwlocation, owner.dir) //then we find where they're being thrown to, checking tile by tile. - affected.throw_at(throwlocation, 6, 1, owner, TRUE) + things_to_throw += affected + + for(var/atom/movable/affected AS in things_to_throw) + var/throwlocation = affected.loc + for(var/x in 1 to 6) + throwlocation = get_step(throwlocation, owner.dir) + affected.throw_at(throwlocation, 6, 1, owner, TRUE) owner.visible_message(span_xenowarning("[owner] sends out a huge blast of psychic energy!"), \ span_xenowarning("We send out a huge blast of psychic energy!")) @@ -315,6 +318,7 @@ RU TGMC EDIT */ //moved to modular keybinding_signals = list( KEYBINDING_NORMAL = COMSIG_XENOABILITY_PLACE_ACID_WELL, ) + use_state_flags = ABILITY_USE_LYING /datum/action/ability/xeno_action/place_acidwell/can_use_action(silent = FALSE, override_flags) . = ..() diff --git a/code/modules/mob/living/carbon/xenomorph/castes/shrike/castedatum_shrike.dm b/code/modules/mob/living/carbon/xenomorph/castes/shrike/castedatum_shrike.dm index 39850eb059920..ad936f4269c96 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/shrike/castedatum_shrike.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/shrike/castedatum_shrike.dm @@ -29,7 +29,6 @@ maximum_active_caste = 1 //upgrade_threshold = TIER_TWO_THRESHOLD // RUTGMC DELETION - evolves_to = list(/mob/living/carbon/xenomorph/queen) deevolves_to = /mob/living/carbon/xenomorph/drone // *** Flags *** // @@ -58,6 +57,7 @@ /datum/action/ability/activable/xeno/neurotox_sting/ozelomelyn, /datum/action/ability/xeno_action/call_of_the_burrowed, /datum/action/ability/activable/xeno/secrete_resin, + /datum/action/ability/activable/xeno/secrete_special_resin, /datum/action/ability/xeno_action/place_acidwell, /datum/action/ability/activable/xeno/corrosive_acid, /datum/action/ability/activable/xeno/psychic_cure, @@ -94,6 +94,7 @@ /datum/action/ability/activable/xeno/neurotox_sting/ozelomelyn, /datum/action/ability/xeno_action/call_of_the_burrowed, /datum/action/ability/activable/xeno/secrete_resin, + /datum/action/ability/activable/xeno/secrete_special_resin, /datum/action/ability/xeno_action/place_acidwell, /datum/action/ability/activable/xeno/corrosive_acid, /datum/action/ability/activable/xeno/psychic_cure, diff --git a/code/modules/mob/living/carbon/xenomorph/castes/spiderling/castedatum_spiderling.dm b/code/modules/mob/living/carbon/xenomorph/castes/spiderling/castedatum_spiderling.dm index e220cbc53c5b4..0bf801722154d 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/spiderling/castedatum_spiderling.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/spiderling/castedatum_spiderling.dm @@ -13,6 +13,7 @@ // *** Melee Attacks *** // melee_damage = 8 + accuracy_malus = 65 // *** Speed *** // speed = -0.6 diff --git a/code/modules/mob/living/carbon/xenomorph/castes/spiderling/spiderling.dm b/code/modules/mob/living/carbon/xenomorph/castes/spiderling/spiderling.dm index f2ecf279d0e6e..a78fe68f88c2e 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/spiderling/spiderling.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/spiderling/spiderling.dm @@ -50,9 +50,9 @@ return ..() ///If we're covering our widow, any clicks should be transferred to them -/mob/living/carbon/xenomorph/spiderling/attack_alien(mob/living/carbon/xenomorph/X, damage_amount, damage_type, damage_flag, effects, armor_penetration, isrightclick) +/mob/living/carbon/xenomorph/spiderling/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) if(!get_dist(src, spidermother) && isxeno(x)) - spidermother.attack_alien(X, damage_amount, damage_type, damage_flag, effects, armor_penetration, isrightclick) + spidermother.attack_alien(xeno_attacker, damage_amount, damage_type, armor_type, effects, armor_penetration, isrightclick) return return ..() @@ -145,7 +145,7 @@ /// Check if escorted_atom moves away from the spiderling while it's attacking something, this is to always keep them close to escorted_atom /datum/ai_behavior/spiderling/look_for_new_state() if(current_action == MOVING_TO_ATOM) - if(escorted_atom) + if(escorted_atom && !(mob_parent.Adjacent(escorted_atom))) change_action(ESCORTING_ATOM, escorted_atom) /// Check so that we dont keep attacking our target beyond it's death diff --git a/code/modules/mob/living/carbon/xenomorph/castes/spitter/abilities_spitter.dm b/code/modules/mob/living/carbon/xenomorph/castes/spitter/abilities_spitter.dm index 22cdd0196ade5..58ac31d937d25 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/spitter/abilities_spitter.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/spitter/abilities_spitter.dm @@ -61,7 +61,7 @@ for(var/obj/O in T) if(is_type_in_typecache(O, GLOB.acid_spray_hit) && O.acid_spray_act(owner)) return // returned true if normal density applies - if(O.density && !(O.allow_pass_flags & PASS_PROJECTILE) && !(O.flags_atom & ON_BORDER)) + if(O.density && !(O.allow_pass_flags & PASS_PROJECTILE) && !(O.atom_flags & ON_BORDER)) blocked = TRUE break @@ -125,7 +125,7 @@ newspit.generate_bullet(scatter_spit, scatter_spit.damage * SPIT_UPGRADE_BONUS(X)) newspit.def_zone = X.get_limbzone_target() - newspit.fire_at(target, X, null, newspit.ammo.max_range) + newspit.fire_at(target, X, X, newspit.ammo.max_range) succeed_activate() add_cooldown() diff --git a/code/modules/mob/living/carbon/xenomorph/castes/spitter/castedatum_spitter.dm b/code/modules/mob/living/carbon/xenomorph/castes/spitter/castedatum_spitter.dm index b1d9c86c904b0..9921f1031becf 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/spitter/castedatum_spitter.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/spitter/castedatum_spitter.dm @@ -25,10 +25,6 @@ evolution_threshold = 225 //upgrade_threshold = TIER_TWO_THRESHOLD // RUTGMC DELETION - evolves_to = list( - /mob/living/carbon/xenomorph/boiler, - /mob/living/carbon/xenomorph/praetorian, - ) deevolves_to = list( /mob/living/carbon/xenomorph/sentinel, ) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/warlock/abilities_warlock.dm b/code/modules/mob/living/carbon/xenomorph/castes/warlock/abilities_warlock.dm index 45753dc7d1c25..505abb98ab776 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/warlock/abilities_warlock.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/warlock/abilities_warlock.dm @@ -212,7 +212,7 @@ return !uncrossing /obj/effect/xeno/shield/do_projectile_hit(obj/projectile/proj) - proj.flags_projectile_behavior |= PROJECTILE_FROZEN + proj.projectile_behavior_flags |= PROJECTILE_FROZEN proj.iff_signal = null frozen_projectiles += proj take_damage(proj.damage, proj.ammo.damage_type, proj.ammo.armor_type, 0, REVERSE_DIR(proj.dir), proj.ammo.penetration) @@ -221,7 +221,7 @@ release_projectiles() owner.apply_effect(1 SECONDS, WEAKEN) -/obj/effect/xeno/shield/obj_destruction() +/obj/effect/xeno/shield/obj_destruction(damage_amount, damage_type, damage_flag, mob/living/blame_mob) release_projectiles() owner.apply_effect(1 SECONDS, WEAKEN) return ..() @@ -229,7 +229,7 @@ ///Unfeezes the projectiles on their original path /obj/effect/xeno/shield/proc/release_projectiles() for(var/obj/projectile/proj AS in frozen_projectiles) - proj.flags_projectile_behavior &= ~PROJECTILE_FROZEN + proj.projectile_behavior_flags &= ~PROJECTILE_FROZEN proj.resume_move() record_projectiles_frozen(owner, LAZYLEN(frozen_projectiles)) @@ -238,15 +238,14 @@ playsound(loc, 'sound/effects/portal.ogg', 20) var/perpendicular_angle = Get_Angle(get_turf(src), get_step(src, dir)) //the angle src is facing, get_turf because pixel_x or y messes with the angle for(var/obj/projectile/proj AS in frozen_projectiles) - proj.flags_projectile_behavior &= ~PROJECTILE_FROZEN + proj.projectile_behavior_flags &= ~PROJECTILE_FROZEN proj.distance_travelled = 0 //we're effectively firing it fresh var/new_angle = (perpendicular_angle + (perpendicular_angle - proj.dir_angle - 180)) if(new_angle < 0) new_angle += 360 else if(new_angle > 360) new_angle -= 360 - proj.firer = src - proj.fire_at(shooter = src, source = src, angle = new_angle, recursivity = TRUE) + proj.fire_at(source = src, angle = new_angle, recursivity = TRUE) //Record those sick rocket shots //Is not part of record_projectiles_frozen() because it is probably bad to be running that for every bullet! @@ -268,6 +267,7 @@ ability_cost = 40 cooldown_duration = 12 SECONDS keybind_flags = ABILITY_KEYBIND_USE_ABILITY + target_flags = ABILITY_TURF_TARGET keybinding_signals = list( KEYBINDING_NORMAL = COMSIG_XENOABILITY_PSYCHIC_CRUSH, ) @@ -403,9 +403,9 @@ carbon_victim.apply_damage(xeno_owner.xeno_caste.crush_strength * 1.5, STAMINA, blocked = BOMB) carbon_victim.adjust_stagger(5 SECONDS) carbon_victim.add_slowdown(6) - else if(ismecha(victim)) - var/obj/vehicle/sealed/mecha/mecha_victim = victim - mecha_victim.take_damage(xeno_owner.xeno_caste.crush_strength * 5, BRUTE, BOMB) + else if(isvehicle(victim)) + var/obj/vehicle/veh_victim = victim + veh_victim.take_damage(xeno_owner.xeno_caste.crush_strength * 5, BRUTE, BOMB) stop_crush() /// stops channeling and unregisters all listeners, resetting the ability @@ -542,16 +542,13 @@ /datum/action/ability/activable/xeno/psy_blast/use_ability(atom/A) var/mob/living/carbon/xenomorph/xeno_owner = owner - var/turf/target_turf = get_turf(A) - owner.balloon_alert(owner, "We channel our psychic power") - generate_particles(A, 7) //ADD_TRAIT(xeno_owner, TRAIT_IMMOBILE, PSYCHIC_BLAST_ABILITY_TRAIT) // RUTGMC DELETION, PSYBLAST IMMOBILIZING REMOVAL var/datum/ammo/energy/xeno/ammo_type = xeno_owner.ammo xeno_owner.update_glow(3, 3, ammo_type.glow_color) - if(!do_after(xeno_owner, 1 SECONDS, NONE, target_turf, BUSY_ICON_DANGER) || !can_use_ability(A, FALSE)) + if(!do_after(xeno_owner, 1 SECONDS, IGNORE_TARGET_LOC_CHANGE, A, BUSY_ICON_DANGER) || !can_use_ability(A, FALSE) || !(A in range(get_screen_size(TRUE), owner))) owner.balloon_alert(owner, "Our focus is disrupted") end_channel() //REMOVE_TRAIT(xeno_owner, TRAIT_IMMOBILE, PSYCHIC_BLAST_ABILITY_TRAIT) // RUTGMC DELETION, PSYBLAST IMMOBILIZING REMOVAL @@ -562,7 +559,7 @@ var/obj/projectile/hitscan/projectile = new /obj/projectile/hitscan(xeno_owner.loc) projectile.effect_icon = initial(ammo_type.hitscan_effect_icon) projectile.generate_bullet(ammo_type) - projectile.fire_at(A, xeno_owner, null, projectile.ammo.max_range, projectile.ammo.shell_speed) + projectile.fire_at(A, xeno_owner, xeno_owner, projectile.ammo.max_range, projectile.ammo.shell_speed) playsound(xeno_owner, 'sound/weapons/guns/fire/volkite_4.ogg', 40) if(istype(xeno_owner.ammo, /datum/ammo/energy/xeno/psy_blast)) @@ -614,10 +611,10 @@ /datum/action/ability/xeno_action/toggle_warlock_zoom/action_activate() var/mob/living/carbon/xenomorph/warlock/X = owner - if(X.is_zoomed) + if(X.xeno_flags & XENO_ZOOMED) X.zoom_out() else - if(!do_after(X, 0 SECONDS, IGNORE_HELD_ITEM, null, BUSY_ICON_GENERIC) || X.is_zoomed) + if(!do_after(X, 0 SECONDS, IGNORE_HELD_ITEM, null, BUSY_ICON_GENERIC) || (X.xeno_flags & XENO_ZOOMED)) return X.zoom_in(0, 4.5) ..() diff --git a/code/modules/mob/living/carbon/xenomorph/castes/warlock/castedatum_warlock.dm b/code/modules/mob/living/carbon/xenomorph/castes/warlock/castedatum_warlock.dm index e763a4a4e0769..29df8b9630e20 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/warlock/castedatum_warlock.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/warlock/castedatum_warlock.dm @@ -12,7 +12,7 @@ speed = -0.5 plasma_max = 1700 plasma_gain = 60 - max_health = 375 + max_health = 325 //upgrade_threshold = TIER_THREE_THRESHOLD // RUTGMC DELETION spit_types = list(/datum/ammo/energy/xeno/psy_blast) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/warrior/castedatum_warrior.dm b/code/modules/mob/living/carbon/xenomorph/castes/warrior/castedatum_warrior.dm index bacec21114a7c..01c8ddb385a58 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/warrior/castedatum_warrior.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/warrior/castedatum_warrior.dm @@ -25,7 +25,6 @@ evolution_threshold = 225 //upgrade_threshold = TIER_TWO_THRESHOLD // RUTGMC DELETION - evolves_to = list(/mob/living/carbon/xenomorph/crusher, /mob/living/carbon/xenomorph/behemoth, /mob/living/carbon/xenomorph/gorger, /mob/living/carbon/xenomorph/warlock) deevolves_to = /mob/living/carbon/xenomorph/defender // *** Flags *** // diff --git a/code/modules/mob/living/carbon/xenomorph/castes/warrior/warrior.dm b/code/modules/mob/living/carbon/xenomorph/castes/warrior/warrior.dm index f0b570655fe09..ed76584183512 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/warrior/warrior.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/warrior/warrior.dm @@ -21,7 +21,7 @@ /mob/living/carbon/xenomorph/warrior/handle_special_state() var/datum/action/ability/xeno_action/toggle_agility/agility_action = actions_by_path[/datum/action/ability/xeno_action/toggle_agility] if(agility_action?.ability_active) - icon_state = "[xeno_caste.caste_name][is_a_rouny ? " rouny" : ""] Agility" + icon_state = "[xeno_caste.caste_name][(xeno_flags & XENO_ROUNY) ? " rouny" : ""] Agility" return TRUE return FALSE diff --git a/code/modules/mob/living/carbon/xenomorph/castes/widow/abilities_widow.dm b/code/modules/mob/living/carbon/xenomorph/castes/widow/abilities_widow.dm index 73e8dade2c253..76604218de7ca 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/widow/abilities_widow.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/widow/abilities_widow.dm @@ -17,7 +17,7 @@ newspit.generate_bullet(web_spit, web_spit.damage * SPIT_UPGRADE_BONUS(X)) newspit.def_zone = X.get_limbzone_target() - newspit.fire_at(target, X, null, newspit.ammo.max_range) + newspit.fire_at(target, X, X, newspit.ammo.max_range) succeed_activate() add_cooldown() @@ -46,7 +46,7 @@ var/obj/projectile/newspit = new (get_turf(X)) newspit.generate_bullet(leash_ball) - newspit.fire_at(target, X, null, newspit.ammo.max_range) + newspit.fire_at(target, X, X, newspit.ammo.max_range) succeed_activate() add_cooldown() @@ -108,15 +108,15 @@ return COMPONENT_MOVABLE_BLOCK_PRE_MOVE /// This is so that xenos can remove leash balls -/obj/structure/xeno/aoe_leash/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) - if(X.status_flags & INCORPOREAL) +/obj/structure/xeno/aoe_leash/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) + if(xeno_attacker.status_flags & INCORPOREAL) return - X.visible_message(span_xenonotice("\The [X] starts tearing down \the [src]!"), \ + xeno_attacker.visible_message(span_xenonotice("\The [xeno_attacker] starts tearing down \the [src]!"), \ span_xenonotice("We start to tear down \the [src].")) - if(!do_after(X, 1 SECONDS, NONE, X, BUSY_ICON_GENERIC) || QDELETED(src)) + if(!do_after(xeno_attacker, 1 SECONDS, NONE, xeno_attacker, BUSY_ICON_GENERIC) || QDELETED(src)) return - X.do_attack_animation(src, ATTACK_EFFECT_CLAW) - X.visible_message(span_xenonotice("\The [X] tears down \the [src]!"), \ + xeno_attacker.do_attack_animation(src, ATTACK_EFFECT_CLAW) + xeno_attacker.visible_message(span_xenonotice("\The [xeno_attacker] tears down \the [src]!"), \ span_xenonotice("We tear down \the [src].")) playsound(src, "alien_resin_break", 25) take_damage(max_integrity) @@ -135,6 +135,7 @@ KEYBINDING_NORMAL = COMSIG_XENOABILITY_CREATE_SPIDERLING, KEYBINDING_ALTERNATE = COMSIG_XENOABILITY_CREATE_SPIDERLING_USING_CC, ) + use_state_flags = ABILITY_USE_LYING /// List of all our spiderlings var/list/mob/living/carbon/xenomorph/spiderling/spiderlings = list() diff --git a/code/modules/mob/living/carbon/xenomorph/castes/wraith/abilities_wraith.dm b/code/modules/mob/living/carbon/xenomorph/castes/wraith/abilities_wraith.dm index b086e6e5fb67a..545d1423273cc 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/wraith/abilities_wraith.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/wraith/abilities_wraith.dm @@ -297,6 +297,16 @@ GLOBAL_LIST_INIT(wraith_banish_very_short_duration_list, typecacheof(list( var/turf/return_turf = get_turf(portal) if(!return_turf) return_turf = locate(backup_coordinates[1], backup_coordinates[2], backup_coordinates[3]) + if(banishment_target.density) + var/list/cards = GLOB.cardinals.Copy() + for(var/mob/living/displacing in return_turf) + if(displacing.stat == DEAD) //no. + continue + shuffle(cards) //direction should vary. + for(var/card AS in cards) + if(step(displacing, card)) + to_chat(displacing, span_warning("A sudden force pushes you away from [return_turf]!")) + break banishment_target.resistance_flags = initial(banishment_target.resistance_flags) banishment_target.status_flags = initial(banishment_target.status_flags) //Remove stasis and temp invulerability banishment_target.forceMove(return_turf) @@ -382,7 +392,7 @@ GLOBAL_LIST_INIT(wraith_banish_very_short_duration_list, typecacheof(list( if(isclosedturf(T) && !ignore_closed_turf) //If we care about closed turfs return TRUE for(var/atom/blocker AS in T) - if((blocker.flags_atom & ON_BORDER) || blocker == subject) //If they're a border entity or our subject, we don't care + if((blocker.atom_flags & ON_BORDER) || blocker == subject) //If they're a border entity or our subject, we don't care continue if(!blocker.CanPass(subject, T) && !ignore_can_pass) //If the subject atom can't pass and we care about that, we have a block return TRUE @@ -484,7 +494,7 @@ GLOBAL_LIST_INIT(wraith_banish_very_short_duration_list, typecacheof(list( to_chat(owner, span_xenowarning("There is already a portal here!")) return FALSE var/area/area = get_area(owner) - if(area.flags_area & MARINE_BASE) + if(area.area_flags & MARINE_BASE) if(!silent) to_chat(owner, span_xenowarning("You cannot portal here!")) return FALSE @@ -552,6 +562,11 @@ GLOBAL_LIST_INIT(wraith_banish_very_short_duration_list, typecacheof(list( QDEL_NULL(portal_visuals) return ..() +/obj/effect/wraith_portal/ex_act() + if(linked_portal) + qdel(linked_portal) + qdel(src) + /obj/effect/wraith_portal/attack_ghost(mob/dead/observer/user) . = ..() if(!linked_portal) @@ -637,8 +652,6 @@ GLOBAL_LIST_INIT(wraith_banish_very_short_duration_list, typecacheof(list( animate(get_filter("portal_ripple"), time = 1.3 SECONDS, loop = -1, easing = LINEAR_EASING, radius = 32) vis_contents += our_destination -/obj/effect/wraith_portal/ex_act() - qdel(src) /datum/action/ability/activable/xeno/rewind name = "Time Shift" @@ -662,6 +675,10 @@ GLOBAL_LIST_INIT(wraith_banish_very_short_duration_list, typecacheof(list( var/target_initial_brute_damage = 0 /// Initial sunder of the target var/target_initial_sunder = 0 + /// Initial fire stacks of the target + var/target_initial_fire_stacks = 0 + /// Initial on_fire value + var/target_initial_on_fire = FALSE /// How far can you rewind someone var/range = 5 @@ -693,6 +710,8 @@ GLOBAL_LIST_INIT(wraith_banish_very_short_duration_list, typecacheof(list( last_target_locs_list = list(get_turf(A)) target_initial_brute_damage = targeted.getBruteLoss() target_initial_burn_damage = targeted.getFireLoss() + target_initial_fire_stacks = targeted.fire_stacks + target_initial_on_fire = targeted.on_fire if(isxeno(A)) var/mob/living/carbon/xenomorph/xeno_target = targeted target_initial_sunder = xeno_target.sunder @@ -735,7 +754,12 @@ GLOBAL_LIST_INIT(wraith_banish_very_short_duration_list, typecacheof(list( targeted.status_flags &= ~(INCORPOREAL|GODMODE) REMOVE_TRAIT(owner, TRAIT_IMMOBILE, TIMESHIFT_TRAIT) targeted.heal_overall_damage(targeted.getBruteLoss() - target_initial_brute_damage, targeted.getFireLoss() - target_initial_burn_damage, updating_health = TRUE) - if(isxeno(target)) + if(target_initial_on_fire && target_initial_fire_stacks >= 0) + targeted.fire_stacks = target_initial_fire_stacks + targeted.IgniteMob() + else + targeted.ExtinguishMob() + if(isxeno(targeted)) var/mob/living/carbon/xenomorph/xeno_target = targeted xeno_target.sunder = target_initial_sunder targeted.remove_filter("rewind_blur") diff --git a/code/modules/mob/living/carbon/xenomorph/castes/wraith/castedatum_wraith.dm b/code/modules/mob/living/carbon/xenomorph/castes/wraith/castedatum_wraith.dm index dddb8dd3caf8a..5f7998202ec22 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/wraith/castedatum_wraith.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/wraith/castedatum_wraith.dm @@ -26,11 +26,6 @@ evolution_threshold = 225 //upgrade_threshold = TIER_TWO_THRESHOLD // RUTGMC DELETION - evolves_to = list( - /mob/living/carbon/xenomorph/defiler, - /mob/living/carbon/xenomorph/ravager, - /mob/living/carbon/xenomorph/warlock, - ) deevolves_to = /mob/living/carbon/xenomorph/runner // *** Flags *** // diff --git a/code/modules/mob/living/carbon/xenomorph/charge_crush.dm b/code/modules/mob/living/carbon/xenomorph/charge_crush.dm index 783252f54bd8b..52d41f5a48dd2 100644 --- a/code/modules/mob/living/carbon/xenomorph/charge_crush.dm +++ b/code/modules/mob/living/carbon/xenomorph/charge_crush.dm @@ -401,7 +401,7 @@ charge_datum.do_stop_momentum() return PRECRUSH_STOPPED if(anchored) - if(flags_atom & ON_BORDER) + if(atom_flags & ON_BORDER) if(dir == REVERSE_DIR(charger.dir)) . = (CHARGE_SPEED(charge_datum) * 80) //Damage to inflict. charge_datum.speed_down(3) @@ -425,6 +425,9 @@ /obj/vehicle/sealed/mecha/pre_crush_act(mob/living/carbon/xenomorph/charger, datum/action/ability/xeno_action/ready_charge/charge_datum) return (CHARGE_SPEED(charge_datum) * 375) +/obj/hitbox/pre_crush_act(mob/living/carbon/xenomorph/charger, datum/action/ability/xeno_action/ready_charge/charge_datum) + return (CHARGE_SPEED(charge_datum) * 20) + /obj/structure/razorwire/pre_crush_act(mob/living/carbon/xenomorph/charger, datum/action/ability/xeno_action/ready_charge/charge_datum) if(CHECK_BITFIELD(resistance_flags, INDESTRUCTIBLE) || charger.is_charging < CHARGE_ON) charge_datum.do_stop_momentum() diff --git a/code/modules/mob/living/carbon/xenomorph/death.dm b/code/modules/mob/living/carbon/xenomorph/death.dm index 8d1fbbab7477c..1351684d5d038 100644 --- a/code/modules/mob/living/carbon/xenomorph/death.dm +++ b/code/modules/mob/living/carbon/xenomorph/death.dm @@ -4,10 +4,7 @@ /mob/living/carbon/xenomorph/death(gibbing, deathmessage = "lets out a waning guttural screech, green blood bubbling from its maw.", silent) - if(stat == DEAD) - return ..() - return ..() //Just a different standard deathmessage - + return ..() //we're just changing the death message /mob/living/carbon/xenomorph/on_death() GLOB.alive_xeno_list -= src @@ -20,11 +17,13 @@ hive?.on_xeno_death(src) hive?.update_tier_limits() //Update our tier limits. - if(is_zoomed) + if(xeno_flags & XENO_ZOOMED) zoom_out() - if(tier != XENO_TIER_MINION) - GLOB.key_to_time_of_xeno_death[key] = world.time + if(GLOB.xeno_stat_multiplicator_buff == 1) //if autobalance is on, it won't equal 1, so xeno respawn timer is not set + switch(tier) + if(XENO_TIER_ZERO, XENO_TIER_ONE, XENO_TIER_TWO, XENO_TIER_THREE) //minions and tier fours have no respawn timer + GLOB.key_to_time_of_xeno_death[key] = world.time SSminimaps.remove_marker(src) set_light_on(FALSE) @@ -37,6 +36,7 @@ if(hud_used.alien_plasma_display) hud_used.alien_plasma_display.icon_state = "power_display_empty" update_icons() + hud_set_plasma() death_cry() diff --git a/code/modules/mob/living/carbon/xenomorph/egg.dm b/code/modules/mob/living/carbon/xenomorph/egg.dm index 4d77621558e64..c0f8e7477f168 100644 --- a/code/modules/mob/living/carbon/xenomorph/egg.dm +++ b/code/modules/mob/living/carbon/xenomorph/egg.dm @@ -1,7 +1,7 @@ /obj/alien/egg name = "theoretical egg" density = FALSE - flags_atom = CRITICAL_ATOM + atom_flags = CRITICAL_ATOM max_integrity = 80 integrity_failure = 20 ///What maturity stage are we in @@ -21,6 +21,7 @@ advance_maturity(maturity_stage) /obj/alien/egg/update_icon_state() + . = ..() icon_state = initial(icon_state) + "[maturity_stage]" /obj/alien/egg/obj_break(damage_flag) @@ -82,7 +83,7 @@ name = "hugger egg" icon_state = "egg_hugger" density = FALSE - flags_atom = CRITICAL_ATOM + atom_flags = CRITICAL_ATOM max_integrity = 80 maturity_time = 15 SECONDS stage_ready_to_burst = 2 @@ -119,37 +120,36 @@ hugger.go_active() */ -/obj/alien/egg/hugger/attack_alien(mob/living/carbon/xenomorph/xenomorph, damage_amount = xenomorph.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) - if(xenomorph.status_flags & INCORPOREAL) +/obj/alien/egg/hugger/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) + if(xeno_attacker.status_flags & INCORPOREAL) return FALSE - if(!istype(xenomorph)) - return attack_hand(xenomorph) + if(!istype(xeno_attacker)) + return attack_hand(xeno_attacker) - if(!issamexenohive(xenomorph)) - xenomorph.do_attack_animation(src, ATTACK_EFFECT_SMASH) - xenomorph.visible_message("[xenomorph] crushes \the [src].","We crush \the [src].") + if(!issamexenohive(xeno_attacker)) + xeno_attacker.do_attack_animation(src, ATTACK_EFFECT_SMASH) + xeno_attacker.visible_message("[xeno_attacker] crushes \the [src].","We crush \the [src].") burst(FALSE) return switch(maturity_stage) if(1) - to_chat(xenomorph, span_xenowarning("The child is not developed yet.")) + to_chat(xeno_attacker, span_xenowarning("The child is not developed yet.")) if(2) - to_chat(xenomorph, span_xenonotice("We retrieve the child.")) + to_chat(xeno_attacker, span_xenonotice("We retrieve the child.")) burst() if(3, 4) - xenomorph.visible_message(span_xenonotice("\The [xenomorph] clears the hatched egg."), \ + xeno_attacker.visible_message(span_xenonotice("\The [xeno_attacker] clears the hatched egg."), \ span_xenonotice("We clear the hatched egg.")) playsound(loc, "alien_resin_break", 25) qdel(src) /obj/alien/egg/hugger/attackby(obj/item/I, mob/user, params) - . = ..() + if(istype(I, /obj/item/clothing/mask/facehugger)) + return insert_new_hugger(I, user) - if(!istype(I, /obj/item/clothing/mask/facehugger)) - return FALSE - return insert_new_hugger(I, user) + return ..() ///Try to insert a new hugger into the egg /obj/alien/egg/hugger/proc/insert_new_hugger(obj/item/clothing/mask/facehugger/facehugger, mob/user) @@ -208,18 +208,18 @@ NS.start() */ //RUTGMC EDIT END -/obj/alien/egg/gas/attack_alien(mob/living/carbon/xenomorph/xenomorph, damage_amount = xenomorph.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) +/obj/alien/egg/gas/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) if(maturity_stage > stage_ready_to_burst) - xenomorph.visible_message(span_xenonotice("\The [xenomorph] clears the hatched egg."), \ + xeno_attacker.visible_message(span_xenonotice("\The [xeno_attacker] clears the hatched egg."), \ span_xenonotice("We clear the broken egg.")) playsound(loc, "alien_resin_break", 25) qdel(src) - if(!issamexenohive(xenomorph) || xenomorph.a_intent != INTENT_HELP) - xenomorph.do_attack_animation(src, ATTACK_EFFECT_SMASH) - xenomorph.visible_message(span_xenowarning("[xenomorph] crushes \the [src]."), span_xenowarning("We crush \the [src].")) + if(!issamexenohive(xeno_attacker) || xeno_attacker.a_intent != INTENT_HELP) + xeno_attacker.do_attack_animation(src, ATTACK_EFFECT_SMASH) + xeno_attacker.visible_message(span_xenowarning("[xeno_attacker] crushes \the [src]."), span_xenowarning("We crush \the [src].")) burst(TRUE) return - to_chat(xenomorph, span_warning("That egg is filled with gas and has no child to retrieve.")) + to_chat(xeno_attacker, span_warning("That egg is filled with gas and has no child to retrieve.")) diff --git a/code/modules/mob/living/carbon/xenomorph/embryo.dm b/code/modules/mob/living/carbon/xenomorph/embryo.dm index dcdc762b858d7..6f71a087a14d3 100644 --- a/code/modules/mob/living/carbon/xenomorph/embryo.dm +++ b/code/modules/mob/living/carbon/xenomorph/embryo.dm @@ -192,9 +192,9 @@ victim.update_burst() - if(istype(victim.loc, /obj/vehicle/multitile/root)) - var/obj/vehicle/multitile/root/V = victim.loc - V.handle_player_exit(src) + if(istype(victim.loc, /obj/vehicle/sealed)) + var/obj/vehicle/sealed/armored/veh = victim.loc + forceMove(veh.exit_location(src)) else forceMove(get_turf(victim)) //moved to the turf directly so we don't get stuck inside a cryopod or another mob container. playsound(src, pick('sound/voice/alien_chestburst.ogg','sound/voice/alien_chestburst2.ogg'), 25) diff --git a/code/modules/mob/living/carbon/xenomorph/evo_datum.dm b/code/modules/mob/living/carbon/xenomorph/evo_datum.dm index 9a5b6415091d4..15bda447ac49b 100644 --- a/code/modules/mob/living/carbon/xenomorph/evo_datum.dm +++ b/code/modules/mob/living/carbon/xenomorph/evo_datum.dm @@ -24,7 +24,7 @@ .["abilities"] = list() for(var/ability in xeno.xeno_caste.actions) var/datum/action/ability/xeno_action/xeno_ability = ability - if(SSticker.mode && !(SSticker.mode.flags_xeno_abilities & initial(xeno_ability.gamemode_flags))) + if(SSticker.mode && !(SSticker.mode.xeno_abilities_flags & initial(xeno_ability.gamemode_flags))) continue .["abilities"]["[ability]"] = list( "name" = initial(xeno_ability.name), @@ -33,17 +33,17 @@ "cooldown" = (initial(xeno_ability.cooldown_duration) / 10) ) .["evolves_to"] = list() - for(var/evolves_into in xeno.xeno_caste.evolves_to) + for(var/evolves_into in xeno.get_evolution_options()) var/datum/xeno_caste/caste = GLOB.xeno_caste_datums[evolves_into][XENO_UPGRADE_BASETYPE] var/list/caste_data = list( "type_path" = caste.caste_type_path, "name" = caste.display_name, "abilities" = list(), - "instant_evolve" = (caste.caste_flags & CASTE_INSTANT_EVOLUTION), + "instant_evolve" = (caste.caste_flags & CASTE_INSTANT_EVOLUTION || (HAS_TRAIT(xeno, TRAIT_CASTE_SWAP) || HAS_TRAIT(xeno, TRAIT_REGRESSING))), ) for(var/ability in caste.actions) var/datum/action/ability/xeno_action/xeno_ability = ability - if(SSticker.mode && !(SSticker.mode.flags_xeno_abilities & initial(xeno_ability.gamemode_flags))) + if(SSticker.mode && !(SSticker.mode.xeno_abilities_flags & initial(xeno_ability.gamemode_flags))) continue caste_data["abilities"]["[ability]"] = list( "name" = initial(xeno_ability.name), @@ -74,5 +74,10 @@ switch(action) if("evolve") var/datum/xeno_caste/caste = GLOB.xeno_caste_datums[text2path(params["path"])][XENO_UPGRADE_BASETYPE] - xeno.do_evolve(caste.caste_type_path, caste.display_name) // All the checks for can or can't are handled inside do_evolve + xeno.do_evolve(caste.caste_type_path, caste.display_name, (HAS_TRAIT(xeno, TRAIT_CASTE_SWAP) || HAS_TRAIT(xeno, TRAIT_REGRESSING))) // All the checks for can or can't are handled inside do_evolve return TRUE + +/datum/evolution_panel/ui_close(mob/user) + . = ..() + REMOVE_TRAIT(user, TRAIT_CASTE_SWAP, TRAIT_CASTE_SWAP) + REMOVE_TRAIT(user, TRAIT_REGRESSING, TRAIT_REGRESSING) diff --git a/code/modules/mob/living/carbon/xenomorph/evolution.dm b/code/modules/mob/living/carbon/xenomorph/evolution.dm index 888cc62c646c3..d5b3566d4c074 100644 --- a/code/modules/mob/living/carbon/xenomorph/evolution.dm +++ b/code/modules/mob/living/carbon/xenomorph/evolution.dm @@ -2,15 +2,26 @@ //Recoded and consolidated by Abby -- ALL evolutions come from here now. It should work with any caste, anywhere // refactored by spookydonut because the above two were shitcoders and i'm sure in time my code too will be considered shit. -//All castes need an evolves_to() list in their defines -//Such as evolves_to = list("Warrior", "Sentinel", "Runner", "Badass") etc -// except use typepaths now so you dont have to have an entry for literally every evolve path /mob/living/carbon/xenomorph/verb/Evolve() set name = "Evolve" set desc = "Evolve into a higher form." set category = "Alien" + SStgui.close_user_uis(src, GLOB.evo_panel) // Closes all verbs using evo UI; evolution, caste swap and regress. They need to be refreshed with their respective castelists. + GLOB.evo_panel.ui_interact(src) + +/mob/living/carbon/xenomorph/verb/caste_swap() + set name = "Caste Swap" + set desc = "Change into another caste in the same tier." + set category = "Alien" + + if(world.time - (GLOB.key_to_time_of_caste_swap[key] ? GLOB.key_to_time_of_caste_swap[key] : -INFINITY) < 9000) //casteswap timer, 15 minutes + to_chat(src, span_warning("Your caste swap timer is not done yet.")) + return + + SStgui.close_user_uis(src, GLOB.evo_panel) + ADD_TRAIT(src, TRAIT_CASTE_SWAP, TRAIT_CASTE_SWAP) GLOB.evo_panel.ui_interact(src) /mob/living/carbon/xenomorph/verb/regress() @@ -18,42 +29,52 @@ set desc = "Regress into a lower form." set category = "Alien" - var/tiers_to_pick_from + SStgui.close_user_uis(src, GLOB.evo_panel) + ADD_TRAIT(src, TRAIT_REGRESSING, TRAIT_REGRESSING) + GLOB.evo_panel.ui_interact(src) + +///Creates a list of possible evolution options for a caste based on their tier. +/mob/living/carbon/xenomorph/proc/get_evolution_options() + . = list() + if(HAS_TRAIT(src, TRAIT_CASTE_SWAP)) + switch(tier) + if(XENO_TIER_ZERO, XENO_TIER_FOUR) + return + if(XENO_TIER_ONE) + return GLOB.xeno_types_tier_one + if(XENO_TIER_TWO) + return GLOB.xeno_types_tier_two + if(XENO_TIER_THREE) + return GLOB.xeno_types_tier_three + if(HAS_TRAIT(src, TRAIT_REGRESSING)) + switch(tier) + if(XENO_TIER_ZERO, XENO_TIER_FOUR) + if(isxenoshrike(src)) + return GLOB.xeno_types_tier_one + else + return + if(XENO_TIER_ONE) + return list(/mob/living/carbon/xenomorph/larva) + if(XENO_TIER_TWO) + return GLOB.xeno_types_tier_one + if(XENO_TIER_THREE) + return GLOB.xeno_types_tier_two switch(tier) - if(XENO_TIER_ZERO, XENO_TIER_FOUR, XENO_TIER_MINION) -/* RU TGMC EDIT - if(isxenoshrike(src)) - tiers_to_pick_from = GLOB.xeno_types_tier_one - else -RU TGMC EDIT */ - to_chat(src, span_warning("Your tier does not allow you to regress.")) - return + if(XENO_TIER_ZERO) + if(istype(xeno_caste, /datum/xeno_caste/larva_predalien)) + return list(/mob/living/carbon/xenomorph/predalien) + if(!istype(xeno_caste, /datum/xeno_caste/hivemind)) + return GLOB.xeno_types_tier_one if(XENO_TIER_ONE) - tiers_to_pick_from = list(/mob/living/carbon/xenomorph/larva) + return GLOB.xeno_types_tier_two + GLOB.xeno_types_tier_four + /mob/living/carbon/xenomorph/hivemind if(XENO_TIER_TWO) - tiers_to_pick_from = GLOB.xeno_types_tier_one + return GLOB.xeno_types_tier_three + GLOB.xeno_types_tier_four + /mob/living/carbon/xenomorph/hivemind if(XENO_TIER_THREE) - tiers_to_pick_from = GLOB.xeno_types_tier_two - else - CRASH("side_evolve() called without a valid tier") - - var/list/castes_to_pick = list() - for(var/type in tiers_to_pick_from) - var/datum/xeno_caste/available_caste = GLOB.xeno_caste_datums[type][XENO_UPGRADE_BASETYPE] - castes_to_pick += available_caste.caste_name - var/castepick = tgui_input_list(src, "We are growing into a beautiful alien! It is time to choose a caste.", null, castes_to_pick) - if(!castepick) //Changed my mind - return - - var/castetype - for(var/type in tiers_to_pick_from) - var/datum/xeno_caste/available_caste = GLOB.xeno_caste_datums[type][XENO_UPGRADE_BASETYPE] - if(castepick != available_caste.caste_name) - continue - castetype = type - break + return GLOB.xeno_types_tier_four + /mob/living/carbon/xenomorph/hivemind + if(XENO_TIER_FOUR) + if(istype(xeno_caste, /datum/xeno_caste/shrike)) + return list(/mob/living/carbon/xenomorph/queen, /mob/living/carbon/xenomorph/king) - do_evolve(castetype, castepick, TRUE) ///Handles the evolution or devolution of the xenomorph /mob/living/carbon/xenomorph/proc/do_evolve(caste_type, forced_caste_name, regression = FALSE) @@ -70,14 +91,14 @@ RU TGMC EDIT */ castepick = forced_caste_name else var/list/castes_to_pick = list() - for(var/type in xeno_caste.evolves_to) + for(var/type in get_evolution_options()) var/datum/xeno_caste/Z = GLOB.xeno_caste_datums[type][XENO_UPGRADE_BASETYPE] castes_to_pick += Z.caste_name castepick = tgui_input_list(src, "We are growing into a beautiful alien! It is time to choose a caste.", null, castes_to_pick) if(!castepick) //Changed my mind return - for(var/type in xeno_caste.evolves_to) + for(var/type in get_evolution_options()) var/datum/xeno_caste/XC = GLOB.xeno_caste_datums[type][XENO_UPGRADE_BASETYPE] if(castepick == XC.caste_name) new_mob_type = type @@ -101,6 +122,12 @@ RU TGMC EDIT */ if(!generic_evolution_checks() || !caste_evolution_checks(new_mob_type, castepick, regression)) return + if(HAS_TRAIT(src, TRAIT_CASTE_SWAP)) + GLOB.key_to_time_of_caste_swap[key] = world.time + + if(xeno_flags & XENO_ZOOMED) + zoom_out() + SStgui.close_user_uis(src) //Force close all UIs upon evolution. finish_evolve(new_mob_type) @@ -140,10 +167,10 @@ RU TGMC EDIT */ new_xeno.fireloss = fireloss //Transfers the damage over. new_xeno.updatehealth() - if(xeno_mobhud) + if(xeno_flags & XENO_MOBHUD) var/datum/atom_hud/H = GLOB.huds[DATA_HUD_XENO_STATUS] H.add_hud_to(new_xeno) //keep our mobhud choice - new_xeno.xeno_mobhud = TRUE + new_xeno.xeno_flags |= XENO_MOBHUD if(lighting_alpha != new_xeno.lighting_alpha) new_xeno.toggle_nightvision(lighting_alpha) @@ -161,7 +188,7 @@ RU TGMC EDIT */ GLOB.round_statistics.total_xenos_created-- //so an evolved xeno doesn't count as two. SSblackbox.record_feedback("tally", "round_statistics", -1, "total_xenos_created") - if(queen_chosen_lead && (new_xeno.xeno_caste.can_flags & CASTE_CAN_BE_LEADER)) // xeno leader is removed by Destroy() + if((xeno_flags & XENO_LEADER) && (new_xeno.xeno_caste.can_flags & CASTE_CAN_BE_LEADER)) // xeno leader is removed by Destroy() hive.add_leader(new_xeno) new_xeno.hud_set_queen_overwatch() if(hive.living_xeno_queen) @@ -217,7 +244,7 @@ RU TGMC EDIT */ balloon_alert(src, "The restraints are too restricting to allow us to evolve") return FALSE - if(isnull(xeno_caste.evolves_to) || !(xeno_caste.caste_flags & CASTE_EVOLUTION_ALLOWED) || HAS_TRAIT(src, TRAIT_VALHALLA_XENO)) + if(isnull(get_evolution_options()) || !(xeno_caste.caste_flags & CASTE_EVOLUTION_ALLOWED) || HAS_TRAIT(src, TRAIT_VALHALLA_XENO)) balloon_alert(src, "We are already the apex of form and function. Let's go forth and spread the hive!") return FALSE @@ -245,7 +272,7 @@ RU TGMC EDIT */ ///Check if the xeno can currently evolve into a specific caste /mob/living/carbon/xenomorph/proc/caste_evolution_checks(new_mob_type, castepick, regression = FALSE) - if(!regression && !(new_mob_type in xeno_caste.evolves_to)) + if(!regression && !(new_mob_type in get_evolution_options())) balloon_alert(src, "We can't evolve to that caste from our current one") return FALSE @@ -308,7 +335,7 @@ RU TGMC EDIT */ balloon_alert(src, "The hive cannot support another Tier 3, wait for either more aliens to be born or someone to die") return FALSE var/potential_queens = length(hive.xenos_by_typepath[/mob/living/carbon/xenomorph/larva]) + length(hive.xenos_by_typepath[/mob/living/carbon/xenomorph/drone]) - if(SSticker.mode?.flags_round_type & MODE_XENO_RULER && !hive.living_xeno_ruler && potential_queens == 1) + if(SSticker.mode?.round_type_flags & MODE_XENO_RULER && !hive.living_xeno_ruler && potential_queens == 1) if(isxenolarva(src) && new_mob_type != /mob/living/carbon/xenomorph/drone) to_chat(src, span_xenonotice("The hive currently has no sister able to become a ruler! The survival of the hive requires from us to be a Drone!")) return FALSE diff --git a/code/modules/mob/living/carbon/xenomorph/facehuggers.dm b/code/modules/mob/living/carbon/xenomorph/facehuggers.dm index 0ad69d28491c0..b714759dbd863 100644 --- a/code/modules/mob/living/carbon/xenomorph/facehuggers.dm +++ b/code/modules/mob/living/carbon/xenomorph/facehuggers.dm @@ -19,10 +19,10 @@ item_state = "facehugger" w_class = WEIGHT_CLASS_TINY //Note: can be picked up by aliens unlike most other items of w_class below 4 resistance_flags = NONE - flags_inventory = COVEREYES|COVERMOUTH - flags_armor_protection = FACE|EYES - flags_atom = CRITICAL_ATOM - flags_item = NOBLUDGEON + inventory_flags = COVEREYES|COVERMOUTH + armor_protection_flags = FACE|EYES + atom_flags = CRITICAL_ATOM + item_flags = NOBLUDGEON throw_range = 1 worn_layer = FACEHUGGER_LAYER layer = FACEHUGGER_LAYER @@ -100,7 +100,8 @@ clear_hugger_source() return ..() -/obj/item/clothing/mask/facehugger/update_icon() +/obj/item/clothing/mask/facehugger/update_icon_state() + . = ..() if(stat == DEAD) var/fertility = sterile ? "impregnated" : "dead" icon_state = "[initial(icon_state)]_[fertility]" @@ -115,18 +116,18 @@ //Deal with picking up facehuggers. "attack_alien" is the universal 'xenos click something while unarmed' proc. -/obj/item/clothing/mask/facehugger/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) - if(X.status_flags & INCORPOREAL) +/obj/item/clothing/mask/facehugger/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) + if(xeno_attacker.status_flags & INCORPOREAL) return - if(!issamexenohive(X) && stat != DEAD) - X.do_attack_animation(src, ATTACK_EFFECT_SMASH) - X.visible_message("[X] crushes \the [src]", + if(!issamexenohive(xeno_attacker) && stat != DEAD) + xeno_attacker.do_attack_animation(src, ATTACK_EFFECT_SMASH) + xeno_attacker.visible_message("[xeno_attacker] crushes \the [src]", "We crush \the [src]") kill_hugger() return else - attack_hand(X) + attack_hand(xeno_attacker) //ATTACK HAND IGNORING PARENT RETURN VALUE /obj/item/clothing/mask/facehugger/attack_hand(mob/living/user) @@ -293,12 +294,12 @@ if(stat == DEAD || stat == UNCONSCIOUS || !isturf(loc)) //It's dead or inactive or not on a turf don't bother return about_to_jump = TRUE - update_overlays() + update_appearance(UPDATE_OVERLAYS) ///Remove the hugger's alert overlay /obj/item/clothing/mask/facehugger/proc/remove_danger_overlay() about_to_jump = FALSE - update_overlays() + update_appearance(UPDATE_OVERLAYS) /obj/item/clothing/mask/facehugger/proc/check_lifecycle() @@ -647,13 +648,13 @@ kill_hugger() /obj/item/clothing/mask/facehugger/attackby(obj/item/I, mob/user, params) - if(I.flags_item & NOBLUDGEON || attached) + if(I.item_flags & NOBLUDGEON || attached) return kill_hugger() /obj/item/clothing/mask/facehugger/bullet_act(obj/projectile/P) ..() - if(P.ammo.flags_ammo_behavior & AMMO_XENO) + if(P.ammo.ammo_behavior_flags & AMMO_XENO) return FALSE //Xeno spits ignore huggers. if(P.damage && !(P.ammo.damage_type in list(OXY, STAMINA))) kill_hugger() @@ -704,33 +705,47 @@ /obj/item/clothing/mask/facehugger/combat sterile = TRUE combat_hugger = TRUE - flags_equip_slot = NONE - + equip_slot_flags = NONE -/obj/item/clothing/mask/facehugger/combat/neuro - name = "neuro hugger" +/obj/item/clothing/mask/facehugger/combat/chem_injector desc = "This strange creature has a single prominent sharp proboscis." - color = COLOR_DARK_ORANGE impact_time = 1 SECONDS activate_time = 1.5 SECONDS jump_cooldown = 1.5 SECONDS proximity_time = 0.5 SECONDS + ///The type of chemical we inject + var/datum/reagent/toxin/injected_chemical_type + ///The amount of chemical we should inject, in units + var/amount_injected = 10 -/obj/item/clothing/mask/facehugger/combat/neuro/Attach(mob/M, mob/user) +/obj/item/clothing/mask/facehugger/combat/chem_injector/Attach(mob/living/carbon/M, mob/user) if(!combat_hugger_check_target(M)) return FALSE - var/mob/living/victim = M do_attack_animation(M) - victim.apply_damage(100, STAMINA, BODY_ZONE_HEAD, BIO) //This should prevent sprinting - victim.apply_damage(1, BRUTE, sharp = TRUE, updating_health = TRUE) //Token brute for the injection - victim.reagents.add_reagent(/datum/reagent/toxin/xeno_neurotoxin, 10, no_overdose = TRUE) - playsound(victim, 'sound/effects/spray3.ogg', 25, 1) - victim.visible_message(span_danger("[src] penetrates [victim] with its sharp probscius!"),span_danger("[src] penetrates you with a sharp probscius before falling down!")) + M.apply_damage(1, BRUTE, sharp = TRUE, updating_health = TRUE) //Token brute for the injection + M.reagents.add_reagent(injected_chemical_type, amount_injected, no_overdose = TRUE) + playsound(M, 'sound/effects/spray3.ogg', 25, 1) + M.visible_message(span_danger("[src] penetrates [M] with its sharp probscius!"), span_danger("[src] penetrates you with a sharp probscius before falling down!")) leaping = FALSE go_idle() //We're a bit slow on the recovery return TRUE +/obj/item/clothing/mask/facehugger/combat/chem_injector/neuro + name = "neurotoxin hugger" + color = COLOR_DARK_ORANGE + injected_chemical_type = /datum/reagent/toxin/xeno_neurotoxin + +/obj/item/clothing/mask/facehugger/combat/chem_injector/neuro/Attach(mob/living/carbon/M) + if(!..()) + return + M.apply_damage(100, STAMINA, BODY_ZONE_HEAD, BIO) //This should prevent sprinting + +/obj/item/clothing/mask/facehugger/combat/chem_injector/ozelomelyn + name = "ozelomelyn hugger" + injected_chemical_type = /datum/reagent/toxin/xeno_ozelomelyn + color = COLOR_MAGENTA + /obj/item/clothing/mask/facehugger/combat/acid name = "acid hugger" desc = "This repulsive looking thing is bloated with throbbing, putrescent green sacks of flesh." diff --git a/code/modules/mob/living/carbon/xenomorph/hive_datum.dm b/code/modules/mob/living/carbon/xenomorph/hive_datum.dm index 7b8a7b22d1282..a5d1cae011382 100644 --- a/code/modules/mob/living/carbon/xenomorph/hive_datum.dm +++ b/code/modules/mob/living/carbon/xenomorph/hive_datum.dm @@ -27,6 +27,8 @@ var/tier2_xeno_limit /// Queue of all clients wanting to join xeno side var/list/client/candidates + /// Amount of special resin points used to build special resin walls by each hive. + var/special_build_points = 50 ///Reference to upgrades available and purchased by this hive. var/datum/hive_purchases/purchases = new @@ -80,8 +82,8 @@ .["hive_larva_rate"] = SSsilo.current_larva_spawn_rate .["hive_larva_burrowed"] = xeno_job.total_positions - xeno_job.current_positions - var/psy_points = SSpoints.xeno_points_by_hive[hivenumber] - .["hive_psy_points"] = !isnull(psy_points) ? psy_points : 0 + .["hive_strategic_psy_points"] = !isnull(SSpoints.xeno_strategic_points_by_hive[hivenumber]) ? SSpoints.xeno_strategic_points_by_hive[hivenumber] : 0 + .["hive_tactical_psy_points"] = !isnull(SSpoints.xeno_tactical_points_by_hive[hivenumber]) ? SSpoints.xeno_tactical_points_by_hive[hivenumber] : 0 var/hivemind_countdown = SSticker.mode?.get_hivemind_collapse_countdown() .["hive_orphan_collapse"] = !isnull(hivemind_countdown) ? hivemind_countdown : 0 @@ -141,7 +143,7 @@ "health" = round(health * 100, 1), "plasma" = round((xeno.plasma_stored / (caste.plasma_max * plasma_multi)) * 100, 1), "can_be_leader" = CHECK_BITFIELD(initial(caste.can_flags), CASTE_CAN_BE_LEADER), //RUTGMC ADDITION - "is_leader" = xeno.queen_chosen_lead, + "is_leader" = xeno.xeno_flags & XENO_LEADER, "is_ssd" = !xeno.client, "index" = GLOB.hive_ui_caste_index[caste.caste_type_path], )) @@ -383,6 +385,12 @@ for(var/obj/structure/xeno/evotower/tower AS in evotowers) . += tower.boost_amount +///fetches number of bonus maturity points given to the hive +/datum/hive_status/proc/get_upgrade_boost() + . = 0 + for(var/obj/structure/xeno/evotower/tower AS in evotowers) + . += tower.maturty_boost_amount + // *************************************** // *********** Adding xenos // *************************************** @@ -537,7 +545,7 @@ if(!hive.remove_xeno(src)) CRASH("failed to remove xeno from a hive") - if(queen_chosen_lead || (src in hive.xeno_leader_list)) + if((xeno_flags & XENO_LEADER) || (src in hive.xeno_leader_list)) hive.remove_leader(src) SSdirection.stop_tracking(hive.hivenumber, src) @@ -552,7 +560,7 @@ var/obj/machinery/nuclearbomb/nuke = thing if(!nuke.timer) CRASH("hive_status's setup_nuke_hud_timer called with invalid nuke object") - nuke_hud_timer = new(null, get_all_xenos() , nuke.timer, "Nuke ACTIVE: ${timer}") + nuke_hud_timer = new(null, null, get_all_xenos() , nuke.timer, "Nuke ACTIVE: ${timer}") /datum/hive_status/Destroy(force, ...) . = ..() @@ -606,12 +614,12 @@ // *************************************** /datum/hive_status/proc/add_leader(mob/living/carbon/xenomorph/X) xeno_leader_list += X - X.queen_chosen_lead = TRUE + X.xeno_flags |= XENO_LEADER X.give_rally_abilities() /datum/hive_status/proc/remove_leader(mob/living/carbon/xenomorph/X) xeno_leader_list -= X - X.queen_chosen_lead = FALSE + X.xeno_flags &= ~XENO_LEADER if(!isxenoshrike(X) && !isxenoqueen(X) && !isxenohivemind(X)) //These innately have the Rally Hive ability X.remove_rally_hive_ability() @@ -799,7 +807,7 @@ /datum/hive_status/normal/check_ruler() - if(!(SSticker.mode?.flags_round_type & MODE_XENO_RULER)) + if(!(SSticker.mode?.round_type_flags & MODE_XENO_RULER)) return TRUE return living_xeno_ruler @@ -901,7 +909,7 @@ to_chat will check for valid clients itself already so no need to double check f /datum/hive_status/normal/handle_ruler_timer() if(!isinfestationgamemode(SSticker.mode)) //Check just need for unit test return - if(!(SSticker.mode?.flags_round_type & MODE_XENO_RULER)) + if(!(SSticker.mode?.round_type_flags & MODE_XENO_RULER)) return if(SSmonitor.gamestate == SHUTTERS_CLOSED) //don't trigger orphan hivemind if the shutters are closed return @@ -919,7 +927,7 @@ to_chat will check for valid clients itself already so no need to double check f D.orphan_hive_timer = addtimer(CALLBACK(D, TYPE_PROC_REF(/datum/game_mode, orphan_hivemind_collapse)), NUCLEAR_WAR_ORPHAN_HIVEMIND, TIMER_STOPPABLE) - orphan_hud_timer = new(null, get_all_xenos(), D.orphan_hive_timer, "Orphan Hivemind Collapse: ${timer}", 150, -80) + orphan_hud_timer = new(null, null, get_all_xenos(), D.orphan_hive_timer, "Orphan Hivemind Collapse: ${timer}", 150, -80) /datum/hive_status/normal/burrow_larva(mob/living/carbon/xenomorph/larva/L) if(!is_ground_level(L.z)) @@ -948,7 +956,7 @@ to_chat will check for valid clients itself already so no need to double check f if(!length(possible_mothers)) if(length(possible_silos)) return attempt_to_spawn_larva_in_silo(xeno_candidate, possible_silos, larva_already_reserved) - if(SSticker.mode?.flags_round_type & MODE_SILO_RESPAWN && !SSsilo.can_fire) // Distress mode & prior to shutters opening, so let the queue bypass silos if needed + if(SSticker.mode?.round_type_flags & MODE_SILO_RESPAWN && !SSsilo.can_fire) // Distress mode & prior to shutters opening, so let the queue bypass silos if needed return do_spawn_larva(xeno_candidate, pick(GLOB.spawns_by_job[/datum/job/xenomorph]), larva_already_reserved) to_chat(xeno_candidate, span_warning("There are no places currently available to receive new larvas.")) return FALSE @@ -976,7 +984,7 @@ to_chat will check for valid clients itself already so no need to double check f xeno_candidate.mob.reset_perspective(chosen_silo) var/double_check = tgui_alert(xeno_candidate.mob, "Spawn here?", "Spawn location", list("Yes","Pick another silo","Abort"), timeout = 20 SECONDS) if(double_check == "Pick another silo") - return attempt_to_spawn_larva_in_silo(xeno_candidate, possible_silos) + return attempt_to_spawn_larva_in_silo(xeno_candidate, possible_silos, larva_already_reserved) else if(double_check != "Yes") xeno_candidate.mob.reset_perspective(null) remove_from_larva_candidate_queue(xeno_candidate) @@ -1052,8 +1060,9 @@ to_chat will check for valid clients itself already so no need to double check f continue qdel(structure) - if(SSticker.mode?.flags_round_type & MODE_PSY_POINTS_ADVANCED) - SSpoints.xeno_points_by_hive[hivenumber] = SILO_PRICE + XENO_TURRET_PRICE //Give a free silo when going shipside and a turret + if(SSticker.mode?.round_type_flags & MODE_PSY_POINTS_ADVANCED) + SSpoints.xeno_strategic_points_by_hive[hivenumber] = SILO_PRICE //Give a free silo when going shipside and a turret + SSpoints.xeno_tactical_points_by_hive[hivenumber] = (XENO_TURRET_PRICE*4) /datum/hive_status/normal/proc/on_hijack_depart(datum/source, new_mode) @@ -1097,9 +1106,12 @@ to_chat will check for valid clients itself already so no need to double check f var/list/possible_mothers = list() var/list/possible_silos = list() SEND_SIGNAL(src, COMSIG_HIVE_XENO_MOTHER_PRE_CHECK, possible_mothers, possible_silos) - if(stored_larva > 0 && !LAZYLEN(candidates) && !XENODEATHTIME_CHECK(waiter.mob) && (length(possible_mothers) || length(possible_silos) || (SSticker.mode?.flags_round_type & MODE_SILO_RESPAWN && SSmonitor.gamestate == SHUTTERS_CLOSED))) - attempt_to_spawn_larva(waiter) - return + if(stored_larva > 0 && !LAZYLEN(candidates) && !XENODEATHTIME_CHECK(waiter.mob) && (length(possible_mothers) || length(possible_silos) || (SSticker.mode?.round_type_flags & MODE_SILO_RESPAWN && SSmonitor.gamestate == SHUTTERS_CLOSED))) + xeno_job.occupy_job_positions(1) + if(!attempt_to_spawn_larva(waiter, TRUE)) + xeno_job.free_job_positions(1) + return FALSE + return TRUE if(LAZYFIND(candidates, waiter)) remove_from_larva_candidate_queue(waiter) return FALSE @@ -1130,7 +1142,7 @@ to_chat will check for valid clients itself already so no need to double check f var/list/possible_mothers = list() var/list/possible_silos = list() SEND_SIGNAL(src, COMSIG_HIVE_XENO_MOTHER_PRE_CHECK, possible_mothers, possible_silos) - if(!length(possible_mothers) && !length(possible_silos) && (!(SSticker.mode?.flags_round_type & MODE_SILO_RESPAWN) || SSsilo.can_fire)) + if(!length(possible_mothers) && !length(possible_silos) && (!(SSticker.mode?.round_type_flags & MODE_SILO_RESPAWN) || SSsilo.can_fire)) return var/datum/job/xeno_job = SSjob.GetJobType(/datum/job/xenomorph) var/stored_larva = round(xeno_job.total_positions - xeno_job.current_positions) diff --git a/code/modules/mob/living/carbon/xenomorph/hive_upgrades.dm b/code/modules/mob/living/carbon/xenomorph/hive_upgrades.dm index 8843d0f67fc15..a2f8bb8352bad 100644 --- a/code/modules/mob/living/carbon/xenomorph/hive_upgrades.dm +++ b/code/modules/mob/living/carbon/xenomorph/hive_upgrades.dm @@ -28,7 +28,7 @@ GLOBAL_LIST_INIT(tier_to_primo_upgrade, list( var/datum/hive_upgrade/upgrade = new type if(upgrade.name == "Error upgrade") //defaultname just skip it its probably organisation continue - if(!(SSticker.mode.flags_xeno_abilities & upgrade.flags_gamemode)) + if(!(SSticker.mode.xeno_abilities_flags & upgrade.gamemode_flags)) continue buyable_upgrades += upgrade upgrades_by_name[upgrade.name] = upgrade @@ -54,8 +54,9 @@ GLOBAL_LIST_INIT(tier_to_primo_upgrade, list( .["upgrades"] = list() for(var/datum/hive_upgrade/upgrade AS in buyable_upgrades) .["upgrades"] += list(list("name" = upgrade.name, "desc" = upgrade.desc, "category" = upgrade.category,\ - "cost" = upgrade.psypoint_cost, "times_bought" = upgrade.times_bought, "iconstate" = upgrade.icon)) - .["psypoints"] = SSpoints.xeno_points_by_hive[X.hive.hivenumber] + "cost" = upgrade.psypoint_cost, "times_bought" = upgrade.times_bought, "iconstate" = upgrade.icon, "istactical" = (upgrade.upgrade_flags & UPGRADE_FLAG_USES_TACTICAL))) + .["strategicpoints"] = SSpoints.xeno_strategic_points_by_hive[X.hive.hivenumber] + .["tacticalpoints"] = SSpoints.xeno_tactical_points_by_hive[X.hive.hivenumber] /datum/hive_purchases/ui_static_data(mob/user) . = ..() @@ -73,7 +74,7 @@ GLOBAL_LIST_INIT(tier_to_primo_upgrade, list( if(!upgrade.on_buy(user)) return log_game("[key_name(user)] has purchased \a [upgrade] Blessing for [upgrade.psypoint_cost] psypoints for the [user.hive.hivenumber] hive") - if(upgrade.flags_upgrade & UPGRADE_FLAG_MESSAGE_HIVE) + if(upgrade.upgrade_flags & UPGRADE_FLAG_MESSAGE_HIVE) xeno_message("[user] has purchased \a [upgrade] Blessing", "xenoannounce", 5, user.hivenumber) /datum/hive_upgrade @@ -86,9 +87,9 @@ GLOBAL_LIST_INIT(tier_to_primo_upgrade, list( ///Psy point cost, float var/psypoint_cost = 10 ///upgrade flag var - var/flags_upgrade = NONE + var/upgrade_flags = NONE ///gamemode flags to whether this upgrade is purchasable - var/flags_gamemode = ABILITY_ALL_GAMEMODE + var/gamemode_flags = ABILITY_ALL_GAMEMODE ///int of the times we bought this upgrade var/times_bought = 0 ///string for UI icon in buyable_icons.dmi for this upgrade @@ -102,7 +103,10 @@ GLOBAL_LIST_INIT(tier_to_primo_upgrade, list( */ /datum/hive_upgrade/proc/on_buy(mob/living/carbon/xenomorph/buyer) SHOULD_CALL_PARENT(TRUE) - SSpoints.xeno_points_by_hive[buyer.hivenumber] -= psypoint_cost + if(upgrade_flags & UPGRADE_FLAG_USES_TACTICAL) + SSpoints.xeno_tactical_points_by_hive[buyer.hivenumber] -= psypoint_cost + else + SSpoints.xeno_strategic_points_by_hive[buyer.hivenumber] -= psypoint_cost times_bought++ /*RUTGMC EDIT begin */ if(buyer.status_flags & INCORPOREAL) @@ -120,16 +124,19 @@ GLOBAL_LIST_INIT(tier_to_primo_upgrade, list( */ /datum/hive_upgrade/proc/can_buy(mob/living/carbon/xenomorph/buyer, silent = TRUE) SHOULD_CALL_PARENT(TRUE) - if((flags_upgrade & UPGRADE_FLAG_ONETIME) && times_bought) + if((upgrade_flags & UPGRADE_FLAG_ONETIME) && times_bought) + if(!silent) + to_chat(buyer, span_xenowarning("You have already bought this blessing!")) return FALSE /*RUTGMC EDIT begin*/ if(buyer.status_flags & INCORPOREAL) to_chat(buyer, span_xenowarning("You can't build in this form!")) return FALSE /*RUTGMC EDIT end*/ - if(SSpoints.xeno_points_by_hive[buyer.hivenumber] < psypoint_cost) + var/points_requirement = (upgrade_flags & UPGRADE_FLAG_USES_TACTICAL) ? SSpoints.xeno_tactical_points_by_hive[buyer.hivenumber] : SSpoints.xeno_strategic_points_by_hive[buyer.hivenumber] + if(points_requirement < psypoint_cost) if(!silent) - to_chat(buyer, span_xenowarning("You need [psypoint_cost-SSpoints.xeno_points_by_hive[buyer.hivenumber]] more points to request this blessing!")) + to_chat(buyer, span_xenowarning("You need [points_requirement] more [(upgrade_flags & UPGRADE_FLAG_USES_TACTICAL) ? "tactical" : "strategic"] points to request this blessing!")) return FALSE return TRUE @@ -185,7 +192,7 @@ GLOBAL_LIST_INIT(tier_to_primo_upgrade, list( desc = "Constructs a silo that generates xeno larvas over time. Requires open space and time to place." psypoint_cost = SILO_PRICE icon = "larvasilo" - flags_upgrade = ABILITY_NUCLEARWAR + gamemode_flags = ABILITY_NUCLEARWAR building_type = /obj/structure/xeno/silo /* RUTGMC DELETION, SILO SCALING @@ -212,10 +219,10 @@ GLOBAL_LIST_INIT(tier_to_primo_upgrade, list( /* RU TGMC EDIT /datum/hive_upgrade/building/evotower name = "Evolution Tower" - desc = "Constructs a tower that increases the rate of evolution point and maturity point generation by 1.2 times per tower." + desc = "Constructs a tower that increases the rate of evolution point generation by 0.2 and maturity point generation by 0.8 times per tower." psypoint_cost = 300 icon = "evotower" - flags_upgrade = ABILITY_NUCLEARWAR + gamemode_flags = ABILITY_NUCLEARWAR building_type = /obj/structure/xeno/evotower /datum/hive_upgrade/building/psychictower @@ -223,7 +230,7 @@ GLOBAL_LIST_INIT(tier_to_primo_upgrade, list( desc = "Constructs a tower that increases the slots of higher tier Xenomorphs." psypoint_cost = 300 icon = "maturitytower" - flags_upgrade = ABILITY_NUCLEARWAR + gamemode_flags = ABILITY_NUCLEARWAR building_type = /obj/structure/xeno/psychictower RU TGMC EDIT */ /datum/hive_upgrade/building/pherotower @@ -231,7 +238,8 @@ RU TGMC EDIT */ desc = "Constructs a tower that emanates a selectable type of pheromone." psypoint_cost = 150 icon = "pherotower" - flags_upgrade = ABILITY_NUCLEARWAR + gamemode_flags = ABILITY_NUCLEARWAR + upgrade_flags = UPGRADE_FLAG_USES_TACTICAL building_type = /obj/structure/xeno/pherotower building_loc = 0 //This results in spawning the structure under the user. building_time = 5 SECONDS @@ -239,11 +247,35 @@ RU TGMC EDIT */ /datum/hive_upgrade/building/spawner name = "Spawner" desc = "Constructs a spawner that generates ai xenos over time" - psypoint_cost = 600 + psypoint_cost = 400 icon = "spawner" - flags_upgrade = ABILITY_NUCLEARWAR + gamemode_flags = ABILITY_NUCLEARWAR + upgrade_flags = UPGRADE_FLAG_USES_TACTICAL building_type = /obj/structure/xeno/spawner +/datum/hive_upgrade/building/acid_pool + name = "acid pool" + desc = "Constructs a pool that allows xenos to regenerate sunder in it while resting. Requires open space and time to place." + psypoint_cost = 200 + icon = "pool" + gamemode_flags = ABILITY_NUCLEARWAR + upgrade_flags = UPGRADE_FLAG_USES_TACTICAL + building_type = /obj/structure/xeno/acid_pool + +/datum/hive_upgrade/building/acid_pool/can_buy(mob/living/carbon/xenomorph/buyer, silent = TRUE) + . = ..() + if(!.) + return + + var/turf/buildloc = get_step(buyer, building_loc) + if(!buildloc) + return FALSE + + if(buildloc.density) + if(!silent) + to_chat(buyer, span_xenowarning("You cannot build in a dense location!")) + return FALSE + /datum/hive_upgrade/defence category = "Defences" @@ -252,7 +284,8 @@ RU TGMC EDIT */ desc = "Places a acid spitting resin turret under you. Must be at least 6 tiles away from other turrets, not near fog and on a weeded area." icon = "acidturret" psypoint_cost = XENO_TURRET_PRICE - flags_gamemode = ABILITY_NUCLEARWAR + gamemode_flags = ABILITY_NUCLEARWAR + upgrade_flags = UPGRADE_FLAG_USES_TACTICAL ///How long to build one turret var/build_time = 10 SECONDS ///What type of turret is built @@ -310,12 +343,74 @@ RU TGMC EDIT */ psypoint_cost = 50 turret_type = /obj/structure/xeno/xeno_turret/sticky +/datum/hive_upgrade/defence/gargoyle + name = "Gargoyle" + desc = "Constructs a gargoyle that alerts you when enemies approach." + psypoint_cost = 25 + icon = "gargoyle" + gamemode_flags = ABILITY_NUCLEARWAR + upgrade_flags = UPGRADE_FLAG_USES_TACTICAL + +/datum/hive_upgrade/defence/gargoyle/can_buy(mob/living/carbon/xenomorph/buyer, silent) + . = ..() + if(!.) + return + var/turf/buildloc = get_turf(buyer) + if(!buildloc) + return FALSE + + if(!buildloc.is_weedable()) + if(!silent) + to_chat(buyer, span_warning("We can't do that here.")) + return FALSE + + var/obj/alien/weeds/alien_weeds = locate() in buildloc + + if(!alien_weeds) + if(!silent) + to_chat(buyer, span_warning("We can only shape on weeds. We must find some resin before we start building!")) + return FALSE + + if(!buildloc.check_alien_construction(buyer, silent) || !buildloc.check_disallow_alien_fortification(buyer, silent)) + return FALSE + +/datum/hive_upgrade/defence/gargoyle/on_buy(mob/living/carbon/xenomorph/buyer) + if(!do_after(buyer, 3 SECONDS, NONE, buyer, BUSY_ICON_BUILD)) + return FALSE + + if(!can_buy(buyer, FALSE)) + return FALSE + + var/turf/buildloc = get_turf(buyer) + + var/atom/built = new /obj/structure/xeno/resin_gargoyle(buildloc, buyer.hivenumber, buyer) + to_chat(buyer, span_notice("We build [built] for [psypoint_cost] psy points.")) + log_game("[buyer] has built \a [built] in [AREACOORD(buildloc)], spending [psypoint_cost] psy points in the process") + xeno_message("[buyer] has built \a [built] at [get_area(buildloc)]!", "xenoannounce", 5, buyer.hivenumber) + return ..() + +/datum/hive_upgrade/defence/special_walls + name = "Special Resin Walls" + desc = "Gives your hive 50 special resin walls to build." + psypoint_cost = 100 + icon = "specialresin" + gamemode_flags = ABILITY_NUCLEARWAR + upgrade_flags = UPGRADE_FLAG_USES_TACTICAL + +/datum/hive_upgrade/defence/special_walls/on_buy(mob/living/carbon/xenomorph/buyer) + GLOB.hive_datums[buyer.get_xeno_hivenumber()].special_build_points += 50 + to_chat(buyer, span_notice("We buy 50 special resin points for [psypoint_cost] psy points.")) + log_game("[buyer] has purchased 50 special resin points, spending [psypoint_cost] psy points in the process.") + xeno_message("[buyer] has purchased 50 special resin points!", "xenoannounce", 5, buyer.hivenumber) + + return ..() + /datum/hive_upgrade/xenos category = "Xenos" /datum/hive_upgrade/primordial category = "Xenos" - flags_upgrade = UPGRADE_FLAG_ONETIME|UPGRADE_FLAG_MESSAGE_HIVE + upgrade_flags = UPGRADE_FLAG_ONETIME|UPGRADE_FLAG_MESSAGE_HIVE /datum/hive_upgrade/primordial/can_buy(mob/living/carbon/xenomorph/buyer, silent = TRUE) . = ..() diff --git a/code/modules/mob/living/carbon/xenomorph/life.dm b/code/modules/mob/living/carbon/xenomorph/life.dm index 1b021f0022f5a..a733a905aa3c8 100644 --- a/code/modules/mob/living/carbon/xenomorph/life.dm +++ b/code/modules/mob/living/carbon/xenomorph/life.dm @@ -3,8 +3,6 @@ #define XENO_STANDING_HEAL 0.2 #define XENO_CRIT_DAMAGE 5 -#define XENO_HUD_ICON_BUCKETS 16 // should equal the number of icons you use to represent health / plasma (from 0 -> X) - /mob/living/carbon/xenomorph/Life() if(!loc) @@ -19,10 +17,10 @@ SSmobs.stop_processing(src) return if(stat == UNCONSCIOUS) - if(is_zoomed) + if(xeno_flags & XENO_ZOOMED) zoom_out() else - if(is_zoomed) + if(xeno_flags & XENO_ZOOMED) if(!can_walk_zoomed) if(loc != zoom_turf) zoom_out() @@ -54,14 +52,13 @@ handle_critical_health_updates() return if((health >= maxHealth) || on_fire) //can't regenerate. - updatehealth() //Update health-related stats, like health itself (using brute and fireloss), health HUD and status. return var/turf/T = loc if(!istype(T)) return var/ruler_healing_penalty = 0.5 - if(hive?.living_xeno_ruler?.loc?.z == T.z || xeno_caste.can_flags & CASTE_CAN_HEAL_WITHOUT_QUEEN || (SSticker?.mode.flags_round_type & MODE_XENO_RULER)) //if the living queen's z-level is the same as ours. + if(hive?.living_xeno_ruler?.loc?.z == T.z || xeno_caste.can_flags & CASTE_CAN_HEAL_WITHOUT_QUEEN || (SSticker?.mode.round_type_flags & MODE_XENO_RULER)) //if the living queen's z-level is the same as ours. ruler_healing_penalty = 1 if(loc_weeds_type || xeno_caste.caste_flags & CASTE_INNATE_HEALING) //We regenerate on weeds or can on our own. if(lying_angle || resting || xeno_caste.caste_flags & CASTE_QUICK_HEAL_STANDING) @@ -119,25 +116,23 @@ /mob/living/carbon/xenomorph/proc/handle_living_plasma_updates() var/turf/T = loc - if(!T || !istype(T)) + if(!istype(T)) //This means plasma doesn't update while you're in things like a vent, but since you don't have weeds in a vent or can actually take advantage of pheros, this is fine return - if(plasma_stored >= xeno_caste.plasma_max * xeno_caste.plasma_regen_limit) + + if(!current_aura && (plasma_stored >= xeno_caste.plasma_max * xeno_caste.plasma_regen_limit)) //no loss or gain return if(current_aura) if(plasma_stored < pheromone_cost) - use_plasma(plasma_stored) + use_plasma(plasma_stored, FALSE) QDEL_NULL(current_aura) src.balloon_alert(src, "Stop emitting, no plasma") else - use_plasma(pheromone_cost) - - if(HAS_TRAIT(src, TRAIT_NOPLASMAREGEN)) - hud_set_plasma() - return + use_plasma(pheromone_cost, FALSE) - if(!loc_weeds_type && !(xeno_caste.caste_flags & CASTE_INNATE_PLASMA_REGEN)) - hud_set_plasma() // since we used some plasma via the aura + if(HAS_TRAIT(src, TRAIT_NOPLASMAREGEN) || !loc_weeds_type && !(xeno_caste.caste_flags & CASTE_INNATE_PLASMA_REGEN)) + if(current_aura) //we only need to update if we actually used plasma from pheros + hud_set_plasma() return var/plasma_gain = xeno_caste.plasma_gain @@ -151,8 +146,9 @@ SEND_SIGNAL(src, COMSIG_XENOMORPH_PLASMA_REGEN, plasma_mod) + plasma_mod[1] = clamp(plasma_mod[1], 0, xeno_caste.plasma_max * xeno_caste.plasma_regen_limit - plasma_stored) + gain_plasma(plasma_mod[1]) - hud_set_plasma() //update plasma amount on the plasma mob_hud /mob/living/carbon/xenomorph/can_receive_aura(aura_type, atom/source, datum/aura_bearer/bearer) . = ..() @@ -171,10 +167,10 @@ if(warding_aura != (received_auras[AURA_XENO_WARDING] || 0)) if(warding_aura) //If either the new or old warding is 0, we can skip adjusting armor for it. - soft_armor = soft_armor.modifyAllRatings(-warding_aura * 2.5) + soft_armor = soft_armor.modifyAllRatings(-warding_aura * 1.5) warding_aura = received_auras[AURA_XENO_WARDING] || 0 if(warding_aura) - soft_armor = soft_armor.modifyAllRatings(warding_aura * 2.5) + soft_armor = soft_armor.modifyAllRatings(warding_aura * 1.5) recovery_aura = received_auras[AURA_XENO_RECOVERY] || 0 @@ -182,37 +178,7 @@ ..() /mob/living/carbon/xenomorph/handle_regular_hud_updates() - if(!client) - return FALSE - - // Sanity checks - if(!maxHealth) - stack_trace("[src] called handle_regular_hud_updates() while having [maxHealth] maxHealth.") - return - if(!xeno_caste.plasma_max) - stack_trace("[src] called handle_regular_hud_updates() while having [xeno_caste.plasma_max] xeno_caste.plasma_max.") - return - - // Health Hud - if(hud_used?.healths) - if(stat != DEAD) - var/bucket = get_bucket(XENO_HUD_ICON_BUCKETS, maxHealth, health, get_crit_threshold(), list("full", "critical")) - hud_used.healths.icon_state = "health[bucket]" - else - hud_used.healths.icon_state = "health_dead" - - // Plasma Hud - if(hud_used?.alien_plasma_display) - if(stat != DEAD) - var/bucket = get_bucket(XENO_HUD_ICON_BUCKETS, xeno_caste.plasma_max, plasma_stored, 0, list("full", "empty")) - hud_used.alien_plasma_display.icon_state = "power_display_[bucket]" - else - hud_used.alien_plasma_display.icon_state = "power_display_empty" - - - interactee?.check_eye(src) - - return TRUE + return /mob/living/carbon/xenomorph/proc/handle_environment() //unused while atmos is not on var/env_temperature = loc.return_temperature() @@ -234,7 +200,7 @@ stat = CONSCIOUS return health = maxHealth - getFireLoss() - getBruteLoss() //Xenos can only take brute and fire damage. - med_hud_set_health() + med_hud_set_health() //todo: Make all damage update health so we can just kill pointless life updates entirely update_stat() update_wounds() diff --git a/code/modules/mob/living/carbon/xenomorph/say.dm b/code/modules/mob/living/carbon/xenomorph/say.dm index 31f2ea04cea50..5488227d915e0 100644 --- a/code/modules/mob/living/carbon/xenomorph/say.dm +++ b/code/modules/mob/living/carbon/xenomorph/say.dm @@ -5,7 +5,7 @@ This is also paired with [/mob/living/carbon/xenomorph/hivemind_end] */ /mob/living/carbon/xenomorph/proc/hivemind_start() - return "Hivemind, [span_name("[name]")]" + return "Hivemind, [span_name("[name]")]" /** Called to create the suffix for xeno hivemind messages @@ -56,7 +56,7 @@ if(!S?.client?.prefs || !(S.client.prefs.toggles_chat & CHAT_GHOSTHIVEMIND)) continue var/track = FOLLOW_LINK(S, src) - S.show_message("[track] [hivemind_start()] [span_message("hisses, '[message]'")][hivemind_end()]", 2) + S.show_message("[track] [hivemind_start()] [span_message("hisses, '[message]'")][hivemind_end()]", 2) hive.hive_mind_message(src, message) @@ -64,7 +64,7 @@ /mob/living/carbon/xenomorph/proc/receive_hivemind_message(mob/living/carbon/xenomorph/X, message) var/follow_link = X != src ? "(F) " : "" - show_message("[follow_link][X.hivemind_start()][span_message(" hisses, '[message]'")][X.hivemind_end()]", 2) + show_message("[follow_link][X.hivemind_start()][span_message(" hisses, '[message]'")][X.hivemind_end()]", 2) /mob/living/carbon/xenomorph/get_saymode(message, talk_key) diff --git a/code/modules/mob/living/carbon/xenomorph/update_icons.dm b/code/modules/mob/living/carbon/xenomorph/update_icons.dm index fdcfa5c149f06..c30a64881e9a6 100644 --- a/code/modules/mob/living/carbon/xenomorph/update_icons.dm +++ b/code/modules/mob/living/carbon/xenomorph/update_icons.dm @@ -20,28 +20,25 @@ update_icons() /mob/living/carbon/xenomorph/update_icons(state_change = TRUE) - if(HAS_TRAIT(src, TRAIT_MOB_ICON_UPDATE_BLOCKED)) - return + SEND_SIGNAL(src, COMSIG_XENOMORPH_UPDATE_ICONS, state_change) if(state_change) if(stat == DEAD) - icon_state = "[xeno_caste.caste_name][is_a_rouny ? " rouny" : ""] Dead" + icon_state = "[xeno_caste.caste_name][(xeno_flags & XENO_ROUNY) ? " rouny" : ""] Dead" else if(HAS_TRAIT(src, TRAIT_BURROWED)) - icon_state = "[xeno_caste.caste_name][is_a_rouny ? " rouny" : ""] Burrowed" + icon_state = "[xeno_caste.caste_name][(xeno_flags & XENO_ROUNY) ? " rouny" : ""] Burrowed" else if(lying_angle) if((resting || IsSleeping()) && (!IsParalyzed() && !IsUnconscious() && health > 0)) - icon_state = "[xeno_caste.caste_name][is_a_rouny ? " rouny" : ""] Sleeping" + icon_state = "[xeno_caste.caste_name][(xeno_flags & XENO_ROUNY) ? " rouny" : ""] Sleeping" else - icon_state = "[xeno_caste.caste_name][is_a_rouny ? " rouny" : ""] Knocked Down" + icon_state = "[xeno_caste.caste_name][(xeno_flags & XENO_ROUNY) ? " rouny" : ""] Knocked Down" else if(!handle_special_state()) if(m_intent == MOVE_INTENT_RUN) - icon_state = "[xeno_caste.caste_name][is_a_rouny ? " rouny" : ""] Running" + icon_state = "[xeno_caste.caste_name][(xeno_flags & XENO_ROUNY) ? " rouny" : ""] Running" else - icon_state = "[xeno_caste.caste_name][is_a_rouny ? " rouny" : ""] Walking" + icon_state = "[xeno_caste.caste_name][(xeno_flags & XENO_ROUNY) ? " rouny" : ""] Walking" update_fire() //the fire overlay depends on the xeno's stance, so we must update it. update_wounds() - hud_set_plasma() - med_hud_set_health() hud_set_sunder() hud_set_firestacks() @@ -53,33 +50,33 @@ update_icons() /mob/living/carbon/xenomorph/update_inv_r_hand() - remove_overlay(X_R_HAND_LAYER) + remove_overlay(R_HAND_LAYER) if(r_hand) if(client && hud_used && hud_used.hud_version != HUD_STYLE_NOHUD) r_hand.screen_loc = ui_rhand client.screen += r_hand - overlays_standing[X_R_HAND_LAYER] = r_hand.make_worn_icon(inhands = TRUE, slot_name = slot_r_hand_str, default_icon = 'icons/mob/items_righthand_1.dmi', default_layer = X_R_HAND_LAYER) - apply_overlay(X_R_HAND_LAYER) + overlays_standing[R_HAND_LAYER] = r_hand.make_worn_icon(inhands = TRUE, slot_name = slot_r_hand_str, default_icon = 'icons/mob/inhands/items/items_right.dmi', default_layer = R_HAND_LAYER) + apply_overlay(R_HAND_LAYER) /mob/living/carbon/xenomorph/update_inv_l_hand() - remove_overlay(X_L_HAND_LAYER) + remove_overlay(L_HAND_LAYER) if(l_hand) if(client && hud_used && hud_used.hud_version != HUD_STYLE_NOHUD) l_hand.screen_loc = ui_lhand client.screen += l_hand - overlays_standing[X_L_HAND_LAYER] = l_hand.make_worn_icon(inhands = TRUE, slot_name = slot_l_hand_str, default_icon = 'icons/mob/items_lefthand_1.dmi', default_layer = X_L_HAND_LAYER) - apply_overlay(X_L_HAND_LAYER) + overlays_standing[L_HAND_LAYER] = l_hand.make_worn_icon(inhands = TRUE, slot_name = slot_l_hand_str, default_icon = 'icons/mob/inhands/items/items_left.dmi', default_layer = L_HAND_LAYER) + apply_overlay(L_HAND_LAYER) /* /mob/living/carbon/xenomorph/proc/create_shriekwave() - overlays_standing[X_SUIT_LAYER] = image("icon"='icons/Xeno/64x64_Xeno_overlays.dmi', "icon_state" = "shriek_waves") //Ehh, suit layer's not being used. - apply_temp_overlay(X_SUIT_LAYER, 3 SECONDS) + overlays_standing[SUIT_LAYER] = image("icon"='icons/Xeno/64x64_Xeno_overlays.dmi', "icon_state" = "shriek_waves") //Ehh, suit layer's not being used. + apply_temp_overlay(SUIT_LAYER, 3 SECONDS) */ /mob/living/carbon/xenomorph/proc/create_stomp() - overlays_standing[X_SUIT_LAYER] = image("icon"='icons/Xeno/64x64_Xeno_overlays.dmi', "icon_state" = "stomp") //Ehh, suit layer's not being used. - apply_temp_overlay(X_SUIT_LAYER, 1.2 SECONDS) + overlays_standing[SUIT_LAYER] = image("icon"='icons/Xeno/64x64_Xeno_overlays.dmi', "icon_state" = "stomp") //Ehh, suit layer's not being used. + apply_temp_overlay(SUIT_LAYER, 1.2 SECONDS) /mob/living/carbon/xenomorph/update_fire() if(!fire_overlay) @@ -95,14 +92,14 @@ if(QDELETED(src)) return - remove_overlay(X_WOUND_LAYER) + remove_overlay(WOUND_LAYER) remove_filter("wounded_filter") var/health_thresholds wound_overlay.layer = layer + 0.3 wound_overlay.icon = src.icon wound_overlay.vis_flags |= VIS_HIDE - if(HAS_TRAIT(src, TRAIT_MOB_ICON_UPDATE_BLOCKED)) + if(HAS_TRAIT(src, TRAIT_XENOMORPH_INVISIBLE_BLOOD)) wound_overlay.icon_state = "none" return if(health > health_threshold_crit) @@ -134,8 +131,8 @@ if(xeno_caste.caste_flags & CASTE_HAS_WOUND_MASK) var/image/wounded_mask = image(icon, null, "alpha_[overlay_to_show]") wounded_mask.render_target = "*[REF(src)]" - overlays_standing[X_WOUND_LAYER] = wounded_mask - apply_overlay(X_WOUND_LAYER) + overlays_standing[WOUND_LAYER] = wounded_mask + apply_overlay(WOUND_LAYER) add_filter("wounded_filter", 1, alpha_mask_filter(0, 0, null, "*[REF(src)]", MASK_INVERSE)) wound_overlay.vis_flags &= ~VIS_HIDE // Show the overlay @@ -175,6 +172,7 @@ update_flame_light(owner.fire_luminosity) /atom/movable/vis_obj/xeno_wounds/fire_overlay/update_icon_state() + . = ..() if(!owner.on_fire) icon_state = "" return diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm index 6f2f6d125b12f..b1eeefe62821d 100644 --- a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm +++ b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm @@ -22,6 +22,8 @@ // *** Melee Attacks *** // ///The amount of damage a xenomorph caste will do with a 'slash' attack. var/melee_damage = 10 + ///The amount of armour pen their melee attacks have + var/melee_ap = 0 ///number of ticks between attacks for a caste. var/attack_delay = CLICK_CD_MELEE @@ -61,8 +63,6 @@ ///Threshold amount of upgrade points to next maturity //var/upgrade_threshold = 0 // RUTGMC DELETION - ///Type paths to the castes that this xenomorph can evolve to - var/list/evolves_to = list() ///Singular type path for the caste to deevolve to when forced to by the queen. var/deevolves_to @@ -92,6 +92,8 @@ var/sunder_recover = 0.5 ///What is the max amount of sunder that can be applied to a xeno (100 = 100%) var/sunder_max = 100 + ///Multiplier on the weapons sunder, e.g 10 sunder on a projectile is reduced to 5 with a 0.5 multiplier. + var/sunder_multiplier = 1 // *** Ranged Attack *** // ///Delay timer for spitting @@ -225,6 +227,8 @@ RU TGMC EDIT */ var/evolve_min_xenos = 0 // How many of this caste may be alive at once var/maximum_active_caste = INFINITY + // Accuracy malus, 0 by default. Should NOT go over 70. + var/accuracy_malus = 0 ///Add needed component to the xeno /datum/xeno_caste/proc/on_caste_applied(mob/xenomorph) @@ -279,11 +283,11 @@ RU TGMC EDIT */ ///Hive datum we belong to var/datum/hive_status/hive ///Xeno mob specific flags - var/xeno_flags = NONE //TODO: There are loads of vars below that should be flags + var/xeno_flags = NONE + ///State tracking of hive status toggles var/status_toggle_flags = HIVE_STATUS_DEFAULTS - var/list/overlays_standing[X_TOTAL_LAYERS] var/atom/movable/vis_obj/xeno_wounds/wound_overlay var/atom/movable/vis_obj/xeno_wounds/fire_overlay/fire_overlay var/datum/xeno_caste/xeno_caste @@ -322,18 +326,17 @@ RU TGMC EDIT */ ///Increases by xeno_caste.regen_ramp_amount every decisecond. If you want to balance this, look at the xeno_caste defines mentioned above. var/regen_power = 0 - var/is_zoomed = 0 var/zoom_turf = null var/can_walk_zoomed = FALSE ///Type of weeds the xeno is standing on, null when not on weeds var/obj/alien/weeds/loc_weeds_type - ///Bonus or pen to time in between attacks. + makes slashes slower. - var/attack_delay = 0 ///This will track their "tier" to restrict/limit evolutions var/tier = XENO_TIER_ONE ///which resin structure to build when we secrete resin var/selected_resin = /turf/closed/wall/resin/regenerating + //which special resin structure to build when we secrete special resin + var/selected_special_resin = /turf/closed/wall/resin/regenerating/special/bulletproof ///which reagent to slash with using reagent slash var/selected_reagent = /datum/reagent/toxin/xeno_hemodile ///which plant to place when we use sow @@ -351,18 +354,11 @@ RU TGMC EDIT */ ///Multiplicative melee damage modifier; referenced by attack_alien.dm, most notably attack_alien_harm var/xeno_melee_damage_modifier = 1 - ///whether the xeno mobhud is activated or not. - var/xeno_mobhud = FALSE - ///whether the xeno has been selected by the queen as a leader. - var/queen_chosen_lead = FALSE //Charge vars ///Will the mob charge when moving ? You need the charge verb to change this var/is_charging = CHARGE_OFF - //Pounce vars - var/usedPounce = 0 - // Gorger vars var/overheal = 0 @@ -401,10 +397,12 @@ RU TGMC EDIT */ ///The xenos/silo/nuke currently tracked by the xeno_tracker arrow var/atom/tracked - ///Are we the roony version of this xeno - var/is_a_rouny = FALSE - /// The type of footstep this xeno has. var/footstep_type = FOOTSTEP_XENO_MEDIUM COOLDOWN_DECLARE(xeno_health_alert_cooldown) + + ///The resting cooldown + COOLDOWN_DECLARE(xeno_resting_cooldown) + ///The unresting cooldown + COOLDOWN_DECLARE(xeno_unresting_cooldown) diff --git a/code/modules/mob/living/carbon/xenomorph/xenoattacks.dm b/code/modules/mob/living/carbon/xenomorph/xenoattacks.dm index 2ca62e972e7cc..b6b812c508e13 100644 --- a/code/modules/mob/living/carbon/xenomorph/xenoattacks.dm +++ b/code/modules/mob/living/carbon/xenomorph/xenoattacks.dm @@ -69,66 +69,67 @@ //Hot hot Aliens on Aliens action. //Actually just used for eating people. -/mob/living/carbon/xenomorph/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) - if(status_flags & INCORPOREAL || X.status_flags & INCORPOREAL) //Incorporeal xenos cannot attack or be attacked +/mob/living/carbon/xenomorph/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) + if(status_flags & INCORPOREAL || xeno_attacker.status_flags & INCORPOREAL) //Incorporeal xenos cannot attack or be attacked return - if(src == X) + if(src == xeno_attacker) return TRUE - - if(isxenolarva(X)) //Larvas can't eat people - X.visible_message(span_danger("[X] nudges its head against \the [src]."), \ + + if(isxenolarva(xeno_attacker)) //Larvas can't eat people + xeno_attacker.visible_message(span_danger("[xeno_attacker] nudges its head against \the [src]."), \ span_danger("We nudge our head against \the [src].")) return FALSE - switch(X.a_intent) + switch(xeno_attacker.a_intent) if(INTENT_HELP) if(on_fire) fire_stacks = max(fire_stacks - 1, 0) playsound(loc, 'sound/weapons/thudswoosh.ogg', 25, 1, 7) - X.visible_message(span_danger("[X] tries to put out the fire on [src]!"), \ + xeno_attacker.visible_message(span_danger("[xeno_attacker] tries to put out the fire on [src]!"), \ span_warning("We try to put out the fire on [src]!"), null, 5) if(fire_stacks <= 0) - X.visible_message(span_danger("[X] has successfully extinguished the fire on [src]!"), \ + xeno_attacker.visible_message(span_danger("[xeno_attacker] has successfully extinguished the fire on [src]!"), \ span_notice("We extinguished the fire on [src]."), null, 5) ExtinguishMob() return TRUE - X.visible_message(span_notice("\The [X] caresses \the [src] with its scythe-like arm."), \ + + xeno_attacker.visible_message(span_notice("\The [xeno_attacker] caresses \the [src] with its scythe-like arm."), \ span_notice("We caress \the [src] with our scythe-like arm."), null, 5) if(INTENT_GRAB) if(anchored) return FALSE - if(!X.start_pulling(src)) + if(!xeno_attacker.start_pulling(src)) return FALSE - X.visible_message(span_warning("[X] grabs \the [src]!"), \ + xeno_attacker.visible_message(span_warning("[xeno_attacker] grabs \the [src]!"), \ span_warning("We grab \the [src]!"), null, 5) playsound(loc, 'sound/weapons/thudswoosh.ogg', 25, 1, 7) if(INTENT_HARM, INTENT_DISARM)//Can't slash other xenos for now. SORRY // You can now! --spookydonut - if(issamexenohive(X)) - X.do_attack_animation(src) - X.visible_message(span_warning("\The [X] nibbles \the [src]."), \ + if(issamexenohive(xeno_attacker)) + xeno_attacker.do_attack_animation(src) + xeno_attacker.visible_message(span_warning("\The [xeno_attacker] nibbles \the [src]."), \ span_warning("We nibble \the [src]."), null, 5) return TRUE // Not at the base of the proc otherwise we can just nibble for free slashing effects - SEND_SIGNAL(X, COMSIG_XENOMORPH_ATTACK_HOSTILE_XENOMORPH, src, damage_amount, X.xeno_caste.melee_damage * X.xeno_melee_damage_modifier) + SEND_SIGNAL(xeno_attacker, COMSIG_XENOMORPH_ATTACK_HOSTILE_XENOMORPH, src, damage_amount, xeno_attacker.xeno_caste.melee_damage * xeno_attacker.xeno_melee_damage_modifier) // copypasted from attack_alien.dm //From this point, we are certain a full attack will go out. Calculate damage and modifiers - var/damage = X.xeno_caste.melee_damage + var/damage = xeno_attacker.xeno_caste.melee_damage //Somehow we will deal no damage on this attack if(!damage) - X.do_attack_animation(src) - playsound(X.loc, 'sound/weapons/alien_claw_swipe.ogg', 25, 1) - X.visible_message(span_danger("\The [X] lunges at [src]!"), \ + xeno_attacker.do_attack_animation(src) + playsound(xeno_attacker.loc, 'sound/weapons/alien_claw_swipe.ogg', 25, 1) + xeno_attacker.visible_message(span_danger("\The [xeno_attacker] lunges at [src]!"), \ span_danger("We lunge at [src]!"), null, 5) return FALSE - X.visible_message(span_danger("\The [X] slashes [src]!"), \ + xeno_attacker.visible_message(span_danger("\The [xeno_attacker] slashes [src]!"), \ span_danger("We slash [src]!"), null, 5) - log_combat(X, src, "slashed") + log_combat(xeno_attacker, src, "slashed") - X.do_attack_animation(src, ATTACK_EFFECT_REDSLASH) + xeno_attacker.do_attack_animation(src, ATTACK_EFFECT_REDSLASH) playsound(loc, "alien_claw_flesh", 25, 1) apply_damage(damage, BRUTE, blocked = MELEE, updating_health = TRUE) diff --git a/code/modules/mob/living/carbon/xenomorph/xenomorph.dm b/code/modules/mob/living/carbon/xenomorph/xenomorph.dm index bbed0e3066a30..cea1d56235bb1 100644 --- a/code/modules/mob/living/carbon/xenomorph/xenomorph.dm +++ b/code/modules/mob/living/carbon/xenomorph/xenomorph.dm @@ -5,7 +5,6 @@ //This is so they can be easily transferred between them without copypasta /mob/living/carbon/xenomorph/Initialize(mapload) - setup_verbs() if(mob_size == MOB_SIZE_BIG) move_resist = MOVE_FORCE_EXTREMELY_STRONG move_force = MOVE_FORCE_EXTREMELY_STRONG @@ -55,10 +54,6 @@ regenerate_icons() - hud_set_plasma() - med_hud_set_health() - hud_update_primo() - toggle_xeno_mobhud() //This is a verb, but fuck it, it just werks update_spits() @@ -81,6 +76,7 @@ AddElement(/datum/element/footstep, footstep_type, mob_size >= MOB_SIZE_BIG ? 0.8 : 0.5) set_jump_component() + AddComponent(/datum/component/seethrough_mob) /mob/living/carbon/xenomorph/register_init_signals() . = ..() @@ -109,7 +105,7 @@ maxHealth = xeno_caste.max_health * GLOB.xeno_stat_multiplicator_buff if(restore_health_and_plasma) // xenos that manage plasma through special means shouldn't gain it for free on aging - plasma_stored = max(plasma_stored, xeno_caste.plasma_max * xeno_caste.plasma_regen_limit) + set_plasma(max(plasma_stored, xeno_caste.plasma_max * xeno_caste.plasma_regen_limit)) health = maxHealth setXenoCasteSpeed(xeno_caste.speed) @@ -156,17 +152,17 @@ var/rank_name switch(playtime_mins) if(0 to 600) - rank_name = "Hatchling" - if(601 to 1500) //10 hours rank_name = "Young" - if(1501 to 4200) //25 hours + if(601 to 1500) //10 hours rank_name = "Mature" - if(4201 to 10500) //70 hours + if(1501 to 4200) //25 hours rank_name = "Elder" - if(10501 to INFINITY) //175 hours + if(4201 to 10500) //70 hours rank_name = "Ancient" + if(10501 to INFINITY) //175 hours + rank_name = "Prime" else - rank_name = "Hatchling" + rank_name = "Young" var/prefix = (hive.prefix || xeno_caste.upgrade_name) ? "[hive.prefix][xeno_caste.upgrade_name] " : "" name = prefix + "[rank_name ? "[rank_name] " : ""][xeno_caste.display_name] ([nicknumber])" @@ -245,9 +241,10 @@ /mob/living/carbon/xenomorph/examine(mob/user) . = ..() . += xeno_caste.caste_desc + . += "" if(stat == DEAD) - . += "It is DEAD. Kicked the bucket. Off to that great hive in the sky." + . += "It is DEAD. Kicked the bucket. Off to that great hive in the sky." else if(stat == UNCONSCIOUS) . += "It quivers a bit, but barely moves." else @@ -264,6 +261,8 @@ if(1 to 24) . += "It is heavily injured and limping badly." + . += "" + if(hivenumber != XENO_HIVE_NORMAL) var/datum/hive_status/hive = GLOB.hive_datums[hivenumber] . += "It appears to belong to the [hive.prefix]hive" @@ -271,7 +270,8 @@ /mob/living/carbon/xenomorph/Destroy() if(mind) mind.name = name //Grabs the name when the xeno is getting deleted, to reference through hive status later. - if(is_zoomed) zoom_out() + if(xeno_flags & XENO_ZOOMED) + zoom_out() GLOB.alive_xeno_list -= src LAZYREMOVE(GLOB.alive_xeno_list_hive[hivenumber], src) @@ -415,7 +415,7 @@ /mob/living/carbon/xenomorph/Moved(atom/old_loc, movement_dir) - if(is_zoomed) + if(xeno_flags & XENO_ZOOMED) if(!can_walk_zoomed) zoom_out() handle_weeds_on_movement() @@ -471,23 +471,38 @@ Returns TRUE when loc_weeds_type changes. Returns FALSE when it doesn’t change return update_icon() -/mob/living/carbon/xenomorph/lay_down() +/mob/living/carbon/xenomorph/toggle_resting() var/datum/action/ability/xeno_action/xeno_resting/resting_action = actions_by_path[/datum/action/ability/xeno_action/xeno_resting] if(!resting_action || !resting_action.can_use_action()) return + if(resting) + if(!COOLDOWN_CHECK(src, xeno_resting_cooldown)) + balloon_alert(src, "Cannot get up so soon after resting!") + return + + if(!COOLDOWN_CHECK(src, xeno_unresting_cooldown)) + balloon_alert(src, "Cannot rest so soon after getting up!") + return return ..() -/mob/living/carbon/xenomorph/set_jump_component(duration = 0.5 SECONDS, cooldown = 2 SECONDS, cost = 0, height = 16, sound = null, flags = JUMP_SHADOW, flags_pass = PASS_LOW_STRUCTURE|PASS_FIRE) +/mob/living/carbon/xenomorph/set_resting() + . = ..() + if(resting) + COOLDOWN_START(src, xeno_resting_cooldown, XENO_RESTING_COOLDOWN) + else + COOLDOWN_START(src, xeno_unresting_cooldown, XENO_UNRESTING_COOLDOWN) + +/mob/living/carbon/xenomorph/set_jump_component(duration = 0.5 SECONDS, cooldown = 2 SECONDS, cost = 0, height = 16, sound = null, flags = JUMP_SHADOW, pass_flags = PASS_LOW_STRUCTURE|PASS_FIRE|PASS_TANK) var/gravity = get_gravity() if(gravity < 1) //low grav duration *= 2.5 - gravity cooldown *= 2 - gravity height *= 2 - gravity if(gravity <= 0.75) - flags_pass |= PASS_DEFENSIVE_STRUCTURE + pass_flags |= PASS_DEFENSIVE_STRUCTURE else if(gravity > 1) //high grav duration *= gravity * 0.5 cooldown *= gravity height *= gravity * 0.5 - AddComponent(/datum/component/jump, _jump_duration = duration, _jump_cooldown = cooldown, _stamina_cost = 0, _jump_height = height, _jump_sound = sound, _jump_flags = flags, _jumper_allow_pass_flags = flags_pass) + AddComponent(/datum/component/jump, _jump_duration = duration, _jump_cooldown = cooldown, _stamina_cost = 0, _jump_height = height, _jump_sound = sound, _jump_flags = flags, _jumper_allow_pass_flags = pass_flags) diff --git a/code/modules/mob/living/carbon/xenomorph/xenoprocs.dm b/code/modules/mob/living/carbon/xenomorph/xenoprocs.dm index 1fcb5053c17fb..12f63918e1b11 100644 --- a/code/modules/mob/living/carbon/xenomorph/xenoprocs.dm +++ b/code/modules/mob/living/carbon/xenomorph/xenoprocs.dm @@ -135,7 +135,15 @@ . += "Sunder: [100-sunder]% armor left" - //Very weak <= 1.0, weak <= 2.0, no modifier 2-3, strong <= 3.5, very strong <= 4.5 + . += "Regeneration power: [max(regen_power * 100, 0)]%" + + var/casteswap_value = ((GLOB.key_to_time_of_caste_swap[key] ? GLOB.key_to_time_of_caste_swap[key] : -INFINITY) + 15 MINUTES - world.time) * 0.1 + if(casteswap_value <= 0) + . += "Caste Swap Timer: READY" + else + . += "Caste Swap Timer: [(casteswap_value / 60) % 60]:[add_leading(num2text(casteswap_value % 60), 2, "0")]" + + //Very weak <= 1.0, Weak <= 2.0, Medium < 3.0, Strong < 4.0, Very strong >= 4.0 var/msg_holder = "" if(frenzy_aura) switch(frenzy_aura) @@ -149,7 +157,7 @@ msg_holder = "Strong" if(4.0 to INFINITY) msg_holder = "Very strong" - . += "[AURA_XENO_FRENZY] pheromone strength: [msg_holder]" + . += "[AURA_XENO_FRENZY] pheromone strength: [msg_holder] ([frenzy_aura])" if(warding_aura) switch(warding_aura) if(-INFINITY to 1.0) @@ -162,7 +170,7 @@ msg_holder = "Strong" if(4.0 to INFINITY) msg_holder = "Very strong" - . += "[AURA_XENO_WARDING] pheromone strength: [msg_holder]" + . += "[AURA_XENO_WARDING] pheromone strength: [msg_holder] ([warding_aura])" if(recovery_aura) switch(recovery_aura) if(-INFINITY to 1.0) @@ -175,7 +183,7 @@ msg_holder = "Strong" if(4.0 to INFINITY) msg_holder = "Very strong" - . += "[AURA_XENO_RECOVERY] pheromone strength: [msg_holder]" + . += "[AURA_XENO_RECOVERY] pheromone strength: [msg_holder] ([recovery_aura])" //A simple handler for checking your state. Used in pretty much all the procs. /mob/living/carbon/xenomorph/proc/check_state() @@ -191,16 +199,25 @@ return FALSE return TRUE -/mob/living/carbon/xenomorph/proc/use_plasma(value) +/mob/living/carbon/xenomorph/proc/set_plasma(value, update_plasma = TRUE) + plasma_stored = clamp(value, 0, xeno_caste.plasma_max) + if(!update_plasma) + return + hud_set_plasma() + +/mob/living/carbon/xenomorph/proc/use_plasma(value, update_plasma = TRUE) plasma_stored = max(plasma_stored - value, 0) update_action_button_icons() + if(!update_plasma) + return + hud_set_plasma() -/mob/living/carbon/xenomorph/proc/gain_plasma(value) +/mob/living/carbon/xenomorph/proc/gain_plasma(value, update_plasma = TRUE) plasma_stored = min(plasma_stored + value, xeno_caste.plasma_max) update_action_button_icons() - - - + if(!update_plasma) + return + hud_set_plasma() //Strip all inherent xeno verbs from your caste. Used in evolution. /mob/living/carbon/xenomorph/proc/remove_inherent_verbs() @@ -230,7 +247,7 @@ // Upgrade is increased based on marine to xeno population taking stored_larva as a modifier. var/datum/job/xeno_job = SSjob.GetJobType(/datum/job/xenomorph) var/stored_larva = xeno_job.total_positions - xeno_job.current_positions - upgrade_stored += 1 + (stored_larva/6) + hive.get_evolution_boost() //Do this regardless of whether we can upgrade so age accrues at primo + upgrade_stored += 1 + (stored_larva/6) + hive.get_upgrade_boost() //Do this regardless of whether we can upgrade so age accrues at primo if(!upgrade_possible()) return if(upgrade_stored < xeno_caste.upgrade_threshold) @@ -312,17 +329,16 @@ /mob/living/carbon/xenomorph/proc/zoom_in(tileoffset = 5, viewsize = 4.5) //RU TGMC EDIT if(stat || resting) - if(is_zoomed) - is_zoomed = 0 + if(xeno_flags & XENO_ZOOMED) zoom_out() return return - if(is_zoomed) + if(xeno_flags & XENO_ZOOMED) return if(!client) return zoom_turf = get_turf(src) - is_zoomed = 1 + xeno_flags |= XENO_ZOOMED client.view_size.set_view_radius_to(viewsize) //convert diameter to radius var/viewoffset = 32 * tileoffset switch(dir) @@ -340,7 +356,7 @@ client.pixel_y = 0 /mob/living/carbon/xenomorph/proc/zoom_out() - is_zoomed = 0 + xeno_flags &= ~XENO_ZOOMED zoom_turf = null if(!client) return @@ -363,7 +379,7 @@ //When the Queen's pheromones are updated, or we add/remove a leader, update leader pheromones /mob/living/carbon/xenomorph/proc/handle_xeno_leader_pheromones(mob/living/carbon/xenomorph/queen/Q) QDEL_NULL(leader_current_aura) - if(QDELETED(Q) || !queen_chosen_lead || !Q.current_aura || Q.loc.z != loc.z) //We are no longer a leader, or the Queen attached to us has dropped from her ovi, disabled her pheromones or even died + if(QDELETED(Q) || !(xeno_flags & XENO_LEADER) || !Q.current_aura || Q.loc.z != loc.z) //We are no longer a leader, or the Queen attached to us has dropped from her ovi, disabled her pheromones or even died to_chat(src, span_xenowarning("Our pheromones wane. The Queen is no longer granting us her pheromones.")) else leader_current_aura = SSaura.add_emitter(src, Q.current_aura.aura_types.Copy(), Q.current_aura.range, Q.current_aura.strength, Q.current_aura.duration, Q.current_aura.faction, Q.current_aura.hive_number) @@ -398,11 +414,6 @@ take_damage(2 * X.xeno_caste.acid_spray_structure_damage, BURN, ACID) return FALSE // not normal density flag -/obj/vehicle/multitile/root/cm_armored/acid_spray_act(mob/living/carbon/xenomorph/X) - take_damage_type(X.xeno_caste.acid_spray_structure_damage, ACID, src) - healthcheck() - return TRUE - /mob/living/carbon/acid_spray_act(mob/living/carbon/xenomorph/X) ExtinguishMob() if(isnestedhost(src)) @@ -432,7 +443,11 @@ ExtinguishMob() /obj/flamer_fire/acid_spray_act(mob/living/carbon/xenomorph/X) - Destroy() + qdel(src) + +/obj/hitbox/acid_spray_act(mob/living/carbon/xenomorph/X) + take_damage(X.xeno_caste.acid_spray_structure_damage, BURN, ACID) + return TRUE // Vent Crawl /mob/living/carbon/xenomorph/proc/vent_crawl() @@ -450,13 +465,13 @@ set desc = "Toggles the health and plasma hud appearing above Xenomorphs." set category = "Alien" - xeno_mobhud = !xeno_mobhud + xeno_flags ^= XENO_MOBHUD var/datum/atom_hud/H = GLOB.huds[DATA_HUD_XENO_STATUS] - if(xeno_mobhud) + if(xeno_flags & XENO_MOBHUD) H.add_hud_to(src) else H.remove_hud_from(src) - to_chat(src, span_notice("You have [xeno_mobhud ? "enabled" : "disabled"] the Xeno Status HUD.")) + to_chat(src, span_notice("You have [(xeno_flags & XENO_MOBHUD) ? "enabled" : "disabled"] the Xeno Status HUD.")) /mob/living/carbon/xenomorph/proc/recurring_injection(mob/living/carbon/C, datum/reagent/toxin = /datum/reagent/toxin/xeno_neurotoxin, channel_time = XENO_NEURO_CHANNEL_TIME, transfer_amount = XENO_NEURO_AMOUNT_RECURRING, count = 4) @@ -490,17 +505,12 @@ return TRUE return FALSE -/mob/living/carbon/xenomorph/proc/setup_verbs() - add_verb(src, /mob/living/proc/lay_down) - -/mob/living/carbon/xenomorph/hivemind/setup_verbs() - return - /mob/living/carbon/xenomorph/adjust_sunder(adjustment) . = ..() if(.) return - sunder = clamp(sunder + adjustment, 0, xeno_caste.sunder_max) + sunder = clamp(sunder + (adjustment > 0 ? adjustment * xeno_caste.sunder_multiplier : adjustment), 0, xeno_caste.sunder_max) +//Applying sunder is an adjustment value above 0, healing sunder is an adjustment value below 0. Use multiplier when taking sunder, not when healing. /mob/living/carbon/xenomorph/set_sunder(new_sunder) . = ..() diff --git a/code/modules/mob/living/carbon/xenomorph/xenoupgrade.dm b/code/modules/mob/living/carbon/xenomorph/xenoupgrade.dm index c642082b6cb48..7fa2cb9f9bbbf 100644 --- a/code/modules/mob/living/carbon/xenomorph/xenoupgrade.dm +++ b/code/modules/mob/living/carbon/xenomorph/xenoupgrade.dm @@ -25,7 +25,7 @@ if(found) continue var/datum/action/ability/xeno_action/action = new allowed_action_path() - if(!SSticker.mode || (SSticker.mode.flags_xeno_abilities & action.gamemode_flags)) + if(!SSticker.mode || (SSticker.mode.xeno_abilities_flags & action.gamemode_flags)) action.give_action(src) for(var/datum/action/ability/xeno_action/action_already_added AS in actions_already_added) @@ -39,7 +39,7 @@ activable_ability.select() break - if(queen_chosen_lead) + if(xeno_flags & XENO_LEADER) give_rally_abilities() //Give them back their rally hive ability if(current_aura) //Updates pheromone strength diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index af09465c5c4be..a9624e0e360cf 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -98,6 +98,7 @@ set_armor_datum() AddElement(/datum/element/gesture) AddElement(/datum/element/keybinding_update) + AddElement(/datum/element/directional_attack) /mob/living/Destroy() for(var/datum/status_effect/effect AS in status_effects) @@ -130,48 +131,8 @@ return -/mob/proc/get_contents() - return - - -//Recursive function to find everything a mob is holding. -/mob/living/get_contents(obj/item/storage/Storage = null) - var/list/L = list() - - if(Storage) //If it called itself - L += Storage.return_inv() - - for(var/obj/item/gift/G in Storage.return_inv()) //Check for gift-wrapped items - L += G.gift - if(istype(G.gift, /obj/item/storage)) - L += get_contents(G.gift) - - for(var/obj/item/smallDelivery/D in Storage.return_inv()) //Check for package wrapped items - L += D.wrapped - if(istype(D.wrapped, /obj/item/storage)) //this should never happen - L += get_contents(D.wrapped) - return L - - else - - L += contents - for(var/obj/item/storage/S in contents) //Check for storage items - L += get_contents(S) - - for(var/obj/item/gift/G in contents) //Check for gift-wrapped items - L += G.gift - if(istype(G.gift, /obj/item/storage)) - L += get_contents(G.gift) - - for(var/obj/item/smallDelivery/D in contents) //Check for package wrapped items - L += D.wrapped - if(istype(D.wrapped, /obj/item/storage)) //this should never happen - L += get_contents(D.wrapped) - return L - - /mob/living/proc/check_contents_for(A) - var/list/L = get_contents() + var/list/L = GetAllContents() for(var/obj/O in L) if(O.type == A) @@ -234,9 +195,9 @@ s_active.close(src) -/mob/living/Moved(oldLoc, dir) +/mob/living/Moved(atom/old_loc, movement_dir, forced = FALSE, list/old_locs) . = ..() - update_camera_location(oldLoc) + update_camera_location(old_loc) /mob/living/forceMove(atom/destination) @@ -255,14 +216,6 @@ /mob/living/proc/update_camera_location(oldLoc) return - -/mob/living/vv_get_dropdown() - . = ..() - . += "---" - .["Add Language"] = "?_src_=vars;[HrefToken()];addlanguage=[REF(src)]" - .["Remove Language"] = "?_src_=vars;[HrefToken()];remlanguage=[REF(src)]" - - /mob/proc/resist_grab() return //returning 1 means we successfully broke free @@ -375,8 +328,10 @@ mob_swap_mode = PHASING else if((move_resist >= MOVE_FORCE_VERY_STRONG || move_resist > L.move_force) && a_intent == INTENT_HELP) //Larger mobs can shove aside smaller ones. Xenos can always shove xenos mob_swap_mode = SWAPPING - ///if we're moving diagonally, but the mob isn't on the diagonal destination turf we have no reason to shuffle/push them - if(moving_diagonally && (get_dir(src, L) in GLOB.cardinals) && get_step(src, dir).Enter(src, loc)) + /* If we're moving diagonally, but the mob isn't on the diagonal destination turf and the destination turf is enterable we have no reason to shuffle/push them + * However we also do not want mobs of smaller move forces being able to pass us diagonally if our move resist is larger, unless they're the same faction as us + */ + if(moving_diagonally && (get_dir(src, L) in GLOB.cardinals) && (L.faction == faction || L.move_resist <= move_force) && get_step(src, dir).Enter(src, loc)) mob_swap_mode = PHASING if(mob_swap_mode) //switch our position with L @@ -483,6 +438,11 @@ stop_pulling() //being thrown breaks pulls. if(pulledby) pulledby.stop_pulling() + if(LAZYLEN(buckled_mobs) && !flying) + unbuckle_all_mobs(force = TRUE) + if(buckled) + buckled.unbuckle_mob(src) + return ..() /** @@ -772,33 +732,6 @@ below 100 is not dizzy else stop_pulling() - -/mob/living/vv_edit_var(var_name, var_value) - switch(var_name) - if("maxHealth") - if(!isnum(var_value) || var_value <= 0) - return FALSE - if("stat") - if((stat == DEAD) && (var_value < DEAD))//Bringing the dead back to life - GLOB.dead_mob_list -= src - GLOB.alive_living_list += src - if((stat < DEAD) && (var_value == DEAD))//Kill he - GLOB.alive_living_list -= src - GLOB.dead_mob_list += src - . = ..() - switch(var_name) - if("eye_blind") - set_blindness(var_value) - if("eye_blurry") - set_blurriness(var_value) - if("maxHealth") - updatehealth() - if("resize") - update_transform() - if("lighting_alpha") - sync_lighting_plane_alpha() - - /mob/living/can_interact_with(datum/D) return D == src || D.Adjacent(src) @@ -871,19 +804,15 @@ below 100 is not dizzy ///Swap the active hand /mob/living/proc/swap_hand() var/obj/item/wielded_item = get_active_held_item() - if(wielded_item && (wielded_item.flags_item & WIELDED)) //this segment checks if the item in your hand is twohanded. + if(wielded_item && (wielded_item.item_flags & WIELDED)) //this segment checks if the item in your hand is twohanded. var/obj/item/weapon/twohanded/offhand/offhand = get_inactive_held_item() - if(offhand && (offhand.flags_item & WIELDED)) + if(offhand && (offhand.item_flags & WIELDED)) wielded_item.unwield(src) //Get rid of it. hand = !hand SEND_SIGNAL(src, COMSIG_CARBON_SWAPPED_HANDS) if(hud_used.l_hand_hud_object && hud_used.r_hand_hud_object) - hud_used.l_hand_hud_object.update_icon(hand) - hud_used.r_hand_hud_object.update_icon(!hand) - if(hand) //This being 1 means the left hand is in use - hud_used.l_hand_hud_object.add_overlay("hand_active") - else - hud_used.r_hand_hud_object.add_overlay("hand_active") + hud_used.l_hand_hud_object.update_icon() + hud_used.r_hand_hud_object.update_icon() return ///Swap to the hand clicked on the hud @@ -946,7 +875,7 @@ below 100 is not dizzy get_up() ///Sets up the jump component for the mob. Proc args can be altered so different mobs have different 'default' jump settings -/mob/living/proc/set_jump_component(duration = 0.5 SECONDS, cooldown = 1 SECONDS, cost = 8, height = 16, sound = null, flags = JUMP_SHADOW, flags_pass = PASS_LOW_STRUCTURE|PASS_FIRE) +/mob/living/proc/set_jump_component(duration = 0.5 SECONDS, cooldown = 1 SECONDS, cost = 8, height = 16, sound = null, flags = JUMP_SHADOW, pass_flags = PASS_LOW_STRUCTURE|PASS_FIRE|PASS_TANK) var/gravity = get_gravity() if(gravity < 1) //low grav duration *= 2.5 - gravity @@ -954,11 +883,122 @@ below 100 is not dizzy cost *= gravity * 0.5 height *= 2 - gravity if(gravity <= 0.75) - flags_pass |= PASS_DEFENSIVE_STRUCTURE + pass_flags |= PASS_DEFENSIVE_STRUCTURE else if(gravity > 1) //high grav duration *= gravity * 0.5 cooldown *= gravity cost *= gravity height *= gravity * 0.5 - AddComponent(/datum/component/jump, _jump_duration = duration, _jump_cooldown = cooldown, _stamina_cost = cost, _jump_height = height, _jump_sound = sound, _jump_flags = flags, _jumper_allow_pass_flags = flags_pass) + AddComponent(/datum/component/jump, _jump_duration = duration, _jump_cooldown = cooldown, _stamina_cost = cost, _jump_height = height, _jump_sound = sound, _jump_flags = flags, _jumper_allow_pass_flags = pass_flags) + +/mob/living/vv_edit_var(var_name, var_value) + switch(var_name) + if (NAMEOF(src, maxHealth)) + if (!isnum(var_value) || var_value <= 0) + return FALSE + if(NAMEOF(src, health)) //this doesn't work. gotta use procs instead. + return FALSE + if(NAMEOF(src, stat)) + if((stat == DEAD) && (var_value < DEAD))//Bringing the dead back to life + GLOB.dead_mob_list -= src + GLOB.alive_living_list += src + if((stat < DEAD) && (var_value == DEAD))//Kill he + GLOB.alive_living_list -= src + GLOB.dead_mob_list += src + if(NAMEOF(src, resting)) + set_resting(var_value) + . = TRUE + if(NAMEOF(src, lying_angle)) + set_lying_angle(var_value) + . = TRUE + if(NAMEOF(src, eye_blind)) + set_blindness(var_value) + if(NAMEOF(src, eye_blurry)) + set_blurriness(var_value) + if(NAMEOF(src, lighting_alpha)) + sync_lighting_plane_alpha() + if(NAMEOF(src, resize)) + if(var_value == 0) //prevents divisions of and by zero. + return FALSE + update_transform(var_value/resize) + . = TRUE + + if(!isnull(.)) + datum_flags |= DF_VAR_EDITED + return + + . = ..() + + switch(var_name) + if(NAMEOF(src, maxHealth)) + updatehealth() + +/mob/living/vv_get_header() + . = ..() + var/refid = REF(src) + . += {" +
[VV_HREF_TARGETREF(refid, VV_HK_GIVE_DIRECT_CONTROL, "[ckey || "no ckey"]")] / [VV_HREF_TARGETREF_1V(refid, VV_HK_BASIC_EDIT, "[real_name || "no real name"]", NAMEOF(src, real_name))] +
+ BRUTE:[getBruteLoss()] + FIRE:[getFireLoss()] + TOXIN:[getToxLoss()] + OXY:[getOxyLoss()] + CLONE:[getCloneLoss()] + STAMINA:[getStaminaLoss()] + + "} + +/mob/living/vv_get_dropdown() + . = ..() + VV_DROPDOWN_OPTION("", "---------") + VV_DROPDOWN_OPTION(VV_HK_ADD_LANGUAGE, "Add Language") + VV_DROPDOWN_OPTION(VV_HK_REMOVE_LANGUAGE, "Remove Language") + VV_DROPDOWN_OPTION(VV_HK_GIVE_SPEECH_IMPEDIMENT, "Impede Speech (Slurring, stuttering, etc)") + +/mob/living/vv_do_topic(list/href_list) + . = ..() + + if(!.) + return + + if(href_list[VV_HK_ADD_LANGUAGE]) + if(!check_rights(NONE)) + return + var/choice = tgui_input_list(usr, "Grant which language?", "Languages", GLOB.all_languages) + if(!choice) + return + grant_language(choice) + if(href_list[VV_HK_REMOVE_LANGUAGE]) + if(!check_rights(NONE)) + return + var/choice = tgui_input_list(usr, "Remove which language?", "Known Languages", src.language_holder.languages) + if(!choice) + return + remove_language(choice) + if(href_list[VV_HK_GIVE_SPEECH_IMPEDIMENT]) + if(!check_rights(NONE)) + return + admin_give_speech_impediment(usr) + +/// Admin only proc for giving a certain speech impediment to this mob +/mob/living/proc/admin_give_speech_impediment(mob/admin) + if(!admin || !check_rights(NONE)) + return + + var/list/impediments = list() + for(var/datum/status_effect/possible as anything in typesof(/datum/status_effect/speech)) + if(!initial(possible.id)) + continue + + impediments[initial(possible.id)] = possible + + var/chosen = tgui_input_list(admin, "What speech impediment?", "Impede Speech", impediments) + if(!chosen || !ispath(impediments[chosen], /datum/status_effect/speech) || QDELETED(src) || !check_rights(NONE)) + return + + var/duration = tgui_input_number(admin, "How long should it last (in seconds)? Max is infinite duration.", "Duration", 0, INFINITY, 0 SECONDS) + if(!isnum(duration) || duration <= 0 || QDELETED(src) || !check_rights(NONE)) + return + + adjust_timed_status_effect(duration * 1 SECONDS, impediments[chosen]) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index de2ad13aae925..8dcb7ea20555a 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -1,8 +1,58 @@ +/mob/living/grab_interact(obj/item/grab/grab, mob/user, base_damage = BASE_MOB_SLAM_DAMAGE, is_sharp = FALSE) + if(!isliving(grab.grabbed_thing)) + return + if(grab.grabbed_thing == src) + return + if(user == src) + return + + var/mob/living/grabbed_mob = grab.grabbed_thing + step_towards(grabbed_mob, src) + user.drop_held_item() + var/state = user.grab_state + + if(state >= GRAB_AGGRESSIVE) + var/own_stun_chance = 0 + var/grabbed_stun_chance = 0 + if(grabbed_mob.mob_size > mob_size) + own_stun_chance = 25 + grabbed_stun_chance = 10 + else if(grabbed_mob.mob_size < mob_size) + own_stun_chance = 0 + grabbed_stun_chance = 25 + else + own_stun_chance = 25 + grabbed_stun_chance = 25 + + if(prob(own_stun_chance)) + Paralyze(1 SECONDS) + if(prob(grabbed_stun_chance)) + grabbed_mob.Paralyze(1 SECONDS) + + var/damage = (user.skills.getRating(SKILL_CQC) * CQC_SKILL_DAMAGE_MOD) + switch(state) + if(GRAB_PASSIVE) + damage += base_damage + grabbed_mob.visible_message(span_warning("[user] slams [grabbed_mob] against [src]!")) + log_combat(user, grabbed_mob, "slammed", "", "against [src]") + if(GRAB_AGGRESSIVE) + damage += base_damage * 1.5 + grabbed_mob.visible_message(span_danger("[user] bashes [grabbed_mob] against [src]!")) + log_combat(user, grabbed_mob, "bashed", "", "against [src]") + if(GRAB_NECK) + damage += base_damage * 2 + grabbed_mob.visible_message(span_danger("[user] crushes [grabbed_mob] against [src]!")) + log_combat(user, grabbed_mob, "crushed", "", "against [src]") + grabbed_mob.apply_damage(damage, blocked = MELEE, updating_health = TRUE) + apply_damage(damage, blocked = MELEE, updating_health = TRUE) + playsound(src, 'sound/weapons/heavyhit.ogg', 40) + return TRUE + /mob/living/proc/electrocute_act(shock_damage, obj/source, siemens_coeff = 1.0) return 0 //only carbon liveforms have this proc /mob/living/emp_act(severity) - var/list/L = src.get_contents() + var/list/L = GetAllContents() for(var/obj/O in L) O.emp_act(severity) ..() @@ -21,9 +71,6 @@ var/obj/O = AM O.stop_throw() apply_damage(O.throwforce*(speed * 0.2), O.damtype, BODY_ZONE_CHEST, MELEE, is_sharp(O), has_edge(O), TRUE, O.penetration) - if(O.item_fire_stacks) - fire_stacks += O.item_fire_stacks - IgniteMob() visible_message(span_warning(" [src] has been hit by [AM]."), null, null, 5) if(ismob(AM.thrower)) @@ -138,6 +185,21 @@ adjust_fire_stacks(rand(1,2)) IgniteMob() +/mob/living/lava_act() + if(resistance_flags & INDESTRUCTIBLE) + return FALSE + if(stat == DEAD) + return FALSE + if(status_flags & GODMODE) + return TRUE //while godmode will stop the damage, we don't want the process to stop in case godmode is removed + + var/lava_damage = 20 + take_overall_damage(max(modify_by_armor(lava_damage, FIRE), lava_damage * 0.3), BURN, updating_health = TRUE, max_limbs = 3) //snowflakey interaction to stop complete lava immunity + if(!CHECK_BITFIELD(pass_flags, PASS_FIRE))//Pass fire allow to cross lava without igniting + adjust_fire_stacks(20) + IgniteMob() + return TRUE + /mob/living/flamer_fire_act(burnlevel) if(!burnlevel) return diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm index 605adb03c0e02..165474af2a3c2 100644 --- a/code/modules/mob/living/living_defines.dm +++ b/code/modules/mob/living/living_defines.dm @@ -1,6 +1,6 @@ /mob/living see_invisible = SEE_INVISIBLE_LIVING - flags_atom = CRITICAL_ATOM|PREVENT_CONTENTS_EXPLOSION|BUMP_ATTACKABLE + atom_flags = CRITICAL_ATOM|PREVENT_CONTENTS_EXPLOSION|BUMP_ATTACKABLE ///0 for no override, sets see_invisible = see_override in silicon & carbon life process via update_sight() var/see_override = 0 ///Badminnery resize @@ -124,7 +124,10 @@ var/grab_resist_level = 0 var/datum/job/job var/comm_title = "" - ///how much blood the mob has + /** + * How much blood the mob has. + * !!! Use the adjust_blood_volume() and set_blood_volume() to set this variable instead of directly modifying it!!! + */ var/blood_volume = 0 ///Multiplier. var/heart_multi = 1 diff --git a/code/modules/mob/living/living_health_procs.dm b/code/modules/mob/living/living_health_procs.dm index f06b770cc759c..ee301c667dc85 100644 --- a/code/modules/mob/living/living_health_procs.dm +++ b/code/modules/mob/living/living_health_procs.dm @@ -92,6 +92,7 @@ updateStamina(feedback) /mob/living/proc/updateStamina(feedback = TRUE) + hud_used?.staminas?.update_icon() if(staminaloss < max(health * 1.5,0) || !(COOLDOWN_CHECK(src, last_stamina_exhaustion))) //If we're on cooldown for stamina exhaustion, don't bother return @@ -105,21 +106,6 @@ adjust_blurriness(STAMINA_EXHAUSTION_DEBUFF_STACKS) COOLDOWN_START(src, last_stamina_exhaustion, LIVING_STAMINA_EXHAUSTION_COOLDOWN - (skills.getRating(SKILL_STAMINA) * STAMINA_SKILL_COOLDOWN_MOD)) //set the cooldown. - -/mob/living/carbon/human/updateStamina(feedback = TRUE) - . = ..() - if(!hud_used?.staminas) - return - if(stat == DEAD) - hud_used.staminas.icon_state = "stamloss200" - return - var/relative_stamloss = getStaminaLoss() - if(relative_stamloss < 0 && max_stamina) - relative_stamloss = round(((relative_stamloss * 14) / max_stamina), 1) - else - relative_stamloss = round(((relative_stamloss * 7) / (maxHealth * 2)), 1) - hud_used.staminas.icon_state = "stamloss[relative_stamloss]" - /// Adds an entry to our stamina_regen_modifiers and updates stamina_regen_multiplier /mob/living/proc/add_stamina_regen_modifier(mod_name, mod_value) if(stamina_regen_modifiers[mod_name] == mod_value) @@ -205,6 +191,20 @@ return remove_movespeed_modifier(MOVESPEED_ID_DROWSINESS) +///Adjusts the blood volume, with respect to the minimum and maximum values +/mob/living/proc/adjust_blood_volume(amount) + if(!amount) + return + + blood_volume = clamp(blood_volume + amount, 0, BLOOD_VOLUME_MAXIMUM) + +///Sets the blood volume, with respect to the minimum and maximum values +/mob/living/proc/set_blood_volume(amount) + if(!amount) + return + + blood_volume = clamp(amount, 0, BLOOD_VOLUME_MAXIMUM) + // heal ONE limb, organ gets randomly selected from damaged ones. /mob/living/proc/heal_limb_damage(brute, burn, robo_repair = FALSE, updating_health = FALSE) @@ -254,7 +254,6 @@ /mob/living/carbon/human/on_revive() . = ..() - revive_grace_time = initial(revive_grace_time) GLOB.alive_human_list += src LAZYADD(GLOB.alive_human_list_faction[faction], src) GLOB.dead_human_list -= src @@ -374,7 +373,7 @@ /mob/living/carbon/xenomorph/revive(admin_revive = FALSE) - plasma_stored = xeno_caste.plasma_max + set_plasma(xeno_caste.plasma_max) sunder = 0 if(stat == DEAD) hive?.on_xeno_revive(src) @@ -397,7 +396,8 @@ ADD_TRAIT(src, TRAIT_IS_RESURRECTING, REVIVE_TO_CRIT_TRAIT) if(should_zombify && (istype(wear_ear, /obj/item/radio/headset/mainship))) var/obj/item/radio/headset/mainship/radio = wear_ear - radio.safety_protocol(src) + if(istype(radio)) + radio.safety_protocol(src) addtimer(CALLBACK(src, PROC_REF(finish_revive_to_crit), should_offer_to_ghost, should_zombify), 10 SECONDS) ///Check if we have a mind, and finish the revive if we do @@ -427,3 +427,4 @@ overlay_fullscreen_timer(2 SECONDS, 20, "roundstart2", /atom/movable/screen/fullscreen/spawning_in) REMOVE_TRAIT(src, TRAIT_IS_RESURRECTING, REVIVE_TO_CRIT_TRAIT) SSmobs.start_processing(src) + diff --git a/code/modules/mob/living/living_helpers.dm b/code/modules/mob/living/living_helpers.dm index ce974aedf2c26..bde1bbef01453 100644 --- a/code/modules/mob/living/living_helpers.dm +++ b/code/modules/mob/living/living_helpers.dm @@ -32,10 +32,10 @@ /mob/living/restrained(ignore_checks) . = ..() - var/flags_to_check = RESTRAINED_NECKGRAB | RESTRAINED_XENO_NEST | RESTRAINED_STRAIGHTJACKET | RESTRAINED_RAZORWIRE | RESTRAINED_PSYCHICGRAB + var/to_check_flags = RESTRAINED_NECKGRAB | RESTRAINED_XENO_NEST | RESTRAINED_STRAIGHTJACKET | RESTRAINED_RAZORWIRE | RESTRAINED_PSYCHICGRAB if(ignore_checks) - DISABLE_BITFIELD(flags_to_check, ignore_checks) - return (. || CHECK_BITFIELD(restrained_flags, flags_to_check)) + DISABLE_BITFIELD(to_check_flags, ignore_checks) + return (. || CHECK_BITFIELD(restrained_flags, to_check_flags)) /mob/living/get_policy_keywords() diff --git a/code/modules/mob/living/living_verbs.dm b/code/modules/mob/living/living_verbs.dm index 0c323f442effa..bd456755bc2bd 100644 --- a/code/modules/mob/living/living_verbs.dm +++ b/code/modules/mob/living/living_verbs.dm @@ -3,13 +3,9 @@ set category = "IC" do_resist() - -//RUTGMC EDIT BEGIN - Moved to modular_RUtgmc\code\modules\mob\living\living_verbs.dm -/* -/mob/living/proc/lay_down() - set name = "Rest" - set category = "IC" - +/* // RUTGMC CHANGE +///Handles trying to toggle resting state +/mob/living/proc/toggle_resting() if(incapacitated(TRUE)) return @@ -17,19 +13,21 @@ if(is_ventcrawling) return FALSE set_resting(TRUE, FALSE) - else if(do_actions) - to_chat(src, span_warning("You are still in the process of standing up.")) return - else if(do_after(src, 2 SECONDS, IGNORE_LOC_CHANGE|IGNORE_HELD_ITEM, src)) - get_up() + if(do_actions) + balloon_alert(src, "Busy!") + return + get_up() +///Handles getting up, doing a basic check before relaying it to the actual proc that does it /mob/living/proc/get_up() if(!incapacitated(TRUE)) set_resting(FALSE, FALSE) else to_chat(src, span_notice("You fail to get up.")) -*/ // RUTGMC EDIT END +*/ //RUTGMC CHANGE +///Actually handles toggling the resting state /mob/living/proc/set_resting(rest, silent = TRUE) if(status_flags & INCORPOREAL) return @@ -47,11 +45,7 @@ if(!silent) to_chat(src, span_notice("You get up.")) SEND_SIGNAL(src, COMSIG_XENOMORPH_UNREST) - update_resting() - - -/mob/living/proc/update_resting() - hud_used?.rest_icon?.update_icon(src) + hud_used?.rest_icon?.update_icon() /mob/living/verb/ghost() diff --git a/code/modules/mob/living/logout.dm b/code/modules/mob/living/logout.dm index 0960b0e702323..d8d92c9dca5cb 100644 --- a/code/modules/mob/living/logout.dm +++ b/code/modules/mob/living/logout.dm @@ -12,4 +12,4 @@ else if(!isclientedaghost(src)) set_afk_status(MOB_RECENTLY_DISCONNECTED, AFK_TIMER) if(!QDELETED(src) && stat != DEAD) - LAZYDISTINCTADD(GLOB.ssd_living_mobs, src) + LAZYOR(GLOB.ssd_living_mobs, src) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 5850166dc29c5..a8e77af688a3e 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -138,19 +138,6 @@ GLOB.ai_list -= src QDEL_NULL(builtInCamera) QDEL_NULL(track) - UnregisterSignal(src, COMSIG_ORDER_SELECTED) - UnregisterSignal(src, COMSIG_MOB_CLICK_ALT) - - UnregisterSignal(SSdcs, COMSIG_GLOB_OB_LASER_CREATED) - UnregisterSignal(SSdcs, COMSIG_GLOB_CAS_LASER_CREATED) - UnregisterSignal(SSdcs, COMSIG_GLOB_RAILGUN_LASER_CREATED) - UnregisterSignal(SSdcs, COMSIG_GLOB_SHUTTLE_TAKEOFF) - UnregisterSignal(SSdcs, COMSIG_GLOB_DROPSHIP_CONTROLS_CORRUPTED) - UnregisterSignal(SSdcs, COMSIG_GLOB_MINI_DROPSHIP_DESTROYED) - UnregisterSignal(SSdcs, COMSIG_GLOB_DISK_GENERATED) - UnregisterSignal(SSdcs, COMSIG_GLOB_NUKE_START) - UnregisterSignal(SSdcs, COMSIG_GLOB_CLONE_PRODUCED) - UnregisterSignal(SSdcs, COMSIG_GLOB_HOLOPAD_AI_CALLED) QDEL_NULL(mini) return ..() @@ -255,7 +242,6 @@ to_chat(src, span_notice("Camera lights activated.")) camera_light_on = !camera_light_on - /mob/living/silicon/ai/proc/light_cameras() var/list/obj/machinery/camera/add = list() var/list/obj/machinery/camera/remove = list() @@ -277,6 +263,14 @@ C.Togglelight(1) lit_cameras |= C +/mob/living/silicon/ai/proc/supply_interface() + var/datum/supply_ui/SU + if(!SU) + SU = new(src) + SU.shuttle_id = SHUTTLE_SUPPLY + SU.home_id = "supply_home" + SU.faction = src.faction + return SU.interact(src) /mob/living/silicon/ai/proc/camera_visibility(mob/camera/aiEye/moved_eye) GLOB.cameranet.visibility(moved_eye, client, all_eyes, moved_eye.use_static) @@ -289,11 +283,11 @@ return (GLOB.cameranet && GLOB.cameranet.checkTurfVis(get_turf_pixel(A))) /mob/living/silicon/ai/proc/relay_speech(message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode) - raw_message = lang_treat(speaker, message_language, raw_message, spans, message_mode) var/start = "Relayed Speech: " var/namepart = "[speaker.GetVoice()][speaker.get_alt_name()]" var/hrefpart = "" var/jobpart + var/speech_part = lang_treat(speaker, message_language, raw_message, spans, message_mode) if(iscarbon(speaker)) var/mob/living/carbon/S = speaker @@ -302,8 +296,10 @@ else jobpart = "Unknown" - var/rendered = "[start][span_name("[hrefpart][namepart] ([jobpart]) ")][span_message("[raw_message]")]" + var/rendered = "[start][span_name("[hrefpart][namepart] ([jobpart]) ")][span_message("[speech_part]")]" + + create_chat_message(speaker, message_language, raw_message, spans, message_mode) show_message(rendered, 2) @@ -345,20 +341,19 @@ else clear_fullscreen("remote_view", 0) -/* RUTGMC DELETION + /mob/living/silicon/ai/update_sight() - . = ..() if(HAS_TRAIT(src, TRAIT_SEE_IN_DARK)) see_in_dark = max(see_in_dark, 8) lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE eyeobj.see_in_dark = max(eyeobj.see_in_dark, 8) eyeobj.lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE - return + return ..() + see_in_dark = initial(see_in_dark) + lighting_alpha = initial(lighting_alpha) eyeobj.see_in_dark = initial(eyeobj.see_in_dark) eyeobj.lighting_alpha = initial(eyeobj.lighting_alpha) - see_in_dark = initial(see_in_dark) - lighting_alpha = initial(lighting_alpha) // yes you really have to change both the eye and the ai vars -*/ + return ..() /mob/living/silicon/ai/get_status_tab_items() . = ..() @@ -383,7 +378,8 @@ . += "Current alert level: [GLOB.marine_main_ship.get_security_level()]" - . += "Number of living marines: [SSticker.mode.count_humans_and_xenos()[1]]" + if(SSticker.mode) + . += "Number of living marines: [SSticker.mode.count_humans_and_xenos()[1]]" if(GLOB.marine_main_ship?.rail_gun?.last_firing_ai + COOLDOWN_RAILGUN_FIRE > world.time) . += "Railgun status: Cooling down, next fire in [(GLOB.marine_main_ship?.rail_gun?.last_firing_ai + COOLDOWN_RAILGUN_FIRE - world.time)/10] seconds." @@ -394,6 +390,9 @@ . += "AI bioscan status: Instruments recalibrating, next scan in [(last_ai_bioscan + COOLDOWN_AI_BIOSCAN - world.time)/10] seconds." //about 10 minutes else . += "AI bioscan status: Instruments are ready to scan the planet." + var/status_value = SSevacuation?.get_status_panel_eta() + if(status_value) + . += "Evacuation in: [status_value]" /mob/living/silicon/ai/fully_replace_character_name(oldname, newname) . = ..() diff --git a/code/modules/mob/living/silicon/ai/freelook/read_me.dm b/code/modules/mob/living/silicon/ai/freelook/README.md similarity index 97% rename from code/modules/mob/living/silicon/ai/freelook/read_me.dm rename to code/modules/mob/living/silicon/ai/freelook/README.md index 0f92bf94e6cd6..4528926265596 100644 --- a/code/modules/mob/living/silicon/ai/freelook/read_me.dm +++ b/code/modules/mob/living/silicon/ai/freelook/README.md @@ -1,12 +1,4 @@ -// CREDITS -/* -Initial code credit for this goes to Uristqwerty. -Debugging, functionality, all comments and porting by Giacom. - -Everything about freelook (or what we can put in here) will be stored here. - - -WHAT IS THIS? +# WHAT IS THIS? This is a replacement for the current camera movement system, of the AI. Before this, the AI had to move between cameras and could only see what the cameras could see. Not only this but the cameras could see through walls, which created problems. @@ -17,7 +9,7 @@ This creates several features, such as.. no more see-through-wall cameras, easie the AI only being able to track mobs which are visible to a camera, only trackable mobs appearing on the mob list and many more. -HOW IT WORKS +# HOW IT WORKS It works by first creating a camera network datum. Inside of this camera network are "chunks" (which will be explained later) and "cameras". The cameras list is kept up to date by obj/machinery/camera/Initialize(mapload) and Destroy(). @@ -27,7 +19,7 @@ These turfs are then sorted out based on what the cameras can and cannot see. If the 16x16 block, it is listed as an "obscured" turf. Meaning the AI won't be able to see it. -HOW IT UPDATES +# HOW IT UPDATES The camera network uses a streaming method in order to effeciently update chunks. Since the server will have doors opening, doors closing, turf being destroyed and other lag inducing stuff, we want to update it under certain conditions and not every tick. @@ -41,10 +33,15 @@ measures, such as an UPDATE_BUFFER which stops a chunk from updating too many ti sight; for example, we don't update glass airlocks or floors. -WHERE IS EVERYTHING? +# WHERE IS EVERYTHING? cameranet.dm = Everything about the cameranet datum. chunk.dm = Everything about the chunk datum. eye.dm = Everything about the AI and the AIEye. -*/ +## CREDITS + +Initial code credit for this goes to Uristqwerty. +Debugging, functionality, all comments and porting by Giacom. + +Everything about freelook (or what we can put in here) will be stored here. diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm index 5f4ef743db403..44bb9a62424ff 100644 --- a/code/modules/mob/living/silicon/ai/freelook/eye.dm +++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm @@ -198,3 +198,8 @@ /mob/camera/aiEye/proc/unregister_facedir_signals(mob/user) UnregisterSignal(user, list(COMSIG_KB_MOB_FACENORTH_DOWN, COMSIG_KB_MOB_FACEEAST_DOWN, COMSIG_KB_MOB_FACESOUTH_DOWN, COMSIG_KB_MOB_FACEWEST_DOWN)) + +/mob/camera/aiEye/playsound_local(turf/turf_source, soundin, vol, vary, frequency, falloff, is_global, channel, sound/S, distance_multiplier, mob/sound_reciever) + if(istype(parent_cameranet) && !parent_cameranet.checkTurfVis(get_turf(src))) + return + return ..(turf_source, soundin, vol, vary, frequency, falloff, is_global, channel, S, distance_multiplier, ai) diff --git a/code/modules/mob/living/silicon/ai/multicam.dm b/code/modules/mob/living/silicon/ai/multicam.dm index 680244b23c8fd..652c6bb19198f 100644 --- a/code/modules/mob/living/silicon/ai/multicam.dm +++ b/code/modules/mob/living/silicon/ai/multicam.dm @@ -222,7 +222,7 @@ GLOBAL_DATUM(ai_camera_room_landmark, /obj/effect/landmark/ai_multicam_room) if(!silent) to_chat(src, span_warning("Cannot place more than [max_multicams] multicamera windows.")) return - var/atom/movable/screen/movable/pic_in_pic/ai/C = new /atom/movable/screen/movable/pic_in_pic/ai() + var/atom/movable/screen/movable/pic_in_pic/ai/C = new() C.set_view_size(3, 3, FALSE) C.set_view_center(get_turf(eyeobj)) C.set_ai(src) diff --git a/code/modules/mob/living/silicon/ai/say.dm b/code/modules/mob/living/silicon/ai/say.dm index db7e8e950f486..1d0b5e1310393 100644 --- a/code/modules/mob/living/silicon/ai/say.dm +++ b/code/modules/mob/living/silicon/ai/say.dm @@ -114,7 +114,7 @@ log_game("[key_name(src)] made a vocal announcement with the following message: [message].") log_talk(message, LOG_SAY, tag="VOX Announcement") - to_chat(src, span_notice("The following vocal announcement has been made: [message].")) + minor_announce(capitalize(message), "[name] announces:", receivers = (GLOB.alive_human_list + GLOB.ai_list + GLOB.observer_list), should_play_sound = FALSE) for(var/word in words) //play vox sounds to the rest of our zlevel play_vox_word(word, src.z, null) diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index f3a37e5f0297c..ccd70bbe026d4 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -18,6 +18,7 @@ /mob/living/silicon/Initialize(mapload) . = ..() + GLOB.silicon_mobs += src radio = new(src) if(SStts.tts_enabled) voice = pick(SStts.available_speakers) @@ -25,6 +26,7 @@ /mob/living/silicon/Destroy() QDEL_NULL(radio) + GLOB.silicon_mobs -= src return ..() diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index c3e48b988a810..5d8dadf6c6fa6 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -141,7 +141,7 @@ slot_l_hand_str = 'icons/mob/inhands/items/animals_left.dmi', slot_r_hand_str = 'icons/mob/inhands/items/animals_right.dmi', ) - flags_armor_features = ARMOR_NO_DECAP + armor_features_flags = ARMOR_NO_DECAP soft_armor = list(MELEE = 25, BULLET = 25, LASER = 25, ENERGY = 25, BOMB = 10, BIO = 5, FIRE = 50, ACID = 50) var/mob/living/simple_animal/cat/cat diff --git a/code/modules/mob/living/simple_animal/friendly/parrot.dm b/code/modules/mob/living/simple_animal/friendly/parrot.dm index cf94b7f4e534e..f9f88241e19f1 100644 --- a/code/modules/mob/living/simple_animal/friendly/parrot.dm +++ b/code/modules/mob/living/simple_animal/friendly/parrot.dm @@ -156,8 +156,8 @@ GLOBAL_LIST_INIT(strippable_parrot_items, create_strippable_list(list( if(stat != DEAD && user.a_intent == INTENT_HELP) handle_automated_speech(1) //assured speak/emote -/mob/living/simple_animal/parrot/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) - return attack_hand(X) +/mob/living/simple_animal/parrot/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) + return attack_hand(xeno_attacker) /mob/living/simple_animal/parrot/attack_animal(mob/living/simple_animal/M) diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index c9cb366bca4c1..b92cdf747865a 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -386,7 +386,7 @@ var/obj/projectile/P = new(startloc) playsound(src, projectilesound, 100, 1) P.generate_bullet(GLOB.ammo_list[ammotype]) - P.fire_at(targeted_atom, src) + P.fire_at(targeted_atom, src, src) /mob/living/simple_animal/hostile/proc/CanSmashTurfs(turf/T) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 5104d3f4295db..9a50d11f8d745 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -197,22 +197,22 @@ return TRUE -/mob/living/simple_animal/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) +/mob/living/simple_animal/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) . = ..() if(!.) return - if(X.a_intent == INTENT_DISARM) + if(xeno_attacker.a_intent == INTENT_DISARM) playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1) - visible_message(span_danger("[X] [response_disarm] [name]!"), \ - span_userdanger("[X] [response_disarm] [name]!")) - log_combat(X, src, "disarmed") + visible_message(span_danger("[xeno_attacker] [response_disarm] [name]!"), \ + span_userdanger("[xeno_attacker] [response_disarm] [name]!")) + log_combat(xeno_attacker, src, "disarmed") else var/damage = rand(15, 30) - visible_message(span_danger("[X] has slashed at [src]!"), \ - span_userdanger("[X] has slashed at [src]!")) + visible_message(span_danger("[xeno_attacker] has slashed at [src]!"), \ + span_userdanger("[xeno_attacker] has slashed at [src]!")) playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1) attack_threshold_check(damage) - log_combat(X, src, "attacked") + log_combat(xeno_attacker, src, "attacked") return TRUE diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index a9aa21994f39e..ea2f0bd67c1e2 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -11,7 +11,6 @@ ghostize() clear_fullscreens() if(mind) - stack_trace("Found a reference to an undeleted mind in mob/Destroy(). Mind name: [mind.name]. Mind mob: [mind.current]") mind = null if(hud_used) QDEL_NULL(hud_used) @@ -34,6 +33,11 @@ GLOB.dead_mob_list += src set_focus(src) prepare_huds() + for(var/v in GLOB.active_alternate_appearances) + if(!v) + continue + var/datum/atom_hud/alternate_appearance/AA = v + AA.onNewMob(src) . = ..() if(islist(skills)) set_skills(getSkills(arglist(skills))) @@ -240,13 +244,13 @@ return FALSE equip_to_slot(W, slot) //This proc should not ever fail. //This will unwield items -without- triggering lights. - if(CHECK_BITFIELD(W.flags_item, TWOHANDED)) + if(CHECK_BITFIELD(W.item_flags, TWOHANDED)) W.unwield(src) return TRUE else equip_to_slot(W, slot) //This proc should not ever fail. //This will unwield items -without- triggering lights. - if(CHECK_BITFIELD(W.flags_item, TWOHANDED)) + if(CHECK_BITFIELD(W.item_flags, TWOHANDED)) W.unwield(src) return TRUE @@ -307,7 +311,7 @@ var/obj/item/found = I.do_quick_equip(src) if(!found) return FALSE - if(CHECK_BITFIELD(found.flags_inventory, NOQUICKEQUIP)) + if(CHECK_BITFIELD(found.inventory_flags, NOQUICKEQUIP)) return FALSE temporarilyRemoveItemFromInventory(found) put_in_hands(found) @@ -318,6 +322,37 @@ . += "---" .["Player Panel"] = "?_src_=vars;[HrefToken()];playerpanel=[REF(src)]" +/mob/vv_edit_var(var_name, var_value) + switch(var_name) + if(NAMEOF(src, control_object)) + var/obj/O = var_value + if(!istype(O) || (O.obj_flags & DANGEROUS_POSSESSION)) + return FALSE + if(NAMEOF(src, machine)) + set_machine(var_value) + . = TRUE + if(NAMEOF(src, focus)) + set_focus(var_value) + . = TRUE + if(NAMEOF(src, stat)) + set_stat(var_value) + . = TRUE + + if(!isnull(.)) + datum_flags |= DF_VAR_EDITED + return + + var/slowdown_edit = (var_name == NAMEOF(src, cached_multiplicative_slowdown)) + var/diff + if(slowdown_edit && isnum(cached_multiplicative_slowdown) && isnum(var_value)) + remove_movespeed_modifier(MOVESPEED_ID_ADMIN_VAREDIT) + diff = var_value - cached_multiplicative_slowdown + + . = ..() + + if(. && slowdown_edit && isnum(diff)) + update_movespeed() + /client/verb/changes() set name = "Changelog" @@ -789,6 +824,7 @@ //This would go on on_revive() but that is a mob/living proc var/datum/personal_statistics/personal_statistics = GLOB.personal_statistics_list[ckey] personal_statistics.times_revived++ + personal_statistics.mission_times_revived++ SEND_SIGNAL(src, COMSIG_MOB_STAT_CHANGED, ., new_stat) /// Cleanup proc that's called when a mob loses a client, either through client destroy or logout diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index f1f3482670a8e..7d5a782d81d0d 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -6,7 +6,7 @@ animate_movement = SLIDE_STEPS datum_flags = DF_USE_TAG mouse_drag_pointer = MOUSE_ACTIVE_POINTER - flags_atom = PREVENT_CONTENTS_EXPLOSION + atom_flags = PREVENT_CONTENTS_EXPLOSION resistance_flags = NONE //Mob @@ -77,6 +77,8 @@ var/list/fullscreens = list() ///contains /atom/movable/screen/alert only, used by alerts.dm var/list/alerts = list() + ///List of queued interactions on this mob + var/list/queued_interactions var/list/datum/action/actions = list() var/list/actions_by_path = list() var/lighting_alpha = LIGHTING_PLANE_ALPHA_VISIBLE diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index b416799643b3c..b31dc5f2511d6 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -4,8 +4,8 @@ name = "grab" icon_state = "reinforce" icon = 'icons/mob/screen/generic.dmi' - flags_atom = NONE - flags_item = NOBLUDGEON|DELONDROP|ITEM_ABSTRACT + atom_flags = NONE + item_flags = NOBLUDGEON|DELONDROP|ITEM_ABSTRACT layer = ABOVE_HUD_LAYER plane = ABOVE_HUD_PLANE item_state = "nothing" @@ -61,7 +61,7 @@ if(user.grab_state > GRAB_KILL) return user.changeNext_move(CLICK_CD_GRABBING) - if(!do_after(user, 2 SECONDS, NONE, victim, BUSY_ICON_HOSTILE, extra_checks = CALLBACK(user, TYPE_PROC_REF(/datum, Adjacent), victim)) || !user.pulling) + if(!do_after(user, max(2 SECONDS - (user.skills.getRating(SKILL_CQC) * 0.5 SECONDS), 1 SECONDS), NONE, victim, BUSY_ICON_HOSTILE, extra_checks = CALLBACK(user, TYPE_PROC_REF(/datum, Adjacent), victim)) || !user.pulling) return user.advance_grab_state() if(user.grab_state == GRAB_NECK) @@ -74,6 +74,7 @@ var/mob/living/victim = pulling playsound(loc, 'sound/weapons/thudswoosh.ogg', 25, TRUE, 7) setGrabState(grab_state + 1) + victim.grab_resist_level -= 1 switch(grab_state) if(GRAB_AGGRESSIVE) log_combat(src, victim, "aggressive grabbed") diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 97b1823a88a2d..6794ea95a60e8 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -252,10 +252,10 @@ GLOBAL_LIST_INIT(organ_rel_size, list( /mob/proc/abiotic(full_body) - if(full_body && ((l_hand && !( l_hand.flags_item & ITEM_ABSTRACT )) || (r_hand && !( r_hand.flags_item & ITEM_ABSTRACT )))) + if(full_body && ((l_hand && !( l_hand.item_flags & ITEM_ABSTRACT )) || (r_hand && !( r_hand.item_flags & ITEM_ABSTRACT )))) return TRUE - if((src.l_hand && !( src.l_hand.flags_item & ITEM_ABSTRACT )) || (src.r_hand && !( src.r_hand.flags_item & ITEM_ABSTRACT ))) + if((src.l_hand && !( src.l_hand.item_flags & ITEM_ABSTRACT )) || (src.r_hand && !( src.r_hand.item_flags & ITEM_ABSTRACT ))) return TRUE return FALSE diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 654a57c6173a9..c5f5c182dc6a3 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -184,7 +184,7 @@ if(istype(src,/mob/living/carbon/human/)) // Only humans can wear magboots, so we give them a chance to. var/mob/living/carbon/human/H = src - if((istype(turf,/turf/open/floor)) && !(istype(H.shoes, /obj/item/clothing/shoes/magboots) && (H.shoes.flags_inventory & NOSLIPPING))) + if((istype(turf,/turf/open/floor)) && !(istype(H.shoes, /obj/item/clothing/shoes/magboots) && (H.shoes.inventory_flags & NOSLIPPING))) continue @@ -361,7 +361,7 @@ if(hud_used?.static_inventory) for(var/atom/movable/screen/mov_intent/selector in hud_used.static_inventory) - selector.update_icon(src) + selector.update_icon() return TRUE diff --git a/code/modules/mob/mob_movespeed.dm b/code/modules/mob/mob_movespeed.dm index 967a4c1f4a54f..47019380785eb 100644 --- a/code/modules/mob/mob_movespeed.dm +++ b/code/modules/mob/mob_movespeed.dm @@ -61,17 +61,6 @@ Key procs update_movespeed(FALSE) return TRUE -///Handles the special case of editing the movement var -/mob/vv_edit_var(var_name, var_value) - var/slowdown_edit = (var_name == NAMEOF(src, cached_multiplicative_slowdown)) - var/diff - if(slowdown_edit && isnum(cached_multiplicative_slowdown) && isnum(var_value)) - remove_movespeed_modifier(MOVESPEED_ID_ADMIN_VAREDIT) - diff = var_value - cached_multiplicative_slowdown - . = ..() - if(. && slowdown_edit && isnum(diff)) - add_movespeed_modifier(MOVESPEED_ID_ADMIN_VAREDIT, TRUE, 100, NONE, TRUE, diff) - ///Is there a movespeed modifier for this mob /mob/proc/has_movespeed_modifier(id) return LAZYACCESS(movespeed_modification, id) diff --git a/code/modules/mob/mob_verbs.dm b/code/modules/mob/mob_verbs.dm index ddcfab3cf347b..bf6a7005b2cad 100644 --- a/code/modules/mob/mob_verbs.dm +++ b/code/modules/mob/mob_verbs.dm @@ -82,7 +82,7 @@ return var/mob/new_player/M = new /mob/new_player() - if(SSticker.mode?.flags_round_type & MODE_TWO_HUMAN_FACTIONS) + if(SSticker.mode?.round_type_flags & MODE_TWO_HUMAN_FACTIONS) M.faction = faction if(!client) qdel(M) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 5b019faae00e3..bc80a844dd0fc 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -173,7 +173,7 @@ DIRECT_OUTPUT(usr, browse(null, "window=xenosunbalanced")) if(href_list["showpoll"]) - handle_playeR_DBRANKSing() + handle_playeR_POLLSing() return if(href_list["viewpoll"]) @@ -195,7 +195,7 @@ if(!GLOB.enter_allowed) dat += "
You may no longer join the round.
" var/forced_faction - if(SSticker.mode.flags_round_type & MODE_TWO_HUMAN_FACTIONS) + if(SSticker.mode.round_type_flags & MODE_TWO_HUMAN_FACTIONS) if(faction in SSticker.mode.get_joinable_factions(FALSE)) forced_faction = faction else @@ -455,7 +455,7 @@ to_chat(src, span_warning("The round is either not ready, or has already finished.")) return - if(SSticker.mode.flags_round_type & MODE_NO_LATEJOIN) + if(SSticker.mode.round_type_flags & MODE_NO_LATEJOIN) to_chat(src, span_warning("Sorry, you cannot late join during [SSticker.mode.name]. You have to start at the beginning of the round. You may observe or try to join as an alien, if possible.")) return diff --git a/code/modules/mob/new_player/poll.dm b/code/modules/mob/new_player/poll.dm index 8fdf495ae35fa..570b13273c086 100644 --- a/code/modules/mob/new_player/poll.dm +++ b/code/modules/mob/new_player/poll.dm @@ -2,7 +2,7 @@ * Shows a list of currently running polls a player can vote/has voted on * */ -/mob/new_player/proc/handle_playeR_DBRANKSing() +/mob/new_player/proc/handle_playeR_POLLSing() var/list/output = list("
Player polls
")
var/rs = REF(src)
for(var/p in GLOB.polls)
diff --git a/code/modules/mob/update_icons.dm b/code/modules/mob/update_icons.dm
index 79b8c359da1a5..5c275bf383fd2 100644
--- a/code/modules/mob/update_icons.dm
+++ b/code/modules/mob/update_icons.dm
@@ -61,9 +61,6 @@
/mob/proc/update_inv_ears()
return
-/mob/proc/update_targeted()
- return
-
/mob/proc/update_burst()
return
diff --git a/code/modules/orbits/spaceship.dm b/code/modules/orbits/spaceship.dm
index 211830a9cf303..d058fe16f2c3b 100644
--- a/code/modules/orbits/spaceship.dm
+++ b/code/modules/orbits/spaceship.dm
@@ -161,7 +161,7 @@ GLOBAL_VAR_INIT(current_orbit,STANDARD_ORBIT)
message_admins("[ADMIN_TPMONTY(usr)] Has sent the ship [direction == "UP" ? "UPWARD" : "DOWNWARD"] in orbit")
var/message = "Prepare for orbital change in 10 seconds.\nMoving [direction] the gravity well.\nSecure all belongings and prepare for engine ignition."
- priority_announce(message, title = "Orbit Change")
+ minor_announce(message, title = "Orbit Change")
addtimer(CALLBACK(src, PROC_REF(do_change_orbit), current_orbit, direction), 10 SECONDS)
/obj/machinery/computer/navigation/proc/can_change_orbit(current_orbit, direction, silent = FALSE)
@@ -195,7 +195,7 @@ GLOBAL_VAR_INIT(current_orbit,STANDARD_ORBIT)
engine_shudder()
var/message = "Arriving at new orbital level. Prepare for engine ignition and stabilization."
- addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(priority_announce), message, "Orbit Change"), 290 SECONDS)
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(minor_announce), message, "Orbit Change"), 290 SECONDS)
addtimer(CALLBACK(src, PROC_REF(orbit_gets_changed), current_orbit, direction), 3 MINUTES)
/obj/machinery/computer/navigation/proc/orbit_gets_changed(current_orbit, direction)
diff --git a/code/modules/organs/limb_objects.dm b/code/modules/organs/limb_objects.dm
index 75f4c607be4d9..b7d806af28330 100644
--- a/code/modules/organs/limb_objects.dm
+++ b/code/modules/organs/limb_objects.dm
@@ -93,7 +93,7 @@
overlays.Add(facial) // icon.Blend(facial, ICON_OVERLAY)
- if(H.h_style && !(H.head && (H.head.flags_inv_hide & HIDETOPHAIR)))
+ if(H.h_style && !(H.head && (H.head.inv_hide_flags & HIDETOPHAIR)))
var/datum/sprite_accessory/hair_style = GLOB.hair_styles_list[H.h_style]
if(hair_style)
var/icon/hair = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s")
diff --git a/code/modules/organs/limbs.dm b/code/modules/organs/limbs.dm
index 91e88a3c8b201..8f447083d25c7 100644
--- a/code/modules/organs/limbs.dm
+++ b/code/modules/organs/limbs.dm
@@ -194,7 +194,7 @@ RU TGMC EDIT */
//Possibly trigger an internal wound, too.
var/local_damage = brute_dam + burn_dam + brute
- if(brute > 15 && local_damage > 30 && prob(brute*0.5) && !(limb_status & LIMB_ROBOT) && !(SSticker.mode?.flags_round_type & MODE_NO_PERMANENT_WOUNDS))
+ if(brute > 15 && local_damage > 30 && prob(brute*0.5) && !(limb_status & LIMB_ROBOT) && !(SSticker.mode?.round_type_flags & MODE_NO_PERMANENT_WOUNDS))
new /datum/wound/internal_bleeding(min(brute - 15, 15), src)
owner.custom_pain("You feel something rip in your [display_name]!", 1)
@@ -269,7 +269,7 @@ RU TGMC EDIT */
owner.updatehealth()
return update_icon()
var/obj/item/clothing/worn_helmet = owner.head
- if(body_part == HEAD && worn_helmet && (worn_helmet.flags_armor_features & ARMOR_NO_DECAP)) //Early return if the body part is a head but target is wearing decap-protecting headgear.
+ if(body_part == HEAD && worn_helmet && (worn_helmet.armor_features_flags & ARMOR_NO_DECAP)) //Early return if the body part is a head but target is wearing decap-protecting headgear.
if(updating_health)
owner.updatehealth()
return update_icon()
@@ -558,51 +558,51 @@ Note that amputating the affected organ does in fact remove the infection from t
remove_limb_flags(LIMB_BLEEDING)
-/datum/limb/proc/set_limb_flags(flags_to_set)
- if(flags_to_set == limb_status)
+/datum/limb/proc/set_limb_flags(to_set_flags)
+ if(to_set_flags == limb_status)
return
. = limb_status
- var/flags_to_change = . & ~flags_to_set //Flags to remove
- if(flags_to_change)
- remove_limb_flags(flags_to_change)
- flags_to_change = flags_to_set & ~(flags_to_set & .) //Flags to add
- if(flags_to_change)
- add_limb_flags(flags_to_change)
+ var/to_change_flags = . & ~to_set_flags //Flags to remove
+ if(to_change_flags)
+ remove_limb_flags(to_change_flags)
+ to_change_flags = to_set_flags & ~(to_set_flags & .) //Flags to add
+ if(to_change_flags)
+ add_limb_flags(to_change_flags)
-/datum/limb/proc/remove_limb_flags(flags_to_remove)
- if(!(limb_status & flags_to_remove))
+/datum/limb/proc/remove_limb_flags(to_remove_flags)
+ if(!(limb_status & to_remove_flags))
return //Nothing old to remove.
. = limb_status
- limb_status &= ~flags_to_remove
- var/changed_flags = . & flags_to_remove
+ limb_status &= ~to_remove_flags
+ var/changed_flags = . & to_remove_flags
if((changed_flags & LIMB_DESTROYED))
SEND_SIGNAL(src, COMSIG_LIMB_UNDESTROYED)
-/datum/limb/proc/add_limb_flags(flags_to_add)
- if(flags_to_add == (limb_status & flags_to_add))
+/datum/limb/proc/add_limb_flags(to_add_flags)
+ if(to_add_flags == (limb_status & to_add_flags))
return //Nothing new to add.
. = limb_status
- limb_status |= flags_to_add
- var/changed_flags = ~(. & flags_to_add) & flags_to_add
+ limb_status |= to_add_flags
+ var/changed_flags = ~(. & to_add_flags) & to_add_flags
if((changed_flags & LIMB_DESTROYED))
SEND_SIGNAL(src, COMSIG_LIMB_DESTROYED)
-/datum/limb/foot/remove_limb_flags(flags_to_remove)
+/datum/limb/foot/remove_limb_flags(to_remove_flags)
. = ..()
if(isnull(.))
return
- var/changed_flags = . & flags_to_remove
+ var/changed_flags = . & to_remove_flags
if((changed_flags & LIMB_DESTROYED) && owner.has_legs())
REMOVE_TRAIT(owner, TRAIT_LEGLESS, TRAIT_LEGLESS)
-/datum/limb/foot/add_limb_flags(flags_to_add)
+/datum/limb/foot/add_limb_flags(to_add_flags)
. = ..()
if(isnull(.))
return
- var/changed_flags = ~(. & flags_to_add) & flags_to_add
+ var/changed_flags = ~(. & to_add_flags) & to_add_flags
if((changed_flags & LIMB_DESTROYED) && !owner.has_legs())
ADD_TRAIT(owner, TRAIT_LEGLESS, TRAIT_LEGLESS)
@@ -668,6 +668,11 @@ Note that amputating the affected organ does in fact remove the infection from t
return limb_name
return null
+///Amputates the limb in the specified limb zone
+/mob/living/carbon/human/proc/amputate_limb(limb_zone)
+ var/datum/limb/limb_to_drop = get_limb(limb_zone)
+ limb_to_drop?.droplimb(TRUE, TRUE)
+
//Handles dismemberment
/datum/limb/proc/droplimb(amputation, delete_limb = FALSE)
if(limb_status & LIMB_DESTROYED)
@@ -922,23 +927,19 @@ Note that amputating the affected organ does in fact remove the infection from t
// todo this proc sucks lmao just redo it from scratch
//for arms and hands
/datum/limb/proc/process_grasp(obj/item/c_hand, hand_name)
- if (!c_hand)
+ if(!c_hand)
return
if(!is_usable())
- owner.dropItemToGround(c_hand)
- owner.emote("me", 1, "drop[owner.p_s()] what [owner.p_they()] [owner.p_were()] holding in [owner.p_their()] [hand_name], [owner.p_their()] [display_name] unresponsive!")
- return
- if(is_broken())
- if(prob(15))
- owner.dropItemToGround(c_hand)
- var/emote_scream = pick("screams in pain and", "lets out a sharp cry and", "cries out and")
- owner.emote("me", 1, "[(owner.species && owner.species.species_flags & NO_PAIN) ? "" : emote_scream ] drops what [owner.p_they()] [owner.p_were()] holding in their [hand_name]!")
- return
- if(is_malfunctioning())
- if(prob(20))
- owner.dropItemToGround(c_hand)
- owner.emote("me", 1, "drops what they were holding, [owner.p_their()] [hand_name] malfunctioning!")
+ if(owner.dropItemToGround(c_hand))
+ owner.emote("me", 1, "drops what [owner.p_they()] [owner.p_were()] holding in [owner.p_their()] [hand_name], [owner.p_their()] [display_name] unresponsive!")
+ else if(is_broken() && prob(15))
+ if(owner.dropItemToGround(c_hand))
+ var/emote_scream = owner.species?.species_flags & NO_PAIN ? "" : pick("screams in pain and ", "lets out a sharp cry and ", "cries out and ")
+ owner.emote("me", 1, "[emote_scream]drops what [owner.p_they()] [owner.p_were()] holding in [owner.p_their()] [hand_name]!")
+ else if(is_malfunctioning() && prob(20))
+ if(owner.dropItemToGround(c_hand))
+ owner.emote("me", 1, "drops what [owner.p_they()] [owner.p_were()] holding, [owner.p_their()] [hand_name] malfunctioning!")
new /datum/effect_system/spark_spread(owner, owner, 5, 0, TRUE, 1 SECONDS)
///applies a splint stack to this limb. should probably be more generic but #notit
diff --git a/code/modules/organs/organ_internal.dm b/code/modules/organs/organ_internal.dm
index ea5469ecdb3ca..f78e8d1432b31 100644
--- a/code/modules/organs/organ_internal.dm
+++ b/code/modules/organs/organ_internal.dm
@@ -42,7 +42,7 @@
return
var/mob/living/carbon/human/human = carbon_mob
var/datum/limb/limb = human.get_limb(parent_limb)
- LAZYDISTINCTADD(limb.internal_organs, src)
+ LAZYOR(limb.internal_organs, src)
///Signal handler to prevent hard del
/datum/internal_organ/proc/clean_owner()
@@ -50,7 +50,7 @@
owner = null
/datum/internal_organ/proc/take_damage(amount, silent= FALSE)
- if(SSticker.mode?.flags_round_type & MODE_NO_PERMANENT_WOUNDS)
+ if(SSticker.mode?.round_type_flags & MODE_NO_PERMANENT_WOUNDS)
return
if(amount <= 0)
heal_organ_damage(-amount)
diff --git a/code/modules/organs/wound.dm b/code/modules/organs/wound.dm
index 1b2c9a05c2786..50d6b60e91876 100644
--- a/code/modules/organs/wound.dm
+++ b/code/modules/organs/wound.dm
@@ -73,7 +73,7 @@
parent_limb.createwound(CUT, 0.1)
if(!quickclot || !thwei) //Quickclot/thwei stops bleeding, magic!
- parent_limb.owner.blood_volume = max(0, parent_limb.owner.blood_volume - damage/30)
+ parent_limb.owner.set_blood_volume(parent_limb.owner.blood_volume - damage/30)
if(prob(1))
parent_limb.owner.custom_pain("You feel a stabbing pain in your [parent_limb.display_name]!", 1)
diff --git a/code/modules/paperwork/beginner_tutorials.dm b/code/modules/paperwork/beginner_tutorials.dm
new file mode 100644
index 0000000000000..61235612899a2
--- /dev/null
+++ b/code/modules/paperwork/beginner_tutorials.dm
@@ -0,0 +1,747 @@
+//Each beginner loadout in quick_load_beginners.dm has a instruction pamphlet.
+
+/obj/item/paper/tutorial/beginner_rifleman
+ name = "Rifleman Tutorial"
+ info = {"As a rifleman, you are suited for virtually all theatres of combat.\
+ Your AR-12 assault rifle is accurate and effective at all ranges, and its powerful underbarrel grenade launcher poses even further danger to mid-range threats.\
+ Inside your backpack is a box of flares to refill your flare pouch, gauze and ointment for brute (slashes) and burn (acid) wounds respectively,\
+ and backup magazines for your AR 12.\
+ Your belt contains backup magazines for your AR-12, while your body armor contains additional grenades to reload your underbarrel grenade launcher.\
+ Your left pocket contains a flare gun holster and several flares.\
+ Your right pocket contains a first aid kit, with Bicaridine (heals brute damage), Kelotane (heals burn damage), Tramadol (a painkiller),\
+ Tricordrazine (heals all damage, but slowly), and Dylovene (heals toxin damage), as well as splints and inaprovaline.\
+ Your helmet contains two protein bars, in case you get hungry, and your boots contain a standard-issue combat knife for clearing weeds or breaking things.