[display_name]") + camera_operator.screen += perspective_display + +/mob/proc/handoff_cmtv() + set name = "Handoff CMTV" + set category = "OOC.CMTV" + + SScmtv.handoff(src, "verb") + +/client/proc/change_observed_player() + set name = "Change Observed Player" + set category = "Admin.CMTV" + + if(!SScmtv.online()) + return to_chat(src, SPAN_WARNING("CMTV is currently offline!")) + + var/mob/selected_mob = tgui_input_list(src, "Who should be selected for observation?", "CMTV Target", GLOB.player_list) + if(!selected_mob) + return + + var/how_long = tgui_input_number(src, "How long should we stay on this perspective (in seconds)? Set 0 to not force a length.", "CMTV Length", default = 60) + + message_admins("CMTV: [key_name(src)] swapped the perspective to [key_name_admin(selected_mob)].") + SScmtv.change_observed_mob(selected_mob, set_showtime = how_long) + +/datum/config_entry/string/cmtv_ckey + protection = CONFIG_ENTRY_LOCKED + +/datum/config_entry/string/cmtv_link + protection = CONFIG_ENTRY_LOCKED + +/datum/config_entry/string/cmtv_api + protection = CONFIG_ENTRY_LOCKED + +/datum/config_entry/string/cmtv_api_key + protection = CONFIG_ENTRY_HIDDEN | CONFIG_ENTRY_LOCKED + +/atom/movable/screen/cmtv + plane = ESCAPE_MENU_PLANE + clear_with_screen = FALSE + icon_state = "blank" + + screen_loc = "CENTER-5,NORTH-1.5" + + appearance_flags = RESET_COLOR|RESET_TRANSFORM|NO_CLIENT_COLOR|PIXEL_SCALE + + maptext_height = 400 + maptext_width = 400 + +/datum/action/stop_cmtv + name = "Stop CMTV" + action_icon_state = "twitch_observe" + +/datum/action/stop_cmtv/action_activate() + . = ..() + + SScmtv.handoff(owner, "action") + +#undef PRIORITY_FIRST +#undef PRIORITY_SECOND +#undef PRIORITY_THIRD diff --git a/code/controllers/subsystem/communications.dm b/code/controllers/subsystem/communications.dm index f4d25df23b71..94e42a8ffd12 100644 --- a/code/controllers/subsystem/communications.dm +++ b/code/controllers/subsystem/communications.dm @@ -81,11 +81,13 @@ Radiochat range: 1441 to 1489 (most devices refuse to be tune to other frequency //WY Channels (1230-1249) #define WY_FREQ 1231 -#define PMC_CMD_FREQ 1232 -#define PMC_FREQ 1233 -#define PMC_ENGI_FREQ 1234 -#define PMC_MED_FREQ 1235 -#define PMC_CCT_FREQ 1236 +#define WY_PUB_FREQ 1232 +#define WY_SEC_FREQ 1233 +#define PMC_CMD_FREQ 1234 +#define PMC_FREQ 1235 +#define PMC_ENGI_FREQ 1236 +#define PMC_MED_FREQ 1237 +#define PMC_CCT_FREQ 1238 #define WY_WO_FREQ 1239 //UPP Channels (1250-1269) @@ -200,6 +202,8 @@ GLOBAL_LIST_INIT(radiochannels, list( RADIO_CHANNEL_HYPERDYNE = HDC_FREQ, RADIO_CHANNEL_WY = WY_FREQ, + RADIO_CHANNEL_WY_PUB = WY_PUB_FREQ, + RADIO_CHANNEL_WY_SEC = WY_SEC_FREQ, RADIO_CHANNEL_PMC_GEN = PMC_FREQ, RADIO_CHANNEL_PMC_CMD = PMC_CMD_FREQ, RADIO_CHANNEL_PMC_ENGI = PMC_ENGI_FREQ, @@ -240,7 +244,7 @@ GLOBAL_LIST_INIT(radiochannels, list( #define CLF_FREQS list(CLF_FREQ, CLF_CMD_FREQ, CLF_ENGI_FREQ, CLF_MED_FREQ, CLF_CCT_FREQ) // PMC Frequencies -#define PMC_FREQS list(PMC_FREQ, PMC_CMD_FREQ, PMC_ENGI_FREQ, PMC_MED_FREQ, PMC_CCT_FREQ, WY_WO_FREQ, WY_FREQ) +#define PMC_FREQS list(PMC_FREQ, PMC_CMD_FREQ, PMC_ENGI_FREQ, PMC_MED_FREQ, PMC_CCT_FREQ, WY_WO_FREQ, WY_FREQ, WY_PUB_FREQ, WY_SEC_FREQ) //Listening Device Frequencies #define BUG_FREQS list(BUG_A_FREQ, BUG_B_FREQ) @@ -278,7 +282,8 @@ GLOBAL_LIST_INIT(radiochannels, list( SUBSYSTEM_DEF(radio) name = "radio" - flags = SS_NO_FIRE|SS_NO_INIT + wait = 30 SECONDS + flags = SS_KEEP_TIMING|SS_NO_INIT init_order = SS_INIT_RADIO var/list/datum/radio_frequency/frequencies = list() @@ -286,6 +291,13 @@ SUBSYSTEM_DEF(radio) var/list/tcomm_machines_ground = list() var/list/tcomm_machines_almayer = list() + /// The last cached result for get_available_tcomm_zs(COMM_FREQ) + var/list/last_command_zs = list() + /// The current coms clarity per faction for Zs without coms (otherwise announcement_max_clarity config value) + var/list/faction_coms_clarity = list(FACTION_MARINE = 100) + /// The currently unsolved encryption_sequences for a faction (only the ones listed here decay) + var/list/faction_coms_codes = list(FACTION_MARINE = list()) + var/static/list/freq_to_span = list( "[COMM_FREQ]" = "comradio", "[AI_FREQ]" = "airadio", @@ -297,6 +309,8 @@ SUBSYSTEM_DEF(radio) "[JTAC_FREQ]" = "jtacradio", "[INTEL_FREQ]" = "intelradio", "[WY_FREQ]" = "wyradio", + "[WY_PUB_FREQ]" = "wypubradio", + "[WY_SEC_FREQ]" = "wysecradio", "[VAI_FREQ]" = "vairadio", "[RMC_FREQ]" = "rmcradio", "[CIA_FREQ]" = "ciaradio", @@ -332,6 +346,24 @@ SUBSYSTEM_DEF(radio) "[HDC_FREQ]" = "hdcradio", ) +/datum/controller/subsystem/radio/fire(resumed) + var/decay_rate = CONFIG_GET(number/announcement_clarity_decay) + var/clarity_min = CONFIG_GET(number/announcement_min_clarity) + var/oldest_time = world.time - ((100 - clarity_min) / decay_rate * wait) + + for(var/faction in faction_coms_codes) + // Clean out any old codes (Assumption: They're ordered) + var/list/codes = faction_coms_codes[faction] + var/index + for(index in 1 to length(codes)) + var/datum/encryption_sequence/current = codes[index] + if(current.time >= oldest_time) + break + codes.Cut(1, index) + + // Decay current clarity + faction_coms_clarity[faction] = max(faction_coms_clarity[faction] - decay_rate, clarity_min) + /datum/controller/subsystem/radio/proc/add_object(obj/device as obj, new_frequency as num, filter = null as text|null) var/f_text = num2text(new_frequency) var/datum/radio_frequency/frequency = frequencies[f_text] @@ -368,8 +400,8 @@ SUBSYSTEM_DEF(radio) return frequency +///Returns lists of Z levels that have comms /datum/controller/subsystem/radio/proc/get_available_tcomm_zs(frequency) - //Returns lists of Z levels that have comms var/list/target_zs = SSmapping.levels_by_trait(ZTRAIT_ADMIN) var/list/extra_zs = SSmapping.levels_by_trait(ZTRAIT_AWAY) if(length(extra_zs)) @@ -383,9 +415,14 @@ SUBSYSTEM_DEF(radio) target_zs += SSmapping.levels_by_trait(ZTRAIT_MARINE_MAIN_SHIP) target_zs += SSmapping.levels_by_trait(ZTRAIT_RESERVED) break - SEND_SIGNAL(src, COMSIG_SSRADIO_GET_AVAILABLE_TCOMMS_ZS, target_zs) + if(frequency == COMM_FREQ) + last_command_zs = target_zs return target_zs +/// Call this when a cached frequency changed (e.g. tcoms going down/up) +/datum/controller/subsystem/radio/proc/update_cache() + get_available_tcomm_zs(COMM_FREQ) + /datum/controller/subsystem/radio/proc/add_tcomm_machine(obj/machine) if(is_ground_level(machine.z)) addToListNoDupe(tcomm_machines_ground, machine) diff --git a/code/controllers/subsystem/dcs.dm b/code/controllers/subsystem/dcs.dm index 104c3eef31d3..10cc0112aa11 100644 --- a/code/controllers/subsystem/dcs.dm +++ b/code/controllers/subsystem/dcs.dm @@ -40,7 +40,7 @@ PROCESSING_SUBSYSTEM_DEF(dcs) value = arguments[key] if(!(istext(key) || isnum(key))) key = REF(key) - key = "[key]" // Key is stringified so numbers dont break things + key = "[key]" // Key is stringified so numbers don't break things if(!isnull(value)) if(!(istext(value) || isnum(value))) value = REF(value) diff --git a/code/controllers/subsystem/hijack.dm b/code/controllers/subsystem/hijack.dm index 66f2968335fa..c027f14d664e 100644 --- a/code/controllers/subsystem/hijack.dm +++ b/code/controllers/subsystem/hijack.dm @@ -163,6 +163,11 @@ SUBSYSTEM_DEF(hijack) current_run_progress_additive = 0 current_run_progress_multiplicative = 1 +///Called when the dropship has been called by the xenos +/datum/controller/subsystem/hijack/proc/call_shuttle() + hijack_status = HIJACK_OBJECTIVES_SHIP_INBOUND + SEND_GLOBAL_SIGNAL(COMSIG_GLOB_HIJACK_INBOUND) + ///Called when the xeno dropship crashes into the Almayer and announces the current status of various objectives to marines /datum/controller/subsystem/hijack/proc/announce_status_on_crash() var/message = "" @@ -218,13 +223,13 @@ SUBSYSTEM_DEF(hijack) switch(announce) if(1) - marine_announcement("Emergency fuel replenishment is at 25 percent. Lifeboat early launch is now available. Recommendation: wait for 100% fuel for safety purposes.[marine_warning_areas ? "\nTo increase speed, restore power to the following areas: [marine_warning_areas]" : " All fueling areas operational."]", HIJACK_ANNOUNCE) + marine_announcement("Emergency fuel replenishment is at 25%. Lifeboat early launch is now available. Recommendation: wait for 100% fuel for safety purposes.[marine_warning_areas ? "\nTo increase speed, restore power to the following areas: [marine_warning_areas]" : " All fueling areas operational."]", HIJACK_ANNOUNCE) if(2) - marine_announcement("Emergency fuel replenishment is at 50 percent.[marine_warning_areas ? "\nTo increase speed, restore power to the following areas: [marine_warning_areas]" : " All fueling areas operational."]", HIJACK_ANNOUNCE) + marine_announcement("Emergency fuel replenishment is at 50%.[marine_warning_areas ? "\nTo increase speed, restore power to the following areas: [marine_warning_areas]" : " All fueling areas operational."]", HIJACK_ANNOUNCE) if(3) - marine_announcement("Emergency fuel replenishment is at 75 percent.[marine_warning_areas ? "\nTo increase speed, restore power to the following areas: [marine_warning_areas]" : " All fueling areas operational."]", HIJACK_ANNOUNCE) + marine_announcement("Emergency fuel replenishment is at 75%.[marine_warning_areas ? "\nTo increase speed, restore power to the following areas: [marine_warning_areas]" : " All fueling areas operational."]", HIJACK_ANNOUNCE) if(4) - marine_announcement("Emergency fuel replenishment is at 100 percent. Safe utilization of lifeboats and pods is now possible.", HIJACK_ANNOUNCE) + marine_announcement("Emergency fuel replenishment is at 100%. Safe utilization of lifeboats and pods is now possible.", HIJACK_ANNOUNCE) if(!admin_sd_blocked) addtimer(CALLBACK(src, PROC_REF(unlock_self_destruct)), 8 SECONDS) @@ -301,7 +306,7 @@ SUBSYSTEM_DEF(hijack) sd_unlocked = TRUE marine_announcement("Fuel reserves full. Manual detonation of fuel reserves by overloading the on-board fusion reactors now possible.", HIJACK_ANNOUNCE) -/datum/controller/subsystem/hijack/proc/on_generator_overload(obj/structure/machinery/power/reactor/source, new_overloading) +/datum/controller/subsystem/hijack/proc/on_generator_overload(obj/structure/machinery/power/power_generator/reactor/source, new_overloading) SIGNAL_HANDLER if(!generator_ever_overloaded) @@ -352,6 +357,7 @@ SUBSYSTEM_DEF(hijack) /datum/controller/subsystem/hijack/proc/detonate_sd() set waitfor = FALSE sd_detonated = TRUE + SSticker?.roundend_check_paused = TRUE var/creak_picked = pick('sound/effects/creak1.ogg', 'sound/effects/creak2.ogg', 'sound/effects/creak3.ogg') for(var/mob/current_mob as anything in GLOB.mob_list) var/turf/current_turf = get_turf(current_mob) @@ -421,10 +427,11 @@ SUBSYSTEM_DEF(hijack) sleep(0.5 SECONDS) - if(SSticker.mode) - SSticker.mode.check_win() - if(!SSticker.mode) //Just a safety, just in case a mode isn't running, somehow. + SSticker?.roundend_check_paused = FALSE + if(SSticker?.mode) + SSticker.mode.check_win() + else //Just a safety, just in case a mode isn't running, somehow. to_world(SPAN_ROUNDBODY("Resetting in 30 seconds!")) sleep(30 SECONDS) log_game("Rebooting due to nuclear detonation.") diff --git a/code/controllers/subsystem/inactivity.dm b/code/controllers/subsystem/inactivity.dm index c3183bd8f502..ef35b0e65be1 100644 --- a/code/controllers/subsystem/inactivity.dm +++ b/code/controllers/subsystem/inactivity.dm @@ -9,25 +9,36 @@ SUBSYSTEM_DEF(inactivity) var/list/client/current_run = list() -/datum/controller/subsystem/inactivity/fire(resumed = FALSE) - if(list_clear_nulls(GLOB.clients)) - debug_log("Removed nulls from GLOB.clients!") - if(list_clear_nulls(GLOB.player_list)) - debug_log("Removed nulls from GLOB.player_list!") - if(list_clear_nulls(GLOB.new_player_list)) - debug_log("Removed nulls from GLOB.new_player_list!") - - if(!CONFIG_GET(flag/kick_inactive)) - return +/datum/controller/subsystem/inactivity/stat_entry(msg) + msg = "Clients:[length(GLOB.clients)] Players:[length(GLOB.player_list)] NewPlayers:[length(GLOB.new_player_list)]" + return ..() +/datum/controller/subsystem/inactivity/fire(resumed = FALSE) if(!resumed) + if(list_clear_nulls(GLOB.clients)) + debug_log("Removed nulls from GLOB.clients!") + if(list_clear_nulls(GLOB.player_list)) + debug_log("Removed nulls from GLOB.player_list!") + if(list_clear_nulls(GLOB.new_player_list)) + debug_log("Removed nulls from GLOB.new_player_list!") + + if(!CONFIG_GET(flag/kick_inactive)) + return + current_run = GLOB.clients.Copy() while(length(current_run)) var/client/current = current_run[length(current_run)] current_run.len-- + if(QDELETED(current)) + if(MC_TICK_CHECK) + return + continue + if(CLIENT_IS_AFK_SAFE(current)) //Skip admins. + if(MC_TICK_CHECK) + return continue if(current.is_afk(INACTIVITY_KICK)) diff --git a/code/controllers/subsystem/influxmcstats.dm b/code/controllers/subsystem/influxmcstats.dm index a1bf171d81a3..ed0677f26471 100644 --- a/code/controllers/subsystem/influxmcstats.dm +++ b/code/controllers/subsystem/influxmcstats.dm @@ -42,6 +42,6 @@ SUBSYSTEM_DEF(influxmcstats) subsystem_name_cache[SS.type] = "SS[get_last_path_element.group[1]]" var/SSname = subsystem_name_cache[SS.type] if(!SSname) - stack_trace("Influx MC Stats couldnt name a subsystem, type=[SS.type]") + stack_trace("Influx MC Stats couldn't name a subsystem, type=[SS.type]") continue SSinfluxdriver.enqueue_stats("sstimings", list("ss" = SSname), list("cost" = SS.cost, "tick_overrun" = SS.tick_overrun, "tick_usage" = SS.tick_usage, "wait" = SS.wait)) diff --git a/code/controllers/subsystem/ipcheck.dm b/code/controllers/subsystem/ipcheck.dm new file mode 100644 index 000000000000..191113a8cc54 --- /dev/null +++ b/code/controllers/subsystem/ipcheck.dm @@ -0,0 +1,301 @@ +SUBSYSTEM_DEF(ipcheck) + name = "IPCheck" + flags = SS_NO_FIRE | SS_NO_INIT + + /// Cache for previously queried IP addresses and those stored in the database + var/list/datum/ip_intel/cached_queries = list() + +/// The ip intel for a given address +/datum/ip_intel + var/result + var/address + var/date + +/datum/controller/subsystem/ipcheck/proc/is_enabled() + return !!length(CONFIG_GET(string/ipcheck_base)) && !!length(CONFIG_GET(string/ipcheck_apikey)) + +/datum/controller/subsystem/ipcheck/proc/get_address_intel_state(address, probability_override) + if (!is_enabled()) + return IPCHECK_GOOD_IP + var/datum/ip_intel/intel = query_address(address) + if(isnull(intel)) + stack_trace("query_address did not return an ip intel response") + return IPCHECK_UNKNOWN_INTERNAL_ERROR + + var/check_probability = CONFIG_GET(number/ipcheck_rating_bad) + if(intel.result == check_probability) + return IPCHECK_BAD_IP + + return IPCHECK_GOOD_IP + +/datum/controller/subsystem/ipcheck/proc/query_address(address, allow_cached = TRUE) + if (!is_enabled()) + return + if(allow_cached && fetch_cached_ip_intel(address)) + return cached_queries[address] + + var/query_base = "https://[CONFIG_GET(string/ipcheck_base)]/" + var/query = "[query_base]?q=[address]&key=[CONFIG_GET(string/ipcheck_apikey)]" + + var/datum/http_request/request = new + request.prepare(RUSTG_HTTP_METHOD_GET, query) + request.execute_blocking() + var/datum/http_response/response = request.into_response() + + var/list/data + try + data = json_decode(response.body) + catch + log_debug("IPCHECK: Error while decoding response. [response.body]") + return + + var/datum/ip_intel/intel = new + intel.result = data["is_vpn"] + if(isnull(intel.result)) + return + + intel.date = time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss") + intel.address = address + + cached_queries[address] = intel + add_intel_to_database(intel) + + return intel + +/datum/entity/intel + var/ip + var/intel + var/date + +/datum/entity_meta/intel + entity_type = /datum/entity/intel + table_name = "intel" + field_types = list( + "ip" = DB_FIELDTYPE_STRING_SMALL, + "intel" = DB_FIELDTYPE_INT, + "date" = DB_FIELDTYPE_DATE, + ) + +/datum/view_record/intel + var/ip + var/intel + var/date + +/datum/entity_view_meta/intel + root_record_type = /datum/entity/intel + destination_entity = /datum/view_record/intel + fields = list( + "ip", + "intel", + "date", + ) + +/datum/controller/subsystem/ipcheck/proc/add_intel_to_database(datum/ip_intel/intel) + set waitfor = FALSE //no need to make the client connection wait for this step. + + WAIT_DB_READY + + var/datum/entity/intel/query = DB_ENTITY(/datum/entity/intel) + query.ip = intel.address + query.intel = intel.result + query.date = intel.date + + query.save() + query.detach() + +/datum/controller/subsystem/ipcheck/proc/fetch_cached_ip_intel(address) + if(!SSentity_manager.ready) + return + + var/ipcheck_cache_length = CONFIG_GET(number/ipcheck_cache_length) + + var/filter + if(ipcheck_cache_length > 1) + var/length_time = time2text(world.realtime - (ipcheck_cache_length * 24 HOURS), "YYYY-MM-DD hh:mm:ss") + filter = DB_AND( + DB_COMP("ip", DB_EQUALS, address), + DB_COMP("date", DB_GREATER, length_time) + ) + else + filter = DB_COMP("ip", DB_EQUALS, address) + + var/list/datum/view_record/intel/reports = DB_VIEW(/datum/view_record/intel, filter) + if(!length(reports)) + return null + + var/datum/view_record/intel/report = reports[1] + + var/datum/ip_intel/intel = new + intel.result = report.intel + intel.date = report.date + intel.address = address + + cached_queries[address] = intel + return TRUE + +/datum/controller/subsystem/ipcheck/proc/is_exempt(client/player) + if(player.admin_holder) + return TRUE + + var/exempt_living_playtime = CONFIG_GET(number/ipcheck_exempt_playtime_living) + if(exempt_living_playtime > 0) + var/living_minutes = player.get_total_xeno_playtime() + player.get_total_human_playtime() + if(living_minutes >= exempt_living_playtime) + return TRUE + + return FALSE + +/datum/entity/vpn_whitelist + var/ckey + var/admin_ckey + +/datum/entity_meta/vpn_whitelist + entity_type = /datum/entity/vpn_whitelist + table_name = "vpn_whitelist" + field_types = list( + "ckey" = DB_FIELDTYPE_STRING_LARGE, + "admin_ckey" = DB_FIELDTYPE_STRING_LARGE, + ) + +/datum/view/vpn_whitelist + var/id + var/ckey + var/admin_ckey + +/datum/entity_view_meta/vpn_whitelist + root_record_type = /datum/entity/vpn_whitelist + destination_entity = /datum/view/vpn_whitelist + fields = list( + "id", + "ckey", + "admin_ckey", + ) + +/datum/controller/subsystem/ipcheck/proc/is_whitelisted(ckey) + var/list/datum/view/vpn_whitelist/whitelists = DB_VIEW(/datum/view/vpn_whitelist, DB_COMP("ckey", DB_EQUALS, ckey)) + return !!length(whitelists) + +/client/proc/ipcheck_allow() + set name = "Whitelist Player VPN" + set desc = "Allow a player to connect even if they are using a VPN." + set category = "Admin.VPN" + + if(!CLIENT_HAS_RIGHTS(src, R_BAN)) + return + + var/whitelist_ckey = ckey(tgui_input_text(src, "What's the ckey to be whitelisted?", "Whitelist VPN")) + if(!whitelist_ckey) + return + + if (!SSipcheck.is_enabled()) + to_chat(src, "The ipcheck system is not currently enabled but you can still edit the whitelists.") + if(SSipcheck.is_whitelisted(whitelist_ckey)) + to_chat(src, "Player is already whitelisted.") + return + + var/datum/entity/vpn_whitelist/whitelist = DB_ENTITY(/datum/entity/vpn_whitelist) + whitelist.ckey = whitelist_ckey + whitelist.admin_ckey = ckey + + whitelist.save() + whitelist.sync() + + message_admins("IPCHECK: [key_name_admin(src)] has whitelisted '[whitelist_ckey]'") + +/client/proc/ipcheck_revoke() + set name = "Dewhitelist Player VPN" + set desc = "Revoke a player's VPN whitelist." + set category = "Admin.VPN" + + if(!CLIENT_HAS_RIGHTS(src, R_BAN)) + return + + var/dewhitelist_ckey = ckey(tgui_input_text(src, "What's the ckey to be de-whitelisted?", "Dewhitelist VPN")) + if(!dewhitelist_ckey) + return + + + if (!SSipcheck.is_enabled()) + to_chat(src, "The ipcheck system is not currently enabled but you can still edit the whitelists.") + if(!SSipcheck.is_whitelisted(dewhitelist_ckey)) + to_chat(src, "Player is not whitelisted.") + return + + var/list/datum/view/vpn_whitelist/whitelists = DB_VIEW(/datum/view/vpn_whitelist, DB_COMP("ckey", DB_EQUALS, dewhitelist_ckey)) + if(!length(whitelists)) + to_chat(src, "Player is not whitelisted.") + return + + for(var/datum/view/vpn_whitelist/whitelist in whitelists) + var/datum/entity/vpn_whitelist/db_whitelist = DB_ENTITY(/datum/entity/vpn_whitelist, whitelist.id) + db_whitelist.delete() + + message_admins("IPCHECK: [key_name_admin(src)] has revoked the VPN whitelist for '[dewhitelist_ckey]'") + +/client/proc/check_ip_vpn() + set waitfor = FALSE + + WAIT_DB_READY + + if(!player_entity) + player_entity = setup_player_entity(ckey) + + if(!SSipcheck.is_enabled(src)) + return + + if(SSipcheck.is_exempt(src) || SSipcheck.is_whitelisted(ckey)) + return + + if(check_localhost_status()) + return + + var/static/queries_today + if(isnull(queries_today)) + var/list/datum/view_record/intel/intels = DB_VIEW(/datum/view_record/intel, DB_COMP("date", DB_GREATER, time2text(world.realtime - 24 HOURS, "YYYY-MM-DD hh:mm:ss"))) + queries_today = length(intels) + + var/day_limit = CONFIG_GET(number/ipcheck_rate_day) + + if(queries_today == day_limit) + message_admins("IPCheck has been disabled due to exceeding the day ratelimit.") + queries_today++ + + if(queries_today > day_limit) + log_access("IPCHECK: [ckey] unable to be checked due to ratelimiting.") + if(CONFIG_GET(flag/ipcheck_reject_rate_limited)) + to_chat_immediate(src, SPAN_BOLDNOTICE("Your connection cannot be processed at this time.")) + qdel(src) + return TRUE + return + + var/intel_state = SSipcheck.get_address_intel_state(address) + queries_today++ + + var/connection_rejected = FALSE + switch(intel_state) + if(IPCHECK_BAD_IP) + if(CONFIG_GET(flag/ipcheck_reject_bad)) + log_access("IPCHECK: [ckey] ([address]) was flagged as a VPN and disconnected.") + to_chat_immediate(src, SPAN_BOLDNOTICE("Your connection has been detected as a VPN.")) + connection_rejected = TRUE + else + log_access("IPCHECK: [ckey] ([address]) was flagged as a VPN and allowed to connect.") + message_admins("IPCHECK: [key_name_admin(src)] has been flagged as a VPN.") + + if(IPCHECK_UNKNOWN_INTERNAL_ERROR) + if(CONFIG_GET(flag/ipcheck_reject_unknown)) + log_access("IPCHECK: [ckey] ([address]) unable to be checked due to an error and disconnected.") + to_chat_immediate(src, SPAN_BOLDNOTICE("Your connection cannot be processed at this time.")) + connection_rejected = TRUE + else + log_access("IPCHECK: [ckey] ([address]) unable to be checked due to an error and was allowed to connect.") + message_admins("IPCHECK: [key_name_admin(src)] was unable to be checked due to an error.") + + if(!connection_rejected) + return + + var/message_string = "Your connection has been rejected at this time: [CONFIG_GET(string/ipcheck_fail_message)]" + + to_chat_immediate(src, SPAN_USERDANGER(message_string)) + qdel(src) + return TRUE diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index e99b5ad917ee..38d793a63f0e 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -407,11 +407,6 @@ SUBSYSTEM_DEF(mapping) used_turfs.Cut() reserve_turfs(clearing, await = TRUE) -/datum/controller/subsystem/mapping/proc/reg_in_areas_in_z(list/areas) - for(var/B in areas) - var/area/A = B - A.reg_in_areas_in_z() - /// Takes a z level datum, and tells the mapping subsystem to manage it /// Also handles things like plane offset generation, and other things that happen on a z level to z level basis /datum/controller/subsystem/mapping/proc/manage_z_level(datum/space_level/new_z, filled_with_space, contain_turfs = TRUE) diff --git a/code/controllers/subsystem/minimap.dm b/code/controllers/subsystem/minimap.dm index 17dc3de112dd..88bab5528009 100644 --- a/code/controllers/subsystem/minimap.dm +++ b/code/controllers/subsystem/minimap.dm @@ -1,5 +1,12 @@ -#define CANVAS_COOLDOWN_TIME 4 MINUTES -#define FLATTEN_MAP_COOLDOWN_TIME 3 MINUTES +/// range that we can remove labels when we click near them with the removal tool +#define LABEL_REMOVE_RANGE 20 +/// How often a tacmap can be submitted +#define CANVAS_COOLDOWN_TIME 3 MINUTES +/// List of minimap_flag=world.time for a faction wide cooldown on tacmap submissions +GLOBAL_VAR_INIT(faction_tacmap_cooldown, alist()) // TODO: Change to GLOBAL_ALIST_EMPTY +///A player needs to be unbanned from ALL these roles in order to be able to use the minimap drawing tool +GLOBAL_LIST_INIT(roles_allowed_minimap_draw, list(JOB_SQUAD_LEADER, JOB_SQUAD_TEAM_LEADER, JOB_SO, JOB_XO, JOB_CO)) +GLOBAL_PROTECT(roles_allowed_minimap_draw) /** * # Minimaps subsystem @@ -9,16 +16,20 @@ * Minimaps are a low priority subsystem that fires relatively often * the Initialize proc for this subsystem draws the maps as one of the last initializing subsystems * - * Fire() for this subsystem doesn't actually update anything, and purely just reapplies the overlays that it already tracks + * Fire() for this subsystem doens't actually updates anything, and purely just reapplies the overlays that it already tracks * actual updating of marker locations is handled by [/datum/controller/subsystem/minimaps/proc/on_move] * and zlevel changes are handled in [/datum/controller/subsystem/minimaps/proc/on_z_change] * tracking of the actual atoms you want to be drawn on is done by means of datums holding info pertaining to them with [/datum/hud_displays] + * + * Todo + * *: add fetching of images to allow stuff like adding/removing xeno crowns easily + * *: add a system for viscontents so things like minimap draw are more responsive */ SUBSYSTEM_DEF(minimaps) name = "Minimaps" init_order = SS_INIT_MINIMAP priority = SS_PRIORITY_MINIMAPS - wait = 5 SECONDS + wait = 10 runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME ///Minimap hud display datums sorted by zlevel var/list/datum/hud_displays/minimaps_by_z = list() @@ -26,115 +37,28 @@ SUBSYSTEM_DEF(minimaps) var/list/image/images_by_source = list() ///the update target datums, sorted by update flag type var/list/update_targets = list() - ///Nonassoc list of targets we want to be stripped of their overlays during the SS fire - var/list/atom/update_targets_unsorted = list() + ///Nonassoc list of updators we want to have their overlays reapplied + var/list/datum/minimap_updator/update_targets_unsorted = list() ///Assoc list of removal callbacks to invoke to remove images from the raw lists var/list/datum/callback/removal_cbs = list() - ///list of holders for data relating to tracked zlevel and tracked atom + ///list of holders for data relating to tracked zlevel and tracked atum var/list/datum/minimap_updator/updators_by_datum = list() - ///list of callbacks we need to invoke late because Initialize happens early - var/list/datum/callback/earlyadds = list() + ///assoc list of hash = image of images drawn by players + var/list/image/drawn_images = list() + ///list of callbacks we need to invoke late because Initialize happens early, or a Z-level was loaded after init + var/list/list/datum/callback/earlyadds = list() ///assoc list of minimap objects that are hashed so we have to update as few as possible var/list/hashed_minimaps = list() - /// associated list of tacmap datums with a hash - var/list/hashed_tacmaps = list() - /// weakrefs of xenos temporarily added to the marine minimap - var/list/minimap_added = list() - -/datum/controller/subsystem/minimaps/Initialize(start_timeofday) - for(var/level in 1 to length(SSmapping.z_list)) - minimaps_by_z["[level]"] = new /datum/hud_displays - if(!is_ground_level(level) && !is_mainship_level(level)) - continue - - var/icon/icon_gen = new('icons/ui_icons/minimap.dmi') //600x600 blank icon template for drawing on the map - var/xmin = world.maxx - var/ymin = world.maxy - var/xmax = 1 - var/ymax = 1 - - for(var/xval in 1 to world.maxx) - for(var/yval in 1 to world.maxy) //Scan all the turfs and draw as needed - var/turf/location = locate(xval, yval, level) - if(location.z != level) - continue - - if(location.density) - if(!istype(location, /turf/closed/wall/almayer/outer)) // Ignore almayer border - xmin = min(xmin, xval) - ymin = min(ymin, yval) - xmax = max(xmax, xval) - ymax = max(ymax, yval) - icon_gen.DrawBox(location.minimap_color, xval, yval) - continue - - if(istype(location, /turf/open/space)) - continue - - var/atom/movable/alttarget = (locate(/obj/structure/machinery/door) in location) || (locate(/obj/structure/fence) in location) - if(alttarget) - xmin = min(xmin, xval) - ymin = min(ymin, yval) - xmax = max(xmax, xval) - ymax = max(ymax, yval) - icon_gen.DrawBox(alttarget.minimap_color, xval, yval) - continue - - var/area/turfloc = location.loc - if(turfloc.minimap_color) - xmin = min(xmin, xval) - ymin = min(ymin, yval) - xmax = max(xmax, xval) - ymax = max(ymax, yval) - icon_gen.DrawBox(BlendRGB(location.minimap_color, turfloc.minimap_color, 0.5), xval, yval) - continue - - xmin = min(xmin, xval) - ymin = min(ymin, yval) - xmax = max(xmax, xval) - ymax = max(ymax, yval) - icon_gen.DrawBox(location.minimap_color, xval, yval) - - xmin = xmin * MINIMAP_SCALE - 1 - ymin = ymin * MINIMAP_SCALE - 1 - xmax = min(xmax * MINIMAP_SCALE, MINIMAP_PIXEL_SIZE) - ymax = min(ymax * MINIMAP_SCALE, MINIMAP_PIXEL_SIZE) - - icon_gen.Scale(icon_gen.Width() * MINIMAP_SCALE, icon_gen.Height() * MINIMAP_SCALE) //scale it up x2 to make it easer to see - icon_gen.Crop(xmin, ymin, MINIMAP_PIXEL_SIZE + xmin - 1, MINIMAP_PIXEL_SIZE + ymin - 1) //then trim it down also cutting anything unused on the bottom left - - // Determine and assign the offsets - minimaps_by_z["[level]"].x_offset = floor((MINIMAP_PIXEL_SIZE - xmax - 1) / MINIMAP_SCALE) - xmin - minimaps_by_z["[level]"].y_offset = floor((MINIMAP_PIXEL_SIZE - ymax - 1) / MINIMAP_SCALE) - ymin - minimaps_by_z["[level]"].x_max = xmax - minimaps_by_z["[level]"].y_max = ymax - - // Center the map icon - icon_gen.Shift(EAST, minimaps_by_z["[level]"].x_offset + xmin) - icon_gen.Shift(NORTH, minimaps_by_z["[level]"].y_offset + ymin) - - minimaps_by_z["[level]"].hud_image = icon_gen //done making the image! - - RegisterSignal(SSdcs, COMSIG_GLOB_NEW_Z, PROC_REF(handle_new_z)) +/datum/controller/subsystem/minimaps/Initialize() initialized = TRUE - - for(var/i in 1 to length(earlyadds)) //lateload icons - earlyadds[i].Invoke() - earlyadds = null //then clear them + for(var/datum/space_level/z_level as anything in SSmapping.z_list) + load_new_z(null, z_level) return SS_INIT_SUCCESS -/datum/controller/subsystem/minimaps/proc/handle_new_z(dcs, datum/space_level/z_level) - SIGNAL_HANDLER - - if(minimaps_by_z["[z_level.z_value]"]) - return - - minimaps_by_z["[z_level.z_value]"] = new /datum/hud_displays - /datum/controller/subsystem/minimaps/stat_entry(msg) - msg = "Upd:[length(update_targets_unsorted)] Mark: [length(removal_cbs)]" + msg = "Upd:[length(update_targets_unsorted)] Mark:[length(removal_cbs)]" return ..() /datum/controller/subsystem/minimaps/Recover() @@ -144,29 +68,101 @@ SUBSYSTEM_DEF(minimaps) update_targets_unsorted = SSminimaps.update_targets_unsorted removal_cbs = SSminimaps.removal_cbs updators_by_datum = SSminimaps.updators_by_datum + drawn_images = SSminimaps.drawn_images /datum/controller/subsystem/minimaps/fire(resumed) var/static/iteration = 0 - if(!iteration) //on first iteration clear all overlays - for(var/iter=1 to length(update_targets_unsorted)) - update_targets_unsorted[iter].overlays.Cut() //clear all the old overlays, no we cant cache it because they wont update - //checks last fired flag to make sure under high load that things are performed in stages var/depthcount = 0 - for(var/flag in update_targets) + for(var/datum/minimap_updator/updator as anything in update_targets_unsorted) if(depthcount < iteration) //under high load update in chunks depthcount++ continue - for(var/datum/minimap_updator/updator as anything in update_targets[flag]) - if(length(updator.minimap.overlays)) - updator.minimap.overlays += minimaps_by_z["[updator.ztarget]"].images_raw[flag] - else - updator.minimap.overlays = minimaps_by_z["[updator.ztarget]"].images_raw[flag] + + var/atom/movable/screen/minimap/target = updator.minimap + if(istype(target) && !target.live) + update_targets_unsorted -= updator + updator.minimap.overlays = updator.raw_blips depthcount++ iteration++ if(MC_TICK_CHECK) return iteration = 0 +///Creates a minimap for a particular z level +/datum/controller/subsystem/minimaps/proc/load_new_z(datum/dcs, datum/space_level/z_level) + SIGNAL_HANDLER + + var/level = z_level.z_value + minimaps_by_z["[level]"] = new /datum/hud_displays + if(!is_mainship_level(level) && !is_ground_level(level) && !(SSmapping.level_trait(level, ZTRAIT_AWAY))) //todo: maybe move this around + return + var/icon/icon_gen = new('icons/ui_icons/minimap.dmi') //600x600 blank icon template for drawing on the map + var/xmin = world.maxx + var/ymin = world.maxy + var/xmax = 1 + var/ymax = 1 + + for(var/xval = 1 to world.maxx) + for(var/yval = 1 to world.maxy) //Scan all the turfs and draw as needed + var/turf/location = locate(xval,yval,level) + if(location.density) + if(!istype(location, /turf/closed/wall/almayer/outer)) // Ignore almayer border + xmin = min(xmin, xval) + ymin = min(ymin, yval) + xmax = max(xmax, xval) + ymax = max(ymax, yval) + icon_gen.DrawBox(location.minimap_color, xval, yval) + continue + if(istype(location, /turf/open/space)) + continue + var/atom/movable/alttarget = (locate(/obj/structure/machinery/door) in location) || (locate(/obj/structure/fence) in location) + if(alttarget) + xmin = min(xmin, xval) + ymin = min(ymin, yval) + xmax = max(xmax, xval) + ymax = max(ymax, yval) + icon_gen.DrawBox(alttarget.minimap_color, xval, yval) + continue + var/area/turfloc = location.loc + if(turfloc.minimap_color) + xmin = min(xmin, xval) + ymin = min(ymin, yval) + xmax = max(xmax, xval) + ymax = max(ymax, yval) + icon_gen.DrawBox(BlendRGB(location.minimap_color, turfloc.minimap_color, 0.5), xval, yval) + continue + xmin = min(xmin, xval) + ymin = min(ymin, yval) + xmax = max(xmax, xval) + ymax = max(ymax, yval) + icon_gen.DrawBox(location.minimap_color, xval, yval) + xmin = xmin * MINIMAP_SCALE - 1 + ymin = ymin * MINIMAP_SCALE - 1 + xmax = min(xmax * MINIMAP_SCALE, MINIMAP_PIXEL_SIZE) + ymax = min(ymax * MINIMAP_SCALE, MINIMAP_PIXEL_SIZE) + + icon_gen.Scale(icon_gen.Width() * MINIMAP_SCALE, icon_gen.Height() * MINIMAP_SCALE) //scale it up x2 to make it easer to see + icon_gen.Crop(xmin, ymin, MINIMAP_PIXEL_SIZE + xmin - 1, MINIMAP_PIXEL_SIZE + ymin - 1) //then trim it down also cutting anything unused on the bottom left + + // Determine and assign the offsets + minimaps_by_z["[level]"].x_offset = floor((MINIMAP_PIXEL_SIZE - xmax - 1) / 2) - xmin + minimaps_by_z["[level]"].y_offset = floor((MINIMAP_PIXEL_SIZE - ymax - 1) / 2) - ymin + minimaps_by_z["[level]"].x_max = xmax + minimaps_by_z["[level]"].y_max = ymax + + // Center the map icon + icon_gen.Shift(EAST, minimaps_by_z["[level]"].x_offset + xmin) + icon_gen.Shift(NORTH, minimaps_by_z["[level]"].y_offset + ymin) + minimaps_by_z["[level]"].hud_image = icon_gen //done making the image! + + //lateload icons + if(!LAZYACCESS(earlyadds, "[level]")) + return + + for(var/datum/callback/callback as anything in LAZYACCESS(earlyadds, "[level]")) + callback.Invoke() + LAZYREMOVE(earlyadds, "[level]") + /** * Adds an atom to the processing updators that will have blips drawn on them * Arguments: @@ -174,12 +170,21 @@ SUBSYSTEM_DEF(minimaps) * * flags: flags for the types of blips we want to be updated * * ztarget: zlevel we want to be updated with */ -/datum/controller/subsystem/minimaps/proc/add_to_updaters(atom/target, flags, ztarget) - var/datum/minimap_updator/holder = new(target, ztarget) +/datum/controller/subsystem/minimaps/proc/add_to_updaters(atom/target, flags, ztarget, drawing, labels) + var/datum/minimap_updator/holder = new(target, ztarget, drawing) for(var/flag in bitfield2list(flags)) LAZYADD(update_targets["[flag]"], holder) + holder.raw_blips += minimaps_by_z["[ztarget]"].images_raw["[flag]"] + if(holder.drawing) + holder.raw_blips += drawn_images["[ztarget]-[flag]"] + if(!labels) + continue + LAZYADD(update_targets["[flag]label"], holder) + holder.raw_blips += minimaps_by_z["[ztarget]"].images_raw["[flag]label"] + if(holder.drawing) + holder.raw_blips += drawn_images["[ztarget]-[flag]label"] updators_by_datum[target] = holder - update_targets_unsorted += target + update_targets_unsorted += holder RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(remove_updator)) /** @@ -192,17 +197,13 @@ SUBSYSTEM_DEF(minimaps) updators_by_datum -= target for(var/key in update_targets) LAZYREMOVE(update_targets[key], holder) - update_targets_unsorted -= target + update_targets_unsorted -= holder /** * Holder datum for a zlevels data, concerning the overlays and the drawn level itself * The individual image trackers have a raw and a normal list * raw lists just store the images, while the normal ones are assoc list of [tracked_atom] = image - * the raw lists are to speed up the Fire() of the subsystem so we dont have to filter through - * WARNING! - * There is a byond bug: http://www.byond.com/forum/post/2661309 - * That that forces us to use a separate list ref when accessing the lists of this datum - * Yea it hurts me too + * the raw lists are to speed up the Fire() of the subsystem so we don't have to filter through */ /datum/hud_displays ///Actual icon of the drawn zlevel with all of it's atoms @@ -211,6 +212,8 @@ SUBSYSTEM_DEF(minimaps) var/list/images_assoc = list() ///Raw list containing updating images by flag; list("[flag]" = list(blip)) var/list/images_raw = list() + ///drawing image of the map + var/image/drawing_image ///x offset of the actual icon to center it to screens var/x_offset = 0 ///y offset of the actual icons to keep it to screens @@ -225,6 +228,8 @@ SUBSYSTEM_DEF(minimaps) for(var/flag in GLOB.all_minimap_flags) images_assoc["[flag]"] = list() images_raw["[flag]"] = list() + images_assoc["[flag]label"] = list() + images_raw["[flag]label"] = list() /** * Holder datum to ease updating of atoms to update @@ -234,318 +239,232 @@ SUBSYSTEM_DEF(minimaps) var/atom/minimap ///Target zlevel we want to be updating to var/ztarget = 0 + /// list of overlays we update + var/raw_blips + /// does this updator showing map drawing + var/drawing -/datum/minimap_updator/New(minimap, ztarget) +/datum/minimap_updator/New(minimap, ztarget, drawing) ..() src.minimap = minimap src.ztarget = ztarget + src.drawing = drawing + raw_blips = list() /** * Adds an atom we want to track with blips to the subsystem * Arguments: * * target: atom we want to track - * * zlevel: zlevel we want this atom to be tracked for * * hud_flags: tracked HUDs we want this atom to be displayed on - * * iconstate: iconstate for the blip we want to be used for this tracked atom - * * icon: icon file we want to use for this blip, 'icons/UI_icons/map_blips.dmi' by default - * * overlay_iconstates: list of iconstates to use as overlay. Used for xeno leader icons. + * * marker: image or mutable_appearance we want to be using on the map */ -/datum/controller/subsystem/minimaps/proc/add_marker(atom/target, zlevel, hud_flags = NONE, iconstate, icon = 'icons/ui_icons/map_blips.dmi', list/overlay_iconstates, image/given_image) - if(!isatom(target) || !zlevel || !hud_flags || ((!iconstate || !icon) && !given_image)) +/datum/controller/subsystem/minimaps/proc/add_marker(atom/target, hud_flags = NONE, image/blip, image_x, image_y, is_label=FALSE) + if(!isatom(target) || !hud_flags || !blip) CRASH("Invalid marker added to subsystem") - if(images_by_source[target]) - CRASH("Duplicate marker added to subsystem") - if(!initialized) - earlyadds += CALLBACK(src, PROC_REF(add_marker), target, zlevel, hud_flags, iconstate, icon, overlay_iconstates, given_image) + + var/actual_z = target.z + if(ismob(target) && target.loc && !isturf(target.loc)) + actual_z = target.loc.z + + if(!initialized || !(minimaps_by_z["[actual_z]"])) //the minimap doesn't exist yet, z level was probably loaded after init + for(var/datum/callback/callback as anything in LAZYACCESS(earlyadds, "[actual_z]")) + if(callback.arguments[1] == target) + return + LAZYADDASSOCLIST(earlyadds, "[actual_z]", CALLBACK(src, PROC_REF(add_marker), target, hud_flags, blip)) + RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(remove_earlyadd), override = TRUE) //Override required for late z-level loading to prevent hard dels where an atom is initiated during z load, but is qdel'd before it finishes return - var/image/blip - if(!given_image) - blip = image(icon, iconstate, pixel_x = MINIMAP_PIXEL_FROM_WORLD(target.x) + minimaps_by_z["[zlevel]"].x_offset, pixel_y = MINIMAP_PIXEL_FROM_WORLD(target.y) + minimaps_by_z["[zlevel]"].y_offset) - else - given_image.pixel_x = MINIMAP_PIXEL_FROM_WORLD(target.x) + minimaps_by_z["[zlevel]"].x_offset - given_image.pixel_y = MINIMAP_PIXEL_FROM_WORLD(target.y) + minimaps_by_z["[zlevel]"].y_offset - blip = given_image - for(var/i in overlay_iconstates) - var/image/overlay = image(icon, i) - overlay.appearance_flags = RESET_COLOR - blip.overlays += overlay + var/turf/target_turf = get_turf(target) + if(ismob(target) && target.loc && !isturf(target.loc)) + target_turf = get_turf(target.loc) + + blip.pixel_x = MINIMAP_PIXEL_FROM_WORLD(target_turf.x) + minimaps_by_z["[target_turf.z]"].x_offset + image_x + blip.pixel_y = MINIMAP_PIXEL_FROM_WORLD(target_turf.y) + minimaps_by_z["[target_turf.z]"].y_offset + image_y images_by_source[target] = blip for(var/flag in bitfield2list(hud_flags)) - minimaps_by_z["[zlevel]"].images_assoc["[flag]"][target] = blip - minimaps_by_z["[zlevel]"].images_raw["[flag]"] += blip + if(is_label) + flag = "[flag]label" + minimaps_by_z["[target_turf.z]"].images_assoc["[flag]"][target] = blip + minimaps_by_z["[target_turf.z]"].images_raw["[flag]"] += blip + for(var/datum/minimap_updator/updator as anything in update_targets["[flag]"]) + if(target_turf.z == updator.ztarget) + updator.raw_blips += blip if(ismovableatom(target)) RegisterSignal(target, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(on_z_change)) blip.RegisterSignal(target, COMSIG_MOVABLE_MOVED, TYPE_PROC_REF(/image, minimap_on_move)) - removal_cbs[target] = CALLBACK(src, PROC_REF(removeimage), blip, target) - RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(remove_marker)) + removal_cbs[target] = CALLBACK(src, PROC_REF(removeimage), blip, target, hud_flags) + RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(remove_marker), override = TRUE) //override for atoms that were on a late loaded z-level, overrides the remove_earlyadd above + +///Removes the object from the earlyadds list, in case it was qdel'd before the z-level was fully loaded +/datum/controller/subsystem/minimaps/proc/remove_earlyadd(atom/source) + SIGNAL_HANDLER + remove_marker(source) + var/actual_z = source.z + if(ismob(source) && source.loc && !isturf(source.loc)) + actual_z = source.loc.z + for(var/datum/callback/callback in LAZYACCESS(earlyadds, "[actual_z]")) + if(callback.arguments[1] != source) + continue + earlyadds["[actual_z]"] -= callback + UnregisterSignal(source, COMSIG_PARENT_QDELETING) + return /** * removes an image from raw tracked lists, invoked by callback */ -/datum/controller/subsystem/minimaps/proc/removeimage(image/blip, atom/target) - var/turf/turf_gotten = get_turf(target) - if(!turf_gotten) - return - var/z_level = turf_gotten.z - for(var/flag in GLOB.all_minimap_flags) - minimaps_by_z["[z_level]"].images_raw["[flag]"] -= blip +/datum/controller/subsystem/minimaps/proc/removeimage(image/blip, atom/target, hud_flags) + var/turf/target_turf = get_turf(target) + for(var/flag in bitfield2list(hud_flags)) + minimaps_by_z["[target_turf.z]"].images_raw["[flag]"] -= blip + for(var/datum/minimap_updator/updator as anything in update_targets["[flag]"]) + if(updator.ztarget == target_turf.z) + updator.raw_blips -= blip + minimaps_by_z["[target_turf.z]"].images_raw["[flag]label"] -= blip + for(var/datum/minimap_updator/updator as anything in update_targets["[flag]label"]) + if(updator.ztarget == target_turf.z) + updator.raw_blips -= blip blip.UnregisterSignal(target, COMSIG_MOVABLE_MOVED) removal_cbs -= target /** * Called on zlevel change of a blip-atom so we can update the image lists as needed + * + * TODO gross amount of assoc usage and unneeded ALL FLAGS iteration */ /datum/controller/subsystem/minimaps/proc/on_z_change(atom/movable/source, oldz, newz) SIGNAL_HANDLER + var/image/blip + // Assumption: Never would a label be attached to a moveable atom for(var/flag in GLOB.all_minimap_flags) if(!minimaps_by_z["[oldz]"]?.images_assoc["[flag]"][source]) continue - var/ref_old = minimaps_by_z["[oldz]"].images_assoc["[flag]"][source] - - minimaps_by_z["[newz]"].images_assoc["[flag]"][source] = ref_old - minimaps_by_z["[newz]"].images_raw["[flag]"] += ref_old - + if(!blip) + blip = minimaps_by_z["[oldz]"].images_assoc["[flag]"][source] + blip.minimap_on_move(source, null) + // todo maybe make update_targets also sort by zlevel? + for(var/datum/minimap_updator/updator as anything in update_targets["[flag]"]) + if(updator.ztarget == oldz) + updator.raw_blips -= blip + else if(updator.ztarget == newz) + updator.raw_blips += blip + minimaps_by_z["[newz]"].images_assoc["[flag]"][source] = blip minimaps_by_z["[oldz]"].images_assoc["[flag]"] -= source - minimaps_by_z["[oldz]"].images_raw["[flag]"] -= ref_old + minimaps_by_z["[newz]"].images_raw["[flag]"] += blip + minimaps_by_z["[oldz]"].images_raw["[flag]"] -= blip /** * Simple proc, updates overlay position on the map when a atom moves */ /image/proc/minimap_on_move(atom/movable/source, oldloc) SIGNAL_HANDLER + if(isturf(source.loc)) + pixel_x = MINIMAP_PIXEL_FROM_WORLD(source.x) + SSminimaps.minimaps_by_z["[source.z]"].x_offset + pixel_y = MINIMAP_PIXEL_FROM_WORLD(source.y) + SSminimaps.minimaps_by_z["[source.z]"].y_offset + return - var/source_z = source.z - if(!source_z) + var/atom/movable/movable_loc = source.loc + source.override_minimap_tracking(source.loc) + pixel_x = MINIMAP_PIXEL_FROM_WORLD(movable_loc.x) + SSminimaps.minimaps_by_z["[movable_loc.z]"].x_offset + pixel_y = MINIMAP_PIXEL_FROM_WORLD(movable_loc.y) + SSminimaps.minimaps_by_z["[movable_loc.z]"].y_offset + +///Used to handle minimap tracking inside other movables +/atom/movable/proc/override_minimap_tracking(atom/movable/loc) + var/image/blip = SSminimaps.images_by_source[src] + blip.RegisterSignal(loc, COMSIG_MOVABLE_MOVED, TYPE_PROC_REF(/image, minimap_on_move)) + RegisterSignal(loc, COMSIG_ATOM_EXITED, PROC_REF(cancel_override_minimap_tracking)) + +///Stops minimap override tracking +/atom/movable/proc/cancel_override_minimap_tracking(atom/movable/source, atom/movable/mover) + SIGNAL_HANDLER + if(mover != src) return - pixel_x = MINIMAP_PIXEL_FROM_WORLD(source.x) + SSminimaps.minimaps_by_z["[source_z]"].x_offset - pixel_y = MINIMAP_PIXEL_FROM_WORLD(source.y) + SSminimaps.minimaps_by_z["[source_z]"].y_offset + var/image/blip = SSminimaps.images_by_source[src] + blip?.UnregisterSignal(source, COMSIG_MOVABLE_MOVED) + UnregisterSignal(source, COMSIG_ATOM_EXITED) + /** - * Removes an atom and it's blip from the subsystem. - * Force has no effect on this proc, but is here because we are a COMSIG_PARENT_QDELETING handler. + * Removes an atom and it's blip from the subsystem */ -/datum/controller/subsystem/minimaps/proc/remove_marker(atom/source, force, minimap_flag) +/datum/controller/subsystem/minimaps/proc/remove_marker(atom/source) SIGNAL_HANDLER if(!removal_cbs[source]) //already removed return UnregisterSignal(source, list(COMSIG_PARENT_QDELETING, COMSIG_MOVABLE_Z_CHANGED)) + var/turf/source_turf = get_turf(source) + for(var/flag in GLOB.all_minimap_flags) + minimaps_by_z["[source_turf.z]"].images_assoc["[flag]"] -= source + minimaps_by_z["[source_turf.z]"].images_assoc["[flag]label"] -= source images_by_source -= source removal_cbs[source].Invoke() removal_cbs -= source + +/// Checks if the source has a marker already set +/datum/controller/subsystem/minimaps/proc/has_marker(atom/source) var/turf/turf_gotten = get_turf(source) + if(!turf_gotten) return + var/z_level = turf_gotten.z - if(minimap_flag) - minimaps_by_z["[z_level]"].images_assoc["[minimap_flag]"] -= source - else + + if(minimaps_by_z["[z_level]"]) for(var/flag in GLOB.all_minimap_flags) - minimaps_by_z["[z_level]"].images_assoc["[flag]"] -= source + if(source in minimaps_by_z["[z_level]"].images_assoc["[flag]"]) + return TRUE + if(source in minimaps_by_z["[z_level]"].images_assoc["[flag]label"]) + return TRUE + + return FALSE /** - * Fetches a /atom/movable/screen/minimap instance or creates one if none exists + * Fetches a /atom/movable/screen/minimap instance or creates on if none exists * Note this does not destroy them when the map is unused, might be a potential thing to do? * Arguments: * * zlevel: zlevel to fetch map for * * flags: map flags to fetch from */ -/datum/controller/subsystem/minimaps/proc/fetch_minimap_object(zlevel, flags, shifting = FALSE) - var/hash = "[zlevel]-[flags]-[shifting]" +/datum/controller/subsystem/minimaps/proc/fetch_minimap_object(zlevel, flags, live, popup, drawing) + var/hash = "[zlevel]-[flags]-[live]-[popup]-[drawing]" if(hashed_minimaps[hash]) return hashed_minimaps[hash] - var/atom/movable/screen/minimap/map = new(null, zlevel, flags, shifting) + var/atom/movable/screen/minimap/map = new(null, null, zlevel, flags, live, popup, drawing) if (!map.icon) //Don't wanna save an unusable minimap for a z-level. - CRASH("Empty and unusable minimap generated for '[zlevel]-[flags]-[shifting]'") //Can be caused by atoms calling this proc before minimap subsystem initializing. + CRASH("Empty and unusable minimap generated for '[zlevel]-[flags]-[live]-[popup]'") //Can be caused by atoms calling this proc before minimap subsystem initializing. hashed_minimaps[hash] = map return map -/** - * Fetches the datum containing an announced flattend map png reference. - * - * Arguments: - * * faction: FACTION_MARINE or XENO_HIVE_NORMAL - */ -/proc/get_tacmap_data_png(faction) - var/list/map_list - - if(faction == FACTION_MARINE) - map_list = GLOB.uscm_flat_tacmap_data - else if(faction == XENO_HIVE_NORMAL) - map_list = GLOB.xeno_flat_tacmap_data - else - return null - - var/map_length = length(map_list) - - if(map_length == 0) - return null - - return map_list[map_length] - -/** - * Fetches the datum containing the latest unannounced flattend map png reference. - * - * Arguments: - * * faction: FACTION_MARINE or XENO_HIVE_NORMAL - */ -/proc/get_unannounced_tacmap_data_png(faction) - if(faction == FACTION_MARINE) - return GLOB.uscm_unannounced_map - else if(faction == XENO_HIVE_NORMAL) - return GLOB.xeno_unannounced_map - - return null - -/** - * Fetches the last set of svg coordinates for the tacmap drawing. - * - * Arguments: - * * faction: which faction get the map for: FACTION_MARINE or XENO_HIVE_NORMAL - */ -/proc/get_tacmap_data_svg(faction) - var/list/map_list - - if(faction == FACTION_MARINE) - map_list = GLOB.uscm_svg_tacmap_data - else if(faction == XENO_HIVE_NORMAL) - map_list = GLOB.xeno_svg_tacmap_data - else - return null - - var/map_length = length(map_list) - - if(map_length == 0) - return null - - return map_list[map_length] - -/** - * Re-sends relevant flattened tacmaps to a single client. - * - * Arguments: - * * user: The mob that is either an observer, marine, or xeno - */ -/proc/resend_current_map_png(mob/user) - if(!user.client) - return - - var/is_observer = user.faction == FACTION_NEUTRAL && isobserver(user) - if(is_observer || user.faction == FACTION_MARINE) - // Send marine maps - var/datum/flattened_tacmap/latest = get_tacmap_data_png(FACTION_MARINE) - if(latest) - SSassets.transport.send_assets(user.client, latest.asset_key) - var/datum/flattened_tacmap/unannounced = get_unannounced_tacmap_data_png(FACTION_MARINE) - if(unannounced && (!latest || latest.asset_key != unannounced.asset_key)) - SSassets.transport.send_assets(user.client, unannounced.asset_key) - - var/mob/living/carbon/xenomorph/xeno = user - if(is_observer || istype(xeno) && xeno.hivenumber == XENO_HIVE_NORMAL) - // Send xeno maps - var/datum/flattened_tacmap/latest = get_tacmap_data_png(XENO_HIVE_NORMAL) - if(latest) - SSassets.transport.send_assets(user.client, latest.asset_key) - var/datum/flattened_tacmap/unannounced = get_unannounced_tacmap_data_png(XENO_HIVE_NORMAL) - if(unannounced && (!latest || latest.asset_key != unannounced.asset_key)) - SSassets.transport.send_assets(user.client, unannounced.asset_key) - -/** - * Flattens the current map and then distributes it for the specified faction as an unannounced map. - * - * Arguments: - * * faction: Which faction to distribute the map to: FACTION_MARINE or XENO_HIVE_NORMAL - * Return: - * * Returns a boolean value, TRUE if the operation was successful, FALSE if it was not (on cooldown generally). - */ -/datum/tacmap/drawing/proc/distribute_current_map_png(faction) - if(faction == FACTION_MARINE) - if(!COOLDOWN_FINISHED(GLOB, uscm_flatten_map_icon_cooldown)) - return FALSE - COOLDOWN_START(GLOB, uscm_flatten_map_icon_cooldown, FLATTEN_MAP_COOLDOWN_TIME) - else if(faction == XENO_HIVE_NORMAL) - if(!COOLDOWN_FINISHED(GLOB, xeno_flatten_map_icon_cooldown)) - return FALSE - COOLDOWN_START(GLOB, xeno_flatten_map_icon_cooldown, FLATTEN_MAP_COOLDOWN_TIME) - else - return FALSE - - var/icon/flat_map = getFlatIcon(map_holder.map, appearance_flags = TRUE) - if(!flat_map) - to_chat(usr, SPAN_WARNING("A critical error has occurred! Contact a coder.")) // tf2heavy: "Oh, this is bad!" - return FALSE - - // Send to only relevant clients - var/list/faction_clients = list() - for(var/client/client as anything in GLOB.clients) - if(!client || !client.mob) - continue - var/mob/client_mob = client.mob - if(client_mob.faction == faction) - faction_clients += client - else if(client_mob.faction == FACTION_NEUTRAL && isobserver(client_mob)) - faction_clients += client - else if(isxeno(client_mob)) - var/mob/living/carbon/xenomorph/xeno = client_mob - if(xeno.hivenumber == faction) - faction_clients += client - - // This may be unnecessary to do this way if the asset url is always the same as the lookup key - var/flat_tacmap_key = icon2html(flat_map, faction_clients, keyonly = TRUE) - if(!flat_tacmap_key) - to_chat(usr, SPAN_WARNING("A critical error has occurred! Contact a coder.")) - return FALSE - var/flat_tacmap_png = SSassets.transport.get_asset_url(flat_tacmap_key) - var/datum/flattened_tacmap/new_flat = new(flat_tacmap_png, flat_tacmap_key) - - if(faction == FACTION_MARINE) - GLOB.uscm_unannounced_map = new_flat - else //if(faction == XENO_HIVE_NORMAL) - GLOB.xeno_unannounced_map = new_flat - - return TRUE - -/** - * Globally stores svg coords for a given faction. - * - * Arguments: - * * faction: which faction to save the data for: FACTION_MARINE or XENO_HIVE_NORMAL - * * svg_coords: an array of coordinates corresponding to an svg. - * * ckey: the ckey of the user who submitted this - */ -/datum/tacmap/drawing/proc/store_current_svg_coords(faction, svg_coords, ckey) - var/datum/svg_overlay/svg_store_overlay = new(svg_coords, ckey) - - if(faction == FACTION_MARINE) - GLOB.uscm_svg_tacmap_data += svg_store_overlay - else if(faction == XENO_HIVE_NORMAL) - GLOB.xeno_svg_tacmap_data += svg_store_overlay - else - qdel(svg_store_overlay) - debug_log("SVG coordinates for [faction] are not implemented!") - -#define can_draw(faction, user) ((faction == FACTION_MARINE && skillcheck(user, SKILL_OVERWATCH, SKILL_OVERWATCH_TRAINED)) || (faction == XENO_HIVE_NORMAL && isqueen(user))) - -/datum/controller/subsystem/minimaps/proc/fetch_tacmap_datum(zlevel, flags) - var/hash = "[zlevel]-[flags]" - if(hashed_tacmaps[hash]) - return hashed_tacmaps[hash] - - var/datum/tacmap_holder/tacmap = new(null, zlevel, flags) - hashed_tacmaps[hash] = tacmap - return tacmap +///fetches the drawing icon for a minimap flag and returns it, creating it if needed. assumes minimap_flag is ONE flag +/datum/controller/subsystem/minimaps/proc/get_drawing_image(zlevel, minimap_flag, drawing) + var/hash = "[zlevel]-[minimap_flag]" + if(drawn_images[hash]) + return drawn_images[hash] + var/image/blip = new // could use MA but yolo + blip.icon = icon('icons/ui_icons/minimap.dmi') + if(minimaps_by_z["[zlevel]"]) + minimaps_by_z["[zlevel]"].drawing_image = blip + for(var/datum/minimap_updator/updator as anything in update_targets["[minimap_flag]"]) + if(zlevel == updator.ztarget && updator.drawing) + updator.raw_blips += blip + drawn_images[hash] = blip + return blip ///Default HUD screen minimap object /atom/movable/screen/minimap name = "Minimap" icon = null icon_state = "" - layer = ABOVE_HUD_LAYER + layer = TACMAP_LAYER + plane = TACMAP_PLANE screen_loc = "1,1" - mouse_opacity = MOUSE_OPACITY_TRANSPARENT - appearance_flags = TILE_BOUND + appearance_flags = TILE_BOUND|PIXEL_SCALE + mouse_opacity = MOUSE_OPACITY_OPAQUE + ///assoc list of mob choices by clicking on coords. only exists fleetingly for the wait loop in [/proc/get_coords_from_click] + var/list/mob/choices_by_mob + ///assoc list to determine if get_coords_from_click should stop waiting for an input for that specific mob + var/list/mob/stop_polling /// How many pixels to shift each update var/shift_size = 8 /// The horizontal max for this map (set at Initialize) @@ -560,42 +479,185 @@ SUBSYSTEM_DEF(minimaps) var/west_x_shift = TRUE /// Whether the vertical shift is currently pushing the map southward var/south_y_shift = TRUE + /// Is the minimap live + var/live + /// Minimap flags + var/minimap_flags + /// Minimap target + var/target + /// Is drawing enbabled + var/drawing + /// Max ratio to x_max/y_max you can scroll the map to + var/max_scroll_ratio = 0.8 + + var/atom/movable/screen/minimap_tool/draw_tool/active_draw_tool + /// List of turfs that have labels attached to them. kept around so it can be cleared + var/list/turf/labelled_turfs = list() + +/atom/movable/screen/minimap/MouseWheel(delta_x, delta_y, location, control, params) + var/mob/user = usr + var/list/mods = params2list(params) + + if(!user) + return + + var/atom/movable/screen/plane_master/minimap/plane_master = user.hud_used.plane_masters["[TACMAP_PLANE]"] + + if(!plane_master) + return + + var/matrix/transform = plane_master.transform + + if(!transform) + plane_master.transform = matrix() + + var/shift_click = mods[SHIFT_CLICK] + var/x_shift = plane_master.cur_x_shift + var/max_x_shift = x_max * max_scroll_ratio + var/y_shift = plane_master.cur_y_shift + var/max_y_shift = y_max * max_scroll_ratio -/atom/movable/screen/minimap/Initialize(mapload, target, flags, shifting = FALSE) + // Out of bounds checks + if(x_shift > max_x_shift && (shift_click ? delta_y < 0 : delta_x < 0) || x_shift < max_x_shift * -1 && (shift_click ? delta_y > 0 : delta_x > 0)) + return + + if(y_shift > max_y_shift && (shift_click ? delta_x < 0 : delta_y < 0) || y_shift < max_y_shift * -1 && (shift_click ? delta_x > 0 : delta_y > 0)) + return + + if(shift_click) + transform.Translate(delta_y / 32, delta_x / 32) + plane_master.cur_x_shift -= delta_y / 32 + plane_master.cur_y_shift -= delta_x / 32 + else + transform.Translate(delta_x / 32, delta_y / 32) + plane_master.cur_x_shift -= delta_x / 32 + plane_master.cur_y_shift -= delta_y / 32 + + plane_master.transform = transform + +/atom/movable/screen/minimap/Initialize(mapload, datum/hud/hud_owner, target, minimap_flags, live = TRUE, popup = FALSE, drawing = TRUE) . = ..() if(!SSminimaps.minimaps_by_z["[target]"]) return + + choices_by_mob = list() + stop_polling = list() icon = SSminimaps.minimaps_by_z["[target]"].hud_image - SSminimaps.add_to_updaters(src, flags, target) + if(live) + SSminimaps.add_to_updaters(src, minimap_flags, target, drawing, labels=drawing) + src.drawing = drawing + src.minimap_flags = minimap_flags + src.target = target + src.live = live x_max = SSminimaps.minimaps_by_z["[target]"].x_max y_max = SSminimaps.minimaps_by_z["[target]"].y_max - if(shifting && (x_max > SCREEN_PIXEL_SIZE || y_max > SCREEN_PIXEL_SIZE)) - START_PROCESSING(SSobj, src) - if(findtext(screen_loc, "1") != 1) // We're detecting the first position matching, not the 1 there - CRASH("Shifting a minimap screen_loc of '[screen_loc]' is not currently implemented!") // Just need to do string manip in process to support it - -/atom/movable/screen/minimap/process() - if(x_max > SCREEN_PIXEL_SIZE) - if(west_x_shift) - cur_x_shift = min(cur_x_shift + shift_size, x_max - SCREEN_PIXEL_SIZE) - if(cur_x_shift == x_max - SCREEN_PIXEL_SIZE) - west_x_shift = !west_x_shift - else - cur_x_shift = max(cur_x_shift - shift_size, 0) - if(cur_x_shift == 0) - west_x_shift = !west_x_shift - if(y_max > SCREEN_PIXEL_SIZE) - if(south_y_shift) - cur_y_shift = min(cur_y_shift + shift_size, y_max - SCREEN_PIXEL_SIZE) - if(cur_y_shift == y_max - SCREEN_PIXEL_SIZE) - south_y_shift = !south_y_shift - else - cur_y_shift = max(cur_y_shift - shift_size, 0) - if(cur_y_shift == 0) - south_y_shift = !south_y_shift - screen_loc = "1:-[cur_x_shift],1:-[cur_y_shift]" // Pixel shift the map + add_filter("border_outline", 1, outline_filter(2, COLOR_BLACK)) + add_filter("map_glow", 2, drop_shadow_filter(x = 0, y = 0, size = 3, offset = 1, color = "#c0f7ff")) + add_filter("overlay1", 3, layering_filter(x = -480, y = 0, icon = 'icons/mob/hud/minimap_overlay.dmi', blend_mode = BLEND_INSET_OVERLAY)) + add_filter("overlay2", 4, layering_filter(x = 0, y = 0, icon = 'icons/mob/hud/minimap_overlay.dmi', blend_mode = BLEND_INSET_OVERLAY)) + add_filter("overlay3", 5, layering_filter(x = -480, y = 480, icon = 'icons/mob/hud/minimap_overlay.dmi', blend_mode = BLEND_INSET_OVERLAY)) + add_filter("overlay4", 6, layering_filter(x = 0, y = 480, icon = 'icons/mob/hud/minimap_overlay.dmi', blend_mode = BLEND_INSET_OVERLAY)) + add_filter("overlay5", 7, layering_filter(x = 480, y = 0, icon = 'icons/mob/hud/minimap_overlay.dmi', blend_mode = BLEND_INSET_OVERLAY)) + add_filter("overlay6", 8, layering_filter(x = 480, y = 480, icon = 'icons/mob/hud/minimap_overlay.dmi', blend_mode = BLEND_INSET_OVERLAY)) + +/atom/movable/screen/minimap/proc/update() + if(live) + return + + SSminimaps.remove_updator(src) + SSminimaps.add_to_updaters(src, minimap_flags, target, drawing, labels=drawing) + +/atom/movable/screen/minimap/Destroy() + SSminimaps.hashed_minimaps -= src + stop_polling = null + return ..() + +/** + * lets the user get coordinates by clicking the actual map + * Returns a list(x_coord, y_coord) + * note: sleeps until the user makes a choice, stop_polling is set to TRUE for this specific user or they disconnect + */ +/atom/movable/screen/minimap/proc/get_coords_from_click(mob/user) + //lord forgive my shitcode + var/signal_by_type = isobserver(user) ? COMSIG_OBSERVER_CLICKON : COMSIG_MOB_CLICKON + RegisterSignal(user, signal_by_type, PROC_REF(on_click), override=TRUE) + while(!(choices_by_mob[user] || stop_polling[user]) && user.client && islist(stop_polling)) + stoplag(1) + UnregisterSignal(user, signal_by_type) + . = choices_by_mob[user] + choices_by_mob -= user + // I have an extra layer of shitcode for you + stop_polling -= user + +/** + * Handles fetching the targetted coordinates when the mob tries to click on this map + * does the following: + * turns map targetted pixel into a list(x, y) + * gets z level of this map + * x and y minimap centering is reverted, then the x2 scaling of the map is removed + * round up to correct if an odd pixel was clicked and make sure its valid + */ +/atom/movable/screen/minimap/proc/on_click(mob/source, atom/A, params) + SIGNAL_HANDLER + var/list/modifiers = params2list(params) + if(!modifiers[CTRL_CLICK]) + return + // we only care about absolute coords because the map is fixed to 1,1 so no client stuff + var/atom/movable/screen/plane_master/minimap/plane_master = source.hud_used.plane_masters["[TACMAP_PLANE]"] + + if(!plane_master) + return + + var/list/pixel_coords = params2screenpixel(modifiers["screen-loc"]) + var/zlevel = SSminimaps.updators_by_datum[src].ztarget + var/x = (pixel_coords[1] - SSminimaps.minimaps_by_z["[zlevel]"].x_offset + plane_master.cur_x_shift) / MINIMAP_SCALE + var/y = (pixel_coords[2] - SSminimaps.minimaps_by_z["[zlevel]"].y_offset + plane_master.cur_y_shift) / MINIMAP_SCALE + var/c_x = clamp(CEILING(x, 1), 1, world.maxx) + var/c_y = clamp(CEILING(y, 1), 1, world.maxy) + choices_by_mob[source] = list(c_x, c_y) + return COMSIG_MOB_CLICK_CANCELED + +/atom/movable/screen/minimap_locator + name = "You are here" + icon = 'icons/ui_icons/map_blips.dmi' + icon_state = "locator" + plane = TACMAP_PLANE + layer = INTRO_LAYER + mouse_opacity = MOUSE_OPACITY_TRANSPARENT + var/atom/movable/screen/minimap/current_map + var/currently_tracking + var/shift_x = 0 + var/shift_y = 0 + +///Get the current x and y shift and mover of the minimap +/atom/movable/screen/minimap_locator/proc/link_locator(action_map, atom/movable/mover) + SIGNAL_HANDLER + if(action_map) + current_map = action_map + if(mover) + currently_tracking = mover + shift_x = current_map.cur_x_shift + shift_y = current_map.cur_y_shift + +///updates the screen loc of the locator so that it's on the movers location on the minimap +/atom/movable/screen/minimap_locator/proc/update(atom/movable/mover, atom/oldloc, direction) + SIGNAL_HANDLER + link_locator() + var/turf/mover_turf = get_turf(currently_tracking) + var/x_coord = mover_turf.x * MINIMAP_SCALE + var/y_coord = mover_turf.y * MINIMAP_SCALE + x_coord += SSminimaps.minimaps_by_z["[mover_turf.z]"].x_offset - shift_x + y_coord += SSminimaps.minimaps_by_z["[mover_turf.z]"].y_offset - shift_y + // + 1 because tiles start at 1 + var/x_tile = FLOOR(x_coord/32, 1) + 1 + // -3 to center the image + var/x_pixel = x_coord % 32 - 3 + var/y_tile = FLOOR(y_coord/32, 1) + 1 + var/y_pixel = y_coord % 32 - 3 + screen_loc = "[x_tile]:[x_pixel],[y_tile]:[y_pixel]" + link_locator() /** * Action that gives the owner access to the minimap pool @@ -611,468 +673,815 @@ SUBSYSTEM_DEF(minimaps) var/minimap_displayed = FALSE ///Minimap object we'll be displaying var/atom/movable/screen/minimap/map - ///This is mostly for the AI & other things which do not move groundside. + ///Overrides what the locator tracks aswell what z the map displays as opposed to always tracking the minimap's owner. Default behavior when null. + var/atom/movable/locator_override + ///Minimap "You are here" indicator for when it's up + var/atom/movable/screen/minimap_locator/locator + ///Sets a fixed z level to be tracked by this minimap action instead of being influenced by the owner's / locator override's z level. var/default_overwatch_level = 0 - ///Whether this minimap should shift or not - var/shifting = FALSE + /// Is it live + var/live = FALSE + /// Can it see tacmap drawings + var/drawing = TRUE + +/datum/action/minimap/New(Target, new_minimap_flags, new_marker_flags) + . = ..() + locator = new + if(new_minimap_flags) + minimap_flags = new_minimap_flags + if(new_marker_flags) + marker_flags = new_marker_flags /datum/action/minimap/Destroy() map = null + locator_override = null + QDEL_NULL(locator) return ..() /datum/action/minimap/action_activate() . = ..() if(!map) - return - if(minimap_displayed) - owner.client.remove_from_screen(map) - else - owner.client.add_to_screen(map) - minimap_displayed = !minimap_displayed + return FALSE -/datum/action/minimap/give_to(mob/target) - . = ..() + if(!minimap_displayed && !isobserver(owner) && owner.is_mob_incapacitated()) + return FALSE - if(default_overwatch_level) - map = SSminimaps.fetch_minimap_object(default_overwatch_level, minimap_flags, shifting) + return toggle_minimap() + +/// Toggles the minimap, has a variable to force on or off (most likely only going to be used to close it) +/datum/action/minimap/proc/toggle_minimap(force_state) + // No force state? Invert the current state + if(isnull(force_state)) + force_state = !minimap_displayed + if(force_state == minimap_displayed) + return FALSE + if(!locator_override && ismovableatom(owner.loc)) + override_locator(owner.loc) + var/atom/movable/tracking = locator_override ? locator_override : owner + if(force_state) + if(locate(/atom/movable/screen/minimap) in owner.client.screen) //This seems like the most effective way to do this without some wacky code + to_chat(owner, SPAN_WARNING("You already have a minimap open!")) + return FALSE + owner.client.add_to_screen(map) + owner.client.add_to_screen(locator) + locator.link_locator(map, owner) + locator.update(tracking, null, null) + locator.RegisterSignal(tracking, COMSIG_MOVABLE_MOVED, TYPE_PROC_REF(/atom/movable/screen/minimap_locator, update)) else - RegisterSignal(target, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(on_owner_z_change)) + owner.client.remove_from_screen(map) + owner.client.remove_from_screen(locator) + map.stop_polling -= owner + locator.UnregisterSignal(tracking, COMSIG_MOVABLE_MOVED) + minimap_displayed = force_state + return TRUE - var/turf/turf_gotten = get_turf(target) - if(!turf_gotten) +///Overrides the minimap locator to a given atom +/datum/action/minimap/proc/override_locator(atom/movable/to_track) + var/atom/movable/tracking = locator_override ? locator_override : owner + var/atom/movable/new_track = to_track ? to_track : owner + if(locator_override) + clear_locator_override() + if(owner) + UnregisterSignal(tracking, COMSIG_MOVABLE_Z_CHANGED) + if(!minimap_displayed) + locator_override = to_track + if(to_track) + RegisterSignal(to_track, COMSIG_PARENT_QDELETING, TYPE_PROC_REF(/datum/action/minimap, clear_locator_override)) + if(owner && owner.loc == to_track) + RegisterSignal(to_track, COMSIG_ATOM_EXITED, TYPE_PROC_REF(/datum/action/minimap, on_exit_check)) + if(owner) + RegisterSignal(new_track, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(on_owner_z_change)) + var/turf/old_turf = get_turf(tracking) + if(!old_turf || !old_turf.z || old_turf.z != new_track.z) + on_owner_z_change(new_track, old_turf?.z, new_track?.z) return - var/z_level = turf_gotten.z + locator.UnregisterSignal(tracking, COMSIG_MOVABLE_MOVED) + locator_override = to_track + if(to_track) + RegisterSignal(to_track, COMSIG_PARENT_QDELETING, TYPE_PROC_REF(/datum/action/minimap, clear_locator_override)) + if(owner.loc == to_track) + RegisterSignal(to_track, COMSIG_ATOM_EXITED, TYPE_PROC_REF(/datum/action/minimap, on_exit_check)) + RegisterSignal(new_track, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(on_owner_z_change)) + var/turf/old_turf = get_turf(tracking) + if(old_turf.z != new_track.z) + on_owner_z_change(new_track, old_turf.z, new_track.z) + locator.RegisterSignal(new_track, COMSIG_MOVABLE_MOVED, TYPE_PROC_REF(/atom/movable/screen/minimap_locator, update)) + locator.link_locator(map, new_track) + locator.update(new_track) + +///checks if we should clear override if the owner exits this atom +/datum/action/minimap/proc/on_exit_check(datum/source, atom/movable/mover) + SIGNAL_HANDLER + if(mover && mover != owner) + return + clear_locator_override() - if(!SSminimaps.minimaps_by_z["[z_level]"] || !SSminimaps.minimaps_by_z["[z_level]"].hud_image) +///CLears the locator override in case the override target is deleted +/datum/action/minimap/proc/clear_locator_override() + SIGNAL_HANDLER + if(!locator_override) return - map = SSminimaps.fetch_minimap_object(z_level, minimap_flags, shifting) + UnregisterSignal(locator_override, list(COMSIG_PARENT_QDELETING, COMSIG_ATOM_EXITED)) + if(owner) + UnregisterSignal(locator_override, COMSIG_MOVABLE_Z_CHANGED) + RegisterSignal(owner, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(on_owner_z_change)) + var/turf/owner_turf = get_turf(owner) + if(owner_turf.z != locator_override.z) + on_owner_z_change(owner, locator_override.z, owner_turf.z) + if(minimap_displayed) + locator.UnregisterSignal(locator_override, COMSIG_MOVABLE_MOVED) + locator.RegisterSignal(owner, COMSIG_MOVABLE_MOVED, TYPE_PROC_REF(/atom/movable/screen/minimap_locator, update)) + locator.link_locator(map, owner) + locator.update(owner) + locator_override = null -/datum/action/minimap/remove_from(mob/target) +/datum/action/minimap/give_to(mob/mob) . = ..() - if(minimap_displayed) - owner?.client?.remove_from_screen(map) - minimap_displayed = FALSE + var/atom/movable/tracking = locator_override ? locator_override : mob + RegisterSignal(tracking, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(on_owner_z_change)) + if(default_overwatch_level) + if(!SSminimaps.minimaps_by_z["[default_overwatch_level]"] || !SSminimaps.minimaps_by_z["[default_overwatch_level]"].hud_image) + return + map = SSminimaps.fetch_minimap_object(default_overwatch_level, minimap_flags, live=live, popup=FALSE, drawing=drawing) + return + if(!SSminimaps.minimaps_by_z["[tracking.z]"] || !SSminimaps.minimaps_by_z["[tracking.z]"].hud_image) + return + map = SSminimaps.fetch_minimap_object(tracking.z, minimap_flags, live=live, popup=FALSE, drawing=drawing) - UnregisterSignal(target, COMSIG_MOVABLE_Z_CHANGED) +/datum/action/minimap/remove_from(mob/mob) + toggle_minimap(FALSE) + UnregisterSignal(locator_override || mob, COMSIG_MOVABLE_Z_CHANGED) + return ..() /** * Updates the map when the owner changes zlevel */ /datum/action/minimap/proc/on_owner_z_change(atom/movable/source, oldz, newz) SIGNAL_HANDLER + var/atom/movable/tracking = locator_override ? locator_override : owner if(minimap_displayed) - owner.client.remove_from_screen(map) - minimap_displayed = FALSE + toggle_minimap(force_state=FALSE) map = null - if(!SSminimaps.minimaps_by_z["[newz]"] || !SSminimaps.minimaps_by_z["[newz]"].hud_image) - return if(default_overwatch_level) - map = SSminimaps.fetch_minimap_object(default_overwatch_level, minimap_flags, shifting) + if(!SSminimaps.minimaps_by_z["[default_overwatch_level]"] || !SSminimaps.minimaps_by_z["[default_overwatch_level]"].hud_image) + if(minimap_displayed) + owner.client?.screen -= locator + locator.UnregisterSignal(tracking, COMSIG_MOVABLE_MOVED) + minimap_displayed = FALSE + return + map = SSminimaps.fetch_minimap_object(default_overwatch_level, minimap_flags, live=live, popup=FALSE, drawing=drawing) + if(minimap_displayed) + if(owner.client) + owner.client.screen += map + else + minimap_displayed = FALSE + return + if(!SSminimaps.minimaps_by_z["[newz]"] || !SSminimaps.minimaps_by_z["[newz]"].hud_image) + if(minimap_displayed) + owner.client?.screen -= locator + locator.UnregisterSignal(tracking, COMSIG_MOVABLE_MOVED) + minimap_displayed = FALSE return - map = SSminimaps.fetch_minimap_object(newz, minimap_flags, shifting) + map = SSminimaps.fetch_minimap_object(newz, minimap_flags, live=live, popup=FALSE, drawing=drawing) + if(minimap_displayed) + if(owner.client) + owner.client.screen += map + else + minimap_displayed = FALSE + /datum/action/minimap/xeno minimap_flags = MINIMAP_FLAG_XENO + live = TRUE + drawing = FALSE + +/datum/action/minimap/xeno/New(target, new_minimap_flags, new_marker_flags, hive_number) + var/minimap_flag = get_minimap_flag_for_faction(hive_number) + if(minimap_flag != MINIMAP_FLAG_XENO) + minimap_flags &= ~MINIMAP_FLAG_XENO + minimap_flags |= minimap_flag + + . = ..() + +/datum/action/minimap/xeno/see_humans + minimap_flags = MINIMAP_FLAG_XENO|MINIMAP_FLAG_USCM|MINIMAP_FLAG_WY|MINIMAP_FLAG_WY|MINIMAP_FLAG_UPP + +/datum/action/minimap/xeno/action_activate() + var/mob/living/carbon/xenomorph/xeno = owner + if(!istype(xeno)) + return + + if(!minimap_displayed && !xeno?.hive?.living_xeno_queen?.ovipositor && xeno != xeno?.hive?.living_xeno_queen && xeno?.hive?.tacmap_requires_queen_ovi) + to_chat(xeno, SPAN_WARNING("You cannot access that right now, The Queen has shed her ovipositor.")) + return + + . = ..() /datum/action/minimap/marine minimap_flags = MINIMAP_FLAG_USCM marker_flags = MINIMAP_FLAG_USCM +/datum/action/minimap/marine/live + live = TRUE + +/datum/action/minimap/marine/upp + minimap_flags = MINIMAP_FLAG_UPP + marker_flags = MINIMAP_FLAG_UPP + +/datum/action/minimap/ai //I'll keep this as seperate type despite being identical so it's easier if people want to make different aspects different. + minimap_flags = MINIMAP_FLAG_USCM + marker_flags = MINIMAP_FLAG_USCM + /datum/action/minimap/upp - minimap_flags = MINIMAP_FLAG_UPP + minimap_flags = MINIMAP_FLAG_UPP marker_flags = MINIMAP_FLAG_UPP +/datum/action/minimap/pmc + minimap_flags = MINIMAP_FLAG_PMC + marker_flags = MINIMAP_FLAG_PMC + /datum/action/minimap/observer minimap_flags = MINIMAP_FLAG_ALL marker_flags = NONE - hidden = TRUE - shifting = TRUE - -/datum/tacmap - var/allowed_flags = MINIMAP_FLAG_USCM - /// by default the ground map - this picks the first level matching the trait. if it exists - var/targeted_ztrait = ZTRAIT_GROUND - /// the current z level within the z stack - var/target_z = 1 - var/atom/owner - - /// tacmap holder for holding the minimap - var/datum/tacmap_holder/map_holder - -/datum/tacmap/drawing - /// A url that will point to the wiki map for the current map as a fall back image - var/static/wiki_map_fallback - - /// color selection for the tactical map canvas, defaults to black. - var/toolbar_color_selection = "black" - var/toolbar_updated_selection = "black" - - /// boolean value to keep track if the canvas has been updated or not, the value is used in tgui state. - var/updated_canvas = FALSE - /// current flattend map - var/datum/flattened_tacmap/new_current_map - /// previous flattened map - var/datum/flattened_tacmap/old_map - /// current svg - var/datum/svg_overlay/current_svg - - var/action_queue_change = 0 - - /// The last time the map has been flattened - used as a key to trick react into updating the canvas - var/last_update_time = 0 - /// A temporary lock out time before we can open the new canvas tab to allow the tacmap time to fire - var/tacmap_ready_time = 0 - -/datum/tacmap/New(atom/source, minimap_type) - allowed_flags = minimap_type - owner = source - -/datum/tacmap/drawing/status_tab_view/New() - var/datum/tacmap/drawing/status_tab_view/uscm_tacmap - allowed_flags = MINIMAP_FLAG_USCM - owner = uscm_tacmap - -/datum/tacmap/drawing/status_tab_view/xeno/New() - var/datum/tacmap/drawing/status_tab_view/xeno/xeno_tacmap - allowed_flags = MINIMAP_FLAG_XENO - owner = xeno_tacmap - -/datum/tacmap/Destroy() - map_holder = null - owner = null - return ..() + live = TRUE + drawing = FALSE -/datum/tacmap/drawing/Destroy() - new_current_map = null - old_map = null - current_svg = null - return ..() +/datum/action/minimap/observer/action_activate() + . = ..() + if(!.) + return + if(!minimap_displayed) + map.stop_polling[owner] = TRUE + return + var/list/clicked_coords = map.get_coords_from_click(owner) + if(!clicked_coords) + toggle_minimap(FALSE) + return + var/turf/clicked_turf = locate(clicked_coords[1], clicked_coords[2], owner.z) + if(!clicked_turf) + toggle_minimap(FALSE) + return + // Taken directly from observer/DblClickOn + owner.abstract_move(clicked_turf) + // Close minimap + toggle_minimap(FALSE) + +/atom/movable/screen/exit_map + name = "Close Minimap" + desc = "Close the minimap." + icon = 'icons/ui_icons/minimap_buttons.dmi' + icon_state = "close" + screen_loc = "RIGHT,TOP" + plane = ABOVE_TACMAP_PLANE + layer = INTRO_LAYER + var/datum/component/tacmap/linked_map + +/atom/movable/screen/exit_map/Initialize(mapload, linked_map) + . = ..() + src.linked_map = linked_map -/datum/tacmap/tgui_interact(mob/user, datum/tgui/ui) - if(!map_holder) - var/level = SSmapping.levels_by_trait(targeted_ztrait) - if(!level[target_z]) - return - map_holder = SSminimaps.fetch_tacmap_datum(level[target_z], allowed_flags) +/atom/movable/screen/exit_map/MouseEntered(location, control, params) + . = ..() + add_filter("mouseover", 1, outline_filter(1, COLOR_WHITE)) + if(desc) + openToolTip(usr, src, params, title = name, content = desc, special="offset_left") - ui = SStgui.try_update_ui(user, src, ui) - if(!ui) - user.client.register_map_obj(map_holder.map) - ui = new(user, src, "TacticalMap") - ui.open() - RegisterSignal(user.mind, COMSIG_MIND_TRANSFERRED, PROC_REF(on_mind_transferred)) +/atom/movable/screen/exit_map/MouseExited(location, control, params) + . = ..() + remove_filter("mouseover") + if(desc) + closeToolTip(usr) -/datum/tacmap/drawing/tgui_interact(mob/user, datum/tgui/ui) - var/mob/living/carbon/xenomorph/xeno = user - var/is_xeno = istype(xeno) - var/faction = is_xeno ? xeno.hivenumber : user.faction - if(faction == FACTION_NEUTRAL && isobserver(user)) - faction = allowed_flags == MINIMAP_FLAG_XENO ? XENO_HIVE_NORMAL : FACTION_MARINE - - if(is_xeno && xeno.hive.see_humans_on_tacmap) - if(targeted_ztrait != ZTRAIT_MARINE_MAIN_SHIP && !xeno.hive.need_round_end_check) - targeted_ztrait = ZTRAIT_MARINE_MAIN_SHIP - allowed_flags |= MINIMAP_FLAG_USCM|MINIMAP_FLAG_WY|MINIMAP_FLAG_UPP|MINIMAP_FLAG_CLF - map_holder = null - - new_current_map = get_unannounced_tacmap_data_png(faction) - old_map = get_tacmap_data_png(faction) - current_svg = get_tacmap_data_svg(faction) - - var/use_live_map = faction == FACTION_MARINE && skillcheck(user, SKILL_OVERWATCH, SKILL_OVERWATCH_TRAINED) || is_xeno - - if(use_live_map && !map_holder) - var/level = SSmapping.levels_by_trait(targeted_ztrait) - if(!level[target_z]) - return - map_holder = SSminimaps.fetch_tacmap_datum(level[target_z], allowed_flags) - - ui = SStgui.try_update_ui(user, src, ui) - if(!ui) - if(!wiki_map_fallback) - var/wiki_url = CONFIG_GET(string/wikiurl) - var/obj/item/map/current_map/new_map = new - if(wiki_url && new_map.html_link) - wiki_map_fallback ="[wiki_url]/[new_map.html_link]" - else - debug_log("Failed to determine fallback wiki map! Attempted '[wiki_url]/[new_map.html_link]'") - qdel(new_map) +/atom/movable/screen/exit_map/clicked(mob/user, list/mods) + linked_map.on_unset_interaction(user) + return TRUE - // Ensure we actually have the map image sent - resend_current_map_png(user) +/atom/movable/screen/minimap_tool + icon = 'icons/ui_icons/minimap_buttons.dmi' + layer = TACMAP_LAYER + plane = ABOVE_TACMAP_PLANE + ///x offset of the minimap icon for this zlevel. mostly used for shorthand + var/x_offset + ///y offset of the minimap icon for this zlevel. mostly used for shorthand + var/y_offset + ///zlevel that this minimap tool applies to and which it will be drawing on + var/zlevel + /// active mouse icon when the tool is selected + var/active_mouse_icon + ///one minimap flag that this tool will be drawing on + var/minimap_flag + /// reference to the icon we are manipulating when drawing, fetched during initialize + var/image/drawn_image + /// what minimap screen we drawing to + var/atom/movable/screen/minimap/linked_map + /// datum owner of this minimap tool + var/datum/component/tacmap/owner + +/atom/movable/screen/minimap_tool/Initialize(mapload, zlevel, minimap_flag, linked_map, owner) + . = ..() + src.owner = owner + src.minimap_flag = minimap_flag + src.zlevel = zlevel + src.linked_map = linked_map + if(SSminimaps.initialized) + set_zlevel(zlevel, minimap_flag) + return + LAZYADDASSOCLIST(SSminimaps.earlyadds, "[zlevel]", CALLBACK(src, PROC_REF(set_zlevel), zlevel, minimap_flag)) - if(use_live_map) - tacmap_ready_time = SSminimaps.next_fire + 2 SECONDS - addtimer(CALLBACK(src, PROC_REF(on_tacmap_fire), faction), SSminimaps.next_fire - world.time + 1 SECONDS) - user.client.register_map_obj(map_holder.map) - RegisterSignal(user.mind, COMSIG_MIND_TRANSFERRED, PROC_REF(on_mind_transferred)) +/atom/movable/screen/minimap_tool/Destroy() + owner = null + . = ..() - ui = new(user, src, "TacticalMap") - ui.open() +///Setter for the offsets of the x and y of drawing based on the input z, and the drawn_image +/atom/movable/screen/minimap_tool/proc/set_zlevel(zlevel, minimap_flag) + x_offset = SSminimaps.minimaps_by_z["[zlevel]"] ? SSminimaps.minimaps_by_z["[zlevel]"].x_offset : 0 + y_offset = SSminimaps.minimaps_by_z["[zlevel]"] ? SSminimaps.minimaps_by_z["[zlevel]"].y_offset : 0 + drawn_image = SSminimaps.get_drawing_image(zlevel, minimap_flag) -/datum/tacmap/ui_data(mob/user) +/atom/movable/screen/minimap_tool/MouseEntered(location, control, params) . = ..() + add_filter("mouseover", 1, outline_filter(1, COLOR_WHITE)) + if(desc) + openToolTip(usr, src, params, title = name, content = desc, special="offset_left") - .["mapRef"] = map_holder?.map_ref +/atom/movable/screen/minimap_tool/MouseExited(location, control, params) + . = ..() + remove_filter("mouseover") + if(desc) + closeToolTip(usr) + +/atom/movable/screen/minimap_tool/clicked(mob/user, list/mods) + if(LAZYACCESS(mods, LEFT_CLICK)) + RegisterSignal(user, COMSIG_MOB_MOUSEDOWN, PROC_REF(on_mousedown)) + user.client.mouse_pointer_icon = active_mouse_icon + return TRUE -/datum/tacmap/drawing/ui_data(mob/user) - var/list/data = list() +/** + * handles actions when the mouse is held down while the tool is active. + * returns COMSIG_MOB_CLICK_CANCELED to continue handling, NONE to cancel + */ +/atom/movable/screen/minimap_tool/proc/on_mousedown(mob/source, atom/object, location, control, params) + SIGNAL_HANDLER + if(!(src in source.client.screen)) + UnregisterSignal(source, COMSIG_MOB_MOUSEDOWN) + source.client.mouse_pointer_icon = null + return NONE + if(istype(object, /atom/movable/screen/minimap_tool) || istype(object, /atom/movable/screen/exit_map)) + linked_map.active_draw_tool = null + UnregisterSignal(source, COMSIG_MOB_MOUSEDOWN) + source.client.mouse_pointer_icon = null + return NONE + return COMSIG_MOB_CLICK_CANCELED + +/atom/movable/screen/minimap_tool/draw_tool + icon_state = "draw" + desc = "Draw using a color. Drag to draw freely, middle click to place a dot. Middle click this button to unselect." + // color that this draw tool will be drawing in + color = COLOR_PINK + ///temporary existing list used to calculate a line between the start of a click and the end of a click + var/list/starting_coords + + var/list/freedraw_queue = list() + var/list/last_coords + /// Width of the lines this is going to draw + var/width = 0 + + /// Whether we're drawing right now. Used to no-op clickdrag macros that we want to blackhole without deleting the verb from the client + var/drawing + +/atom/movable/screen/minimap_tool/draw_tool/clicked(mob/user, list/mods) + . = ..() + if(LAZYACCESS(mods, MIDDLE_CLICK)) + user.client.active_draw_tool = null + linked_map.active_draw_tool = null + winset(user, "drawingtools", "reset=true") + return - data["newCanvasFlatImage"] = new_current_map?.flat_tacmap - data["oldCanvasFlatImage"] = old_map?.flat_tacmap - data["svgData"] = current_svg?.svg_data + winset(user, "drawingtools", "parent=default;name=MouseDragMove;command=\".mouse-draw \[\[mapwindow.map.mouse-pos.x]] \[\[mapwindow.map.mouse-pos.y]] \[\[mapwindow.map.size.x]] \[\[mapwindow.map.size.y]] \[\[mapwindow.map.view-size.x]] \[\[mapwindow.map.view-size.y]]\"") + add_verb(user.client, /client/proc/handle_draw) + linked_map.active_draw_tool = src + user.client.active_draw_tool = src - data["actionQueueChange"] = action_queue_change +/client/var/atom/movable/screen/minimap_tool/draw_tool/active_draw_tool +/client/var/last_drawn +/client/proc/handle_draw(mouse_x as num, mouse_y as num, size_x as num, size_y as num, view_size_x as num, view_size_y as num) + set instant = TRUE + set category = null + set hidden = TRUE + set name = ".mouse-draw" - data["toolbarColorSelection"] = toolbar_color_selection - data["toolbarUpdatedSelection"] = toolbar_updated_selection + if(!active_draw_tool) + return - if(isxeno(user)) - data["canvasCooldown"] = max(GLOB.xeno_canvas_cooldown - world.time, 0) - else - data["canvasCooldown"] = max(GLOB.uscm_canvas_cooldown - world.time, 0) + if (!active_draw_tool.drawing) + return - data["updatedCanvas"] = updated_canvas + mouse_y = size_y - mouse_y - data["lastUpdateTime"] = last_update_time - data["tacmapReady"] = world.time > tacmap_ready_time - data["mapRef"] = map_holder?.map_ref + var/horizontal_letterbox = size_x - view_size_x + var/vertical_letterbox = size_y - view_size_y - return data + if(horizontal_letterbox) + mouse_x -= floor(horizontal_letterbox / 2) -/datum/tacmap/ui_static_data(mob/user) - var/list/data = list() + if(vertical_letterbox) + mouse_y -= floor(vertical_letterbox / 2) - data["canDraw"] = FALSE - data["canViewTacmap"] = TRUE - data["canChangeZ"] = FALSE - data["canViewCanvas"] = FALSE - data["isxeno"] = FALSE + mouse_x = floor(mouse_x * (SCREEN_PIXEL_SIZE / view_size_x)) + mouse_y = floor(mouse_y * (SCREEN_PIXEL_SIZE / view_size_y)) - return data + if(mouse_x < 0 || mouse_y < 0) + return -/datum/tacmap/drawing/ui_static_data(mob/user) - var/list/data = list() + active_draw_tool.freedraw_queue += vector(mouse_x, mouse_y) - data["canvasCooldownDuration"] = CANVAS_COOLDOWN_TIME - data["canDraw"] = FALSE - data["mapFallback"] = wiki_map_fallback - data["canChangeZ"] = TRUE + if(last_drawn == world.time) + return + last_drawn = world.time - var/mob/living/carbon/xenomorph/xeno = user - var/is_xeno = istype(xeno) - var/faction = is_xeno ? xeno.hivenumber : user.faction + sleep(0) // to reschedule us to the end of the tick - data["isxeno"] = is_xeno - data["canViewTacmap"] = is_xeno - data["canViewCanvas"] = faction == FACTION_MARINE || faction == XENO_HIVE_NORMAL + if(!mob) + return + active_draw_tool.process_queue(mob) - if(can_draw(faction, user)) - data["canDraw"] = TRUE - data["canViewTacmap"] = TRUE - return data +/atom/movable/screen/minimap_tool/draw_tool/proc/process_queue(mob/user) + var/icon/slate = icon(drawn_image.icon) + var/first = TRUE + var/atom/movable/screen/plane_master/minimap/plane_master = user.hud_used.plane_masters["[TACMAP_PLANE]"] -/datum/tacmap/drawing/status_tab_view/ui_static_data(mob/user) - var/list/data = list() + if(!plane_master) + return - data["canvasCooldownDuration"] = CANVAS_COOLDOWN_TIME - data["mapFallback"] = wiki_map_fallback - data["canDraw"] = FALSE - data["canViewTacmap"] = FALSE - data["canViewCanvas"] = TRUE - data["isxeno"] = FALSE + if(!last_coords) + var/vector/first_in_queue = freedraw_queue[1] + last_coords = list(first_in_queue.x + plane_master.cur_x_shift, first_in_queue.y + plane_master.cur_x_shift) + else + first = FALSE - return data + for(var/vector/vector in freedraw_queue) + if(first) + first = FALSE + continue -/datum/tacmap/drawing/status_tab_view/xeno/ui_static_data(mob/user) - var/list/data = list() + var/px = vector.x + plane_master.cur_x_shift + var/py = vector.y + plane_master.cur_y_shift - data["canvasCooldownDuration"] = CANVAS_COOLDOWN_TIME - data["mapFallback"] = wiki_map_fallback - data["canDraw"] = FALSE - data["canViewTacmap"] = FALSE - data["canViewCanvas"] = TRUE - data["isxeno"] = TRUE + if(width) + draw_line_width(last_coords, list(px, py), slate, width) + else + draw_line(last_coords, list(px, py), slate) + last_coords = list(px, py) - return data + addtimer(VARSET_CALLBACK(src, last_coords, null), 2, TIMER_UNIQUE|TIMER_OVERRIDE) + addtimer(VARSET_CALLBACK(src, freedraw_queue, list()), 2, TIMER_UNIQUE|TIMER_OVERRIDE) + drawn_image.icon = slate + freedraw_queue = list() -/datum/tacmap/ui_close(mob/user) - UnregisterSignal(user.mind, COMSIG_MIND_TRANSFERRED) +/atom/movable/screen/minimap_tool/draw_tool/on_mousedown(mob/source, atom/object, location, control, params) + . = ..() + if(!.) + return + + // N.B. popup tacmap is a different control; we never want to recieve drawing inputs from it. + if (control != "mapwindow.map") + drawing = FALSE + return COMSIG_MOB_CLICK_CANCELED + else + drawing = TRUE + + var/atom/movable/screen/plane_master/minimap/plane_master = source.hud_used.plane_masters["[TACMAP_PLANE]"] + + if(!plane_master) + return -/datum/tacmap/drawing/ui_close(mob/user) + var/list/modifiers = params2list(params) + var/list/pixel_coords = params2screenpixel(modifiers["screen-loc"]) + pixel_coords = list(pixel_coords[1] + plane_master.cur_x_shift, pixel_coords[2] + plane_master.cur_y_shift) + if(modifiers[BUTTON] == MIDDLE_CLICK) + var/icon/mona_lisa = icon(drawn_image.icon) + mona_lisa.DrawBox(color, pixel_coords[1], pixel_coords[2], ++pixel_coords[1], ++pixel_coords[2]) + drawn_image.icon = mona_lisa + return COMSIG_MOB_CLICK_CANCELED + starting_coords = pixel_coords + return COMSIG_MOB_CLICK_CANCELED + +/atom/movable/screen/minimap_tool/draw_tool/proc/draw_line_width(list/start_coords, list/end_coords, icon/slate, width, draw_color = color) + var/half_width = floor(width / 2) + var/x1 = start_coords[1] + var/x2 = end_coords[1] + var/y1 = start_coords[2] + var/y2 = end_coords[2] + + if(abs(x2 - x1) > abs(y2 - y1)) + for(var/offset in -half_width to half_width) + draw_line(list(x1, y1+offset), list(x2, y2+offset), slate, draw_color) + else + for(var/offset in -half_width to half_width) + draw_line(list(x1+offset, y1), list(x2+offset, y2), slate, draw_color) + + return slate + +/// proc for drawing a line from list(startx, starty) to list(endx, endy) on the screen. yes this is aa ripoff of [/proc/getline] +/atom/movable/screen/minimap_tool/draw_tool/proc/draw_line(list/start_coords, list/end_coords, icon/slate, draw_color = color) + // converts these into the unscaled minimap version so we have to do less calculating + var/start_x = FLOOR(start_coords[1]/2, 1) + var/start_y = FLOOR(start_coords[2]/2, 1) + var/end_x = FLOOR(end_coords[1]/2, 1) + var/end_y = FLOOR(end_coords[2]/2, 1) + + //special case 1, straight line + if(start_x == end_x) + slate.DrawBox(draw_color, start_x*2, start_y*2, start_x*2 + 1, end_y*2 + 1) + return slate + if(start_y == end_y) + slate.DrawBox(draw_color, start_x*2, start_y*2, end_x*2 + 1, start_y*2 + 1) + return slate + + slate.DrawBox(draw_color, start_x*2, start_y*2, start_x*2 + 1, start_y*2 + 1) + + var/abs_dx = abs(end_x - start_x) + var/abs_dy = abs(end_y - start_y) + var/sign_dx = ( ((end_x - start_x) > 0) - ((end_x - start_x) < 0) ) + var/sign_dy = ( ((end_y - start_y) > 0) - ((end_y - start_y) < 0) ) + + //special case 2, perfectly diagonal line + if(abs_dx == abs_dy) + for(var/j = 1 to abs_dx) + start_x += sign_dx + start_y += sign_dy + slate.DrawBox(draw_color, start_x*2, start_y*2, start_x*2 + 1, start_y*2 + 1) + return slate + + /*x_error and y_error represents how far we are from the ideal line. + Initialized so that we will check these errors against 0, instead of 0.5 * abs_(dx/dy)*/ + //We multiply every check by the line slope denominator so that we only handles integers + if(abs_dx > abs_dy) + var/y_error = -(abs_dx >> 1) + var/steps = abs_dx + while(steps--) + y_error += abs_dy + if(y_error > 0) + y_error -= abs_dx + start_y += sign_dy + start_x += sign_dx + slate.DrawBox(draw_color, start_x*2, start_y*2, start_x*2 + 1, start_y*2 + 1) + else + var/x_error = -(abs_dy >> 1) + var/steps = abs_dy + while(steps--) + x_error += abs_dx + if(x_error > 0) + x_error -= abs_dy + start_x += sign_dx + start_y += sign_dy + slate.DrawBox(draw_color, start_x*2, start_y*2, start_x*2 + 1, start_y*2 + 1) + return slate + +/atom/movable/screen/minimap_tool/draw_tool/green + screen_loc = "14,14" + active_mouse_icon = 'icons/ui_icons/minimap_mouse/draw_green.dmi' + color = MINIMAP_DRAWING_GREEN + +/atom/movable/screen/minimap_tool/draw_tool/black + screen_loc = "14,13" + active_mouse_icon = 'icons/ui_icons/minimap_mouse/draw_black.dmi' + color = MINIMAP_DRAWING_BLACK + +/atom/movable/screen/minimap_tool/draw_tool/red + screen_loc = "15,14" + active_mouse_icon = 'icons/ui_icons/minimap_mouse/draw_red.dmi' + color = MINIMAP_DRAWING_RED + +/atom/movable/screen/minimap_tool/draw_tool/yellow + screen_loc = "15,13" + active_mouse_icon = 'icons/ui_icons/minimap_mouse/draw_yellow.dmi' + color = MINIMAP_DRAWING_YELLOW + +/atom/movable/screen/minimap_tool/draw_tool/purple + screen_loc = "15,12" + active_mouse_icon = 'icons/ui_icons/minimap_mouse/draw_purple.dmi' + color = MINIMAP_DRAWING_PURPLE + +/atom/movable/screen/minimap_tool/draw_tool/blue + screen_loc = "15,11" + active_mouse_icon = 'icons/ui_icons/minimap_mouse/draw_blue.dmi' + color = MINIMAP_DRAWING_BLUE + +/atom/movable/screen/minimap_tool/draw_tool/erase + icon_state = "erase" + desc = "Drag to erase freely, middle click to erase a dot. Middle click this button to unselect." + active_mouse_icon = 'icons/ui_icons/minimap_mouse/draw_erase.dmi' + screen_loc = "15,10" + color = null + width = 5 + +/atom/movable/screen/minimap_tool/label + icon_state = "label" + desc = "Click to place a label. Middle click a label to remove it. Middle click this button to remove all labels." + active_mouse_icon = 'icons/ui_icons/minimap_mouse/label.dmi' + screen_loc = "15,9" + +/atom/movable/screen/minimap_tool/label/clicked(mob/user, list/mods) . = ..() - action_queue_change = 0 - updated_canvas = FALSE - toolbar_color_selection = "black" - toolbar_updated_selection = "black" + if(LAZYACCESS(mods, MIDDLE_CLICK)) + clear_labels(user) + +///Clears all labels and logs who did it +/atom/movable/screen/minimap_tool/label/proc/clear_labels(mob/user) + for(var/turf/label as anything in linked_map.labelled_turfs) + SSminimaps.remove_marker(label) -/datum/tacmap/drawing/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +/atom/movable/screen/minimap_tool/label/on_mousedown(mob/source, atom/object, location, control, params) . = ..() - if(.) + if(!.) return - var/mob/user = ui.user - var/mob/living/carbon/xenomorph/xeno = user - var/faction = istype(xeno) ? xeno.hivenumber : user.faction - var/is_observer = isobserver(user) - if(faction == FACTION_NEUTRAL && is_observer) - faction = allowed_flags == MINIMAP_FLAG_XENO ? XENO_HIVE_NORMAL : FACTION_MARINE - var/drawing_allowed = !is_observer && can_draw(faction, user) - - switch (action) - if ("menuSelect") - if(params["selection"] != "Canvas") - if(updated_canvas) - updated_canvas = FALSE - toolbar_updated_selection = toolbar_color_selection // doing this if it == canvas can cause a latency issue with the stroke. - else - if(!drawing_allowed) - msg_admin_niche("[key_name(user)] made an unauthorized attempt to 'menuSelect' the 'new canvas' panel of the [faction] tacmap!") - return FALSE - distribute_current_map_png(faction) - last_update_time = world.time - // An attempt to get the image to load on first try in the interface, but doesn't seem always reliable - - new_current_map = get_unannounced_tacmap_data_png(faction) - old_map = get_tacmap_data_png(faction) - current_svg = get_tacmap_data_svg(faction) - - if("updateCanvas") - toolbar_updated_selection = "export" - updated_canvas = TRUE - action_queue_change += 1 - - if("clearCanvas") - toolbar_updated_selection = "clear" - updated_canvas = FALSE - action_queue_change += 1 - - if("undoChange") - toolbar_updated_selection = "undo" - updated_canvas = FALSE - action_queue_change += 1 - - if("selectColor") - var/newColor = params["color"] - if(newColor) - toolbar_color_selection = newColor - toolbar_updated_selection = newColor - action_queue_change += 1 - - if("onDraw") - updated_canvas = FALSE - - if("changeZ") - var/amount = params["amount"] - var/level = SSmapping.levels_by_trait(targeted_ztrait) - if(target_z+amount < 1 || target_z+amount > length(level) || !SSmapping.same_z_map(level[target_z], level[target_z+amount])) - return + // N.B. popup tacmap is a different control; we never want to recieve drawing inputs from it. + if (control != "mapwindow.map") + return COMSIG_MOB_CLICK_CANCELED - target_z += amount + INVOKE_ASYNC(src, PROC_REF(async_mousedown), source, object, location, control, params) + return COMSIG_MOB_CLICK_CANCELED - if(!level[target_z]) - return +///async mousedown for the actual label placement handling +/atom/movable/screen/minimap_tool/label/proc/async_mousedown(mob/source, atom/object, location, control, params) + // this is really [/atom/movable/screen/minimap/proc/get_coords_from_click] copypaste since we + // want to also cancel the click if they click src and I can't be bothered to make it even more generic rn + var/atom/movable/screen/plane_master/minimap/plane_master = source.hud_used.plane_masters["[TACMAP_PLANE]"] - if(user.client) - user.client.clear_map(map_holder.map.name) - map_holder = SSminimaps.fetch_tacmap_datum(level[target_z], allowed_flags) - resend_current_map_png(user) - if(user.client) - user.client.register_map_obj(map_holder.map) - - distribute_current_map_png(faction) - last_update_time = world.time - - new_current_map = get_unannounced_tacmap_data_png(faction) - old_map = get_tacmap_data_png(faction) - current_svg = get_tacmap_data_svg(faction) - - - if("selectAnnouncement") - if(!drawing_allowed) - msg_admin_niche("[key_name(user)] made an unauthorized attempt to 'selectAnnouncement' the [faction] tacmap!") - return FALSE - - if(!istype(params["image"], /list)) // potentially very serious? - return FALSE - - var/cooldown_satisfied = FALSE - if(faction == FACTION_MARINE) - cooldown_satisfied = COOLDOWN_FINISHED(GLOB, uscm_canvas_cooldown) - else if(faction == XENO_HIVE_NORMAL) - cooldown_satisfied = COOLDOWN_FINISHED(GLOB, xeno_canvas_cooldown) - if(!cooldown_satisfied) - msg_admin_niche("[key_name(user)] attempted to 'selectAnnouncement' the [faction] tacmap while it is still on cooldown!") - return FALSE - - if(faction == FACTION_MARINE) - GLOB.uscm_flat_tacmap_data += new_current_map - COOLDOWN_START(GLOB, uscm_canvas_cooldown, CANVAS_COOLDOWN_TIME) - for(var/datum/squad/current_squad in GLOB.RoleAuthority.squads) - current_squad.send_maptext("Tactical map update in progress...", "Tactical Map:") - var/mob/living/carbon/human/human_leader = user - human_leader.visible_message(SPAN_BOLDNOTICE("Tactical map update in progress...")) - playsound_client(human_leader.client, "sound/effects/data-transmission.ogg") - notify_ghosts(header = "Tactical Map", message = "The USCM tactical map has been updated.", ghost_sound = "sound/effects/data-transmission.ogg", notify_volume = 80, action = NOTIFY_USCM_TACMAP, enter_link = "uscm_tacmap=1", enter_text = "View", source = owner) - else if(faction == XENO_HIVE_NORMAL) - GLOB.xeno_flat_tacmap_data += new_current_map - COOLDOWN_START(GLOB, xeno_canvas_cooldown, CANVAS_COOLDOWN_TIME) - xeno_maptext("The Queen has updated our hive mind map", "We sense something unusual...", faction) - var/mutable_appearance/appearance = mutable_appearance(icon('icons/mob/hud/actions_xeno.dmi'), "toggle_queen_zoom") - notify_ghosts(header = "Tactical Map", message = "The Xenomorph tactical map has been updated.", ghost_sound = "sound/voice/alien_distantroar_3.ogg", notify_volume = 50, action = NOTIFY_XENO_TACMAP, enter_link = "xeno_tacmap=1", enter_text = "View", source = user, alert_overlay = appearance) - - store_current_svg_coords(faction, params["image"], user) - current_svg = get_tacmap_data_svg(faction) - old_map = get_tacmap_data_png(faction) - - toolbar_updated_selection = toolbar_color_selection - message_admins("[key_name(user)] has updated the tactical map for [faction].") - updated_canvas = FALSE + if(!plane_master) + return - return TRUE + var/list/modifiers = params2list(params) + var/list/pixel_coords = params2screenpixel(modifiers["screen-loc"]) + var/x = (pixel_coords[1] - x_offset + plane_master.cur_x_shift) / MINIMAP_SCALE + var/y = (pixel_coords[2] - y_offset + plane_master.cur_y_shift) / MINIMAP_SCALE + var/c_x = clamp(CEILING(x, 1), 1, world.maxx) + var/c_y = clamp(CEILING(y, 1), 1, world.maxy) + var/turf/target = locate(c_x, c_y, zlevel) + if(modifiers[BUTTON] == MIDDLE_CLICK) + var/curr_dist + var/turf/nearest + for(var/turf/label as anything in linked_map.labelled_turfs) + var/dist = get_dist_euclidian(label, target) + if(dist > LABEL_REMOVE_RANGE) + continue + if(!curr_dist || curr_dist > dist) + curr_dist = dist + nearest = label + if(nearest) + SSminimaps.remove_marker(nearest) + return + var/label_text = MAPTEXT(tgui_input_text(source, title = "Label Name", max_length = 35)) + if(!label_text) + return + var/atom/movable/screen/minimap/mini = SSminimaps.fetch_minimap_object(zlevel, minimap_flag, live=TRUE, popup=FALSE, drawing=TRUE) + if(!locate(mini) in source.client?.screen) + return -/datum/tacmap/ui_status(mob/user) - if(!(isatom(owner))) - return UI_INTERACTIVE + var/mutable_appearance/textbox = mutable_appearance(icon('icons/ui_icons/map_blips.dmi'), "label", ABOVE_FLOAT_LAYER, appearance_flags = KEEP_TOGETHER) + textbox.maptext_x = 5 + textbox.maptext_y = 5 + textbox.maptext_width = 64 + textbox.maptext = label_text + + linked_map.labelled_turfs += target + msg_admin_niche("[key_name(source)] has crated a label at ([target.x],[target.y]) with text: [label_text].") + SSminimaps.add_marker(target, minimap_flag, textbox, is_label=TRUE) + +/atom/movable/screen/minimap_tool/clear + icon_state = "clear" + desc = "Remove all current labels and drawings." + screen_loc = "15,8" + +/atom/movable/screen/minimap_tool/clear/clicked(mob/user, list/mods) + drawn_image.icon = icon('icons/ui_icons/minimap.dmi') + var/atom/movable/screen/minimap_tool/label/labels = locate() in user.client?.screen + labels?.clear_labels(user) + +/atom/movable/screen/minimap_tool/update + icon_state = "update" + desc = "Send a tacmap update." + screen_loc = "15,7" + +/atom/movable/screen/minimap_tool/update/proc/cooldown_finished() + icon_state = initial(icon_state) + +/atom/movable/screen/minimap_tool/update/clicked(mob/user, list/mods) + var/time_left = get_cooldown_for_minimap_flag(minimap_flag) - world.time + + if(time_left > 0) + to_chat(user, SPAN_WARNING("Wait another [DisplayTimeText(time_left)] before sending another update.")) + if(icon_state != "update_cooldown") + icon_state = "update_cooldown" + addtimer(CALLBACK(src, PROC_REF(cooldown_finished)), time_left, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_NO_HASH_WAIT) + return + + set_cooldown_for_minimap_flag(minimap_flag, CANVAS_COOLDOWN_TIME) + addtimer(CALLBACK(src, PROC_REF(cooldown_finished)), CANVAS_COOLDOWN_TIME, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_NO_HASH_WAIT) + icon_state = "update_cooldown" - var/dist = get_dist(owner, user) - if(dist <= 1) - return UI_INTERACTIVE - else if(dist <= 2) - return UI_UPDATE + if(linked_map.minimap_flags & MINIMAP_FLAG_XENO) + announce_xeno(user) else - return UI_CLOSE + announce_human(user) -/datum/tacmap/drawing/xeno/ui_status(mob/user) - if(!isxeno(user)) - return UI_CLOSE + message_admins("[key_name(user)] has updated the tactical map.") - var/mob/living/carbon/xenomorph/xeno = user - if(!xeno.hive?.living_xeno_queen?.ovipositor && xeno.hive?.tacmap_requires_queen_ovi) - return UI_CLOSE +/atom/movable/screen/minimap_tool/update/proc/announce_xeno(mob/user) + playsound_client(user.client, get_sfx("queen")) - return UI_INTERACTIVE + user.client.images += drawn_image + var/icon/flat_drawing = icon(user.client.RenderIcon(drawn_image)) + user.client.images -= drawn_image + var/icon/flat_map = icon(user.client.RenderIcon(linked_map)) + if(!flat_map || !flat_drawing) + to_chat(user, SPAN_WARNING("A critical error has occurred!! Contact a coder.")) + return FALSE -// This gets removed when the player changes bodies (i.e. xeno evolution), so re-register it when that happens. -/datum/tacmap/proc/on_mind_transferred(datum/mind/source, mob/previous_body) - SIGNAL_HANDLER - source.current.client.register_map_obj(map_holder.map) + var/list/faction_clients = list() + for(var/client/client as anything in GLOB.clients) + if(!client || !client.mob) + continue + var/mob/client_mob = client.mob + if(linked_map.minimap_flags & get_minimap_flag_for_faction(client_mob.faction)) + faction_clients += client + else if(client_mob.faction == FACTION_NEUTRAL && isobserver(client_mob)) + faction_clients += client + else if(isxeno(client_mob)) + var/mob/living/carbon/xenomorph/xeno = client_mob + if(linked_map.minimap_flags & get_minimap_flag_for_faction(xeno.hivenumber)) + faction_clients += client -/datum/tacmap_holder - var/map_ref - var/atom/movable/screen/minimap/map + var/flat_tacmap_key = icon2html(flat_map, faction_clients, keyonly = TRUE) + var/flat_drawing_key = icon2html(flat_drawing, faction_clients, keyonly = TRUE) + if(!flat_tacmap_key || !flat_drawing_key) + to_chat(user, SPAN_WARNING("A critical error has occurred! Contact a coder.")) + return FALSE + var/flat_tacmap_png = SSassets.transport.get_asset_url(flat_tacmap_key) + var/flat_drawing_png = SSassets.transport.get_asset_url(flat_drawing_key) + var/datum/flattened_tacmap/new_flat = new(flat_tacmap_png, flat_tacmap_key) + var/datum/drawing_data/draw_data = new(flat_drawing_png, user, flat_drawing_key) -/datum/tacmap_holder/New(loc, zlevel, flags) - map_ref = "tacmap_[REF(src)]_map" - map = SSminimaps.fetch_minimap_object(zlevel, flags) - map.screen_loc = "[map_ref]:1,1" - map.assigned_map = map_ref - map.appearance_flags = NONE // If you really want TILE_BOUND for the tacmaps, you need to CENTER it but it won't be scaled right + GLOB.xeno_flat_tacmap_data += new_flat + GLOB.xeno_drawing_tacmap_data += draw_data -/datum/tacmap_holder/Destroy() - map = null - return ..() + xeno_maptext("The Queen has updated our hive mind map", "We sense something unusual...", XENO_HIVE_NORMAL) + var/mutable_appearance/appearance = mutable_appearance(icon('icons/mob/hud/actions_xeno.dmi'), "toggle_queen_zoom") + notify_ghosts(header = "Tactical Map", message = "The Xenomorph tactical map has been updated.", ghost_sound = "sound/voice/alien_distantroar_3.ogg", notify_volume = 50, action = NOTIFY_USCM_TACMAP, enter_link = "uscm_tacmap=1", enter_text = "View", source = user, alert_overlay = appearance) + return TRUE + +/atom/movable/screen/minimap_tool/update/proc/announce_human(mob/user) + playsound_client(user.client, "sound/effects/data-transmission.ogg") + + var/atom/movable/screen/minimap/minimap_to_update = SSminimaps.fetch_minimap_object(2, MINIMAP_FLAG_USCM, live=FALSE, popup=FALSE, drawing=TRUE) + minimap_to_update.update() + + user.client.images += drawn_image + var/icon/flat_drawing = icon(user.client.RenderIcon(drawn_image)) + user.client.images -= drawn_image + var/icon/flat_map = icon(user.client.RenderIcon(linked_map)) + if(!flat_map || !flat_drawing) + to_chat(user, SPAN_WARNING("A critical error has occurred!! Contact a coder.")) + return FALSE + + var/list/faction_clients = list() + for(var/client/client as anything in GLOB.clients) + if(!client || !client.mob) + continue + var/mob/client_mob = client.mob + if(linked_map.minimap_flags & get_minimap_flag_for_faction(client_mob.faction)) + faction_clients += client + else if(client_mob.faction == FACTION_NEUTRAL && isobserver(client_mob)) + faction_clients += client + else if(isxeno(client_mob)) + var/mob/living/carbon/xenomorph/xeno = client_mob + if(linked_map.minimap_flags & get_minimap_flag_for_faction(xeno.hivenumber)) + faction_clients += client + + var/flat_tacmap_key = icon2html(flat_map, faction_clients, keyonly = TRUE) + var/flat_drawing_key = icon2html(flat_drawing, faction_clients, keyonly = TRUE) + if(!flat_tacmap_key || !flat_drawing_key) + to_chat(user, SPAN_WARNING("A critical error has occurred! Contact a coder.")) + return FALSE + var/flat_tacmap_png = SSassets.transport.get_asset_url(flat_tacmap_key) + var/flat_drawing_png = SSassets.transport.get_asset_url(flat_drawing_key) + var/datum/flattened_tacmap/new_flat = new(flat_tacmap_png, flat_tacmap_key) + var/datum/drawing_data/draw_data = new(flat_drawing_png, user, flat_drawing_key) + + GLOB.uscm_flat_tacmap_data += new_flat + GLOB.uscm_drawing_tacmap_data += draw_data + + for(var/datum/squad/current_squad in GLOB.RoleAuthority.squads) + current_squad.send_maptext("Tactical map update in progress...", "Tactical Map:") + + var/atom/source = owner?.parent + if(!source) + source = user + notify_ghosts(header = "Tactical Map", message = "The USCM tactical map has been updated.", ghost_sound = "sound/effects/data-transmission.ogg", notify_volume = 80, action = NOTIFY_USCM_TACMAP, enter_link = "uscm_tacmap=1", enter_text = "View", source = source) + return TRUE /datum/flattened_tacmap var/flat_tacmap @@ -1084,22 +1493,80 @@ SUBSYSTEM_DEF(minimaps) src.asset_key = asset_key src.time = time_stamp() -/datum/svg_overlay - var/svg_data +/datum/drawing_data + var/draw_data + var/asset_key var/ckey var/name var/time -/datum/svg_overlay/New(svg_data, mob/user) - src.svg_data = svg_data +/datum/drawing_data/New(draw_data, mob/user, asset_key) + src.draw_data = draw_data + src.asset_key = asset_key src.ckey = user?.persistent_ckey src.name = user?.real_name src.time = time_stamp() -/// Callback when timer indicates the tacmap is flattenable now -/datum/tacmap/drawing/proc/on_tacmap_fire(faction) - distribute_current_map_png(faction) - last_update_time = world.time +/atom/movable/screen/minimap_tool/up + icon_state = "up" + desc = "Move up a level." + screen_loc = "15,6" + +/atom/movable/screen/minimap_tool/up/clicked(mob/user, list/modifiers) + if(!SSmapping.same_z_map(zlevel, zlevel+1)) + return + + owner.move_tacmap_up() + +/atom/movable/screen/minimap_tool/down + icon_state = "down" + desc = "Move down a level." + screen_loc = "15,5" + +/atom/movable/screen/minimap_tool/down/clicked(mob/user, list/modifiers) + if(!SSmapping.same_z_map(zlevel, zlevel-1)) + return + + owner.move_tacmap_down() + + return TRUE + +/atom/movable/screen/minimap_tool/popout + icon_state = "popout" + desc = "Pop the minimap to a window." + screen_loc = "15,4" + +/atom/movable/screen/minimap_tool/popout/clicked(mob/user, list/modifiers) + owner.popout(user) + return TRUE + +/atom/movable/screen/minimap_tool/popout/set_zlevel(zlevel, minimap_flag) + x_offset = SSminimaps.minimaps_by_z["[zlevel]"] ? SSminimaps.minimaps_by_z["[zlevel]"].x_offset : 0 + y_offset = SSminimaps.minimaps_by_z["[zlevel]"] ? SSminimaps.minimaps_by_z["[zlevel]"].y_offset : 0 + +/datum/proc/send_tacmap_assets_latejoin(mob/user) + if(!user.client) + return + + var/is_observer = user.faction == FACTION_NEUTRAL && isobserver(user) + if((is_observer || user.faction == FACTION_MARINE) && length(GLOB.uscm_flat_tacmap_data)) + // Send marine maps + var/datum/flattened_tacmap/latest = GLOB.uscm_flat_tacmap_data[length(GLOB.uscm_flat_tacmap_data)] + if(latest) + SSassets.transport.send_assets(user.client, latest.asset_key) + var/datum/drawing_data/latest_draw_data = GLOB.uscm_drawing_tacmap_data[length(GLOB.uscm_drawing_tacmap_data)] + if(latest_draw_data) + SSassets.transport.send_assets(user.client, latest_draw_data.asset_key) + + var/mob/living/carbon/xenomorph/xeno = user + if((is_observer || istype(xeno) && xeno.hivenumber == XENO_HIVE_NORMAL) && length(GLOB.xeno_flat_tacmap_data)) + // Send xeno maps + var/datum/flattened_tacmap/latest = GLOB.xeno_flat_tacmap_data[length(GLOB.xeno_flat_tacmap_data)] + if(latest) + SSassets.transport.send_assets(user.client, latest.asset_key) + var/datum/drawing_data/latest_draw_data = GLOB.xeno_drawing_tacmap_data[length(GLOB.xeno_drawing_tacmap_data)] + if(latest_draw_data) + SSassets.transport.send_assets(user.client, latest_draw_data.asset_key) /// Gets the MINIMAP_FLAG for the provided faction or hivenumber if one exists /proc/get_minimap_flag_for_faction(faction) @@ -1115,7 +1582,7 @@ SUBSYSTEM_DEF(minimaps) if(FACTION_CLF) return MINIMAP_FLAG_CLF if(FACTION_PMC) - return MINIMAP_FLAG_WY + return MINIMAP_FLAG_PMC if(FACTION_YAUTJA) return MINIMAP_FLAG_YAUTJA if(XENO_HIVE_CORRUPTED) @@ -1138,10 +1605,24 @@ SUBSYSTEM_DEF(minimaps) return MINIMAP_FLAG_XENO_FORSAKEN if(XENO_HIVE_YAUTJA) return MINIMAP_FLAG_YAUTJA + if(XENO_HIVE_HUNTED) + return MINIMAP_FLAG_XENO_HUNTED if(XENO_HIVE_RENEGADE) return MINIMAP_FLAG_XENO_RENEGADE return 0 +/// Returns the highest world.time for all minimap_flags passed +/proc/get_cooldown_for_minimap_flag(minimap_flag) + var/cooldown = 0 + for(var/flag in bitfield2list(minimap_flag)) + cooldown = max(cooldown, GLOB.faction_tacmap_cooldown[flag]) + return cooldown + +/// Sets the cooldown for all minimap_flags passed +/proc/set_cooldown_for_minimap_flag(minimap_flag, duration) + duration += world.time + for(var/flag in bitfield2list(minimap_flag)) + GLOB.faction_tacmap_cooldown[flag] = duration + #undef CANVAS_COOLDOWN_TIME -#undef FLATTEN_MAP_COOLDOWN_TIME -#undef can_draw +#undef LABEL_REMOVE_RANGE diff --git a/code/controllers/subsystem/objectives_controller.dm b/code/controllers/subsystem/objectives_controller.dm index 3bb57b521f7e..90e18222acac 100644 --- a/code/controllers/subsystem/objectives_controller.dm +++ b/code/controllers/subsystem/objectives_controller.dm @@ -125,12 +125,7 @@ SUBSYSTEM_DEF(objectives) var/research_legendary_hints = 8 //A stub of tweaking item spawns based on map - switch(SSmapping.configs[GROUND_MAP]) - if(MAP_LV_624) - paper_scraps = 35 - progress_reports = 12 - folders = 25 - disks = 25 + switch(SSmapping.configs[GROUND_MAP].map_name) if(MAP_CORSAT) research_papers = 30 experimental_devices = 20 @@ -165,6 +160,8 @@ SUBSYSTEM_DEF(objectives) for(var/i=0;i
"))) diff --git a/code/datums/highlight_keywords_payload.dm b/code/datums/highlight_keywords_payload.dm new file mode 100644 index 000000000000..330593d00fb3 --- /dev/null +++ b/code/datums/highlight_keywords_payload.dm @@ -0,0 +1,103 @@ +// Unlikely to come up in normal gameplay. +#define EMPTY_VALUE null + +// Make sure to update `KeywordMenu` in TextHighlight.tsx to show users what +// keywords they can use. +/datum/highlight_keywords_payload + var/name_full = EMPTY_VALUE + var/name_first = EMPTY_VALUE + var/name_middle = EMPTY_VALUE + var/name_last = EMPTY_VALUE + var/job_full = EMPTY_VALUE + var/job_comm_title = EMPTY_VALUE + var/xeno_prefix = EMPTY_VALUE + var/xeno_number = EMPTY_VALUE + var/xeno_postfix = EMPTY_VALUE + +/datum/highlight_keywords_payload/New(mob/mob) + ..() + + name_full = mob.real_name + job_full = mob.get_role_name() + + if(ishuman(mob)) + var/first_name_end = findtext(name_full, " ") + name_first = copytext(name_full, 1, first_name_end) + + var/last_name_start = findlasttext(name_full, " ") + if (last_name_start != 0) + name_last = copytext(name_full, last_name_start) + // If there is more than one space in the name, this triggers. + // Note that this will contains everything between the first and + // last names, so names like "John von Neumann" will trigger it. + if (first_name_end != last_name_start) + name_middle = copytext(name_full, first_name_end, last_name_start) + + // If this is called before the human is *equipped* it will be null. + job_comm_title = mob.comm_title + else if(isxeno(mob)) + // This is a more involved way of extracting the xeno's information, + // compared to checking the user's settings, but this works if they + // have changed their settings or are playing a different xeno. + var/dynamic_name_start = findlasttext(name_full, "(") + var/dynamic_name_end = findlasttext(name_full, ")") + // Get the "XX-123-YY" part of "Forsaken Prime Runner (XX-123-YY)". + var/dynamic_name = copytext(name_full, dynamic_name_start + 1, dynamic_name_end) + var/list/name_components = splittext(dynamic_name, "-") + + switch(length(name_components)) + if(1) + var/first_component = name_components[1] + + var/mob/living/carbon/xenomorph/xeno = mob + var/nicknumber = num2text(xeno.nicknumber) + + if (first_component == nicknumber) + xeno_number = first_component + else + xeno_prefix = first_component + // "Normal" xeno name patterns. + if(2) + var/first_component = name_components[1] + var/second_component = name_components[2] + + var/mob/living/carbon/xenomorph/xeno = mob + var/nicknumber = num2text(xeno.nicknumber) + + // 123-XX + if (first_component == nicknumber) + xeno_number = first_component + xeno_postfix = second_component + // XX-123 + else if (second_component == nicknumber) + xeno_prefix = first_component + xeno_number = second_component + // XX-YY + else + xeno_prefix = first_component + xeno_postfix = second_component + // XX-123-YY + if (3) + xeno_prefix = name_components[1] + xeno_number = name_components[2] + xeno_postfix = name_components[3] + + +/datum/highlight_keywords_payload/proc/to_list() + return list( + // Includes '' surrounding nickname. + fullName = name_full, + firstName = format_field(name_first), + middleName = format_field(name_middle), + lastName = format_field(name_last), + fullJob = format_field(job_full), + jobCommTitle = format_field(job_comm_title), + xenoPrefix = format_field(xeno_prefix), + xenoNumber = format_field(xeno_number), + xenoPostfix = format_field(xeno_postfix) + ) + +/proc/format_field(input) + for (var/bad_char in list("'", "\"", "$")) + input = replacetext(trim_right(trim_left(input)), bad_char, "") + return input diff --git a/code/datums/keybinding/carbon.dm b/code/datums/keybinding/carbon.dm index 8bdbbccb6add..653a5ca2dc16 100644 --- a/code/datums/keybinding/carbon.dm +++ b/code/datums/keybinding/carbon.dm @@ -5,6 +5,13 @@ /datum/keybinding/carbon/can_use(client/user) return iscarbon(user.mob) +/datum/keybinding/carbon/item/can_use(client/user) + . = ..() + if(!.) + return + var/mob/user_mob = user.mob + return isitem(user_mob.get_held_item()) + /datum/keybinding/carbon/toggle_throw_mode hotkey_keys = list("R", "Southwest") // END classic_keys =list("R", "Southwest") @@ -131,3 +138,19 @@ var/mob/living/carbon/C = user.mob C.give() return TRUE + +/datum/keybinding/carbon/item/unique_action + hotkey_keys = list("Space") + classic_keys = list("Unbound") + name = "unique_action" + full_name = "Unique Action" + keybind_signal = COMSIG_KB_CARBON_UNIQUEACTION + +/datum/keybinding/carbon/item/unique_action/down(client/user) + . = ..() + if(.) + return + var/mob/living/carbon/human/human = user.mob + var/obj/item/held_item = human.get_held_item() + held_item.use_unique_action() + return TRUE diff --git a/code/datums/keybinding/custom.dm b/code/datums/keybinding/custom.dm new file mode 100644 index 000000000000..9f37a7ca2594 --- /dev/null +++ b/code/datums/keybinding/custom.dm @@ -0,0 +1,45 @@ +/datum/keybinding/custom + description = "Custom keybinding, used for say/me/picksay keybindings." + keybind_signal = COMSIG_KB_CUSTOM_KEYBIND_DOWN + + /// If this is a say, me, or picksay keybind + var/keybind_type = KEYBIND_TYPE_SAY + + /// What should be said or me'd, or picked from if a picksay emote + var/contents = "" + + /// If this emote should fire when xenomorph + var/when_xeno = TRUE + + /// If this emote should fire when human + var/when_human = TRUE + + /// When this emote was last used + var/last_fired + + /// Emote cooldown duration + var/cooldown_duration = 0.5 SECONDS + +/datum/keybinding/custom/can_use(client/user) + . = ..() + + if(!COOLDOWN_FINISHED(src, last_fired)) + return FALSE + + if(isxeno(user?.mob)) + return when_xeno + + return when_human + +/datum/keybinding/custom/down(client/user) + . = ..() + + switch(keybind_type) + if(KEYBIND_TYPE_SAY) + user?.mob?.say_verb(contents) + if(KEYBIND_TYPE_ME) + user?.mob?.me_verb(contents) + if(KEYBIND_TYPE_PICKSAY) + user?.mob?.say_verb(pick(contents)) + + COOLDOWN_START(src, last_fired, cooldown_duration) diff --git a/code/datums/keybinding/human_combat.dm b/code/datums/keybinding/human_combat.dm index b96b4ee39960..a7d7e68ad1bc 100644 --- a/code/datums/keybinding/human_combat.dm +++ b/code/datums/keybinding/human_combat.dm @@ -89,22 +89,6 @@ held_item.toggle_underbarrel_attachment_verb() return TRUE -/datum/keybinding/human/combat/unique_action - hotkey_keys = list("Space") - classic_keys = list("Unbound") - name = "unique_action" - full_name = "Unique Action" - keybind_signal = COMSIG_KB_HUMAN_WEAPON_UNIQUEACTION - -/datum/keybinding/human/combat/unique_action/down(client/user) - . = ..() - if(.) - return - var/mob/living/carbon/human/human = user.mob - var/obj/item/weapon/gun/held_item = human.get_held_item() - held_item.use_unique_action() - return TRUE - /datum/keybinding/human/combat/unload_gun hotkey_keys = list("Shift+Z") classic_keys = list("Unbound") diff --git a/code/datums/keybinding/human_inventory.dm b/code/datums/keybinding/human_inventory.dm index 163cbccdd5c0..e34fd1501df0 100644 --- a/code/datums/keybinding/human_inventory.dm +++ b/code/datums/keybinding/human_inventory.dm @@ -151,6 +151,11 @@ TIMER_COOLDOWN_START(src, COOLDOWN_SLOT_INTERACT_KEYBIND, INTERACT_KEYBIND_COOLDOWN_TIME) var/mob/living/carbon/human/human_user = user.mob + + if((human_user.is_mob_incapacitated(TRUE) || human_user.is_mob_restrained() || human_user.IsKnockDown() || HAS_TRAIT_FROM(human_user, TRAIT_UNDENSE, LYING_DOWN_TRAIT)) && !HAS_TRAIT(human_user, TRAIT_HAULED)) + to_chat(user, SPAN_WARNING("You can't do that in your current state.")) + return + var/obj/item/current_item = check_slot(human_user) var/obj/item/in_hand_item = human_user.get_active_hand() diff --git a/code/datums/keybinding/mob.dm b/code/datums/keybinding/mob.dm index 100f546ba590..eca30b4da34b 100644 --- a/code/datums/keybinding/mob.dm +++ b/code/datums/keybinding/mob.dm @@ -220,3 +220,21 @@ if(.) return user.movement_locked = FALSE + +/datum/keybinding/mob/minimap + hotkey_keys = list("5") + classic_keys = list("5") + name = "toggle_minimap" + full_name = "Toggle Minimap" + keybind_signal = COMSIG_KB_MOB_TOGGLE_MINIMAP + +/datum/keybinding/mob/minimap/down(client/user) + . = ..() + if(.) + return + var/mob/user_mob = user.mob + if(!(user.screen)) + return + for(var/datum/action/minimap/user_map in user_mob.actions) + user_map.action_activate() + return TRUE diff --git a/code/datums/langchat/langchat.dm b/code/datums/langchat/langchat.dm index a1409bca2cee..fe87903a8d69 100644 --- a/code/datums/langchat/langchat.dm +++ b/code/datums/langchat/langchat.dm @@ -11,6 +11,7 @@ /mob/living/carbon/xenomorph/defender/langchat_height = 48 /mob/living/carbon/xenomorph/warrior/langchat_height = 48 /mob/living/carbon/xenomorph/king/langchat_height = 64 +/mob/living/carbon/xenomorph/despoiler/langchat_height = 64 #define LANGCHAT_LONGEST_TEXT 64 #define LANGCHAT_WIDTH 96 @@ -95,6 +96,7 @@ var/image/r_icon var/use_mob_style = TRUE var/text_to_display = message + var/is_emote = additional_styles && additional_styles.Find("emote") if(length(text_to_display) > LANGCHAT_LONGEST_TEXT) text_to_display = copytext_char(text_to_display, 1, LANGCHAT_LONGEST_TEXT + 1) + "..." var/timer = (length(text_to_display) / LANGCHAT_LONGEST_TEXT) * 4 SECONDS + 2 SECONDS @@ -115,7 +117,7 @@ langchat_listeners = listeners for(var/mob/M in langchat_listeners) - if(langchat_client_enabled(M) && !M.ear_deaf && (skip_language_check || M.say_understands(src, language))) + if(langchat_client_enabled(M) && (is_emote || !M.ear_deaf) && (skip_language_check || M.say_understands(src, language))) M.client.images += langchat_image if(isturf(loc)) diff --git a/code/datums/looping_sounds/misc_sounds.dm b/code/datums/looping_sounds/misc_sounds.dm index 318ac7b331b7..2408e69d62ba 100644 --- a/code/datums/looping_sounds/misc_sounds.dm +++ b/code/datums/looping_sounds/misc_sounds.dm @@ -22,3 +22,11 @@ mid_sounds = 'sound/machines/telephone/phone_busy.ogg' mid_length = 5 SECONDS volume = 15 + +/datum/looping_sound/generator + start_sound = 'sound/machines/generator/generator_start.ogg' + start_length = 0.4 SECONDS + mid_sounds = 'sound/machines/generator/generator_mid1.ogg' + mid_length = 0.4 SECONDS + end_sound = 'sound/machines/generator/generator_end.ogg' + volume = 40 diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm index 13cf15cb98a9..e18d606dc294 100644 --- a/code/datums/map_config.dm +++ b/code/datums/map_config.dm @@ -33,6 +33,7 @@ var/announce_text = "" var/infection_announce_text = "" var/liaison_briefing = "" + var/list/co_briefing_files = list() var/squads_max_num = 4 @@ -149,6 +150,16 @@ #define CHECK_EXISTS(X) if(!istext(json[X])) { log_world("[##X] missing from json!"); return; } /datum/map_config/proc/LoadConfig(filename, error_if_missing, maptype) + #ifdef FORCE_GROUND_MAP + if(maptype == GROUND_MAP) + filename = FORCE_GROUND_MAP + #endif + + #ifdef FORCE_SHIP_MAP + if(maptype == SHIP_MAP) + filename = FORCE_SHIP_MAP + #endif + if(!fexists(filename)) if(error_if_missing) log_world("map_config not found: [filename]") @@ -384,6 +395,9 @@ if(json["liaison_briefing"]) liaison_briefing = json["liaison_briefing"] + if(islist(json["co_briefing"])) + co_briefing_files = json["co_briefing"] + if(json["weather_holder"]) weather_holder = text2path(json["weather_holder"]) if(!weather_holder) diff --git a/code/datums/medal_awards.dm b/code/datums/medal_awards.dm index 772bdebbed23..dd5a430d41ea 100644 --- a/code/datums/medal_awards.dm +++ b/code/datums/medal_awards.dm @@ -1,7 +1,20 @@ -#define MARINE_CONDUCT_MEDAL "distinguished conduct medal" -#define MARINE_BRONZE_HEART_MEDAL "bronze heart medal" -#define MARINE_VALOR_MEDAL "medal of valor" -#define MARINE_HEROISM_MEDAL "medal of exceptional heroism" +#define MARINE_RIBBON_COMMENDATION "ribbon of commendation" +#define MARINE_RIBBON_LEADERSHIP "distinguished leadership ribbon" +#define MARINE_RIBBON_PROFICIENCY "technical proficiency ribbon" + +#define MARINE_MEDAL_PURPLE_HEART "purple heart medal" +#define MARINE_MEDAL_VALOR "medal of valor" +#define MARINE_MEDAL_SILVER_STAR "silver star medal" +#define MARINE_MEDAL_GALACTIC_CROSS "galactic cross medal" +#define MARINE_MEDAL_HONOR "medal of honor" + +//Legacy medals retained in the game, but not issued further, to allow the medal statistics tracker to function properly and show historic awards. +#define MARINE_LEGACY_MEDAL_CONDUCT "distinguished conduct medal" +#define MARINE_LEGACY_MEDAL_BRONZE_HEART "bronze heart medal" +#define MARINE_LEGACY_MEDAL_HEROISM "medal of exceptional heroism" + +#define WY_MEDAL_AWARD_1 "corporate service award" +#define WY_MEDAL_AWARD_2 "corporate medallion" #define XENO_SLAUGHTER_MEDAL "royal jelly of slaughter" #define XENO_RESILIENCE_MEDAL "royal jelly of resilience" @@ -36,9 +49,48 @@ GLOBAL_LIST_EMPTY(medal_recommendations) giver_mob = list() giver_ckey = list() -GLOBAL_LIST_INIT(human_medals, list(MARINE_CONDUCT_MEDAL, MARINE_BRONZE_HEART_MEDAL, MARINE_VALOR_MEDAL, MARINE_HEROISM_MEDAL)) - -/proc/give_medal_award(medal_location, as_admin = FALSE) +GLOBAL_LIST_INIT(medal_options, generate_medal_options()) +GLOBAL_LIST_INIT(medal_references, generate_medal_references()) + +/proc/generate_medal_references() + var/list/medals = list() + for(var/medal in subtypesof(/obj/item/clothing/accessory/medal)) + medals += new medal + return medals + +/proc/generate_medal_options() + var/list/options_list = list() + options_list["marine_medals_xo"] = list(MARINE_RIBBON_COMMENDATION, MARINE_RIBBON_PROFICIENCY, MARINE_RIBBON_LEADERSHIP) + options_list["marine_medals_co"] = list(MARINE_RIBBON_PROFICIENCY, MARINE_RIBBON_LEADERSHIP, MARINE_MEDAL_PURPLE_HEART, MARINE_MEDAL_VALOR, MARINE_MEDAL_SILVER_STAR, MARINE_MEDAL_GALACTIC_CROSS) + options_list["marine_medals_admin"] = list(MARINE_RIBBON_COMMENDATION, MARINE_RIBBON_PROFICIENCY, MARINE_RIBBON_LEADERSHIP, MARINE_MEDAL_PURPLE_HEART, MARINE_MEDAL_VALOR, MARINE_MEDAL_SILVER_STAR, MARINE_MEDAL_GALACTIC_CROSS, MARINE_MEDAL_HONOR) + options_list["wy_medals_admin"] = list(WY_MEDAL_AWARD_1, WY_MEDAL_AWARD_2) + + return options_list + +/proc/get_medal_path(medal_type) + switch(medal_type) + if(MARINE_RIBBON_COMMENDATION) + return /obj/item/clothing/accessory/medal/ribbon/commendation + if(MARINE_RIBBON_LEADERSHIP) + return /obj/item/clothing/accessory/medal/ribbon/leadership + if(MARINE_RIBBON_PROFICIENCY) + return /obj/item/clothing/accessory/medal/ribbon/proficiency + if(MARINE_MEDAL_PURPLE_HEART) + return /obj/item/clothing/accessory/medal/purple_heart + if(MARINE_MEDAL_VALOR) + return /obj/item/clothing/accessory/medal/silver/valor + if(MARINE_MEDAL_SILVER_STAR) + return /obj/item/clothing/accessory/medal/silver/star + if(MARINE_MEDAL_GALACTIC_CROSS) + return /obj/item/clothing/accessory/medal/gold/cross + if(MARINE_MEDAL_HONOR) + return /obj/item/clothing/accessory/medal/platinum/honor + if(WY_MEDAL_AWARD_1) + return /obj/item/clothing/accessory/medal/gold/corporate_award + if(WY_MEDAL_AWARD_2) + return /obj/item/clothing/accessory/medal/gold/corporate_award2 + +/proc/give_medal_award(medal_location, as_admin = FALSE, as_xo = FALSE) if(as_admin && !check_rights(R_ADMIN)) as_admin = FALSE @@ -53,8 +105,19 @@ GLOBAL_LIST_INIT(human_medals, list(MARINE_CONDUCT_MEDAL, MARINE_BRONZE_HEART_ME if(!chosen_recipient) return FALSE + var/list/medal_options = GLOB.medal_options["marine_medals_co"] + if(as_admin) + var/faction = tgui_input_list(usr, "What faction do you wish to give a medal from?", "Medal Faction", list(FACTION_MARINE, FACTION_WY)) + switch(faction) + if(FACTION_WY) + medal_options = GLOB.medal_options["wy_medals_admin"] + else + medal_options = GLOB.medal_options["marine_medals_admin"] + else if(as_xo) + medal_options = GLOB.medal_options["marine_medals_xo"] + // Pick a medal - var/medal_type = tgui_input_list(usr, "What type of medal do you want to award?", "Medal Type", GLOB.human_medals) + var/medal_type = tgui_input_list(usr, "What type of medal do you want to award?", "Medal Type", medal_options) if(!medal_type) return FALSE @@ -133,17 +196,10 @@ GLOBAL_LIST_INIT(human_medals, list(MARINE_CONDUCT_MEDAL, MARINE_BRONZE_HEART_ME if(medal_location) var/turf/turf_location = get_turf(medal_location) var/obj/item/clothing/accessory/medal/medal - switch(medal_type) - if(MARINE_CONDUCT_MEDAL) - medal = new /obj/item/clothing/accessory/medal/bronze/conduct(turf_location) - if(MARINE_BRONZE_HEART_MEDAL) - medal = new /obj/item/clothing/accessory/medal/bronze/heart(turf_location) - if(MARINE_VALOR_MEDAL) - medal = new /obj/item/clothing/accessory/medal/silver/valor(turf_location) - if(MARINE_HEROISM_MEDAL) - medal = new /obj/item/clothing/accessory/medal/gold/heroism(turf_location) - else - return FALSE + var/medal_path = get_medal_path(medal_type) + if(!medal_path) + return FALSE + medal = new medal_path(turf_location) medal.recipient_name = chosen_recipient medal.medal_citation = citation medal.recipient_rank = recipient_rank @@ -226,17 +282,10 @@ GLOBAL_LIST_INIT(human_medals, list(MARINE_CONDUCT_MEDAL, MARINE_BRONZE_HEART_ME if(medal_location) var/turf/turf_location = get_turf(medal_location) var/obj/item/clothing/accessory/medal/medal - switch(medal_type) - if(MARINE_CONDUCT_MEDAL) - medal = new /obj/item/clothing/accessory/medal/bronze/conduct(turf_location) - if(MARINE_BRONZE_HEART_MEDAL) - medal = new /obj/item/clothing/accessory/medal/bronze/heart(turf_location) - if(MARINE_VALOR_MEDAL) - medal = new /obj/item/clothing/accessory/medal/silver/valor(turf_location) - if(MARINE_HEROISM_MEDAL) - medal = new /obj/item/clothing/accessory/medal/gold/heroism(turf_location) - else - return FALSE + var/medal_path = get_medal_path(medal_type) + if(!medal_path) + return FALSE + medal = new medal_path(turf_location) medal.recipient_name = chosen_recipient medal.medal_citation = citation medal.recipient_rank = recipient_rank @@ -261,7 +310,11 @@ GLOBAL_LIST_INIT(human_medals, list(MARINE_CONDUCT_MEDAL, MARINE_BRONZE_HEART_ME to_chat(user, SPAN_WARNING("You must have an authenticated ID Card to award medals.")) return - if(!((card.paygrade in GLOB.co_paygrades) || (card.paygrade in GLOB.uscm_highcom_paygrades))) + var/is_xo_medal + if(user.job == JOB_XO) + is_xo_medal = TRUE + + if(!((card.paygrade in GLOB.co_paygrades) || (card.paygrade in GLOB.uscm_highcom_paygrades) || is_xo_medal)) to_chat(user, SPAN_WARNING("Only a Senior Officer can award medals!")) return @@ -524,9 +577,7 @@ GLOBAL_LIST_INIT(xeno_medals, list(XENO_SLAUGHTER_MEDAL, XENO_RESILIENCE_MEDAL, recommendation.recipient_name = recipient_mob.real_name recommendation.recommended_by_name = recommendation_giver.real_name recommendation.recommended_by_ckey = recommendation_giver.ckey - recommendation.recommended_by_rank = recipient_ranks[recommendation_giver.real_name] - - + recommendation.recommended_by_rank = recommendation_giver.job recommendation.reason = reason return TRUE @@ -543,7 +594,6 @@ GLOBAL_DATUM_INIT(ic_medals_panel, /datum/ic_medal_panel, new) if(!ui) ui = new(user, src, "IcMedalsPanel", "Medals Panel") ui.open() - ui.set_autoupdate(FALSE) /datum/ic_medal_panel/ui_state(mob/user) var/datum/weakref/user_reference = WEAKREF(user) @@ -561,6 +611,21 @@ GLOBAL_DATUM_INIT(ic_medals_panel, /datum/ic_medal_panel, new) /datum/ic_medal_panel/ui_data(mob/user) var/list/data = list() + var/list/available_medals = list() + var/list/medal_names = list() + + for(var/obj/item/clothing/accessory/medal/award in GLOB.medal_references) + if(!(award.awarding_faction == user.faction)) + continue + var/list/award_stuff = list() + award_stuff["name"] = award.name + award_stuff["description"] = award.desc + + available_medals[award.name] = award_stuff + medal_names += award.name + + data["medal_types"] = available_medals + data["medal_names"] = medal_names data["recommendations"] = list() for(var/datum/medal_recommendation/recommendation in GLOB.medal_recommendations) @@ -586,7 +651,11 @@ GLOBAL_DATUM_INIT(ic_medals_panel, /datum/ic_medal_panel, new) to_chat(user, SPAN_WARNING("You must have an authenticated ID Card to award medals.")) return - if(!((card.paygrade in GLOB.co_paygrades) || (card.paygrade in GLOB.uscm_highcom_paygrades))) + var/is_xo_medal + if(user.job == JOB_XO) + is_xo_medal = TRUE + + if(!((card.paygrade in GLOB.co_paygrades) || (card.paygrade in GLOB.uscm_highcom_paygrades) || is_xo_medal)) to_chat(user, SPAN_WARNING("Only a Senior Officer can award medals!")) return @@ -607,15 +676,17 @@ GLOBAL_DATUM_INIT(ic_medals_panel, /datum/ic_medal_panel, new) return switch(action) - if("grant_new_medal") - if(give_medal_award(actual_loc)) - actual_loc.visible_message(SPAN_NOTICE("[actual_loc] prints a medal.")) - . = TRUE + if("recommend_new_medal") + if(add_medal_recommendation(user)) + . = TRUE if("approve_medal") var/recommendation_ref = params["ref"] var/medal_type = params["medal_type"] - if(!(medal_type in GLOB.human_medals)) + if(!(medal_type in GLOB.medal_options["marine_medals_co"]) && !(medal_type in GLOB.medal_options["marine_medals_xo"])) + return + if((is_xo_medal && !(medal_type in GLOB.medal_options["marine_medals_xo"])) || (!is_xo_medal && !(medal_type in GLOB.medal_options["marine_medals_co"]))) + to_chat(user, SPAN_WARNING("You cannot award this medal!")) return var/datum/medal_recommendation/recommendation = locate(recommendation_ref) in GLOB.medal_recommendations if(!recommendation) @@ -627,7 +698,7 @@ GLOBAL_DATUM_INIT(ic_medals_panel, /datum/ic_medal_panel, new) var/choice = tgui_alert(user, "Would you like to change the medal text?", "Medal Citation", list("Yes", "No")) var/medal_citation = recommendation.reason if(choice == "Yes") - medal_citation = strip_html(tgui_input_text(user, "What should the medal citation read?", "Medal Citation", null, MAX_PAPER_MESSAGE_LEN, TRUE), MAX_PAPER_MESSAGE_LEN) + medal_citation = strip_html(tgui_input_text(user, "What should the medal citation read?", "Medal Citation", recommendation.reason, MAX_PAPER_MESSAGE_LEN, TRUE), MAX_PAPER_MESSAGE_LEN) var/confirm_choice = tgui_alert(user, "Are you sure you want to give a medal to [recommendation.recipient_name]?", "Medal Confirmation", list("Yes", "No")) if(confirm_choice != "Yes") diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 49de370c6091..4a44638f269e 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -69,8 +69,8 @@ if(new_character.client) new_character.client.init_verbs() new_character.client.change_view(GLOB.world_view_size) //reset view range to default. - new_character.client.pixel_x = 0 - new_character.client.pixel_y = 0 + new_character.client.set_pixel_x(0) + new_character.client.set_pixel_y(0) if(usr && usr.open_uis) for(var/datum/nanoui/ui in usr.open_uis) if(ui.allowed_user_stat == -1) @@ -81,6 +81,10 @@ SEND_SIGNAL(src, COMSIG_MIND_TRANSFERRED, old_current) SEND_SIGNAL(new_character, COMSIG_MOB_NEW_MIND, current.client) + // comm_title is probably null when this is called. + var/datum/highlight_keywords_payload/payload = new(new_character) + new_character.client.tgui_panel.window.send_message("settings/updateHighlightKeywords", payload.to_list()) + new_character.refresh_huds(current) //inherit the HUDs from the old body new_character.aghosted = FALSE //reset aghost and away timer new_character.away_timer = 0 diff --git a/code/datums/mob_hud.dm b/code/datums/mob_hud.dm index d9b5aab29e9f..7df85b10f421 100644 --- a/code/datums/mob_hud.dm +++ b/code/datums/mob_hud.dm @@ -1,7 +1,8 @@ /* HUD DATUMS */ -//GLOBAL HUD LIST: This must be indexed in order (or the defines stringified so its an asslist) -GLOBAL_LIST_INIT_TYPED(huds, /datum/mob_hud, list( +//GLOBAL HUD LIST: (note no assertion ensures all huds are unique so be sure you never reuse the same index) +// flatten_numeric_alist(alist) is used to ensure the define matches the index and they're sequential defines +GLOBAL_LIST_INIT_TYPED(huds, /datum/mob_hud, flatten_numeric_alist(alist( MOB_HUD_SECURITY_BASIC = new /datum/mob_hud/security/basic(), MOB_HUD_SECURITY_ADVANCED = new /datum/mob_hud/security/advanced(), MOB_HUD_MEDICAL_BASIC = new /datum/mob_hud/medical/basic(), @@ -28,7 +29,7 @@ GLOBAL_LIST_INIT_TYPED(huds, /datum/mob_hud, list( MOB_HUD_EXECUTE = new /datum/mob_hud/execute_hud(), MOB_HUD_NEW_PLAYER = new /datum/mob_hud/new_player(), MOB_HUD_SPYCAMS = new /datum/mob_hud/spy_cams(), - )) + ))) /datum/mob_hud var/list/mob/hudmobs = list() //list of all mobs which display this hud @@ -337,8 +338,8 @@ GLOBAL_LIST_INIT_TYPED(huds, /datum/mob_hud, list( else var/amount = health > 0 ? round(health * 100 / maxHealth, 10) : CEILING(health, 10) if(health < 0) - var/warding_health = crit_health != 0 ? warding_aura * 20 : 0 - amount = round((health / (crit_health - warding_health)) * -100, 10) + var/warding_health = health_threshold_dead != 0 ? warding_aura * 20 : 0 + amount = round((health / (health_threshold_dead - warding_health)) * -100, 10) else amount = CEILING((health / maxHealth) * 100, 10) if(!amount) @@ -466,6 +467,7 @@ GLOBAL_LIST_INIT_TYPED(huds, /datum/mob_hud, list( if(hive && hive.color) holder3.color = hive.color + holder2.color = hive.color if(stat == DEAD || status_flags & FAKEDEATH) holder2.alpha = 100 @@ -706,11 +708,11 @@ GLOBAL_LIST_INIT_TYPED(huds, /datum/mob_hud, list( holder.overlays.Cut() if(mob_flags & MUTINY_MUTINEER) - holder.overlays += image('icons/mob/hud/marine_hud.dmi', src, "hudmutineer", pixel_y = 12) + holder.overlays += image('icons/mob/hud/human_status.dmi', src, "hudmutineer", pixel_y = 12) else if(mob_flags & MUTINY_LOYALIST) - holder.overlays += image('icons/mob/hud/marine_hud.dmi', src, "hudloyalist", pixel_y = 12) + holder.overlays += image('icons/mob/hud/human_status.dmi', src, "hudloyalist", pixel_y = 12) else if(mob_flags & MUTINY_NONCOMBAT) - holder.overlays += image('icons/mob/hud/marine_hud.dmi', src, "hudnoncombat", pixel_y = 9) + holder.overlays += image('icons/mob/hud/human_status.dmi', src, "hudnoncombat", pixel_y = 9) hud_set_new_player() F.modify_hud_holder(holder, src) @@ -789,9 +791,9 @@ GLOBAL_DATUM_INIT(hud_icon_hunter_blooded, /image, image('icons/mob/hud/hud_yaut /mob/proc/hud_set_order() return -GLOBAL_DATUM_INIT(hud_icon_hudmove, /image, image('icons/mob/hud/marine_hud.dmi', src, "hudmove")) -GLOBAL_DATUM_INIT(hud_icon_hudhold, /image, image('icons/mob/hud/marine_hud.dmi', src, "hudhold")) -GLOBAL_DATUM_INIT(hud_icon_hudfocus, /image, image('icons/mob/hud/marine_hud.dmi', src, "hudfocus")) +GLOBAL_DATUM_INIT(hud_icon_hudmove, /image, image('icons/mob/hud/human_status.dmi', src, "hudmove")) +GLOBAL_DATUM_INIT(hud_icon_hudhold, /image, image('icons/mob/hud/human_status.dmi', src, "hudhold")) +GLOBAL_DATUM_INIT(hud_icon_hudfocus, /image, image('icons/mob/hud/human_status.dmi', src, "hudfocus")) // ORDER HUD /mob/living/carbon/human/hud_set_order() var/image/holder = hud_list[ORDER_HUD] diff --git a/code/datums/mutable_appearance.dm b/code/datums/mutable_appearance.dm index 4abaa9e640e3..5fb2cdf2a3c1 100644 --- a/code/datums/mutable_appearance.dm +++ b/code/datums/mutable_appearance.dm @@ -4,10 +4,12 @@ // Mutable appearances are children of images, just so you know. -/mutable_appearance/New() +// Mutable appearances erase template vars on new, because they accept an appearance to copy as an arg +// If we have nothin to copy, we set the float plane +/mutable_appearance/New(mutable_appearance/to_copy) ..() - plane = FLOAT_PLANE // No clue why this is 0 by default yet images are on FLOAT_PLANE - // And yes this does have to be in the constructor, BYOND ignores it if you set it as a normal var + if(!to_copy) + plane = FLOAT_PLANE /// Helper similar to image() /proc/mutable_appearance(icon, icon_state = "", layer = FLOAT_LAYER, plane = FLOAT_PLANE, alpha = 255, appearance_flags = NONE) diff --git a/code/datums/origin/origin.dm b/code/datums/origin/origin.dm index 46027a49941a..447c379d9ca4 100644 --- a/code/datums/origin/origin.dm +++ b/code/datums/origin/origin.dm @@ -3,7 +3,7 @@ var/desc = "You were born somewhere, someplace. The area is known for doing things, you think." /datum/origin/proc/generate_human_name(gender = MALE) - return pick(gender == MALE ? GLOB.first_names_male : GLOB.first_names_female) + " " + pick(GLOB.last_names) + return random_name(gender) /// Return null if the name is correct, otherwise return a string containing the error message /datum/origin/proc/validate_name(name_to_check) diff --git a/code/datums/origin/upp.dm b/code/datums/origin/upp.dm index 8346657c5020..fdaf6104a055 100644 --- a/code/datums/origin/upp.dm +++ b/code/datums/origin/upp.dm @@ -5,18 +5,16 @@ /datum/origin/upp/generate_human_name(gender = MALE) var/first_name var/last_name - - if(gender == MALE) - if(prob(40)) - first_name = "[capitalize(randomly_generate_chinese_word(1))]" - else - first_name = "[pick(GLOB.first_names_male_upp)]" + if(prob(40)) + first_name = "[capitalize(randomly_generate_chinese_word(1))]" else - if(prob(40)) - first_name = "[capitalize(randomly_generate_chinese_word(1))]" - else - first_name = "[pick(GLOB.first_names_female_upp)]" - + switch(gender) + if(FEMALE) + first_name = capitalize(pick(GLOB.first_names_female_upp)) + if(PLURAL, NEUTER) + first_name = capitalize(pick(pick(GLOB.first_names_male_upp), pick(GLOB.first_names_female_upp))) + else // MALE + first_name = capitalize(pick(GLOB.first_names_male_upp)) if(prob(35)) last_name = "[capitalize(randomly_generate_chinese_word(pick(20;1, 80;2)))]" else diff --git a/code/datums/origin/uscm.dm b/code/datums/origin/uscm.dm index 0f83e6501a1f..2a251b9d9d6f 100644 --- a/code/datums/origin/uscm.dm +++ b/code/datums/origin/uscm.dm @@ -28,7 +28,13 @@ desc = "You were a product of an experimental military programme that sought to breed the perfect supersoldier. In some aspects, they've succeeded." /datum/origin/uscm/aw/generate_human_name(gender = MALE) - return pick(gender == MALE ? GLOB.first_names_male : GLOB.first_names_female) + " A.W. " + pick(GLOB.weapon_surnames) + switch(gender) + if(FEMALE) + return "[capitalize(pick(GLOB.first_names_female))] A.W. [capitalize(pick(GLOB.weapon_surnames))]" + if(PLURAL, NEUTER) + return "[capitalize(pick(MALE, FEMALE) == MALE ? pick(GLOB.first_names_male) : pick(GLOB.first_names_female))] A.W. [capitalize(pick(GLOB.weapon_surnames))]" + else // MALE + return "[capitalize(pick(GLOB.first_names_male))] A.W. [capitalize(pick(GLOB.weapon_surnames))]" /datum/origin/uscm/aw/validate_name(name_to_check) if(!findtext(name_to_check, "A.W. ")) diff --git a/code/datums/pain/_pain.dm b/code/datums/pain/_pain.dm index a648eb8cf427..f0532c04b284 100644 --- a/code/datums/pain/_pain.dm +++ b/code/datums/pain/_pain.dm @@ -111,7 +111,7 @@ update_pain_level() /datum/pain/proc/apply_pain_reduction(amount = 0) - if(last_reduction_update > world.time || amount <= reduction_pain) // Needed so pain meds cant spam us, neccesary evil. + if(last_reduction_update > world.time || amount <= reduction_pain) // Needed so pain meds can't spam us, neccesary evil. return last_reduction_update = world.time + 10 SECONDS diff --git a/code/datums/pain/pain_human.dm b/code/datums/pain/pain_human.dm index de4aca0a4929..179ebc8a5156 100644 --- a/code/datums/pain/pain_human.dm +++ b/code/datums/pain/pain_human.dm @@ -19,8 +19,9 @@ // Delimbed if((O.status & LIMB_DESTROYED) && !(O.status & LIMB_AMPUTATED)) apply_pain(PAIN_DELIMB) + continue //we take no extra pain from destroyed limb // Broken bones - else if(O.status & LIMB_BROKEN || H.incision_depths[O.name] != SURGERY_DEPTH_SURFACE) + if(O.status & LIMB_BROKEN || H.incision_depths[O.name] != SURGERY_DEPTH_SURFACE) // Splinted else non-splinted if(O.status & LIMB_SPLINTED) apply_pain(PAIN_BONE_BREAK - PAIN_BONE_BREAK_SPLINTED) @@ -29,6 +30,9 @@ else if((O.status & LIMB_SPLINTED) && !(O.status & LIMB_BROKEN)) apply_pain(PAIN_BONE_BREAK_SPLINTED) + if(O.status & LIMB_ESCHAR) + apply_pain(PAIN_ESCHAR) + //Internal organs for(var/datum/internal_organ/O in H.internal_organs) if(O.damage) diff --git a/code/datums/paygrades/factions/other/civilian.dm b/code/datums/paygrades/factions/other/civilian.dm index 25b63af51e30..73679d17033d 100644 --- a/code/datums/paygrades/factions/other/civilian.dm +++ b/code/datums/paygrades/factions/other/civilian.dm @@ -22,28 +22,47 @@ paygrade = PAY_SHORT_CDOC name = "Doctor" prefix = "Dr." - pay_multiplier = 0.75 + pay_multiplier = 2.5 + +/datum/paygrade/civilian/assistantprofessor + paygrade = PAY_SHORT_CCMOA + name = "Assistant Professor" + prefix = "Asst. Prof." + pay_multiplier = 3 + +/datum/paygrade/civilian/associateprofessor + paygrade = PAY_SHORT_CCMOB + name = "Associate Professor" + prefix = "Assoc. Prof." + pay_multiplier = 3.5 /datum/paygrade/civilian/professor - paygrade = PAY_SHORT_CCMO + paygrade = PAY_SHORT_CCMOC name = "Professor" prefix = "Prof." - pay_multiplier = 1 + pay_multiplier = 3.75 + officer_grade = GRADE_OFFICER + +/datum/paygrade/civilian/regentsprofessor + paygrade = PAY_SHORT_CCMOD + name = "Regents Professor" + prefix = "Regents Prof." + pay_multiplier = 4 officer_grade = GRADE_OFFICER -/datum/paygrade/civillian/representative +/datum/paygrade/civilian/representative paygrade = PAY_SHORT_CREP name = "Representative" prefix = "Rep." pay_multiplier = 1 -/datum/paygrade/civillian/officer +/datum/paygrade/civilian/officer paygrade = PAY_SHORT_CPO name = "Officer" prefix = "Off." pay_multiplier = 0.66 -/datum/paygrade/civillian/officer/senior +/datum/paygrade/civilian/officer/senior paygrade = PAY_SHORT_CSPO name = "Senior Officer" prefix = "Sr. Off." diff --git a/code/datums/paygrades/factions/uscm/marine.dm b/code/datums/paygrades/factions/uscm/marine.dm index f6f77b717a98..67eb7b93a07a 100644 --- a/code/datums/paygrades/factions/uscm/marine.dm +++ b/code/datums/paygrades/factions/uscm/marine.dm @@ -102,6 +102,24 @@ ranking = 11 pay_multiplier = 3 +/datum/paygrade/marine/wo + paygrade = PAY_SHORT_MWO + name = "Warrant Officer" + prefix = "WO" + rank_pin = /obj/item/clothing/accessory/ranks/marine/wo + ranking = 12 + pay_multiplier = 3 + officer_grade = GRADE_OFFICER + +/datum/paygrade/marine/cwo + paygrade = PAY_SHORT_MCWO + name = "Chief Warrant Officer" + prefix = "CWO" + rank_pin = /obj/item/clothing/accessory/ranks/marine/cwo + ranking = 13 + pay_multiplier = 3 + officer_grade = GRADE_OFFICER + // COMMISSIONED PAYGRADES /datum/paygrade/marine/o1 @@ -109,7 +127,7 @@ name = "Second Lieutenant" prefix = "2ndLt" rank_pin = /obj/item/clothing/accessory/ranks/marine/o1 - ranking = 12 + ranking = 14 pay_multiplier = 3 officer_grade = GRADE_OFFICER @@ -118,7 +136,7 @@ name = "First Lieutenant" prefix = "1stLt" rank_pin = /obj/item/clothing/accessory/ranks/marine/o2 - ranking = 13 + ranking = 15 pay_multiplier = 3.2 officer_grade = GRADE_OFFICER @@ -127,7 +145,7 @@ name = "Captain" prefix = "Capt" rank_pin = /obj/item/clothing/accessory/ranks/marine/o3 - ranking = 14 + ranking = 16 pay_multiplier = 4 officer_grade = GRADE_OFFICER @@ -136,7 +154,7 @@ name = "Major" prefix = "Maj" rank_pin = /obj/item/clothing/accessory/ranks/marine/o4 - ranking = 15 + ranking = 17 pay_multiplier = 4 officer_grade = GRADE_OFFICER @@ -145,7 +163,7 @@ name = "Lieutenant Colonel" prefix = "LtCol" rank_pin = /obj/item/clothing/accessory/ranks/marine/o5 - ranking = 16 + ranking = 18 pay_multiplier = 4.2 officer_grade = GRADE_OFFICER @@ -155,7 +173,7 @@ name = "Colonel" prefix = "Col" rank_pin = /obj/item/clothing/accessory/ranks/marine/o6 - ranking = 17 + ranking = 19 pay_multiplier = 4.4 officer_grade = GRADE_OFFICER @@ -164,7 +182,7 @@ name = "Senior Colonel" prefix = "Snr Col." rank_pin = /obj/item/clothing/accessory/ranks/marine/o6e - ranking = 18 + ranking = 20 pay_multiplier = 4.6 officer_grade = GRADE_OFFICER @@ -173,7 +191,7 @@ name = "Division Colonel" prefix = "Div Col." rank_pin = /obj/item/clothing/accessory/ranks/marine/o6c - ranking = 19 + ranking = 21 pay_multiplier = 4.8 officer_grade = GRADE_OFFICER @@ -183,7 +201,7 @@ name = "Brigadier General" prefix = "BGen" rank_pin = /obj/item/clothing/accessory/ranks/marine/o7 - ranking = 20 + ranking = 22 pay_multiplier = 6 officer_grade = GRADE_FLAG @@ -192,7 +210,7 @@ name = "Major General" prefix = "MajGen" rank_pin = /obj/item/clothing/accessory/ranks/marine/o8 - ranking = 21 + ranking = 23 pay_multiplier = 6.2 officer_grade = GRADE_FLAG @@ -201,7 +219,7 @@ name = "Lieutenant General" prefix = "LtGen" rank_pin = /obj/item/clothing/accessory/ranks/marine/o9 - ranking = 22 + ranking = 24 pay_multiplier = 6.4 officer_grade = GRADE_FLAG @@ -210,7 +228,7 @@ name = "General" prefix = "Gen" rank_pin = /obj/item/clothing/accessory/ranks/marine/o10 - ranking = 23 + ranking = 25 pay_multiplier = 6.6 officer_grade = GRADE_FLAG @@ -219,7 +237,7 @@ name = "Assistant Commandant of the Marine Corps" prefix = "ACMC" rank_pin = /obj/item/clothing/accessory/ranks/marine/o10c - ranking = 24 + ranking = 26 pay_multiplier = 6.8 officer_grade = GRADE_FLAG @@ -228,7 +246,7 @@ name = "Commandant of the Marine Corps" prefix = "CMC" rank_pin = /obj/item/clothing/accessory/ranks/marine/o10c - ranking = 25 + ranking = 27 pay_multiplier = 7 officer_grade = GRADE_FLAG @@ -238,6 +256,6 @@ name = "Second Lieutenant Combat Lifesaver" prefix = "2ndLt Combat Lifesaver" rank_pin = /obj/item/clothing/accessory/ranks/marine/o1 - ranking = 12 + ranking = 14 pay_multiplier = 0 officer_grade = GRADE_OFFICER diff --git a/code/datums/paygrades/factions/wy/security.dm b/code/datums/paygrades/factions/wy/security.dm new file mode 100644 index 000000000000..2f9f35a0e800 --- /dev/null +++ b/code/datums/paygrades/factions/wy/security.dm @@ -0,0 +1,64 @@ +/datum/paygrade/wy_sec + name = "Corporate Security Paygrade" + pay_multiplier = 1 + default_faction = FACTION_WY + +/datum/paygrade/wy_sec/standard + paygrade = PAY_SHORT_WY_SEC + name = "Corporate Security Officer" + prefix = "Off." + +/datum/paygrade/wy_sec/specialist + paygrade = PAY_SHORT_WY_SEC_SPEC + name = "Senior Corporate Security Officer" + prefix = "Sr. Off." + pay_multiplier = 2 + +/datum/paygrade/wy_sec/leader + paygrade = PAY_SHORT_WY_SEC_LEAD + name = "Corporate Security Sergeant" + prefix = "CSSgt." + pay_multiplier = 3 + + +/datum/paygrade/wy_sec/bodyguard/trainee + paygrade = PAY_SHORT_WY_SEC_TPPO + name = "Trainee Personal Protection Officer" + prefix = "TPPO." + pay_multiplier = 2.5 + +/datum/paygrade/wy_sec/bodyguard + paygrade = PAY_SHORT_WY_SEC_PPO + name = "Personal Protection Officer" + prefix = "PPO." + pay_multiplier = 3 + +/datum/paygrade/wy_sec/bodyguard/grade_2 + paygrade = PAY_SHORT_WY_SEC_PPS + name = "Personal Protection Specialist" + prefix = "PPS." + pay_multiplier = 3.3 + +/datum/paygrade/wy_sec/bodyguard/grade_3 + paygrade = PAY_SHORT_WY_SEC_PPC + name = "Personal Protection Coordinator" + prefix = "PPC." + pay_multiplier = 4 + +/datum/paygrade/wy_sec/bodyguard/leadership + paygrade = PAY_SHORT_WY_SEC_DPO + name = "Directorate Protection Officer" + prefix = "DPO." + pay_multiplier = 6 + +/datum/paygrade/wy_sec/bodyguard/leadership/grade_2 + paygrade = PAY_SHORT_WY_SEC_DPS + name = "Directorate Protection Specialist" + prefix = "DPS." + pay_multiplier = 7 + +/datum/paygrade/wy_sec/bodyguard/leadership/grade_3 + paygrade = PAY_SHORT_WY_SEC_DPC + name = "Directorate Protection Coordinator" + prefix = "DPC." + pay_multiplier = 8 diff --git a/code/datums/quadtree.dm b/code/datums/quadtree.dm index 9056dfd6bd59..0b7416df90c6 100644 --- a/code/datums/quadtree.dm +++ b/code/datums/quadtree.dm @@ -40,8 +40,10 @@ /datum/coords/qtplayer /// Relevant client the coords are associated to var/client/player - /// Truthy if player is an observer - var/is_observer = FALSE + /// Truthy if player.mob is not a living mob + var/non_living_mob = FALSE + /// Weakref to the player.mob to determine if this is stale + var/datum/weakref/weak_mob // Related scheme to above /datum/coords/qtplayer/Destroy() @@ -212,14 +214,16 @@ se_branch.query_range(range, found_players, flags) if(!player_coords) return - for(var/datum/coords/qtplayer/P as anything in player_coords) - if(!P.player) // Basically client is gone + for(var/datum/coords/qtplayer/quad_player as anything in player_coords) + if(!quad_player.player) // Basically client is gone continue - if((flags & QTREE_EXCLUDE_OBSERVER) && P.is_observer) + if((flags & QTREE_FILTER_LIVING) && quad_player.non_living_mob) continue - if(range.contains_coords(P)) + if(range.contains_coords(quad_player)) if(flags & QTREE_SCAN_MOBS) - found_players.Add(P.player.mob) + if(!quad_player.player.mob || quad_player.player.mob != quad_player.weak_mob?.resolve()) + continue + found_players.Add(quad_player.player.mob) else - found_players.Add(P.player) + found_players.Add(quad_player.player) diff --git a/code/datums/recipe.dm b/code/datums/recipe.dm index 4cb80dd2ba8c..06d5270e7165 100644 --- a/code/datums/recipe.dm +++ b/code/datums/recipe.dm @@ -1107,9 +1107,9 @@ result = /obj/item/reagent_container/food/snacks/taco /datum/recipe/bun - reagents = list("sodiumchloride" = 1) + reagents = list("blackpepper" = 1) items = list( - /obj/item/reagent_container/food/snacks/dough, + /obj/item/reagent_container/food/snacks/doughslice, ) result = /obj/item/reagent_container/food/snacks/bun diff --git a/code/datums/research_upgrade_datum.dm b/code/datums/research_upgrade_datum.dm index d6e1ae129e2c..f2e1780e5d00 100644 --- a/code/datums/research_upgrade_datum.dm +++ b/code/datums/research_upgrade_datum.dm @@ -2,7 +2,7 @@ ///unique to every upgrade. not the name of the item. name of the upgrade var/name = "Upgrade." ///name of upgrades, not items. Items are at research_upgrades.dm somewhere in item folder. - var/desc = "something is broken. yippee!!" + var/desc = "Something is broken. yippee!!" ///which behavior should this type follow. Should this be completely excluded from the buy menu? should it be one of the dropdown options? or a normal item? var/behavior = RESEARCH_UPGRADE_EXCLUDE_BUY // should this be on the list? /// the price of the upgrade, refer to this: 500 is a runner, 8k is queen. T3 is usually 3k, woyer is 2k. @@ -15,9 +15,9 @@ var/clearance_req = 5 ///The change of price for item per purchase, recommended for mass producing stuff or limited upgrade. var/change_purchase = 0 - ///the minimum price which we cant go any cheaper usually dont need to set this if change price is 0 or positive + ///the minimum price which we can't go any cheaper usually don't need to set this if change price is 0 or positive var/minimum_price = 0 - ///the maximum price which we cant go any more expensive, usually dont need to set this if change price is 0 or negative + ///the maximum price which we can't go any more expensive, usually don't need to set this if change price is 0 or negative var/maximum_price = INFINITY ///gets called once the product is purchased, override if you need to pass any special arguments or have special behavior on purchase. @@ -43,7 +43,7 @@ clearance_req = 1 /datum/research_upgrades/machinery/autodoc/internal_bleed/on_purchase(turf/machine_loc) - new /obj/item/research_upgrades/autodoc(machine_loc, RESEARCH_UPGRADE_TIER_1) + new /obj/item/research_upgrades/autodoc(machine_loc) /datum/research_upgrades/machinery/autodoc/broken_bone name = "AutoDoc Bone Fracture Repair" @@ -53,7 +53,7 @@ clearance_req = 3 /datum/research_upgrades/machinery/autodoc/broken_bone/on_purchase(turf/machine_loc) - new /obj/item/research_upgrades/autodoc(machine_loc, RESEARCH_UPGRADE_TIER_2) + new /obj/item/research_upgrades/autodoc/tier2(machine_loc) /datum/research_upgrades/machinery/autodoc/organ_damage name = "AutoDoc Broken Organ Repair" @@ -63,7 +63,7 @@ clearance_req = 2 /datum/research_upgrades/machinery/autodoc/organ_damage/on_purchase(turf/machine_loc) - new /obj/item/research_upgrades/autodoc(machine_loc, RESEARCH_UPGRADE_TIER_3) + new /obj/item/research_upgrades/autodoc/tier3(machine_loc) /datum/research_upgrades/machinery/autodoc/larva_removal name = "AutoDoc Embryo Removal" @@ -73,7 +73,7 @@ clearance_req = 6 /datum/research_upgrades/machinery/autodoc/larva_removal/on_purchase(turf/machine_loc) - new /obj/item/research_upgrades/autodoc(machine_loc, RESEARCH_UPGRADE_TIER_4) + new /obj/item/research_upgrades/autodoc/tier4(machine_loc) /datum/research_upgrades/machinery/grinderspeed name = "Reagent-Grinder Upgrade" @@ -148,7 +148,7 @@ upgrade_type = ITEM_ACCESSORY_UPGRADE /datum/research_upgrades/item/nanosplints/on_purchase(turf/machine_loc) - new /obj/item/stack/medical/splint/nano/research(machine_loc, 5)//adjust this to change amount of nanosplints in a stack, cant be higher than five, go change max_amount in the nanosplint itself, then change it. + new /obj/item/stack/medical/splint/nano/research(machine_loc, 5)//adjust this to change amount of nanosplints in a stack, can't be higher than five, go change max_amount in the nanosplint itself, then change it. /datum/research_upgrades/item/flamer_tank name = "Upgraded Incinerator Tank" diff --git a/code/datums/skills/civilian.dm b/code/datums/skills/civilian.dm index 4374c1a135f8..7d2e201f3761 100644 --- a/code/datums/skills/civilian.dm +++ b/code/datums/skills/civilian.dm @@ -17,7 +17,7 @@ CIVILIAN name = "Weyland-Yutani Manager" // Semi-competent leader with basic knowledge in most things. skills = list( SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, - SKILL_LEADERSHIP = SKILL_LEAD_MASTER, + SKILL_LEADERSHIP = SKILL_LEAD_SKILLED, // this used to be master skill for whatever reason SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_ENGINEER = SKILL_ENGINEER_NOVICE, @@ -65,7 +65,7 @@ CIVILIAN name = "Weyland-Yutani Manager" skills = list( SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, - SKILL_LEADERSHIP = SKILL_LEAD_MASTER, + SKILL_LEADERSHIP = SKILL_LEAD_SKILLED, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_INTEL = SKILL_INTEL_EXPERT, @@ -177,14 +177,14 @@ CIVILIAN SKILL_VEHICLE = SKILL_VEHICLE_SMALL, SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_LEADERSHIP = SKILL_LEAD_SKILLED, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, SKILL_JTAC = SKILL_JTAC_TRAINED, ) /datum/skills/civilian/survivor/pmc/co_survivor // PMC Nightmare Variant of CMB CO Survivor for Solaris Ridge name = "Survivor PMC Field Operations Leader" - skills = list( + additional_skills = list( SKILL_CQC = SKILL_CQC_EXPERT, SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, @@ -265,7 +265,7 @@ CIVILIAN SKILL_ENGINEER = SKILL_ENGINEER_NOVICE, // to use their C4 SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_SURGERY = SKILL_SURGERY_NOVICE, - SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_LEADERSHIP = SKILL_LEAD_SKILLED, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, @@ -343,7 +343,7 @@ CIVILIAN name = "Survivor Chaplain" additional_skills = list( SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, - SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_LEADERSHIP = SKILL_LEAD_SKILLED, ) /datum/skills/civilian/survivor/marshal @@ -428,7 +428,7 @@ CIVILIAN name = "Comms Relay Worker" //Used for fax responder presets, allowing use of appropriate HUDs and basics. skills = list( SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, - SKILL_LEADERSHIP = SKILL_LEAD_MASTER, + SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, diff --git a/code/datums/skills/cmb.dm b/code/datums/skills/cmb.dm index be7a0bb53280..68a8a535f0a5 100644 --- a/code/datums/skills/cmb.dm +++ b/code/datums/skills/cmb.dm @@ -110,7 +110,7 @@ COLONIAL MARSHALS SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_CQC = SKILL_CQC_EXPERT, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_LEADERSHIP = SKILL_LEAD_SKILLED, // for some reason, the skill doesnt match with the normal preset but whatever SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, diff --git a/code/datums/skills/commando.dm b/code/datums/skills/commando.dm index 711950f8f82c..a0563398562d 100644 --- a/code/datums/skills/commando.dm +++ b/code/datums/skills/commando.dm @@ -74,7 +74,7 @@ SPEC-OPS SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_FIREARMS = SKILL_FIREARMS_MASTER, - SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_LEADERSHIP = SKILL_LEAD_SKILLED, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, diff --git a/code/datums/skills/forecon.dm b/code/datums/skills/forecon.dm index 3fcf34a4d47b..bc2b0faf109f 100644 --- a/code/datums/skills/forecon.dm +++ b/code/datums/skills/forecon.dm @@ -16,7 +16,6 @@ MILITARY SURVIVORS SKILL_FIREARMS = SKILL_FIREARMS_SKILLED, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, - SKILL_LEADERSHIP = SKILL_LEAD_NOVICE, SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT, SKILL_JTAC = SKILL_JTAC_TRAINED, ) @@ -33,7 +32,6 @@ MILITARY SURVIVORS SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, SKILL_SURGERY = SKILL_SURGERY_NOVICE, SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, - SKILL_LEADERSHIP = SKILL_LEAD_NOVICE, SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT, SKILL_JTAC = SKILL_JTAC_TRAINED, ) @@ -50,7 +48,6 @@ MILITARY SURVIVORS SKILL_SPEC_WEAPONS = SKILL_SPEC_SCOUT, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, - SKILL_LEADERSHIP = SKILL_LEAD_NOVICE, SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT, SKILL_JTAC = SKILL_JTAC_TRAINED, ) @@ -67,7 +64,6 @@ MILITARY SURVIVORS SKILL_SPEC_WEAPONS = SKILL_SPEC_SMARTGUN, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, - SKILL_LEADERSHIP = SKILL_LEAD_NOVICE, SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT, SKILL_JTAC = SKILL_JTAC_TRAINED, ) @@ -84,7 +80,6 @@ MILITARY SURVIVORS SKILL_SPEC_WEAPONS = SKILL_SPEC_SNIPER, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, - SKILL_LEADERSHIP = SKILL_LEAD_NOVICE, SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT, SKILL_JTAC = SKILL_JTAC_TRAINED, ) @@ -102,7 +97,7 @@ MILITARY SURVIVORS SKILL_JTAC = SKILL_JTAC_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, - SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_LEADERSHIP = SKILL_LEAD_SKILLED, SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT, SKILL_JTAC = SKILL_JTAC_TRAINED, ) diff --git a/code/datums/skills/gladiator.dm b/code/datums/skills/gladiator.dm index 7757fd928972..9e6543c0559f 100644 --- a/code/datums/skills/gladiator.dm +++ b/code/datums/skills/gladiator.dm @@ -5,7 +5,6 @@ SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN, - SKILL_LEADERSHIP = SKILL_LEAD_NOVICE, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, ) @@ -16,7 +15,7 @@ SKILL_CQC = SKILL_CQC_MASTER, SKILL_FIREMAN = SKILL_FIREMAN_MAX, SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER, - SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_LEADERSHIP = SKILL_LEAD_SKILLED, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, SKILL_JTAC = SKILL_JTAC_TRAINED, @@ -34,3 +33,26 @@ SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, SKILL_JTAC = SKILL_JTAC_MASTER, ) + +/datum/skills/gladiator/legionary + name = "Roman Legionary" + skills = list( + SKILL_CQC = SKILL_CQC_EXPERT, + SKILL_FIREMAN = SKILL_FIREMAN_EXPERT, + SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER, + SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, + ) + +/datum/skills/gladiator/legionary/eaglebearer + name = "Roman Eaglebearer" + skills = list( + SKILL_CQC = SKILL_CQC_EXPERT, + SKILL_FIREMAN = SKILL_FIREMAN_MASTER, + SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER, + SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, + SKILL_LEADERSHIP = SKILL_LEAD_MASTER, + ) diff --git a/code/datums/skills/iasf.dm b/code/datums/skills/iasf.dm index d584a95d1efa..4a68374f365c 100644 --- a/code/datums/skills/iasf.dm +++ b/code/datums/skills/iasf.dm @@ -126,7 +126,7 @@ IASF - Paratrooper SKILL_SURGERY = SKILL_SURGERY_DEFAULT, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_JTAC = SKILL_JTAC_TRAINED, - SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_LEADERSHIP = SKILL_LEAD_SKILLED, SKILL_PILOT = SKILL_PILOT_TRAINED, SKILL_VEHICLE = SKILL_VEHICLE_SMALL, SKILL_INTEL = SKILL_INTEL_TRAINED, diff --git a/code/datums/skills/misc.dm b/code/datums/skills/misc.dm index 598cd307b8c8..64904af6d447 100644 --- a/code/datums/skills/misc.dm +++ b/code/datums/skills/misc.dm @@ -13,7 +13,6 @@ MISCELLANEOUS SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, - SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, SKILL_JTAC = SKILL_JTAC_EXPERT, ) diff --git a/code/datums/skills/pmc.dm b/code/datums/skills/pmc.dm index 8e38d2ae9f84..98b70ad5e54c 100644 --- a/code/datums/skills/pmc.dm +++ b/code/datums/skills/pmc.dm @@ -85,7 +85,7 @@ Private Military Contractors SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CQC = SKILL_CQC_SKILLED, - SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, @@ -118,7 +118,6 @@ Private Military Contractors SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, - SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, SKILL_JTAC = SKILL_JTAC_TRAINED, SKILL_VEHICLE = SKILL_VEHICLE_CREWMAN, SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, diff --git a/code/datums/skills/rmc.dm b/code/datums/skills/rmc.dm index bfb52ec6a74a..f810853a1aaf 100644 --- a/code/datums/skills/rmc.dm +++ b/code/datums/skills/rmc.dm @@ -126,7 +126,7 @@ Royal Marines Commando SKILL_SURGERY = SKILL_SURGERY_DEFAULT, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_JTAC = SKILL_JTAC_TRAINED, - SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_LEADERSHIP = SKILL_LEAD_SKILLED, SKILL_PILOT = SKILL_PILOT_TRAINED, SKILL_VEHICLE = SKILL_VEHICLE_SMALL, SKILL_INTEL = SKILL_INTEL_TRAINED, diff --git a/code/datums/skills/upp.dm b/code/datums/skills/upp.dm index 9934ba1d6385..fbb9dd1b737e 100644 --- a/code/datums/skills/upp.dm +++ b/code/datums/skills/upp.dm @@ -106,7 +106,7 @@ UNITED PROGRESSIVE PEOPLES SKILL_FIREARMS = SKILL_FIREARMS_SKILLED, SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, SKILL_VEHICLE = SKILL_VEHICLE_SMALL, - SKILL_LEADERSHIP = SKILL_LEAD_MASTER, + SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, SKILL_INTEL = SKILL_INTEL_EXPERT, ) @@ -249,7 +249,7 @@ UNITED PROGRESSIVE PEOPLES SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_VEHICLE = SKILL_VEHICLE_LARGE, - SKILL_SPEC_WEAPONS = SKILL_SPEC_ROCKET, + SKILL_SPEC_WEAPONS = SKILL_SPEC_UPP, ) /datum/skills/military/survivor/upp_sl diff --git a/code/datums/skills/uscm.dm b/code/datums/skills/uscm.dm index 3e71dc8e0948..efb7ae77d627 100644 --- a/code/datums/skills/uscm.dm +++ b/code/datums/skills/uscm.dm @@ -70,6 +70,7 @@ United States Colonial Marines SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_JTAC = SKILL_JTAC_EXPERT, + SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, ) /datum/skills/SL @@ -79,7 +80,7 @@ United States Colonial Marines SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, - SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_LEADERSHIP = SKILL_LEAD_SKILLED, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_FIREARMS = SKILL_FIREARMS_SKILLED, SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, @@ -155,7 +156,6 @@ MILITARY NONCOMBATANT skills = list( SKILL_PILOT = SKILL_PILOT_TRAINED, SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, - SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, SKILL_SURGERY = SKILL_SURGERY_NOVICE, @@ -357,7 +357,7 @@ COMMAND STAFF name = "CMO" skills = list( SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN, - SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, + SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, SKILL_SURGERY = SKILL_SURGERY_TRAINED, @@ -374,7 +374,7 @@ COMMAND STAFF SKILL_CQC = SKILL_CQC_SKILLED, SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, + SKILL_LEADERSHIP = SKILL_LEAD_SKILLED, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, SKILL_JTAC = SKILL_JTAC_EXPERT, @@ -390,7 +390,7 @@ COMMAND STAFF skills = list( SKILL_PILOT = SKILL_PILOT_EXPERT, SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, - SKILL_LEADERSHIP = SKILL_LEAD_MASTER, + SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, SKILL_SURGERY = SKILL_SURGERY_NOVICE, @@ -410,7 +410,8 @@ COMMAND STAFF skills = list( SKILL_ENGINEER = SKILL_ENGINEER_MASTER, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER, - SKILL_LEADERSHIP = SKILL_LEAD_MASTER, + SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, SKILL_POLICE = SKILL_POLICE_FLASH, SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, @@ -424,7 +425,7 @@ COMMAND STAFF name = "Requisition Officer" skills = list( SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, + SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, SKILL_POLICE = SKILL_POLICE_FLASH, @@ -527,7 +528,7 @@ CIA SKILL_CQC = SKILL_CQC_MASTER, SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_LEADERSHIP = SKILL_LEAD_SKILLED, SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, SKILL_JTAC = SKILL_JTAC_EXPERT, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, diff --git a/code/datums/statistics/cause_data.dm b/code/datums/statistics/cause_data.dm index 36f1a664afa7..312410f54663 100644 --- a/code/datums/statistics/cause_data.dm +++ b/code/datums/statistics/cause_data.dm @@ -1,3 +1,13 @@ +GLOBAL_LIST_EMPTY(ref_mob_to_last_cause_data_time) + +GLOBAL_LIST_INIT(exempted_cause_objects, typecacheof(list( + /obj/structure/machinery/defenses, +))) + +GLOBAL_LIST_INIT(exempted_cause_areas, typecacheof(list( + /area/almayer/shipboard/firing_range_north, + /area/almayer/shipboard/firing_range_south +))) /datum/cause_data var/datum/weakref/weak_mob @@ -7,6 +17,42 @@ var/cause_name var/datum/weakref/weak_cause + var/time_created + +/datum/cause_data/New(cause_name, mob/causing_mob, obj/causing_object) + src.cause_name = cause_name + time_created = world.time + + if(causing_object) + weak_cause = WEAKREF(causing_object) + + if(istype(causing_mob)) + weak_mob = WEAKREF(causing_mob) + + role = causing_mob.get_role_name() + faction = causing_mob.faction + + if(causing_mob.mind) + ckey = causing_mob.mind.ckey + + if(causing_object && is_type_in_typecache(causing_object, GLOB.exempted_cause_objects)) + return + + if(islarva(causing_mob)) + var/mob/living/carbon/burst = locate(/mob/living/carbon) in get_turf(causing_mob) + if(!burst) + return + + if(!HAS_TRAIT(burst, TRAIT_NESTED)) + return + + var/area/mob_area = get_area(causing_mob) + if(is_type_in_typecache(mob_area, GLOB.exempted_cause_areas)) + return + + GLOB.ref_mob_to_last_cause_data_time[weak_mob.reference] = world.time + + /datum/cause_data/proc/resolve_mob() if(!weak_mob) return null @@ -20,14 +66,5 @@ /proc/create_cause_data(new_cause, mob/M = null, obj/C = null) if(!new_cause) return null - var/datum/cause_data/new_data = new() - new_data.cause_name = new_cause - if(C) - new_data.weak_cause = WEAKREF(C) - if(istype(M)) - new_data.weak_mob = WEAKREF(M) - if(M.mind) - new_data.ckey = M.mind.ckey - new_data.role = M.get_role_name() - new_data.faction = M.faction + var/datum/cause_data/new_data = new(new_cause, M, C) return new_data diff --git a/code/datums/statistics/entities/death_stats.dm b/code/datums/statistics/entities/death_stats.dm index 170ca24a24df..eba8da5b396c 100644 --- a/code/datums/statistics/entities/death_stats.dm +++ b/code/datums/statistics/entities/death_stats.dm @@ -14,7 +14,7 @@ var/cause_role_name var/cause_faction_name - var/total_steps = 0 + var/total_steps var/total_kills = 0 var/time_of_death var/total_time_alive diff --git a/code/datums/statistics/entities/round_stats.dm b/code/datums/statistics/entities/round_stats.dm index e5f1f67982e8..95ec01bf25b2 100644 --- a/code/datums/statistics/entities/round_stats.dm +++ b/code/datums/statistics/entities/round_stats.dm @@ -22,8 +22,10 @@ var/total_friendly_fire_instances = 0 var/total_slashes = 0 - // untracked data + // Sub entities var/datum/entity/statistic/map/current_map // reference to current map + + // untracked data var/list/datum/entity/statistic/death/death_stats_list = list() var/list/abilities_used = list() // types of /datum/entity/statistic, "tail sweep" = 10, "screech" = 2 @@ -63,6 +65,10 @@ QDEL_LIST_ASSOC_VAL(weapon_stats_list) QDEL_LIST_ASSOC_VAL(job_stats_list) +/datum/entity/statistic/round/save() + . = ..() + current_map?.save() + /datum/entity_meta/statistic_round entity_type = /datum/entity/statistic/round table_name = "rounds" @@ -112,6 +118,8 @@ // Map stats var/datum/entity/statistic/map/new_map = DB_EKEY(/datum/entity/statistic/map, SSmapping.configs[GROUND_MAP].map_name) + new_map.save() + new_map.sync() new_map.total_rounds++ new_map.save() diff --git a/code/datums/statistics/random_facts/damage_fact.dm b/code/datums/statistics/random_facts/damage_fact.dm index 2fa8a5d06491..9ebacfc6993b 100644 --- a/code/datums/statistics/random_facts/damage_fact.dm +++ b/code/datums/statistics/random_facts/damage_fact.dm @@ -1,6 +1,7 @@ /datum/random_fact/damage statistic_name = "damage" statistic_verb = "took" + min_required = 400 /datum/random_fact/damage/life_grab_stat(mob/fact_mob) return fact_mob.life_damage_taken_total diff --git a/code/datums/statistics/random_facts/ib_fact.dm b/code/datums/statistics/random_facts/ib_fact.dm index dca8c303b744..d6960b390b72 100644 --- a/code/datums/statistics/random_facts/ib_fact.dm +++ b/code/datums/statistics/random_facts/ib_fact.dm @@ -1,6 +1,7 @@ /datum/random_fact/ib statistic_name = "people" statistic_verb = "fixed internal bleeding for" + min_required = 3 /datum/random_fact/ib/life_grab_stat(mob/fact_mob) return fact_mob.life_ib_total diff --git a/code/datums/statistics/random_facts/kills_fact.dm b/code/datums/statistics/random_facts/kills_fact.dm index 4b43b0b193bf..724564815ec8 100644 --- a/code/datums/statistics/random_facts/kills_fact.dm +++ b/code/datums/statistics/random_facts/kills_fact.dm @@ -3,6 +3,7 @@ statistic_verb = "earned" role_filter = list(XENO_CASTE_FACEHUGGER, XENO_CASTE_LESSER_DRONE, XENO_CASTE_LARVA, XENO_CASTE_PREDALIEN_LARVA) role_filter_blacklist = TRUE + min_required = 5 /datum/random_fact/kills/life_grab_stat(mob/fact_mob) return fact_mob.life_kills_total diff --git a/code/datums/statistics/random_facts/revives_fact.dm b/code/datums/statistics/random_facts/revives_fact.dm index 60b6daa896d2..2a1f66979222 100644 --- a/code/datums/statistics/random_facts/revives_fact.dm +++ b/code/datums/statistics/random_facts/revives_fact.dm @@ -1,6 +1,7 @@ /datum/random_fact/revives statistic_name = "people" statistic_verb = "revived" + min_required = 5 /datum/random_fact/revives/life_grab_stat(mob/fact_mob) return fact_mob.life_revives_total diff --git a/code/datums/statistics/random_facts/steps_fact.dm b/code/datums/statistics/random_facts/steps_fact.dm new file mode 100644 index 000000000000..d435a18cac07 --- /dev/null +++ b/code/datums/statistics/random_facts/steps_fact.dm @@ -0,0 +1,10 @@ +/datum/random_fact/steps + statistic_name = "calories" + statistic_verb = "burned" + min_required = 100 + +/datum/random_fact/steps/life_grab_stat(mob/fact_mob) + return (fact_mob.life_steps_total * 0.12) + +/datum/random_fact/steps/death_grab_stat(datum/entity/statistic/death/fact_death) + return (fact_death.total_steps * 0.12) diff --git a/code/datums/status_effects/debuffs/debuffs.dm b/code/datums/status_effects/debuffs/debuffs.dm index 0ecfead05615..538efd93c4f8 100644 --- a/code/datums/status_effects/debuffs/debuffs.dm +++ b/code/datums/status_effects/debuffs/debuffs.dm @@ -1,4 +1,4 @@ -//Largely negative status effects go here, even if they have small benificial effects +//Largely negative status effects go here, even if they have small beneficial effects //STUN EFFECTS /datum/status_effect/incapacitating tick_interval = -1 @@ -21,26 +21,72 @@ owner.update_stat() return ..() +#define MAX_RESISTIBLE_STUN (20 SECONDS) + //STUN /datum/status_effect/incapacitating/stun id = "stun" + VAR_PROTECTED/resist_duration = -1 + var/last_amount = 0 // alert_type = /atom/movable/screen/alert/status_effect/stun +/datum/status_effect/incapacitating/stun/on_creation(mob/living/new_owner, set_duration, resistible = FALSE) + if(!resistible) + if(new_owner) + last_amount = set_duration / new_owner.GetStunDuration(1) + return ..() + + resist_duration = world.time + MAX_RESISTIBLE_STUN + var/capped_amount = min(set_duration, MAX_RESISTIBLE_STUN) + if(new_owner) + last_amount = capped_amount / new_owner.GetStunDuration(1) + return ..(new_owner, capped_amount, resistible) + /datum/status_effect/incapacitating/stun/on_apply() . = ..() if(!.) return - owner.add_traits(list(TRAIT_INCAPACITATED, TRAIT_IMMOBILIZED /*, TRAIT_HANDS_BLOCKED*/), TRAIT_STATUS_EFFECT(id)) + owner?.add_traits(list(TRAIT_INCAPACITATED, TRAIT_IMMOBILIZED /*, TRAIT_HANDS_BLOCKED*/), TRAIT_STATUS_EFFECT(id)) /datum/status_effect/incapacitating/stun/on_remove() - owner.remove_traits(list(TRAIT_INCAPACITATED, TRAIT_IMMOBILIZED /*, TRAIT_HANDS_BLOCKED*/), TRAIT_STATUS_EFFECT(id)) + resist_duration = -1 + owner?.remove_traits(list(TRAIT_INCAPACITATED, TRAIT_IMMOBILIZED /*, TRAIT_HANDS_BLOCKED*/), TRAIT_STATUS_EFFECT(id)) return ..() +/datum/status_effect/incapacitating/stun/update_duration(amount, increment, resistible = FALSE) + if(!resistible) + if(owner) + last_amount = amount / owner.GetStunDuration(1) + return ..() + + if(resist_duration < 0) + resist_duration = world.time + MAX_RESISTIBLE_STUN + + var/capped_amount = min(amount, resist_duration - world.time) + if(owner) + last_amount = capped_amount / owner.GetStunDuration(1) + return ..(capped_amount, increment) + +/datum/status_effect/incapacitating/stun/adjust_duration(amount, resistible = FALSE) + if(!resistible) + if(owner) + last_amount = amount / owner.GetStunDuration(1) + return ..() + + if(resist_duration < 0) + resist_duration = world.time + MAX_RESISTIBLE_STUN + + var/capped_amount = min(amount, resist_duration - world.time) + if(owner) + last_amount = capped_amount / owner.GetStunDuration(1) + return ..(capped_amount) + /atom/movable/screen/alert/status_effect/stun name = "Stunned" desc = "You are incapacitated. You may not move or act." icon_state = ALERT_INCAPACITATED +#undef MAX_RESISTIBLE_STUN //KNOCKDOWN /datum/status_effect/incapacitating/knockdown diff --git a/code/datums/supply_packs/ammo.dm b/code/datums/supply_packs/ammo.dm index b0d92cfb5782..d9d59f70e100 100644 --- a/code/datums/supply_packs/ammo.dm +++ b/code/datums/supply_packs/ammo.dm @@ -319,16 +319,25 @@ containername = "\improper M10 extended magazines crate" group = "Ammo" -/datum/supply_packs/ammo_m10_pistol_mag_box_drum - name = "Magazine box (M10, 12x drum mags)" +/datum/supply_packs/ammo_m10_ap_pistol_mag_box + name = "Magazine box (M10 AP, 22x regular mags)" contains = list( - /obj/item/ammo_box/magazine/m10/drum, + /obj/item/ammo_box/magazine/m10/ap, ) - cost = 50 + cost = 40 containertype = /obj/structure/closet/crate/ammo - containername = "\improper M10 drum magazines crate" + containername = "\improper M10 AP magazines crate" group = "Ammo" +/datum/supply_packs/ammo_m10_ap_pistol_mag_box_extended + name = "Magazine box (M10 AP, 14x extended mags)" + contains = list( + /obj/item/ammo_box/magazine/m10/ap/extended, + ) + cost = 60 + containertype = /obj/structure/closet/crate/ammo + containername = "\improper M10 AP extended magazines crate" + group = "Ammo" //------------------------Smartgunner stuff---------------- @@ -501,9 +510,10 @@ /obj/item/ammo_magazine/smg/m39/extended, /obj/item/ammo_magazine/smg/m39/ap, /obj/item/ammo_magazine/smg/m39/ap, - /obj/item/ammo_magazine/pistol/m10, /obj/item/ammo_magazine/pistol/m10/extended, - /obj/item/ammo_magazine/pistol/m10/drum, + /obj/item/ammo_magazine/pistol/m10/extended, + /obj/item/ammo_magazine/pistol/m10/extended, + /obj/item/ammo_magazine/pistol/m10/extended, /obj/item/ammo_magazine/revolver, /obj/item/ammo_magazine/revolver, /obj/item/ammo_magazine/revolver, diff --git a/code/datums/supply_packs/black_market.dm b/code/datums/supply_packs/black_market.dm index 8b06e8be927f..f93c912c2d4b 100644 --- a/code/datums/supply_packs/black_market.dm +++ b/code/datums/supply_packs/black_market.dm @@ -1303,7 +1303,6 @@ Things that don't fit anywhere else. If they're meant for shipside use, they pro /obj/item/explosive/grenade/phosphorus/clf, /obj/item/explosive/grenade/smokebomb, /obj/item/explosive/grenade/smokebomb/airburst, - /obj/item/explosive/grenade/custom/antiweed ) for(var/i in 1 to 4) var/picked_type = pick(nades_to_pick) @@ -1380,7 +1379,7 @@ Things that don't fit anywhere else. If they're meant for shipside use, they pro var/obj/item/mortar_shell/frag/fragshell = new(loc) var/obj/item/explosive/grenade/incendiary/molotov/molotov = new(loc) molotov.prime() - fragshell.balloon_alert_to_viewers("the mortar shell makes an awful hissing noise!") + fragshell.balloon_alert_to_viewers("the shell starts hissing!") addtimer(CALLBACK(fragshell, TYPE_PROC_REF(/obj/item/mortar_shell/frag, detonate), loc), 5 SECONDS) QDEL_IN(fragshell, 5.5 SECONDS) loot_message = SPAN_HIGHDANGER("RUN!!!") diff --git a/code/datums/supply_packs/medical.dm b/code/datums/supply_packs/medical.dm index 4967b96bf6ff..ef90b68aa2ad 100644 --- a/code/datums/supply_packs/medical.dm +++ b/code/datums/supply_packs/medical.dm @@ -127,6 +127,22 @@ access = ACCESS_MARINE_MEDBAY group = "Medical" +/datum/supply_packs/surgery/beds + name = "surgery crate (surgical beds)" + contains = list( + /obj/item/roller/surgical, + /obj/item/roller/surgical, + /obj/item/roller/surgical, + /obj/item/roller/surgical, + /obj/item/roller/surgical, + /obj/item/roller/surgical, + ) + cost = 25 + containertype = /obj/structure/closet/crate/secure/surgery + containername = "surgery crate" + access = ACCESS_MARINE_MEDBAY + group = "Medical" + /datum/supply_packs/field_doc name = "field doctor crate (replacement field doctor gear)" contains = list( @@ -139,6 +155,7 @@ /obj/item/clothing/mask/breath/medical, /obj/item/storage/box/masks, /obj/item/storage/box/gloves, + /obj/item/storage/box/bloodbag, /obj/item/tool/wrench, /obj/item/tool/crowbar, ) diff --git a/code/datums/supply_packs/reagent_tanks.dm b/code/datums/supply_packs/reagent_tanks.dm index ea981065865e..5c22c36d8bc0 100644 --- a/code/datums/supply_packs/reagent_tanks.dm +++ b/code/datums/supply_packs/reagent_tanks.dm @@ -2,7 +2,7 @@ /datum/supply_packs/fueltank name = "fuel tank crate (x1)" - contains = list(/obj/structure/reagent_dispensers/fueltank) + contains = list(/obj/structure/reagent_dispensers/tank/fuel) cost = 20 containertype = /obj/structure/largecrate containername = "fuel tank crate" diff --git a/code/datums/tacmap_viewer.dm b/code/datums/tacmap_viewer.dm new file mode 100644 index 000000000000..d2b3cbceda98 --- /dev/null +++ b/code/datums/tacmap_viewer.dm @@ -0,0 +1,62 @@ +GLOBAL_DATUM_INIT(tacmap_viewer, /datum/tacmap_viewer, new) + +/datum/tacmap_viewer + var/name = "Tacmap Viewer" + /// A url that will point to the wiki map for the current map as a fall back image + var/static/wiki_map_fallback + +/datum/tacmap_viewer/tgui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + if(!wiki_map_fallback) + var/wiki_url = CONFIG_GET(string/wikiurl) + var/obj/item/map/current_map/new_map = new + if(wiki_url && new_map.html_link) + wiki_map_fallback ="[wiki_url]/[new_map.html_link]" + else + debug_log("Failed to determine fallback wiki map! Attempted '[wiki_url]/[new_map.html_link]'") + qdel(new_map) + + ui = new(user, src, "TacmapViewer", "Tacmap Viewer") + ui.open() + +/datum/tacmap_viewer/ui_state(mob/user) + if(isliving(user)) + return GLOB.conscious_state + else + return GLOB.observer_state + +/datum/tacmap_viewer/ui_data(mob/user) + var/list/data = list() + + var/list/factions = list() + if(ishuman(user) && (user.faction == FACTION_MARINE || (FACTION_MARINE in user.faction_group))) + factions += "USCM" + + if(isxeno(user)) + factions += "Hive" + + data["factions"] = factions + + var/uscm_length = length(GLOB.uscm_drawing_tacmap_data) + if(uscm_length == 0) + data["uscm_map"] = null + data["uscm_svg"] = null + else + var/datum/flattened_tacmap/selected_flat = GLOB.uscm_flat_tacmap_data[uscm_length] + var/datum/drawing_data/selected_draw_data = GLOB.uscm_drawing_tacmap_data[uscm_length] + data["uscm_map"] = selected_flat ? selected_flat.flat_tacmap : null + data["uscm_svg"] = selected_draw_data ? selected_draw_data.draw_data : null + + var/xeno_length = length(GLOB.xeno_drawing_tacmap_data) + if(xeno_length == 0) + data["xeno_map"] = null + data["xeno_svg"] = null + else + var/datum/flattened_tacmap/selected_flat = GLOB.xeno_flat_tacmap_data[xeno_length] + var/datum/drawing_data/selected_draw_data = GLOB.xeno_drawing_tacmap_data[xeno_length] + data["xeno_map"] = selected_flat ? selected_flat.flat_tacmap : null + data["xeno_svg"] = selected_draw_data ? selected_draw_data.draw_data : null + + data["map_fallback"] = wiki_map_fallback + return data diff --git a/code/datums/tutorial/marine/hospital_corpsman_sandbox.dm b/code/datums/tutorial/marine/hospital_corpsman_sandbox.dm index cc41847bd5b0..603932e75712 100644 --- a/code/datums/tutorial/marine/hospital_corpsman_sandbox.dm +++ b/code/datums/tutorial/marine/hospital_corpsman_sandbox.dm @@ -25,6 +25,7 @@ #define INTERNAL_BLEEDING "IB" #define SUTURE "suture" #define FRACTURE "fracture" +#define ESCHAR_INJURY "eschar" /datum/tutorial/marine/hospital_corpsman_sandbox name = "Marine - Hospital Corpsman (Sandbox)" @@ -45,7 +46,7 @@ /// List of ACTIVELY MOVING patient NPCs var/list/mob/living/carbon/human/realistic_dummy/active_agents = list() /// List of NPC inventory items that needs to be removed when they asked to leave - var/list/obj/item/clothing/suit/storage/marine/medium/cleanup = list() + var/list/obj/item/cleanup = list() /// Ref to any patient NPC actively moving var/mob/living/carbon/human/realistic_dummy/active_agent /// Ref to late-spawned patient NPC that has a chance to appear during a treatment phase @@ -215,6 +216,8 @@ simulate_condition(active_agent) var/obj/item/clothing/suit/storage/marine/medium/armor = active_agent.get_item_by_slot(WEAR_JACKET) RegisterSignal(armor, COMSIG_ITEM_UNEQUIPPED, PROC_REF(item_cleanup)) + var/obj/item/clothing/head/helmet/marine/helmet = active_agent.get_item_by_slot(WEAR_HEAD) + RegisterSignal(helmet, COMSIG_ITEM_UNEQUIPPED, PROC_REF(item_cleanup)) addtimer(CALLBACK(src, PROC_REF(eval_agent_status)), 3 SECONDS) // Gives time for NPCs to pass out or die, if their condition is severe enough if((survival_difficulty >= TUTORIAL_HM_INJURY_SEVERITY_FATAL) && prob(75)) // If above difficulty FATAL, starts a random timer to spawn a booboo agent @@ -235,8 +238,10 @@ var/obj/limb/selected_limb = pick(limbs) var/damage_amount = (rand((40 * survival_difficulty), (50 * survival_difficulty))) selected_limb.take_damage(round((damage_amount * damage_amount_split) / amount_of_parts), round((damage_amount * (1 - damage_amount_split)) / amount_of_parts)) - if((damage_amount > 30) && prob(survival_difficulty * 10)) + if((damage_amount > selected_limb.min_broken_damage) && prob(survival_difficulty * 7)) selected_limb.fracture() + if((damage_amount > selected_limb.min_eschar_damage) && prob(survival_difficulty * 3)) + selected_limb.eschar() if(patient_type == PATIENT_TYPE_ORGAN) // applies organ damage AS WELL as mundane damage if type 2 var/datum/internal_organ/organ = pick(target.internal_organs) target.apply_internal_damage(rand(1,(survival_difficulty*3.75)), "[organ.name]") @@ -266,12 +271,16 @@ var/list/injury_type = list() if((limb.status & LIMB_BROKEN) && !(limb.status & LIMB_SPLINTED)) injury_type |= FRACTURE - RegisterSignal(limb, COMSIG_LIVING_LIMB_SPLINTED, PROC_REF(health_tasks_handler)) + RegisterSignal(limb, COMSIG_LIVING_LIMB_SPLINTED, PROC_REF(health_tasks_handler_splinted)) + if((limb.status & LIMB_ESCHAR)) + injury_type |= ESCHAR_INJURY + RegisterSignal(limb, COMSIG_LIMB_SURGERY_STEP_SUCCESS, PROC_REF(health_tasks_handler_surgery)) if(limb.can_bleed_internally) for(var/datum/wound/wound as anything in limb.wounds) if(wound.internal) injury_type |= INTERNAL_BLEEDING - RegisterSignal(tutorial_mob, COMSIG_HUMAN_SURGERY_STEP_SUCCESS, PROC_REF(health_tasks_handler), TRUE) // yeah yeah, give me a break + RegisterSignal(limb, COMSIG_LIMB_SURGERY_STEP_SUCCESS, PROC_REF(health_tasks_handler_surgery)) + break if(length(injury_type)) healing_tasks[limb] = injury_type if(!length(healing_tasks) || bypass) @@ -279,37 +288,43 @@ else agent_healing_tasks[target] = healing_tasks -/datum/tutorial/marine/hospital_corpsman_sandbox/proc/health_tasks_handler(datum/source, mob/living/carbon/human/realistic_dummy/target, datum/surgery/surgery) +/// Signal handler for COMSIG_LIVING_LIMB_SPLINTED +/datum/tutorial/marine/hospital_corpsman_sandbox/proc/health_tasks_handler_splinted(obj/limb/limb, mob/living/user) SIGNAL_HANDLER + health_tasks_handler(limb) +/// Signal handler for COMSIG_LIMB_SURGERY_STEP_SUCCESS +/datum/tutorial/marine/hospital_corpsman_sandbox/proc/health_tasks_handler_surgery(obj/limb/limb, mob/living/user, datum/surgery/surgery, obj/item/tool) + SIGNAL_HANDLER + health_tasks_handler(limb, surgery) + +/datum/tutorial/marine/hospital_corpsman_sandbox/proc/health_tasks_handler(obj/limb/limb, datum/surgery/surgery) + var/mob/living/carbon/human/realistic_dummy/target = limb.owner var/list/healing_tasks = agent_healing_tasks[target] + var/list/injury_type = healing_tasks[limb] - var/obj/limb/limb - if(istype(source, /obj/limb)) // swaps around the variables from COMSIG_LIVING_LIMB_SPLINTED to make them consistent - limb = source - var/target_redirect = limb.owner - health_tasks_handler(target, target_redirect) - UnregisterSignal(limb, COMSIG_LIVING_LIMB_SPLINTED) - return - for(limb in healing_tasks) - var/list/injury_type = list() - injury_type |= healing_tasks[limb] - if(surgery && limb == surgery.affected_limb) + if(surgery?.affected_limb == limb) + if(surgery.status == length(surgery.steps)) if(istype(surgery, /datum/surgery/internal_bleeding)) injury_type -= INTERNAL_BLEEDING injury_type |= SUTURE - if(istype(surgery, /datum/surgery/suture_incision)) - injury_type = healing_tasks[surgery.affected_limb] - if(SUTURE in injury_type) - injury_type -= SUTURE - if((FRACTURE in injury_type) && (limb.status & LIMB_BROKEN) && (limb.status & LIMB_SPLINTED)) - injury_type -= FRACTURE - if(!length(injury_type) && limb) // makes sure something DID exist on the list - healing_tasks -= limb - else - healing_tasks[limb] = injury_type + else if(istype(surgery, /datum/surgery/eschar_mend) && !(limb.status & LIMB_ESCHAR)) + injury_type -= ESCHAR_INJURY + injury_type |= SUTURE + else if(istype(surgery, /datum/surgery/suture_incision)) + injury_type -= SUTURE + if(!(INTERNAL_BLEEDING in injury_type) && !(ESCHAR_INJURY in injury_type)) + UnregisterSignal(limb, COMSIG_LIMB_SURGERY_STEP_SUCCESS) + if((FRACTURE in injury_type) && (CHECK_MULTIPLE_BITFIELDS(limb.status, LIMB_BROKEN|LIMB_SPLINTED) || !(limb.status & LIMB_BROKEN))) + injury_type -= FRACTURE + UnregisterSignal(limb, COMSIG_LIVING_LIMB_SPLINTED) + + if(!length(injury_type)) // makes sure something DID exist on the list + healing_tasks -= limb + else + healing_tasks[limb] = injury_type + if(!length(healing_tasks)) - UnregisterSignal(tutorial_mob, COMSIG_HUMAN_SURGERY_STEP_SUCCESS) make_agent_leave(target) /datum/tutorial/marine/hospital_corpsman_sandbox/proc/eval_agent_status() @@ -441,7 +456,7 @@ agent.updatehealth() if(!bypass) if(agent.undefibbable == TRUE) - agent.balloon_alert_to_viewers("[agent.name] permanently dead!", null, DEFAULT_MESSAGE_RANGE, null, COLOR_RED) + agent.balloon_alert_to_viewers("[agent.name] is permanently dead!", null, DEFAULT_MESSAGE_RANGE, null, COLOR_RED) playsound(agent.loc, 'sound/items/defib_failed.ogg', 20) else agent.balloon_alert_to_viewers("[agent.name] fully treated!") @@ -451,8 +466,8 @@ active_agents -= agent QDEL_IN(agent, 2.5 SECONDS) animate(agent, 2.5 SECONDS, alpha = 0, easing = CUBIC_EASING) - for(var/obj/item/clothing/suit/storage/marine/medium/armor as anything in cleanup) - item_cleanup(armor) + for(var/obj/item/cleanup_item as anything in cleanup) + item_cleanup(cleanup_item) if(!length(agents)) INVOKE_ASYNC(src, PROC_REF(handle_round_progression)) @@ -490,27 +505,27 @@ for(var/datum/reagent/medical/chemical as anything in target.reagents.reagent_list) if(chemical.volume >= chemical.overdose_critical) - status_message |= "Critical [chemical.name] overdose detected" + status_message |= "critical [chemical.name] overdose detected" for(var/datum/internal_organ/organ as anything in target.internal_organs) if(organ.damage >= organ.min_broken_damage) if((locate(/datum/reagent/medical/peridaxon) in target.reagents.reagent_list) || (target.stat == DEAD)) - status_message |= "Ruptured [organ.name] detected" + status_message |= "ruptured [organ.name] detected" else - medevac_bed.balloon_alert_to_viewers("Organ damage detected! Please stabilize patient with Peridaxon before transit.", null, DEFAULT_MESSAGE_RANGE, null, COLOR_RED) + medevac_bed.balloon_alert_to_viewers("organ damage detected! stabilize patient with peridaxon before transit!", null, DEFAULT_MESSAGE_RANGE, null, COLOR_RED) playsound(medevac_bed.loc, 'sound/machines/twobeep.ogg', 20) return if(tutorial_mob == target) - medevac_bed.balloon_alert_to_viewers("Error! Unable to self-evacuate!", null, DEFAULT_MESSAGE_RANGE, null, COLOR_RED) + medevac_bed.balloon_alert_to_viewers("unable to self-evacuate!", null, DEFAULT_MESSAGE_RANGE, null, COLOR_RED) playsound(medevac_bed.loc, 'sound/machines/twobeep.ogg', 20) return if(length(status_message)) - medevac_bed.balloon_alert_to_viewers("[pick(status_message)]! Evacuating patient!!", null, DEFAULT_MESSAGE_RANGE, null, LIGHT_COLOR_BLUE) + medevac_bed.balloon_alert_to_viewers("[pick(status_message)]! evacuating patient!", null, DEFAULT_MESSAGE_RANGE, null, LIGHT_COLOR_BLUE) playsound(medevac_bed.loc, pick_weight(list('sound/machines/ping.ogg' = 9, 'sound/machines/juicer.ogg' = 1)), 20) make_agent_leave(target, TRUE) addtimer(CALLBACK(src, PROC_REF(animate_medevac_bed), target), 2.7 SECONDS) else - medevac_bed.balloon_alert_to_viewers("Error! Patient condition does not warrant evacuation!", null, DEFAULT_MESSAGE_RANGE, null, COLOR_RED) + medevac_bed.balloon_alert_to_viewers("patient condition does not warrant evacuation!", null, DEFAULT_MESSAGE_RANGE, null, COLOR_RED) playsound(medevac_bed.loc, 'sound/machines/twobeep.ogg', 20) return @@ -525,19 +540,19 @@ if(length(dragging_agents) || length(active_agents)) movement_handler() -/datum/tutorial/marine/hospital_corpsman_sandbox/proc/item_cleanup(obj/item/clothing/suit/storage/marine/medium/armor) +/datum/tutorial/marine/hospital_corpsman_sandbox/proc/item_cleanup(obj/item/dropped) SIGNAL_HANDLER - - if(!(armor in cleanup)) - cleanup |= armor // marks item for removal once the dummy is ready - UnregisterSignal(armor, COMSIG_ITEM_UNEQUIPPED) - return + if(dropped in cleanup) + cleanup -= dropped + var/obj/item/storage/internal/stored_items = locate(/obj/item/storage/internal) in dropped + if(stored_items) + var/turf/dumping_turf = get_turf(dropped) + for(var/obj/item/stored_item as anything in stored_items) + stored_items.remove_from_storage(stored_item, dumping_turf) + QDEL_IN(dropped, 1 SECONDS) else - cleanup -= armor - var/obj/item/storage/internal/armor_storage = locate(/obj/item/storage/internal) in armor - for(var/obj/item/item as anything in armor_storage) - armor_storage.remove_from_storage(item, get_turf(armor)) - QDEL_IN(armor, 1 SECONDS) + cleanup |= dropped // marks item for removal once the dummy is ready + UnregisterSignal(dropped, COMSIG_ITEM_UNEQUIPPED) /datum/tutorial/marine/hospital_corpsman_sandbox/init_mob() . = ..() @@ -632,3 +647,4 @@ #undef INTERNAL_BLEEDING #undef SUTURE #undef FRACTURE +#undef ESCHAR_INJURY diff --git a/code/datums/tutorial/marine/reqs_line.dm b/code/datums/tutorial/marine/reqs_line.dm index b8bea130a76b..8f954c150099 100644 --- a/code/datums/tutorial/marine/reqs_line.dm +++ b/code/datums/tutorial/marine/reqs_line.dm @@ -243,7 +243,7 @@ request += pick(catalogue) if(i < 6) // Only telescope catalogues the first 5 times as the chances compound catalogue += request - spawn_agent(request, "Lv [survival_wave]. ") + spawn_agent(request, "Lv [survival_wave].") /// Called when an agent presents at the line window and needs to make a request /datum/tutorial/marine/reqs_line/proc/a_new_challenger_appears(turf/source, mob/living/carbon/human/challenger) diff --git a/code/datums/weather/weather_event.dm b/code/datums/weather/weather_event.dm index 58e154d68fcc..347354f506a5 100644 --- a/code/datums/weather/weather_event.dm +++ b/code/datums/weather/weather_event.dm @@ -62,5 +62,5 @@ to_chat(affected_mob, SPAN_WARNING(effect_message)) if(damage_per_tick) var/calculated_damage = (isxeno(affected_mob) ? damage_per_tick * 3 : damage_per_tick) * delta_time - affected_mob.apply_damage(calculated_damage, damage_type) + affected_mob.apply_damage(calculated_damage, damage_type, enviro=TRUE) affected_mob.last_damage_data = create_cause_data("Exposure") diff --git a/code/datums/world_topic.dm b/code/datums/world_topic.dm index e70cac5664d9..cab83360b253 100644 --- a/code/datums/world_topic.dm +++ b/code/datums/world_topic.dm @@ -157,181 +157,88 @@ list("title" = test_merge.title, "number" = test_merge.number, "url" = test_merge.url, "author" = test_merge.author) ) -/datum/world_topic/certify - key = "certify" - required_params = list("identifier", "discord_id") - -/datum/world_topic/certify/Run(list/input) - var/identifier = input["identifier"] - var/discord_id = input["discord_id"] - - data = list() - - var/datum/view_record/discord_link/existing_link = locate() in DB_VIEW(/datum/view_record/discord_link, DB_COMP("discord_id", DB_EQUALS, discord_id)) - - if(existing_link) - statuscode = 504 - response = "Discord ID already verified." - return - - var/datum/entity/discord_identifier/id = get_discord_identifier_by_token(identifier) - - if(!id || !id.playerid) - id.delete() - - statuscode = 500 - response = "Database query failed" - return - - if(id.realtime < world.realtime - 4 HOURS) - statuscode = 501 - response = "Authentication timed out." - - var/datum/entity/player/player = DB_ENTITY(/datum/entity/player, id.playerid) - player.sync() - - if(!player.ckey) - statuscode = 500 - response = "Database query failed." - return - - data["ckey"] = player.ckey - data["roles"] = get_whitelisted_roles(player.ckey) - - if(player.discord_link) - statuscode = 503 - response = "Player already authenticated." - return - - var/datum/entity/discord_link/link = DB_EKEY(/datum/entity/discord_link, discord_id) - link.discord_id = discord_id - link.player_id = text2num(player.id) - link.save() - link.sync() - - player.discord_link = link - player.discord_link_id = link.id - player.save() - player.sync() - - id.used = TRUE - id.save() - id.sync() - - statuscode = 200 - response = "Successfully certified." - data["related_ckeys"] = analyze_ckey(player.ckey) - -/datum/world_topic/decertify_by_ckey - key = "decertify_ckey" +/datum/world_topic/lookup_ckey + key = "lookup_ckey" required_params = list("ckey") -/datum/world_topic/decertify_by_ckey/Run(list/input) +/datum/world_topic/lookup_ckey/Run(list/input) data = list() - var/datum/entity/player/player = get_player_from_key(input["ckey"]) - + var/datum/view_record/players/player = locate() in DB_VIEW(/datum/view_record/players, DB_COMP("ckey", DB_EQUALS, input["ckey"])) if(!player) - statuscode = 500 - response = "Database lookup failed." - return - - if(!player.discord_link) statuscode = 501 - response = "No linked Discord." + response = "Database lookup failed." return - var/discord_id = player.discord_link.discord_id - - player.discord_link.delete() - player.discord_link = null - - player.discord_link_id = null - player.save() - player.sync() - - data["discord_id"] = discord_id + data["notes"] = get_all_notes(player.ckey) + data["total_minutes"] = get_total_living_playtime(player.id) + data["roles"] = get_whitelisted_roles(player.ckey) statuscode = 200 - response = "Decertification successful." - -/datum/world_topic/decertify_by_discord_id - key = "decertify_discord_id" - required_params = list("discord_id") + response = "Lookup successful." -/datum/world_topic/decertify_by_discord_id/Run(list/input) - data = list() +/datum/world_topic/cmtv + key = "cmtv" + required_params = list("command") - var/datum/view_record/discord_link/link = locate() in DB_VIEW(/datum/view_record/discord_link, DB_COMP("discord_id", DB_EQUALS, input["discord_id"])) +/datum/world_topic/cmtv/Run(list/input) + . = ..() - if(!link || !link.player_id) - statuscode = 500 - response = "Database lookup failed." + var/datum/cmtv_command/selected_command = GLOB.cmtv_commands[input["command"]] + if(!selected_command) + statuscode = 404 + response = "Invalid command! Use !help to view all commands." return - var/datum/entity/player/player = DB_ENTITY(/datum/entity/player, link.player_id) - player.sync() - - if(!player.discord_link) - statuscode = 501 - response = "No linked Discord." + var/cannot_run = selected_command.cannot_run(input) + if(cannot_run) + statuscode = 401 + response = cannot_run return - player.discord_link.delete() - player.discord_link = null - - player.discord_link_id = null - player.save() - player.sync() + selected_command.pre_execute(input) - data["discord_id"] = input["discord_id"] - data["ckey"] = player.ckey - statuscode = 200 - response = "Decertification successful." + response = selected_command.execute(input) + statuscode = selected_command.successful ? 200 : 303 -/datum/world_topic/lookup_discord_id - key = "lookup_discord_id" - required_params = list("discord_id") - -/datum/world_topic/lookup_discord_id/Run(list/input) - data = list() + selected_command.post_execute(input) - var/datum/view_record/discord_link/link = locate() in DB_VIEW(/datum/view_record/discord_link, DB_COMP("discord_id", DB_EQUALS, input["discord_id"])) +/datum/world_topic/active_mobs + key = "active_mobs" - if(!link || !link.player_id) - statuscode = 500 - response = "Database lookup failed." +/datum/world_topic/active_mobs/Run(list/input) + var/to_follow = SScmtv.get_most_active_list() + if(!length(to_follow)) + statuscode = 404 + response = "No active mobs available." return - var/datum/view_record/players/player = locate() in DB_VIEW(/datum/view_record/players, DB_COMP("id", DB_EQUALS, link.player_id)) + var/list/mobs = list() - data["notes"] = get_all_notes(player.ckey) - data["total_minutes"] = get_total_living_playtime(player.id) - data["ckey"] = player.ckey - data["roles"] = get_whitelisted_roles(player.ckey) - statuscode = 200 - response = "Lookup successful." + for(var/datum/weakref/weakref in to_follow) + var/mob/living/living_mob = weakref.resolve() + if(!living_mob) + continue -/datum/world_topic/lookup_ckey - key = "lookup_ckey" - required_params = list("ckey") + var/minimap_icon + var/background -/datum/world_topic/lookup_ckey/Run(list/input) - data = list() - - var/datum/view_record/players/player = locate() in DB_VIEW(/datum/view_record/players, DB_COMP("ckey", DB_EQUALS, input["ckey"])) - if(!player) - statuscode = 501 - response = "Database lookup failed." - return + if(isxeno(living_mob)) + var/mob/living/carbon/xenomorph/xeno = living_mob + minimap_icon = xeno.caste.minimap_icon + background = xeno.caste.minimap_background + else if(ishuman(living_mob)) + var/mob/living/carbon/human/human = living_mob + if(human.assigned_squad) + background = human.assigned_squad.background_icon + else + background = human.assigned_equipment_preset?.minimap_background - if(player.discord_link_id) - var/datum/view_record/discord_link/link = locate() in DB_VIEW(/datum/view_record/discord_link, DB_COMP("id", DB_EQUALS, player.discord_link_id)) + minimap_icon = human.assigned_equipment_preset?.minimap_icon || "private" - if(link && link.discord_id) - data["discord_id"] = link.discord_id + mobs += list( + list("name" = living_mob.real_name, "job" = minimap_icon, "background" = background) + ) - data["notes"] = get_all_notes(player.ckey) - data["total_minutes"] = get_total_living_playtime(player.id) - data["roles"] = get_whitelisted_roles(player.ckey) + data = mobs statuscode = 200 - response = "Lookup successful." + response = "Active mobs available." diff --git a/code/defines/procs/announcement.dm b/code/defines/procs/announcement.dm index 89bc77172e1a..7405f46cc98a 100644 --- a/code/defines/procs/announcement.dm +++ b/code/defines/procs/announcement.dm @@ -31,24 +31,45 @@ //general marine announcement /proc/marine_announcement(message, title = COMMAND_ANNOUNCE, sound_to_play = sound('sound/misc/notice2.ogg'), faction_to_display = FACTION_MARINE, add_PMCs = FALSE, signature, logging = ARES_LOG_MAIN) var/list/targets = GLOB.human_mob_list + GLOB.dead_mob_list + var/list/targets_to_garble = list() + var/list/coms_zs = SSradio.get_available_tcomm_zs(COMM_FREQ) + if(faction_to_display == FACTION_MARINE) - for(var/mob/M in targets) - if(isobserver(M)) //observers see everything - continue - var/mob/living/carbon/human/H = M - if(!istype(H) || H.stat != CONSCIOUS || isyautja(H)) //base human checks - targets.Remove(H) - continue - if(is_mainship_level(H.z) && istype(GLOB.master_mode, /datum/game_mode/extended/faction_clash )) // People on ship see everything, unless it is faction clash - continue + for(var/mob/current_mob in targets) + var/turf/current_turf = get_turf(current_mob) + var/is_shipside = is_mainship_level(current_turf?.z) + + if(isobserver(current_mob)) //observers see everything + if(current_mob.client?.prefs?.toggles_chat & CHAT_GHOSTANNOUNCECLARITY) + continue // Valid target w/o garble + if(!is_shipside && !(current_turf?.z in coms_zs)) + targets_to_garble += current_mob + continue // Valid target + + var/mob/living/carbon/human/current_human = current_mob + if(!istype(current_human) || current_human.stat != CONSCIOUS || isyautja(current_human)) //base human checks + targets -= current_human + continue // Invalid target + + if(is_shipside && !(istype(GLOB.master_mode, /datum/game_mode/extended/faction_clash))) // People on ship see everything, unless it is faction clash + continue // Valid target w/o garble + + if(!is_shipside && !(current_turf?.z in coms_zs)) + targets_to_garble += current_human // If they have iff AND a marine headset they will recieve announcements - var/obj/item/card/id/card = H.get_idcard() - if ((FACTION_MARINE in card?.faction_group) && (istype(H.wear_l_ear, /obj/item/device/radio/headset/almayer) || istype(H.wear_r_ear, /obj/item/device/radio/headset/almayer))) - continue + var/obj/item/card/id/card = current_human.get_idcard() + if((FACTION_MARINE in card?.faction_group) && (istype(current_human.wear_l_ear, /obj/item/device/radio/headset/almayer) || istype(current_human.wear_r_ear, /obj/item/device/radio/headset/almayer))) + continue // Valid target - if((H.faction != faction_to_display && !add_PMCs) || (H.faction != faction_to_display && add_PMCs && !(H.faction in FACTION_LIST_WY)) && !(faction_to_display in H.faction_group)) //faction checks - targets.Remove(H) + /// If they're in a joint-USCM job they'll get announcements regardless. + if((current_human.job in USCM_SHARED_JOBS) && (istype(current_human.wear_l_ear, /obj/item/device/radio/headset) || istype(current_human.wear_r_ear, /obj/item/device/radio/headset))) + continue // Valid target + + if((current_human.faction != faction_to_display && !add_PMCs) || (current_human.faction != faction_to_display && add_PMCs && !(current_human.faction in FACTION_LIST_WY)) && !(faction_to_display in current_human.faction_group)) //faction checks + targets -= current_human + targets_to_garble -= current_human + continue // Invalid target switch(logging) if(ARES_LOG_MAIN) @@ -57,28 +78,53 @@ log_ares_security(title, message, signature) else if(faction_to_display == "Everyone (-Yautja)") - for(var/mob/M in targets) - if(isobserver(M)) //observers see everything - continue - var/mob/living/carbon/human/H = M - if(!istype(H) || H.stat != CONSCIOUS || isyautja(H)) - targets.Remove(H) + for(var/mob/current_mob in targets) + var/turf/current_turf = get_turf(current_mob) + var/is_shipside = is_mainship_level(current_turf?.z) + + if(isobserver(current_mob)) //observers see everything + if(current_mob.client?.prefs?.toggles_chat & CHAT_GHOSTANNOUNCECLARITY) + continue // Valid target w/o garble + if(!is_shipside && !(current_turf?.z in coms_zs)) + targets_to_garble += current_mob + continue // Valid target + + var/mob/living/carbon/human/current_human = current_mob + if(!istype(current_human) || current_human.stat != CONSCIOUS || isyautja(current_human)) + targets -= current_human + continue // Invalid target + + if(!is_shipside && !(current_turf?.z in coms_zs)) + targets_to_garble += current_human else - for(var/mob/M in targets) - if(isobserver(M)) //observers see everything - continue - var/mob/living/carbon/human/H = M - if(!istype(H) || H.stat != CONSCIOUS || isyautja(H)) - targets.Remove(H) - continue - if(H.faction != faction_to_display) - targets.Remove(H) + for(var/mob/current_mob in targets) + var/turf/current_turf = get_turf(current_mob) + var/is_shipside = is_mainship_level(current_turf?.z) + + if(isobserver(current_mob)) //observers see everything + if(current_mob.client?.prefs?.toggles_chat & CHAT_GHOSTANNOUNCECLARITY) + continue // Valid target w/o garble + if(!is_shipside && !(current_turf?.z in coms_zs)) + targets_to_garble += current_mob + continue // Valid target + + var/mob/living/carbon/human/current_human = current_mob + if(!istype(current_human) || current_human.stat != CONSCIOUS || isyautja(current_human)) + targets -= current_human + continue // Invalid target + + if(current_human.faction != faction_to_display) + targets -= current_human + continue // Invalid target + + if(!is_shipside && !(current_turf?.z in coms_zs)) + targets_to_garble += current_human if(!isnull(signature)) message += "
Signed by,
[signature]" - announcement_helper(message, title, targets, sound_to_play) + announcement_helper(message, title, targets, sound_to_play, FALSE, targets_to_garble, FACTION_MARINE) //AI announcement that uses talking into comms /proc/ai_announcement(message, sound_to_play = sound('sound/misc/interference.ogg'), logging = ARES_LOG_MAIN) @@ -136,14 +182,25 @@ /proc/all_hands_on_deck(message, title = MAIN_AI_SYSTEM, sound_to_play = sound('sound/misc/sound_misc_boatswain.ogg')) shipwide_ai_announcement(message, title, sound_to_play, null, ARES_LOG_MAIN, FALSE) -/proc/announcement_helper(message, title, list/targets, sound_to_play, quiet) +/proc/announcement_helper(message, title, list/targets, sound_to_play, quiet, list/targets_to_garble, faction_to_garble) if(!message || !title || !targets) //Shouldn't happen return + + var/garbled_message + var/garbled_count = length(targets_to_garble) + if(garbled_count) + garbled_message = get_garbled_announcement(message, faction_to_garble) + log_garble("[garbled_count] received '[garbled_message]' for faction [faction_to_garble].") + for(var/mob/target in targets) if(istype(target, /mob/new_player)) continue - to_chat_spaced(target, html = "[SPAN_ANNOUNCEMENT_HEADER(title)]
[SPAN_ANNOUNCEMENT_BODY(message)]", type = MESSAGE_TYPE_RADIO) + if(target in targets_to_garble) + to_chat_spaced(target, html = "[SPAN_ANNOUNCEMENT_HEADER(title)]
[SPAN_ANNOUNCEMENT_BODY(garbled_message)]", type = MESSAGE_TYPE_RADIO) + else + to_chat_spaced(target, html = "[SPAN_ANNOUNCEMENT_HEADER(title)]
[SPAN_ANNOUNCEMENT_BODY(message)]", type = MESSAGE_TYPE_RADIO) + if(!quiet && sound_to_play) if(isobserver(target) && !(target.client?.prefs?.toggles_sound & SOUND_OBSERVER_ANNOUNCEMENTS)) continue diff --git a/code/defines/unit_tests.dm b/code/defines/unit_tests.dm index 89cb8af77b11..3bd66b23fbf2 100644 --- a/code/defines/unit_tests.dm +++ b/code/defines/unit_tests.dm @@ -61,8 +61,9 @@ #define TEST_DEFAULT 1 /// After most test steps, used for tests that run long so shorter issues can be noticed faster #define TEST_LONGER 10 -/// This must be the last test to run due to the inherent nature of the test iterating every single tangible atom in the game and qdeleting all of them (while taking long sleeps to make sure the garbage collector fires properly) taking a large amount of time. -#define TEST_CREATE_AND_DESTROY INFINITY +/// This must be the second to last test to run due to the inherent nature of the test iterating every single tangible atom in the game and qdeleting all of them (while taking long sleeps to make sure the garbage collector fires properly) taking a large amount of time. +#define TEST_CREATE_AND_DESTROY SHORT_REAL_LIMIT +#define TEST_CHECK_RUNTIMES INFINITY /// Change color to red on ANSI terminal output, if enabled with -DANSICOLORS. #ifdef ANSICOLORS diff --git a/code/game/area/BigRed.dm b/code/game/area/BigRed.dm index 058f6847e721..ad97cf214bcd 100644 --- a/code/game/area/BigRed.dm +++ b/code/game/area/BigRed.dm @@ -314,7 +314,7 @@ icon_state = "oob" requires_power = FALSE is_resin_allowed = FALSE - flags_area = AREA_NOTUNNEL|AREA_UNWEEDABLE + flags_area = AREA_NOBURROW|AREA_UNWEEDABLE can_build_special = FALSE soundscape_interval = 0 diff --git a/code/game/area/Corsat.dm b/code/game/area/Corsat.dm index 810a9cf86aac..4cceb7f4cf7d 100644 --- a/code/game/area/Corsat.dm +++ b/code/game/area/Corsat.dm @@ -54,7 +54,7 @@ name = "\improper CORSAT Monorail transit" icon_state = "railcart" ceiling = CEILING_REINFORCED_METAL - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOBURROW /area/corsat/sigma/hangar/cargo name = "\improper Sigma Hangar Cargo Checkpoint" @@ -573,4 +573,4 @@ icon_state = "corsat_hull" requires_power = FALSE ceiling = CEILING_REINFORCED_METAL - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOBURROW diff --git a/code/game/area/DesertDam.dm b/code/game/area/DesertDam.dm index 7020a6e35737..58a55188814f 100644 --- a/code/game/area/DesertDam.dm +++ b/code/game/area/DesertDam.dm @@ -18,6 +18,7 @@ icon_state = "purple" minimap_color = MINIMAP_AREA_RESEARCH unoviable_timer = FALSE + ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS /area/desert_dam/interior/lab_northeast/east_lab_lobby name = "East Lab Lobby" @@ -42,6 +43,7 @@ /area/desert_dam/interior/lab_northeast/east_lab_maintenence name = "East Lab Maintenence" icon_state = "maintcentral" + unoviable_timer = 25 MINUTES /area/desert_dam/interior/lab_northeast/east_lab_containment name = "East Lab Containment" @@ -74,6 +76,7 @@ //Dam Interior /area/desert_dam/interior/dam_interior minimap_color = MINIMAP_AREA_ENGI + ceiling = CEILING_UNDERGROUND_METAL_ALLOW_CAS /area/desert_dam/interior/dam_interior/engine_room name = "Engineering Generator Room" @@ -87,6 +90,22 @@ name = "Engineering Main Substation" icon_state = "purple" +/area/desert_dam/interior/dam_interior/lower_stairwell + name = "Engineering Lower Stairwell" + icon_state = "purple" + +/area/desert_dam/interior/dam_interior/upper_stairwell + name = "Engineering Upper Stairwell" + icon_state = "purple" + +/area/desert_dam/interior/dam_interior/upper_walkway + name = "Engineering Upper Walkway" + icon_state = "yellow" + +/area/desert_dam/interior/dam_interior/break_room/upper + name = "Engineering Upper Breakroom" + icon_state = "purple" + /area/desert_dam/interior/dam_interior/smes_backup name = "Engineering Secondary Backup Substation" icon_state = "green" @@ -108,28 +127,39 @@ icon_state = "purple" /area/desert_dam/interior/dam_interior/northwestern_tunnel - name = "Engineering Northwestern Tunnel" + name = "Engineering Northwestern Road" icon_state = "green" + ceiling = CEILING_NONE /area/desert_dam/interior/dam_interior/north_tunnel - name = "Engineering Northern Tunnel" + name = "Engineering Northern Road" icon_state = "blue-red" + ceiling = CEILING_NONE /area/desert_dam/interior/dam_interior/west_tunnel name = "Engineering Western Tunnel" icon_state = "yellow" + ceiling = CEILING_UNDERGROUND_METAL_ALLOW_CAS + +/area/desert_dam/interior/dam_interior/south_tunnel_research + name = "Research Southern Tunnel" + icon_state = "purple" + ceiling = CEILING_UNDERGROUND_METAL_ALLOW_CAS /area/desert_dam/interior/dam_interior/central_tunnel - name = "Engineering Central Tunnel" + name = "Engineering Central Road" icon_state = "red" + ceiling = CEILING_NONE /area/desert_dam/interior/dam_interior/south_tunnel - name = "Engineering Southern Tunnel" + name = "Engineering Southern Road" icon_state = "purple" + ceiling = CEILING_NONE /area/desert_dam/interior/dam_interior/northeastern_tunnel name = "Engineering Northeastern Tunnel" icon_state = "green" + ceiling = CEILING_UNDERGROUND_METAL_ALLOW_CAS /area/desert_dam/interior/dam_interior/CE_office name = "Engineering Chief Engineer's Office" @@ -138,31 +168,62 @@ /area/desert_dam/interior/dam_interior/workshop name = "Engineering Workshop" icon_state = "purple" + ceiling = CEILING_METAL /area/desert_dam/interior/dam_interior/hanger name = "Engineering Hangar" + ceiling = CEILING_METAL icon_state = "hangar" linked_lz = DROPSHIP_LZ1 +/area/desert_dam/interior/dam_interior/hanger/roof + name = "Engineering Hangar Roof" + icon_state = "hangar" + ceiling = CEILING_NONE + +/area/desert_dam/interior/dam_interior/hanger/waiting + name = "Engineering Hangar Gate" + icon_state = "purple" + +/area/desert_dam/interior/dam_interior/hanger/control + name = "Engineering Hangar Air Traffic Control" + icon_state = "blue" + /area/desert_dam/interior/dam_interior/hangar_storage name = "Engineering Hangar Storage" icon_state = "storage" + ceiling = CEILING_METAL /area/desert_dam/interior/dam_interior/auxilary_tool_storage name = "Engineering Auxiliary Tool Storage" icon_state = "red" + ceiling = CEILING_METAL /area/desert_dam/interior/dam_interior/primary_tool_storage name = "Engineering Primary Tool Storage" icon_state = "blue" +/area/desert_dam/interior/dam_interior/primary_tool_storage/upper + name = "Engineering Upper Primary Tool Storage" + +/area/desert_dam/interior/dam_interior/primary_tool_storage/solar + name = "Engineering Solar Power Monitering" + icon_state = "yellow" + +/area/desert_dam/interior/dam_interior/primary_tool_storage/server + name = "Engineering Server Room" + icon_state = "green" + + /area/desert_dam/interior/dam_interior/tech_storage name = "Engineering Secure Tech Storage" icon_state = "dark" + ceiling = CEILING_METAL /area/desert_dam/interior/dam_interior/break_room name = "Engineering Breakroom" icon_state = "yellow" + ceiling = CEILING_METAL /area/desert_dam/interior/dam_interior/disposals name = "Engineering Disposals" @@ -170,6 +231,7 @@ /area/desert_dam/interior/dam_interior/western_dam_cave name = "Engineering West Entrance" + ceiling = CEILING_UNDERGROUND_ALLOW_CAS icon_state = "red" /area/desert_dam/interior/dam_interior/office @@ -183,18 +245,22 @@ /area/desert_dam/interior/dam_interior/north_tunnel_entrance name = "Engineering North Tunnel Entrance" icon_state = "yellow" + ceiling = CEILING_UNDERGROUND_METAL_ALLOW_CAS /area/desert_dam/interior/dam_interior/east_tunnel_entrance name = "Engineering East Tunnel Entrance" icon_state = "yellow" + ceiling = CEILING_UNDERGROUND_METAL_ALLOW_CAS /area/desert_dam/interior/dam_interior/south_tunnel_entrance name = "Engineering South Tunnel Entrance" icon_state = "red" + ceiling = CEILING_UNDERGROUND_METAL_ALLOW_CAS /area/desert_dam/interior/dam_interior/garage name = "Garage" icon_state = "green" + ceiling = CEILING_METAL /area/desert_dam/interior/caves name = "Caves" @@ -205,11 +271,15 @@ soundscape_interval = 25 sound_environment = SOUND_ENVIRONMENT_AUDITORIUM minimap_color = MINIMAP_AREA_CAVES + ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS /area/desert_dam/interior/caves/east_caves name = "Eastern Caves" icon_state = "red" - unoviable_timer = FALSE + +/area/desert_dam/interior/caves/west_caves + name = "Western Caves" + icon_state = "red" /area/desert_dam/interior/caves/central_caves name = "Central Caves" @@ -219,7 +289,10 @@ /area/desert_dam/interior/caves/temple name = "Sand Temple" icon_state = "green" - unoviable_timer = FALSE + +/area/desert_dam/interior/caves/pred_ship + name = "Unknown Vessel" + icon_state = "red" //BUILDING //areas not under rock @@ -253,6 +326,14 @@ name = "Command Substation" icon_state = "southwestern_ss" +/area/desert_dam/building/substation/southwest/solar + name = "Southwest Substation Solar Power Monitering" + +/area/desert_dam/building/substation/southwest/solar/walkway + name = "Southwest Substation Solar Power Monitering Walkway" + icon = 'icons/turf/areas.dmi' + icon_state = "yellow" + /area/desert_dam/building/substation/west name = "Command Substation" icon_state = "western_ss" @@ -297,6 +378,50 @@ icon_state = "green" linked_lz = DROPSHIP_LZ1 +/area/desert_dam/building/administration/gate + name = "Administration Departures Gate" + icon_state = "purple" + linked_lz = DROPSHIP_LZ1 + +/area/desert_dam/building/administration/breakroom + name = "Administration Breakroom" + icon_state = "yellow" + linked_lz = DROPSHIP_LZ1 + +/area/desert_dam/building/administration/stairwell + name = "Administration Stairwell" + icon_state = "purple" + linked_lz = DROPSHIP_LZ1 + +/area/desert_dam/building/administration/stairwell/upper + name = "Administration Upper Stairwell" + +/area/desert_dam/building/administration/upper_hallway + name = "Administration Upper Hallway" + icon_state = "purple" + linked_lz = DROPSHIP_LZ1 + +/area/desert_dam/building/administration/panic_room + name = "Administration Panic Room" + icon_state = "blue" + linked_lz = DROPSHIP_LZ1 + +/area/desert_dam/building/administration/janitor + name = "Administration Janitor Closet" + icon_state = "blue" + linked_lz = DROPSHIP_LZ1 + +/area/desert_dam/building/administration/maint + name = "Administration Maintenance" + icon_state = "yellow" + linked_lz = DROPSHIP_LZ1 + +/area/desert_dam/building/administration/balcony + name = "Administration Balcony" + icon_state = "yellow" + linked_lz = DROPSHIP_LZ1 + ceiling = CEILING_NONE + //Bar /area/desert_dam/building/bar/bar @@ -317,6 +442,7 @@ name = "DO NOT USE" icon_state = "purple" unoviable_timer = FALSE + ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS /area/desert_dam/building/cafeteria/cafeteria name = "Cafeteria" @@ -340,6 +466,7 @@ name = "DO NOT USE" icon_state = "purple" unoviable_timer = FALSE + ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS /area/desert_dam/building/dorms/hallway_northwing name = "Dormitory North Wing" @@ -371,8 +498,12 @@ name = "Medical Emergency Room" icon_state = "medbay" -/area/desert_dam/building/medical/treatment_room - name = "Medical Treatment Room" +/area/desert_dam/building/medical/helipad_triage + name = "Medical Helipad Intake" + icon_state = "medbay" + +/area/desert_dam/building/medical/outgoing + name = "Medical Outgoing" icon_state = "medbay2" /area/desert_dam/building/medical/lobby @@ -395,6 +526,26 @@ name = "Medical East Wing" icon_state = "medbay" +/area/desert_dam/building/medical/upper_hallway + name = "Medical Upper Wing" + icon_state = "medbay" + +/area/desert_dam/building/medical/stairwell + name = "Medical Southern Stairwell" + icon_state = "medbay2" + +/area/desert_dam/building/medical/stairwell/north + name = "Medical Northern Stairwell" + icon_state = "medbay2" + +/area/desert_dam/building/medical/stairwell/upper + name = "Medical Upper Southern Stairwell" + icon_state = "medbay2" + +/area/desert_dam/building/medical/stairwell/upper_north + name = "Medical Upper Northern Stairwell" + icon_state = "medbay2" + /area/desert_dam/building/medical/primary_storage name = "Medical Primary Storage" icon_state = "red" @@ -431,6 +582,10 @@ name = "Medical Office Two" icon_state = "blue" +/area/desert_dam/building/medical/office3 + name = "Medical Office Shared" + icon_state = "blue" + /area/desert_dam/building/medical/virology_wing name = "Medical Virology Wing" icon_state = "medbay3" @@ -443,6 +598,21 @@ name = "Medical" icon_state = "medbay2" +/area/desert_dam/building/medical/maint + name = "Maint" + icon_state = "yellow" + +/area/desert_dam/building/medical/maint/north + name = "Medical Northern Maintenance" + +/area/desert_dam/building/medical/maint/south + name = "Medical Southern Maintenance" + +/area/desert_dam/building/medical/maint/east + name = "Medical Eastern Maintenance" + +/area/desert_dam/building/medical/maint/cent + name = "Medical Central Maintenance" //Warehouse /area/desert_dam/building/warehouse/warehouse @@ -460,6 +630,11 @@ icon_state = "green" linked_lz = DROPSHIP_LZ2 +/area/desert_dam/building/warehouse/office + name = "Warehouse Overlook Office" + icon_state = "green" + linked_lz = DROPSHIP_LZ2 + //Hydroponics /area/desert_dam/building/hydroponics @@ -481,6 +656,26 @@ name = "Hydroponics Breakroom" icon_state = "red" +/area/desert_dam/building/hydroponics/stairwell + name = "Hydroponics Stairwell" + icon_state = "purple" + +/area/desert_dam/building/hydroponics/maint + name = "Hydroponics Maintenance" + icon_state = "yellow" + +/area/desert_dam/building/hydroponics/growroom + name = "Hydroponics Upper Storage" + icon_state = "green" + +/area/desert_dam/building/hydroponics/offices + name = "Hydroponics Offices" + icon_state = "bluenew" + +/area/desert_dam/building/hydroponics/walkway + name = "Hydroponics Walkway" + icon_state = "yellow" + //Water Treatment Plant 1 /area/desert_dam/building/water_treatment_one minimap_color = MINIMAP_AREA_ENGI @@ -514,6 +709,10 @@ name = "Water Treatment One Control Room" icon_state = "yellow" +/area/desert_dam/building/water_treatment_one/overlook + name = "Water Treatment One Observation Room" + icon_state = "yellow" + /area/desert_dam/building/water_treatment_one/purification name = "Water Treatment One Purification" icon_state = "green" @@ -547,6 +746,10 @@ name = "Water Treatment Two Control Room" icon_state = "yellow" +/area/desert_dam/building/water_treatment_two/overlook + name = "Water Treatment Two Observation" + icon_state = "yellow" + /area/desert_dam/building/water_treatment_two/purification name = "Water Treatment Two Purification" icon_state = "green" @@ -555,6 +758,9 @@ name = "Water Treatment Two Floodgate Control" icon_state = "green" +/area/desert_dam/building/water_treatment_two/floodgate_control/lobby + name = "Water Treatment Two Floodgate Control Lobby" + //Library UNUSED /* @@ -578,11 +784,11 @@ icon_state = "sec_prison" /area/desert_dam/building/security/marshals_office - name = "Security Marshal's Office" + name = "Security Chief's Office" icon_state = "sec_hos" /area/desert_dam/building/security/armory - name = "Security Armory" + name = "Security Armoury" icon_state = "armory" /area/desert_dam/building/security/warden @@ -641,6 +847,59 @@ name = "Security Staffroom" icon_state = "security" +/area/desert_dam/building/security/maint + name = "Security Maintenance" + icon_state = "yellow" + +/area/desert_dam/building/security/maint/north + name = "Security Northern Maintenance" + +/area/desert_dam/building/security/maint/South + name = "Security Southern Maintenance" + +/area/desert_dam/building/security/maint/north + name = "Security Northern Maintenance" + +/area/desert_dam/building/security/maint/west + name = "Security Western Maintenance" + +/area/desert_dam/building/security/maint/east + name = "Security Eastern Maintenance" + +/area/desert_dam/building/security/maint/central + name = "Security Central Maintenance" + +/area/desert_dam/building/security/stairwell + name = "Security Stairwell" + icon_state = "purple" + +/area/desert_dam/building/security/stairwell/upper + name = "Security Upper Stairwell" + +/area/desert_dam/building/security/workshop + name = "Security Workshop" + icon_state = "yellow" + +/area/desert_dam/building/security/riot_armory + name = "Security Riot Armoury" + icon_state = "armory" + +/area/desert_dam/building/security/waiting + name = "Security Visitation Waiting" + icon_state = "green" + +/area/desert_dam/building/security/yard + name = "Security Recreation Yard" + icon_state = "red" + +/area/desert_dam/building/security/upper_hallway + name = "Security Upper Hallway" + icon_state = "purple" + +/area/desert_dam/building/security/break_room + name = "Security Breakroom" + icon_state = "red" + //Church /area/desert_dam/building/church name = "Church" @@ -652,6 +911,7 @@ name = "DO NOT USE" icon_state = "purple" unoviable_timer = FALSE + ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS /area/desert_dam/building/mining/workshop name = "Mining Workshop" @@ -680,9 +940,30 @@ //ambience = list('sound/ambience/ambiatm1.ogg') -/area/desert_dam/exterior/rock +/area/desert_dam/exterior/rock //OOB name = "Rock" icon_state = "cave" + ceiling = CEILING_DEEP_UNDERGROUND + +/area/desert_dam/exterior/rock/level1 + name = "Lower Rock" + +/area/desert_dam/exterior/rock/level3 + name = "Upper Rock" + +/area/desert_dam/exterior/rock/level4 + name = "Mountain Rock" + +/area/desert_dam/exterior/rock/level5 + name = "Upper Mountain Rock" + +/area/desert_dam/exterior/roof + name = "Lower Roof" + always_unpowered = 1 + icon_state = "dark128" + +/area/desert_dam/exterior/roof/level4 + name = "Upper Roof" //Landing Pad for the Alamo. THIS IS NOT THE SHUTTLE AREA /area/desert_dam/exterior/landing_pad_one @@ -789,6 +1070,7 @@ name = "Civilian Valley" icon_state = "valley_south_excv" unoviable_timer = FALSE + ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS /area/desert_dam/exterior/valley/valley_medical name = "Medical Valley" @@ -802,7 +1084,7 @@ /area/desert_dam/exterior/valley/valley_crashsite name = "Crash Site Valley" icon_state = "yellow" - unoviable_timer = FALSE + ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS /area/desert_dam/exterior/valley/north_valley_dam name = "North Dam Valley" @@ -819,8 +1101,6 @@ /area/desert_dam/exterior/valley/valley_wilderness name = "Wilderness Valley" icon_state = "central" - unoviable_timer = FALSE - //Rivers /area/desert_dam/exterior/river diff --git a/code/game/area/LV522_Chances_Claim.dm b/code/game/area/LV522_Chances_Claim.dm index 8265fa824309..5f4ea63d119b 100644 --- a/code/game/area/LV522_Chances_Claim.dm +++ b/code/game/area/LV522_Chances_Claim.dm @@ -27,7 +27,7 @@ requires_power = FALSE ceiling = CEILING_MAX is_resin_allowed = FALSE - flags_area = AREA_NOTUNNEL|AREA_UNWEEDABLE + flags_area = AREA_NOBURROW|AREA_UNWEEDABLE /area/lv522/oob/w_y_vault name = "LV522 - Weyland Secure Vault" diff --git a/code/game/area/LV624.dm b/code/game/area/LV624.dm index abb3e1b4fe3d..a901e4757c34 100644 --- a/code/game/area/LV624.dm +++ b/code/game/area/LV624.dm @@ -408,7 +408,7 @@ /area/lv624/lazarus/secure_storage name = "\improper Secure Storage" icon_state = "storage" - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOBURROW linked_lz = DROPSHIP_LZ2 /area/lv624/lazarus/robotics diff --git a/code/game/area/LV759_Hybrisa_Prospera.dm b/code/game/area/LV759_Hybrisa_Prospera.dm index 1de7eca0b4d9..377ca07e6bb0 100644 --- a/code/game/area/LV759_Hybrisa_Prospera.dm +++ b/code/game/area/LV759_Hybrisa_Prospera.dm @@ -30,7 +30,7 @@ icon_state = "oob" ceiling = CEILING_MAX is_resin_allowed = FALSE - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOBURROW minimap_color = MINIMAP_AREA_OOB requires_power = FALSE @@ -39,7 +39,7 @@ icon_state = "oob" ceiling = CEILING_MAX is_resin_allowed = FALSE - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOBURROW minimap_color = MINIMAP_AREA_OOB /area/lv759/bunker/gonzo @@ -47,7 +47,7 @@ icon_state = "cliff_blocked" ceiling = CEILING_MAX is_resin_allowed = FALSE - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOBURROW minimap_color = MINIMAP_AREA_OOB soundscape_playlist = SCAPE_PL_LV759_INDOORS ambience_exterior = AMBIENCE_HYBRISA_INTERIOR @@ -58,7 +58,7 @@ icon_state = "cliff_blocked" ceiling = CEILING_MAX is_resin_allowed = FALSE - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOBURROW minimap_color = MINIMAP_AREA_OOB soundscape_playlist = SCAPE_PL_LV759_INDOORS ambience_exterior = AMBIENCE_HYBRISA_INTERIOR @@ -182,7 +182,7 @@ name = "Derelict Ship" icon_state = "derelictship" ceiling = CEILING_REINFORCED_METAL - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOBURROW ambience_exterior = AMBIENCE_DERELICT soundscape_playlist = SCAPE_PL_LV759_DERELICTSHIP ceiling_muffle = FALSE @@ -1250,7 +1250,7 @@ icon_state = "hobo" ceiling = CEILING_REINFORCED_METAL is_resin_allowed = FALSE - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOBURROW linked_lz = DROPSHIP_LZ2 // Weyland-Yutani Advanced Bio-Genomic Research Complex diff --git a/code/game/area/Sulaco.dm b/code/game/area/Sulaco.dm index 54e55b8581c7..671dfca869ce 100644 --- a/code/game/area/Sulaco.dm +++ b/code/game/area/Sulaco.dm @@ -10,7 +10,7 @@ /area/shuttle/drop1 //soundscape_playlist = list('sound/soundscape/drum1.ogg') soundscape_interval = 30 //seconds - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOBURROW is_landing_zone = TRUE ceiling = CEILING_REINFORCED_METAL base_lighting_alpha = 0 @@ -66,7 +66,7 @@ /area/shuttle/drop2 //soundscape_playlist = list('sound/soundscape/drum1.ogg') soundscape_interval = 30 //seconds - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOBURROW is_landing_zone = TRUE ceiling = CEILING_REINFORCED_METAL base_lighting_alpha = 0 @@ -119,7 +119,7 @@ /area/shuttle/drop3 //soundscape_playlist = list('sound/soundscape/drum1.ogg') soundscape_interval = 30 //seconds - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOBURROW is_landing_zone = TRUE ceiling = CEILING_REINFORCED_METAL base_lighting_alpha = 0 @@ -177,7 +177,7 @@ /area/shuttle/drop_upp soundscape_interval = 30 //seconds - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOBURROW is_landing_zone = TRUE ceiling = CEILING_REINFORCED_METAL base_lighting_alpha = 0 diff --git a/code/game/area/WhiskeyOutpost.dm b/code/game/area/WhiskeyOutpost.dm index aef72d1a9941..a89d599ca6fd 100644 --- a/code/game/area/WhiskeyOutpost.dm +++ b/code/game/area/WhiskeyOutpost.dm @@ -14,25 +14,34 @@ ceiling = CEILING_UNDERGROUND_ALLOW_CAS minimap_color = MINIMAP_AREA_CAVES +/area/whiskey_outpost/inside/hallway + name = "\improper Bunker Hallway" + flags_area = AREA_NOTUNNEL + /area/whiskey_outpost/inside/hospital name = "\improper Hospital" icon_state = "medical" minimap_color = MINIMAP_AREA_MEDBAY_CAVE + flags_area = AREA_NOTUNNEL /area/whiskey_outpost/inside/hospital/triage name = "\improper Triage Center" + flags_area = NO_FLAGS /area/whiskey_outpost/inside/cic name = "\improper Command Information Center" icon_state = "CIC" minimap_color = MINIMAP_AREA_COMMAND_CAVE + flags_area = AREA_NOTUNNEL /area/whiskey_outpost/inside/bunker name = "\improper Bunker" icon_state = "bunker" + flags_area = AREA_NOTUNNEL /area/whiskey_outpost/inside/bunker/pillbox ceiling = CEILING_METAL + flags_area = NO_FLAGS /area/whiskey_outpost/inside/bunker/pillbox/one name = "Pillbox Bourbon" @@ -53,20 +62,24 @@ /area/whiskey_outpost/inside/bunker/bunker/front name = "Pillbox Beer" icon_state = "p5" + flags_area = NO_FLAGS /area/whiskey_outpost/inside/engineering name = "\improper Engineering" icon_state = "engineering" minimap_color = MINIMAP_AREA_ENGI_CAVE + flags_area = AREA_NOTUNNEL /area/whiskey_outpost/inside/living name = "\improper Living Quarters" icon_state = "livingspace" + flags_area = AREA_NOTUNNEL /area/whiskey_outpost/inside/supply name = "\improper Supply Depot" icon_state = "req" + flags_area = AREA_NOTUNNEL /* |***OUTSIDE AREAS***| @@ -118,6 +131,8 @@ /area/whiskey_outpost/outside/lane/two_north name = "\improper Western Path North" icon_state = "lane2n" + always_unpowered = 0 + power_equip = TRUE /area/whiskey_outpost/outside/lane/two_south name = "\improper Western Path South" @@ -126,6 +141,8 @@ /area/whiskey_outpost/outside/lane/three_north name = "\improper Eastern Path North" icon_state = "lane3n" + always_unpowered = 0 + power_equip = TRUE /area/whiskey_outpost/outside/lane/three_south name = "\improper Eastern Path South" @@ -187,7 +204,7 @@ /area/whiskey_outpost/inside/caves/tunnel name = "\improper Tunnel" icon_state = "tunnel" - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOBURROW|AREA_NOTUNNEL /area/whiskey_outpost/inside/caves/caverns name = "\improper Northern Caverns" @@ -199,3 +216,10 @@ /area/whiskey_outpost/inside/caves/caverns/east name = "\improper Eastern Caverns" icon_state = "caveseast" + +/area/whiskey_outpost/inside/caves/deep + name = "\improper Deep Caves" + icon_state = "caves" + ceiling = CEILING_DEEP_UNDERGROUND + unoviable_timer = FALSE + flags_area = AREA_NOBURROW diff --git a/code/game/area/admin_level.dm b/code/game/area/admin_level.dm index 81763675b171..e80966386c30 100644 --- a/code/game/area/admin_level.dm +++ b/code/game/area/admin_level.dm @@ -9,7 +9,7 @@ icon_state = "thunder" requires_power = FALSE statistic_exempt = TRUE - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOBURROW /area/adminlevel/bunker01/mainroom name = "\improper Bunker Main Room" @@ -90,7 +90,7 @@ name = "\improper Bunker Xeno Hive" icon_state = "bunker01_caves_outpost" ceiling = CEILING_UNDERGROUND_ALLOW_CAS - flags_area = AREA_NOTUNNEL|AREA_ALLOW_XENO_JOIN + flags_area = AREA_NOBURROW|AREA_ALLOW_XENO_JOIN var/hivenumber = XENO_HIVE_ALPHA @@ -107,7 +107,7 @@ name = "ERT Station" icon_state = "green" requires_power = FALSE - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOBURROW /area/adminlevel/ert_station/upp_station name = "UPP Station" @@ -161,7 +161,7 @@ name = "Simulated Reality" icon_state = "green" requires_power = 0 - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOBURROW /area/misc weather_enabled = FALSE @@ -175,7 +175,7 @@ icon_state = "tutorial" requires_power = FALSE unlimited_power = TRUE - flags_area = AREA_NOTUNNEL|AREA_AVOID_BIOSCAN + flags_area = AREA_NOBURROW|AREA_AVOID_BIOSCAN statistic_exempt = TRUE ceiling = CEILING_METAL block_game_interaction = TRUE diff --git a/code/game/area/almayer.dm b/code/game/area/almayer.dm index f9eb67bfed20..aa43ed6e0eec 100644 --- a/code/game/area/almayer.dm +++ b/code/game/area/almayer.dm @@ -63,7 +63,7 @@ fake_zlevel = 1 // upperdeck soundscape_playlist = SCAPE_PL_CIC soundscape_interval = 50 - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOBURROW /area/almayer/command/cichallway name = "\improper Secure Command Hallway" @@ -81,7 +81,7 @@ fake_zlevel = 1 // upperdeck soundscape_playlist = SCAPE_PL_ARES soundscape_interval = 120 - flags_area = AREA_NOTUNNEL|AREA_UNWEEDABLE + flags_area = AREA_NOBURROW|AREA_UNWEEDABLE can_build_special = FALSE is_resin_allowed = FALSE resin_construction_allowed = FALSE @@ -100,13 +100,13 @@ name = "\improper Upper Deck Telecommunications" icon_state = "tcomms" fake_zlevel = 1 // upperdeck - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOBURROW /area/almayer/command/self_destruct name = "\improper Upper Deck Self-Destruct Core Room" icon_state = "selfdestruct" fake_zlevel = 1 // upperdeck - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOBURROW /area/almayer/command/corporateliaison name = "\improper Corporate Liaison Office" @@ -164,7 +164,7 @@ name = "\improper Upper Deck Port Engineering" /area/almayer/engineering/upper_engineering/notunnel - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOBURROW requires_power = FALSE /area/almayer/engineering/ce_room @@ -219,7 +219,7 @@ fake_zlevel = 2 // lowerdeck /area/almayer/shipboard/weapon_room/notunnel - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOBURROW requires_power = FALSE /area/almayer/shipboard/starboard_point_defense @@ -767,7 +767,7 @@ name = "\improper Medical Research containment cells" icon_state = "science" fake_zlevel = 1 // upperdeck - flags_area = AREA_AVOID_BIOSCAN|AREA_NOTUNNEL|AREA_CONTAINMENT + flags_area = AREA_AVOID_BIOSCAN|AREA_NOBURROW|AREA_CONTAINMENT /area/almayer/medical/containment/cell/cl name = "\improper Storage Room" @@ -840,12 +840,12 @@ name = "\improper Unknown Area" icon_state = "selfdestruct" fake_zlevel = 2 // lowerdeck - flags_area = AREA_AVOID_BIOSCAN|AREA_NOTUNNEL + flags_area = AREA_AVOID_BIOSCAN|AREA_NOBURROW /area/almayer/engineering/airmix icon_state = "selfdestruct" requires_power = 0 - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOBURROW /area/almayer/lifeboat_pumps name = "Lifeboat Fuel Pumps" @@ -877,13 +877,13 @@ name = "\improper Port Lifeboat Docking" icon_state = "lifeboat" fake_zlevel = 1 // upperdeck - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOBURROW /area/almayer/evacuation icon = 'icons/turf/areas.dmi' icon_state = "shuttle2" requires_power = 0 - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOBURROW //Placeholder. /area/almayer/evacuation/pod1 diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index cc62969b2d04..2ce1091d72b1 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -375,7 +375,7 @@ return used -/area/proc/use_power(amount, chan) +/area/proc/use_power(amount, chan = POWER_CHANNEL_ONEOFF) switch(chan) if(POWER_CHANNEL_EQUIP) used_equip += amount @@ -386,35 +386,52 @@ if(POWER_CHANNEL_ONEOFF) used_oneoff += amount -/area/Entered(A,atom/OldLoc) - if(ismob(A)) +#if defined(UNIT_TESTS) + switch(chan) + if(POWER_CHANNEL_EQUIP) + if(used_equip < 0) + stack_trace("[src] ([type]) now has [used_equip] used_equip after use_power([amount],...)!") + if(POWER_CHANNEL_LIGHT) + if(used_light < 0) + stack_trace("[src] ([type]) now has [used_light] used_light after use_power([amount],...)!") + if(POWER_CHANNEL_ENVIRON) + if(used_environ < 0) + stack_trace("[src] ([type]) now has [used_environ] used_environ after use_power([amount],...)!") + if(POWER_CHANNEL_ONEOFF) + if(used_oneoff < 0) + stack_trace("[src] ([type]) now has [used_oneoff] used_oneoff after use_power([amount],...)!") +#endif + +/area/Entered(atom/movable/thing, atom/OldLoc) + if(ismob(thing)) if(!OldLoc) return - var/mob/M = A + var/mob/mob_thing = thing var/area/old_area = get_area(OldLoc) if(old_area == src) return - M?.client?.soundOutput?.update_ambience(src, null, TRUE) - else if(istype(A, /obj/structure/machinery)) - add_machine(A) - -/area/Exited(A) - if(istype(A, /obj/structure/machinery)) - remove_machine(A) - else if(ismob(A)) - var/mob/exiting_mob = A + mob_thing?.client?.soundOutput?.update_ambience(src, null, TRUE) + else if(istype(thing, /obj/structure/machinery)) + add_machine(thing) + +/area/Exited(atom/movable/thing) + if(istype(thing, /obj/structure/machinery)) + remove_machine(thing) + else if(ismob(thing)) + var/mob/exiting_mob = thing exiting_mob?.client?.soundOutput?.update_ambience(target_area = null, ambience_override = null, force_update = TRUE) -/area/proc/add_machine(obj/structure/machinery/M) +/area/proc/add_machine(obj/structure/machinery/machine) SHOULD_NOT_SLEEP(TRUE) - if(istype(M)) - use_power(M.calculate_current_power_usage(), M.power_channel) - M.power_change() + if(!machine.last_power_usage) + machine.update_use_power(-1) + else + use_power(machine.last_power_usage, machine.power_channel) + machine.power_change() -/area/proc/remove_machine(obj/structure/machinery/M) +/area/proc/remove_machine(obj/structure/machinery/machine) SHOULD_NOT_SLEEP(TRUE) - if(istype(M)) - use_power(-M.calculate_current_power_usage(), M.power_channel) + use_power(-machine.last_power_usage, machine.power_channel) //atmos related procs @@ -436,23 +453,9 @@ return flags /area/proc/reg_in_areas_in_z() - if(!length(contents)) - return - - var/list/areas_in_z = SSmapping.areas_in_z - var/z - for(var/i in contents) - var/atom/thing = i - if(!thing) - continue - z = thing.z - break - if(!z) - WARNING("No z found for [src]") - return - if(!areas_in_z["[z]"]) - areas_in_z["[z]"] = list() - areas_in_z["[z]"] += src + if(!SSmapping.areas_in_z["[z]"]) + SSmapping.areas_in_z["[z]"] = list() + SSmapping.areas_in_z["[z]"] += src /** * Purges existing weeds, and prevents future weeds from being placed. @@ -467,6 +470,13 @@ addtimer(VARSET_CALLBACK(src, unoviable_timer, FALSE), unoviable_timer) /area/sky - name = "Sky" + name = "Lower Sky" icon_state = "lv-626" flags_area = AREA_UNWEEDABLE + is_resin_allowed = FALSE + +/area/sky/level4 + name = "Sky" + +/area/sky/level5 + name = "Upper Sky" diff --git a/code/game/area/areas_event.dm b/code/game/area/areas_event.dm index f32eb08e53c4..a71ae83ddda3 100644 --- a/code/game/area/areas_event.dm +++ b/code/game/area/areas_event.dm @@ -42,7 +42,7 @@ structure: icon_state = "event" //no bioscan and no tunnels allowed - flags_area = AREA_AVOID_BIOSCAN|AREA_NOTUNNEL + flags_area = AREA_AVOID_BIOSCAN|AREA_NOBURROW //events are not part of regular gameplay, therefore, no statistics statistic_exempt = TRUE diff --git a/code/game/area/chinook.dm b/code/game/area/chinook.dm index b9cd440fd548..f3c2a7f54920 100644 --- a/code/game/area/chinook.dm +++ b/code/game/area/chinook.dm @@ -8,7 +8,7 @@ icon_state = "almayer" requires_power = TRUE statistic_exempt = TRUE - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOBURROW sound_environment = SOUND_ENVIRONMENT_ROOM unlimited_power = TRUE ceiling = CEILING_METAL diff --git a/code/game/area/hunting_preserve.dm b/code/game/area/hunting_preserve.dm index 74d0df0db3bc..c9603b8def93 100644 --- a/code/game/area/hunting_preserve.dm +++ b/code/game/area/hunting_preserve.dm @@ -4,7 +4,7 @@ name = "\improper Yautja Hunting Grounds" icon_state = "green" weather_enabled = FALSE - flags_area = AREA_YAUTJA_HANGABLE|AREA_NOTUNNEL|AREA_AVOID_BIOSCAN|AREA_YAUTJA_GROUNDS|AREA_YAUTJA_HUNTING_GROUNDS + flags_area = AREA_YAUTJA_HANGABLE|AREA_NOBURROW|AREA_AVOID_BIOSCAN|AREA_YAUTJA_GROUNDS|AREA_YAUTJA_HUNTING_GROUNDS resin_construction_allowed = FALSE can_build_special = FALSE is_resin_allowed = TRUE diff --git a/code/game/area/kutjevo.dm b/code/game/area/kutjevo.dm index db458c00b8f9..0825437f0365 100644 --- a/code/game/area/kutjevo.dm +++ b/code/game/area/kutjevo.dm @@ -41,7 +41,7 @@ icon_state = "oob" requires_power = FALSE is_resin_allowed = FALSE - flags_area = AREA_NOTUNNEL|AREA_UNWEEDABLE + flags_area = AREA_NOBURROW|AREA_UNWEEDABLE /area/kutjevo/interior/oob/dev_room name = "Kutjevo - Credits Room" @@ -324,7 +324,14 @@ icon_state = "colony_caves_3" /area/kutjevo/interior/colony_south/power2 - name = "Kutjevo - South Colony Treatment Plant" + name = "Kutjevo - South Colony Treatment Plant - North" + ceiling = CEILING_UNDERGROUND_BLOCK_CAS + icon_state = "colony_caves_3" + minimap_color = MINIMAP_AREA_ENGI_CAVE + unoviable_timer = FALSE + +/area/kutjevo/interior/colony_south/power2/south + name = "Kutjevo - South Colony Treatment Plant - South" ceiling = CEILING_UNDERGROUND_BLOCK_CAS icon_state = "colony_caves_3" minimap_color = MINIMAP_AREA_ENGI_CAVE diff --git a/code/game/area/prison_v3_fiorina.dm b/code/game/area/prison_v3_fiorina.dm index 660632755e92..8f70041a379f 100644 --- a/code/game/area/prison_v3_fiorina.dm +++ b/code/game/area/prison_v3_fiorina.dm @@ -17,7 +17,7 @@ requires_power = FALSE ceiling = CEILING_MAX is_resin_allowed = FALSE - flags_area = AREA_NOTUNNEL|AREA_UNWEEDABLE + flags_area = AREA_NOBURROW|AREA_UNWEEDABLE /area/fiorina/maintenance name = "Fiorina - Maintenance" diff --git a/code/game/area/rostock.dm b/code/game/area/rostock.dm index 6468dc608ba4..adebfcb41217 100644 --- a/code/game/area/rostock.dm +++ b/code/game/area/rostock.dm @@ -9,7 +9,7 @@ icon = 'icons/turf/area_almayer.dmi' // ambience = list('sound/ambience/shipambience.ogg') icon_state = "almayer" - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOBURROW // requires_power = TRUE // unlimited_power = TRUE ceiling = CEILING_METAL @@ -264,7 +264,7 @@ fake_zlevel = 2 // lowerdeck soundscape_playlist = SCAPE_PL_CIC soundscape_interval = 50 - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOBURROW /area/rostock/command/armory name = "SSV Rostock - Command Armory" @@ -405,7 +405,7 @@ fake_zlevel = 2 // lowerdeck soundscape_playlist = SCAPE_PL_ARES soundscape_interval = 120 - flags_area = AREA_NOTUNNEL|AREA_UNWEEDABLE + flags_area = AREA_NOBURROW|AREA_UNWEEDABLE can_build_special = FALSE is_resin_allowed = FALSE resin_construction_allowed = FALSE diff --git a/code/game/area/shiva.dm b/code/game/area/shiva.dm index a5a46c459646..9b96a8222a66 100644 --- a/code/game/area/shiva.dm +++ b/code/game/area/shiva.dm @@ -48,7 +48,7 @@ ceiling = CEILING_MAX icon_state = "oob" is_resin_allowed = FALSE - flags_area = AREA_NOTUNNEL|AREA_UNWEEDABLE + flags_area = AREA_NOBURROW|AREA_UNWEEDABLE /area/shiva/interior/oob/dev_room name = "Shiva's Snowball - Secret Room" diff --git a/code/game/area/shuttles.dm b/code/game/area/shuttles.dm index 1890f31925be..7e2255835eaf 100644 --- a/code/game/area/shuttles.dm +++ b/code/game/area/shuttles.dm @@ -37,7 +37,7 @@ /area/shuttle/transit name = "Hyperspace" - desc = "Weeeeee" + desc = "Weeeeee." ambience_exterior = 'sound/ambience/shuttle_fly_loop.ogg' base_lighting_alpha = 255 @@ -73,7 +73,7 @@ /area/shuttle/escape_pod icon = 'icons/turf/area_almayer.dmi' icon_state = "lifeboat" - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOBURROW /area/shuttle/escape_pod/afterShuttleMove(new_parallax_dir) . = ..() @@ -82,4 +82,4 @@ /area/shuttle/lifeboat icon = 'icons/turf/area_almayer.dmi' icon_state = "lifeboat" - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOBURROW diff --git a/code/game/area/space_station_13_areas.dm b/code/game/area/space_station_13_areas.dm index 9a69919f1e8b..8a25babcfbac 100644 --- a/code/game/area/space_station_13_areas.dm +++ b/code/game/area/space_station_13_areas.dm @@ -24,7 +24,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station power_environ = FALSE temperature = TCMB pressure = 0 - flags_area = AREA_NOTUNNEL|AREA_UNWEEDABLE + flags_area = AREA_NOBURROW|AREA_UNWEEDABLE weather_enabled = FALSE is_resin_allowed = FALSE @@ -84,7 +84,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "\improper abandoned Thunderdome" icon_state = "thunder" requires_power = 0 - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOBURROW statistic_exempt = TRUE block_game_interaction = TRUE ceiling = CEILING_METAL diff --git a/code/game/area/strata.dm b/code/game/area/strata.dm index 082ce19195ad..d34730cbe07d 100644 --- a/code/game/area/strata.dm +++ b/code/game/area/strata.dm @@ -17,7 +17,7 @@ ambience_exterior = FALSE requires_power = FALSE is_resin_allowed = FALSE - flags_area = AREA_NOTUNNEL|AREA_UNWEEDABLE + flags_area = AREA_NOBURROW|AREA_UNWEEDABLE ceiling = CEILING_MAX ////////////////////////////////////////// @@ -134,14 +134,27 @@ /area/strata/interior/vanyard name = "Flight Control Vehicle Yard" icon_state = "garage" + linked_lz = DROPSHIP_LZ2 /area/strata/exterior/tcomms_mining_caves name = "Mining Pathway Relay" icon_state = "tcomms1" - /area/strata/exterior/tcomms_vehicle_yard name = "Vehicle Yard Relay" icon_state = "tcomms1" + linked_lz = DROPSHIP_LZ2 + +/area/strata/exterior/tcomms_geosprings + name = "Geothermal Springs Relay" + icon_state = "tcomms1" + +/area/strata/exterior/tcomms_crashed_dropship + name = "Crashed Dropship Relay" + icon_state = "tcomms1" + +/area/strata/exterior/tcomms_engineering_parts_storage + name = "Engineering - Parts Storage Platform Relay" + icon_state = "tcomms1" //-Outpost @@ -314,6 +327,7 @@ /area/strata/interior/checkpoints/south name = "Landing Zone South Security Checkpoint" is_landing_zone = TRUE + linked_lz = DROPSHIP_LZ2 /area/strata/interior/checkpoints/outpost name = "Outpost - Deck Security Checkpoint" @@ -324,6 +338,7 @@ /area/strata/interior/parts_storage name = "Engineering - Parts Storage" icon_state = "outpost_engi_1" + linked_lz = DROPSHIP_LZ2 /area/strata/interior/generator_substation name = "Engineering - Generator Substation" @@ -335,6 +350,7 @@ ceiling = CEILING_UNDERGROUND_ALLOW_CAS soundscape_playlist = SCAPE_PL_LV759_CAVES ceiling_muffle = FALSE + linked_lz = DROPSHIP_LZ2 /area/strata/exterior/parts_storage_cave name = "Engineering - Parts Storage Exterior" @@ -526,7 +542,7 @@ icon_state = "marshwater" requires_power = FALSE is_resin_allowed = FALSE - flags_area = AREA_NOTUNNEL|AREA_UNWEEDABLE + flags_area = AREA_NOBURROW|AREA_UNWEEDABLE // CLF Insert diff --git a/code/game/area/varadero.dm b/code/game/area/varadero.dm index 702306c37cd1..57fc6ca966e5 100644 --- a/code/game/area/varadero.dm +++ b/code/game/area/varadero.dm @@ -78,7 +78,7 @@ ceiling = CEILING_MAX icon_state = "oob" is_resin_allowed = FALSE - flags_area = AREA_NOTUNNEL|AREA_UNWEEDABLE + flags_area = AREA_NOBURROW|AREA_UNWEEDABLE //landing zone computers @@ -138,13 +138,13 @@ /area/varadero/exterior/eastocean name = "New Varadero - East Ocean" linked_lz = DROPSHIP_LZ2 - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOBURROW icon_state = "varadero2" minimap_color = MINIMAP_AREA_CONTESTED_ZONE /area/varadero/exterior/farocean name = "New Varadero - Far Ocean" - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOBURROW icon_state = "varadero3" minimap_color = MINIMAP_AREA_CONTESTED_ZONE diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 016a9f6121c0..deb2b1e2436b 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -210,7 +210,7 @@ directive is properly returned. /atom/proc/HasProximity(atom/movable/AM as mob|obj) return -/atom/proc/emp_act(severity) +/atom/proc/emp_act(severity, datum/cause_data/cause_data) SHOULD_CALL_PARENT(TRUE) if(emp_proof) @@ -269,14 +269,24 @@ directive is properly returned. // called by mobs when e.g. having the atom as their machine, pulledby, loc (AKA mob being inside the atom) or buckled var set. // see code/modules/mob/mob_movement.dm for more. -/atom/proc/relaymove() +/atom/proc/relaymove(mob/living/user, direction) return +/** + * A special case of relaymove() in which the person relaying the move may be "driving" this atom + * + * This is a special case for vehicles and ridden animals where the relayed movement may be handled + * by the riding component attached to this atom. Returns TRUE as long as there's nothing blocking + * the movement, or FALSE if the signal gets a reply that specifically blocks the movement + */ +/atom/proc/relaydrive(mob/living/user, direction) + return !(SEND_SIGNAL(src, COMSIG_RIDDEN_DRIVER_MOVE, user, direction) & COMPONENT_DRIVER_BLOCK_MOVE) + /atom/proc/contents_explosion(severity) for(var/atom/A in contents) A.ex_act(severity) -/atom/proc/ex_act(severity) +/atom/proc/ex_act(severity, direction, datum/cause_data/cause_data, pierce=0, enviro=FALSE) if(explo_proof) return @@ -638,7 +648,7 @@ Parameters are passed from New. // returns a modifier for how much the tail stab should be cooldowned by // returning a 0 makes it do nothing -/atom/proc/handle_tail_stab(mob/living/carbon/xenomorph/xeno) +/atom/proc/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) return TAILSTAB_COOLDOWN_NONE /atom/proc/handle_flamer_fire(obj/flamer_fire/fire, damage, delta_time) @@ -813,3 +823,6 @@ Parameters are passed from New. var/refid = REF(src) . += "[VV_HREF_TARGETREF(refid, VV_HK_AUTO_RENAME, "[src]")]" . += "
<< [dir2text(dir) || dir] >>" + +/atom/Exited(atom/movable/AM, direction) + SEND_SIGNAL(src, COMSIG_ATOM_EXITED, AM, direction) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index e38b86ca02c7..990d5143eb40 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -11,6 +11,11 @@ var/mob/pulledby = null var/rebounds = FALSE var/rebounding = FALSE // whether an object that was launched was rebounded (to prevent infinite recursive loops from wall bouncing) + var/list/mob/living/buckled_mobs + var/mob/living/buckled_mob // mob buckled to this mob + /// Bed-like behaviour, forces mob.lying = buckle_lying if not set to [NO_BUCKLE_LYING]. + var/buckle_lying = NO_BUCKLE_LYING + var/buckle_flags = NONE var/acid_damage = 0 //Counter for stomach acid damage. At ~60 ticks, dissolved @@ -21,8 +26,8 @@ var/datum/component/orbiter/orbiting - /// Either FALSE, [EMISSIVE_BLOCK_GENERIC], or [EMISSIVE_BLOCK_UNIQUE] - var/blocks_emissive = FALSE + /// Either [EMISSIVE_BLOCK_NONE], [EMISSIVE_BLOCK_GENERIC], or [EMISSIVE_BLOCK_UNIQUE] + var/blocks_emissive = EMISSIVE_BLOCK_NONE ///Internal holder for emissive blocker object, do not use directly use blocks_emissive var/atom/movable/emissive_blocker/em_block @@ -44,6 +49,9 @@ QDEL_NULL(em_block) QDEL_NULL(emissive_overlay) + buckled_mobs?.Cut() + buckled_mob = null + if(loc) loc.on_stored_atom_del(src) //things that container need to do when a movable atom inside it is deleted if(orbiting) @@ -81,10 +89,46 @@ return src.master.attack_hand(a, b, c) return +/mutable_appearance/emissive_blocker + +/mutable_appearance/emissive_blocker/New() + . = ..() + // Need to do this here because it's overridden by the parent call + // This is a microop which is the sole reason why this child exists, because its static this is a really cheap way to set color without setting or checking it every time we create an atom + color = EM_BLOCK_COLOR + /atom/movable/Initialize(mapload, ...) . = ..() - update_emissive_block() +#if EMISSIVE_BLOCK_GENERIC != 0 + #error EMISSIVE_BLOCK_GENERIC is expected to be 0 to facilitate a weird optimization hack where we rely on it being the most common. + #error Read the comment in code/game/atoms_movable.dm for details. +#endif + + // This one is incredible. + // `if (x) else { /* code */ }` is surprisingly fast, and it's faster than a switch, which is seemingly not a jump table. + // From what I can tell, a switch case checks every single branch individually, although sane, is slow in a hot proc like this. + // So, we make the most common `blocks_emissive` value, EMISSIVE_BLOCK_GENERIC, 0, getting to the fast else branch quickly. + // If it fails, then we can check over every value it can be (here, EMISSIVE_BLOCK_UNIQUE is the only one that matters). + // This saves several hundred milliseconds of init time. + if (blocks_emissive) + if (blocks_emissive == EMISSIVE_BLOCK_UNIQUE) + render_target = ref(src) + em_block = new(null, src) + overlays += em_block + else + var/static/mutable_appearance/emissive_blocker/blocker = new() + blocker.icon = icon + blocker.icon_state = icon_state + blocker.dir = dir + blocker.appearance_flags = appearance_flags | EMISSIVE_APPEARANCE_FLAGS + blocker.plane = EMISSIVE_PLANE // Takes a light path through the normal macro for a microop + // Ok so this is really cursed, but I want to set with this blocker cheaply while + // Still allowing it to be removed from the overlays list later + // So I'm gonna flatten it, then insert the flattened overlay into overlays AND the managed overlays list, directly + // I'm sorry + var/mutable_appearance/flat = blocker.appearance + overlays += flat if(opacity) AddElement(/datum/element/light_blocking) @@ -94,22 +138,24 @@ AddComponent(/datum/component/overlay_lighting, is_directional = TRUE) /atom/movable/proc/update_emissive_block() - if(emissive_overlay) - overlays -= emissive_overlay - - switch(blocks_emissive) - if(EMISSIVE_BLOCK_GENERIC) - var/mutable_appearance/gen_emissive_blocker = mutable_appearance(icon, icon_state, plane = EMISSIVE_PLANE, alpha = src.alpha) - gen_emissive_blocker.color = GLOB.em_block_color - gen_emissive_blocker.dir = dir - gen_emissive_blocker.appearance_flags |= appearance_flags - emissive_overlay = gen_emissive_blocker - overlays += gen_emissive_blocker - if(EMISSIVE_BLOCK_UNIQUE) - render_target = ref(src) - em_block = new(src, render_target) - emissive_overlay = em_block - overlays += list(em_block) + // This one is incredible. + // `if (x) else { /* code */ }` is surprisingly fast, and it's faster than a switch, which is seemingly not a jump table. + // From what I can tell, a switch case checks every single branch individually, although sane, is slow in a hot proc like this. + // So, we make the most common `blocks_emissive` value, EMISSIVE_BLOCK_GENERIC, 0, getting to the fast else branch quickly. + // If it fails, then we can check over every value it can be (here, EMISSIVE_BLOCK_UNIQUE is the only one that matters). + // This saves several hundred milliseconds of init time. + if (blocks_emissive) + if (blocks_emissive == EMISSIVE_BLOCK_UNIQUE) + if(em_block) + em_block.plane = EMISSIVE_PLANE + else if(!QDELETED(src)) + render_target = ref(src) + em_block = new(null, src) + return em_block + // Implied else if (blocks_emissive == EMISSIVE_BLOCK_NONE) -> return + // EMISSIVE_BLOCK_GENERIC == 0 + else + return fast_emissive_blocker(src) /atom/movable/vv_get_dropdown() . = ..() @@ -162,9 +208,10 @@ /mob/proc/unset_interaction() if(interactee) - if(istype(interactee)) - interactee.on_unset_interaction(src) + var/atom/movable/prev_interactee = interactee interactee = null + if(istype(prev_interactee)) + prev_interactee.on_unset_interaction(src) //things the user's machine must do just after we set the user's machine. @@ -352,4 +399,138 @@ set_light_color(color) /atom/movable/proc/onZImpact(turf/impact_turf, height) - INVOKE_ASYNC(src, PROC_REF(SpinAnimation), 5, 2) + if(HAS_TRAIT(src, TRAIT_HAULED)) //we do not spin houled humans + return + INVOKE_ASYNC(src, PROC_REF(SpinAnimation), 5, 2) + +//trying to buckle a mob +/atom/movable/proc/buckle_mob(mob/buckle_target, mob/user, ride_check_flags = null, force = FALSE, check_loc = TRUE, lying_buckle = FALSE, hands_needed = 0, target_hands_needed = 0, silent = FALSE) + if(!ismob(buckle_target) || (get_dist(src, user) > 1) || user.stat || buckled_mob || buckle_target.buckled || !isturf(user.loc)) + return + + if(user.is_mob_incapacitated() || HAS_TRAIT(user, TRAIT_IMMOBILIZED) || HAS_TRAIT(user, TRAIT_FLOORED)) + to_chat(user, SPAN_WARNING("You can't do this right now.")) + return + + if(isxeno(user) && !HAS_TRAIT(user, TRAIT_OPPOSABLE_THUMBS)) + to_chat(user, SPAN_WARNING("You don't have the dexterity to do that, try a nest.")) + return + if(iszombie(user)) + return + + if(density) + density = FALSE + if(!step(buckle_target, get_dir(buckle_target, src)) && loc != buckle_target.loc) + density = TRUE + return + density = TRUE + else + if(buckle_target.loc != loc) + step_towards(buckle_target, src) //buckle if you're right next to it + if(buckle_target.loc != loc) + return + . = buckle_mob(buckle_target) + if(buckle_target.mob_size > MOB_SIZE_HUMAN) + if(buckle_target.stat != DEAD) + to_chat(user, SPAN_WARNING("[buckle_target] resists your attempt to buckle!")) + return + if(SEND_SIGNAL(src, COMSIG_MOVABLE_PREBUCKLE, buckle_target, user, ride_check_flags, force, check_loc, lying_buckle, hands_needed, target_hands_needed, silent) & COMPONENT_BLOCK_BUCKLE) + return + do_buckle(buckle_target, user) + +// the actual buckling proc +// Yes I know this is not style but its unreadable otherwise +/atom/movable/proc/do_buckle(mob/living/target, mob/user) + send_buckling_message(target, user) + if(src && loc) + target.throw_alert(ALERT_BUCKLED, /atom/movable/screen/alert/buckled) + target.set_buckled(src) + target.forceMove(loc) + target.setDir(dir) + buckled_mob = target + LAZYADD(buckled_mobs, target) + add_fingerprint(user) + afterbuckle(target) + return TRUE + +/atom/movable/proc/send_buckling_message(mob/buckle_target, mob/user) + if(buckle_target == user) + buckle_target.visible_message( + SPAN_NOTICE("[buckle_target] buckles in!"), + SPAN_NOTICE("You buckle yourself to [src]."), + SPAN_NOTICE("You hear metal clanking.")) + else + buckle_target.visible_message( + SPAN_NOTICE("[buckle_target] is buckled in to [src] by [user]!"), + SPAN_NOTICE("You are buckled in to [src] by [user]."), + SPAN_NOTICE("You hear metal clanking.")) + +/atom/movable/proc/send_unbuckling_message(mob/buckle_target, mob/user, atom/movable/unbuckle_from) + if(!unbuckle_from) + unbuckle_from = src + + if(buckle_target == user) + buckle_target.visible_message( + SPAN_NOTICE("[buckle_target] unbuckled [buckle_target.p_them()]self!"), + SPAN_NOTICE("You unbuckle yourself from [unbuckle_from]."), + SPAN_NOTICE("You hear metal clanking.")) + else + buckle_target.visible_message( + SPAN_NOTICE("[buckle_target] was unbuckled by [user.name]!"), + SPAN_NOTICE("You were unbuckled from [unbuckle_from] by [user]."), + SPAN_NOTICE("You hear metal clanking.")) + +/// Called after somebody buckled / unbuckled +/atom/movable/proc/afterbuckle(mob/buckle_target as mob) + handle_rotation() // To be removed when we have full dir support in set_buckled + SEND_SIGNAL(src, COMSIG_OBJ_AFTER_BUCKLE, buckled_mob) + if(!buckled_mob) + UnregisterSignal(buckle_target, COMSIG_PARENT_QDELETING) + else + RegisterSignal(buckled_mob, COMSIG_PARENT_QDELETING, PROC_REF(unbuckle)) + return buckled_mob + +/atom/movable/proc/handle_rotation() + return + +/atom/movable/proc/unbuckle() + SIGNAL_HANDLER + if(buckled_mob && buckled_mob.buckled == src) + buckled_mob.clear_alert(ALERT_BUCKLED) + buckled_mob.set_buckled(null) + buckled_mob.anchored = initial(buckled_mob.anchored) + + var/mob/living/mob = buckled_mob + buckled_mob = null + REMOVE_TRAITS_IN(mob, TRAIT_SOURCE_BUCKLE) + SEND_SIGNAL(src, COMSIG_MOVABLE_UNBUCKLE, mob) + LAZYREMOVE(buckled_mobs, mob) + afterbuckle(mob) + +/atom/movable/proc/manual_unbuckle(mob/user as mob) + if(buckled_mob) + if(buckled_mob.buckled == src) + send_unbuckling_message(buckled_mob, user) + unbuckle(buckled_mob) + add_fingerprint(user) + return TRUE + + return FALSE + +/atom/movable/proc/handle_buckled_mob_movement(NewLoc, direct) + if(!buckled_mob.Move(NewLoc, direct)) + forceMove(buckled_mob.loc) + last_move_dir = buckled_mob.last_move_dir + buckled_mob.inertia_dir = last_move_dir + return FALSE + + // Even if the movement is entirely managed by the object, notify the buckled mob that it's moving for its handler. + //It won't be called otherwise because it's a function of client_move or pulled mob, neither of which accounts for this. + SEND_SIGNAL(buckled_mob, COMSIG_MOB_MOVE_OR_LOOK, TRUE, direct, direct) + return TRUE + +/atom/movable/BlockedPassDirs(atom/movable/mover, target_dir) + if(mover == buckled_mob) //can't collide with the thing you're buckled to + return NO_BLOCKED_MOVEMENT + + return ..() diff --git a/code/game/cas_manager/datums/cas_fire_envelope.dm b/code/game/cas_manager/datums/cas_fire_envelope.dm index 40578ab74a58..f6c898880df9 100644 --- a/code/game/cas_manager/datums/cas_fire_envelope.dm +++ b/code/game/cas_manager/datums/cas_fire_envelope.dm @@ -105,16 +105,14 @@ mission_error = "Fire Mission is under way already." return FIRE_MISSION_NOT_EXECUTABLE if(!missions[mission_id]) + mission_error = "No Fire Mission selected." return FIRE_MISSION_NOT_EXECUTABLE - if(dir!=NORTH && dir!=SOUTH && dir!=WEST && dir!=EAST) + if(!(dir in GLOB.cardinals)) mission_error = "Incorrect direction." return FIRE_MISSION_BAD_DIRECTION mission_error = null var/datum/cas_fire_mission/mission = missions[mission_id] var/check_result = mission.check(linked_console) - if(check_result == FIRE_MISSION_CODE_ERROR) - return FIRE_MISSION_CODE_ERROR - if(check_result != FIRE_MISSION_ALL_GOOD) mission_error = mission.error_message(check_result) return FIRE_MISSION_CODE_ERROR @@ -294,15 +292,15 @@ /datum/cas_fire_envelope/proc/execute_firemission_unsafe(datum/cas_signal/signal, turf/target_turf, dir, datum/cas_fire_mission/mission) stat = FIRE_MISSION_STATE_IN_TRANSIT - to_chat(usr, SPAN_ALERT("Firemission underway!")) if(!target_turf) stat = FIRE_MISSION_STATE_IDLE - mission_error = "Target Lost." + mission_error = "Target lost." return if(!target_turf || !check_firemission_loc(signal)) stat = FIRE_MISSION_STATE_IDLE mission_error = "Target is off bounds or obstructed." return + to_chat(usr, SPAN_ALERT("Fire Mission underway!")) var/obj/effect/firemission_effect = new(target_turf) @@ -316,6 +314,7 @@ notify_ghosts(header = "CAS Fire Mission", message = "[usr ? usr : "Someone"] is launching Fire Mission '[mission.name]' at [get_area(target_turf)].", source = firemission_effect) msg_admin_niche("[usr ? key_name(usr) : "Someone"] is launching Fire Mission '[mission.name]' at ([target_turf.x],[target_turf.y],[target_turf.z]) [ADMIN_JMP(target_turf)]") + SScmtv.spectate_event("Firemission Inbound", target_turf, when_start = execution_start - 1 SECONDS) addtimer(CALLBACK(src, PROC_REF(play_sound), target_turf), grace_period) addtimer(CALLBACK(src, PROC_REF(chat_warning), target_turf, 15, 1), first_warning) @@ -331,39 +330,37 @@ /datum/cas_fire_envelope/proc/change_direction(new_dir) if(stat > FIRE_MISSION_STATE_IN_TRANSIT) mission_error = "Fire Mission is under way already." - return 0 - if((new_dir != 1) && (new_dir != 2) && (new_dir != 4) && (new_dir != 8)) + return FALSE + if(!(new_dir in GLOB.cardinals)) mission_error = "Direction has to be cardinal (i.e. North/South/West/East)" - return 0 - if(new_dir<0 || new_dir>15) - mission_error = "Do not use 4D coordinate matrix vector please." //hehe - return 0 + return FALSE recorded_dir = new_dir - return 1 + return TRUE -/datum/cas_fire_envelope/proc/change_offset(new_offset) +/datum/cas_fire_envelope/proc/change_offset(new_offset) // Not currently used if(stat > FIRE_MISSION_STATE_IN_TRANSIT) mission_error = "Fire Mission is under way already." - return 0 + return FALSE if(new_offset < 0) mission_error = "Offset cannot be negative." - return 0 + return FALSE if(new_offset > max_offset) mission_error = "Offset cannot be greater than [max_offset]." - return 0 + return FALSE recorded_offset = new_offset - return 1 + return TRUE /datum/cas_fire_envelope/proc/delete_firemission(mission_id) if(stat > FIRE_MISSION_STATE_IN_TRANSIT && stat < FIRE_MISSION_STATE_COOLDOWN) mission_error = "Fire Mission is under way already." - return 0 + return FALSE if(!missions[mission_id]) - return -1 + mission_error = "Fire Mission ID corrupted or already deleted." + return FALSE var/mission = missions[mission_id] missions -= mission qdel(mission) - return 1 + return TRUE /datum/cas_fire_envelope/uscm_dropship fire_length = 12 diff --git a/code/game/cas_manager/datums/cas_fire_mission.dm b/code/game/cas_manager/datums/cas_fire_mission.dm index f672dffed83a..6b9c4c33c432 100644 --- a/code/game/cas_manager/datums/cas_fire_mission.dm +++ b/code/game/cas_manager/datums/cas_fire_mission.dm @@ -132,12 +132,12 @@ if(code_id == FIRE_MISSION_CODE_ERROR) return "System error. Call Tech Support or create Fire Mission from scratch." if(!istype(error_weapon)) - return "Error or Fire Mission is outdated. Create Fire Mission from scratch if Error persists." - var/weapon_string = "[error_weapon.name] " + return "Error or Fire Mission is outdated. Create Fire Mission from scratch if error persists." + var/weapon_string = "[error_weapon.name]" if(error_weapon.ammo_equipped) - weapon_string += "([error_weapon.ammo_equipped.ammo_count]/[error_weapon.ammo_equipped.max_ammo_count]) " + weapon_string += " ([error_weapon.ammo_equipped.ammo_count]/[error_weapon.ammo_equipped.max_ammo_count])" if(error_weapon.ship_base) - weapon_string += "mounted on [error_weapon.ship_base.name] " + weapon_string += " mounted on [error_weapon.ship_base.name]" if(code_id == FIRE_MISSION_BAD_COOLDOWN) return "Weapon [weapon_string] requires interval of [error_weapon.ammo_equipped.fire_mission_delay] time units per shot." @@ -145,19 +145,19 @@ // Change this to using weapon's when it is implemented var/obj/effect/attach_point/weapon/AW = error_weapon.ship_base if(!istype(AW)) - . = "Internal error: [weapon_string] hardpoint invalid" + . = "Internal error: [weapon_string] hardpoint invalid." CRASH("CASFM-CHECK-01: Weapon attached to invalid hardpoint") var/list/allowed_offsets = AW.get_offsets() if(!allowed_offsets) - . = "Internal error: [weapon_string] offsets invalid" + . = "Internal error: [weapon_string] offsets invalid." CRASH("CASFM-CHECK-02: Weapon reported offsets invalid") return "Weapon hardpoint of [weapon_string] only allows gimbal offset between [allowed_offsets["min"]] and [allowed_offsets["max"]]." if(code_id == FIRE_MISSION_WEAPON_REMOVED) - return "Weapon [weapon_string] is no longer located on this dropship" + return "Weapon [weapon_string] is no longer located on this dropship." if(code_id == FIRE_MISSION_WEAPON_UNUSABLE) - return "Weapon [weapon_string] is loaded with ammunition too dangerous to be used in Fire Mission" + return "Weapon [weapon_string] is loaded with ammunition too dangerous to be used in Fire Mission." if(code_id == FIRE_MISSION_WEAPON_OUT_OF_AMMO) - return "Weapon [weapon_string] has not enough ammunition to complete this Fire Mission" + return "Weapon [weapon_string] has not enough ammunition to complete this Fire Mission." return "Unknown Error" /datum/cas_fire_mission/proc/execute_firemission(obj/structure/machinery/computer/dropship_weapons/linked_console, turf/initial_turf, direction = NORTH, steps = 12, step_delay = 3, datum/cas_fire_envelope/envelope = null) diff --git a/code/game/gamemodes/cm_initialize.dm b/code/game/gamemodes/cm_initialize.dm index 8bfe06245fa0..948e680193f4 100644 --- a/code/game/gamemodes/cm_initialize.dm +++ b/code/game/gamemodes/cm_initialize.dm @@ -68,7 +68,7 @@ Additional game mode variables. //Some gameplay variables. var/round_checkwin = 0 var/round_finished - var/round_started = 5 //This is a simple timer so we don't accidently check win conditions right in post-game + var/round_started = 5 //This is a simple timer so we don't accidentally check win conditions right in post-game var/list/round_toxic_river = list() //List of all toxic river locations var/round_time_lobby //Base time for the lobby, for fog dispersal. var/round_time_river @@ -95,12 +95,14 @@ Additional game mode variables. var/bioscan_current_interval = 5 MINUTES//5 minutes in var/bioscan_ongoing_interval = 1 MINUTES//every 1 minute - var/lz_selection_timer = 25 MINUTES //25 minutes in - var/round_time_burrowed_cutoff = 25 MINUTES //Time for when free burrowed larvae stop spawning. + var/lz_selection_timer = 15 MINUTES - var/round_time_resin = 40 MINUTES //Time for when resin placing is allowed close to LZs + ///Time for when resin placing is allowed close to LZs + var/round_time_resin = 40 MINUTES - var/round_time_evolution_ovipositor = 5 MINUTES //Time for when ovipositor becomes necessary for evolution to progress. + ///Time for when ovipositor becomes necessary for evolution to progress. + var/round_time_evolution_ovipositor = XENO_ROUNDSTART_FREE_EVO_TIME + ///Indicates when round_time_evolution_ovipositor has been passed. While FALSE, round_time_evolution_ovipositor is checked var/evolution_ovipositor_threshold = FALSE var/flags_round_type = NO_FLAGS @@ -108,20 +110,21 @@ Additional game mode variables. var/round_modifiers = list() ///List of typepaths of all /datum/gamemode_modifiers that start enabled var/starting_round_modifiers = list() - + /// The current acting commander; set by ares_command_check() + var/acting_commander /datum/game_mode/proc/get_roles_list() return GLOB.ROLES_USCM //===================================================\\ - //GAME MODE INITIATLIZE\\ + //GAME MODE INITIALIZE\\ //===================================================\\ /datum/game_mode/proc/initialize_special_clamps() xeno_starting_num = clamp((GLOB.readied_players/CONFIG_GET(number/xeno_number_divider)), xeno_required_num, INFINITY) //(n, minimum, maximum) - surv_starting_num = clamp((GLOB.readied_players/CONFIG_GET(number/surv_number_divider)), 2, 8) //this doesnt run + surv_starting_num = clamp((GLOB.readied_players/CONFIG_GET(number/surv_number_divider)), 2, 8) //this doesn't run marine_starting_num = length(GLOB.player_list) - xeno_starting_num - surv_starting_num for(var/datum/squad/target_squad in GLOB.RoleAuthority.squads) if(target_squad) @@ -136,7 +139,7 @@ Additional game mode variables. //===================================================\\ - //PREDATOR INITIATLIZE\\ + //PREDATOR INITIALIZE\\ //===================================================\\ @@ -212,7 +215,7 @@ Additional game mode variables. to_chat(pred_candidate, SPAN_WARNING("There is no Hunt this round! Maybe the next one.")) return FALSE - if(pred_candidate.ckey in predators) + if(pred_candidate.key in predators) if(show_warning) to_chat(pred_candidate, SPAN_WARNING("You already were a Yautja! Give someone else a chance.")) return FALSE @@ -371,7 +374,7 @@ Additional game mode variables. //===================================================\\ - //XENOMORPH INITIATLIZE\\ + //XENOMORPH INITIALIZE\\ //===================================================\\ @@ -462,53 +465,57 @@ Additional game mode variables. /datum/game_mode/proc/attempt_to_join_as_xeno(mob/xeno_candidate, instant_join = FALSE) var/list/available_xenos = list() - var/list/available_xenos_non_ssd = list() var/mob/dead/observer/candidate_observer = null if(isobserver(xeno_candidate)) candidate_observer = xeno_candidate - for(var/mob/living/carbon/xenomorph/cur_xeno as anything in GLOB.living_xeno_list) + for(var/mob/living/carbon/xenomorph/cur_xeno in GLOB.living_xeno_list) + if(QDELING(cur_xeno)) + continue if(cur_xeno.aghosted) continue //aghosted xenos don't count var/area/area = get_area(cur_xeno) if(should_block_game_interaction(cur_xeno) && (!area || !(area.flags_area & AREA_ALLOW_XENO_JOIN))) continue //xenos on admin z level don't count - if(!istype(cur_xeno)) - continue - var/required_time = islarva(cur_xeno) ? XENO_LEAVE_TIMER_LARVA - cur_xeno.away_timer : XENO_LEAVE_TIMER - cur_xeno.away_timer - if(required_time > XENO_AVAILABLE_TIMER) - continue - if(!cur_xeno.client) - available_xenos += cur_xeno - else - available_xenos_non_ssd += cur_xeno - - var/datum/hive_status/hive - for(var/hivenumber in GLOB.hive_datum) - hive = GLOB.hive_datum[hivenumber] - if(hive.hardcore) + if(cur_xeno.stat == DEAD) continue - if(!hive.stored_larva) + if(cur_xeno.health <= 0) continue - // Only offer buried larva if there is no queue because we are instead relying on the hive cores/larva pops to handle their larva: - // Technically this should be after a get_alien_candidates() call to be accurate, but we are intentionally trying to not call that proc as much as possible - if(hive.hive_location && GLOB.xeno_queue_candidate_count > 0) + var/required_leave_time = islarva(cur_xeno) ? XENO_LEAVE_TIMER_LARVA : XENO_LEAVE_TIMER + var/min_time = instant_join ? 0 : XENO_AVAILABLE_TIMER + if(required_leave_time - cur_xeno.away_timer > min_time) continue - if(!hive.hive_location && (world.time > XENO_BURIED_LARVA_TIME_LIMIT + SSticker.round_start_time)) + if(isfacehugger(cur_xeno) || islesserdrone(cur_xeno)) continue + available_xenos += cur_xeno + + if(!instant_join) + var/datum/hive_status/hive + for(var/hivenumber in GLOB.hive_datum) + hive = GLOB.hive_datum[hivenumber] + if(hive.hardcore) + continue + if(!hive.stored_larva) + continue + // Only offer buried larva if there is no queue because we are instead relying on the hive cores/larva pops to handle their larva: + // Technically this should be after a get_alien_candidates() call to be accurate, but we are intentionally trying to not call that proc as much as possible + if(hive.hive_location && GLOB.larva_pool_candidate_count > 0) + continue + if(!hive.hive_location && (world.time > XENO_BURIED_LARVA_TIME_LIMIT + SSticker.round_start_time)) + continue + + if(SSticker.mode && (SSticker.mode.flags_round_type & MODE_RANDOM_HIVE)) + available_xenos |= "any buried larva" + LAZYADD(available_xenos["any buried larva"], hive) + else + var/larva_option = "buried larva ([hive])" + available_xenos += larva_option + available_xenos[larva_option] = list(hive) - if(SSticker.mode && (SSticker.mode.flags_round_type & MODE_RANDOM_HIVE)) - available_xenos |= "any buried larva" - LAZYADD(available_xenos["any buried larva"], hive) - else - var/larva_option = "buried larva ([hive])" - available_xenos += larva_option - available_xenos[larva_option] = list(hive) - - if(!length(available_xenos) || (instant_join && !length(available_xenos_non_ssd))) + if(!length(available_xenos)) var/is_new_player = isnewplayer(xeno_candidate) - if(!xeno_candidate.client?.prefs || (!(xeno_candidate.client.prefs.be_special & BE_ALIEN_AFTER_DEATH) && !is_new_player)) + if(!xeno_candidate.client?.prefs || (!(xeno_candidate.client.prefs.be_special & BE_ALIEN) && !is_new_player)) to_chat(xeno_candidate, SPAN_WARNING("There aren't any available xenomorphs or burrowed larvae. \ You can try getting spawned as a chestburster larva by toggling your Xenomorph candidacy in \ Preferences -> Toggle SpecialRole Candidacy.")) @@ -517,84 +524,25 @@ Additional game mode variables. // If a lobby player is trying to join as xeno, estimate their possible position if(is_new_player) - if(!SSticker.HasRoundStarted() || world.time < SSticker.round_start_time + 15 SECONDS) - // Larva queue numbers are too volatile at the start of the game for the estimation to be what they end up with - to_chat(xeno_candidate, SPAN_XENONOTICE("Larva queue position estimation is not available until shortly after the game has started. \ - The ordering is based on your time of death or the time you joined. When you have been dead long enough and are not inactive, \ - you will periodically receive messages where you are in the queue relative to other currently valid xeno candidates. \ - Your current position will shift as others change their preferences or go inactive, but your relative position compared to all observers is the same. \ - Note: Playing as a facehugger/lesser or in the thunderdome will not alter your time of death. \ - This means you won't lose your relative place in queue if you step away, disconnect, play as a facehugger/lesser, or play in the thunderdome.")) - return FALSE - var/mob/new_player/candidate_new_player = xeno_candidate - if(candidate_new_player.larva_queue_message_stale_time <= world.time) - // No cached/current lobby message, determine the position - var/list/valid_candidates = get_alien_candidates() - var/candidate_time = candidate_new_player.client.player_details.larva_queue_time - var/position = 1 - for(var/mob/dead/observer/current in valid_candidates) - if(current.client.player_details.larva_queue_time >= candidate_time) - break - position++ - candidate_new_player.larva_queue_message_stale_time = world.time + 3 MINUTES // spam prevention - candidate_new_player.larva_queue_cached_message = "Your position would be [position]\th in the larva queue if you observed and were eligible to be a xeno. \ - The ordering is based on your time of death or the time you joined. When you have been dead long enough and are not inactive, \ - you will periodically receive messages where you are in the queue relative to other currently valid xeno candidates. \ - Your current position will shift as others change their preferences or go inactive, but your relative position compared to all observers is the same. \ - Note: Playing as a facehugger/lesser or in the thunderdome will not alter your time of death. \ - This means you won't lose your relative place in queue if you step away, disconnect, play as a facehugger/lesser, or play in the thunderdome." - to_chat(candidate_new_player, SPAN_XENONOTICE(candidate_new_player.larva_queue_cached_message)) + message_alien_candidate_new_player(xeno_candidate) return FALSE if(!candidate_observer) return FALSE - // If an observing mod wants to join as a xeno, disable their larva protection so that they can enter the queue. + // If an observing mod wants to join as a xeno, disable their larva protection so that they can enter the larva pool. if(check_client_rights(candidate_observer.client, R_MOD, FALSE)) candidate_observer.admin_larva_protection = FALSE - // Give the player a cached message of their queue status if they are an observer - if(candidate_observer.larva_queue_cached_message) - to_chat(candidate_observer, SPAN_XENONOTICE(candidate_observer.larva_queue_cached_message)) - return FALSE - - // No cache, lets check now then - var/list/valid_candidates = get_alien_candidates() - message_alien_candidates(valid_candidates, dequeued = 0, cache_only = TRUE) - - // If we aren't in the queue yet, let's teach them about the queue - if(!candidate_observer.larva_queue_cached_message) - var/candidate_time = candidate_observer.client.player_details.larva_queue_time - var/position = 1 - for(var/mob/dead/observer/current in valid_candidates) - if(current.client.player_details.larva_queue_time >= candidate_time) - break - position++ - candidate_observer.larva_queue_cached_message = "You are currently ineligible to be a larva but would be [position]\th in queue. \ - The ordering is based on your time of death or the time you joined. When you have been dead long enough and are not inactive, \ - you will periodically receive messages where you are in the queue relative to other currently valid xeno candidates. \ - Your current position will shift as others change their preferences or go inactive, but your relative position compared to all observers is the same. \ - Note: Playing as a facehugger/lesser or in the thunderdome will not alter your time of death. \ - This means you won't lose your relative place in queue if you step away, disconnect, play as a facehugger/lesser, or play in the thunderdome." - to_chat(candidate_observer, SPAN_XENONOTICE(candidate_observer.larva_queue_cached_message)) - return FALSE - - var/datum/hive_status/cur_hive - for(var/hive_num in GLOB.hive_datum) - cur_hive = GLOB.hive_datum[hive_num] - for(var/mob_name in cur_hive.banished_ckeys) - if(cur_hive.banished_ckeys[mob_name] == candidate_observer.ckey) - candidate_observer.larva_queue_cached_message += "\nNOTE: You are banished from the [cur_hive] and you may not rejoin unless \ - the Queen re-admits you or dies. Your queue number won't update until there is a hive you aren't banished from." - break - to_chat(candidate_observer, SPAN_XENONOTICE(candidate_observer.larva_queue_cached_message)) + // Give the observing player a cached message of their pool status (or update their cache) + message_alien_candidate_observer(candidate_observer) return FALSE var/mob/living/carbon/xenomorph/new_xeno if(instant_join) - new_xeno = pick(available_xenos_non_ssd) //Just picks something at random. + new_xeno = pick(available_xenos) //Just picks something at random. else - var/userInput = tgui_input_list(usr, "Available Xenomorphs", "Join as Xeno", available_xenos, theme="hive_status") + var/userInput = tgui_input_list(xeno_candidate, "Available Xenomorphs", "Join as Xeno", available_xenos, theme="hive_status") if(available_xenos[userInput]) //Free xeno mobs have no associated value and skip this. "Pooled larva" strings have a list of hives. var/datum/hive_status/picked_hive = pick(available_xenos[userInput]) //The list contains all available hives if we are to choose at random, only one element if we already chose a hive by its name. @@ -664,7 +612,7 @@ Additional game mode variables. if(tgui_alert(xeno_candidate, "Are you sure you want to transfer yourself into [new_xeno]?", "Confirm Transfer", list("Yes", "No")) != "Yes") return FALSE - if(new_xeno.away_timer < required_leave_time || new_xeno.stat == DEAD || !(new_xeno in GLOB.living_xeno_list) || !xeno_candidate) // Do it again, just in case + if(QDELETED(new_xeno) || new_xeno.away_timer < required_leave_time || new_xeno.stat == DEAD || !(new_xeno in GLOB.living_xeno_list) || !xeno_candidate) // Do it again, just in case to_chat(xeno_candidate, SPAN_WARNING("That xenomorph can no longer be controlled. Please try another.")) return FALSE @@ -804,7 +752,7 @@ Additional game mode variables. return TRUE -/datum/game_mode/proc/transfer_xeno(xeno_candidate, mob/living/new_xeno) +/datum/game_mode/proc/transfer_xeno(xeno_candidate, mob/living/carbon/xenomorph/new_xeno) if(!xeno_candidate || !isxeno(new_xeno) || QDELETED(new_xeno)) return FALSE @@ -827,7 +775,7 @@ Additional game mode variables. else CRASH("ERROR: transfer_xeno called without mob or mind input: [xeno_candidate]") - new_xeno.ghostize(FALSE) //Make sure they're not getting a free respawn. + new_xeno.ghostize(can_reenter_corpse=FALSE, aghosted=FALSE, transfer=TRUE) //Make sure they're not getting a free respawn. xeno_candidate_mind.transfer_to(new_xeno, TRUE) new_xeno.SetSleeping(0) // ghosting sleeps, but they got a new mind! wake up! (/mob/living/verb/ghost()) @@ -839,13 +787,13 @@ Additional game mode variables. SSround_recording.recorder.update_key(new_xeno) if(new_xeno.client) new_xeno.client.change_view(GLOB.world_view_size) + if(isnewplayer(xeno_candidate)) + send_tacmap_assets_latejoin(new_xeno) msg_admin_niche("[new_xeno.key] has joined as [new_xeno].") - if(isxeno(new_xeno)) //Dear lord - var/mob/living/carbon/xenomorph/X = new_xeno - X.generate_name() - if(X.is_ventcrawling) - X.update_pipe_icons(X.loc) //If we are in a vent, fetch a fresh vent map + new_xeno.generate_name() + if(new_xeno.is_ventcrawling) + new_xeno.update_pipe_icons(new_xeno.loc) //If we are in a vent, fetch a fresh vent map return TRUE /// Pick and setup a queen spawn from landmarks, then spawns the player there alongside any required setup @@ -910,17 +858,22 @@ Additional game mode variables. new_queen.generate_name() SSround_recording.recorder.track_player(new_queen) - - to_chat(new_queen, "You are now the alien queen!") - to_chat(new_queen, "Your job is to spread the hive.") - to_chat(new_queen, "You should start by building a hive core.") - to_chat(new_queen, "Talk in Hivemind using ; (e.g. ';Hello my children!')") + if(Check_WO()) + to_chat(new_queen, "You are now the alien queen!") + to_chat(new_queen, "Your job is to assist the hive in assaulting the human outpost!") + to_chat(new_queen, "You should start by planting weeds and growing an ovipositor, your children will appear around round time 0:20. You will be able to leave your cave after the round time reaches 1:00.") + to_chat(new_queen, "Talk in Hivemind using ; (e.g. ';Hello my children!')") + else + to_chat(new_queen, "You are now the alien queen!") + to_chat(new_queen, "Your job is to spread the hive.") + to_chat(new_queen, "You should start by building a hive core.") + to_chat(new_queen, "Talk in Hivemind using ; (e.g. ';Hello my children!')") new_queen.update_icons() //===================================================\\ - //SURVIVOR INITIATLIZE\\ + //SURVIVOR INITIALIZE\\ //===================================================\\ @@ -995,7 +948,7 @@ Additional game mode variables. to_chat(H, "
You are a survivor!
") to_chat(H, SPAN_NOTICE(SSmapping.configs[GROUND_MAP].survivor_message)) to_chat(H, SPAN_NOTICE("You are fully aware of the xenomorph threat and are able to use this knowledge as you see fit.")) - to_chat(H, SPAN_NOTICE("You are NOT aware of the marines or their intentions. ")) + to_chat(H, SPAN_NOTICE("You are NOT aware of the marines or their intentions.")) if(spawner.story_text) . = 1 spawn(6) @@ -1059,7 +1012,7 @@ Additional game mode variables. current_survivors -= survivor continue //Not a mind? How did this happen? - random_name = pick(random_name(FEMALE),random_name(MALE)) + random_name = random_name(pick(FEMALE, MALE)) if(istype(survivor.current, /mob/living) && survivor.current.first_xeno) current_survivors -= survivor @@ -1095,11 +1048,11 @@ Additional game mode variables. //===================================================\\ - //MARINE GEAR INITIATLIZE\\ + //MARINE GEAR INITIALIZE\\ //===================================================\\ -//We do NOT want to initilialize the gear before everyone is properly spawned in +//We do NOT want to initialize the gear before everyone is properly spawned in /datum/game_mode/proc/initialize_post_marine_gear_list() init_gear_scale() @@ -1108,6 +1061,12 @@ Additional game mode variables. var/obj/structure/machinery/cm_vending/sorted/CVS = i CVS.populate_product_list_and_boxes(gear_scale) + for(var/chem_storage_network in GLOB.chemical_data.chemical_networks) + var/obj/structure/machinery/chem_storage/chem_storage = GLOB.chemical_data.chemical_networks[chem_storage_network] + if(!chem_storage.dynamic_storage) + continue + chem_storage.calculate_dynamic_storage(gear_scale) + //Scale the amount of cargo points through a direct multiplier GLOB.supply_controller.points += floor(GLOB.supply_controller.points_scale * gear_scale) @@ -1137,6 +1096,11 @@ Additional game mode variables. gear_scale_max = gear_scale for(var/obj/structure/machinery/cm_vending/sorted/vendor as anything in GLOB.cm_vending_vendors) vendor.update_dynamic_stock(gear_scale_max) + for(var/chem_storage_network in GLOB.chemical_data.chemical_networks) + var/obj/structure/machinery/chem_storage/chem_storage = GLOB.chemical_data.chemical_networks[chem_storage_network] + if(!chem_storage.dynamic_storage) + continue + chem_storage.calculate_dynamic_storage(gear_scale) GLOB.supply_controller.points += floor(gear_delta * GLOB.supply_controller.points_scale) /// Updates [var/latejoin_tally] and [var/gear_scale] based on role weights of latejoiners/cryoers. Delta is the amount of role positions added/removed @@ -1189,6 +1153,10 @@ Additional game mode variables. to_chat(joe_candidate, SPAN_WARNING("You are not whitelisted! You may apply on the forums to be whitelisted as a synth.")) return + if(MODE_HAS_MODIFIER(/datum/gamemode_modifier/disable_wj_spawns)) + to_chat(joe_candidate, SPAN_WARNING("Working Joes are disabled from spawning!")) + return FALSE + if(MODE_HAS_MODIFIER(/datum/gamemode_modifier/disable_wj_respawns) && (joe_candidate.ckey in joes)) // No joe respawns if already a joe before to_chat(joe_candidate, SPAN_WARNING("Working Joe respawns are disabled!")) return FALSE diff --git a/code/game/gamemodes/cm_process.dm b/code/game/gamemodes/cm_process.dm index 93a931c991b9..1287d49f8353 100644 --- a/code/game/gamemodes/cm_process.dm +++ b/code/game/gamemodes/cm_process.dm @@ -69,7 +69,7 @@ of predators), but can be added to include variant game modes (like humans vs. h sleep(2 SECONDS) if(length(GLOB.medal_awards)) var/dat = "" - dat += SPAN_ROUNDBODY("
Medal Awards:") + dat += SPAN_ROUNDBODY("
Medal and Ribbon Awards:") for(var/recipient in GLOB.medal_awards) var/datum/recipient_awards/recipient_award = GLOB.medal_awards[recipient] for(var/i in 1 to length(recipient_award.medal_names)) @@ -139,13 +139,39 @@ GLOBAL_VAR_INIT(next_predator_bioscan, 5 MINUTES) // 30 minutes in GLOBAL_VAR_INIT(next_admin_bioscan, 30 MINUTES) -/datum/game_mode/proc/select_lz(obj/structure/machinery/computer/shuttle/dropship/flight/lz1/console) +/// Asks the user (optional) to pick the primary LZ if both LZ1 and LZ2 exist and it hasn't been set yet +/// If only one, or no user, it will pick the first available +/datum/game_mode/proc/pick_a_lz(mob/user) + if(active_lz) + return + + var/lz1 = locate(/obj/structure/machinery/computer/shuttle/dropship/flight/lz1) + var/lz2 = locate(/obj/structure/machinery/computer/shuttle/dropship/flight/lz2) + + if(lz1 && lz2 && user) + var/lz_choices = list("LZ 1", "LZ 2") + var/new_lz = tgui_input_list(user, "Select primary LZ", "LZ Select", lz_choices) + if(!new_lz) + return + if(new_lz == "LZ 1") + select_lz(lz1) + else + select_lz(lz2) + return + + if(lz1 || lz2) + select_lz(lz1 || lz2) + return + + CRASH("No /obj/structure/machinery/computer/shuttle/dropship/flight/lz1 or lz2 found!") + +/datum/game_mode/proc/select_lz(obj/structure/machinery/computer/shuttle/dropship/flight/console) if(active_lz) return active_lz = console // The announcement to all Humans. var/name = "[MAIN_AI_SYSTEM] Operation Staging Order" - var/input = "Command Order Issued.\n\n[active_lz.loc.loc] has been designated as the primary landing zone." + var/input = "Command Order Issued.\n\n[get_area(active_lz)] has been designated as the primary landing zone." marine_announcement(input, name) /datum/game_mode/proc/announce_bioscans() diff --git a/code/game/gamemodes/colonialmarines/colonialmarines.dm b/code/game/gamemodes/colonialmarines/colonialmarines.dm index afddf771efc1..570d6c59755d 100644 --- a/code/game/gamemodes/colonialmarines/colonialmarines.dm +++ b/code/game/gamemodes/colonialmarines/colonialmarines.dm @@ -19,7 +19,7 @@ monkey_amount = 5 corpses_to_spawn = 0 flags_round_type = MODE_INFESTATION|MODE_FOG_ACTIVATED|MODE_NEW_SPAWN - static_comms_amount = 1 + static_comms_amount = 2 var/round_status_flags var/next_stat_check = 0 var/list/running_round_stats = list() @@ -30,8 +30,6 @@ */ var/near_lz_protection_delay = 8 MINUTES -//////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////// /* Pre-pre-startup */ /datum/game_mode/colonialmarines/can_start(bypass_checks = FALSE) @@ -44,7 +42,7 @@ /datum/game_mode/colonialmarines/get_roles_list() return GLOB.ROLES_DISTRESS_SIGNAL -//////////////////////////////////////////////////////////////////////////////////////// + //Temporary, until we sort this out properly. /obj/effect/landmark/lv624 icon = 'icons/landmarks.dmi' @@ -82,7 +80,6 @@ GLOB.xeno_tunnels -= src return ..() -//////////////////////////////////////////////////////////////////////////////////////// /* Pre-setup */ /datum/game_mode/colonialmarines/pre_setup() @@ -117,8 +114,7 @@ T.id = "hole[i]" return TRUE -//////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////// + /* Post-setup */ //This happens after create_character, so our mob SHOULD be valid and built by now, but without job data. @@ -293,6 +289,9 @@ /datum/game_mode/colonialmarines/proc/clear_proximity_resin() var/datum/cause_data/cause_data = create_cause_data(/obj/effect/particle_effect/smoke/weedkiller::name) + if(!active_lz) + pick_a_lz() + for(var/area/near_area as anything in GLOB.all_areas) var/area_lz = near_area.linked_lz if(!area_lz) @@ -357,21 +356,21 @@ var/rendered_announce_text = replacetext(SSmapping.configs[GROUND_MAP].announce_text, "###SHIPNAME###", MAIN_SHIP_NAME) marine_announcement(rendered_announce_text, "[MAIN_SHIP_NAME]") -/datum/game_mode/proc/ares_command_check() +/datum/game_mode/proc/ares_command_check(mob/living/carbon/human/commander = null, force = FALSE) + /// Job of the person being auto-promoted. var/role_in_charge + /// human being auto-promoted. var/mob/living/carbon/human/person_in_charge - - var/list/role_needs_id = list(JOB_SO, JOB_CHIEF_ENGINEER, JOB_DROPSHIP_PILOT, JOB_CAS_PILOT, JOB_INTEL) - var/list/role_needs_comms = list(JOB_CHIEF_POLICE, JOB_CMO, JOB_CHIEF_ENGINEER, JOB_DROPSHIP_PILOT, JOB_CAS_PILOT, JOB_INTEL) + /// Extra info to add to the ARES announcement announcing the promotion. var/announce_addendum - var/datum/squad/intel_squad = GLOB.RoleAuthority.squads_by_type[/datum/squad/marine/intel] - var/list/intel_officers = intel_squad.marines_list - //Basically this follows the list of command staff in order of CoC, //then if the role lacks senior command access it gives the person that access - if(GLOB.marine_leaders[JOB_CO] || GLOB.marine_leaders[JOB_XO]) + if(SSticker.mode.acting_commander && !force) // If there's already an aCO; don't set a new one, unless forced. + return + + if((GLOB.marine_leaders[JOB_CO] || GLOB.marine_leaders[JOB_XO]) && !force) return //If we have a CO or XO, we're good no need to announce anything. @@ -381,36 +380,44 @@ if(job_by_chain == JOB_SO && GLOB.marine_leaders[JOB_SO]) person_in_charge = pick(GLOB.marine_leaders[JOB_SO]) break - if(job_by_chain == JOB_INTEL && !!length(intel_officers)) - person_in_charge = pick(intel_officers) + if(job_by_chain == JOB_INTEL && GLOB.marine_officers[JOB_INTEL]) + person_in_charge = pick(GLOB.marine_officers[JOB_INTEL]) break + if(job_by_chain == JOB_DOCTOR && GLOB.marine_officers[JOB_DOCTOR]) + person_in_charge = pick(GLOB.marine_officers[JOB_DOCTOR]) + break + //If the job is a list we have to stop here if(person_in_charge) - continue + break var/datum/job/job_datum = GLOB.RoleAuthority.roles_for_mode[job_by_chain] - person_in_charge = job_datum.get_active_player_on_job() + person_in_charge = job_datum?.get_active_player_on_job() if(!isnull(person_in_charge)) break - if(isnull(person_in_charge)) - return + if(commander) // pre-provided commander overrides the automatic selection. + person_in_charge = commander + role_in_charge = person_in_charge.job + + if(!person_in_charge) + return log_admin("No valid commander found for automatic promotion.") - if(LAZYFIND(role_needs_comms, role_in_charge)) - //If the role needs comms we let them know about the headset. - announce_addendum += "\nA Command headset is availible in the CIC Command Tablet cabinet." + SSticker.mode.acting_commander = person_in_charge // Prevents double-dipping. - if(LAZYFIND(role_needs_id, role_in_charge)) - //If the role needs senior command access, we need to add it to the ID card. - var/obj/item/card/id/card = person_in_charge.get_idcard() - if(card) - var/list/access = card.access - access.Add(list(ACCESS_MARINE_SENIOR, ACCESS_MARINE_DATABASE)) + var/obj/item/card/id/card = person_in_charge.get_idcard() + if(card) + var/static/to_add = list(ACCESS_MARINE_SENIOR, ACCESS_MARINE_DATABASE, ACCESS_MARINE_COMMAND) + var/new_access = card.access | to_add + if(card.access ~! new_access) + card.access = new_access announce_addendum += "\nSenior Command access added to ID." + announce_addendum += "\nA Command headset is available in the Command Tablet cabinet." + //does an announcement to the crew about the commander & alerts admins to that change for logs. - shipwide_ai_announcement("Due to the absence of command staff, commander authority now falls to [role_in_charge] [person_in_charge], who will assume command until further notice. Please direct all inquiries and follow instructions accordingly. [announce_addendum]", MAIN_AI_SYSTEM, 'sound/misc/interference.ogg') - message_admins("[key_name(person_in_charge, 1)] [ADMIN_JMP_USER(person_in_charge)] has been designated the operation commander.") + shipwide_ai_announcement("Acting Commander authority has been transferred to: [role_in_charge] [person_in_charge], who will assume command until further notice. Please direct all inquiries and follow instructions accordingly. [announce_addendum]", MAIN_AI_SYSTEM, 'sound/misc/interference.ogg') + message_admins("[key_name(person_in_charge, TRUE)] [ADMIN_JMP_USER(person_in_charge)] has been designated the operation commander.") return @@ -418,9 +425,9 @@ ai_silent_announcement("Bioscan complete. No unknown lifeform signature detected.", ".V") ai_silent_announcement("Saving operational report to archive.", ".V") ai_silent_announcement("Commencing final systems scan in 3 minutes.", ".V") + log_game("Distress Signal ARES commencing final system scan in 3 minutes!") + -//////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////// //This is processed each tick, but check_win is only checked 5 ticks, so we don't go crazy with scanning for mobs. /datum/game_mode/colonialmarines/process() @@ -441,12 +448,17 @@ hive = GLOB.hive_datum[hivenumber] if(!hive.xeno_queen_timer) continue - if(!hive.living_xeno_queen && hive.xeno_queen_timer < world.time) - xeno_message("The Hive is ready for a new Queen to evolve. The hive can only survive for a limited time without a queen!", 3, hive.hivenumber) + var/time_remaining = (QUEEN_DEATH_COUNTDOWN + hive.xeno_queen_timer) - world.time + if(time_remaining <= 59 SECONDS) + var/seconds_left = round(time_remaining / 10) + xeno_message("The Hive is ready for a new Queen to evolve. The Hive will collapse in [seconds_left] seconds without a Queen.", 3, hive.hivenumber) + else + xeno_message("The Hive is ready for a new Queen to evolve. The Hive can only survive for a limited time without a Queen!", 3, hive.hivenumber) - if(!active_lz && world.time > lz_selection_timer) - select_lz(locate(/obj/structure/machinery/computer/shuttle/dropship/flight/lz1)) + + if(!active_lz && ROUND_TIME > lz_selection_timer) + pick_a_lz() // Automated bioscan / Queen Mother message if(world.time > bioscan_current_interval) //If world time is greater than required bioscan time. @@ -474,7 +486,7 @@ check_win() round_checkwin = 0 - if(!evolution_ovipositor_threshold && world.time >= SSticker.round_start_time + round_time_evolution_ovipositor) + if(!evolution_ovipositor_threshold && ROUND_TIME >= round_time_evolution_ovipositor) for(var/hivenumber in GLOB.hive_datum) hive = GLOB.hive_datum[hivenumber] hive.evolution_without_ovipositor = FALSE @@ -543,9 +555,14 @@ playsound_z(SSmapping.levels_by_any_trait(list(ZTRAIT_MARINE_MAIN_SHIP)), 'sound/effects/double_klaxon.ogg', volume = 10) -// Resource Towers - /datum/game_mode/colonialmarines/ds_first_drop(obj/docking_port/mobile/marine_dropship) + if(!active_lz) + var/dest_id = marine_dropship.destination?.id + if(dest_id == DROPSHIP_LZ1) + select_lz(locate(/obj/structure/machinery/computer/shuttle/dropship/flight/lz1)) + else if (dest_id == DROPSHIP_LZ2) + select_lz(locate(/obj/structure/machinery/computer/shuttle/dropship/flight/lz2)) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(show_blurb_uscm)), DROPSHIP_DROP_MSG_DELAY) addtimer(CALLBACK(src, PROC_REF(warn_resin_clear), marine_dropship), DROPSHIP_DROP_FIRE_DELAY) DB_ENTITY(/datum/entity/survivor_survival) // Record surv survival right now @@ -554,25 +571,27 @@ add_current_round_status_to_end_results("First Drop") clear_lz_hazards() -/////////////////////////// -//Checks to see who won/// -////////////////////////// +/** + * Checks to see who won + */ /datum/game_mode/colonialmarines/check_win() if(SSticker.current_state != GAME_STATE_PLAYING) return if(ROUND_TIME < 10 MINUTES) return - var/living_player_list[] = count_humans_and_xenos(get_affected_zlevels()) + + if(SShijack?.sd_detonated) + round_finished = MODE_INFESTATION_DRAW_DEATH // Self destruction. + return + + var/list/living_player_list = count_humans_and_xenos(get_affected_zlevels()) var/num_humans = living_player_list[1] var/num_xenos = living_player_list[2] - if(force_end_at && world.time > force_end_at) - round_finished = MODE_INFESTATION_X_MINOR - - if(!num_humans && num_xenos) //No humans remain alive. - round_finished = MODE_INFESTATION_X_MAJOR //Evacuation did not take place. Everyone died. + if(!num_humans && num_xenos) + round_finished = MODE_INFESTATION_X_MAJOR //No humans remain alive. else if(num_humans && !num_xenos) - if(SSticker.mode && SSticker.mode.is_in_endgame) + if(SSticker.mode?.is_in_endgame) round_finished = MODE_INFESTATION_X_MINOR //Evacuation successfully took place. else SSticker.roundend_check_paused = TRUE @@ -581,6 +600,8 @@ addtimer(VARSET_CALLBACK(SSticker, roundend_check_paused, FALSE), MARINE_MAJOR_ROUND_END_DELAY) else if(!num_humans && !num_xenos) round_finished = MODE_INFESTATION_DRAW_DEATH //Both were somehow destroyed. + else if (force_end_at && world.time > force_end_at) + round_finished = MODE_INFESTATION_X_MINOR // Times up. /datum/game_mode/colonialmarines/count_humans_and_xenos(list/z_levels) . = ..() @@ -626,18 +647,19 @@ round_finished = MODE_INFESTATION_M_MAJOR else round_finished = MODE_INFESTATION_M_MINOR + log_game("Distress Signal Hive collapse!") -/////////////////////////////// -//Checks if the round is over// -/////////////////////////////// +/** + * Checks if the round is over + */ /datum/game_mode/colonialmarines/check_finished() if(round_finished) - return 1 - -////////////////////////////////////////////////////////////////////// -//Announces the end of the game with all relevant information stated// -////////////////////////////////////////////////////////////////////// + return TRUE + return FALSE +/** + * Announces the end of the game with all relevant information stated + */ /datum/game_mode/colonialmarines/declare_completion() announce_ending() var/musical_track @@ -650,7 +672,7 @@ GLOB.round_statistics.current_map.total_xeno_victories++ GLOB.round_statistics.current_map.total_xeno_majors++ if(MODE_INFESTATION_M_MAJOR) - musical_track = pick('sound/theme/winning_triumph1.ogg','sound/theme/winning_triumph2.ogg') + musical_track = pick('sound/theme/winning_triumph1.ogg','sound/theme/winning_triumph2.ogg','sound/theme/winning_triumph3.ogg') end_icon = "marine_major" if(GLOB.round_statistics && GLOB.round_statistics.current_map) GLOB.round_statistics.current_map.total_marine_victories++ diff --git a/code/game/gamemodes/colonialmarines/whiskey_outpost.dm b/code/game/gamemodes/colonialmarines/whiskey_outpost.dm index 6a9a21ea4163..fcaa27d5aa6a 100644 --- a/code/game/gamemodes/colonialmarines/whiskey_outpost.dm +++ b/code/game/gamemodes/colonialmarines/whiskey_outpost.dm @@ -1,6 +1,8 @@ #define WO_MAX_WAVE 15 +#define WO_XENOS_WON 1 +#define WO_MARINES_WON 2 -//Global proc for checking if the game is whiskey outpost so I dont need to type if(gamemode == whiskey outpost) 50000 times +//Global proc for checking if the game is whiskey outpost so I don't need to type if(gamemode == whiskey outpost) 50000 times /proc/Check_WO() if(SSticker.mode == GAMEMODE_WHISKEY_OUTPOST || GLOB.master_mode == GAMEMODE_WHISKEY_OUTPOST) return 1 @@ -11,6 +13,7 @@ config_tag = GAMEMODE_WHISKEY_OUTPOST required_players = 140 xeno_bypass_timer = 1 + static_comms_amount = 0 flags_round_type = MODE_NEW_SPAWN role_mappings = list( /datum/job/command/commander/whiskey = JOB_CO, @@ -40,11 +43,11 @@ latejoin_larva_drop = 0 //You never know - //var/mob/living/carbon/human/Commander //If there is no Commander, marines wont get any supplies + //var/mob/living/carbon/human/Commander //If there is no Commander, marines won't get any supplies //No longer relevant to the game mode, since supply drops are getting changed. var/checkwin_counter = 0 var/finished = 0 - var/has_started_timer = 10 //This is a simple timer so we don't accidently check win conditions right in post-game + var/has_started_timer = 10 //This is a simple timer so we don't accidentally check win conditions right in post-game var/randomovertime = 0 //This is a simple timer so we can add some random time to the game mode. var/spawn_next_wave = 12 MINUTES //Spawn first batch at ~12 minutes var/last_wave_time = 0 // Stores the time the last wave (wave 15) started @@ -74,7 +77,7 @@ var/list/whiskey_outpost_waves = list() hardcore = TRUE - starting_round_modifiers = list(/datum/gamemode_modifier/permadeath) + starting_round_modifiers = list(/datum/gamemode_modifier/permadeath, /datum/gamemode_modifier/more_crit, /datum/gamemode_modifier/disable_wj_spawns) votable = TRUE vote_cycle = 75 // approx. once every 5 days, if it wins the vote @@ -119,24 +122,24 @@ CONFIG_SET(flag/remove_gun_restrictions, TRUE) sleep(10) to_world(SPAN_ROUND_HEADER("The current game mode is - WHISKEY OUTPOST!")) - to_world(SPAN_ROUNDBODY("It is the year 2177 on the planet LV-624, five years before the arrival of the USS Almayer and the 2nd 'Falling Falcons' Battalion in the sector")) - to_world(SPAN_ROUNDBODY("The 3rd 'Dust Raiders' Battalion is charged with establishing a USCM presence in the Neroid Sector")) - to_world(SPAN_ROUNDBODY("[SSmapping.configs[GROUND_MAP].map_name], one of the Dust Raider bases being established in the sector, has come under attack from unrecognized alien forces")) - to_world(SPAN_ROUNDBODY("With casualties mounting and supplies running thin, the Dust Raiders at [SSmapping.configs[GROUND_MAP].map_name] must survive for an hour to alert the rest of their battalion in the sector")) + to_world(SPAN_ROUNDBODY("It is the year 2177 on the planet LV-624, five years before the arrival of the USS Almayer and the 2nd 'Falling Falcons' Battalion in the sector.")) + to_world(SPAN_ROUNDBODY("The 3rd 'Dust Raiders' Battalion is charged with establishing a USCM presence in the Neroid Sector.")) + to_world(SPAN_ROUNDBODY("[SSmapping.configs[GROUND_MAP].map_name], one of the Dust Raider bases being established in the sector, has come under attack from unrecognized alien forces.")) + to_world(SPAN_ROUNDBODY("With casualties mounting and supplies running thin, the Dust Raiders at [SSmapping.configs[GROUND_MAP].map_name] must survive for an hour to alert the rest of their battalion in the sector.")) to_world(SPAN_ROUNDBODY("Hold out for as long as you can.")) world << sound('sound/effects/siren.ogg') sleep(10) switch(map_locale) //Switching it up. if(0) - marine_announcement("This is Captain Hans Naiche, commander of the 3rd Battalion 'Dust Raiders' forces here on LV-624. In our attempts to establish a base on this planet, several of our patrols were wiped out by hostile creatures. We're setting up a distress call, but we need you to hold [SSmapping.configs[GROUND_MAP].map_name] in order for our engineers to set up the relay. We're prepping several M402 mortar units to provide fire support. If they overrun your positon, we will be wiped out with no way to call for help. Hold the line or we all die.", "Captain Naiche, 3rd Battalion Command, LV-624 Garrison") + marine_announcement("This is Captain Hans Naiche, commander of the 3rd Battalion 'Dust Raiders' forces here on LV-624. In our attempts to establish a base on this planet, several of our patrols were wiped out by hostile creatures. We're setting up a distress call, but we need you to hold [SSmapping.configs[GROUND_MAP].map_name] in order for our engineers to set up the relay. We're prepping several M402 mortar units to provide fire support. If they overrun your position, we will be wiped out with no way to call for help. Hold the line or we all die.", "Captain Naiche, 3rd Battalion Command, LV-624 Garrison") addtimer(CALLBACK(src, PROC_REF(story_announce), 0), 3 MINUTES) return ..() /datum/game_mode/whiskey_outpost/proc/story_announce(time) switch(time) if(0) - marine_announcement("This is Captain Hans Naiche, Commander of the 3rd Bataillion, 'Dust Raiders' forces on LV-624. As you already know, several of our patrols have gone missing and were likely wiped out by hostile local creatures as we attempted to set up our base.", "Captain Naiche, 3rd Battalion Command, LV-624 Garrison") + marine_announcement("This is Captain Hans Naiche, Commander of the 3rd Battalion, 'Dust Raiders' forces on LV-624. As you already know, several of our patrols have gone missing and were likely wiped out by hostile local creatures as we attempted to set up our base.", "Captain Naiche, 3rd Battalion Command, LV-624 Garrison") if(1) marine_announcement("Our scouts report increased activity in the area and given our intel, we're already preparing for the worst. We're setting up a comms relay to send out a distress call, but we're going to need time while our engineers get everything ready. All other stations should prepare accordingly and maximize combat readiness, effective immediately.", "Captain Naiche, 3rd Battalion Command, LV-624 Garrison") if(2) @@ -158,7 +161,7 @@ SSitem_cleanup.delete_almayer() -//PROCCESS +//PROCESS /datum/game_mode/whiskey_outpost/process(delta_time) . = ..() checkwin_counter++ @@ -192,12 +195,20 @@ var/wave = pick(whiskey_outpost_waves[xeno_wave]) spawn_whiskey_outpost_xenos(wave) announce_xeno_wave(wave) + announce_dchat("A new xenomorph wave is available, use the Join as Xeno verb to take one of them.") + if(xeno_wave == 1) + xeno_announcement("It is time, dear Queen. Release the hive!", XENO_HIVE_NORMAL, SPAN_ANNOUNCEMENT_HEADER_BLUE("[QUEEN_MOTHER_ANNOUNCE]")) if(xeno_wave == 7) //Wave when Marines get reinforcements! get_specific_call(/datum/emergency_call/wo, FALSE, TRUE) // "Marine Reinforcements (Squad)" + if(xeno_wave == 14) + xeno_announcement("We sense that they are sending signals for help, we have little time left. We have granted you vision of all humans in the area, slaughter them all!", XENO_HIVE_NORMAL, SPAN_ANNOUNCEMENT_HEADER_BLUE("[QUEEN_MOTHER_ANNOUNCE]")) + var/datum/hive_status/main_hive = GLOB.hive_datum[XENO_HIVE_NORMAL] + main_hive.see_humans_on_tacmap = TRUE + main_hive.tacmap_requires_queen_ovi = FALSE + SEND_SIGNAL(main_hive, COMSIG_XENO_REVEAL_TACMAP) xeno_wave = min(xeno_wave + 1, WO_MAX_WAVE) - /datum/game_mode/whiskey_outpost/proc/announce_xeno_wave(datum/whiskey_outpost_wave/wave_data) if(!istype(wave_data)) return @@ -208,12 +219,14 @@ //CHECK WIN /datum/game_mode/whiskey_outpost/check_win() - var/C = count_humans_and_xenos(SSmapping.levels_by_trait(ZTRAIT_GROUND)) + var/list/living_player_list = count_humans_and_xenos(SSmapping.levels_by_trait(ZTRAIT_GROUND)) + var/num_humans = living_player_list[1] + //var/num_xenos = living_player_list[2] - if(C[1] == 0) - finished = 1 //Alien win + if(num_humans == 0) + finished = WO_XENOS_WON else if(world.time > last_wave_time + 15 MINUTES) // Around 1:12 hh:mm - finished = 2 //Marine win + finished = WO_MARINES_WON /datum/game_mode/whiskey_outpost/proc/disablejoining() for(var/i in GLOB.RoleAuthority.roles_by_name) @@ -250,9 +263,9 @@ /////////////////////////////// /datum/game_mode/whiskey_outpost/check_finished() if(finished != 0) - return 1 + return TRUE - return 0 + return FALSE ////////////////////////////////////////////////////////////////////// //Announces the end of the game with all relevant information stated// @@ -260,7 +273,7 @@ /datum/game_mode/whiskey_outpost/declare_completion() if(GLOB.round_statistics) GLOB.round_statistics.track_round_end() - if(finished == 1) + if(finished == WO_XENOS_WON) log_game("Round end result - xenos won") to_world(SPAN_ROUND_HEADER("The Xenos have successfully defended their hive from colonization.")) to_world(SPAN_ROUNDBODY("Well done, you've secured LV-624 for the hive!")) @@ -273,7 +286,7 @@ GLOB.round_statistics.current_map.total_xeno_victories++ GLOB.round_statistics.current_map.total_xeno_majors++ - else if(finished == 2) + else if(finished == WO_MARINES_WON) log_game("Round end result - marines won") to_world(SPAN_ROUND_HEADER("Against the onslaught, the marines have survived.")) to_world(SPAN_ROUNDBODY("The signal rings out to the USS Alistoun, and Dust Raiders stationed elsewhere in the Neroid Sector begin to converge on LV-624.")) @@ -500,14 +513,14 @@ for(var/path in spawnitems) new path(crate) -//Whiskey Outpost Recycler Machine. Teleports objects to centcomm so it doesnt lag +//Whiskey Outpost Recycler Machine. Teleports objects to centcomm so it doesn't lag /obj/structure/machinery/wo_recycler icon = 'icons/obj/structures/machinery/recycling.dmi' icon_state = "grinder-o0" var/icon_on = "grinder-o1" name = "Recycler" - desc = "Instructions: Place objects you want to destroy on top of it and use the machine. Use with care" + desc = "Instructions: Place objects you want to destroy on top of it and use the machine. Use with care." density = FALSE anchored = TRUE unslashable = TRUE @@ -536,7 +549,7 @@ if(istype(O,/obj/structure/closet/crate)) var/obj/structure/closet/crate/C = O if(length(C.contents)) - to_chat(user, SPAN_DANGER("[O] must be emptied before it can be recycled")) + to_chat(user, SPAN_DANGER("[O] must be emptied before it can be recycled.")) continue new /obj/item/stack/sheet/metal(get_step(src,dir)) O.forceMove(get_turf(locate(84,237,2))) //z.2 @@ -811,3 +824,7 @@ /datum/game_mode/whiskey_outpost/get_escape_menu() return "Making a last stand on..." + +#undef WO_MAX_WAVE +#undef WO_XENOS_WON +#undef WO_MARINES_WON diff --git a/code/game/gamemodes/colonialmarines/whiskey_outpost/whiskey_output_waves.dm b/code/game/gamemodes/colonialmarines/whiskey_outpost/whiskey_output_waves.dm index e845f7b4c5ec..9127014cafb7 100644 --- a/code/game/gamemodes/colonialmarines/whiskey_outpost/whiskey_output_waves.dm +++ b/code/game/gamemodes/colonialmarines/whiskey_outpost/whiskey_output_waves.dm @@ -8,8 +8,7 @@ return var/datum/hive_status/hive = GLOB.hive_datum[XENO_HIVE_NORMAL] - if(hive.slashing_allowed != XENO_SLASH_ALLOWED) - hive.slashing_allowed = XENO_SLASH_ALLOWED //Allows harm intent for aliens + hive.hive_flags |= XENO_SLASH_ALLOW_ALL //Allows harm intent for aliens var/xenos_to_spawn if(wave_data.wave_type == WO_SCALED_WAVE) xenos_to_spawn = max(count_marines(SSmapping.levels_by_trait(ZTRAIT_GROUND)),5) * wave_data.scaling_factor * WO_SPAWN_MULTIPLIER @@ -60,8 +59,8 @@ var/spawn_loc = pick(xeno_spawns) var/xeno_type = GLOB.RoleAuthority.get_caste_by_text(userInput) var/mob/living/carbon/xenomorph/new_xeno = new xeno_type(spawn_loc) - if(new_xeno.hive.construction_allowed == NORMAL_XENO) - new_xeno.hive.construction_allowed = XENO_QUEEN + new_xeno.hive.hive_flags |= XENO_CONSTRUCTION_QUEEN + new_xeno.hive.hive_flags &= ~(XENO_CONSTRUCTION_NORMAL|XENO_CONSTRUCTION_LEADERS) new_xeno.nocrit(xeno_wave) xeno_pool -= userInput if(isnewplayer(xeno_candidate)) @@ -120,7 +119,7 @@ /datum/whiskey_outpost_wave/wave1 wave_number = 1 - wave_castes = list(XENO_CASTE_RUNNER) + wave_castes = list(XENO_CASTE_RUNNER, XENO_CASTE_DRONE) sound_effect = list('sound/effects/siren.ogg') command_announcement = list("We're tracking the creatures that wiped out our patrols. They're heading towards your outpost, multiple small life-signs detected. We're attempting to establish a signal with the USS Alistoun, stand by.", "Captain Naiche, 3rd Battalion Command, LV-624 Garrison") scaling_factor = 0.3 @@ -133,7 +132,8 @@ XENO_CASTE_RUNNER, XENO_CASTE_RUNNER, XENO_CASTE_RUNNER, - XENO_CASTE_RUNNER, + XENO_CASTE_SENTINEL, + XENO_CASTE_DRONE, ) scaling_factor = 0.4 wave_delay = 1 MINUTES //Early, quick waves @@ -142,10 +142,11 @@ wave_number = 3 wave_castes = list( XENO_CASTE_RUNNER, - XENO_CASTE_RUNNER, + XENO_CASTE_SENTINEL, XENO_CASTE_LURKER, XENO_CASTE_SPITTER, XENO_CASTE_DEFENDER, + XENO_CASTE_DRONE, ) scaling_factor = 0.6 wave_delay = 1 MINUTES //Early, quick waves @@ -154,7 +155,7 @@ wave_number = 4 wave_castes = list( XENO_CASTE_RUNNER, - XENO_CASTE_RUNNER, + XENO_CASTE_SENTINEL, XENO_CASTE_LURKER, XENO_CASTE_LURKER, XENO_CASTE_SPITTER, @@ -168,7 +169,7 @@ wave_number = 5 wave_castes = list( XENO_CASTE_RUNNER, - XENO_CASTE_RUNNER, + XENO_CASTE_SENTINEL, XENO_CASTE_LURKER, XENO_CASTE_LURKER, XENO_CASTE_SPITTER, @@ -182,7 +183,7 @@ wave_number = 6 wave_castes = list( XENO_CASTE_RUNNER, - XENO_CASTE_RUNNER, + XENO_CASTE_SENTINEL, XENO_CASTE_LURKER, XENO_CASTE_LURKER, XENO_CASTE_LURKER, @@ -199,7 +200,7 @@ wave_number = 7 wave_castes = list(XENO_CASTE_BURROWER) wave_type = WO_STATIC_WAVE - number_of_xenos = 3 + number_of_xenos = 4 command_announcement = list("This is First Lieutenant Ike Saker, Executive Officer of Captain Naiche. The Captain is still trying to get off world contact. An engineer platoon managed to destroy the main entrance into this valley; this should give you a short break while the aliens find another way in. We are receiving reports of seismic waves occurring nearby, there might be creatures burrowing underground. Keep an eye on your defenses. I have also received word that marines evacuating from an overrun outpost are coming to reinforce you. I used to be stationed with them, those troops are top notch.", "First Lieutenant Ike Saker, 3rd Battalion Command, LV-624 Garrison") /datum/whiskey_outpost_wave/wave8 @@ -214,11 +215,12 @@ XENO_CASTE_DEFENDER, XENO_CASTE_DRONE, XENO_CASTE_WARRIOR, + XENO_CASTE_HIVELORD, ) sound_effect = list() command_announcement = list("Captain Naiche speaking, we've been unsuccessful in establishing offworld communication so far. We're prepping our M402 mortars to destroy the inbound forces on the main road. Stand by for fire support.", "Captain Naiche, 3rd Battalion Command, LV-624 Garrison") -/datum/whiskey_outpost_wave/wave9 //Ravager and Praetorian Added, Tier II more common, Tier I less common +/datum/whiskey_outpost_wave/wave9 // Tier II more common, Tier I less common, Early Ravs and Early Boiler (Ideal only 1 boiler) wave_number = 9 wave_castes = list( XENO_CASTE_RUNNER, @@ -228,15 +230,17 @@ XENO_CASTE_LURKER, XENO_CASTE_LURKER, XENO_CASTE_LURKER, - XENO_CASTE_SPITTER, + XENO_CASTE_SENTINEL, XENO_CASTE_SPITTER, XENO_CASTE_SPITTER, XENO_CASTE_SPITTER, XENO_CASTE_DEFENDER, XENO_CASTE_DEFENDER, XENO_CASTE_DRONE, - XENO_CASTE_DRONE, + XENO_CASTE_HIVELORD, XENO_CASTE_WARRIOR, + XENO_CASTE_RAVAGER, + XENO_CASTE_BOILER, ) sound_effect = list('sound/voice/alien_queen_command.ogg') command_announcement = list("Our garrison forces are reaching seventy percent casualties. We're losing our grip here. It appears that the vanguard of the hostile force is still approaching, and most of the other Dust Raider platoons have been shattered. We need you to hold.", "Captain Naiche, 3rd Battalion Command, LV-624 Garrison") @@ -251,14 +255,14 @@ XENO_CASTE_LURKER, XENO_CASTE_LURKER, XENO_CASTE_LURKER, - XENO_CASTE_SPITTER, + XENO_CASTE_SENTINEL, XENO_CASTE_SPITTER, XENO_CASTE_SPITTER, XENO_CASTE_SPITTER, XENO_CASTE_DEFENDER, XENO_CASTE_DEFENDER, XENO_CASTE_DRONE, - XENO_CASTE_DRONE, + XENO_CASTE_HIVELORD, XENO_CASTE_WARRIOR, ) @@ -272,14 +276,14 @@ XENO_CASTE_LURKER, XENO_CASTE_LURKER, XENO_CASTE_LURKER, - XENO_CASTE_SPITTER, + XENO_CASTE_SENTINEL, XENO_CASTE_SPITTER, XENO_CASTE_SPITTER, XENO_CASTE_SPITTER, XENO_CASTE_DEFENDER, XENO_CASTE_DEFENDER, XENO_CASTE_DRONE, - XENO_CASTE_DRONE, + XENO_CASTE_HIVELORD, XENO_CASTE_WARRIOR, XENO_CASTE_WARRIOR, ) @@ -294,14 +298,14 @@ XENO_CASTE_LURKER, XENO_CASTE_LURKER, XENO_CASTE_LURKER, - XENO_CASTE_SPITTER, + XENO_CASTE_SENTINEL, XENO_CASTE_SPITTER, XENO_CASTE_SPITTER, XENO_CASTE_SPITTER, XENO_CASTE_DEFENDER, XENO_CASTE_DEFENDER, XENO_CASTE_DRONE, - XENO_CASTE_DRONE, + XENO_CASTE_HIVELORD, XENO_CASTE_WARRIOR, XENO_CASTE_WARRIOR, XENO_CASTE_RAVAGER, diff --git a/code/game/gamemodes/colonialmarines/xenovsxeno.dm b/code/game/gamemodes/colonialmarines/xenovsxeno.dm index 2188f0cce60b..636cce985e00 100644 --- a/code/game/gamemodes/colonialmarines/xenovsxeno.dm +++ b/code/game/gamemodes/colonialmarines/xenovsxeno.dm @@ -6,6 +6,7 @@ required_players = 4 //Need at least 4 players xeno_required_num = 4 //Need at least four xenos. monkey_amount = 0.2 // Amount of monkeys per player + static_comms_amount = 0 flags_round_type = MODE_NO_SPAWN|MODE_NO_LATEJOIN|MODE_XVX|MODE_RANDOM_HIVE var/list/structures_to_delete = list(/obj/effect/alien/weeds, /turf/closed/wall/resin, /obj/structure/mineral_door/resin, /obj/structure/bed/nest, /obj/item, /obj/structure/tunnel, /obj/structure/machinery/computer/shuttle_control, /obj/structure/machinery/defenses/sentry/premade) diff --git a/code/game/gamemodes/events/power_failure.dm b/code/game/gamemodes/events/power_failure.dm index c8b80efe9b7f..1af48a9f065d 100644 --- a/code/game/gamemodes/events/power_failure.dm +++ b/code/game/gamemodes/events/power_failure.dm @@ -75,7 +75,7 @@ marine_announcement("Power has been restored. Reason: Unknown.", "Power Systems Nominal", 'sound/AI/poweron.ogg') /proc/power_restore_ship_reactors(announce = TRUE) - for(var/obj/structure/machinery/power/reactor/reactor in GLOB.machines) + for(var/obj/structure/machinery/power/power_generator/reactor/reactor in GLOB.machines) if(!is_mainship_level(reactor.z)) //Only ship reactors should be repaired continue reactor.buildstate = 0 diff --git a/code/game/gamemodes/extended/cm_vs_upp.dm b/code/game/gamemodes/extended/cm_vs_upp.dm index c26f6d20a426..ba702ff8da52 100644 --- a/code/game/gamemodes/extended/cm_vs_upp.dm +++ b/code/game/gamemodes/extended/cm_vs_upp.dm @@ -125,7 +125,7 @@ if(MODE_INFESTATION_M_MAJOR) marine_announcement("ALERT: Opposing Force landing zone under USCM force control. Orbital scans concludes all opposing force combat personnel are combat inoperative.\n\nMission Accomplished!\n\nSaving operational report to archive, commencing final systems.", "ARES 3.2", 'sound/AI/commandreport.ogg', FACTION_MARINE) marine_announcement("ALERT: Union landing zone compromised. Union ground forces are non-responsive. Further combat operations impossible.\n\nMission Abort Authorized\n\nConcluding operational report for dispatch, commencing final data entry and systems scan.", "1VAN/3", 'sound/AI/commandreport.ogg', FACTION_UPP) - musical_track = pick('sound/theme/winning_triumph1.ogg','sound/theme/winning_triumph2.ogg') + musical_track = pick('sound/theme/winning_triumph1.ogg','sound/theme/winning_triumph2.ogg','sound/theme/winning_triumph3.ogg') end_icon = "marine_major" if(MODE_INFESTATION_M_MINOR) marine_announcement("ALERT: Opposing Force landing zone under USCM force control. Orbital scans concludes all opposing force combat personnel are combat inoperative.\n\nMission Accomplished!\n\nSaving operational report to archive, commencing final systems scan.", "ARES 3.2", 'sound/AI/commandreport.ogg', FACTION_MARINE) diff --git a/code/game/gamemodes/extended/extended.dm b/code/game/gamemodes/extended/extended.dm index dddd00890871..888ac1867293 100644 --- a/code/game/gamemodes/extended/extended.dm +++ b/code/game/gamemodes/extended/extended.dm @@ -3,6 +3,7 @@ config_tag = "Extended" required_players = 0 latejoin_larva_drop = 0 + static_comms_amount = 2 votable = FALSE taskbar_icon = 'icons/taskbar/gml_colonyrp.png' diff --git a/code/game/gamemodes/extended/infection.dm b/code/game/gamemodes/extended/infection.dm index 52b0ed8465bf..13fbfc4adb30 100644 --- a/code/game/gamemodes/extended/infection.dm +++ b/code/game/gamemodes/extended/infection.dm @@ -11,7 +11,7 @@ /datum/game_mode/infection/announce() to_world("The current game mode is - ZOMBIES!") to_world("Just have fun and role-play!") - to_world("If you die as a zombie, you come back. NO MATTER HOW MUCH DAMAGE.") + to_world("If you die as a zombie, you come back. NO MATTER HOW MUCH DAMAGE.") to_world("Don't ahelp asking for specific details, you won't get them.") /datum/game_mode/infection/get_roles_list() @@ -74,7 +74,7 @@ if(A.roundstart_picked) possible_survivors -= A - if(length(possible_survivors)) //We may have stripped out all the contendors, so check again. + if(length(possible_survivors)) //We may have stripped out all the contenders, so check again. var/i = surv_starting_num var/datum/mind/new_survivor while(i > 0) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index a4be09d24612..f3d26c80141d 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -29,7 +29,7 @@ GLOBAL_VAR_INIT(cas_tracking_id_increment, 0) //this var used to assign unique t var/is_in_endgame = FALSE //Set it to TRUE when we trigger DELTA alert or dropship crashes /// When set and this gamemode is selected, the taskbar icon will change to the png selected here var/taskbar_icon = 'icons/taskbar/gml_distress.png' - var/static_comms_amount = 0 + var/static_comms_amount = 1 var/obj/structure/machinery/computer/shuttle/dropship/flight/active_lz = null var/datum/entity/statistic/round/round_stats = null @@ -258,32 +258,32 @@ GLOBAL_VAR_INIT(cas_tracking_id_increment, 0) //this var used to assign unique t var/obj/effect/landmark/corpsespawner/spawner = pick(gamemode_spawn_corpse) var/turf/spawnpoint = get_turf(spawner) if(spawnpoint) - var/mob/living/carbon/human/M = new /mob/living/carbon/human(spawnpoint) - M.create_hud() //Need to generate hud before we can equip anything apparently... - arm_equipment(M, spawner.equip_path, TRUE, FALSE) + var/mob/living/carbon/human/human_mob = new /mob/living/carbon/human(spawnpoint) + human_mob.create_hud() //Need to generate hud before we can equip anything apparently... + arm_equipment(human_mob, spawner.equip_path, TRUE, FALSE) for(var/obj/structure/bed/nest/found_nest in spawnpoint) for(var/turf/the_turf in list(get_step(found_nest, NORTH),get_step(found_nest, EAST),get_step(found_nest, WEST))) if(the_turf.density) found_nest.dir = get_dir(found_nest, the_turf) found_nest.pixel_x = found_nest.buckling_x["[found_nest.dir]"] found_nest.pixel_y = found_nest.buckling_y["[found_nest.dir]"] - M.dir = get_dir(the_turf,found_nest) + human_mob.dir = get_dir(the_turf,found_nest) if(!found_nest.buckled_mob) - found_nest.do_buckle(M,M) + found_nest.forced_buckle_mob(human_mob,human_mob) gamemode_spawn_corpse.Remove(spawner) /datum/game_mode/proc/spawn_static_comms() for(var/i = 1 to static_comms_amount) - var/obj/effect/landmark/static_comms/SCO = pick_n_take(GLOB.comm_tower_landmarks_net_one) - var/obj/effect/landmark/static_comms/SCT = pick_n_take(GLOB.comm_tower_landmarks_net_two) - if(!SCO) - break - SCO.spawn_tower() - if(!SCT) - break - SCT.spawn_tower() - QDEL_NULL_LIST(GLOB.comm_tower_landmarks_net_one) - QDEL_NULL_LIST(GLOB.comm_tower_landmarks_net_two) + var/obj/effect/landmark/static_comms/tower + if(i % 2) + tower = pick_n_take(GLOB.comm_tower_landmarks_net_one) + else + tower = pick_n_take(GLOB.comm_tower_landmarks_net_two) + if(!tower) + continue + tower.spawn_tower() + QDEL_LIST(GLOB.comm_tower_landmarks_net_one) + QDEL_LIST(GLOB.comm_tower_landmarks_net_two) ////////////////////////// //Reports player logouts// diff --git a/code/game/gamemodes/round_modifiers.dm b/code/game/gamemodes/round_modifiers.dm index c3b47bcfb206..8358d41c3b19 100644 --- a/code/game/gamemodes/round_modifiers.dm +++ b/code/game/gamemodes/round_modifiers.dm @@ -149,3 +149,11 @@ /datum/gamemode_modifier/ceasefire modifier_name = "Ceasefire" modifier_desc = "Prevents firing guns and throwing granades." + +/datum/gamemode_modifier/more_crit + modifier_name = "Increased Crit Threshold" + modifier_desc = "Increases the crit and dead thresholds on humans." + +/datum/gamemode_modifier/disable_wj_spawns + modifier_name = "Disable Working Joe" + modifier_desc = "Disables Working Joes from spawning." diff --git a/code/game/jobs/job/antag/xeno/queen.dm b/code/game/jobs/job/antag/xeno/queen.dm index 144f8e42e6ad..44e492634d72 100644 --- a/code/game/jobs/job/antag/xeno/queen.dm +++ b/code/game/jobs/job/antag/xeno/queen.dm @@ -13,10 +13,16 @@ SSticker.mode.pick_queen_spawn(human_to_transform, hive_index) /datum/job/antag/xenos/queen/announce_entry_message(mob/new_queen, account, whitelist_status) - to_chat(new_queen, "You are now the alien queen!") - to_chat(new_queen, "Your job is to spread the hive.") - to_chat(new_queen, "You should start by building a hive core.") - to_chat(new_queen, "Talk in Hivemind using ; (e.g. ';Hello my children!')") + if(Check_WO()) + to_chat(new_queen, "You are now the alien queen!") + to_chat(new_queen, "Your job is to assist the hive in assaulting the human outpost!") + to_chat(new_queen, "You should start by planting weeds and growing an ovipositor, your children will appear around round time 0:20. You will be able to leave your cave after the round time reaches 1:00.") + to_chat(new_queen, "Talk in Hivemind using ; (e.g. ';Hello my children!')") + else + to_chat(new_queen, "You are now the alien queen!") + to_chat(new_queen, "Your job is to spread the hive.") + to_chat(new_queen, "You should start by building a hive core.") + to_chat(new_queen, "Talk in Hivemind using ; (e.g. ';Hello my children!')") AddTimelock(/datum/job/antag/xenos/queen, list( JOB_XENO_ROLES = 10 HOURS, diff --git a/code/game/jobs/job/antag/xeno/xenomorph.dm b/code/game/jobs/job/antag/xeno/xenomorph.dm index 1765d01e3c85..047a8d13b22a 100644 --- a/code/game/jobs/job/antag/xeno/xenomorph.dm +++ b/code/game/jobs/job/antag/xeno/xenomorph.dm @@ -62,7 +62,7 @@ var/list/turf/neighbor_turfs = list(get_step(wall_in_range, SOUTH), get_step(wall_in_range, EAST), get_step(wall_in_range, WEST)) for(var/turf/open/ground_in_range in neighbor_turfs) var/area/in_range_area = get_area(ground_in_range) - if(in_range_area.flags_area & AREA_NOTUNNEL) + if(in_range_area.flags_area & AREA_NOBURROW) continue var/finish_proc = TRUE for(var/obj/found_object in ground_in_range) @@ -77,7 +77,7 @@ bad_entries |= wall_in_range //no viable turfs found for this wall; we remove it new_entries -= bad_entries list_to_search = new_entries - if(count > 20) // we dont got all day, we got a game to play baby! + if(count > 20) // we don't got all day, we got a game to play baby! start_nest = new /obj/structure/bed/nest(human_to_transform.loc) start_nest.dir = NORTH break diff --git a/code/game/jobs/job/civilians/other/corp_sec.dm b/code/game/jobs/job/civilians/other/corp_sec.dm new file mode 100644 index 000000000000..a856397c2448 --- /dev/null +++ b/code/game/jobs/job/civilians/other/corp_sec.dm @@ -0,0 +1,19 @@ +/datum/job/civilian/corp_sec + title = JOB_CORPORATE_BODYGUARD + total_positions = 1 + spawn_positions = 1 + supervisors = "the Wey-Yu corporate liaison" + selection_class = "job_cl" + flags_startup_parameters = ROLE_ADD_TO_DEFAULT + gear_preset = /datum/equipment_preset/uscm_ship/corp_sec + entry_message_body = "As a corporate security officer from Weyland-Yutani, your job requires you to stay in character at all times. While in the AO (Area of Operation), you are subject to orders given by military personnel. On ship, you are subject to orders only by the Command and Security departments, after the onboard Corporate Liaison. You are not required to follow any orders from the ship's crew but you can be arrested if you do not. Your primary job is to protect the Weyland-Yutani office, and its liaison." + +/obj/effect/landmark/start/corp_sec + name = JOB_CORPORATE_BODYGUARD + icon_state = "cs_spawn" + job = /datum/job/civilian/corp_sec + +AddTimelock(/datum/job/civilian/corp_sec, list( + JOB_CORPORATE_ROLES = 25 HOURS, + JOB_POLICE_ROLES = 5 HOURS, +)) diff --git a/code/game/jobs/job/civilians/other/liaison.dm b/code/game/jobs/job/civilians/other/liaison.dm index 26799242cfd2..b3bc83ee0b1a 100644 --- a/code/game/jobs/job/civilians/other/liaison.dm +++ b/code/game/jobs/job/civilians/other/liaison.dm @@ -6,7 +6,7 @@ selection_class = "job_cl" flags_startup_parameters = ROLE_ADD_TO_DEFAULT gear_preset = /datum/equipment_preset/uscm_ship/liaison - entry_message_body = "As a representative of Weyland-Yutani Corporation from the Corporate Relations Department, your job requires you to stay in character at all times. While in the AO (Area of Operation), you are subject to orders given by military personnel. On ship, you are subject to orders only by the Command and Security departments. You are not required to follow any orders but you can be arrested if you do not. Your primary job is to observe and report back your findings to Weyland-Yutani. Follow regular game rules unless told otherwise by your superiors. Use your office fax machine to communicate with corporate headquarters or to acquire new directives. You may not receive anything back, and this is normal." + entry_message_body = "As a representative of Weyland-Yutani Corporation from the Corporate Relations Department, your job requires you to stay in character at all times. While in the AO (Area of Operation), you are subject to orders given by military personnel. On ship, you are subject to orders only by the Command and Security departments. You are not required to follow any orders but you can be arrested if you do not. Your primary job is to observe and report back your findings to Weyland-Yutani. Follow regular game rules unless told otherwise by your superiors. Use your office fax machine to communicate with corporate headquarters or to acquire new directives. You may not receive anything back, and this is normal. While the Research department are Weyland-Yutani staff, you do not hold authority over them." var/mob/living/carbon/human/active_liaison /datum/job/civilian/liaison/generate_entry_conditions(mob/living/liaison, whitelist_status) diff --git a/code/game/jobs/job/civilians/other/mess_seargent.dm b/code/game/jobs/job/civilians/other/mess_seargent.dm index fb4f5ee14d7c..f982ced4f21a 100644 --- a/code/game/jobs/job/civilians/other/mess_seargent.dm +++ b/code/game/jobs/job/civilians/other/mess_seargent.dm @@ -1,31 +1,14 @@ /datum/job/civilian/chef title = JOB_MESS_SERGEANT total_positions = 2 - spawn_positions = 1 + spawn_positions = 2 allow_additional = TRUE - scaled = TRUE selection_class = "job_ot" flags_startup_parameters = ROLE_ADD_TO_DEFAULT supervisors = "the auxiliary support officer" gear_preset = /datum/equipment_preset/uscm_ship/chef entry_message_body = "Your job is to service the marines with excellent food, drinks and entertaining the shipside crew when needed. You have a lot of freedom and it is up to you, to decide what to do with it. Good luck!" -/datum/job/civilian/chef/set_spawn_positions(count) - spawn_positions = mess_sergeant_slot_formula(count) - -/datum/job/civilian/chef/get_total_positions(latejoin = FALSE) - var/positions = spawn_positions - if(latejoin) - positions = mess_sergeant_slot_formula(get_total_marines()) - if(positions <= total_positions_so_far) - positions = total_positions_so_far - else - total_positions_so_far = positions - else - total_positions_so_far = positions - - return positions - /obj/effect/landmark/start/chef name = JOB_MESS_SERGEANT icon_state = "chef_spawn" diff --git a/code/game/jobs/job/civilians/other/survivors.dm b/code/game/jobs/job/civilians/other/survivors.dm index 889d730d359f..74a8b6f92935 100644 --- a/code/game/jobs/job/civilians/other/survivors.dm +++ b/code/game/jobs/job/civilians/other/survivors.dm @@ -76,7 +76,7 @@ GLOBAL_LIST_EMPTY(spawned_survivors) if(picked_spawner.roundstart_damage_max > 0) if(istype(picked_spawner) && picked_spawner.roundstart_damage_max > 0) for(var/i in 0 to picked_spawner.roundstart_damage_times) - H.take_limb_damage(rand(picked_spawner.roundstart_damage_min, picked_spawner.roundstart_damage_max), 0) + H.take_limb_damage(rand(picked_spawner.roundstart_damage_min, picked_spawner.roundstart_damage_max), 0) H.name = H.get_visible_name() @@ -99,7 +99,7 @@ GLOBAL_LIST_EMPTY(spawned_survivors) to_chat(survivor, "
You are a survivor!
") to_chat(survivor, SPAN_NOTICE(SSmapping.configs[GROUND_MAP].survivor_message)) to_chat(survivor, SPAN_NOTICE("You are fully aware of the xenomorph threat and are able to use this knowledge as you see fit.")) - to_chat(survivor, SPAN_NOTICE("You are NOT aware of the marines or their intentions. ")) + to_chat(survivor, SPAN_NOTICE("You are NOT aware of the marines or their intentions.")) if(story_text) to_chat(survivor, story_text) @@ -145,7 +145,7 @@ GLOBAL_LIST_EMPTY(spawned_survivors) ) */ - var/random_name = pick(random_name(FEMALE), random_name(MALE)) + var/random_name = random_name(pick(FEMALE, MALE)) var/temp_story = "Your story thus far: " + replacetext(pick(survivor_story), "{name}", "[random_name]") to_chat(H, temp_story) H.mind.memory += temp_story @@ -222,7 +222,7 @@ AddTimelock(/datum/job/civilian/survivor, list( if(picked_spawner.CO_equipment) //insert with CO arm_equipment(equipping_human, picked_spawner.CO_equipment, FALSE, TRUE) return - else if(length(CO_survivor_types)) //map with guarenteed CO slot + else if(length(CO_survivor_types)) //map with guaranteed CO slot arm_equipment(equipping_human, pick(CO_survivor_types), FALSE, TRUE) return else //map that has an insert that enabled rolling for CO but the insert didn't fire and there is no default CO equipment, thus equip as a normal survivor diff --git a/code/game/jobs/job/civilians/support/cmo.dm b/code/game/jobs/job/civilians/support/cmo.dm index 0917621094a7..dc07946fa074 100644 --- a/code/game/jobs/job/civilians/support/cmo.dm +++ b/code/game/jobs/job/civilians/support/cmo.dm @@ -7,7 +7,7 @@ selection_class = "job_cmo" flags_startup_parameters = ROLE_ADD_TO_DEFAULT gear_preset = /datum/equipment_preset/uscm_ship/uscm_medical/cmo - entry_message_body = "You're a commissioned officer of the USCM. You have authority over everything related to Medbay and Research, only able to be overridden by the XO and CO. You are in charge of medical staff, surgery, chemistry, stimulants and keeping the marines healthy overall." + entry_message_body = "You're a commissioned officer of the USCM. You have authority and knowledge over everything related to Medbay and Research. All personnel within the medical and research bay must answer to you, while you only answer to the XO and CO. You are in charge of medical staff, surgery, chemistry, stimulants and keeping the marines healthy overall by ensuring all departments are running smoothly. You are also responsible for filling the role of a doctor, surgeon, pharmacist, or researcher if their respective departments are understaffed." var/mob/living/carbon/human/active_cmo /datum/job/civilian/professor/generate_entry_conditions(mob/living/cmo, whitelist_status) diff --git a/code/game/jobs/job/civilians/support/doctor.dm b/code/game/jobs/job/civilians/support/doctor.dm index 926b9214657d..548c9133d706 100644 --- a/code/game/jobs/job/civilians/support/doctor.dm +++ b/code/game/jobs/job/civilians/support/doctor.dm @@ -1,7 +1,8 @@ -//job options for doctors surgeon pharmacy technician(preparation of medecine and distribution) +//Job options for doctors based on their specialty. They can all manufacture chemicals, administer medication, and operate on patients, but the variants have specialities that they prioritize in. -#define DOCTOR_VARIANT "Doctor" -#define SURGEON_VARIANT "Surgeon" +#define DOCTOR_VARIANT "Doctor" // "I do not have a specialty; I go where I am needed most." +#define PHARMACIST_VARIANT "Pharmaceutical Physician" // "I specialize in chemistry and medicine." +#define SURGEON_VARIANT "Surgeon" // "I specialize in surgery and triage." // Doctor /datum/job/civilian/doctor @@ -16,25 +17,30 @@ gear_preset = /datum/equipment_preset/uscm_ship/uscm_medical/doctor // job option - job_options = list(DOCTOR_VARIANT = "Doc", SURGEON_VARIANT = "Sur") - /// If this job is a doctor variant of the doctor role - var/doctor = TRUE + job_options = list(DOCTOR_VARIANT = "Doc", PHARMACIST_VARIANT = "Phm", SURGEON_VARIANT = "Sur") + /// The doctor variant of the doctor role that was selected in handle_job_options + var/doctor_variant //check the job option. and change the gear preset /datum/job/civilian/doctor/handle_job_options(option) - if(option != SURGEON_VARIANT) - doctor = TRUE - gear_preset = /datum/equipment_preset/uscm_ship/uscm_medical/doctor - else - doctor = FALSE - gear_preset = /datum/equipment_preset/uscm_ship/uscm_medical/doctor/surgeon + doctor_variant = option + switch(option) + if(SURGEON_VARIANT) + gear_preset = /datum/equipment_preset/uscm_ship/uscm_medical/doctor/surgeon + if(PHARMACIST_VARIANT) + gear_preset = /datum/equipment_preset/uscm_ship/uscm_medical/doctor/pharmacist + else + gear_preset = /datum/equipment_preset/uscm_ship/uscm_medical/doctor //check what job option you took and generate the corresponding the good texte. -/datum/job/civilian/doctor/generate_entry_message(mob/living/carbon/human/H) - if(doctor) - . = {"You're a commissioned officer of the USCM. You are a doctor and tasked with keeping the marines healthy and strong, usually in the form of surgery. You are a jack of all trades in medicine: you can medicate, perform surgery and produce pharmaceuticals. If you do not know what you are doing, mentorhelp so a mentor can assist you."} - else - . = {"You're a commissioned officer of the USCM. You are a surgeon and tasked with keeping the marines healthy and strong, usually in the form of surgery. You are a doctor that specializes in surgery, but you are also very capable in pharmacy and triage. If you do not know what you are doing, mentorhelp so a mentor can assist you."} +/datum/job/civilian/doctor/generate_entry_message(mob/living/carbon/human/target) + switch(doctor_variant) + if(SURGEON_VARIANT) + . = {"You're a commissioned officer of the USCM. You are a doctor with a special interest in surgery. Your primary job is keeping marines healthy and strong by fixing broken bones, blood vessels, and organs and performing foreign object extractions based on case severity. You are also very capable in medicine and pharmacology; if the pharmacy and triage bays are understaffed, and you have nobody left to operate on, it is also your job to develop chemicals and medicate patients. If you do not know what you are doing, mentorhelp so a mentor can assist you."} + if(PHARMACIST_VARIANT) + . = {"You're a commissioned officer of the USCM. You are a doctor with a special interest in chemistry and medicine. Your primary job is providing the medical bay and marines with medicine and chemicals, and your secondary job is administering these medications to patients based on case severity. You are also very capable in surgery; if there are not enough doctors to operate on patients after you have met your quota, you must head to the surgery bay. If you do not know what you are doing, mentorhelp so a mentor can assist you."} + else + . = {"You're a commissioned officer of the USCM. You are a doctor. You are not specialized in any department, but you are nonetheless a jack of all trades with extensive knowledge in pharmacology, medicine, triage, and surgery. Your primary job is to assess and treat patients with medicine based on case severity, but you are also responsible for manufacturing chemicals and operating on patients if the pharmacy and surgery bays are understaffed. If you do not know what you are doing, mentorhelp so a mentor can assist you."} /datum/job/civilian/doctor/set_spawn_positions(count) spawn_positions = doc_slot_formula(count) @@ -55,6 +61,17 @@ AddTimelock(/datum/job/civilian/doctor, list( JOB_MEDIC_ROLES = 1 HOURS )) +/datum/job/civilian/doctor/generate_entry_conditions(mob/living/M, whitelist_status) + . = ..() + if(!islist(GLOB.marine_officers[JOB_DOCTOR])) + GLOB.marine_officers[JOB_DOCTOR] = list() + GLOB.marine_officers[JOB_DOCTOR] += M + RegisterSignal(M, COMSIG_PARENT_QDELETING, PROC_REF(cleanup_leader_candidate)) + +/datum/job/civilian/doctor/proc/cleanup_leader_candidate(mob/M) + SIGNAL_HANDLER + GLOB.marine_officers[JOB_DOCTOR] -= M + /obj/effect/landmark/start/doctor name = JOB_DOCTOR icon_state = "doc_spawn" diff --git a/code/game/jobs/job/civilians/support/field_doctor.dm b/code/game/jobs/job/civilians/support/field_doctor.dm index 9c715bb31884..072729e1f4b3 100644 --- a/code/game/jobs/job/civilians/support/field_doctor.dm +++ b/code/game/jobs/job/civilians/support/field_doctor.dm @@ -9,7 +9,20 @@ selection_class = "job_doctor" flags_startup_parameters = ROLE_ADD_TO_DEFAULT gear_preset = /datum/equipment_preset/uscm_ship/uscm_medical/field_doctor - entry_message_body = "You are a Field Doctor tasked with keeping the marines healthy and strong in the field, usually in the form of surgery. You must stay onboard the Almayer medical bay if there are no other doctors present and until the FOB is secured. Your superiors may also delay your deployment to the field." + entry_message_body = "You're a commissioned officer of the USCM. You are a doctor specialized in field medicine and surgery. Your primary job is to deploy with your fellow marines, medicate, and operate on the wounded within the safety of your FOB tent. You must stay onboard the Almayer until your superior says it is safe to deploy, after the FOB is secured, and there is least one other doctor on the ship. You are still a doctor, so if you are waiting for deployment, it is your responsibility to assist other doctors in surgery and chembay prep." + var/mob/living/carbon/human/active_field_doctor + +/datum/job/civilian/field_doctor/generate_entry_conditions(mob/living/field_doctor, whitelist_status) + . = ..() + active_field_doctor = field_doctor + RegisterSignal(field_doctor, COMSIG_PARENT_QDELETING, PROC_REF(cleanup_active_field_doctor)) + +/datum/job/civilian/field_doctor/proc/cleanup_active_field_doctor(mob/field_doctor) + SIGNAL_HANDLER + active_field_doctor = null + +/datum/job/civilian/field_doctor/get_active_player_on_job() + return active_field_doctor AddTimelock(/datum/job/civilian/field_doctor, list( JOB_DOCTOR_ROLES = 5 HOURS diff --git a/code/game/jobs/job/civilians/support/researcher.dm b/code/game/jobs/job/civilians/support/researcher.dm index 52862f4aead9..bf524e4ff4db 100644 --- a/code/game/jobs/job/civilians/support/researcher.dm +++ b/code/game/jobs/job/civilians/support/researcher.dm @@ -6,11 +6,11 @@ spawn_positions = 2 allow_additional = 1 scaled = 1 - supervisors = "chief medical officer" + supervisors = "the chief medical officer and the Wey-Yu corporate office" selection_class = "job_researcher" flags_startup_parameters = ROLE_ADD_TO_DEFAULT gear_preset = /datum/equipment_preset/uscm_ship/uscm_medical/researcher - entry_message_body = "You're a commissioned officer of the USCM. You are tasked with researching and developing new medical treatments, helping your fellow doctors, and generally learning new things. Your role involves a lot of roleplaying, but you can perform the function of a regular doctor. Do not hand out things to Marines without getting permission from your supervisor." + entry_message_body = "You're a medical researcher on loan to the USCM from Weyland-Yutani. You are tasked with researching and developing new medical treatments, helping the USCM medical team, and generally learning new things. Your role involves a lot of roleplaying, but you can perform the function of a regular doctor. Do not hand out things to Marines without getting permission from your supervisor. You do not answer to the Corporate Liaison." /datum/job/civilian/researcher/set_spawn_positions(count) spawn_positions = rsc_slot_formula(count) diff --git a/code/game/jobs/job/civilians/support/synthetic.dm b/code/game/jobs/job/civilians/support/synthetic.dm index 12f8f10f07bd..24cadbc39010 100644 --- a/code/game/jobs/job/civilians/support/synthetic.dm +++ b/code/game/jobs/job/civilians/support/synthetic.dm @@ -12,6 +12,45 @@ loadout_points = 120 entry_message_body = "You are a Synthetic! You are held to a higher standard and are required to obey not only the Server Rules but Marine Law and Synthetic Rules. Failure to do so may result in your White-list Removal. Your primary job is to support and assist all USCM Departments and Personnel on-board. In addition, being a Synthetic gives you knowledge in every field and specialization possible on-board the ship. As a Synthetic you answer to the acting commanding officer. Special circumstances may change this!" +/datum/job/civilian/synthetic/proc/check_specialisation(client/player) + switch(player.prefs.synth_specialisation) + if("Generalised") + gear_preset_whitelist = list( + "[JOB_SYNTH][WHITELIST_NORMAL]" = /datum/equipment_preset/synth/uscm, + "[JOB_SYNTH][WHITELIST_COUNCIL]" = /datum/equipment_preset/synth/uscm/councillor, + "[JOB_SYNTH][WHITELIST_LEADER]" = /datum/equipment_preset/synth/uscm/councillor + ) + if("Engineering") + gear_preset_whitelist = list( + "[JOB_SYNTH][WHITELIST_NORMAL]" = /datum/equipment_preset/synth/uscm/engineering, + "[JOB_SYNTH][WHITELIST_COUNCIL]" = /datum/equipment_preset/synth/uscm/engineering/council, + "[JOB_SYNTH][WHITELIST_LEADER]" = /datum/equipment_preset/synth/uscm/engineering/council + ) + if("Medical") + gear_preset_whitelist = list( + "[JOB_SYNTH][WHITELIST_NORMAL]" = /datum/equipment_preset/synth/uscm/medical, + "[JOB_SYNTH][WHITELIST_COUNCIL]" = /datum/equipment_preset/synth/uscm/medical/council, + "[JOB_SYNTH][WHITELIST_LEADER]" = /datum/equipment_preset/synth/uscm/medical/council + ) + if("Intel") + gear_preset_whitelist = list( + "[JOB_SYNTH][WHITELIST_NORMAL]" = /datum/equipment_preset/synth/uscm/intel, + "[JOB_SYNTH][WHITELIST_COUNCIL]" = /datum/equipment_preset/synth/uscm/intel/council, + "[JOB_SYNTH][WHITELIST_LEADER]" = /datum/equipment_preset/synth/uscm/intel/council + ) + if("Military Police") + gear_preset_whitelist = list( + "[JOB_SYNTH][WHITELIST_NORMAL]" = /datum/equipment_preset/synth/uscm/mp, + "[JOB_SYNTH][WHITELIST_COUNCIL]" = /datum/equipment_preset/synth/uscm/mp/council, + "[JOB_SYNTH][WHITELIST_LEADER]" = /datum/equipment_preset/synth/uscm/mp/council + ) + if("Command") + gear_preset_whitelist = list( + "[JOB_SYNTH][WHITELIST_NORMAL]" = /datum/equipment_preset/synth/uscm/command, + "[JOB_SYNTH][WHITELIST_COUNCIL]" = /datum/equipment_preset/synth/uscm/command/council, + "[JOB_SYNTH][WHITELIST_LEADER]" = /datum/equipment_preset/synth/uscm/command/council + ) + /datum/job/civilian/synthetic/New() . = ..() gear_preset_whitelist = list( @@ -24,7 +63,7 @@ . = ..() if(!.) return - + check_specialisation(player) if(player.check_whitelist_status(WHITELIST_SYNTHETIC_LEADER)) return get_desired_status(player.prefs.synth_status, WHITELIST_LEADER) if(player.check_whitelist_status(WHITELIST_SYNTHETIC_COUNCIL|WHITELIST_SYNTHETIC_COUNCIL_LEGACY)) diff --git a/code/game/jobs/job/civilians/support/working_joe.dm b/code/game/jobs/job/civilians/support/working_joe.dm index 7eafb1af666e..f66ba50f7307 100644 --- a/code/game/jobs/job/civilians/support/working_joe.dm +++ b/code/game/jobs/job/civilians/support/working_joe.dm @@ -48,9 +48,9 @@ /datum/job/civilian/working_joe/generate_entry_message(mob/living/carbon/human/H) if(standard) - . = {"You are a Working Joe. You are held to a higher standard and are required to obey not only the Server Rules but Marine Law, Roleplay Expectations and Synthetic Rules. Your primary task is to maintain the cleanliness of the ship, putting things in their proper place. Alternatively, your primary task may be to assist with manual labor in limited capacity, or clerical duties. Your capacities are limited, but you have all the equipment you need, and the central AI has a plan! Stay in character at all times. Use the APOLLO link to communicate with your uplink!"} + . = {"You are a Working Joe. You are held to a higher standard and are required to obey not only the Server Rules but Marine Law, Roleplay Expectations and Synthetic Rules. Your primary task is to maintain the cleanliness of the ship, putting things in their proper place. Alternatively, your primary task may be to assist with manual labor in limited capacity, or clerical duties. Your capacities are limited, but you have all the equipment you need, and the central AI has a plan! Stay in character at all times. Use the APOLLO link to communicate with your uplink!"} else - . = {"You are a Working Joe for Hazardous Environments! You are held to a higher standard and are required to obey not only the Server Rules but Marine Law, Roleplay Expectations and Synthetic Rules. You are a variant of the Working Joe built for tougher environments and fulfill the specific duty of dangerous repairs or maintenance. Your primary task is to maintain the reactor, SMES and AI Core. Your secondary task is to respond to hazardous environments, such as an atmospheric breach or biohazard spill, and assist with repairs when ordered to by either an AI Mainframe, or a Commisioned Officer. You should not be seen outside of emergencies besides in Engineering and the AI Core! Stay in character at all times. Use the APOLLO link to communicate with your uplink!"} + . = {"You are a Working Joe for Hazardous Environments! You are held to a higher standard and are required to obey not only the Server Rules but Marine Law, Roleplay Expectations and Synthetic Rules. You are a variant of the Working Joe built for tougher environments and fulfill the specific duty of dangerous repairs or maintenance. Your primary task is to maintain the reactor, SMES and AI Core. Your secondary task is to respond to hazardous environments, such as an atmospheric breach or biohazard spill, and assist with repairs when ordered to by either an AI Mainframe, or a Commissioned Officer. You should not be seen outside of emergencies besides in Engineering and the AI Core! Stay in character at all times. Use the APOLLO link to communicate with your uplink!"} /datum/job/civilian/working_joe/announce_entry_message(mob/living/carbon/human/H) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(ares_apollo_talk), "[H.real_name] has been activated."), 1.5 SECONDS) diff --git a/code/game/jobs/job/command/auxiliary/intel.dm b/code/game/jobs/job/command/auxiliary/intel.dm index 9905bc9d3747..ae0d032e7af2 100644 --- a/code/game/jobs/job/command/auxiliary/intel.dm +++ b/code/game/jobs/job/command/auxiliary/intel.dm @@ -23,6 +23,17 @@ total_positions_so_far = positions return positions +/datum/job/command/intel/generate_entry_conditions(mob/living/M, whitelist_status) + . = ..() + if(!islist(GLOB.marine_officers[JOB_INTEL])) + GLOB.marine_officers[JOB_INTEL] = list() + GLOB.marine_officers[JOB_INTEL] += M + RegisterSignal(M, COMSIG_PARENT_QDELETING, PROC_REF(cleanup_leader_candidate)) + +/datum/job/command/intel/proc/cleanup_leader_candidate(mob/M) + SIGNAL_HANDLER + GLOB.marine_officers[JOB_INTEL] -= M + AddTimelock(/datum/job/command/intel, list( JOB_SQUAD_ROLES = 5 HOURS )) diff --git a/code/game/jobs/job/command/cic/captain.dm b/code/game/jobs/job/command/cic/captain.dm index 69169d82a2ee..8eb00c10b682 100644 --- a/code/game/jobs/job/command/cic/captain.dm +++ b/code/game/jobs/job/command/cic/captain.dm @@ -81,10 +81,56 @@ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(all_hands_on_deck), "Attention all hands, [H.get_paygrade(0)] [H.real_name] on deck!"), 1.5 SECONDS) return ..() -/datum/job/command/commander/generate_entry_conditions(mob/living/M, whitelist_status) +/datum/job/command/commander/generate_entry_conditions(mob/living/player, whitelist_status, late_join = FALSE) . = ..() - GLOB.marine_leaders[JOB_CO] = M - RegisterSignal(M, COMSIG_PARENT_QDELETING, PROC_REF(cleanup_leader_candidate)) + GLOB.marine_leaders[JOB_CO] = player + RegisterSignal(player, COMSIG_PARENT_QDELETING, PROC_REF(cleanup_leader_candidate)) + if(!late_join) + addtimer(CALLBACK(src, PROC_REF(handle_entry_fax), player, whitelist_status), 15 SECONDS) + +/// handles the sending of the CO lore faxes upon roundstart +/datum/job/command/commander/proc/handle_entry_fax(mob/living/player, whitelist_status) + var/list/co_briefing_files = SSmapping.configs[GROUND_MAP].co_briefing_files + var/faction_alignment = "Unaligned" + + if(!co_briefing_files) // ground map has no defined briefing faxes + return + + if(!player.client) // our CO has ghosted or DC'd within the 15 seconds + return + + if(player.client.prefs.affiliation) + faction_alignment = player.client.prefs.affiliation + + var/obj/item/paper/captain_brief/co_briefing = new /obj/item/paper/captain_brief + + if(co_briefing_files[faction_alignment]) + co_briefing.info = file2text(co_briefing_files[faction_alignment]) + else + qdel(co_briefing) + return + + var/datum/asset/asset = get_asset_datum(/datum/asset/simple/paper) + co_briefing.info = replacetext(co_briefing.info, "%%USCMLOGO%%", asset.get_url_mappings()["logo_uscm.png"]) + co_briefing.info = replacetext(co_briefing.info, "%%DARKBACKGROUND%%", asset.get_url_mappings()["background_dark2.jpg"]) + + var/obj/structure/machinery/faxmachine/receiver + for(var/target_machine_code as anything in GLOB.fax_network.all_faxcodes) + var/obj/structure/machinery/faxmachine/target_machine = GLOB.fax_network.all_faxcodes[target_machine_code] + if(target_machine.sub_name == "Commanding Officer") + receiver = target_machine + break + if(!receiver) + return + if(receiver.inoperable()) + return + co_briefing.forceMove(receiver.loc) + playsound(receiver.loc, "sound/machines/twobeep.ogg", 45) + receiver.langchat_speech("beeps with a priority message", get_mobs_in_view(GLOB.world_view_size, receiver), GLOB.all_languages, skip_language_check = TRUE, animation_style = LANGCHAT_FAST_POP, additional_styles = list("langchat_small", "emote")) + receiver.visible_message("[SPAN_BOLD(receiver)] beeps with a priority message.") + if(!receiver.radio_alert_tag) + return + ai_silent_announcement("COMMUNICATIONS REPORT: Fax Machine [receiver.machine_id_tag], [receiver.sub_name ? "[receiver.sub_name]" : ""], now receiving priority fax.", "[receiver.radio_alert_tag]") /datum/job/command/commander/proc/cleanup_leader_candidate(mob/M) SIGNAL_HANDLER diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index 9572b3223469..1702af245f55 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -1,30 +1,45 @@ /datum/job //The name of the job - var/title = null //The internal title for the job, used for the job ban system and so forth. Don't change these, change the disp_title instead. - var/disp_title //Determined on new(). Usually the same as the title, but doesn't have to be. Set this to override what the player sees in the game as their title. - var/role_ban_alternative // If the roleban title needs to be an extra check, like Xenomorphs = Alien. - - var/total_positions = 0 //How many players can be this job - var/spawn_positions = 0 //How many players can spawn in as this job - var/total_positions_so_far = 0 //How many slots were open in this round. Used to prevent slots locking with decreasing amount of alive players - var/allow_additional = 0 //Can admins modify positions to it - var/scaled = 0 - var/current_positions = 0 //How many players have this job - var/supervisors = "" //Supervisors, who this person answers to directly. Should be a string, shown to the player when they enter the game. - var/selection_class = "" // Job Selection span class (for background color) + ///The internal title for the job, used for the job ban system and so forth. Don't change these, change the disp_title instead. + var/title = null + ///Determined on new(). Usually the same as the title, but doesn't have to be. Set this to override what the player sees in the game as their title. + var/disp_title + ///If the roleban title needs to be an extra check, like Xenomorphs = Alien. + var/role_ban_alternative + + ///How many players can be this job + var/total_positions = 0 + ///How many players can spawn in as this job + var/spawn_positions = 0 + ///How many slots were open in this round. Used to prevent slots locking with decreasing amount of alive players + var/total_positions_so_far = 0 + /// Can admins modify positions to it + var/allow_additional = 0 + ///If it can be scaled with playercount + var/scaled = 0 + ///How many players have this job + var/current_positions = 0 + ///Supervisors, who this person answers to directly. Should be a string, shown to the player when they enter the game. + var/supervisors = "" + /// Job Selection span class (for background color) + var/selection_class = "" var/late_joinable = TRUE - var/flags_startup_parameters = NO_FLAGS //These flags are used to determine how to load the role, and some other parameters. - var/flags_whitelist = NO_FLAGS //Only used by whitelisted roles. Can be a single whitelist flag, or a combination of them. + ///These flags are used to determine how to load the role, and some other parameters. + var/flags_startup_parameters = NO_FLAGS + ///Only used by whitelisted roles. Can be a single whitelist flag, or a combination of them. + var/flags_whitelist = NO_FLAGS - //If you have use_timelocks config option enabled, this option will add a requirement for players to have the prerequisite roles have at least x minimum playtime before unlocking. + ///If you have use_timelocks config option enabled, this option will add a requirement for players to have the prerequisite roles have at least x minimum playtime before unlocking. var/list/minimum_playtimes var/minimum_playtime_as_job = 3 HOURS - var/datum/equipment_preset/gear_preset //Gear preset name used for this job - var/list/gear_preset_whitelist = list()//Gear preset name used for council snowflakes ;) + ///Gear preset name used for this job + var/datum/equipment_preset/gear_preset + ///Gear preset name used for council snowflakes ;) + var/list/gear_preset_whitelist = list() //For generating entry messages var/entry_message_intro @@ -118,11 +133,20 @@ else return time_required - get_job_playtime(C, roles) +/client/proc/can_skip_role_lock() + if(admin_holder && (admin_holder.rights & (R_NOLOCK | R_ADMIN))) + return TRUE + if(GLOB.community_awards[ckey]) + for(var/award in GLOB.community_awards[ckey]) + if(award == "SDTimeAward") + return TRUE + return FALSE + /datum/job/proc/can_play_role(client/client) if(!CONFIG_GET(flag/use_timelocks)) return TRUE - if(client.admin_holder && (client.admin_holder.rights & (R_NOLOCK | R_ADMIN))) + if(client.can_skip_role_lock()) return TRUE if(get_job_playtime(client, title) > minimum_playtime_as_job) @@ -152,29 +176,29 @@ /datum/job/proc/get_access() if(!gear_preset) return null - if(GLOB.gear_path_presets_list[gear_preset]) - return GLOB.gear_path_presets_list[gear_preset].access + if(GLOB.equipment_presets.gear_path_presets_list[gear_preset]) + return GLOB.equipment_presets.gear_path_presets_list[gear_preset].access return null /datum/job/proc/get_skills() if(!gear_preset) return null - if(GLOB.gear_path_presets_list[gear_preset]) - return GLOB.gear_path_presets_list[gear_preset].skills + if(GLOB.equipment_presets.gear_path_presets_list[gear_preset]) + return GLOB.equipment_presets.gear_path_presets_list[gear_preset].skills return null /datum/job/proc/get_paygrade() if(!gear_preset) return "" - if(GLOB.gear_path_presets_list[gear_preset]) - return GLOB.gear_path_presets_list[gear_preset].paygrades[1] + if(GLOB.equipment_presets.gear_path_presets_list[gear_preset]) + return GLOB.equipment_presets.gear_path_presets_list[gear_preset].paygrades[1] return "" /datum/job/proc/get_comm_title() if(!gear_preset) return "" - if(GLOB.gear_path_presets_list[gear_preset]) - return GLOB.gear_path_presets_list[gear_preset].role_comm_title + if(GLOB.equipment_presets.gear_path_presets_list[gear_preset]) + return GLOB.equipment_presets.gear_path_presets_list[gear_preset].role_comm_title return "" /datum/job/proc/set_spawn_positions(count) diff --git a/code/game/jobs/job/logistics/cargo/cargo_tech.dm b/code/game/jobs/job/logistics/cargo/cargo_tech.dm index c4725289c3ff..e3642cfd7fa9 100644 --- a/code/game/jobs/job/logistics/cargo/cargo_tech.dm +++ b/code/game/jobs/job/logistics/cargo/cargo_tech.dm @@ -10,6 +10,10 @@ gear_preset = /datum/equipment_preset/uscm_ship/cargo entry_message_body = "Your job is to dispense supplies to the marines, including weapon attachments. Stay in your department when possible to ensure the marines have full access to the supplies they may require. Listen to the radio in case someone requests a supply drop via the overwatch system." +AddTimelock(/datum/job/logistics/cargo, list( + JOB_HUMAN_ROLES = 10 HOURS, +)) + /datum/job/logistics/cargo/set_spawn_positions(count) spawn_positions = ct_slot_formula(count) diff --git a/code/game/jobs/job/logistics/cargo/chief_req.dm b/code/game/jobs/job/logistics/cargo/chief_req.dm index 5d5123e687ed..036bf4d1af31 100644 --- a/code/game/jobs/job/logistics/cargo/chief_req.dm +++ b/code/game/jobs/job/logistics/cargo/chief_req.dm @@ -4,6 +4,19 @@ flags_startup_parameters = ROLE_ADD_TO_DEFAULT gear_preset = /datum/equipment_preset/uscm_ship/qm entry_message_body = "Your job is to dispense supplies to the marines, including weapon attachments. Your cargo techs can help you out, but you have final say in your department. Make sure they're not goofing off. While you may request paperwork for supplies, do not go out of your way to screw with marines, unless you want to get deposed. A happy ship is a well-functioning ship." + var/mob/living/carbon/human/active_chief_requisition + +/datum/job/logistics/requisition/generate_entry_conditions(mob/living/chief_requisition, whitelist_status) + . = ..() + active_chief_requisition = chief_requisition + RegisterSignal(chief_requisition, COMSIG_PARENT_QDELETING, PROC_REF(cleanup_active_chief_requisition)) + +/datum/job/logistics/requisition/proc/cleanup_active_chief_requisition(mob/chief_requisition) + SIGNAL_HANDLER + active_chief_requisition = null + +/datum/job/logistics/requisition/get_active_player_on_job() + return active_chief_requisition AddTimelock(/datum/job/logistics/requisition, list( JOB_REQUISITION_ROLES = 10 HOURS, diff --git a/code/game/jobs/job/marine/squad_info.dm b/code/game/jobs/job/marine/squad_info.dm index 9711e46797a2..5563aa347c42 100644 --- a/code/game/jobs/job/marine/squad_info.dm +++ b/code/game/jobs/job/marine/squad_info.dm @@ -15,13 +15,24 @@ update_free_mar() if(squad_leader && squad_info_data["sl"]["name"] != squad_leader.real_name) update_squad_leader() + + var/mob/living/carbon/human/human_user = user // Assumption: Only a human can use this UI + var/turf/current_turf = get_turf(user) + var/is_shipside = is_mainship_level(current_turf?.z) + var/garbled = !is_shipside && !(current_turf?.z in SSradio.last_command_zs) + if(!garbled) // They've now gotten a connection + human_user.squad_primary_objective_ungarbled = TRUE + human_user.squad_secondary_objective_ungarbled = TRUE + var/primary_garbled = garbled && !human_user.squad_primary_objective_ungarbled + var/secondary_garbled = garbled && !human_user.squad_secondary_objective_ungarbled + var/list/data = squad_info_data.Copy() data["squad"] = name data["squad_color"] = equipment_color data["is_lead"] = get_leadership(user) data["objective"] = list( - "primary" = primary_objective, - "secondary" = secondary_objective, + "primary" = primary_garbled ? primary_objective_garbled : primary_objective, + "secondary" = secondary_garbled ? secondary_objective_garbled : secondary_objective, ) return data @@ -57,7 +68,7 @@ var/target_marine = params["target_marine"] var/target_team = params["target_ft"] - if (islead != "sl") + if (islead != "sl" && islead != target_team) return var/mob/living/carbon/human/target = get_marine_from_name(target_marine) @@ -70,13 +81,15 @@ if ("unassign_ft") var/target_marine = params["target_marine"] + var/target_team = params["target_ft"] - if (islead != "sl") + if (islead != "sl" && islead != target_team) return var/mob/living/carbon/human/target = get_marine_from_name(target_marine) if(!target) return + unassign_fireteam(target, TRUE) update_all_squad_info() return @@ -96,6 +109,7 @@ var/target_team = params["target_ft"] if (islead != "sl") + to_chat(usr, SPAN_WARNING("You don't have the permissions to promote a fireteam leader!")) return var/mob/living/carbon/human/target = get_marine_from_name(target_marine) diff --git a/code/game/jobs/job/marine/squads.dm b/code/game/jobs/job/marine/squads.dm index f2d2c5ae2e8e..fd080478d65b 100644 --- a/code/game/jobs/job/marine/squads.dm +++ b/code/game/jobs/job/marine/squads.dm @@ -93,9 +93,14 @@ var/mob/living/carbon/human/overwatch_officer = null //Who's overwatching this squad? COOLDOWN_DECLARE(next_supplydrop) - ///Text strings, not HTML safe so don't use it without encoding + /// The ungarbled primary objective string var/primary_objective = null + /// The ungarbled secondary objective string var/secondary_objective = null + /// The garbled primary objective string + var/primary_objective_garbled = null + /// The garbled secondary objective string + var/secondary_objective_garbled = null var/obj/item/device/squad_beacon/sbeacon = null var/obj/item/device/squad_beacon/bomb/bbeacon = null @@ -248,7 +253,7 @@ chat_color = "#5a2c2c" radio_freq = SOF_FREQ minimap_color = "#5a2c2c" - background_icon = "background_civillian" + background_icon = "background_civilian" active = FALSE roundstart = FALSE @@ -451,42 +456,124 @@ to_chat(targets, html = message, type = MESSAGE_TYPE_RADIO) /// Displays a message to squad members directly on the game map -/datum/squad/proc/send_maptext(text = "", title_text = "", only_leader = 0) +/datum/squad/proc/send_maptext(text="", title_text="", only_leader=FALSE, list/targets_to_garble=null, garbled_text="") var/message_color = chat_color + if(only_leader) - if(squad_leader) - if(!squad_leader.stat && squad_leader.client) - playsound_client(squad_leader.client, 'sound/effects/radiostatic.ogg', squad_leader.loc, 25, FALSE) - squad_leader.play_screen_text("[title_text]" + text, /atom/movable/screen/text/screen_text/command_order, message_color) - else - for(var/mob/living/carbon/human/marine in marines_list) - if(!marine.stat && marine.client) //Only living and connected people in our squad - playsound_client(marine.client, 'sound/effects/radiostatic.ogg', marine.loc, 25, FALSE) - marine.play_screen_text("[title_text]
" + text, /atom/movable/screen/text/screen_text/command_order, message_color) + if(squad_leader && squad_leader.stat == CONSCIOUS && squad_leader.client) + playsound_client(squad_leader.client, 'sound/effects/radiostatic.ogg', squad_leader.loc, 25, FALSE) + if(squad_leader in targets_to_garble) + squad_leader.play_screen_text("[title_text]
[garbled_text]", /atom/movable/screen/text/screen_text/command_order, message_color) + else + squad_leader.play_screen_text("[title_text]
[text]", /atom/movable/screen/text/screen_text/command_order, message_color) + return + + for(var/mob/living/carbon/human/marine in marines_list) + if(marine.stat == CONSCIOUS && marine.client) //Only living and connected people in our squad + playsound_client(marine.client, 'sound/effects/radiostatic.ogg', marine.loc, 25, FALSE) + if(marine in targets_to_garble) + marine.play_screen_text("[title_text]
[garbled_text]", /atom/movable/screen/text/screen_text/command_order, message_color) + else + marine.play_screen_text("[title_text]
[text]", /atom/movable/screen/text/screen_text/command_order, message_color) /// Displays a message to the squad members in chat -/datum/squad/proc/send_message(text = "", plus_name = 0, only_leader = 0) +/datum/squad/proc/send_message(text="", transmitter=null, only_leader=FALSE, list/targets_to_garble=null, garbled_text="") var/nametext = "" - if(plus_name) - nametext = "[usr.name] transmits: " + if(transmitter) + nametext = "[transmitter] transmits: " text = "[FONT_SIZE_LARGE("[text]")]" if(only_leader) - if(squad_leader) - var/mob/living/carbon/human/SL = squad_leader - if(!SL.stat && SL.client) - if(plus_name) - SL << sound('sound/effects/tech_notification.ogg') - to_chat(SL, "[SPAN_BLUE("SL Overwatch: [nametext][text]")]", type = MESSAGE_TYPE_RADIO) - return - else - for(var/mob/living/carbon/human/target_mob in marines_list) - if(!target_mob.stat && target_mob.client) //Only living and connected people in our squad - if(plus_name) - target_mob << sound('sound/effects/tech_notification.ogg') - to_chat(target_mob, "[SPAN_BLUE("Overwatch: [nametext][text]")]", type = MESSAGE_TYPE_RADIO) - + if(squad_leader && squad_leader.stat == CONSCIOUS && squad_leader.client) + if(transmitter) + squad_leader << sound('sound/effects/tech_notification.ogg') + if(squad_leader in targets_to_garble) + to_chat(squad_leader, "[SPAN_BLUE("SL Overwatch: [nametext][garbled_text]")]", type = MESSAGE_TYPE_RADIO) + else + to_chat(squad_leader, "[SPAN_BLUE("SL Overwatch: [nametext][text]")]", type = MESSAGE_TYPE_RADIO) + return + for(var/mob/living/carbon/human/marine in marines_list) + if(marine.stat == CONSCIOUS && marine.client) //Only living and connected people in our squad + if(transmitter) + marine << sound('sound/effects/tech_notification.ogg') + if(marine in targets_to_garble) + to_chat(marine, "[SPAN_BLUE("Overwatch: [nametext][garbled_text]")]", type = MESSAGE_TYPE_RADIO) + else + to_chat(marine, "[SPAN_BLUE("Overwatch: [nametext][text]")]", type = MESSAGE_TYPE_RADIO) + +/// Displays a message to squad members in chat and directly on the game map with potential coms garble for only the text argument +/datum/squad/proc/transmit_alert(prefix="", text="", postfix="", maptext_title="", transmitter=null, only_leader=FALSE) + var/garbled_text = get_garbled_announcement(text, faction) + var/list/targets_to_garble = get_garbled_targets(only_leader) + + send_message("[prefix][text][postfix]", transmitter, only_leader, targets_to_garble, "[prefix][garbled_text][postfix]") + send_maptext(text, maptext_title, only_leader, targets_to_garble, garbled_text) + + var/garbled_count = length(targets_to_garble) + if(garbled_count) + log_garble("[garbled_count] received '[garbled_text]' in squad [src].") + +/// Displays and sets an objective for squad members in chat and directly on the game map with potential coms garble for only the text argument +/datum/squad/proc/transmit_objective(text="", transmitter=null, primary=TRUE) + var/prefix = "Your primary objective has been changed to '" + var/postfix = "'. See Status pane for details." + var/maptext_title = "Primary Objective Updated:" + if(!primary) + prefix = "Your secondary objective has been changed to '" + maptext_title = "Secondary Objective Updated:" + + var/garbled_text = get_garbled_announcement(text, faction) + var/list/targets_to_garble = get_garbled_targets(only_leader=FALSE) + + send_message("[prefix][text][postfix]", transmitter, FALSE, targets_to_garble, "[prefix][garbled_text][postfix]") + send_maptext(text, maptext_title, FALSE, targets_to_garble, garbled_text) + + var/garbled_count = length(targets_to_garble) + if(garbled_count) + log_garble("[garbled_count] received '[garbled_text]' in squad [src].") + + if(primary) + primary_objective = "[text] ([worldtime2text()])" + primary_objective_garbled = "[garbled_text] ([worldtime2text()])" + for(var/mob/living/carbon/human/marine in marines_list) + marine.squad_primary_objective_ungarbled = !(marine in targets_to_garble) + else + secondary_objective = "[text] ([worldtime2text()])" + secondary_objective_garbled = "[garbled_text] ([worldtime2text()])" + for(var/mob/living/carbon/human/marine in marines_list) + marine.squad_secondary_objective_ungarbled = !(marine in targets_to_garble) + +/datum/squad/proc/remind_objective(transmitter=null, primary=TRUE) + var/prefix = "Your primary objective is '" + var/postfix = "'. See Status pane for details." + var/maptext_title = "Primary Objective:" + var/text = primary_objective + var/garbled_text = primary_objective_garbled + if(!primary) + prefix = "Your secondary objective is '" + maptext_title = "Secondary Objective:" + text = secondary_objective + garbled_text = secondary_objective_garbled + + var/list/targets_to_garble = get_garbled_targets(only_leader=FALSE) + + send_message("[prefix][text][postfix]", transmitter, FALSE, targets_to_garble, "[prefix][garbled_text][postfix]") + send_maptext(text, maptext_title, FALSE, targets_to_garble, garbled_text) + +/// Returns a list of squad members that are without coms +/datum/squad/proc/get_garbled_targets(only_leader=FALSE) + var/list/targets = only_leader ? list(squad_leader) : marines_list + var/list/targets_to_garble = list() + var/list/coms_zs = SSradio.get_available_tcomm_zs(COMM_FREQ) + + for(var/mob/current_mob in targets) + var/turf/current_turf = get_turf(current_mob) + var/is_shipside = is_mainship_level(current_turf?.z) + if(!is_shipside && !(current_turf?.z in coms_zs)) + targets_to_garble += current_mob + + return targets_to_garble //Straight-up insert a marine into a squad. //This sets their ID, increments the total count, and so on. Everything else is done in job_controller.dm. @@ -527,6 +614,12 @@ if(JOB_SQUAD_TEAM_LEADER) assignment = JOB_SQUAD_TEAM_LEADER target_mob.important_radio_channels += radio_freq + for(var/lead in 1 to roles_cap[JOB_SQUAD_TEAM_LEADER]) + if(!fireteam_leaders["FT[lead]"]) + assign_fireteam("FT[lead]", target_mob) + assign_ft_leader("FT[lead]", target_mob) + break + if(JOB_SQUAD_SMARTGUN) assignment = JOB_SQUAD_SMARTGUN if(JOB_SQUAD_LEADER) @@ -727,6 +820,10 @@ old_lead.update_inv_wear_suit() to_chat(old_lead, FONT_SIZE_BIG(SPAN_BLUE("You're no longer the [squad_type] Leader for [src]!"))) + var/obj/item/device/radio/headset/earpiece = old_lead.get_type_in_ears(/obj/item/device/radio/headset) + if(earpiece) + earpiece.locate_setting = TRACKER_SL + //Not a safe proc. Returns null if squads or jobs aren't set up. //Mostly used in the marine squad console in marine_consoles.dm. /proc/get_squad_by_name(text) @@ -789,6 +886,11 @@ to_chat(fireteam_leaders[fireteam], FONT_SIZE_BIG(SPAN_BLUE("[H.mind ? H.comm_title : ""] [H] was assigned to your fireteam."))) if(H.stat == CONSCIOUS) to_chat(H, FONT_SIZE_HUGE(SPAN_BLUE("You were assigned to [fireteam]."))) + + var/obj/item/device/radio/headset/earpiece = H.get_type_in_ears(/obj/item/device/radio/headset) + if(earpiece) + earpiece.locate_setting = TRACKER_FTL + H.hud_set_squad() /datum/squad/proc/unassign_fireteam(mob/living/carbon/human/H, upd_ui = TRUE) @@ -803,6 +905,10 @@ to_chat(fireteam_leaders[ft], FONT_SIZE_HUGE(SPAN_BLUE("[H.mind ? H.comm_title : ""] [H] was unassigned from your fireteam."))) if(!H.stat) to_chat(H, FONT_SIZE_HUGE(SPAN_BLUE("You were unassigned from [ft]."))) + + var/obj/item/device/radio/headset/earpiece = H.get_type_in_ears(/obj/item/device/radio/headset) + if(earpiece) + earpiece.locate_setting = TRACKER_SL H.hud_set_squad() /datum/squad/proc/assign_ft_leader(fireteam, mob/living/carbon/human/H, upd_ui = TRUE) @@ -816,6 +922,10 @@ if(H.stat == CONSCIOUS) to_chat(H, FONT_SIZE_HUGE(SPAN_BLUE("You were assigned as [fireteam] Team Leader."))) + var/obj/item/device/radio/headset/earpiece = H.get_type_in_ears(/obj/item/device/radio/headset) + if(earpiece) + earpiece.locate_setting = TRACKER_SL + /datum/squad/proc/unassign_ft_leader(fireteam, clear_group_id, upd_ui = TRUE) if(!fireteam_leaders[fireteam]) return @@ -828,6 +938,11 @@ if(!H.stat) to_chat(H, FONT_SIZE_HUGE(SPAN_BLUE("You were unassigned as [fireteam] Team Leader."))) + var/obj/item/device/radio/headset/earpiece = H.get_type_in_ears(/obj/item/device/radio/headset) + if(earpiece) + earpiece.locate_setting = TRACKER_FTL + +// this proc is defunct too /datum/squad/proc/unassign_all_ft_leaders() for(var/team in fireteam_leaders) if(fireteam_leaders[team]) @@ -914,6 +1029,7 @@ return //Managing MIA and KIA statuses for marines +//this is currently defunct, but theres probably something to salvage here /datum/squad/proc/change_squad_status(mob/living/carbon/human/target_mob) if(target_mob == squad_leader) return //you can't mark yourself KIA diff --git a/code/game/jobs/job/special/uscm.dm b/code/game/jobs/job/special/uscm.dm index 87511cb6af16..4ef5fa456986 100644 --- a/code/game/jobs/job/special/uscm.dm +++ b/code/game/jobs/job/special/uscm.dm @@ -15,5 +15,8 @@ /datum/job/special/uscm/riot/chief title = JOB_RIOT_CHIEF +/datum/job/special/uscm/hgmp + title = JOB_POLICE_HG + /datum/job/special/uscm/tech title = JOB_FORECON_SUPPORT diff --git a/code/game/jobs/job/special/weyland_yutani.dm b/code/game/jobs/job/special/weyland_yutani.dm index f470d0d69393..0742b96fb0a0 100644 --- a/code/game/jobs/job/special/weyland_yutani.dm +++ b/code/game/jobs/job/special/weyland_yutani.dm @@ -94,8 +94,8 @@ gear_preset = /datum/equipment_preset/pmc/pmc_riot_control /datum/job/special/wey_yu/pmc/detainer - title = JOB_PMC_DETAINER - gear_preset = /datum/equipment_preset/pmc/pmc_detainer + title = JOB_PMC_SECURITY + gear_preset = /datum/equipment_preset/pmc/pmc_security /datum/job/special/wey_yu/pmc/crewman title = JOB_PMC_CREWMAN diff --git a/code/game/jobs/role_authority.dm b/code/game/jobs/role_authority.dm index 01ab234afc36..208decb04520 100644 --- a/code/game/jobs/role_authority.dm +++ b/code/game/jobs/role_authority.dm @@ -465,7 +465,7 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou arm_equipment(new_human, new_job.gear_preset_whitelist[job_whitelist], FALSE, TRUE) var/generated_account = new_job.generate_money_account(new_human) new_job.announce_entry_message(new_human, generated_account, whitelist_status) //Tell them their spawn info. - new_job.generate_entry_conditions(new_human, whitelist_status) //Do any other thing that relates to their spawn. + new_job.generate_entry_conditions(new_human, whitelist_status, late_join) //Do any other thing that relates to their spawn. else arm_equipment(new_human, new_job.gear_preset, FALSE, TRUE) //After we move them, we want to equip anything else they should have. var/generated_account = new_job.generate_money_account(new_human) @@ -523,6 +523,10 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou new_human.sec_hud_set_ID() new_human.hud_set_squad() + // comm_title is probably available at this point. + var/datum/highlight_keywords_payload/payload = new(new_mob) + new_mob.client.tgui_panel.window.send_message("settings/updateHighlightKeywords", payload.to_list()) + SEND_SIGNAL(new_human, COMSIG_POST_SPAWN_UPDATE) SSround_recording.recorder.track_player(new_human) @@ -646,6 +650,8 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou M = /mob/living/carbon/xenomorph/hellhound if(XENO_CASTE_KING) M = /mob/living/carbon/xenomorph/king + if(XENO_CASTE_DESPOILER) + M = /mob/living/carbon/xenomorph/despoiler return M @@ -687,6 +693,7 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou break transfer_marine.hud_set_squad() + SEND_SIGNAL(transfer_marine, COMSIG_HUMAN_SQUAD_CHANGED) // returns TRUE if transfer_marine's role is at max capacity in the new squad /datum/authority/branch/role/proc/check_squad_capacity(mob/living/carbon/human/transfer_marine, datum/squad/new_squad) diff --git a/code/game/jobs/slot_scaling.dm b/code/game/jobs/slot_scaling.dm index 8c8568130763..d5a3e2679213 100644 --- a/code/game/jobs/slot_scaling.dm +++ b/code/game/jobs/slot_scaling.dm @@ -50,6 +50,3 @@ /proc/working_joe_slot_formula(playercount) return job_slot_formula(playercount,30,1,3,6) - -/proc/mess_sergeant_slot_formula(playercount) - return job_slot_formula(playercount, 70, 1, 1, 2) diff --git a/code/game/machinery/ARES/ARES_interface_admin.dm b/code/game/machinery/ARES/ARES_interface_admin.dm index 5818926d0be7..3066491a2ad4 100644 --- a/code/game/machinery/ARES/ARES_interface_admin.dm +++ b/code/game/machinery/ARES/ARES_interface_admin.dm @@ -37,7 +37,7 @@ /datum/ares_link/tgui_interact(mob/user, datum/tgui/ui) if(!interface || !admin_interface) - to_chat(user, SPAN_WARNING("ARES ADMIN DATA LINK FAILED")) + to_chat(user, SPAN_WARNING("ARES ADMIN DATA LINK FAILED.")) return FALSE ui = SStgui.try_update_ui(user, GLOB.ares_link, ui) if(!ui) @@ -46,7 +46,7 @@ /datum/ares_link/ui_data(mob/user) if(!interface) - to_chat(user, SPAN_WARNING("ARES ADMIN DATA LINK FAILED")) + to_chat(user, SPAN_WARNING("ARES ADMIN DATA LINK FAILED.")) return FALSE var/list/data = datacore.get_interface_data() diff --git a/code/game/machinery/ARES/ARES_procs.dm b/code/game/machinery/ARES/ARES_procs.dm index 6730721c8424..4dd49b35824b 100644 --- a/code/game/machinery/ARES/ARES_procs.dm +++ b/code/game/machinery/ARES/ARES_procs.dm @@ -43,7 +43,7 @@ GLOBAL_LIST_INIT(maintenance_categories, list( ///Sentry faction stuff var/faction_label = "USCM Only" var/list/faction_group = FACTION_LIST_ARES_MARINE - var/list/faction_options = list("USCM Only" = FACTION_LIST_ARES_MARINE, "Wey-Yu Only" = FACTION_WY, "USCM & Wey-Yu" = FACTION_LIST_ARES_ALL, "ARES Only" = FACTION_LIST_ARES_ALONE) + var/list/faction_options = list("USCM Only" = FACTION_LIST_ARES_MARINE, "Wey-Yu Only" = FACTION_LIST_ARES_WY, "USCM & Wey-Yu" = FACTION_LIST_ARES_ALL, "ARES Only" = FACTION_LIST_ARES_ALONE) var/list/core_sentries = list() /datum/ares_link/New() diff --git a/code/game/machinery/ARES/apollo_pda.dm b/code/game/machinery/ARES/apollo_pda.dm index d2fa678ad48d..901d4217a33c 100644 --- a/code/game/machinery/ARES/apollo_pda.dm +++ b/code/game/machinery/ARES/apollo_pda.dm @@ -1,6 +1,6 @@ /obj/item/device/working_joe_pda name = "KN5500 PDA" - desc = "A portable interface used by Working-Joes, capable of connecting to the local command AI to relay tasking information. Built to withstand a nuclear bomb." + desc = "A Karnak Electronics portable interface used by Working-Joes, capable of connecting to the local command AI to relay tasking information. Built to withstand a nuclear bomb." icon_state = "karnak_off" item_state = "wj_pda" icon = 'icons/obj/items/synth/wj_pda.dmi' @@ -43,6 +43,7 @@ /obj/item/device/working_joe_pda/Initialize(mapload, ...) link_systems(override = FALSE) . = ..() + AddElement(/datum/element/corp_label/karnak) /obj/item/device/working_joe_pda/proc/notify() if(notify_sounds) @@ -432,6 +433,6 @@ /obj/item/device/working_joe_pda/uscm name = "KN5500/2 PDA" - desc = "A portable interface used by AI technicians, capable of connecting to the local command AI to relay tasking information. Built to withstand a nuclear bomb." + desc = "A Karnak Electronics portable interface used by AI technicians, capable of connecting to the local command AI to relay tasking information. Built to withstand a nuclear bomb." icon_state = "karnak_uscm_off" base_icon_state = "karnak_uscm" diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm index f1c87598f400..755ec6242e74 100644 --- a/code/game/machinery/OpTable.dm +++ b/code/game/machinery/OpTable.dm @@ -271,7 +271,7 @@ if(!C.stasis_mob) return M = C.stasis_mob - C.open() + C.open(user) user.stop_pulling() user.start_pulling(M) else @@ -281,11 +281,11 @@ /obj/structure/machinery/optable/proc/check_table(mob/living/carbon/patient) if(buckled_mob) - to_chat(patient, SPAN_NOTICE(" The table is already occupied!")) + to_chat(patient, SPAN_NOTICE("The table is already occupied!")) return FALSE if(patient.buckled) - to_chat(patient, SPAN_NOTICE(" Unbuckle first!")) + to_chat(patient, SPAN_NOTICE("Unbuckle first!")) return FALSE return TRUE diff --git a/code/game/machinery/aicore_lockdown.dm b/code/game/machinery/aicore_lockdown.dm index 8120e98977dc..d54b32e19325 100644 --- a/code/game/machinery/aicore_lockdown.dm +++ b/code/game/machinery/aicore_lockdown.dm @@ -13,6 +13,9 @@ /obj/structure/machinery/aicore_lockdown/attack_alien(mob/user as mob) return FALSE +/obj/structure/machinery/aicore_lockdown/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + return TAILSTAB_COOLDOWN_NONE + /obj/structure/machinery/aicore_lockdown/attackby(obj/item/attacking_item, mob/user) return attack_hand(user) @@ -20,7 +23,7 @@ if(isxeno(user)) return FALSE if(!allowed(user)) - to_chat(user, SPAN_DANGER("Access Denied")) + to_chat(user, SPAN_DANGER("Access Denied.")) flick(initial(icon_state) + "-denied", src) return FALSE diff --git a/code/game/machinery/air_alarm.dm b/code/game/machinery/air_alarm.dm index 67b9df077c93..9189936be0ff 100644 --- a/code/game/machinery/air_alarm.dm +++ b/code/game/machinery/air_alarm.dm @@ -28,6 +28,14 @@ #define AALARM_WIRE_AI_CONTROL 4 #define AALARM_WIRE_AALARM 5 +GLOBAL_LIST_INIT(aalarm_wire_descriptions, flatten_numeric_alist(alist( + AALARM_WIRE_IDSCAN = "ID scanner", + AALARM_WIRE_POWER = "Main power", + AALARM_WIRE_SYPHON = "Siphon", + AALARM_WIRE_AI_CONTROL = "AI Control", + AALARM_WIRE_AALARM = "Air Alarm", + ))) + #define AALARM_MODE_SCRUBBING 1 #define AALARM_MODE_REPLACEMENT 2 //like scrubbing, but faster. #define AALARM_MODE_PANIC 3 //constantly sucks all air @@ -35,6 +43,15 @@ #define AALARM_MODE_FILL 5 //emergency fill #define AALARM_MODE_OFF 6 //Shuts it all down. +GLOBAL_LIST_INIT(aalarm_mode_descriptions, flatten_numeric_alist(alist( + AALARM_MODE_SCRUBBING = "Filtering - Scrubs out contaminants", + AALARM_MODE_REPLACEMENT = SET_CLASS("Replace Air - Siphons out air while replacing", INTERFACE_BLUE), + AALARM_MODE_PANIC = SET_CLASS("Panic - Siphons air out of the room", INTERFACE_RED), + AALARM_MODE_CYCLE = SET_CLASS("Cycle - Siphons air before replacing", INTERFACE_RED), + AALARM_MODE_FILL = SET_CLASS("Fill - Shuts off scrubbers and opens vents", INTERFACE_GREEN), + AALARM_MODE_OFF = SET_CLASS("Off - Shuts off vents and scrubbers", INTERFACE_BLUE), + ))) + #define AALARM_SCREEN_MAIN 1 #define AALARM_SCREEN_VENT 2 #define AALARM_SCREEN_SCRUB 3 @@ -591,9 +608,9 @@ Pressure: [environment_pressure]kP output += "Area Status: " if(alarm_area.atmosalm) - output += SPAN_DL1("Atmos alert in area") + output += SPAN_DL1("Atmos alert in area.") else if (alarm_area.flags_alarm_state & ALARM_WARNING_FIRE) - output += SPAN_DL1("Fire alarm in area") + output += SPAN_DL1("Fire alarm in area.") else output += "No alerts" @@ -726,18 +743,11 @@ Nitrous Oxide if (AALARM_SCREEN_MODE) output += "Main menu
Air machinery mode for the area:
- "
- var/list/modes = list(AALARM_MODE_SCRUBBING = "Filtering - Scrubs out contaminants",\
- AALARM_MODE_REPLACEMENT = SET_CLASS("Replace Air - Siphons out air while replacing", INTERFACE_BLUE),\
- AALARM_MODE_PANIC = SET_CLASS("Panic - Siphons air out of the room", INTERFACE_RED),\
- AALARM_MODE_CYCLE = SET_CLASS("Cycle - Siphons air before replacing", INTERFACE_RED),\
- AALARM_MODE_FILL = SET_CLASS("Fill - Shuts off scrubbers and opens vents", INTERFACE_GREEN),\
- AALARM_MODE_OFF = SET_CLASS("Off - Shuts off vents and scrubbers", INTERFACE_BLUE)
- )
- for (var/m=1,m<=length(modes),m++)
+ for (var/m=1,m<=length(GLOB.aalarm_mode_descriptions),m++)
if (mode==m)
- output += "
- [modes[m]] (selected) " + output += "
- [GLOB.aalarm_mode_descriptions[m]] (selected) " else - output += "
- [modes[m]] " + output += "
- [GLOB.aalarm_mode_descriptions[m]] " output += "
" dat += "
Issue pass
" - user << browse(dat, "window=guestpass;size=400x520") + user << browse(HTML_SKELETON(dat), "window=guestpass;size=400x520") onclose(user, "guestpass") diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 22772cfb2b7a..4d58b8f41db1 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -21,7 +21,7 @@ var/biometric_scan_timer /// the current users access level for the medical record database. see define definitions for access permissions var/access_level = MEDICAL_RECORD_ACCESS_LEVEL_0 - /// the id number of the lastest viewed record. used to manage ui data + /// the id number of the latest viewed record. used to manage ui data var/currently_selected_record_id COOLDOWN_DECLARE(record_printing_cooldown) @@ -75,7 +75,7 @@ if(general_record.fields["id"] != general_record_id) continue if((general_record.fields["name"] != target.real_name) && (general_record.fields["name"] != "New Record")) - balloon_alert_to_viewers("ERROR! Medical record bioscan does not match general record ID.") + balloon_alert_to_viewers("medical record bioscan does not match general record") playsound(src, 'sound/machines/terminal_error.ogg', 15, FALSE) return general_record.fields["name"] = target.real_name @@ -115,7 +115,7 @@ if(!record_id) // for whatever reason, the computer is asking for a record with a null ID - balloon_alert_to_viewers("Critical systems fault! Unable to process request.") + balloon_alert_to_viewers("critical systems fault!") to_chat(user, SPAN_NOTICE("Critical systems fault! Unable to process request.")) playsound(loc, 'sound/machines/terminal_shutdown.ogg', 15, FALSE) return @@ -127,7 +127,7 @@ var/datum/data/record/medical_record = find_record("medical", record_id) if (!general_record) - balloon_alert_to_viewers("Unable to process request. Record not found!") + balloon_alert_to_viewers("record not found!") to_chat(user, SPAN_NOTICE("Unable to process request. Record not found!")) playsound(loc, 'sound/machines/terminal_shutdown.ogg', 15, FALSE) return @@ -142,7 +142,7 @@ biometric_scan_timer = null bio_link_target_record_id = null - balloon_alert_to_viewers("Aborting biometric scan! No user detected in time.") + balloon_alert_to_viewers("aborting biometric scan!") to_chat(user, SPAN_NOTICE("Aborting biometric scan! No user detected in time.")) playsound(loc, 'sound/machines/terminal_shutdown.ogg', 15, FALSE) @@ -154,7 +154,6 @@ ui.open() /obj/structure/machinery/computer/med_data/proc/gather_record_data(mob/user, datum/data/record/general) - if(!general) return @@ -168,12 +167,14 @@ if(target_ref) target = target_ref.resolve() - if(!target) // if the target has been gibbed, or no longer physically exists - return - id = target.get_idcard() - // checks if record target is in the chain of command, and needs their record protected - if(target.job in CHAIN_OF_COMMAND_ROLES) - record_classified = TRUE + if(target) // null if the target has been gibbed, or no longer physically exists + id = target.get_idcard() + // checks if record target is in the chain of command, and needs their record protected + if(target.job in CHAIN_OF_COMMAND_ROLES) + record_classified = TRUE + + if(!record_classified && (general.fields["rank"] in CHAIN_OF_COMMAND_ROLES)) + record_classified = TRUE var/paygrade = id ? id.paygrade : "None" @@ -233,7 +234,7 @@ // checks if the record is being viewed, and requires more data if((id_number == currently_selected_record_id) && currently_selected_record_id) records |= list(gather_record_data(user, general)) - // sends photo data seperately from the records system, for ease of use + // sends photo data separately from the records system, for ease of use var/icon/photo_icon = new /icon('icons/misc/buildmode.dmi', "buildhelp") var/photo_data = icon2html(photo_icon, user.client, sourceonly = TRUE) @@ -436,8 +437,8 @@ var/name = params["name"] if (name && id) - balloon_alert_to_viewers("Place a hand on the biometric reader to create a new medical record.") - to_chat(user, SPAN_WARNING("Place a hand on the biometric reader to create a new medical record.")) + balloon_alert_to_viewers("place a hand on biometric reader to complete new medical record") + to_chat(user, SPAN_WARNING("Place a hand on biometric reader to complete new medical record.")) playsound(src, 'sound/machines/ping.ogg', 15, FALSE) bio_link_target_record_id = id biometric_scan_timer = addtimer(CALLBACK(src, PROC_REF(handle_biometric_scan_timeout), user), 10 SECONDS, TIMER_STOPPABLE) @@ -484,12 +485,12 @@ if ("print_medical_record") var/target_record_id = params["id"] if (!COOLDOWN_FINISHED(src, record_printing_cooldown)) - to_chat(user, SPAN_WARNING("Woah there buddy! Let the printer catch its breath before ordering the next document.")) + to_chat(user, SPAN_WARNING("Woah there buddy! You wouldn't want it to jam would you?")) return COOLDOWN_START(src, record_printing_cooldown, 7 SECONDS) - balloon_alert_to_viewers("Printing record!") + balloon_alert_to_viewers("printing record!") to_chat(user, SPAN_NOTICE("Printing record!")) playsound(loc, 'sound/machines/fax.ogg', 15, TRUE) @@ -516,7 +517,7 @@ "photo_[photo_profile]" = icon2html(image, user.client, sourceonly = TRUE), )) - to_chat(user, SPAN_NOTICE("You successfully updated record [photo_profile] photo")) + to_chat(user, SPAN_NOTICE("You successfully updated record [photo_profile] photo.")) msg_admin_niche("[key_name_admin(user)] updated the record photo of [general_record.fields["name"]] at [get_location_in_text(user)] [ADMIN_JMP(loc)]") return TRUE diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index 9911ceac1720..471096eaea39 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -106,7 +106,7 @@ var/obj/item/implant/I = locate(href_list["warn"]) if((I)&&(I.imp_in)) var/mob/living/carbon/R = I.imp_in - to_chat(R, SPAN_XENOWARNING(" You hear a voice in your head saying: '[warning]'")) + to_chat(R, SPAN_XENOWARNING("You hear a voice in your head saying: '[warning]'")) src.add_fingerprint(usr) src.updateUsrDialog() diff --git a/code/game/machinery/computer/research.dm b/code/game/machinery/computer/research.dm index fa4cbb54a779..e41d7a79b740 100644 --- a/code/game/machinery/computer/research.dm +++ b/code/game/machinery/computer/research.dm @@ -57,31 +57,13 @@ var/obj/item/paper/research_report/CR = P.convert_to_chem_report() GLOB.chemical_data.save_document(CR, response, CR.name) return + //biomass rewards if(istype(B, /obj/item/research_upgrades/reroll)) var/obj/item/research_upgrades/reroll/reroll = B GLOB.chemical_data.reroll_chemicals() visible_message(SPAN_NOTICE("[user] inserts [reroll] in [src], Rerolling contract chemicals.")) qdel(reroll) - //Clearance Card Updating - if(!istype(B, /obj/item/card/id)) - return - var/obj/item/card/id/silver/clearance_badge/card = B - if(!istype(card)) - visible_message(SPAN_NOTICE("[user] swipes their ID card on [src], but it is refused.")) - return - if(!card.check_biometrics(user)) - visible_message(SPAN_WARNING("WARNING: ILLEGAL CLEARANCE USER DETECTED. ABORTING.")) - return - - var/credits_to_add = max(card.credits_to_give - GLOB.chemical_data.credits_gained, 0) - if(credits_to_add) - GLOB.chemical_data.update_credits(credits_to_add) - GLOB.chemical_data.credits_gained += credits_to_add - - visible_message(SPAN_NOTICE("[user] swipes their ID card on [src], granting [credits_to_add] credits.")) - msg_admin_niche("[key_name(user)] has swiped a clearance card to give [credits_to_add] credits to research.") - return /obj/structure/machinery/computer/research/ui_state(mob/user) return GLOB.not_incapacitated_and_adjacent_strict_state diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 716a0ea6b50d..00dd77550315 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -2,7 +2,7 @@ /obj/structure/machinery/computer/secure_data//TODO:SANITY name = "Security Records" - desc = "Used to view and edit personnel's security records" + desc = "Used to view and edit personnel's security records." icon_state = "security" req_access = list(ACCESS_MARINE_BRIG) circuit = /obj/item/circuitboard/computer/secure_data @@ -137,7 +137,7 @@ R.fields["criminal"] = pick("None", "*Arrest*", "Incarcerated", "Released", "Suspect", "NJP") msg_admin_niche("The security record criminal status of [R.fields["name"]] was scrambled!") if(5) - R.fields["p_stat"] = pick("*Unconscious*", "Active", "Physically Unfit") + R.fields["p_stat"] = pick("Inactive", "Active", "Unknown") msg_admin_niche("The security record physical state of [R.fields["name"]] was scrambled!") if(6) R.fields["m_stat"] = pick("*Insane*", "*Unstable*", "*Watch*", "Stable") @@ -326,12 +326,12 @@ if ("new_general_record") CreateGeneralRecord() - to_chat(user, SPAN_NOTICE("You successfully created new general record")) + to_chat(user, SPAN_NOTICE("You successfully created new general record.")) msg_admin_niche("[key_name_admin(user)] created new general record.") if ("delete_general_record") if(!check_player_paygrade(user,list(GLOB.uscm_highcom_paygrades))){ - to_chat(user, SPAN_WARNING("You have no permission to do that")) + to_chat(user, SPAN_WARNING("You have no permission to do that.")) return } @@ -423,7 +423,7 @@ ui.send_update(list( "photo_[photo_profile]" = icon2html(img, user.client, sourceonly=TRUE), )) - to_chat(user, SPAN_NOTICE("You successfully updated record [photo_profile] photo")) + to_chat(user, SPAN_NOTICE("You successfully updated record [photo_profile] photo.")) msg_admin_niche("[key_name_admin(user)] updated record photo of [general_record.fields["name"]].") /obj/structure/machinery/computer/secure_data/proc/validate_field(field, value, mob/user = usr, strict_mode = FALSE) diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm index f26dab3663d7..88e89a8da180 100644 --- a/code/game/machinery/computer/skills.dm +++ b/code/game/machinery/computer/skills.dm @@ -2,7 +2,7 @@ /obj/structure/machinery/computer/skills//TODO:SANITY name = "Employment Records" - desc = "Used to view personnel's employment records" + desc = "Used to view personnel's employment records." icon_state = "medlaptop" req_one_access = list(ACCESS_MARINE_DATABASE) circuit = /obj/item/circuitboard/computer/skills @@ -69,7 +69,6 @@ "} if(!isnull(GLOB.data_core.general)) for(var/datum/data/record/R in sortRecord(GLOB.data_core.general, sortBy, order)) - for(var/datum/data/record/E in GLOB.data_core.security) dat += "
\nPrint Record
\nBack
" if(4.0) if(!length(Perp)) - dat += "ERROR. String could not be located.
Back" + dat += "ERROR. String could not be located.
Back" else dat += {"
"
+ fax_paper_copy.info += "This paper has been stamped by the [FAX_NET_PRESS_HC]." var/msg_ghost = SPAN_NOTICE(faction_ghost_header) - msg_ghost += "Transmitting '[customname]' via secure connection ... " + msg_ghost += "Transmitting '[customname]' via secure connection ..." msg_ghost += "view message" announce_fax( ,msg_ghost) diff --git a/code/modules/admin/topic/topic_chems.dm b/code/modules/admin/topic/topic_chems.dm index 9c911e907c09..3da7a6ee04ea 100644 --- a/code/modules/admin/topic/topic_chems.dm +++ b/code/modules/admin/topic/topic_chems.dm @@ -2,7 +2,7 @@ message_admins("[usr] spawned in a container of [target] with a volume of [volume]u") if(volume > 300) - var/obj/structure/reagent_dispensers/fueltank/custom/C = new(usr.loc, volume, target) + var/obj/structure/reagent_dispensers/tank/fuel/custom/C = new(usr.loc, volume, target) C.reagents.add_reagent(target, volume) if(alert(usr, "Do you want to set the explosive capabilities on your fueltank? (This will disallow transferring to and from the tank)", "", "Yes", "No") == "Yes") diff --git a/code/modules/admin/topic/topic_events.dm b/code/modules/admin/topic/topic_events.dm index 6d2dc21ac8cc..882fe2bd55d5 100644 --- a/code/modules/admin/topic/topic_events.dm +++ b/code/modules/admin/topic/topic_events.dm @@ -142,9 +142,9 @@ for(var/datum/hive_status/permit_hive as anything in permit_hives) //Give or remove the trait from newly-born xenos in this hive. if(grant == "Grant") - LAZYADD(permit_hive.hive_inherant_traits, TRAIT_OPPOSABLE_THUMBS) + LAZYADD(permit_hive.hive_inherited_traits, TRAIT_OPPOSABLE_THUMBS) else - LAZYREMOVE(permit_hive.hive_inherant_traits, TRAIT_OPPOSABLE_THUMBS) + LAZYREMOVE(permit_hive.hive_inherited_traits, TRAIT_OPPOSABLE_THUMBS) if(!length(handled_xenos) && !length(permit_hives)) return @@ -198,9 +198,9 @@ for(var/datum/hive_status/permit_hive as anything in permit_hives) //Give or remove the trait from newly-born xenos in this hive. if(grant == "Grant") - LAZYADD(permit_hive.hive_inherant_traits, TRAIT_CARDPLAYING_THUMBS) + LAZYADD(permit_hive.hive_inherited_traits, TRAIT_CARDPLAYING_THUMBS) else - LAZYREMOVE(permit_hive.hive_inherant_traits, TRAIT_CARDPLAYING_THUMBS) + LAZYREMOVE(permit_hive.hive_inherited_traits, TRAIT_CARDPLAYING_THUMBS) if(!length(handled_xenos) && !length(permit_hives)) return diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm index 2739c44108ad..05d1a86c8028 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm @@ -564,7 +564,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/sdql2_vv_all, new(null if(length(select_text)) var/text = islist(select_text)? select_text.Join() : select_text var/static/result_offset = 0 - showmob << browse(text, "window=SDQL-result-[result_offset++]") + showmob << browse(HTML_SKELETON(text), "window=SDQL-result-[result_offset++]") show_next_to_key = null if(qdel_on_finish) qdel(src) @@ -732,7 +732,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/sdql2_vv_all, new(null if((location == world) && (options & SDQL2_OPTION_OPTIMIZED_SOURCE)) search_location = GLOB.all_multi_vehicles - for(var/obj/item/ammo_magazine/d in search_location) + for(var/obj/vehicle/multitile/d in search_location) if(typecache[d.type] && (d.can_vv_get() || superuser)) out += d SDQL2_TICK_CHECK @@ -743,7 +743,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/sdql2_vv_all, new(null if((location == world) && (options & SDQL2_OPTION_OPTIMIZED_SOURCE)) search_location = GLOB.closet_list - for(var/obj/item/ammo_magazine/d in search_location) + for(var/obj/structure/closet/d in search_location) if(typecache[d.type] && (d.can_vv_get() || superuser)) out += d SDQL2_TICK_CHECK @@ -754,7 +754,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/sdql2_vv_all, new(null if((location == world) && (options & SDQL2_OPTION_OPTIMIZED_SOURCE)) search_location = GLOB.cable_list - for(var/obj/item/ammo_magazine/d in search_location) + for(var/obj/structure/cable/d in search_location) if(typecache[d.type] && (d.can_vv_get() || superuser)) out += d SDQL2_TICK_CHECK @@ -1161,10 +1161,10 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/sdql2_vv_all, new(null return null var/datum/located = locate("\[[expression[start + 1]]]") if(!istype(located)) - to_chat(usr, SPAN_DANGER("Invalid pointer: [expression[start + 1]] - null or not datum"), confidential = TRUE) + to_chat(usr, SPAN_DANGER("Invalid pointer: [expression[start + 1]] - null or not datum."), confidential = TRUE) return null if(!located.can_vv_mark()) - to_chat(usr, SPAN_DANGER("Pointer [expression[start+1]] cannot be marked"), confidential = TRUE) + to_chat(usr, SPAN_DANGER("Pointer [expression[start+1]] cannot be marked."), confidential = TRUE) return null v = located start++ diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index f50caaea6882..ea0891112000 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -292,7 +292,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) /datum/admin_help/proc/send_message_to_external(message, urgent = FALSE) if(urgent) var/extra_message = CONFIG_GET(string/urgent_ahelp_message) - to_chat(initiator, SPAN_BOLDNOTICE("Notified admins to prioritize your ticket")) + to_chat(initiator, SPAN_BOLDNOTICE("Notified admins to prioritize your ticket.")) var/datum/discord_embed/embed = format_embed_discord(message) embed.content = extra_message embed.footer = "This player requested an admin" diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm index 8a86d7282aa9..337c8cf79493 100644 --- a/code/modules/admin/verbs/adminjump.dm +++ b/code/modules/admin/verbs/adminjump.dm @@ -168,7 +168,7 @@ /client/proc/Getmob(mob/M) set name = "Get Mob" - set desc = "Mob to teleport" + set desc = "Mob to teleport." set category = null set hidden = TRUE @@ -183,7 +183,7 @@ /client/proc/Getkey() set name = "Get Ckey" set category = null - set desc = "Key to teleport" + set desc = "Key to teleport." if(!src.admin_holder || !(admin_holder.rights & R_MOD)) to_chat(src, "Only administrators may use this command.") diff --git a/code/modules/admin/verbs/custom_paper.dm b/code/modules/admin/verbs/custom_paper.dm index e8079e0c9dee..0edb37d278d3 100644 --- a/code/modules/admin/verbs/custom_paper.dm +++ b/code/modules/admin/verbs/custom_paper.dm @@ -19,7 +19,7 @@ if(new_sheet) qdel(sheet) return - show_browser(usr, "[new_text]", "Custom paper preview", "custom_paper_preview", width = 650, height = 700) + show_browser(usr, "[new_text]", "Custom paper preview", "custom_paper_preview", width = DEFAULT_PAPER_WIDTH, height = DEFAULT_PAPER_HEIGHT) if(alert(usr, "Make this new content?", "Customising [new_name]", "OK", "Cancel") == "Cancel") close_browser(usr, "custom_paper_preview") if(new_sheet) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 3b2eed6ce00a..605b2c32e4b2 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -60,7 +60,7 @@ var/mob/living/carbon/X = tgui_input_list(src,"Select a xeno.", "Change Hivenumber", GLOB.living_xeno_list) if(!istype(X)) - to_chat(usr, "This can only be done to instances of type /mob/living/carbon") + to_chat(usr, "This can only be done to instances of type /mob/living/carbon.") return cmd_admin_change_their_hivenumber(X) @@ -246,7 +246,7 @@ set name = "Create Bank Account" if(!ishuman(target)) - to_chat(src, SPAN_WARNING("This only works on humans")) + to_chat(src, SPAN_WARNING("This only works on humans.")) return var/mob/living/carbon/human/account_user = target @@ -292,7 +292,7 @@ /client/proc/cmd_assume_direct_control(mob/M in GLOB.mob_list) set name = "Control Mob" - set desc = "Assume control of the mob" + set desc = "Assume control of the mob." set category = null if(!check_rights(R_DEBUG|R_ADMIN)) @@ -320,7 +320,7 @@ /client/proc/cmd_debug_list_processing_items() set category = "Debug.Controllers" set name = "List Processing Items" - set desc = "For scheduler debugging" + set desc = "For scheduler debugging." var/list/individual_counts = list() for(var/datum/disease/M in SSdisease.all_diseases) @@ -352,7 +352,7 @@ /client/proc/allow_browser_inspect() set category = "Debug" set name = "Allow Browser Inspect" - set desc = "Allow browser debugging via inspect" + set desc = "Allow browser debugging via inspect." if(!check_rights(R_DEBUG) || !isclient(src)) return diff --git a/code/modules/admin/verbs/load_event_level.dm b/code/modules/admin/verbs/load_event_level.dm index 28aab2ef783d..d5dea9d37fa3 100644 --- a/code/modules/admin/verbs/load_event_level.dm +++ b/code/modules/admin/verbs/load_event_level.dm @@ -1,7 +1,7 @@ /client/proc/load_event_level() set category = "Admin.Events" set name = "Map Template - New Z" - set desc = "Load a Map Template as a new event Z-Level" + set desc = "Load a Map Template as a new event Z-Level." var/datum/map_template/template var/client/C = usr.client diff --git a/code/modules/admin/verbs/mob_verbs.dm b/code/modules/admin/verbs/mob_verbs.dm index e64adb2ace3e..147b71aaae5c 100644 --- a/code/modules/admin/verbs/mob_verbs.dm +++ b/code/modules/admin/verbs/mob_verbs.dm @@ -163,11 +163,11 @@ var/mob/living/carbon/human/H = M if(!istype(H)) - to_chat(usr, "The person you are trying to contact is not human") + to_chat(usr, "The person you are trying to contact is not human.") return if(!H.get_type_in_ears(/obj/item/device/radio/headset)) - to_chat(usr, "The person you are trying to contact is not wearing a headset") + to_chat(usr, "The person you are trying to contact is not wearing a headset.") return to_chat(H, SPAN_ANNOUNCEMENT_HEADER_BLUE("Message received through headset. [message_option] Transmission \"[msg]\"")) @@ -296,7 +296,7 @@ usr.forceMove(O) usr.real_name = O.name usr.name = O.name - usr.client.eye = O + usr.client.set_eye(O) usr.control_object = O /client/proc/release(obj/O as obj in world) @@ -316,7 +316,7 @@ H.change_real_name(H, usr.name_archive) usr.forceMove(O.loc )// Appear where the object you were controlling is -- TLE - usr.client.eye = usr + usr.client.set_eye(usr) usr.control_object = null /client/proc/cmd_admin_drop_everything(mob/M as mob in GLOB.mob_list) @@ -353,7 +353,7 @@ var/newhive = tgui_input_list(src,"Select a hive.", "Change Hivenumber", hives, theme="hive_status") if(!H) - to_chat(usr, "This mob no longer exists") + to_chat(usr, "This mob no longer exists.") return if(isxeno(H)) @@ -387,7 +387,7 @@ return if(!carbon) - to_chat(usr, "This mob no longer exists") + to_chat(usr, "This mob no longer exists.") return var/old_name = carbon.name diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm index deef7119c926..23d3da7a167d 100644 --- a/code/modules/admin/verbs/playsound.dm +++ b/code/modules/admin/verbs/playsound.dm @@ -92,8 +92,8 @@ music_extra_data["title"] = data["title"] if(!must_send_assets && web_sound_url && !findtext(web_sound_url, GLOB.is_http_protocol)) - to_chat(src, SPAN_BOLDWARNING("BLOCKED: Content URL not using http(s) protocol"), confidential = TRUE) - to_chat(src, SPAN_WARNING("The media provider returned a content URL that isn't using the HTTP or HTTPS protocol"), confidential = TRUE) + to_chat(src, SPAN_BOLDWARNING("BLOCKED: Content URL not using http(s) protocol."), confidential = TRUE) + to_chat(src, SPAN_WARNING("The media provider returned a content URL that isn't using the HTTP or HTTPS protocol."), confidential = TRUE) return diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 9de1ebf381db..d984b72b7af9 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -36,7 +36,7 @@ msg += "[key_name(C, 1, 1, CLIENT_IS_STAFF(src))]: account is [C.player_age] days old
" if(missing_ages) - to_chat(src, "Some accounts did not have proper ages set in their clients. This function requires database to be present") + to_chat(src, "Some accounts did not have proper ages set in their clients. This function requires database to be present.") if(msg != "") show_browser(src, msg, "Check New Players", "Player_age_check") @@ -112,7 +112,7 @@ else usr.invisibility = 70 usr.layer = BELOW_MOB_LAYER - to_chat(usr, SPAN_WARNING("Your ghost is now invisibile to other ghosts.")) + to_chat(usr, SPAN_WARNING("Your ghost is now invisible to other ghosts.")) log_admin("Admin [key_name(src)] has toggled Ordukai Mode.") else to_chat(usr, SPAN_WARNING("You need to be a ghost in order to use this.")) diff --git a/code/modules/admin/verbs/select_equipment.dm b/code/modules/admin/verbs/select_equipment.dm index de61e1ed3087..f4013ed20e47 100644 --- a/code/modules/admin/verbs/select_equipment.dm +++ b/code/modules/admin/verbs/select_equipment.dm @@ -106,7 +106,10 @@ /client/proc/cmd_admin_dress_human(mob/living/carbon/human/M in GLOB.human_mob_list, datum/equipment_preset/dresscode, no_logs = 0, count_participant = FALSE) if (!no_logs) - dresscode = tgui_input_list(usr, "Select dress for [M]", "Robust quick dress shop", GLOB.gear_name_presets_list) + var/category = tgui_input_list(usr, "Which Equipment Category do you wish to use?", "Select Category", GLOB.equipment_presets.categories) + if(!category) + return + dresscode = tgui_input_list(usr, "Select dress for [M]", "Robust quick dress shop", GLOB.equipment_presets.categories[category]) if(isnull(dresscode)) return @@ -138,7 +141,7 @@ set name = "Select Equipment - All Humans" set desc = "Applies an equipment preset to all humans in the world." - var/datum/equipment_preset/dresscode = tgui_input_list(usr, "Select dress for ALL HUMANS", "Robust quick dress shop", GLOB.gear_name_presets_list) + var/datum/equipment_preset/dresscode = tgui_input_list(usr, "Select dress for ALL HUMANS", "Robust quick dress shop", GLOB.equipment_presets.categories["All"]) if (isnull(dresscode)) return @@ -154,18 +157,18 @@ //a rank that matches a job title unless you want the human to bypass the skill system. /proc/arm_equipment(mob/living/carbon/human/M, dresscode, randomise = FALSE, count_participant = FALSE, client/mob_client, show_job_gear = TRUE) if(ispath(dresscode)) - if(!GLOB.gear_path_presets_list) + if(!GLOB.equipment_presets.gear_path_presets_list) CRASH("arm_equipment !gear_path_presets_list") - if(!GLOB.gear_path_presets_list[dresscode]) + if(!GLOB.equipment_presets.gear_path_presets_list[dresscode]) CRASH("arm_equipment !gear_path_presets_list[dresscode]") - GLOB.gear_path_presets_list[dresscode].load_preset(M, randomise, count_participant, mob_client, show_job_gear) + GLOB.equipment_presets.gear_path_presets_list[dresscode].load_preset(M, randomise, count_participant, mob_client, show_job_gear) else - if(!GLOB.gear_name_presets_list) + if(!GLOB.equipment_presets.categories["All"]) CRASH("arm_equipment !gear_path_presets_list") - if(!GLOB.gear_name_presets_list[dresscode]) + if(!GLOB.equipment_presets.categories["All"][dresscode]) CRASH("arm_equipment !gear_path_presets_list[dresscode]") - GLOB.gear_name_presets_list[dresscode].load_preset(M, randomise, count_participant, mob_client, show_job_gear) - + var/datum/equipment_preset/selected_dresscode = GLOB.equipment_presets.categories["All"][dresscode] + selected_dresscode.load_preset(M, randomise, count_participant, mob_client, show_job_gear) if(M.faction) M.check_event_info(M.faction) return diff --git a/code/modules/admin/view_variables/reference_tracking.dm b/code/modules/admin/view_variables/reference_tracking.dm index 8658c9e30602..bbea3ac67919 100644 --- a/code/modules/admin/view_variables/reference_tracking.dm +++ b/code/modules/admin/view_variables/reference_tracking.dm @@ -13,7 +13,7 @@ return #if !defined(UNIT_TESTS) && !defined(SPACEMAN_DMM) // Without this we just get thousands of warnings about sleeps in qdel - if(!skip_alert && tgui_alert(usr,"Running this will lock everything up for about 5 minutes. Would you like to begin the search?", "Find References", list("Yes", "No")) != "Yes") + if(!skip_alert && tgui_alert(usr,"Running this will lock everything up for about 5 minutes. Would you like to begin the search?", "Find References", list("Yes", "No")) != "Yes") running_find_references = null return #endif @@ -43,7 +43,7 @@ DoSearchVar(global_vars, "Native Global", search_time = starting_time) log_reftracker("Finished searching native globals") - for(var/datum/thing in world) //atoms (don't beleive its lies) + for(var/datum/thing in world) //atoms (don't believe its lies) DoSearchVar(thing, "World -> [thing.type]", search_time = starting_time) log_reftracker("Finished searching atoms") @@ -121,7 +121,7 @@ #ifndef FIND_REF_NO_CHECK_TICK CHECK_TICK #endif - //Check normal entrys + //Check normal entries if(element_in_list == src) #ifdef REFERENCE_TRACKING_DEBUG if(SSgarbage.should_save_refs) @@ -139,7 +139,7 @@ var/assoc_val = null if(!isnum(element_in_list) && normal) assoc_val = potential_cache[element_in_list] - //Check assoc entrys + //Check assoc entries if(assoc_val == src) #ifdef REFERENCE_TRACKING_DEBUG if(SSgarbage.should_save_refs) diff --git a/code/modules/almayer/machinery.dm b/code/modules/almayer/machinery.dm index d670700aaf98..2627cbd19df1 100644 --- a/code/modules/almayer/machinery.dm +++ b/code/modules/almayer/machinery.dm @@ -76,28 +76,47 @@ use_power = USE_POWER_IDLE density = TRUE idle_power_usage = 2 - var/datum/tacmap/map - ///flags that we want to be shown when you interact with this table - var/minimap_type = MINIMAP_FLAG_USCM - ///The faction that is intended to use this structure (determines type of tacmap used) - var/faction = FACTION_MARINE + var/minimap_flag = MINIMAP_FLAG_USCM + var/drawing = TRUE -/obj/structure/machinery/prop/almayer/CICmap/Initialize() +/obj/structure/machinery/prop/almayer/CICmap/Initialize(mapload, ...) . = ..() - - if (faction == FACTION_MARINE) - map = new /datum/tacmap/drawing(src, minimap_type) - else - map = new(src, minimap_type) // Non-drawing version + AddComponent(/datum/component/tacmap, has_drawing_tools=drawing, minimap_flag=minimap_flag, has_update=drawing, drawing=drawing) /obj/structure/machinery/prop/almayer/CICmap/Destroy() - QDEL_NULL(map) return ..() /obj/structure/machinery/prop/almayer/CICmap/attack_hand(mob/user) . = ..() + if(.) + return + if(interact_checks(user)) + return TRUE + + if(locate(/atom/movable/screen/minimap) in user.client.screen) //This seems like the most effective way to do this without some wacky code + to_chat(user, SPAN_WARNING("You already have a minimap open!")) + return + var/datum/component/tacmap/tacmap_component = GetComponent(/datum/component/tacmap) + tacmap_component.show_tacmap(user) + RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(on_move), user) + +///Returns true if something prevents the user from interacting with this. used mainly with the drawtable +/obj/structure/machinery/prop/almayer/CICmap/proc/interact_checks(mob/user) + if(!user.client) + return TRUE + +/obj/structure/machinery/prop/almayer/CICmap/on_unset_interaction(mob/user) + . = ..() + var/datum/component/tacmap/tacmap_component = GetComponent(/datum/component/tacmap) + tacmap_component.on_unset_interaction(user) - map.tgui_interact(user) +//Bugfix to handle cases for ghosts/observers that don't automatically close uis on move. +/obj/structure/machinery/prop/almayer/CICmap/proc/on_move(mob/source, oldloc) + SIGNAL_HANDLER + if(Adjacent(source)) + return + on_unset_interaction(source) + UnregisterSignal(source, COMSIG_MOVABLE_MOVED) /obj/structure/machinery/prop/almayer/CICmap/computer name = "map terminal" @@ -107,16 +126,13 @@ density = FALSE /obj/structure/machinery/prop/almayer/CICmap/upp - minimap_type = MINIMAP_FLAG_UPP - faction = FACTION_UPP + minimap_flag = MINIMAP_FLAG_UPP /obj/structure/machinery/prop/almayer/CICmap/clf - minimap_type = MINIMAP_FLAG_CLF - faction = FACTION_CLF + minimap_flag = MINIMAP_FLAG_CLF /obj/structure/machinery/prop/almayer/CICmap/pmc - minimap_type = MINIMAP_FLAG_WY - faction = FACTION_PMC + minimap_flag = MINIMAP_FLAG_PMC //Nonpower using props diff --git a/code/modules/animations/animation_library.dm b/code/modules/animations/animation_library.dm index 7a69adc512ef..5a176eaf8b64 100644 --- a/code/modules/animations/animation_library.dm +++ b/code/modules/animations/animation_library.dm @@ -179,7 +179,7 @@ Can look good elsewhere as well.*/ if(A.clone) if(src.Adjacent(A.clone)) A = A.clone - if(buckled || anchored || HAS_TRAIT(src, TRAIT_HAULED)) //it would look silly. + if(buckled || anchored || HAS_TRAIT(src, TRAIT_HAULED) || LAZYLEN(buckled_mobs)) //it would look silly. return var/pixel_x_diff = 0 var/pixel_y_diff = 0 diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm index b604fe658f61..88d439b0f1a9 100644 --- a/code/modules/assembly/igniter.dm +++ b/code/modules/assembly/igniter.dm @@ -17,13 +17,13 @@ var/obj/item/explosive/explosive = holder.loc explosive.prime() - else if(istype(holder.loc, /obj/structure/reagent_dispensers/fueltank)) - var/obj/structure/reagent_dispensers/fueltank/tank = holder.loc + else if(istype(holder.loc, /obj/structure/reagent_dispensers/tank/fuel)) + var/obj/structure/reagent_dispensers/tank/fuel/tank = holder.loc if(tank && !tank.exploding) playsound(get_turf(tank), 'sound/machines/twobeep.ogg', 75, 1) tank.exploding = TRUE - addtimer(CALLBACK(tank, TYPE_PROC_REF(/obj/structure/reagent_dispensers/fueltank, explode)), 3 SECONDS) + addtimer(CALLBACK(tank, TYPE_PROC_REF(/obj/structure/reagent_dispensers/tank/fuel, explode)), 3 SECONDS) tank.update_icon() diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index c56f94f15aa6..0b71a45d8dfb 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -42,11 +42,9 @@ affecting = H.get_limb(type) H.apply_effect(3, STUN) if(affecting) - if(affecting.take_damage(1, 0)) - H.UpdateDamageIcon() - H.updatehealth() + affecting.take_damage(1, 0) else if(ismouse(target)) - var/mob/living/simple_animal/mouse/M = target + var/mob/living/simple_animal/small/mouse/M = target visible_message(SPAN_DANGER("SPLAT!")) M.splat() if(!target) diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm index a3d1f1356f3c..eb1c65e2bc84 100644 --- a/code/modules/asset_cache/asset_list_items.dm +++ b/code/modules/asset_cache/asset_list_items.dm @@ -130,11 +130,18 @@ "logo_upp.png" = 'html/paper_assets/logo_upp.png', "logo_twe.png" = 'html/paper_assets/logo_twe.png', "logo_cmb.png" = 'html/paper_assets/logo_cmb.png', + "logo_wy_carbon.png" = 'html/paper_assets/logo_wy_carbon.png', + "logo_hd_carbon.png" = 'html/paper_assets/logo_hd_carbon.png', "background_white.jpg" = 'html/paper_assets/background_white.jpg', "background_dark.jpg" = 'html/paper_assets/background_dark.jpg', "background_dark2.jpg" = 'html/paper_assets/background_dark2.jpg', "background_dark_fractal.png" = 'html/paper_assets/background_dark_fractal.png', + "background_card.png" = 'html/paper_assets/background_card.png', + "background_card_ribbed.png" = 'html/paper_assets/background_card_ribbed.png', "colonialspacegruntsEZ.png" = 'html/paper_assets/colonialspacegruntsEZ.png', + "wy_punch_card.png" = 'html/paper_assets/wy_punch_card.png', + "hd_punch_card.png" = 'html/paper_assets/hd_punch_card.png', + "punch_card_punch.png" = 'html/paper_assets/punch_card_punch.png', ) /datum/asset/spritesheet/chat @@ -260,7 +267,7 @@ name = "squadranks" /datum/asset/spritesheet/ranks/register() - var/icon_file = 'icons/mob/hud/marine_hud.dmi' + var/icon_file = 'icons/mob/hud/factions/marine.dmi' var/list/icon_data = list( list("Mar", null), @@ -280,13 +287,14 @@ list("SpcPy", "hudsquad_spec_pyro"), list("TL", "hudsquad_tl"), list("SL", "hudsquad_leader"), + list("hg", "hudsquad_hg"), ) for(var/datum/squad/marine/squad in GLOB.RoleAuthority.squads) var/color = squad.equipment_color for(var/iref in icon_data) var/list/iconref = iref - var/icon/background = icon('icons/mob/hud/marine_hud.dmi', "hudsquad", SOUTH) + var/icon/background = icon('icons/mob/hud/factions/marine.dmi', "hudsquad", SOUTH) background.Blend(color, ICON_MULTIPLY) if(iconref[2]) var/icon/squad_icon = icon(icon_file, iconref[2], SOUTH) diff --git a/code/modules/asset_cache/assets/stack_receipts.dm b/code/modules/asset_cache/assets/stack_receipts.dm new file mode 100644 index 000000000000..f5f4a06fac9b --- /dev/null +++ b/code/modules/asset_cache/assets/stack_receipts.dm @@ -0,0 +1,79 @@ +/datum/asset/spritesheet/stack_receipts + name = "stack-receipts" + +/datum/asset/spritesheet/stack_receipts/register() + // initialising the list of items we need + var/target_items = list() + + //This list should contain stack receipts to render them on UI + var/all_receipts = list( + GLOB.sandstone_recipes, + GLOB.runedsandstone_recipes, + GLOB.silver_recipes, + GLOB.diamond_recipes, + GLOB.uranium_recipes, + GLOB.gold_recipes, + GLOB.phoron_recipes, + GLOB.plastic_recipes, + GLOB.iron_recipes, + GLOB.metal_recipes, + GLOB.plasteel_recipes, + GLOB.wood_recipes, + GLOB.cardboard_recipes, + GLOB.aluminium_recipes, + GLOB.copper_recipes, + GLOB.glass_recipes, + GLOB.glass_reinforced_recipes, + GLOB.phoronrglass_recipes, + GLOB.phoronglass_recipes, + GLOB.rod_recipes, + GLOB.snow_recipes + ) + + + for(var/little_list in all_receipts) + for(var/each in little_list) + if (istype(each, /datum/stack_recipe_list)) + var/datum/stack_recipe_list/srl = each + for (var/sub_rec in srl.recipes) + if (istype(sub_rec, /datum/stack_recipe)) + var/datum/stack_recipe/recipe = sub_rec + target_items |= recipe.result_type + else if (istype(each, /datum/stack_recipe)) + var/datum/stack_recipe/recipe = each + if(!recipe) + continue + target_items |= recipe.result_type + + // building icons for each item + for (var/k in target_items) + var/atom/item = k + if (!ispath(item, /atom)) + continue + + var/icon_file = initial(item.icon) + var/icon_state = initial(item.icon_state) + + if (PERFORM_ALL_TESTS(focus_only/invalid_vending_machine_icon_states)) + var/icon_states_list = icon_states(icon_file) + if (!(icon_state in icon_states_list)) + var/icon_states_string + for (var/an_icon_state in icon_states_list) + if (!icon_states_string) + icon_states_string = "[json_encode(an_icon_state)]([text_ref(an_icon_state)])" + else + icon_states_string += ", [json_encode(an_icon_state)]([text_ref(an_icon_state)])" + + stack_trace("[item] does not have a valid icon state, icon=[icon_file], icon_state=[json_encode(icon_state)]([text_ref(icon_state)]), icon_states=[icon_states_string]") + continue + + var/icon/I = icon(icon_file, icon_state, SOUTH) + var/c = initial(item.color) + if (!isnull(c) && c != "#FFFFFF") + I.Blend(c, ICON_MULTIPLY) + + var/imgid = replacetext(replacetext("[item]", "/obj/item/", ""), "/", "-") + + Insert(imgid, I) + + return ..() diff --git a/code/modules/asset_cache/assets/tgfont.dm b/code/modules/asset_cache/assets/tgfont.dm index efa98e22e2c0..4d300835add9 100644 --- a/code/modules/asset_cache/assets/tgfont.dm +++ b/code/modules/asset_cache/assets/tgfont.dm @@ -1,6 +1,5 @@ /datum/asset/simple/namespaced/tgfont assets = list( - "tgfont.eot" = file("tgui/packages/tgfont/static/tgfont.eot"), "tgfont.woff2" = file("tgui/packages/tgfont/static/tgfont.woff2"), ) parents = list( diff --git a/code/modules/asset_cache/transports/asset_transport.dm b/code/modules/asset_cache/transports/asset_transport.dm index 3db4f0f33297..0b91a96e9d92 100644 --- a/code/modules/asset_cache/transports/asset_transport.dm +++ b/code/modules/asset_cache/transports/asset_transport.dm @@ -31,7 +31,7 @@ * * asset_name - the identifier of the asset. * * asset - the actual asset file (or an asset_cache_item datum). * * file_hash - optional, a hash of the contents of the asset files contents. used so asset_cache_item doesnt have to hash it again - * * dmi_file_path - optional, means that the given asset is from the rsc and thus we dont need to do some expensive operations + * * dmi_file_path - optional, means that the given asset is from the rsc and thus we don't need to do some expensive operations */ /datum/asset_transport/proc/register_asset(asset_name, asset, file_hash, dmi_file_path) var/datum/asset_cache_item/ACI = asset diff --git a/code/modules/buildmode/bm-mode.dm b/code/modules/buildmode/bm-mode.dm index f85ac14c4631..61a0753459c7 100644 --- a/code/modules/buildmode/bm-mode.dm +++ b/code/modules/buildmode/bm-mode.dm @@ -43,7 +43,7 @@ ***********************************************************")) /datum/buildmode_mode/proc/change_settings(client/c) - to_chat(c, SPAN_WARNING("There is no configuration available for this mode")) + to_chat(c, SPAN_WARNING("There is no configuration available for this mode.")) return /datum/buildmode_mode/proc/Reset() diff --git a/code/modules/buildmode/buildmode.dm b/code/modules/buildmode/buildmode.dm index 4b6d84a5ae40..01bfe6351868 100644 --- a/code/modules/buildmode/buildmode.dm +++ b/code/modules/buildmode/buildmode.dm @@ -34,6 +34,7 @@ holder.add_to_screen(buttons) holder.click_intercept = src mode.enter_mode(src) + RegisterSignal(c, COMSIG_CLIENT_ESCAPE_MENU_OPEN, PROC_REF(quit)) /datum/buildmode/proc/quit() mode.exit_mode(src) @@ -139,7 +140,8 @@ return TRUE /datum/buildmode/proc/InterceptClickOn(mob/user, params, atom/object) - mode.when_clicked(user.client, params, object) + if(mode.when_clicked(user.client, params, object)) + return FALSE //cancel the intercept return TRUE // no doing underlying actions /proc/togglebuildmode(mob/M as mob in GLOB.player_list) diff --git a/code/modules/buildmode/buttons.dm b/code/modules/buildmode/buttons.dm index c53628206095..bde801c7fe85 100644 --- a/code/modules/buildmode/buttons.dm +++ b/code/modules/buildmode/buttons.dm @@ -2,6 +2,7 @@ icon = 'icons/misc/buildmode.dmi' var/datum/buildmode/bd // If we don't do this, we get occluded by item action buttons + plane = ABOVE_TACMAP_PLANE + 1 layer = ABOVE_HUD_LAYER /atom/movable/screen/buildmode/New(bld) diff --git a/code/modules/buildmode/submodes/basic.dm b/code/modules/buildmode/submodes/basic.dm index 0b34bb9c2d1c..81ee2de33615 100644 --- a/code/modules/buildmode/submodes/basic.dm +++ b/code/modules/buildmode/submodes/basic.dm @@ -1,60 +1,164 @@ /datum/buildmode_mode/basic key = "basic" - help = "Left Mouse Button = Construct / Upgrade\n\ - Right Mouse Button = Deconstruct / Delete / Downgrade\n\ - Left Mouse Button + ctrl = R-Window\n\ - Left Mouse Button + alt = Airlock\n\ + help = "Left Mouse Button = Construct / Upgrade \n\ + Right Mouse Button = Manipulation Menu\n\ + Right Mouse Button + ctrl = Quick delete\n\ + Left Mouse Button + ctrl = Object Creation Menu\n\ Use the button in the upper left corner to\n\ change the direction of built objects" + var/list/radial_menu_options = list() -/datum/buildmode_mode/basic/when_clicked(client/c, params, obj/object) +/datum/buildmode_mode/basic/when_clicked(client/admin_building, params, atom/clicked_atom) var/list/modifiers = params2list(params) var/left_click = LAZYACCESS(modifiers, LEFT_CLICK) var/right_click = LAZYACCESS(modifiers, RIGHT_CLICK) var/alt_click = LAZYACCESS(modifiers, ALT_CLICK) var/ctrl_click = LAZYACCESS(modifiers, CTRL_CLICK) - - if(istype(object,/turf) && left_click && !alt_click && !ctrl_click) - var/turf/clicked_turf = object - if(istype(object, /turf/closed/wall/almayer/outer)) - return - else if(istype(object, /turf/closed/wall/r_wall)) - clicked_turf.PlaceOnTop(/turf/closed/wall/almayer/outer) - else if(istype(object, /turf/open/floor/plating)) - clicked_turf.PlaceOnTop(/turf/open/floor/almayer) - else if(istype(object, /turf/open/floor)) - clicked_turf.PlaceOnTop(/turf/closed/wall) - else if(istype(object, /turf/closed/wall)) - clicked_turf.PlaceOnTop(/turf/closed/wall/r_wall) - else - clicked_turf.PlaceOnTop(/turf/open/floor/plating) // Gotta do something - log_admin("Build Mode: [key_name(c)] built [clicked_turf] at [AREACOORD(clicked_turf)]") - return - else if(right_click) - log_admin("Build Mode: [key_name(c)] deleted [object] at [AREACOORD(object)]") - if(isturf(object)) - var/turf/T = object - if(istype(object, /turf/closed/wall/almayer/outer)) - T.PlaceOnTop(/turf/closed/wall/r_wall) - else if(istype(object, /turf/closed/wall/r_wall)) - T.PlaceOnTop(/turf/closed/wall) + if(istype(clicked_atom, /atom/movable/screen/radial)) //we're actively using radials in basic mode, so don't intercept any clicks that target those. + return TRUE + if(istype(clicked_atom, /turf)) + var/turf/clicked_turf = clicked_atom + if(left_click && !alt_click && !ctrl_click) + var/list/upgrade_reference = list( + /turf/closed/wall/almayer/outer = null, + /turf/closed/wall/r_wall = /turf/closed/wall/almayer/outer, + /turf/closed/wall = /turf/closed/wall/r_wall, + /turf/open/floor/plating = /turf/open/floor/almayer, + /turf/open/floor = /turf/closed/wall, + ) + var/turf/upgrade_version + for(var/i in upgrade_reference) + if(istype(clicked_atom, i)) + upgrade_version = upgrade_reference[i] + break + if(upgrade_version) + clicked_turf.PlaceOnTop(upgrade_version) else - T.ScrapeAway() - else if(isobj(object)) - qdel(object) - return - else if(istype(object,/turf) && alt_click && left_click) - var/obj/structure/window/reinforced/airlock - log_admin("Build Mode: [key_name(c)] built an airlock at [AREACOORD(object)]") - airlock = new/obj/structure/machinery/door/airlock/almayer(get_turf(object)) - airlock.setDir(BM.build_dir) - else if(istype(object, /turf) && ctrl_click && left_click) - var/obj/structure/window/reinforced/window - var/diagonals = list(NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST) - if(BM.build_dir in diagonals) - window = new /obj/structure/window/framed(get_turf(object)) - else - window = new /obj/structure/window/framed/almayer/hull(get_turf(object)) - window.setDir(BM.build_dir) - log_admin("Build Mode: [key_name(c)] built a window at [AREACOORD(object)]") + clicked_turf.PlaceOnTop(/turf/open/floor/plating) + log_admin("Build Mode: [key_name(admin_building)] built [upgrade_version] at [AREACOORD(clicked_turf)]") + return + else if(right_click && !alt_click && !ctrl_click) + var/destruction_switch = "Make Indestructible" + if(clicked_atom.unacidable || clicked_atom.explo_proof || CHECK_BITFIELD(clicked_turf.turf_flags, TURF_HULL)) + destruction_switch = "Make Destructible" + radial_menu_options = list( + "Destroy" = image('icons/misc/buildmode.dmi', icon_state = "buildquit"), + "[destruction_switch]" = image('icons/misc/buildmode.dmi', icon_state = "build", dir = NORTH), + "Downgrade" = image('icons/misc/buildmode.dmi', icon_state = "build"), + "Turn" = image('icons/misc/buildmode.dmi', icon_state = "buildmode_edit"), + ) + if(GLOB.radial_menus["buildmode_basic_turf_[key_name(admin_building)]"]) + return + var/picked_option = show_radial_menu(admin_building.mob, clicked_atom, radial_menu_options, tooltips = TRUE, uniqueid = "buildmode_basic_turf_[key_name(admin_building)]") + switch(picked_option) + if("Destroy") + log_admin("Build Mode: [key_name(admin_building)] deleted [clicked_turf] at [AREACOORD(clicked_turf)]") + clicked_turf.ScrapeAway() + if("Downgrade") + var/list/downgrade_reference = list( + /turf/closed/wall/almayer/outer = /turf/closed/wall/r_wall, + /turf/closed/wall/r_wall = /turf/closed/wall, + ) + var/turf/downgrade_version + for(var/i in downgrade_reference) + if(istype(clicked_atom, i)) + downgrade_version = downgrade_reference[i] + if(downgrade_version) + clicked_turf.PlaceOnTop(downgrade_version) + else + clicked_turf.ScrapeAway() + log_admin("Build Mode: [key_name(admin_building)] downgraded [clicked_turf] at [AREACOORD(clicked_turf)]") + if("Make Indestructible", "Make Destructible") + if(destruction_switch == "Make Destructible") + clicked_atom.unacidable = FALSE + clicked_atom.explo_proof = FALSE + DISABLE_BITFIELD(clicked_turf.turf_flags, TURF_HULL) + else + clicked_atom.unacidable = TRUE + clicked_atom.explo_proof = TRUE + ENABLE_BITFIELD(clicked_turf.turf_flags, TURF_HULL) + log_admin("Build Mode: [key_name(admin_building)] made [clicked_turf] [clicked_atom.explo_proof ? "indestructible" : "destructible"] at [AREACOORD(clicked_turf)]") + if("Turn") + radial_menu_options = list( + "North" = image('icons/misc/buildmode.dmi', icon_state = "build", dir = NORTH), + "East" = image('icons/misc/buildmode.dmi', icon_state = "build", dir = EAST), + "South" = image('icons/misc/buildmode.dmi', icon_state = "build", dir = SOUTH), + "West" = image('icons/misc/buildmode.dmi', icon_state = "build", dir = WEST), + ) + if(GLOB.radial_menus["buildmode_basic_turf_[key_name(admin_building)]"]) + return + var/picked_turn_option = show_radial_menu(admin_building.mob, clicked_atom, radial_menu_options, tooltips = TRUE, uniqueid = "buildmode_basic_turf_[key_name(admin_building)]") + clicked_atom.setDir(text2dir(capitalize(picked_turn_option))) + log_admin("Build Mode: [key_name(admin_building)] turned [clicked_turf] at [AREACOORD(clicked_turf)]") + + else if(right_click && !alt_click && ctrl_click) + log_admin("Build Mode: [key_name(admin_building)] deleted [clicked_turf] at [AREACOORD(clicked_turf)]") + clicked_turf.ScrapeAway() + + else if(left_click && !alt_click && ctrl_click) + radial_menu_options = list( + "Window" = image('icons/turf/walls/windows.dmi', icon_state = "alm_rwindow0"), + "Door" = image('icons/obj/structures/doors/personaldoor.dmi', icon_state = "door_closed"), + "Wall" = image('icons/turf/walls/walls.dmi', icon_state = "rwall"), + "Barricade" = image('icons/obj/structures/barricades.dmi', icon_state = "metal_0"), + "Plasteel Barricade" = image('icons/obj/structures/barricades.dmi', icon_state = "plasteel_0"), + "Reinforced Table" = image('icons/obj/structures/tables.dmi', icon_state = "reinftable"), + ) + var/list/build_options = list( + "Window" = /obj/structure/window/framed/almayer, + "Door" = /obj/structure/machinery/door/airlock/almayer/generic, + "Wall" = /turf/closed/wall/r_wall, + "Barricade" = /obj/structure/barricade/metal, + "Plasteel Barricade" = /obj/structure/barricade/plasteel, + "Reinforced Table" = /obj/structure/surface/table/reinforced, + ) + var/picked_option = show_radial_menu(admin_building.mob, clicked_atom, radial_menu_options, tooltips = TRUE) + if(picked_option) + var/atom/build_picked = build_options[picked_option] + var/atom/built_atom = new build_picked(get_turf(clicked_atom)) + if(picked_option != "Reinforced Table") + built_atom.setDir(BM.build_dir) + if(istype(clicked_atom, /obj)) + var/obj/clicked_object = clicked_atom + var/destruction_switch = "Make Indestructible" + if(clicked_atom.unacidable || clicked_atom.explo_proof || clicked_object.health == -1) + destruction_switch = "Make Destructible" + if(right_click && !alt_click && !ctrl_click) + if(GLOB.radial_menus["buildmode_basic_obj_[key_name(admin_building)]"]) + return + radial_menu_options = list( + "Destroy" = image('icons/misc/buildmode.dmi', icon_state = "buildquit"), + "[destruction_switch]" = image('icons/misc/buildmode.dmi', icon_state = "build", dir = NORTH), + "Turn" = image('icons/misc/buildmode.dmi', icon_state = "buildmode_edit"), + ) + var/picked_option = show_radial_menu(admin_building.mob, clicked_atom, radial_menu_options, tooltips = TRUE, uniqueid = "buildmode_basic_obj_[key_name(admin_building)]") + switch(picked_option) + if("Destroy") + log_admin("Build Mode: [key_name(admin_building)] deleted [clicked_object] at [AREACOORD(clicked_object)]") + qdel(clicked_object) + if("Make Indestructible", "Make Destructible") + if(destruction_switch == "Make Destructible") + clicked_atom.unacidable = FALSE + clicked_atom.explo_proof = FALSE + clicked_object.health = initial(clicked_object.health) + else + clicked_atom.unacidable = TRUE + clicked_atom.explo_proof = TRUE + clicked_object.health = -1 + + if("Turn") + if(GLOB.radial_menus["buildmode_basic_obj_[key_name(admin_building)]"]) + return + radial_menu_options = list( + "North" = image('icons/misc/buildmode.dmi', icon_state = "build", dir = NORTH), + "East" = image('icons/misc/buildmode.dmi', icon_state = "build", dir = EAST), + "South" = image('icons/misc/buildmode.dmi', icon_state = "build", dir = SOUTH), + "West" = image('icons/misc/buildmode.dmi', icon_state = "build", dir = WEST), + ) + var/picked_turn_option = show_radial_menu(admin_building.mob, clicked_atom, radial_menu_options, tooltips = TRUE, uniqueid = "buildmode_basic_obj_[key_name(admin_building)]") + clicked_atom.setDir(text2dir(capitalize(picked_turn_option))) + log_admin("Build Mode: [key_name(admin_building)] turned [clicked_object] at [AREACOORD(clicked_object)]") + else if(right_click && !alt_click && ctrl_click) + log_admin("Build Mode: [key_name(admin_building)] deleted [clicked_object] at [AREACOORD(clicked_object)]") + qdel(clicked_atom) diff --git a/code/modules/buildmode/submodes/boom.dm b/code/modules/buildmode/submodes/boom.dm index 752efc46f6ab..203f0d832ebb 100644 --- a/code/modules/buildmode/submodes/boom.dm +++ b/code/modules/buildmode/submodes/boom.dm @@ -23,4 +23,4 @@ if(LAZYACCESS(modifiers, LEFT_CLICK)) log_admin("Build Mode: [key_name(c)] caused an explosion(power=[power], falloff=[falloff]]") - cell_explosion(location, power, falloff, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, create_cause_data("divine intervention", c)) + cell_explosion(location, power, falloff, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, create_cause_data("divine intervention")) diff --git a/code/modules/buildmode/submodes/copy.dm b/code/modules/buildmode/submodes/copy.dm index 59a5d32c68c6..d1e6b738cb1e 100644 --- a/code/modules/buildmode/submodes/copy.dm +++ b/code/modules/buildmode/submodes/copy.dm @@ -8,15 +8,16 @@ stored = null return ..() -/datum/buildmode_mode/copy/when_clicked(client/c, params, obj/object) +/datum/buildmode_mode/copy/when_clicked(client/admin_copying, params, atom/object) var/list/modifiers = params2list(params) if(LAZYACCESS(modifiers, LEFT_CLICK)) - var/turf/T = get_turf(object) + var/turf/clicked_turf = get_turf(object) if(stored) - DuplicateObject(stored, perfectcopy=1, sameloc=0,newloc=T) - log_admin("Build Mode: [key_name(c)] copied [stored] to [AREACOORD(object)]") + var/atom/new_object = DuplicateObject(stored, perfectcopy = TRUE, sameloc = FALSE, newloc = clicked_turf) + new_object.setDir(BM.build_dir) + log_admin("Build Mode: [key_name(admin_copying)] copied [stored] to [AREACOORD(object)]") else if(LAZYACCESS(modifiers, RIGHT_CLICK)) if(ismovable(object)) // No copying turfs for now. - to_chat(c, SPAN_NOTICE("[object] set as template.")) + to_chat(admin_copying, SPAN_NOTICE("[object] set as template.")) stored = object diff --git a/code/modules/buildmode/submodes/delete.dm b/code/modules/buildmode/submodes/delete.dm index 78bba145fb0d..1245a5f0ee95 100644 --- a/code/modules/buildmode/submodes/delete.dm +++ b/code/modules/buildmode/submodes/delete.dm @@ -45,7 +45,7 @@ qdel(obj) CHECK_TICK if(!i) - to_chat(usr, "No instances of this type exist") + to_chat(usr, "No instances of this type exist.") return log_admin("[key_name(usr)] deleted all instances of type [o_type] ([i] instances deleted) ") message_admins(SPAN_NOTICE("[key_name(usr)] deleted all instances of type [o_type] ([i] instances deleted) ")) @@ -57,7 +57,7 @@ qdel(obj) CHECK_TICK if(!i) - to_chat(usr, "No instances of this type exist") + to_chat(usr, "No instances of this type exist.") return log_admin("[key_name(usr)] deleted all instances of type or subtype of [o_type] ([i] instances deleted) ") message_admins(SPAN_NOTICE("[key_name(usr)] deleted all instances of type or subtype of [o_type] ([i] instances deleted) ")) diff --git a/code/modules/buildmode/submodes/outfit.dm b/code/modules/buildmode/submodes/outfit.dm index fd2d82cbd803..1baf1311b59d 100644 --- a/code/modules/buildmode/submodes/outfit.dm +++ b/code/modules/buildmode/submodes/outfit.dm @@ -14,7 +14,7 @@ dresscode = null /datum/buildmode_mode/outfit/change_settings(client/c) - dresscode = tgui_input_list(c?.mob, "Pick a Preset", "Equipment", GLOB.gear_name_presets_list) + dresscode = tgui_input_list(c?.mob, "Pick a Preset", "Equipment", GLOB.equipment_presets.categories["All"]) /datum/buildmode_mode/outfit/when_clicked(client/c, params, object) var/list/modifiers = params2list(params) diff --git a/code/modules/character_traits/biology_traits.dm b/code/modules/character_traits/biology_traits.dm index 2b6a381f3612..bc530ba57387 100644 --- a/code/modules/character_traits/biology_traits.dm +++ b/code/modules/character_traits/biology_traits.dm @@ -10,6 +10,7 @@ trait_desc = "A condition in which close objects appear clearly, but far ones don't." applyable = TRUE cost = 1 + var/list/inapplicable_species = list(SPECIES_YAUTJA) /datum/character_trait/biology/bad_eyesight/apply_trait(mob/living/carbon/human/target) ..() diff --git a/code/modules/character_traits/character_trait.dm b/code/modules/character_traits/character_trait.dm index fb102b5ae06a..3490881acea7 100644 --- a/code/modules/character_traits/character_trait.dm +++ b/code/modules/character_traits/character_trait.dm @@ -27,7 +27,7 @@ GLOBAL_REFERENCE_LIST_INDEXED(character_traits, /datum/character_trait, type) /// Similar to the traits from Project Zomboid. /datum/character_trait var/trait_name = "Character Trait" - var/trait_desc = "A character trait" + var/trait_desc = "A character trait." /// Whether the trait can be applied to mobs /// Do not forget to override this var for any child types /// Only set this to TRUE for "abstract" parent types diff --git a/code/modules/character_traits/languages.dm b/code/modules/character_traits/languages.dm index b30c47ffe59e..63475deae8fd 100644 --- a/code/modules/character_traits/languages.dm +++ b/code/modules/character_traits/languages.dm @@ -66,3 +66,7 @@ /datum/character_trait/language/sainja language_name = LANGUAGE_YAUTJA applyable = FALSE + +/datum/character_trait/language/forgotten + language_name = LANGUAGE_FORGOTTEN + applyable = FALSE diff --git a/code/modules/character_traits/skills.dm b/code/modules/character_traits/skills.dm index 471fbe45b84d..9c352258d390 100644 --- a/code/modules/character_traits/skills.dm +++ b/code/modules/character_traits/skills.dm @@ -92,7 +92,7 @@ /datum/character_trait/skills/cosmartgun trait_name = "Smartgun Training" - trait_desc = "Gives the CO information on his smartgun" + trait_desc = "Gives the CO information on his smartgun." skill = SKILL_SPEC_WEAPONS skill_cap = SKILL_SPEC_SMARTGUN skill_increment = 7 @@ -121,7 +121,7 @@ /datum/character_trait/skills/k9_handler trait_name = "K9 Handler Training" - trait_desc = "Allows the user to interface with Wey-Yu Synthetic K9 Units for rescue purposes" + trait_desc = "Allows the user to interface with Wey-Yu Synthetic K9 Units for rescue purposes." skill = SKILL_JTAC secondary_skill = SKILL_ENGINEER //enables the handler to use standard synth reset keys as well as easier repairs for the dog skill_cap = SKILL_ENGINEER_NOVICE diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index e845e8dcf37f..b552f920d741 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -58,6 +58,7 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list( /client/proc/set_crit_type, /client/proc/set_flashing_lights_pref, /client/proc/toggle_leadership_spoken_orders, + /client/proc/toggle_cocking_to_hand, )) /client/proc/reduce_minute_count() @@ -107,7 +108,7 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list( topiclimiter[SECOND_COUNT] = 0 topiclimiter[SECOND_COUNT] += 1 if (topiclimiter[SECOND_COUNT] > stl) - to_chat(src, SPAN_DANGER("Your previous action was ignored because you've done too many in a second")) + to_chat(src, SPAN_DANGER("Your previous action was ignored because you've done too many in a second.")) return // Tgui Topic middleware @@ -167,19 +168,13 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list( for(var/photo in info.photo_list) usr << browse_rsc(info.photo_list[photo], photo) - show_browser(usr, "[info.data]", "Fax Message", "Fax Message") + show_browser(usr, "[info.data]", "Fax Message", "Fax Message", width=DEFAULT_PAPER_WIDTH, height=DEFAULT_PAPER_HEIGHT, extra_stylesheets=info.extra_stylesheets, extra_headers=info.extra_headers) else if(href_list["medals_panel"]) GLOB.medals_panel.tgui_interact(mob) - else if(href_list["tacmaps_panel"]) GLOB.tacmap_admin_panel.tgui_interact(mob) - else if(href_list["MapView"]) - if(isxeno(mob)) - return - GLOB.uscm_tacmap_status.tgui_interact(mob) - //NOTES OVERHAUL if(href_list["add_merit_info"]) var/key = href_list["add_merit_info"] @@ -328,7 +323,7 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list( to_chat_immediate(src, SPAN_DANGER("Your version of BYOND is too old:")) to_chat_immediate(src, CONFIG_GET(string/client_error_message)) to_chat_immediate(src, "Your version: [byond_version].[byond_build]") - to_chat_immediate(src, "Required version: [breaking_version].[breaking_build] or later") + to_chat_immediate(src, "Required version: [breaking_version].[breaking_build] or later.") to_chat_immediate(src, "Visit BYOND's website to get the latest version of BYOND.") return FALSE @@ -339,12 +334,12 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list( msg += "Your version: [byond_version].[byond_build]
" msg += "Required version to remove this message: [warn_version].[warn_build] or later
" msg += "Visit BYOND's website to get the latest version of BYOND.
" - src << browse(msg, "window=warning_popup") + src << browse(HTML_SKELETON(msg), "window=warning_popup") else to_chat(src, SPAN_DANGER("Your version of BYOND may be getting out of date:")) to_chat(src, CONFIG_GET(string/client_warn_message)) to_chat(src, "Your version: [byond_version].[byond_build]") - to_chat(src, "Required version to remove this message: [warn_version].[warn_build] or later") + to_chat(src, "Required version to remove this message: [warn_version].[warn_build] or later.") to_chat(src, "Visit BYOND's website to get the latest version of BYOND.") if (num2text(byond_build) in GLOB.blacklisted_builds) @@ -401,6 +396,8 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list( /client/proc/PostLogin() add_verb(src, collect_client_verbs()) + check_ip_vpn() + acquire_dpi() // Initialize tgui panel @@ -970,6 +967,39 @@ CLIENT_VERB(action_hide_menu) winset(src, "default.Shift", "is-disabled=true") winset(src, "default.ShiftUp", "is-disabled=true") +#ifdef SPACEMAN_DMM +/client/VAR_PRIVATE/eye +/client/VAR_PRIVATE/pixel_x +/client/VAR_PRIVATE/pixel_y +#endif + +/client/proc/set_eye(new_eye) + SEND_SIGNAL(src, COMSIG_CLIENT_EYE_CHANGED, new_eye) + + eye = new_eye + +/client/proc/get_eye() as /atom + RETURN_TYPE(/atom) + + return eye + +/client/proc/set_pixel_x(new_pixel_x) + SEND_SIGNAL(src, COMSIG_CLIENT_PIXEL_X_CHANGED, new_pixel_x) + + pixel_x = new_pixel_x + +/client/proc/get_pixel_x() as num + return pixel_x + +/client/proc/set_pixel_y(new_pixel_y) + SEND_SIGNAL(src, COMSIG_CLIENT_PIXEL_Y_CHANGED, new_pixel_y) + + pixel_y = new_pixel_y + +/client/proc/get_pixel_y() as num + return pixel_y + + GLOBAL_VAR(ooc_rank_dmi) GLOBAL_LIST_INIT(ooc_rank_iconstates, setup_ooc_rank_icons()) GLOBAL_LIST_INIT(community_awards, get_community_awards()) diff --git a/code/modules/client/flavor_text_editor.dm b/code/modules/client/flavor_text_editor.dm new file mode 100644 index 000000000000..895ec3f8fc88 --- /dev/null +++ b/code/modules/client/flavor_text_editor.dm @@ -0,0 +1,44 @@ +/datum/flavor_text_editor/ui_data(mob/user) + . = ..() + + var/datum/preferences/prefs = user.client?.prefs + if(!prefs) + return + + .["categories"] = list() + + for (var/category in prefs.flavor_texts) + .["categories"] += category + .[category] = prefs.flavor_texts[category] + +/datum/flavor_text_editor/tgui_interact(mob/user, datum/tgui/ui) + . = ..() + + ui = SStgui.try_update_ui(user, src, ui) + + if(!ui) + ui = new(user, src, "FlavorTextEditor", "Flavor Text Editor") + ui.open() + ui.set_autoupdate(FALSE) + + winset(user, ui.window.id, "focus=true") + +/datum/flavor_text_editor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + + var/datum/preferences/prefs = ui.user.client?.prefs + if(!prefs) + return + + switch(action) + if("set_flavor_text") + if(!params["category"]) + return + prefs.flavor_texts[params["category"]] = params["text"] + return TRUE + + return TRUE + + +/datum/flavor_text_editor/ui_state(mob/user) + return GLOB.always_state diff --git a/code/modules/client/player_details.dm b/code/modules/client/player_details.dm index 12e50647536b..1ec094b8cff5 100644 --- a/code/modules/client/player_details.dm +++ b/code/modules/client/player_details.dm @@ -7,11 +7,11 @@ GLOBAL_LIST_EMPTY(player_details) // ckey -> /datum/player_details var/list/post_logout_callbacks = list() var/list/played_names = list() //List of names this key played under this round var/byond_version = "Unknown" - /// The descriminator for larva queue ordering: Generally set to timeofdeath except for facehuggers/admin z-level play - var/larva_queue_time + /// The descriminator for larva pool ordering: Generally set to timeofdeath except for facehuggers/admin z-level play + var/larva_pool_time /datum/player_details/New() - larva_queue_time = world.time + larva_pool_time = world.time return ..() /proc/log_played_names(ckey, ...) diff --git a/code/modules/client/pred_picker.dm b/code/modules/client/pred_picker.dm index 3dec5d4e37f4..c8b606ace980 100644 --- a/code/modules/client/pred_picker.dm +++ b/code/modules/client/pred_picker.dm @@ -59,10 +59,13 @@ .["caster_icon"] = /obj/item/weapon/gun/energy/yautja/plasma_caster::icon .["caster_prefix"] = /obj/item/weapon/gun/energy/yautja/plasma_caster::base_icon_state + .["bracer_icon"] = /obj/item/clothing/gloves/yautja::icon + .["mask_accessory_icon"] = /obj/item/clothing/accessory/mask::icon .["mask_accessory_types"] = PRED_MASK_ACCESSORY_TYPE_MAX .["materials"] = PRED_MATERIALS + .["retro_materials"] = PRED_RETRO_MATERIALS .["translators"] = PRED_TRANSLATORS .["invisibility_sounds"] = PRED_INVIS_SOUNDS .["legacies"] = PRED_LEGACIES @@ -100,6 +103,8 @@ .["caster_material"] = prefs.predator_caster_material + .["bracer_material"] = prefs.predator_bracer_material + .["cape_color"] = prefs.predator_cape_color /datum/pred_picker/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) @@ -222,11 +227,18 @@ if("caster_material") var/material = params["material"] - if(!material || !(material in PRED_MATERIALS)) + if(!material || !(material in PRED_RETRO_MATERIALS)) return prefs.predator_caster_material = material + if("bracer_material") + var/material = params["material"] + if(!material || !(material in PRED_RETRO_MATERIALS)) + return + + prefs.predator_bracer_material = material + if("mask_accessory") var/accessory = params["type"] if(isnull(accessory) || !isnum(accessory)) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 3849b2c757d5..b6c20dfcbc99 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -22,8 +22,7 @@ GLOBAL_LIST_INIT(bgstate_options, list( )) GLOBAL_LIST_INIT(be_special_flags, list( - "Xenomorph after unrevivable death" = BE_ALIEN_AFTER_DEATH, - "Agent" = BE_AGENT, + "Xenomorph" = BE_ALIEN, "King" = BE_KING, )) @@ -38,9 +37,11 @@ GLOBAL_LIST_INIT(be_special_flags, list( var/static/datum/body_picker/body_picker = new var/static/datum/traits_picker/traits_picker = new var/static/datum/loadout_picker/loadout_picker = new + var/static/datum/flavor_text_editor/flavor_text_editor = new var/static/datum/pred_picker/pred_picker = new + //doohickeys for savefiles var/path var/default_slot = 1 //Holder so it doesn't default to slot 1, rather the last one used @@ -61,8 +62,8 @@ GLOBAL_LIST_INIT(be_special_flags, list( //game-preferences var/lastchangelog = "" // Saved changlog filesize to detect if there was a change var/ooccolor - var/be_special = BE_ALIEN_AFTER_DEATH|BE_KING // Special role selection - var/toggle_prefs = TOGGLE_DIRECTIONAL_ATTACK|TOGGLE_COMBAT_CLICKDRAG_OVERRIDE|TOGGLE_MEMBER_PUBLIC|TOGGLE_AMBIENT_OCCLUSION|TOGGLE_VEND_ITEM_TO_HAND|TOGGLE_LEADERSHIP_SPOKEN_ORDERS // flags in #define/mode.dm + var/be_special = BE_ALIEN|BE_KING // Special role selection + var/toggle_prefs = TOGGLE_DIRECTIONAL_ATTACK|TOGGLE_COMBAT_CLICKDRAG_OVERRIDE|TOGGLE_MEMBER_PUBLIC|TOGGLE_AMBIENT_OCCLUSION|TOGGLE_VEND_ITEM_TO_HAND|TOGGLE_LEADERSHIP_SPOKEN_ORDERS|TOGGLE_COCKING_TO_HAND // flags in #define/mode.dm var/xeno_ability_click_mode = XENO_ABILITY_CLICK_MIDDLE var/auto_fit_viewport = FALSE var/adaptive_zoom = 0 @@ -97,10 +98,13 @@ GLOBAL_LIST_INIT(be_special_flags, list( var/ghost_vision_pref = GHOST_VISION_LEVEL_MID_NVG var/ghost_orbit = GHOST_ORBIT_CIRCLE var/dual_wield_pref = DUAL_WIELD_FIRE + var/playtime_perks = TRUE + var/skip_playtime_ranks = FALSE //Synthetic specific preferences var/synthetic_name = "Undefined" var/synthetic_type = SYNTH_GEN_THREE + var/synth_specialisation = "Generalised" //Predator specific preferences. var/predator_name = "Undefined" var/predator_gender = MALE @@ -118,10 +122,11 @@ GLOBAL_LIST_INIT(be_special_flags, list( var/predator_mask_material = "ebony" var/predator_greave_material = "ebony" var/predator_caster_material = "ebony" + var/predator_bracer_material = "ebony" var/predator_cape_color = "#654321" var/predator_flavor_text = "" //CO-specific preferences - var/commander_sidearm = "Mateba" + var/commander_sidearm = "Unica (camo comforting)" var/co_career_path = "Infantry" var/affiliation = "Unaligned" //SEA specific preferences @@ -159,7 +164,7 @@ GLOBAL_LIST_INIT(be_special_flags, list( var/age = 19 //age of character var/spawnpoint = "Arrivals Shuttle" //where this character will spawn (0-2). var/underwear = "Boxers (Camo Conforming)" //underwear type - var/undershirt = "Undershirt (Tan)" //undershirt type + var/undershirt = "Undershirt (Tan) (Camo Conforming)" //undershirt type var/backbag = 2 //backpack type var/preferred_armor = "Random" //preferred armor type (from their primary prep vendor) @@ -241,7 +246,6 @@ GLOBAL_LIST_INIT(be_special_flags, list( var/xeno_postfix = "" var/xeno_name_ban = FALSE var/xeno_vision_level_pref = XENO_VISION_LEVEL_MID_NVG - var/playtime_perks = TRUE var/show_queen_name = FALSE var/stylesheet = "Modern" @@ -309,6 +313,15 @@ GLOBAL_LIST_INIT(be_special_flags, list( /// Sends messages in chat when the Xeno Action's cooldown is complete and adds cooldown timers in stat panel var/show_cooldown_messages = FALSE + /// A list of saved presets for the ChemMaster, storing pill bottle color, label, and pill color preferences + var/list/chem_presets = list() + + /// The custom keybinds, in an array to associated array of {"keybinding": [], "type": "picksay"|"say"|"me", "contents": "CHARGE!"} + var/list/custom_keybinds = list() + + /// The same keybinds, but in an array of {"keybinding": /datum/keybinding/custom} + var/list/key_to_custom_keybind = list() + /datum/preferences/New(client/C) key_bindings = deep_copy_list(GLOB.hotkey_keybinding_list_by_key) // give them default keybinds and update their movement keys macros = new(C, src) @@ -329,6 +342,9 @@ GLOBAL_LIST_INIT(be_special_flags, list( real_name = random_name(gender) gear = list() + #ifdef QUICK_START + job_preference_list[JOB_CO] = HIGH_PRIORITY + #endif /datum/preferences/proc/client_reconnected(client/C) owner = C @@ -403,7 +419,7 @@ GLOBAL_LIST_INIT(be_special_flags, list( dat += "
Physical Information:" dat += "®
" dat += "Age: [age]" - dat += "Gender: [gender == MALE ? "Male" : "Female"]
" + dat += "Gender: [gender == PLURAL ? "Non-Binary" : gender == MALE ? "Male" : "Female"]
" dat += "Skin Color: [skin_color]
" dat += "Body Size: [body_size]
" @@ -516,7 +532,6 @@ GLOBAL_LIST_INIT(be_special_flags, list( dat += "Xeno prefix: [display_prefix]
" dat += "Xeno postfix: [display_postfix]
" - dat += "Enable Playtime Perks: [playtime_perks? "Yes" : "No"]
" dat += "Show Queen Name: [show_queen_name? "Yes" : "No"]
" dat += "Default Xeno Night Vision Level: [xeno_vision_level_pref]
" @@ -547,6 +562,7 @@ GLOBAL_LIST_INIT(be_special_flags, list( dat += "Synthetic Name: [synthetic_name]
" dat += "Synthetic Type: [synthetic_type]
" dat += "Synthetic Whitelist Status: [synth_status]
" + dat += "Synthetic Specialisation: [synth_specialisation]
" dat += "" else dat += "You do not have the whitelist for this role." @@ -586,6 +602,7 @@ GLOBAL_LIST_INIT(be_special_flags, list( dat += "Ghost Sight: [(toggles_chat & CHAT_GHOSTSIGHT) ? "All Emotes" : "Nearest Creatures"]
" dat += "Ghost Radio: [(toggles_chat & CHAT_GHOSTRADIO) ? "All Chatter" : "Nearest Speakers"]
" dat += "Ghost Spy Radio: [(toggles_chat & CHAT_LISTENINGBUG) ? "Hear" : "Silence"] listening devices
" + dat += "Ghost Announcement Clarity: [(toggles_chat & CHAT_GHOSTANNOUNCECLARITY) ? "Full Clarity" : "Potentially Garbled"] announcements
" dat += "Ghost Hivemind: [(toggles_chat & CHAT_GHOSTHIVEMIND) ? "Show Hivemind" : "Hide Hivemind"]
" dat += "Abovehead Chat: [lang_chat_disabled ? "Hide" : "Show"]
" dat += "Abovehead Emotes: [(toggles_langchat & LANGCHAT_SEE_EMOTES) ? "Show" : "Hide"]
" @@ -620,6 +637,9 @@ GLOBAL_LIST_INIT(be_special_flags, list( dat += "
"
dat += "
" + if(user.client.can_skip_role_lock()) + dat += "Skip Playtime Ranks: [skip_playtime_ranks? "Yes" : "No"]
" dat += "Toggle Being Able to Hurt Yourself: \ [toggle_prefs & TOGGLE_IGNORE_SELF ? "Off" : "On"]
" dat += "Toggle Help Intent Safety: \ @@ -638,6 +658,8 @@ GLOBAL_LIST_INIT(be_special_flags, list( [toggle_prefs & TOGGLE_EJECT_MAGAZINE_TO_HAND ? "On" : "Off"]
" dat += "Toggle Automatic Punctuation: \ [toggle_prefs & TOGGLE_AUTOMATIC_PUNCTUATION ? "On" : "Off"]
" + dat += "Toggle Bullet Cocking to hand: \ + [toggle_prefs & TOGGLE_COCKING_TO_HAND ? "On" : "Off"]
" dat += "Toggle Leadership Spoken Orders: \ [toggle_prefs & TOGGLE_LEADERSHIP_SPOKEN_ORDERS ? "On" : "Off"]
" dat += "Toggle Combat Click-Drag Override: \ @@ -668,14 +690,7 @@ GLOBAL_LIST_INIT(be_special_flags, list( for(var/role_name in GLOB.be_special_flags) var/flag = GLOB.be_special_flags[role_name] - - var/ban_check_name - switch(role_name) - if("Xenomorph after unrevivable death") - ban_check_name = JOB_XENOMORPH - - if("Agent") - ban_check_name = "Agent" + var/ban_check_name = JOB_XENOMORPH // Ever a be_special_flags uses a different ban check, check and switch here if(ban_check_name && jobban_isbanned(user, ban_check_name)) dat += "Be [role_name]: \[BANNED]
" @@ -693,6 +708,8 @@ GLOBAL_LIST_INIT(be_special_flags, list( dat += "Spawn as Royal Marine: [toggles_ert_pred & PLAY_TWE ? "Yes" : "No"]
" dat += "Spawn as UPP: [toggles_ert_pred & PLAY_UPP ? "Yes" : "No"]
" dat += "Spawn as CLF: [toggles_ert_pred & PLAY_CLF ? "Yes" : "No"]
" + dat += "Spawn as PMC: [toggles_ert_pred & PLAY_PMC ? "Yes" : "No"]
" + dat += "Spawn as Miscellaneous: [toggles_ert_pred & PLAY_HUNT_MISC ? "Yes" : "No"]
" dat += "Spawn as Xeno T2: [toggles_ert_pred & PLAY_XENO_T2 ? "Yes" : "No"]
" dat += "Spawn as Xeno T3: [toggles_ert_pred & PLAY_XENO_T3 ? "Yes" : "No"]
" dat += "
"
@@ -732,7 +749,7 @@ GLOBAL_LIST_INIT(be_special_flags, list(
* * width - Screen' width.
* * height - Screen's height.
*/
-/datum/preferences/proc/SetChoices(mob/user, limit = 21, list/splitJobs = list(JOB_CHIEF_REQUISITION, JOB_WO_CMO), width = 950, height = 750)
+/datum/preferences/proc/SetChoices(mob/user, limit = 21, list/splitJobs = list(JOB_MAINT_TECH, JOB_WO_CMO), width = 950, height = 750)
if(!GLOB.RoleAuthority)
return
@@ -852,7 +869,7 @@ GLOBAL_LIST_INIT(be_special_flags, list(
* * width - Screen' width.
* * height - Screen's height.
*/
-/datum/preferences/proc/set_job_slots(mob/user, limit = 21, list/splitJobs = list(JOB_CHIEF_REQUISITION, JOB_WO_CMO), width = 950, height = 750)
+/datum/preferences/proc/set_job_slots(mob/user, limit = 21, list/splitJobs = list(JOB_MAINT_TECH, JOB_WO_CMO), width = 950, height = 750)
if(!GLOB.RoleAuthority)
return
@@ -950,23 +967,6 @@ GLOBAL_LIST_INIT(be_special_flags, list(
show_browser(user, HTML, "Set Records", "records", width = 350, height = 300)
return
-/datum/preferences/proc/SetFlavorText(mob/user)
- var/HTML = ""
- HTML += ""
- HTML += "You may include %bloodtype% %rank% or %name% as inserts."
- HTML += "Gameplay Toggles:
" + dat += "Enable Playtime Perks: [playtime_perks? "Yes" : "No"]" + if(user.client.can_skip_role_lock()) + dat += "Skip Playtime Ranks: [skip_playtime_ranks? "Yes" : "No"]
" dat += "Toggle Being Able to Hurt Yourself: \ [toggle_prefs & TOGGLE_IGNORE_SELF ? "Off" : "On"]
" dat += "Toggle Help Intent Safety: \ @@ -638,6 +658,8 @@ GLOBAL_LIST_INIT(be_special_flags, list( [toggle_prefs & TOGGLE_EJECT_MAGAZINE_TO_HAND ? "On" : "Off"]
" dat += "Toggle Automatic Punctuation: \ [toggle_prefs & TOGGLE_AUTOMATIC_PUNCTUATION ? "On" : "Off"]
" + dat += "Toggle Bullet Cocking to hand: \ + [toggle_prefs & TOGGLE_COCKING_TO_HAND ? "On" : "Off"]
" dat += "Toggle Leadership Spoken Orders: \ [toggle_prefs & TOGGLE_LEADERSHIP_SPOKEN_ORDERS ? "On" : "Off"]
" dat += "Toggle Combat Click-Drag Override: \ @@ -668,14 +690,7 @@ GLOBAL_LIST_INIT(be_special_flags, list( for(var/role_name in GLOB.be_special_flags) var/flag = GLOB.be_special_flags[role_name] - - var/ban_check_name - switch(role_name) - if("Xenomorph after unrevivable death") - ban_check_name = JOB_XENOMORPH - - if("Agent") - ban_check_name = "Agent" + var/ban_check_name = JOB_XENOMORPH // Ever a be_special_flags uses a different ban check, check and switch here if(ban_check_name && jobban_isbanned(user, ban_check_name)) dat += "Be [role_name]: \[BANNED]
" @@ -693,6 +708,8 @@ GLOBAL_LIST_INIT(be_special_flags, list( dat += "Spawn as Royal Marine: [toggles_ert_pred & PLAY_TWE ? "Yes" : "No"]
" dat += "Spawn as UPP: [toggles_ert_pred & PLAY_UPP ? "Yes" : "No"]
" dat += "Spawn as CLF: [toggles_ert_pred & PLAY_CLF ? "Yes" : "No"]
" + dat += "Spawn as PMC: [toggles_ert_pred & PLAY_PMC ? "Yes" : "No"]
" + dat += "Spawn as Miscellaneous: [toggles_ert_pred & PLAY_HUNT_MISC ? "Yes" : "No"]
" dat += "Spawn as Xeno T2: [toggles_ert_pred & PLAY_XENO_T2 ? "Yes" : "No"]
" dat += "Spawn as Xeno T3: [toggles_ert_pred & PLAY_XENO_T3 ? "Yes" : "No"]
" dat += "
" - HTML += "The %rank% will include a space after if applicable." - HTML += "
" - HTML += "General: " - HTML += TextPreview(flavor_texts["general"]) - HTML += "
" - HTML += "
" - HTML +="Done" - HTML += "" - close_browser(user, "preferences") - show_browser(user, HTML, "Set Flavor Text", "flavor_text", width = 410, height = 430) - return - /datum/preferences/proc/SetJob(mob/user, role, priority) var/datum/job/job = GLOB.RoleAuthority.roles_by_name[role] if(!job) @@ -1109,27 +1109,7 @@ GLOBAL_LIST_INIT(be_special_flags, list( return if("flavor_text") - switch(href_list["task"]) - if("open") - SetFlavorText(user) - return - if("done") - close_browser(user, "flavor_text") - ShowChoices(user) - return - if("general") - var/msg = input(usr,"Give a physical description of your character. This will be shown regardless of clothing.","Flavor Text",html_decode(flavor_texts[href_list["task"]])) as message - if(msg != null) - msg = copytext(msg, 1, MAX_MESSAGE_LEN) - msg = html_encode(msg) - flavor_texts[href_list["task"]] = msg - else - var/msg = input(usr,"Set the flavor text for your [href_list["task"]].","Flavor Text",html_decode(flavor_texts[href_list["task"]])) as message - if(msg != null) - msg = copytext(msg, 1, MAX_MESSAGE_LEN) - msg = html_encode(msg) - flavor_texts[href_list["task"]] = msg - SetFlavorText(user) + flavor_text_editor.tgui_interact(user) return if("records") @@ -1289,6 +1269,7 @@ GLOBAL_LIST_INIT(be_special_flags, list( var/datum/action/human_action/activable/ability = human.selected_ability human.set_selected_ability(null) human.set_selected_ability(ability) + if("synth_name") var/raw_name = input(user, "Choose your Synthetic's name:", "Character Preference") as text|null if(raw_name) // Check to ensure that the user entered text (rather than cancel.) @@ -1301,6 +1282,16 @@ GLOBAL_LIST_INIT(be_special_flags, list( var/new_synth_type = tgui_input_list(user, "Choose your model of synthetic:", "Make and Model", PLAYER_SYNTHS) if(new_synth_type) synthetic_type = new_synth_type + if("synth_specialisation") + var/list/options = list("Generalised", "Engineering", "Medical", "Intel", "Military Police", "Command") + + var/new_specialisation = tgui_input_list(user, "Choose your new Specialisation.", "Specialisation", options) + + if(!new_specialisation) + return + + synth_specialisation = new_specialisation + if("pred_name") var/raw_name = input(user, "Choose your Predator's name:", "Character Preference") as text|null if(raw_name) // Check to ensure that the user entered text (rather than cancel.) @@ -1362,10 +1353,15 @@ GLOBAL_LIST_INIT(be_special_flags, list( return predator_greave_material = new_pred_greave_mat if("pred_caster_mat") - var/new_pred_caster_mat = tgui_input_list(user, "Choose your caster material:", "Caster Material", PRED_MATERIALS + "retro") + var/new_pred_caster_mat = tgui_input_list(user, "Choose your caster material:", "Caster Material", PRED_RETRO_MATERIALS) if(!new_pred_caster_mat) return predator_caster_material = new_pred_caster_mat + if("pred_bracer_mat") + var/new_pred_bracer_mat = tgui_input_list(user, "Choose your bracer material:", "Bracer Material", PRED_RETRO_MATERIALS) + if(!new_pred_bracer_mat) + return + predator_bracer_material = new_pred_bracer_mat if("pred_cape_color") var/new_cape_color = input(user, "Choose your cape color:", "Cape Color", predator_cape_color) as color|null if(!new_cape_color) @@ -1796,6 +1792,8 @@ GLOBAL_LIST_INIT(be_special_flags, list( if("gender") if(gender == MALE) gender = FEMALE + else if(gender == FEMALE) + gender = PLURAL else gender = MALE underwear = sanitize_inlist(underwear, gender == MALE ? GLOB.underwear_m : GLOB.underwear_f, initial(underwear)) @@ -1851,6 +1849,9 @@ GLOBAL_LIST_INIT(be_special_flags, list( if("playtime_perks") playtime_perks = !playtime_perks + if("skip_playtime_ranks") + skip_playtime_ranks = !skip_playtime_ranks + if("show_queen_name") show_queen_name = !show_queen_name @@ -1897,6 +1898,9 @@ GLOBAL_LIST_INIT(be_special_flags, list( if("ghost_spyradio") toggles_chat ^= CHAT_LISTENINGBUG + if("ghost_announceclarity") + toggles_chat ^= CHAT_GHOSTANNOUNCECLARITY + if("ghost_hivemind") toggles_chat ^= CHAT_GHOSTHIVEMIND @@ -2017,6 +2021,7 @@ GLOBAL_LIST_INIT(be_special_flags, list( save_preferences() save_character() save_cooldown = world.time + 50 + to_chat(user, SPAN_WARNING(SPAN_BOLD("Successfully saved preferences."))) if("reload") if(reload_cooldown > world.time) @@ -2116,6 +2121,8 @@ GLOBAL_LIST_INIT(be_special_flags, list( character.flavor_texts["hands"] = flavor_texts["hands"] character.flavor_texts["legs"] = flavor_texts["legs"] character.flavor_texts["feet"] = flavor_texts["feet"] + character.flavor_texts["helmet"] = flavor_texts["helmet"] + character.flavor_texts["armor"] = flavor_texts["armor"] if(!be_random_name) character.med_record = strip_html(med_record) @@ -2190,8 +2197,7 @@ GLOBAL_LIST_INIT(be_special_flags, list( character.underwear = underwear character.undershirt = undershirt - if(backbag > 2 || backbag < 1) - backbag = 2 //Same as above + backbag = sanitize_integer(backbag, 1, length(GLOB.backbaglist), initial(backbag)) character.backbag = backbag //Debugging report to track down a bug, which randomly assigned the plural gender to people. @@ -2264,8 +2270,7 @@ GLOBAL_LIST_INIT(be_special_flags, list( character.underwear = underwear character.undershirt = undershirt - if(backbag > 2 || backbag < 1) - backbag = 2 //Same as above + backbag = sanitize_integer(backbag, 1, length(GLOB.backbaglist), initial(backbag)) character.backbag = backbag //Debugging report to track down a bug, which randomly assigned the plural gender to people. @@ -2462,6 +2467,7 @@ GLOBAL_LIST_INIT(be_special_flags, list( options[string_to_use] = slot owner.mob.sight = BLIND + /// This is causing Synthetics to not be on manifest at round start if they have a loadout due to delay in spawning. No idea how to fix it. var/selected = tgui_input_list(owner, "You have loadout available - which slot would you like to use?", "Slot Selection", options, theme = "crtgreen", timeout = timeout) owner.mob.sight = owner.mob::sight @@ -2506,3 +2512,17 @@ GLOBAL_LIST_INIT(be_special_flags, list( return return slots_with_stuff + +/datum/preferences/proc/get_all_chem_presets() + return chem_presets + +/datum/preferences/proc/get_chem_preset(preset_name) + return chem_presets[preset_name] + +/datum/preferences/proc/save_chem_preset(preset_name, list/preset_data) + chem_presets[preset_name] = preset_data + save_preferences() + +/datum/preferences/proc/delete_chem_preset(preset_name) + chem_presets -= preset_name + save_preferences() diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index 4155e0793e2d..3ef3f746b298 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -67,11 +67,11 @@ GLOBAL_LIST_EMPTY(roles_with_gear) /// Attempt to wear this equipment, in the given slot if possible. If not, any slot is used. /datum/gear/proc/equip_to_user(mob/living/carbon/human/user, override_checks = FALSE, drop_instead_of_del = TRUE) if(!override_checks && allowed_roles && !(user.job in allowed_roles)) - to_chat(user, SPAN_WARNING("Gear [display_name] cannot be equipped: Invalid Role")) + to_chat(user, SPAN_WARNING("Gear [display_name] cannot be equipped: Invalid Role.")) return if(!override_checks && allowed_origins && !(user.origin in allowed_origins)) - to_chat(user, SPAN_WARNING("Gear [display_name] cannot be equipped: Invalid Origin")) + to_chat(user, SPAN_WARNING("Gear [display_name] cannot be equipped: Invalid Origin.")) return if(!(slot && user.equip_to_slot_or_del(new path, slot))) @@ -465,19 +465,19 @@ GLOBAL_LIST_EMPTY(roles_with_gear) /datum/gear/helmet_garb/netting display_name = "Helmet netting" - path = /obj/item/prop/helmetgarb/netting + path = /obj/item/clothing/accessory/helmet/cover/netting /datum/gear/helmet_garb/netting/desert display_name = "Desert Helmet netting" - path = /obj/item/prop/helmetgarb/netting/desert + path = /obj/item/clothing/accessory/helmet/cover/netting/desert /datum/gear/helmet_garb/netting/jungle display_name = "Jungle Helmet netting" - path = /obj/item/prop/helmetgarb/netting/jungle + path = /obj/item/clothing/accessory/helmet/cover/netting/jungle /datum/gear/helmet_garb/netting/urban display_name = "Urban Helmet netting" - path = /obj/item/prop/helmetgarb/netting/urban + path = /obj/item/clothing/accessory/helmet/cover/netting/urban /datum/gear/helmet_garb/lucky_feather display_name = "Lucky feather, red" @@ -505,19 +505,19 @@ GLOBAL_LIST_EMPTY(roles_with_gear) /datum/gear/helmet_garb/raincover display_name = "Rain cover" - path = /obj/item/prop/helmetgarb/raincover + path = /obj/item/clothing/accessory/helmet/cover/raincover /datum/gear/helmet_garb/raincover/jungle display_name = "Jungle Rain cover" - path = /obj/item/prop/helmetgarb/raincover/jungle + path = /obj/item/clothing/accessory/helmet/cover/raincover/jungle /datum/gear/helmet_garb/raincover/desert display_name = "Desert Rain cover" - path = /obj/item/prop/helmetgarb/raincover/desert + path = /obj/item/clothing/accessory/helmet/cover/raincover/desert /datum/gear/helmet_garb/raincover/urban display_name = "Urban Rain cover" - path = /obj/item/prop/helmetgarb/raincover/urban + path = /obj/item/clothing/accessory/helmet/cover/raincover/urban /datum/gear/helmet_garb/rabbits_foot display_name = "Rabbit's foot" @@ -640,6 +640,11 @@ GLOBAL_LIST_EMPTY(roles_with_gear) path = /obj/item/device/camera fluff_cost = 2 +/datum/gear/toy/camera/disposable + display_name = "Old Disposable Camera" + path = /obj/item/device/camera/oldcamera + fluff_cost = 3 + /datum/gear/toy/mags fluff_cost = 1 @@ -1151,7 +1156,7 @@ GLOBAL_LIST_EMPTY(roles_with_gear) /datum/gear/misc/facepaint_body display_name = "Fullbody paint" path = /obj/item/facepaint/sniper - fluff_cost = 4 //To match with the skull paint amount of point, gave this amount of point for the same reason of the skull facepaint (too cool for everyone to be able to constantly use) + fluff_cost = 3 /datum/gear/misc/jungle_boots display_name = "Jungle pattern combat boots" @@ -1253,39 +1258,36 @@ GLOBAL_LIST_EMPTY(roles_with_gear) category = "Civilian only (restricted)" allowed_origins = list(ORIGIN_CIVILIAN) -/datum/gear/civilian/patch - display_name = "Weyland-Yutani shoulder patch, black" - path = /obj/item/clothing/accessory/patch/wy - fluff_cost = 1 - slot = WEAR_IN_ACCESSORY - -/datum/gear/civilian/patch/wysquare - display_name = "Weyland-Yutani shoulder patch" - path = /obj/item/clothing/accessory/patch/wysquare +///Commented out until we have a factional system to restrict these properly +// /datum/gear/civilian/patch +// display_name = "Weyland-Yutani shoulder patch, black" +// path = /obj/item/clothing/accessory/patch/wy +// fluff_cost = 1 +// slot = WEAR_IN_ACCESSORY -/datum/gear/civilian/patch/wy_white - display_name = "Weyland-Yutani shoulder patch, white" - path = /obj/item/clothing/accessory/patch/wy_white +// /datum/gear/civilian/patch/wysquare +// display_name = "Weyland-Yutani shoulder patch" +// path = /obj/item/clothing/accessory/patch/wysquare -/datum/gear/civilian/patch/wy_fury - display_name = "Weyland-Yutani Fury '161' patch" - path = /obj/item/clothing/accessory/patch/wyfury +// /datum/gear/civilian/patch/wy_white +// display_name = "Weyland-Yutani shoulder patch, white" +// path = /obj/item/clothing/accessory/patch/wy_white -/datum/gear/civilian/patch/twepatch - display_name = "Three World Empire shoulder patch" - path = /obj/item/clothing/accessory/patch/twe +// /datum/gear/civilian/patch/wy_fury +// display_name = "Weyland-Yutani Fury '161' patch" +// path = /obj/item/clothing/accessory/patch/wyfury -/datum/gear/civilian/patch/cec - display_name = "Cosmos Exploration Corps shoulder patch" - path = /obj/item/clothing/accessory/patch/cec_patch +// /datum/gear/civilian/patch/twepatch +// display_name = "Three World Empire shoulder patch" +// path = /obj/item/clothing/accessory/patch/twe -/datum/gear/civilian/patch/clf - display_name = "Colonial Liberation Front shoulder patch" - path = /obj/item/clothing/accessory/patch/clf_patch +// /datum/gear/civilian/patch/cec +// display_name = "Cosmos Exploration Corps shoulder patch" +// path = /obj/item/clothing/accessory/patch/cec_patch -/datum/gear/civilian/patch/hyperdyne - display_name = "Hyperdyne Corporation shoulder patch" - path = /obj/item/clothing/accessory/patch/hyperdyne_patch +// /datum/gear/civilian/patch/hyperdyne +// display_name = "Hyperdyne Corporation shoulder patch" +// path = /obj/item/clothing/accessory/patch/hyperdyne_patch // Misc Headwear diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index e0d0cf39069e..d8fea90d6a1a 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -1,5 +1,5 @@ #define SAVEFILE_VERSION_MIN 8 -#define SAVEFILE_VERSION_MAX 32 +#define SAVEFILE_VERSION_MAX 33 //handles converting savefiles to new formats //MAKE SURE YOU KEEP THIS UP TO DATE! @@ -223,6 +223,12 @@ pref_toggles |= TOGGLE_LEADERSHIP_SPOKEN_ORDERS // Enables it by default for new saves S["toggle_prefs"] << pref_toggles + if(savefile_version < 33) + var/pref_toggles + S["toggle_prefs"] >> pref_toggles + pref_toggles |= TOGGLE_COCKING_TO_HAND // enabled by default for new saves + S["toggle_prefs"] << pref_toggles + savefile_version = SAVEFILE_VERSION_MAX return 1 @@ -255,6 +261,7 @@ if(!path) return 0 if(!fexists(path)) + load_preferences_sanitize() // Ensure a new player gets same defaults as returning players return 0 var/savefile/S = new /savefile(path) if(!S) @@ -311,6 +318,7 @@ S["xeno_postfix"] >> xeno_postfix S["xeno_name_ban"] >> xeno_name_ban S["playtime_perks"] >> playtime_perks + S["skip_playtime_ranks"] >> skip_playtime_ranks S["show_queen_name"] >> show_queen_name S["xeno_vision_level_pref"] >> xeno_vision_level_pref S["view_controller"] >> View_MC @@ -320,6 +328,7 @@ S["synth_name"] >> synthetic_name S["synth_type"] >> synthetic_type + S["synth_specialisation"] >> synth_specialisation S["pred_name"] >> predator_name S["pred_gender"] >> predator_gender S["pred_age"] >> predator_age @@ -334,6 +343,7 @@ S["pred_armor_mat"] >> predator_armor_material S["pred_greave_mat"] >> predator_greave_material S["pred_caster_mat"] >> predator_caster_material + S["pred_bracer_mat"] >> predator_bracer_material S["pred_cape_color"] >> predator_cape_color S["pred_h_style"] >> predator_h_style S["pred_skin_color"] >> predator_skin_color @@ -369,6 +379,8 @@ S["tooltips"] >> tooltips S["key_bindings"] >> key_bindings + S["custom_keybinds"] >> custom_keybinds + S["tgui_lock"] >> tgui_lock S["tgui_fancy"] >> tgui_fancy S["window_scale"] >> window_scale @@ -379,6 +391,7 @@ var/list/remembered_key_bindings S["remembered_key_bindings"] >> remembered_key_bindings + remembered_key_bindings = sanitize_islist(remembered_key_bindings, null) S["lastchangelog"] >> lastchangelog @@ -387,7 +400,40 @@ S["show_cooldown_messages"] >> show_cooldown_messages + S["chem_presets"] >> chem_presets + //Sanitize + load_preferences_sanitize() + + check_keybindings() + S["key_bindings"] << key_bindings + + if(remembered_key_bindings) + for(var/i in GLOB.keybindings_by_name) + if(!(i in remembered_key_bindings)) + var/datum/keybinding/instance = GLOB.keybindings_by_name[i] + // Classic + if(LAZYLEN(instance.classic_keys)) + for(var/bound_key in instance.classic_keys) + LAZYADD(key_bindings[bound_key], list(instance.name)) + + // Hotkey + if(LAZYLEN(instance.hotkey_keys)) + for(var/bound_key in instance.hotkey_keys) + LAZYADD(key_bindings[bound_key], list(instance.name)) + + S["remembered_key_bindings"] << GLOB.keybindings_by_name + + load_custom_keybinds() + + if(toggles_chat & SHOW_TYPING) + owner.typing_indicators = FALSE + else + owner.typing_indicators = TRUE + + return 1 + +/datum/preferences/proc/load_preferences_sanitize() ooccolor = sanitize_hexcolor(ooccolor, CONFIG_GET(string/ooc_color_default)) lastchangelog = sanitize_text(lastchangelog, initial(lastchangelog)) UI_style = sanitize_inlist(UI_style, list("white", "dark", "midnight", "orange", "old"), initial(UI_style)) @@ -418,7 +464,8 @@ ghost_vision_pref = sanitize_inlist(ghost_vision_pref, list(GHOST_VISION_LEVEL_NO_NVG, GHOST_VISION_LEVEL_MID_NVG, GHOST_VISION_LEVEL_HIGH_NVG, GHOST_VISION_LEVEL_FULL_NVG), GHOST_VISION_LEVEL_MID_NVG) ghost_orbit = sanitize_inlist(ghost_orbit, GLOB.ghost_orbits, initial(ghost_orbit)) auto_observe = sanitize_integer(auto_observe, 0, 1, 1) - playtime_perks = sanitize_integer(playtime_perks, 0, 1, 1) + playtime_perks = sanitize_integer(playtime_perks, 0, 1, 1) + skip_playtime_ranks = sanitize_integer(skip_playtime_ranks, 0, 1, 1) show_queen_name = sanitize_integer(show_queen_name, FALSE, TRUE, FALSE) xeno_vision_level_pref = sanitize_inlist(xeno_vision_level_pref, list(XENO_VISION_LEVEL_NO_NVG, XENO_VISION_LEVEL_MID_NVG, XENO_VISION_LEVEL_HIGH_NVG, XENO_VISION_LEVEL_FULL_NVG), XENO_VISION_LEVEL_MID_NVG) hear_vox = sanitize_integer(hear_vox, FALSE, TRUE, TRUE) @@ -431,6 +478,7 @@ synthetic_name = synthetic_name ? sanitize_text(synthetic_name, initial(synthetic_name)) : initial(synthetic_name) synthetic_type = sanitize_inlist(synthetic_type, PLAYER_SYNTHS, initial(synthetic_type)) + synth_specialisation = sanitize_inlist(synth_specialisation, list("Generalised", "Engineering", "Medical", "Intel", "Military Police", "Command"), initial(synth_specialisation)) predator_name = predator_name ? sanitize_text(predator_name, initial(predator_name)) : initial(predator_name) predator_gender = sanitize_text(predator_gender, initial(predator_gender)) predator_age = sanitize_integer(predator_age, 100, 10000, initial(predator_age)) @@ -444,7 +492,8 @@ predator_mask_material = sanitize_inlist(predator_mask_material, PRED_MATERIALS, initial(predator_mask_material)) predator_armor_material = sanitize_inlist(predator_armor_material, PRED_MATERIALS, initial(predator_armor_material)) predator_greave_material = sanitize_inlist(predator_greave_material, PRED_MATERIALS, initial(predator_greave_material)) - predator_caster_material = sanitize_inlist(predator_caster_material, PRED_MATERIALS + "retro", initial(predator_caster_material)) + predator_caster_material = sanitize_inlist(predator_caster_material, PRED_RETRO_MATERIALS, initial(predator_caster_material)) + predator_bracer_material = sanitize_inlist(predator_bracer_material, PRED_RETRO_MATERIALS, initial(predator_bracer_material)) predator_cape_color = sanitize_hexcolor(predator_cape_color, initial(predator_cape_color)) predator_h_style = sanitize_inlist(predator_h_style, GLOB.yautja_hair_styles_list, initial(predator_h_style)) predator_skin_color = sanitize_inlist(predator_skin_color, PRED_SKIN_COLOR, initial(predator_skin_color)) @@ -470,7 +519,6 @@ fax_name_clf = fax_name_clf ? sanitize_text(fax_name_clf, initial(fax_name_clf)) : generate_name(FACTION_CLF) key_bindings = sanitize_keybindings(key_bindings) - remembered_key_bindings = sanitize_islist(remembered_key_bindings, null) hotkeys = sanitize_integer(hotkeys, FALSE, TRUE, TRUE) custom_cursors = sanitize_integer(custom_cursors, FALSE, TRUE, TRUE) pref_special_job_options = sanitize_islist(pref_special_job_options, list()) @@ -481,36 +529,18 @@ show_cooldown_messages = sanitize_integer(show_cooldown_messages, FALSE, TRUE, FALSE) - check_keybindings() - S["key_bindings"] << key_bindings - - if(remembered_key_bindings) - for(var/i in GLOB.keybindings_by_name) - if(!(i in remembered_key_bindings)) - var/datum/keybinding/instance = GLOB.keybindings_by_name[i] - // Classic - if(LAZYLEN(instance.classic_keys)) - for(var/bound_key in instance.classic_keys) - LAZYADD(key_bindings[bound_key], list(instance.name)) - - // Hotkey - if(LAZYLEN(instance.hotkey_keys)) - for(var/bound_key in instance.hotkey_keys) - LAZYADD(key_bindings[bound_key], list(instance.name)) - - S["remembered_key_bindings"] << GLOB.keybindings_by_name - - if(toggles_chat & SHOW_TYPING) - owner.typing_indicators = FALSE - else - owner.typing_indicators = TRUE + chem_presets = sanitize_islist(chem_presets, list()) if(!observer_huds) observer_huds = list("Medical HUD" = FALSE, "Security HUD" = FALSE, "Squad HUD" = FALSE, "Xeno Status HUD" = FALSE, HUD_MENTOR_SIGHT = FALSE) volume_preferences = sanitize_volume_preferences(volume_preferences, list(1, 0.5, 1, 0.6)) // Game, music, admin midis, lobby music - return 1 + if(!islist(custom_keybinds)) + custom_keybinds = new /list(KEYBIND_CUSTOM_MAX) + + if(length(custom_keybinds) != KEYBIND_CUSTOM_MAX) + custom_keybinds.len = KEYBIND_CUSTOM_MAX /datum/preferences/proc/save_preferences() if(!path) @@ -564,6 +594,7 @@ S["xeno_name_ban"] << xeno_name_ban S["xeno_vision_level_pref"] << xeno_vision_level_pref S["playtime_perks"] << playtime_perks + S["skip_playtime_ranks"] << skip_playtime_ranks S["show_queen_name"] << show_queen_name S["view_controller"] << View_MC @@ -573,6 +604,7 @@ S["synth_name"] << synthetic_name S["synth_type"] << synthetic_type + S["synth_specialisation"] << synth_specialisation S["pred_name"] << predator_name S["pred_gender"] << predator_gender S["pred_age"] << predator_age @@ -587,6 +619,7 @@ S["pred_armor_mat"] << predator_armor_material S["pred_greave_mat"] << predator_greave_material S["pred_caster_mat"] << predator_caster_material + S["pred_bracer_mat"] << predator_bracer_material S["pred_cape_color"] << predator_cape_color S["pred_h_style"] << predator_h_style S["pred_skin_color"] << predator_skin_color @@ -636,6 +669,10 @@ S["show_cooldown_messages"] << show_cooldown_messages + S["chem_presets"] << chem_presets + + S["custom_keybinds"] << custom_keybinds + return TRUE /datum/preferences/proc/load_character(slot) @@ -708,6 +745,9 @@ S["flavor_texts_hands"] >> flavor_texts["hands"] S["flavor_texts_legs"] >> flavor_texts["legs"] S["flavor_texts_feet"] >> flavor_texts["feet"] + S["flavor_texts_helmet"] >> flavor_texts["helmet"] + S["flavor_texts_armor"] >> flavor_texts["armor"] + //Miscellaneous S["med_record"] >> med_record @@ -871,6 +911,8 @@ S["flavor_texts_hands"] << flavor_texts["hands"] S["flavor_texts_legs"] << flavor_texts["legs"] S["flavor_texts_feet"] << flavor_texts["feet"] + S["flavor_texts_helmet"] << flavor_texts["helmet"] + S["flavor_texts_armor"] << flavor_texts["armor"] //Miscellaneous S["med_record"] << med_record @@ -943,7 +985,7 @@ to_chat(owner, SPAN_ALERTWARNING("Keybinding Conflict")) to_chat(owner, SPAN_ALERTWARNING("There are new keybindings that default to keys you've already bound. The new ones will be unbound.")) for(var/datum/keybinding/conflicted as anything in notadded) - to_chat(owner, SPAN_DANGER("[conflicted.category]: [conflicted.full_name] needs updating")) + to_chat(owner, SPAN_DANGER("[conflicted.category]: [conflicted.full_name] needs updating.")) if(hotkeys) for(var/entry in conflicted.hotkey_keys) @@ -954,5 +996,20 @@ LAZYADD(key_bindings["Unbound"], conflicted.name) // set it to unbound to prevent this from opening up again in the future +/datum/preferences/proc/load_custom_keybinds() + key_to_custom_keybind = list() + + for(var/keybind in custom_keybinds) + if(!("keybinding" in keybind)) + continue // unbound + + var/datum/keybinding/custom/custom_key = new + custom_key.keybind_type = keybind["type"] + custom_key.contents = keybind["contents"] + custom_key.when_human = keybind["when_human"] + custom_key.when_xeno = keybind["when_xeno"] + + key_to_custom_keybind[keybind["keybinding"]] = custom_key + #undef SAVEFILE_VERSION_MAX #undef SAVEFILE_VERSION_MIN diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm index 92a1b16182aa..b03d7e4dfd83 100644 --- a/code/modules/client/preferences_toggles.dm +++ b/code/modules/client/preferences_toggles.dm @@ -2,17 +2,17 @@ /client/proc/toggle_hear_radio() set name = "Show/Hide Radio Chatter" set category = "Preferences.Chat" - set desc = "Toggle seeing radio chatter from radios and speakers" + set desc = "Toggle seeing radio chatter from radios and speakers." if(!admin_holder) return prefs.toggles_chat ^= CHAT_RADIO prefs.save_preferences() - to_chat(usr, SPAN_BOLDNOTICE("You will [(prefs.toggles_chat & CHAT_RADIO) ? "now" : "no longer"] see radio chatter from radios or speakers")) + to_chat(usr, SPAN_BOLDNOTICE("You will [(prefs.toggles_chat & CHAT_RADIO) ? "now" : "no longer"] see radio chatter from radios or speakers.")) /client/proc/toggleadminhelpsound() set name = "Hear/Silence Adminhelps" set category = "Preferences.Sound" - set desc = "Toggle hearing a notification when admin PMs are received" + set desc = "Toggle hearing a notification when admin PMs are received." if(!admin_holder) return prefs.toggles_sound ^= SOUND_ADMINHELP @@ -22,7 +22,7 @@ /client/proc/toggleprayers() set name = "Show/Hide Prayers" set category = "Preferences.Chat" - set desc = "Toggles seeing prayers" + set desc = "Toggles seeing prayers." prefs.toggles_chat ^= CHAT_PRAYER prefs.save_preferences() to_chat(src, SPAN_BOLDNOTICE("You will [(prefs.toggles_chat & CHAT_PRAYER) ? "now" : "no longer"] see prayerchat.")) @@ -46,7 +46,7 @@ CLIENT_VERB(toggle_fax_machine_sounds) CLIENT_VERB(toggletitlemusic) set name = "Hear/Silence LobbyMusic" set category = "Preferences.Sound" - set desc = "Toggles hearing the GameLobby music" + set desc = "Toggles hearing the GameLobby music." prefs.toggles_sound ^= SOUND_LOBBY prefs.save_preferences() if(prefs.toggles_sound & SOUND_LOBBY) @@ -74,7 +74,7 @@ CLIENT_VERB(togglemidis) CLIENT_VERB(togglechat) set name = "Toggle Abovehead Chat" set category = "Preferences.Chat" - set desc = "Toggles abovehead chat until you change body" + set desc = "Toggles abovehead chat until you change body." prefs.lang_chat_disabled = ~prefs.lang_chat_disabled prefs.save_preferences() @@ -83,7 +83,7 @@ CLIENT_VERB(togglechat) CLIENT_VERB(togglechatemotes) set name = "Toggle Abovehead Chat Emotes" set category = "Preferences.Chat" - set desc = "Toggles seeing emotes in abovehead chat" + set desc = "Toggles seeing emotes in abovehead chat." prefs.toggles_langchat ^= LANGCHAT_SEE_EMOTES prefs.save_preferences() @@ -101,7 +101,7 @@ CLIENT_VERB(toggle_permission_errors) CLIENT_VERB(listen_ooc) set name = "Show/Hide OOC" set category = "Preferences.Chat" - set desc = "Toggles seeing OutOfCharacter chat" + set desc = "Toggles seeing OutOfCharacter chat." prefs.toggles_chat ^= CHAT_OOC prefs.save_preferences() to_chat(src, SPAN_BOLDNOTICE("You will [(prefs.toggles_chat & CHAT_OOC) ? "now" : "no longer"] see messages on the OOC channel.")) @@ -109,7 +109,7 @@ CLIENT_VERB(listen_ooc) CLIENT_VERB(listen_looc) set name = "Show/Hide LOOC" set category = "Preferences.Chat" - set desc = "Toggles seeing Local OutOfCharacter chat" + set desc = "Toggles seeing Local OutOfCharacter chat." prefs.toggles_chat ^= CHAT_LOOC prefs.save_preferences() @@ -118,7 +118,7 @@ CLIENT_VERB(listen_looc) CLIENT_VERB(Toggle_Soundscape) //All new ambience should be added here so it works with this verb until someone better at things comes up with a fix that isn't awful set name = "Hear/Silence Ambience" set category = "Preferences.Sound" - set desc = "Toggles hearing ambient sound effects" + set desc = "Toggles hearing ambient sound effects." prefs.toggles_sound ^= SOUND_AMBIENCE prefs.save_preferences() if(prefs.toggles_sound & SOUND_AMBIENCE) @@ -207,7 +207,7 @@ CLIENT_VERB(toggle_adminpm_flash) CLIENT_VERB(toggle_be_special) set name = "Toggle SpecialRole Candidacy" set category = "Preferences" - set desc = "Toggles which special roles you would like to be a candidate for, during events." + set desc = "Toggles which special roles you would like to be a candidate for." var/role = tgui_input_list(usr, "Toggle which candidacy?", "Select role", GLOB.be_special_flags) if(!role) @@ -263,7 +263,7 @@ CLIENT_VERB(toggle_ooc_country_flag) CLIENT_VERB(toggle_prefs) // Toggle whether anything will happen when you click yourself in non-help intent set name = "Toggle Preferences" set category = "Preferences" - set desc = "Toggles a specific toggleable preference" + set desc = "Toggles a specific toggleable preference." var/list/pref_buttons = list( "Toggle the Ability to Hurt Yourself
", @@ -286,6 +286,7 @@ CLIENT_VERB(toggle_prefs) // Toggle whether anything will happen when you click "Set Crit Type
", "Set Flashing Lights
", "Toggle Leadership Spoken Orders
", + "Toggle Bullet Cocking to hand
", ) var/dat = "" @@ -327,7 +328,7 @@ CLIENT_VERB(toggle_prefs) // Toggle whether anything will happen when you click /client/proc/toggle_ammo_display_type() prefs.toggle_prefs ^= TOGGLE_AMMO_DISPLAY_TYPE - to_chat(usr, SPAN_NOTICE("Guns in semi-automatic mode will now display the ammo on every [SPAN_BOLD(prefs.toggle_prefs & TOGGLE_AMMO_DISPLAY_TYPE ? "fifth bullet and when the mag has less than 15 rounds left" : "single bullet")]")) + to_chat(usr, SPAN_NOTICE("Guns in semi-automatic mode will now display the ammo on every [SPAN_BOLD(prefs.toggle_prefs & TOGGLE_AMMO_DISPLAY_TYPE ? "fifth bullet and when the mag has less than 15 rounds left" : "single bullet")].")) prefs.save_preferences() /client/proc/toggle_auto_eject_to_hand() // Toggle whether guns with auto-ejectors will eject their magazines to your offhand @@ -391,6 +392,15 @@ CLIENT_VERB(toggle_prefs) // Toggle whether anything will happen when you click to_chat(src, SPAN_BOLDNOTICE("Your leadership orders will now be verbally spoken.")) prefs.save_preferences() +/// Toggles whether cocking a gun should drop its bullet or moves it to your empty hand +/client/proc/toggle_cocking_to_hand() + prefs.toggle_prefs ^= TOGGLE_COCKING_TO_HAND + if(prefs.toggle_prefs & TOGGLE_COCKING_TO_HAND) + to_chat(src, SPAN_BOLDNOTICE("You will attempt to catch the ejected bullet when cocking a gun.")) + else + to_chat(src, SPAN_BOLDNOTICE("You will now drop the ejected bullet when cocking a gun.")) + prefs.save_preferences() + ///Toggle whether dual-wielding fires both guns at once or swaps between them. /client/proc/toggle_dualwield() if(prefs.dual_wield_pref < DUAL_WIELD_NONE) @@ -527,7 +537,7 @@ CLIENT_VERB(toggle_prefs) // Toggle whether anything will happen when you click CLIENT_VERB(toggle_tgui_say) set name = "Toggle Say Input Style" set category = "Preferences.UI" - set desc = "Toggle your Input Style" + set desc = "Toggle your Input Style." var/result = tgui_alert(src, "Which input style do you want?", "Input Style", list("Modern", "Legacy")) if(!result) @@ -545,7 +555,7 @@ CLIENT_VERB(toggle_tgui_say) CLIENT_VERB(toggle_tgui_say_light_mode) set name = "Toggle Say Input Color" set category = "Preferences.UI" - set desc = "Toggle your Input Color" + set desc = "Toggle your Input Color." var/result = tgui_alert(src, "Which input color do you want?", "Input Style", list("Darkmode", "Lightmode")) if(!result) @@ -562,7 +572,7 @@ CLIENT_VERB(toggle_tgui_say_light_mode) CLIENT_VERB(toggle_custom_cursors) set name = "Toggle Custom Cursors" set category = "Preferences.UI" - set desc = "Toggle Custom Cursors" + set desc = "Toggle Custom Cursors." do_toggle_custom_cursors() @@ -660,7 +670,7 @@ CLIENT_VERB(toggle_adaptive_zooming) /client/proc/toggle_ghost_hivemind() set name = "Toggle GhostHivemind" set category = "Preferences.Ghost" - set desc = "Toggle seeing all chatter from the Xenomorph Hivemind" + set desc = "Toggle seeing all chatter from the Xenomorph Hivemind." prefs.toggles_chat ^= CHAT_GHOSTHIVEMIND to_chat(src,SPAN_BOLDNOTICE( "As a ghost, you will [(prefs.toggles_chat & CHAT_GHOSTHIVEMIND) ? "now see chatter from the Xenomorph Hivemind" : "no longer see chatter from the Xenomorph Hivemind"].")) prefs.save_preferences() @@ -680,7 +690,7 @@ CLIENT_VERB(toggle_adaptive_zooming) /client/proc/toggle_ghost_ears() set name = "Toggle GhostEars" set category = "Preferences.Ghost" - set desc = "Toggle Between seeing all mob speech, and only speech of nearby mobs" + set desc = "Toggle between seeing all mob speech, and only speech of nearby mobs." prefs.toggles_chat ^= CHAT_GHOSTEARS to_chat(src, SPAN_BOLDNOTICE("As a ghost, you will now [(prefs.toggles_chat & CHAT_GHOSTEARS) ? "see all speech in the world" : "only see speech from nearby mobs"].")) prefs.save_preferences() @@ -688,7 +698,7 @@ CLIENT_VERB(toggle_adaptive_zooming) /client/proc/toggle_ghost_sight() set name = "Toggle GhostSight" set category = "Preferences.Ghost" - set desc = "Toggle Between seeing all mob emotes, and only emotes of nearby mobs" + set desc = "Toggle between seeing all mob emotes, and only emotes of nearby mobs." prefs.toggles_chat ^= CHAT_GHOSTSIGHT to_chat(src, SPAN_BOLDNOTICE("As a ghost, you will now [(prefs.toggles_chat & CHAT_GHOSTSIGHT) ? "see all emotes in the world" : "only see emotes from nearby mobs"].")) prefs.save_preferences() @@ -696,7 +706,7 @@ CLIENT_VERB(toggle_adaptive_zooming) /client/proc/toggle_ghost_radio() set name = "Toggle GhostRadio" set category = "Preferences.Ghost" - set desc = "Toggle between hearing all radio chatter, or only from nearby speakers" + set desc = "Toggle between hearing all radio chatter, or only from nearby speakers." prefs.toggles_chat ^= CHAT_GHOSTRADIO to_chat(src,SPAN_BOLDNOTICE( "As a ghost, you will now [(prefs.toggles_chat & CHAT_GHOSTRADIO) ? "hear all radio chat in the world" : "only hear from nearby speakers"].")) prefs.save_preferences() @@ -709,6 +719,14 @@ CLIENT_VERB(toggle_adaptive_zooming) to_chat(src,SPAN_BOLDNOTICE( "As a ghost, you will [(prefs.toggles_chat & CHAT_LISTENINGBUG) ? "now" : "no longer"] hear listening devices as a ghost.")) prefs.save_preferences() +/client/proc/toggle_ghost_announce_clarity() + set name = "Toggle Ghost Announce Clarity" + set category = "Preferences.Ghost" + set desc = "Toggle between seeing announcements always in full clarity, or with the current clarity for the observed z-level." + prefs.toggles_chat ^= CHAT_GHOSTANNOUNCECLARITY + to_chat(src, SPAN_BOLDNOTICE("As a ghost, you will now see announcements in [(prefs.toggles_chat & CHAT_GHOSTANNOUNCECLARITY) ? "full clarity always" : "partial clarity if applicable"].")) + prefs.save_preferences() + /client/proc/toggle_ghost_hud() set name = "Toggle Ghost HUDs" set category = "Preferences.Ghost" @@ -764,7 +782,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE, GHOST_ORBIT_TRIANGLE, GH /client/proc/pick_ghost_orbit() set name = "Pick Ghost Orbit Shape" set category = "Preferences.Ghost" - set desc = "Toggle in what manner you orbit mobs while a ghost" + set desc = "Toggle in what manner you orbit mobs while a ghost." var/new_orbit = tgui_input_list(src, "Choose your ghostly orbit:", "Ghost Customization", GLOB.ghost_orbits) if(!new_orbit) return @@ -802,7 +820,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE, GHOST_ORBIT_TRIANGLE, GH /client/proc/toggle_chat_shooting() set name = "Toggle Firing Messages" set category = "Preferences.Combat" - set desc = ".Enable or Disable messages informing about weapon fire" + set desc = ".Enable or Disable messages informing about weapon fire." prefs.chat_display_preferences ^= CHAT_TYPE_WEAPON_USE to_chat(src,SPAN_BOLDNOTICE( "As a player, you will now [(prefs.chat_display_preferences & CHAT_TYPE_WEAPON_USE) ? "see all weapon fire messages" : "never see weapon fire messages"].")) prefs.save_preferences() @@ -810,7 +828,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE, GHOST_ORBIT_TRIANGLE, GH /client/proc/toggle_chat_xeno_attack() set name = "Toggle Xeno Attack Messages" set category = "Preferences.Combat" - set desc = ".Enable or Disable messages informing about xeno attacks" + set desc = ".Enable or Disable messages informing about xeno attacks." prefs.chat_display_preferences ^= CHAT_TYPE_XENO_COMBAT to_chat(src, SPAN_BOLDNOTICE("As a player, you will now [(prefs.chat_display_preferences & CHAT_TYPE_XENO_COMBAT) ? "see all xeno attack messages" : "never see xeno attack messages"].")) prefs.save_preferences() @@ -818,7 +836,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE, GHOST_ORBIT_TRIANGLE, GH /client/proc/toggle_chat_xeno_armor() set name = "Toggle Xeno Armor Messages" set category = "Preferences.Combat" - set desc = ".Enable or Disable messages informing about xeno armor" + set desc = ".Enable or Disable messages informing about xeno armor." prefs.chat_display_preferences ^= CHAT_TYPE_ARMOR_DAMAGE to_chat(src, SPAN_BOLDNOTICE("As a player, you will now [(prefs.chat_display_preferences & CHAT_TYPE_ARMOR_DAMAGE) ? "see all xeno armor messages" : "never see xeno armor messages"].")) prefs.save_preferences() @@ -826,7 +844,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE, GHOST_ORBIT_TRIANGLE, GH /client/proc/toggle_chat_someone_hit() set name = "Toggle Someone Hit Messages" set category = "Preferences.Combat" - set desc = ".Enable or Disable messages informing about someone being hit" + set desc = ".Enable or Disable messages informing about someone being hit." prefs.chat_display_preferences ^= CHAT_TYPE_TAKING_HIT to_chat(src,SPAN_BOLDNOTICE( "As a player, you will now [(prefs.chat_display_preferences & CHAT_TYPE_TAKING_HIT) ? "see all player hit messages" : "never see player hit messages"].")) prefs.save_preferences() @@ -834,7 +852,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE, GHOST_ORBIT_TRIANGLE, GH /client/proc/toggle_chat_you_hit() set name = "Toggle You Hit Messages" set category = "Preferences.Combat" - set desc = ".Enable or Disable messages informing about you being hit" + set desc = ".Enable or Disable messages informing about you being hit." prefs.chat_display_preferences ^= CHAT_TYPE_BEING_HIT to_chat(src,SPAN_BOLDNOTICE( "As a player, you will now [(prefs.chat_display_preferences & CHAT_TYPE_BEING_HIT) ? "see you being hit messages" : "never see you being hit messages"].")) prefs.save_preferences() @@ -842,7 +860,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE, GHOST_ORBIT_TRIANGLE, GH /client/proc/toggle_chat_you_pain() set name = "Toggle Pain Messages" set category = "Preferences.Combat" - set desc = ".Enable or Disable messages informing about you being in pain" + set desc = ".Enable or Disable messages informing about you being in pain." prefs.chat_display_preferences ^= CHAT_TYPE_PAIN to_chat(src, SPAN_BOLDNOTICE("As a player, you will now [(prefs.chat_display_preferences & CHAT_TYPE_PAIN) ? "see you being in pain messages" : "never see you being in pain messages"].")) prefs.save_preferences() @@ -861,6 +879,7 @@ GLOBAL_LIST_INIT(ghost_prefs_verbs, list( /client/proc/toggle_ghost_sight, /client/proc/toggle_ghost_radio, /client/proc/toggle_ghost_spyradio, + /client/proc/toggle_ghost_announce_clarity, /client/proc/toggle_ghost_hivemind, /client/proc/deadchat, /client/proc/toggle_ghost_hud, diff --git a/code/modules/client/tgui_macro.dm b/code/modules/client/tgui_macro.dm index 28939fed69ca..52758ef2ba74 100644 --- a/code/modules/client/tgui_macro.dm +++ b/code/modules/client/tgui_macro.dm @@ -24,11 +24,16 @@ GLOBAL_LIST_EMPTY(ui_data_keybindings) /datum/tgui_macro/ui_data(mob/user) . = list() .["player_keybinds"] = prefs.key_bindings + .["custom_keybinds"] = prefs.custom_keybinds /datum/tgui_macro/ui_static_data(mob/user) . = list() .["glob_keybinds"] = GLOB.ui_data_keybindings .["byond_keymap"] = GLOB._kbMap + .["max_custom_keybinds"] = KEYBIND_CUSTOM_MAX + .["max_custom_keybind_picksays"] = KEYBIND_CUSTOM_PICKSAY_MAX + .["max_say_length"] = MAX_MESSAGE_LEN + .["max_emote_length"] = MAX_EMOTE_LEN /datum/tgui_macro/ui_state(mob/user) return GLOB.always_state @@ -122,6 +127,55 @@ GLOBAL_LIST_EMPTY(ui_data_keybindings) INVOKE_ASYNC(owner, /client/proc/set_macros) return TRUE + if("set_custom_keybinds") + var/index = params["index"] + if(index > KEYBIND_CUSTOM_MAX) + return TRUE + + var/keybind_type = params["keybind_type"] + if(!(keybind_type in list(KEYBIND_TYPE_SAY, KEYBIND_TYPE_ME, KEYBIND_TYPE_PICKSAY))) + return TRUE + + var/keybind = params["keybind"] + if(!keybind) + return TRUE + + var/contents = params["contents"] + + switch(keybind_type) + if(KEYBIND_TYPE_PICKSAY) + if(!islist(contents)) + contents = list(contents) + + var/list/list_contents = contents + if(length(contents) > KEYBIND_CUSTOM_PICKSAY_MAX) + list_contents.len = KEYBIND_CUSTOM_PICKSAY_MAX + + for(var/i in 1 to length(contents)) + list_contents[i] = strip_html(contents[i], MAX_EMOTE_LEN) + + if(KEYBIND_TYPE_ME) + if(islist(contents)) + contents = jointext(contents, ", ") + contents = strip_html(contents, MAX_EMOTE_LEN) + + else + if(islist(contents)) + contents = jointext(contents, ", ") + contents = strip_html(contents, MAX_MESSAGE_LEN) + + for(var/i in GLOB._kbMap) + keybind = replacetext(keybind, i, GLOB._kbMap[i]) + + var/when_human = sanitize_integer(params["when_human"], FALSE, TRUE, TRUE) + var/when_xeno = sanitize_integer(params["when_xeno"], FALSE, TRUE, TRUE) + + prefs.custom_keybinds[index] = list("type" = keybind_type, "keybinding" = keybind, "contents" = contents, "when_human" = when_human, "when_xeno" = when_xeno) + prefs.load_custom_keybinds() + + prefs.save_preferences() + return TRUE + if("clear_all_keybinds") var/choice = tgui_alert(owner, "Would you prefer 'hotkey' or 'classic' defaults?", "Setup keybindings", list("Hotkey", "Classic", "Cancel")) if(choice == "Cancel") diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index c9487a22151c..6c0c90c7b7f4 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -37,6 +37,7 @@ // copies the properties of the clothing item to the accessory, in the future, take literally almost every var from ties.dm parent object and place it in clothing parent var/obj/item/clothing/accessory/new_accessory = new accessory_path(loc) new_accessory.name = name + new_accessory.color = color new_accessory.icon = icon new_accessory.icon_state = icon_state new_accessory.desc = desc @@ -59,7 +60,7 @@ user.put_in_hands(new_accessory) to_chat(user, SPAN_NOTICE("You will start wearing [src] as an accessory.")) - // we dont want duplicates man + // we don't want duplicates man qdel(src) /obj/item/clothing/proc/revert_from_accessory(mob/user) @@ -74,6 +75,7 @@ return if(ismob(loc) && loc == user) + original_item.color = access.color user.put_in_hands(original_item) to_chat(user, SPAN_NOTICE("You will start wearing [src] as normal.")) @@ -232,6 +234,7 @@ icon = 'icons/obj/items/clothing/suits/misc_ert.dmi' var/fire_resist = T0C+100 flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS allowed = list( /obj/item/device/flashlight, /obj/item/device/healthanalyzer, @@ -293,6 +296,7 @@ var/wired = 0 var/obj/item/cell/cell = 0 flags_armor_protection = BODY_FLAG_HANDS + flags_bodypart_hidden = BODY_FLAG_HANDS flags_equip_slot = SLOT_HANDS attack_verb = list("challenged") valid_accessory_slots = list(ACCESSORY_SLOT_WRIST_L, ACCESSORY_SLOT_WRIST_R) @@ -421,6 +425,7 @@ gender = PLURAL //Carn: for grammarically correct text-parsing siemens_coefficient = 0.9 flags_armor_protection = BODY_FLAG_FEET + flags_bodypart_hidden = BODY_FLAG_FEET flags_equip_slot = SLOT_FEET slowdown = SHOES_SLOWDOWN @@ -522,12 +527,24 @@ if(clothing_traits_active) for(var/trait in clothing_traits) ADD_TRAIT(user, trait, TRAIT_SOURCE_EQUIPMENT(slot)) + + if(LAZYLEN(accessories)) + for(var/obj/item/clothing/accessory/usable in accessories) + if(LAZYLEN(usable.actions)) + for(var/datum/action/action in usable.actions) + action.give_to(user) ..() /obj/item/clothing/unequipped(mob/user, slot) if(is_valid_slot(slot, TRUE)) for(var/trait in clothing_traits) REMOVE_TRAIT(user, trait, TRAIT_SOURCE_EQUIPMENT(slot)) + + if(LAZYLEN(accessories)) + for(var/obj/item/clothing/accessory/usable in accessories) + if(LAZYLEN(usable.actions)) + for(var/datum/action/action in usable.actions) + action.remove_from(user) . = ..() /obj/item/clothing/proc/get_pockets() diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index b08eef3825a4..1b633f913371 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -134,6 +134,7 @@ H.remove_hud_from(user, src) user.glasses = null user.update_inv_glasses() + user.update_glass_vision(src) user.update_sight() return ..() @@ -167,7 +168,7 @@ icon_state = "purple" item_state = "glasses" deactive_state = "purple_off" - actions_types = list(/datum/action/item_action/toggle) + actions_types = list(/datum/action/item_action/toggle/hudgoggles) toggleable = TRUE flags_inventory = COVEREYES req_skill = SKILL_RESEARCH @@ -345,7 +346,7 @@ /obj/item/clothing/glasses/jensen name = "Augmented sunglasses" - desc = "Augmented sunglasses with the HUD removed" + desc = "Augmented sunglasses with the HUD removed." icon = 'icons/obj/items/clothing/glasses/misc.dmi' item_icons = list( WEAR_EYES = 'icons/mob/humans/onmob/clothing/glasses/misc.dmi', @@ -900,6 +901,7 @@ darkness_view = -1 flags_equip_slot = SLOT_EYES|SLOT_FACE flags_obj = OBJ_IS_HELMET_GARB + flags_inv_hide = HIDEEYES eye_protection = EYE_PROTECTION_FLAVOR /obj/item/clothing/glasses/sunglasses/blindfold @@ -1043,6 +1045,11 @@ desc = "Sunglasses wired up with the best nano-tech the USCM can muster out on the frontier. Displays information about any person you decree worthy of your gaze." icon_state = "sunhud_blue" +/obj/item/clothing/glasses/sunglasses/sechud/blue/prescription + name = "Prescription Security HUD-Glasses" + desc = "Sunglasses wired up with the best nano-tech the USCM can muster out on the frontier. Displays information about any person you decree worthy of your gaze. Contains prescription lenses." + prescription = TRUE + /obj/item/clothing/glasses/sunglasses/sechud/prescription name = "Prescription Security HUD-Glasses" desc = "Sunglasses wired up with the best nano-tech the USCM can muster out on the frontier. Displays information about any person you decree worthy of your gaze. Contains prescription lenses." diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index 5bf29c3c0093..8484a6a6de11 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -18,7 +18,7 @@ flags_armor_protection = 0 toggleable = TRUE hud_type = MOB_HUD_MEDICAL_ADVANCED - actions_types = list(/datum/action/item_action/toggle, /datum/action/item_action/view_publications) + actions_types = list(/datum/action/item_action/toggle/hudgoggles, /datum/action/item_action/view_publications) req_skill = SKILL_MEDICAL req_skill_level = SKILL_MEDICAL_MEDIC @@ -32,9 +32,7 @@ name = "View Research Publications" button.name = name button.overlays.Cut() - var/image/IMG = image('icons/obj/structures/machinery/computer.dmi', button, "research") - IMG.pixel_x = 0 - IMG.pixel_y = -5 + var/image/IMG = image('icons/mob/hud/actions.dmi', button, "research") button.overlays += IMG /datum/action/item_action/view_publications/update_button_icon() @@ -158,7 +156,7 @@ toggleable = TRUE flags_armor_protection = 0 hud_type = MOB_HUD_SECURITY_ADVANCED - actions_types = list(/datum/action/item_action/toggle) + actions_types = list(/datum/action/item_action/toggle/hudgoggles) /obj/item/clothing/glasses/hud/security/prescription name = "\improper Prescription PatrolMate HUD" diff --git a/code/modules/clothing/glasses/meson.dm b/code/modules/clothing/glasses/meson.dm index aad33e89864b..68c92afce04a 100644 --- a/code/modules/clothing/glasses/meson.dm +++ b/code/modules/clothing/glasses/meson.dm @@ -11,7 +11,7 @@ icon_state = "meson" item_state = "glasses" deactive_state = "degoggles" - actions_types = list(/datum/action/item_action/toggle) + actions_types = list(/datum/action/item_action/toggle/hudgoggles) toggleable = TRUE fullscreen_vision = /atom/movable/screen/fullscreen/meson diff --git a/code/modules/clothing/glasses/night.dm b/code/modules/clothing/glasses/night.dm index efe49ee92428..0cb2dd21a09f 100644 --- a/code/modules/clothing/glasses/night.dm +++ b/code/modules/clothing/glasses/night.dm @@ -94,7 +94,7 @@ icon_state = "m56_goggles" deactive_state = "m56_goggles_0" toggleable = TRUE - actions_types = list(/datum/action/item_action/toggle) + actions_types = list(/datum/action/item_action/toggle/m56goggles) vision_flags = SEE_TURFS fullscreen_vision = null req_skill = SKILL_SPEC_WEAPONS @@ -221,7 +221,7 @@ name = "\improper M56T head mounted sight" desc = "A headset and goggles system for the M56T 'Terminator' Smartgun. Has a low-light vision processor as well as a system allowing detection of thermal signatures though solid surfaces." vision_flags = SEE_TURFS|SEE_MOBS - actions_types = list(/datum/action/item_action/toggle, /datum/action/item_action/m56_goggles/far_sight) + actions_types = list(/datum/action/item_action/toggle/m56goggles, /datum/action/item_action/m56_goggles/far_sight) /obj/item/clothing/glasses/night/m56_goggles/upp name = "\improper RADIO head rig" diff --git a/code/modules/clothing/glasses/thermal.dm b/code/modules/clothing/glasses/thermal.dm index d86d62e5c432..10655b537610 100644 --- a/code/modules/clothing/glasses/thermal.dm +++ b/code/modules/clothing/glasses/thermal.dm @@ -80,7 +80,7 @@ /obj/item/clothing/glasses/thermal/eyepatch name = "Optical Thermal Eyepatch" - desc = "An eyepatch with built-in thermal optics" + desc = "An eyepatch with built-in thermal optics." icon = 'icons/obj/items/clothing/glasses/misc.dmi' item_icons = list( WEAR_EYES = 'icons/mob/humans/onmob/clothing/glasses/misc.dmi', diff --git a/code/modules/clothing/gloves/marine_gloves.dm b/code/modules/clothing/gloves/marine_gloves.dm index f77f1ec1cc0b..d06feb7fb506 100644 --- a/code/modules/clothing/gloves/marine_gloves.dm +++ b/code/modules/clothing/gloves/marine_gloves.dm @@ -162,12 +162,22 @@ icon_state = "insulated" item_state = "insulated" +/obj/item/clothing/gloves/marine/veteran/ppo + name = "\improper WY PPO gloves" + desc = "Standard issue kevlon fiber gloves manufactured for and by Weyland-Yutani Personal Protection division. They are insulated against electrical shock." + icon_state = "ppo" + item_state = "ppo" + /obj/item/clothing/gloves/marine/veteran/pmc name = "\improper WY PMC gloves" desc = "Standard issue kevlon fiber gloves manufactured for and by Weyland-Yutani PMC dispatch division. They are insulated against electrical shock." icon_state = "pmc" item_state = "pmc" +/obj/item/clothing/gloves/marine/veteran/pmc/Initialize() + . = ..() + AddElement(/datum/element/corp_label/wy) + /obj/item/clothing/gloves/marine/veteran/pmc/commando name = "\improper W-Y Commando gloves" desc = "Standard issue kevlon fiber gloves manufactured for and by Weyland-Yutani Commandos. They are insulated against electrical shock." @@ -235,6 +245,10 @@ unacidable = TRUE adopts_squad_color = FALSE +/obj/item/clothing/gloves/marine/veteran/souto/Initialize() + . = ..() + AddElement(/datum/element/corp_label/souta) + /obj/item/clothing/gloves/marine/veteran/insulated/van_bandolier name = "custom shooting gloves" desc = "Highly protective against injury, temperature, and electric shock. Cool in the summer, warm in the winter, and a secure grip on any surface. You could buy a lot for the price of these, and they're worth every penny." @@ -254,6 +268,10 @@ unacidable = TRUE adopts_squad_color = FALSE +/obj/item/clothing/gloves/marine/joe/Initialize() + . = ..() + AddElement(/datum/element/corp_label/seegson) + //=ROYAL MARINES=\\ /obj/item/clothing/gloves/marine/veteran/royal_marine diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 70d958796022..38f02cf40812 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -9,7 +9,7 @@ max_heat_protection_temperature = GLOVES_MAX_HEAT_PROT /obj/item/clothing/gloves/cyborg - desc = "beep boop borp" + desc = "Beep boop borp." name = "cyborg gloves" icon_state = "black" item_state = "r_hands" diff --git a/code/modules/clothing/head/WY/goons.dm b/code/modules/clothing/head/WY/goons.dm index 31103653211d..277521837362 100644 --- a/code/modules/clothing/head/WY/goons.dm +++ b/code/modules/clothing/head/WY/goons.dm @@ -12,6 +12,10 @@ icon_state = "sec_helmet" item_state = "sec_helmet" +/obj/item/clothing/head/helmet/marine/veteran/pmc/corporate/ppo + icon_state = "ppo_helmet" + item_state = "ppo_helmet" + /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate/medic desc = "A basic skull-helm worn by corporate security assets. This variant lacks a visor, granting the wearer a better view of any potential patients." icon_state = "med_helmet" @@ -19,7 +23,7 @@ /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate/engi name = "\improper WY corporate security technician helmet" - desc = "A basic skull-helm worn by corporate security assets. This variant comes equipped with a standard-issue integrated welding visor. Prone to fogging up over prolonged use" + desc = "A basic skull-helm worn by corporate security assets. This variant comes equipped with a standard-issue integrated welding visor. Prone to fogging up over prolonged use." icon_state = "eng_helmet" item_state = "eng_helmet" built_in_visors = list(new /obj/item/device/helmet_visor/welding_visor/goon) diff --git a/code/modules/clothing/head/WY/pmc.dm b/code/modules/clothing/head/WY/pmc.dm index bb224fc69af7..d9647495791c 100644 --- a/code/modules/clothing/head/WY/pmc.dm +++ b/code/modules/clothing/head/WY/pmc.dm @@ -5,9 +5,13 @@ flags_atom = NO_GAMEMODE_SKIN|NO_NAME_OVERRIDE //Let's make these keep their name and icon. built_in_visors = list() +/obj/item/clothing/head/helmet/marine/veteran/Initialize() + . = ..() + RemoveElement(/datum/element/corp_label/armat) + /obj/item/clothing/head/helmet/marine/veteran/pmc name = "\improper PMC tactical cap" - desc = "A protective cap made from flexible kevlar. Standard issue for most security forms in the place of a helmet." + desc = "A protective cap made from flexible kevlar. Standard issue for most security firms in the place of a helmet." icon_state = "pmc_hat" icon = 'icons/obj/items/clothing/hats/hats_by_faction/WY.dmi' item_icons = list( @@ -24,6 +28,10 @@ camera_factions = FACTION_LIST_WY +/obj/item/clothing/head/helmet/marine/veteran/pmc/Initialize() + . = ..() + AddElement(/datum/element/corp_label/wy) + /obj/item/clothing/head/helmet/marine/veteran/pmc/black name = "\improper PMC black tactical cap" icon_state = "pmc_hat_dark" @@ -75,12 +83,20 @@ var/atom/movable/marine_light/light_holder var/flashlight_cooldown = 0 //Cooldown for toggling the light -/datum/action/item_action/toggle_helmet_light - /datum/action/item_action/toggle_helmet_light/New() ..() name = "Toggle Headlight" button.name = name + update_button_icon() + +/datum/action/item_action/toggle_helmet_light/update_button_icon() + var/obj/item/clothing/head/helmet/marine/veteran/pmc/G = holder_item + if(!G.light_on) + action_icon_state = "armor_light" + else + action_icon_state = "armor_light_off" + button.overlays.Cut() + button.overlays += image('icons/mob/hud/actions.dmi', button, action_icon_state) /datum/action/item_action/toggle_helmet_light/action_activate() . = ..() @@ -98,6 +114,7 @@ return light.turn_light(human_owner, !light.light_on) + update_button_icon() /obj/item/clothing/head/helmet/marine/veteran/pmc/enclosed/Initialize() . = ..() @@ -178,6 +195,10 @@ name = "\improper PMC guard tactical cap" icon_state = "guard_cap" +/obj/item/clothing/head/helmet/marine/veteran/pmc/guard/ppo + name = "\improper corporate security cap" + icon_state = "ppo_cap" + /obj/item/clothing/head/helmet/marine/veteran/pmc/guard/crewman name = "\improper PMC driver tactical cap" icon_state = "guard_cap" diff --git a/code/modules/clothing/head/head.dm b/code/modules/clothing/head/head.dm index 3ff62a0e2892..6b240133c003 100644 --- a/code/modules/clothing/head/head.dm +++ b/code/modules/clothing/head/head.dm @@ -2,6 +2,7 @@ name = "head" icon = 'icons/obj/items/clothing/hats/hats.dmi' flags_armor_protection = BODY_FLAG_HEAD + flags_bodypart_hidden = BODY_FLAG_HEAD flags_equip_slot = SLOT_HEAD w_class = SIZE_SMALL blood_overlay_type = "helmet" @@ -410,8 +411,14 @@ GLOBAL_LIST_INIT(allowed_hat_items, list( /obj/item/clothing/glasses/mgoggles/black/prescription = PREFIX_HAT_GARB_OVERRIDE, /obj/item/clothing/glasses/mgoggles/orange = PREFIX_HAT_GARB_OVERRIDE, /obj/item/clothing/glasses/mgoggles/orange/prescription = PREFIX_HAT_GARB_OVERRIDE, - /obj/item/clothing/glasses/mgoggles/v2 = NO_GARB_OVERRIDE, - /obj/item/clothing/glasses/mgoggles/v2/prescription = NO_GARB_OVERRIDE, + /obj/item/clothing/glasses/mgoggles/v2 = PREFIX_HAT_GARB_OVERRIDE, + /obj/item/clothing/glasses/mgoggles/v2/prescription = PREFIX_HAT_GARB_OVERRIDE, + /obj/item/clothing/glasses/mgoggles/v2/blue = PREFIX_HAT_GARB_OVERRIDE, + /obj/item/clothing/glasses/mgoggles/v2/blue/prescription = PREFIX_HAT_GARB_OVERRIDE, + /obj/item/clothing/glasses/mgoggles/v2/polarized_blue = PREFIX_HAT_GARB_OVERRIDE, + /obj/item/clothing/glasses/mgoggles/v2/polarized_blue/prescription = PREFIX_HAT_GARB_OVERRIDE, + /obj/item/clothing/glasses/mgoggles/v2/polarized_orange = PREFIX_HAT_GARB_OVERRIDE, + /obj/item/clothing/glasses/mgoggles/v2/polarized_orange/prescription = PREFIX_HAT_GARB_OVERRIDE, /obj/item/prop/helmetgarb/helmet_nvg = PREFIX_HAT_GARB_OVERRIDE, /obj/item/prop/helmetgarb/helmet_nvg/cosmetic = PREFIX_HAT_GARB_OVERRIDE, /obj/item/prop/helmetgarb/helmet_nvg/marsoc = PREFIX_HAT_GARB_OVERRIDE, diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index a3ff0edd66c6..24768833cd6a 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -139,6 +139,51 @@ armor_rad = CLOTHING_ARMOR_LOW armor_internaldamage = CLOTHING_ARMOR_MEDIUM +/obj/item/clothing/head/helmet/roman + name = "\improper imperial galea helmet" + desc = "An extremely old helmet that was used by Roman heavy infantry units called the Legionares." + icon_state = "legionary_helm" + item_state = "legionary_helm" + icon = 'icons/obj/items/clothing/hats/misc_ert_colony.dmi' + item_icons = list( + WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/misc_ert_colony.dmi' + ) + flags_inventory = COVEREYES|BLOCKSHARPOBJ + flags_inv_hide = HIDEEARS|HIDEEYES + siemens_coefficient = 1 + armor_melee = CLOTHING_ARMOR_MEDIUMHIGH + armor_bullet = CLOTHING_ARMOR_LOW + armor_laser = CLOTHING_ARMOR_NONE + armor_energy = CLOTHING_ARMOR_NONE + armor_bomb = CLOTHING_ARMOR_LOW + armor_bio = CLOTHING_ARMOR_LOW + armor_rad = CLOTHING_ARMOR_LOW + armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH + +/obj/item/clothing/head/helmet/roman/centurion + desc = "An extremely old helmet that was used by Roman heavy infantry units called the Legionares. This one has a crest indicating it was used by Centurions." + icon_state = "centurion_helm" + item_state = "centurion_helm" + worn_x_dimension = 64 + worn_y_dimension = 64 + item_icons = list( + WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/head_64.dmi' + ) + + +/obj/item/clothing/head/helmet/roman/eaglebearer + name = "\improper Aquilifier's bear pelt mask" + desc = "a bear pelt and mask that was worn by a Roman Aquilifier, a prestigious role meant to inspire troops in battles." + icon_state = "eaglebearer_hat" + item_state = "eaglebearer_hat" + worn_x_dimension = 64 + worn_y_dimension = 64 + item_icons = list( + WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/head_64.dmi' + ) + flags_inv_hide = HIDEMASK|HIDEEARS|HIDEEYES + anti_hug = 1 + //===========================//MARINES HELMETS\\=================================\\ //=======================================================================\\ @@ -188,14 +233,14 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( // EYEWEAR /obj/item/clothing/glasses/mgoggles = PREFIX_HELMET_GARB_OVERRIDE, // helmet_ - /obj/item/clothing/glasses/mgoggles/v2 = NO_GARB_OVERRIDE, - /obj/item/clothing/glasses/mgoggles/v2/prescription = NO_GARB_OVERRIDE, - /obj/item/clothing/glasses/mgoggles/v2/blue = NO_GARB_OVERRIDE, - /obj/item/clothing/glasses/mgoggles/v2/blue/prescription = NO_GARB_OVERRIDE, - /obj/item/clothing/glasses/mgoggles/v2/polarized_blue = NO_GARB_OVERRIDE, - /obj/item/clothing/glasses/mgoggles/v2/polarized_blue/prescription = NO_GARB_OVERRIDE, - /obj/item/clothing/glasses/mgoggles/v2/polarized_orange = NO_GARB_OVERRIDE, - /obj/item/clothing/glasses/mgoggles/v2/polarized_orange/prescription = NO_GARB_OVERRIDE, + /obj/item/clothing/glasses/mgoggles/v2 = PREFIX_HELMET_GARB_OVERRIDE, + /obj/item/clothing/glasses/mgoggles/v2/prescription = PREFIX_HELMET_GARB_OVERRIDE, + /obj/item/clothing/glasses/mgoggles/v2/blue = PREFIX_HELMET_GARB_OVERRIDE, + /obj/item/clothing/glasses/mgoggles/v2/blue/prescription = PREFIX_HELMET_GARB_OVERRIDE, + /obj/item/clothing/glasses/mgoggles/v2/polarized_blue = PREFIX_HELMET_GARB_OVERRIDE, + /obj/item/clothing/glasses/mgoggles/v2/polarized_blue/prescription = PREFIX_HELMET_GARB_OVERRIDE, + /obj/item/clothing/glasses/mgoggles/v2/polarized_orange = PREFIX_HELMET_GARB_OVERRIDE, + /obj/item/clothing/glasses/mgoggles/v2/polarized_orange/prescription = PREFIX_HELMET_GARB_OVERRIDE, /obj/item/clothing/glasses/mgoggles/prescription = PREFIX_HELMET_GARB_OVERRIDE, // helmet_ /obj/item/clothing/glasses/mgoggles/black = PREFIX_HELMET_GARB_OVERRIDE, // helmet_ /obj/item/clothing/glasses/mgoggles/black/prescription = PREFIX_HELMET_GARB_OVERRIDE, // helmet_ @@ -261,19 +306,19 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( // PREFERENCES GEAR /obj/item/prop/helmetgarb/gunoil = NO_GARB_OVERRIDE, - /obj/item/prop/helmetgarb/netting = NO_GARB_OVERRIDE, - /obj/item/prop/helmetgarb/netting/desert = NO_GARB_OVERRIDE, - /obj/item/prop/helmetgarb/netting/jungle = NO_GARB_OVERRIDE, - /obj/item/prop/helmetgarb/netting/urban = NO_GARB_OVERRIDE, + /obj/item/clothing/accessory/helmet/cover/netting = NO_GARB_OVERRIDE, + /obj/item/clothing/accessory/helmet/cover/netting/desert = NO_GARB_OVERRIDE, + /obj/item/clothing/accessory/helmet/cover/netting/jungle = NO_GARB_OVERRIDE, + /obj/item/clothing/accessory/helmet/cover/netting/urban = NO_GARB_OVERRIDE, /obj/item/prop/helmetgarb/spent_buckshot = NO_GARB_OVERRIDE, /obj/item/prop/helmetgarb/spent_slug = NO_GARB_OVERRIDE, /obj/item/prop/helmetgarb/spent_flech = NO_GARB_OVERRIDE, /obj/item/prop/helmetgarb/cartridge = NO_GARB_OVERRIDE, /obj/item/prop/helmetgarb/prescription_bottle = NO_GARB_OVERRIDE, - /obj/item/prop/helmetgarb/raincover = NO_GARB_OVERRIDE, - /obj/item/prop/helmetgarb/raincover/jungle = NO_GARB_OVERRIDE, - /obj/item/prop/helmetgarb/raincover/desert = NO_GARB_OVERRIDE, - /obj/item/prop/helmetgarb/raincover/urban = NO_GARB_OVERRIDE, + /obj/item/clothing/accessory/helmet/cover/raincover = NO_GARB_OVERRIDE, + /obj/item/clothing/accessory/helmet/cover/raincover/jungle = NO_GARB_OVERRIDE, + /obj/item/clothing/accessory/helmet/cover/raincover/desert = NO_GARB_OVERRIDE, + /obj/item/clothing/accessory/helmet/cover/raincover/urban = NO_GARB_OVERRIDE, /obj/item/prop/helmetgarb/rabbitsfoot = NO_GARB_OVERRIDE, /obj/item/prop/helmetgarb/rosary = NO_GARB_OVERRIDE, // This one was already in the game for some reason, but never had an object /obj/item/prop/helmetgarb/lucky_feather = NO_GARB_OVERRIDE, @@ -429,6 +474,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( /obj/item/clothing/head/helmet/marine/Initialize(mapload, new_protection[] = list(MAP_ICE_COLONY = ICE_PLANET_MIN_COLD_PROT)) . = ..() AddComponent(/datum/component/overwatch_console_control) + AddElement(/datum/element/corp_label/armat) if(!(flags_atom & NO_NAME_OVERRIDE)) name = "[specialty]" if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) @@ -520,6 +566,10 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( ..() /obj/item/clothing/head/helmet/marine/attackby(obj/item/attacking_item, mob/user) + . = ..() + if(.) + return + if(istype(attacking_item, /obj/item/ammo_magazine) && world.time > helmet_bash_cooldown && user) var/obj/item/ammo_magazine/M = attacking_item var/ammo_level = "more than half full." @@ -778,6 +828,15 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( /obj/item/clothing/head/helmet/marine/see_emote(mob/living/sourcemob, emote, audible) SEND_SIGNAL(src, COMSIG_BROADCAST_SEE_EMOTE, sourcemob, emote, audible, loc == sourcemob && audible) +/datum/action/item_action/cycle_helmet_huds + var/supported_custom_icons = list( + "hud_marine", + "nvg_sight_down", + "med_sight_down", + "sec_sight_down", + "blank_hud_sight_down" + ) + /datum/action/item_action/cycle_helmet_huds/New(Target, obj/item/holder) . = ..() name = "Cycle helmet HUD" @@ -799,13 +858,16 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( action_icon_state = new_visor.action_icon_string button.overlays.Cut() - button.overlays += image('icons/obj/items/clothing/helmet_visors.dmi', button, action_icon_state) + button.overlays += image('icons/mob/hud/actions.dmi', button, action_icon_state) + +/datum/action/item_action/cycle_helmet_huds/update_button_icon() + return /// Sets the action overlay to default hud sight up /datum/action/item_action/cycle_helmet_huds/proc/set_default_overlay() - action_icon_state = "hud_sight_up" + action_icon_state = "hud_deploy" button.overlays.Cut() - button.overlays += image('icons/obj/items/clothing/helmet_visors.dmi', button, action_icon_state) + button.overlays += image('icons/mob/hud/actions.dmi', button, action_icon_state) /obj/item/clothing/head/helmet/marine/tech name = "\improper M10 technician helmet" @@ -833,7 +895,6 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/classic_righthand.dmi' ) - /obj/item/clothing/head/helmet/marine/jungle icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi' flags_atom = NO_GAMEMODE_SKIN|NO_NAME_OVERRIDE @@ -843,7 +904,6 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_righthand.dmi' ) - /obj/item/clothing/head/helmet/marine/snow name = "\improper M10 marine snow helmet" icon = 'icons/obj/items/clothing/hats/hats_by_map/snow.dmi' @@ -910,6 +970,53 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( flags_atom = NO_GAMEMODE_SKIN|NO_NAME_OVERRIDE flags_marine_helmet = HELMET_GARB_OVERLAY|HELMET_DAMAGE_OVERLAY +/obj/item/clothing/head/helmet/marine/medic/grey + desc = "An M10 marine helmet version worn by marine hospital corpsmen. Has red cross painted on its front. This one has not had a camouflage pattern applied to it yet. There is a built-in camera on the right side." + icon = 'icons/obj/items/clothing/hats/hats_by_map/classic.dmi' + flags_atom = NO_GAMEMODE_SKIN|NO_NAME_OVERRIDE + item_icons = list( + WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/classic.dmi', + WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/classic_lefthand.dmi', + WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/classic_righthand.dmi' + ) + +/obj/item/clothing/head/helmet/marine/medic/jungle + icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi' + flags_atom = NO_GAMEMODE_SKIN|NO_NAME_OVERRIDE + item_icons = list( + WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi', + WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_lefthand.dmi', + WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_righthand.dmi' + ) + +/obj/item/clothing/head/helmet/marine/medic/snow + name = "\improper M10 pattern medic snow helmet" + icon = 'icons/obj/items/clothing/hats/hats_by_map/snow.dmi' + flags_atom = NO_GAMEMODE_SKIN|NO_NAME_OVERRIDE + item_icons = list( + WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi', + WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_lefthand.dmi', + WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_righthand.dmi' + ) + +/obj/item/clothing/head/helmet/marine/medic/desert + flags_atom = NO_GAMEMODE_SKIN|NO_NAME_OVERRIDE + icon = 'icons/obj/items/clothing/hats/hats_by_map/desert.dmi' + item_icons = list( + WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/desert.dmi', + WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/desert_lefthand.dmi', + WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/desert_righthand.dmi' + ) + +/obj/item/clothing/head/helmet/marine/medic/urban + flags_atom = NO_GAMEMODE_SKIN|NO_NAME_OVERRIDE + icon = 'icons/obj/items/clothing/hats/hats_by_map/urban.dmi' + item_icons = list( + WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/urban.dmi', + WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/urban_lefthand.dmi', + WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/urban_righthand.dmi' + ) + /obj/item/clothing/head/helmet/marine/covert name = "\improper M10 covert helmet" desc = "An M10 marine helmet version designed for use in darkened environments. It is coated with a special anti-reflective paint." @@ -941,6 +1048,11 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( armor_bio = CLOTHING_ARMOR_MEDIUMHIGH specialty = "M11 pattern marine" +/obj/item/clothing/head/helmet/marine/leader/mod + name = "\improper M11-R pattern helmet" + desc = "A variant of the M11 pattern, the 'R' platform features an older, external-style comms module and leather banding. Those who use it swear it has a better signal, but nobody knows for sure." + icon_state = "vsl_helmet" + /obj/item/clothing/head/helmet/marine/rto name = "\improper M12 pattern dust helmet" desc = "An experimental brain-bucket. A dust ruffle hangs from back instead of the standard lobster shell design. Moderately better at deflecting blunt objects at the cost of humiliation, can also hold a second visor optic. But who will be laughing at the memorial? Not you, you'll be busy getting medals for your fantastic leadership." @@ -960,6 +1072,53 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( desc = "An experimental brain-bucket. A dust ruffle hangs from back. Moderately better at deflecting blunt objects at the cost of humiliation, can also hold a second visor optic. But who will be laughing at the memorial? Not you, you'll be busy getting medals for your intel work." specialty = "XM12 pattern intel" +/obj/item/clothing/head/helmet/marine/rto/intel/grey + desc = "An experimental brain-bucket. A dust ruffle hangs from back. Moderately better at deflecting blunt objects at the cost of humiliation, can also hold a second visor optic. But who will be laughing at the memorial? Not you, you'll be busy getting medals for your intel work. This one has not had a camouflage pattern applied to it yet." + icon = 'icons/obj/items/clothing/hats/hats_by_map/classic.dmi' + flags_atom = NO_GAMEMODE_SKIN|NO_NAME_OVERRIDE + item_icons = list( + WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/classic.dmi', + WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/classic_lefthand.dmi', + WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/classic_righthand.dmi' + ) + +/obj/item/clothing/head/helmet/marine/rto/intel/jungle + icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi' + flags_atom = NO_GAMEMODE_SKIN|NO_NAME_OVERRIDE + item_icons = list( + WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi', + WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_lefthand.dmi', + WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_righthand.dmi' + ) + +/obj/item/clothing/head/helmet/marine/rto/intel/snow + name = "\improper XM12 pattern intel snow helmet" + icon = 'icons/obj/items/clothing/hats/hats_by_map/snow.dmi' + flags_atom = NO_GAMEMODE_SKIN|NO_NAME_OVERRIDE + item_icons = list( + WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi', + WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_lefthand.dmi', + WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_righthand.dmi' + ) + +/obj/item/clothing/head/helmet/marine/rto/intel/desert + flags_atom = NO_GAMEMODE_SKIN|NO_NAME_OVERRIDE + icon = 'icons/obj/items/clothing/hats/hats_by_map/desert.dmi' + item_icons = list( + WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/desert.dmi', + WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/desert_lefthand.dmi', + WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/desert_righthand.dmi' + ) + +/obj/item/clothing/head/helmet/marine/rto/intel/urban + flags_atom = NO_GAMEMODE_SKIN|NO_NAME_OVERRIDE + icon = 'icons/obj/items/clothing/hats/hats_by_map/urban.dmi' + item_icons = list( + WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/urban.dmi', + WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/urban_lefthand.dmi', + WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/urban_righthand.dmi' + ) + /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." @@ -1026,7 +1185,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( name = "Use Phone" button.name = name button.overlays.Cut() - var/image/IMG = image('icons/obj/structures/phone.dmi', button, "scout_microphone") + var/image/IMG = image('icons/mob/hud/actions.dmi', button, "microphone") button.overlays += IMG /datum/action/item_action/radio_helmet/use_phone/action_activate() @@ -1173,6 +1332,9 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( inserted_visors = list(new /obj/item/device/helmet_visor/po_visor) max_inserted_visors = 1 +/obj/item/clothing/head/helmet/marine/pilot/novisor //For vendors that give sepreate visor options + inserted_visors = list() + /obj/item/clothing/head/helmet/marine/pilot/tex name = "\improper Tex's MK30 tactical helmet" desc = "The MK30 tactical helmet has an eyepiece filter used to filter tactical data. It is required to fly the dropships manually and in safety. This one belonged to Tex: the craziest sum'bitch pilot the Almayer ever had. He's not dead or anything, but he did get a medical discharge after he was hit by a car on shore leave last year." @@ -1199,10 +1361,9 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( /obj/item/clothing/head/helmet/marine/ghillie/select_gamemode_skin() . = ..() - switch(SSmapping.configs[GROUND_MAP].camouflage_type) - if("urban") - name = "\improper M10-LS pattern sniper helmet" - desc = "A lightweight version of M10 helmet with thermal signature dampering used by USCM snipers on urban recon missions." + if(SSmapping.configs[GROUND_MAP].camouflage_type == "urban" || "classic") + name = "\improper M10-LS pattern sniper helmet" + desc = "A lightweight version of M10 helmet with thermal signature dampering used by USCM snipers on urban recon missions." /obj/item/clothing/head/helmet/marine/leader/CO name = "\improper M11C pattern commanding officer helmet" @@ -1248,6 +1409,53 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( specialty = "M10 pattern military police" built_in_visors = list(new /obj/item/device/helmet_visor/security) +/obj/item/clothing/head/helmet/marine/MP/grey + desc = "A special variant of the M10 Pattern Helmet worn by the Military Police of the USCM. Whether you're facing a crime syndicate or a mutiny, this bucket will keep your brains intact. This one has not had a camouflage pattern applied to it yet." + icon = 'icons/obj/items/clothing/hats/hats_by_map/classic.dmi' + flags_atom = NO_GAMEMODE_SKIN|NO_NAME_OVERRIDE + item_icons = list( + WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/classic.dmi', + WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/classic_lefthand.dmi', + WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/classic_righthand.dmi' + ) + +/obj/item/clothing/head/helmet/marine/MP/jungle + icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi' + flags_atom = NO_GAMEMODE_SKIN|NO_NAME_OVERRIDE + item_icons = list( + WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi', + WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_lefthand.dmi', + WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/jungle_righthand.dmi' + ) + +/obj/item/clothing/head/helmet/marine/MP/snow + name = "\improper M10 pattern military police snow helmet" + icon = 'icons/obj/items/clothing/hats/hats_by_map/snow.dmi' + flags_atom = NO_GAMEMODE_SKIN|NO_NAME_OVERRIDE + item_icons = list( + WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi', + WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_lefthand.dmi', + WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/snow_righthand.dmi' + ) + +/obj/item/clothing/head/helmet/marine/MP/desert + flags_atom = NO_GAMEMODE_SKIN|NO_NAME_OVERRIDE + icon = 'icons/obj/items/clothing/hats/hats_by_map/desert.dmi' + item_icons = list( + WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/desert.dmi', + WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/desert_lefthand.dmi', + WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/desert_righthand.dmi' + ) + +/obj/item/clothing/head/helmet/marine/MP/urban + flags_atom = NO_GAMEMODE_SKIN|NO_NAME_OVERRIDE + icon = 'icons/obj/items/clothing/hats/hats_by_map/urban.dmi' + item_icons = list( + WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_map/urban.dmi', + WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/urban_lefthand.dmi', + WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items_by_map/urban_righthand.dmi' + ) + /obj/item/clothing/head/helmet/marine/MP/WO name = "\improper M3 pattern chief MP helmet" desc = "A well-crafted variant of the M10 Helmet typically distributed to Chief MPs. Useful for letting your men know who is in charge." @@ -1267,6 +1475,9 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( specialty = "M10 pattern officer" built_in_visors = list(new /obj/item/device/helmet_visor, new /obj/item/device/helmet_visor/medical/advanced) +/obj/item/clothing/head/helmet/marine/MP/SO/basic + built_in_visors = list(new /obj/item/device/helmet_visor, new /obj/item/device/helmet_visor/medical) + /obj/item/clothing/head/helmet/marine/MP/provost/marshal name = "\improper M10 pattern MP riot helmet" desc = "A variant of the M10 for the Military Police deployed to deal with riots, often worn by MPs from the Provost Office." @@ -1357,6 +1568,10 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( clothing_traits = list(TRAIT_EAR_PROTECTION) built_in_visors = list(new /obj/item/device/helmet_visor/security) +/obj/item/clothing/head/helmet/marine/veteran/cmb/Initialize() + . = ..() + AddElement(/datum/element/corp_label/armat) + /obj/item/clothing/head/helmet/marine/veteran/cmb/engi built_in_visors = list(new /obj/item/device/helmet_visor/security, new /obj/item/device/helmet_visor/welding_visor) @@ -1388,6 +1603,10 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( flags_marine_helmet = HELMET_GARB_OVERLAY|HELMET_DAMAGE_OVERLAY camera_factions = list(FACTION_DUTCH) +/obj/item/clothing/head/helmet/marine/veteran/dutch/vietnam + name = "\improper M1 pattern army helmet" + desc = "A protective helmet worn by US Army Riflemen during the peak of the Vietnam War." + /obj/item/clothing/head/helmet/marine/veteran/dutch/cap name = "\improper Dutch's Dozen cap" desc = "A protective cap worn by some seriously experienced mercs." @@ -1451,7 +1670,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( /obj/item/clothing/head/helmet/marine/veteran/UPP/army name = "\improper 6B82 combat helmet" - desc = "An older version of the UPP Army's 6B92 combat helmet, still worn by certain units on planets the UPP deems less important" + desc = "An older version of the UPP Army's 6B92 combat helmet, still worn by certain units on planets the UPP deems less important." icon_state = "upp_army_helmet" /obj/item/clothing/head/helmet/marine/veteran/UPP/heavy/SOF_helmet @@ -1615,7 +1834,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( /obj/item/clothing/head/helmet/skullcap name = "skullcap" - desc = "Good for keeping sweat out of your eyes" + desc = "Good for keeping sweat out of your eyes." icon = 'icons/obj/items/clothing/hats/hats_by_map/jungle.dmi' icon_state = "skullcap" armor_melee = CLOTHING_ARMOR_MEDIUMLOW @@ -1887,6 +2106,10 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( item_state = "generic_helm" flags_marine_helmet = HELMET_GARB_OVERLAY +/obj/item/clothing/head/helmet/marine/veteran/royal_marine/generic/Initialize() + . = ..() + AddElement(/datum/element/corp_label/alphatech) + /obj/item/clothing/head/helmet/marine/veteran/royal_marine/pilot name = "\improper PH-4 'Spitfire' flight helmet" desc = "Standard flight helmet used across the Three World Empire’s aerospace forces, from fighter pilots to atmospheric crews. This PH-4 variant is tailored for dropship operations in space, featuring reinforced plating, HUD optics, and encrypted comms. Essential for high-risk insertions, landings, and exfil missions. Nicknamed “Spitfire” for its reliability under fire." @@ -1925,7 +2148,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( /obj/item/clothing/head/helmet/marine/veteran/royal_marine/breacher name = "\improper L5A3 ballistic helmet" - desc = "A High-cut ballistic helmet featuring an attached mandible. Designed by Lindenthal-Ehrenfeld Militärindustrie it is intended to be used by Royal Marines Commando as part of the kestrel armour system" + desc = "A High-cut ballistic helmet featuring an attached mandible. Designed by Lindenthal-Ehrenfeld Militärindustrie it is intended to be used by Royal Marines Commando as part of the kestrel armour system." icon_state = "rmc_helm_br" item_state = "rmc_helm_br" armor_melee = CLOTHING_ARMOR_HIGH diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index e440723678dc..fd759bf30dd7 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -98,21 +98,60 @@ ) flags_inv_hide = 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." - icon_state = "surgcap_purple" - /obj/item/clothing/head/surgery/blue - desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is baby blue." + name = "doctor's surgical cap" + desc = "A cap doctors wear during operations. Keeps their hair from tickling your internal organs. Typically worn by doctors, this one reminds you of blueberries." icon_state = "surgcap_blue" +/obj/item/clothing/head/surgery/lightblue + name = "nurse's surgical cap" + desc = "A cap nurses wear while they assist during operations. Keeps their hair from tickling your internal organs. Typically worn by nurses, this one is baby blue." + icon_state = "surgcap_lightblue" + /obj/item/clothing/head/surgery/green - desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is dark green." + name = "surgeon's surgical cap" + desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. Typically worn by surgeons, this one is jade green." icon_state = "surgcap_green" -/obj/item/clothing/head/surgery/orange - desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is orange." - icon_state = "surgcap_orange" +/obj/item/clothing/head/surgery/morgue + name = "morgue surgical cap" + desc = "A cap doctors wear while making autopsies, rather than during operations. Keeps their hair from dropping and interfering with incision scans. This one is a black as coal." + icon_state = "surgcap_morgue" + +/obj/item/clothing/head/surgery/pharmacist + name = "pharmaceutical physician's surgical cap" + desc = "A cap pharmaceutical physicians wear during to protect their scalp from chemical mishaps. It also keeps their hair from tickling your internal organs while they operate. It's white with an orange rim." + icon_state = "surgcap_pharm" + +/obj/item/clothing/head/surgery/cmo + name = "chief medical officer's surgical cap" + desc = "A striped cap the Chief Medical Officer wears during operations. Keeps their hair from tickling your internal organs. It's green with peach stripes to match the stripes on their lab coat." + icon_state = "surgcap_cmo" + +/obj/item/clothing/head/surgery/purple + name = "purple surgical cap" + desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is a rich wine color." + icon_state = "surgcap_purple" + +/obj/item/clothing/head/surgery/olive + name = "olive surgical cap" + desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is olive green." + icon_state = "surgcap_olive" + +/obj/item/clothing/head/surgery/brown + name = "brown surgical cap" + desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is a rusty brown color." + icon_state = "surgcap_brown" + +/obj/item/clothing/head/surgery/grey + name = "grey surgical cap" + desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is a mundane grey color." + icon_state = "surgcap_grey" + +/obj/item/clothing/head/surgery/white + name = "white surgical cap" + desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is snow white." + icon_state = "surgcap_white" //Detective diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 00ac6cea5c98..2708532e5dbd 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -134,7 +134,7 @@ /obj/item/clothing/head/director name = "director's hat" - desc = "Belongs to someone very important. Has minor protection to all damage types" + desc = "Belongs to someone very important. Has minor protection to all damage types." icon_state = "director_hat" item_state = "director_hat" icon = 'icons/obj/items/clothing/hats/formal_hats.dmi' diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 6becbf8c47f7..cb7006db2a61 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -96,7 +96,7 @@ var/onfire = 0 var/status = 0 var/fire_resist = T0C+1300 //this is the max temp it can stand before you start to cook. although it might not burn away, you take damage - var/processing = 0 //I dont think this is used anywhere. + var/processing = 0 //I don't think this is used anywhere. flags_armor_protection = BODY_FLAG_EYES /obj/item/clothing/head/cakehat/process() diff --git a/code/modules/clothing/hybrisa_clothing.dm b/code/modules/clothing/hybrisa_clothing.dm index a3a6d890506d..4a5ce9a95a8c 100644 --- a/code/modules/clothing/hybrisa_clothing.dm +++ b/code/modules/clothing/hybrisa_clothing.dm @@ -160,6 +160,10 @@ armor_rad = CLOTHING_ARMOR_NONE armor_internaldamage = CLOTHING_ARMOR_LOW +/obj/item/clothing/under/hybrisa/kelland_mining/Initialize() + . = ..() + AddElement(/datum/element/corp_label/kelland) + // Weymart /obj/item/clothing/under/hybrisa/weymart @@ -288,23 +292,23 @@ /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate/hybrisa name = "\improper WY corporate security helmet" - desc = "A basic skull-helm with a orange saftey vison fitted. Worn by corporate security assets, graded to protect your head from an unruly scientist armed with a crowbar." + desc = "A basic skull-helm with a orange safety visor fitted. Worn by corporate security assets, graded to protect your head from an unruly scientist armed with a crowbar." icon_state = "sec_helmet_hybrisa" item_state = "sec_helmet_hybrisa" /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate/hybrisa/lead - desc = "A basic skull-helm with a orange saftey vison fitted. Worn by corporate security assets. This variant is worn by low-level guards that have too much brainmatter to fit into the old one. Or so they say." + desc = "A basic skull-helm with a orange safety visor fitted. Worn by corporate security assets. This variant is worn by low-level guards that have too much brainmatter to fit into the old one. Or so they say." icon_state = "sec_lead_helmet_hybrisa" item_state = "sec_lead_helmet_hybrisa" /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate/hybrisa/brown name = "\improper WY corporate security helmet" - desc = "A basic skull-helm with a orange saftey vison fitted. Worn by corporate security assets, graded to protect your head from an unruly scientist armed with a crowbar." + desc = "A basic skull-helm with a orange safety visor fitted. Worn by corporate security assets, graded to protect your head from an unruly scientist armed with a crowbar." icon_state = "sec_brown_helmet_hybrisa" item_state = "sec_brown_helmet_hybrisa" /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate/hybrisa/medic - desc = "A basic skull-helm with a orange saftey vison fitted. Worn by corporate security assets, graded to protect your head from an unruly scientist armed with a crowbar. A medical cross is emblazoned across the front." + desc = "A basic skull-helm with a orange safety visor fitted. Worn by corporate security assets, graded to protect your head from an unruly scientist armed with a crowbar. A medical cross is emblazoned across the front." icon_state = "sec_medic_helmet_hybrisa" item_state = "sec_medic_helmet_hybrisa" @@ -387,7 +391,7 @@ /obj/item/clothing/head/hybrisa/wy_po_cap name = "\improper Weyland-Yutani Pilot cap" - desc = "A dark peaked cap enscribed with the Weyland-Yutani 'Wings' logo. A formal cap for qualified civillian Pilots, akin to old Earth formal Pilots-wear." + desc = "A dark peaked cap enscribed with the Weyland-Yutani 'Wings' logo. A formal cap for qualified civilian Pilots, akin to old Earth formal Pilots-wear." icon = 'icons/obj/items/clothing/hats/hats_by_faction/WY.dmi' item_icons = list( WEAR_HEAD = 'icons/mob/humans/onmob/clothing/head/hats_by_faction/WY.dmi', @@ -496,6 +500,10 @@ flags_inventory = COVEREYES|BLOCKSHARPOBJ flags_inv_hide = HIDEEARS|HIDEEYES|HIDETOPHAIR +/obj/item/clothing/head/helmet/hybrisa/kelland_mining_helmet/Initialize() + . = ..() + AddElement(/datum/element/corp_label/kelland) + // Pizza-Galaxy (Rare Helmet) /obj/item/clothing/head/helmet/hybrisa/pizza_galaxy @@ -530,6 +538,10 @@ icon_state = "sci_expedition_helmet" item_state = "sci_expedition_helmet" +/obj/item/clothing/head/bio_hood/wy_bio/Initialize() + . = ..() + AddElement(/datum/element/corp_label/wy) + /obj/item/clothing/head/bio_hood/wy_bio/alt name = "WY-TSS MK I - bio hood" desc = "The 'Weyland-Yutani TerraScientia bio-suit MK I'. An advanced light-weight bio-suit developed in-house by Weyland-Yutani. It's a hood that protects the head and face from biological contaminants." @@ -548,6 +560,10 @@ slowdown = 0 uniform_restricted = null +/obj/item/clothing/suit/bio_suit/wy_bio/Initialize() + . = ..() + AddElement(/datum/element/corp_label/wy) + // Synth Bio /obj/item/clothing/head/bio_hood/synth/wy_bio @@ -568,7 +584,7 @@ /obj/item/clothing/suit/storage/synthbio/wy_bio name = "WY-TSS MK I - bio suit" - desc = "The 'Weyland-Yutani TerraScientia bio-suit MK I'. An advanced light-weight bio-suit developed in-house by Weyland-Yutani. A Synthetic compliant bio-hazard suit. Intended to allow a synthetic to offer the illusion of infection control to humans. Has had most of the internal protective lining removed, allowing it to hold equipment and be lighter to move in." + desc = "The 'Weyland-Yutani TerraScientia bio-suit MK I'. An advanced light-weight bio-suit developed in-house by Weyland-Yutani. A Synthetic compliant biohazard suit. Intended to allow a synthetic to offer the illusion of infection control to humans. Has had most of the internal protective lining removed, allowing it to hold equipment and be lighter to move in." icon = 'icons/obj/items/clothing/suits/hazard.dmi' item_icons = list( WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/hazard.dmi', @@ -638,6 +654,10 @@ max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROT flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_FEET|BODY_FLAG_ARMS|BODY_FLAG_HANDS +/obj/item/clothing/suit/storage/marine/light/vest/fire_light/Initialize(mapload) + . = ..() + RemoveElement(/datum/element/corp_label/armat) + /obj/item/clothing/suit/storage/marine/light/vest/fire_light/equipped(mob/user, slot) if(slot == WEAR_JACKET) RegisterSignal(user, COMSIG_LIVING_FLAMER_CROSSED, PROC_REF(flamer_fire_crossed_callback)) @@ -664,6 +684,56 @@ item_state = "upp_firefighter_alt" uniform_restricted = FALSE +/obj/item/clothing/suit/storage/marine/light/vest/fire_light/upp/alt + icon_state = "upp_firefighter" + item_state = "upp_firefighter" + +/obj/item/clothing/suit/storage/marine/light/vest/fire_light/upp/synth + name = "T-20 synthetic fire response coat" + desc = "A rugged, no-frills fire-resistant overcoat issued to UPP industrial and emergency crews. Based on the PyroTex LT design but using cheaper, domestically produced materials, it offers basic protection against heat and debris at the cost of weight and comfort." + + time_to_unequip = 0.5 SECONDS + time_to_equip = 1 SECONDS + armor_melee = CLOTHING_ARMOR_NONE + armor_bullet = CLOTHING_ARMOR_NONE + armor_laser = CLOTHING_ARMOR_NONE + armor_energy = CLOTHING_ARMOR_NONE + armor_bomb = CLOTHING_ARMOR_NONE + armor_bio = CLOTHING_ARMOR_NONE + armor_rad = CLOTHING_ARMOR_NONE + armor_internaldamage = CLOTHING_ARMOR_NONE + storage_slots = 4 + slowdown = SLOWDOWN_ARMOR_SUPER_LIGHT + +/obj/item/clothing/suit/storage/marine/light/vest/fire_light/upp/synth/Initialize() + flags_atom |= NO_NAME_OVERRIDE + flags_marine_armor |= SYNTH_ALLOWED + return ..() + +/obj/item/clothing/suit/storage/marine/light/vest/fire_light/upp/synth/alt + name = "T-20 synthetic fire response coat" + desc = "A rugged, no-frills fire-resistant overcoat issued to UPP industrial and emergency crews. Based on the PyroTex LT design but using cheaper, domestically produced materials, it offers basic protection against heat and debris at the cost of weight and comfort." + icon_state = "upp_firefighter" + item_state = "upp_firefighter" + + time_to_unequip = 0.5 SECONDS + time_to_equip = 1 SECONDS + armor_melee = CLOTHING_ARMOR_NONE + armor_bullet = CLOTHING_ARMOR_NONE + armor_laser = CLOTHING_ARMOR_NONE + armor_energy = CLOTHING_ARMOR_NONE + armor_bomb = CLOTHING_ARMOR_NONE + armor_bio = CLOTHING_ARMOR_NONE + armor_rad = CLOTHING_ARMOR_NONE + armor_internaldamage = CLOTHING_ARMOR_NONE + storage_slots = 4 + slowdown = SLOWDOWN_ARMOR_SUPER_LIGHT + +/obj/item/clothing/suit/storage/marine/light/vest/fire_light/upp/synth/alt/Initialize() + flags_atom |= NO_NAME_OVERRIDE + flags_marine_armor |= SYNTH_ALLOWED + return ..() + // Kelland Mining /obj/item/clothing/suit/storage/marine/light/vest/hybrisa_kelland @@ -707,6 +777,11 @@ /obj/item/storage/belt/gun/xm51, ) +/obj/item/clothing/suit/storage/marine/light/vest/hybrisa_kelland/Initialize() + . = ..() + RemoveElement(/datum/element/corp_label/armat) + AddElement(/datum/element/corp_label/kelland) + /obj/item/clothing/suit/storage/marine/light/vest/hybrisa_kelland_alt name = "\improper Kelland-Mining utility uniform" desc = "A set of standard issue Kelland-Mining utility fatigues, a yellow pair of utility work slacks and a black collard heavy padded jacket, which protects against various environmental hazards." @@ -748,6 +823,11 @@ /obj/item/storage/belt/gun/xm51, ) +/obj/item/clothing/suit/storage/marine/light/vest/hybrisa_kelland_alt/Initialize() + . = ..() + RemoveElement(/datum/element/corp_label/armat) + AddElement(/datum/element/corp_label/kelland) + // EMT - Paramedic /obj/item/clothing/suit/hybrisa/EMT_green_utility @@ -806,7 +886,7 @@ /obj/item/clothing/suit/storage/hybrisa/wy_Pilot name = "\improper Weyland-Yutani Pilot formal-jacket" - desc = "A suit-style jacket with a fur lined collar and golden epaulettes signifying rank. Worn by Weyland-Yutani qualified civillian Pilots, akin to old Earth formal Pilots-wear." + desc = "A suit-style jacket with a fur lined collar and golden epaulettes signifying rank. Worn by Weyland-Yutani qualified civilian Pilots, akin to old Earth formal Pilots-wear." icon = 'icons/obj/items/clothing/suits/suits_by_faction/WY.dmi' item_icons = list( WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/WY.dmi' diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm index 3b2d1022a5fe..05f40fee7835 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -96,7 +96,7 @@ min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT var/pulled = FALSE var/original_state = "coif" - actions_types = list(/datum/action/item_action/toggle) + actions_types = list(/datum/action/item_action/toggle/adjust_mask) /obj/item/clothing/mask/rebreather/scarf/ui_action_click() pull_down() @@ -364,7 +364,7 @@ flags_inventory = ALLOWREBREATH|ALLOWCPR var/adjust = FALSE var/original_state = "neckerchief" - actions_types = list(/datum/action/item_action/toggle) + actions_types = list(/datum/action/item_action/toggle/neckerchief) can_become_accessory = TRUE worn_accessory_slot = ACCESSORY_SLOT_MASK worn_accessory_limit = 2 diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index e42974ca0470..126f1231aa83 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -58,6 +58,11 @@ flags_inv_hide = HIDEEARS|HIDEFACE|HIDEALLHAIR flags_equip_slot = SLOT_FACE +/obj/item/clothing/mask/gas/pmc/Initialize() + . = ..() + if(istypestrict(src, /obj/item/clothing/mask/gas/pmc) || istypestrict(src, /obj/item/clothing/mask/gas/pmc/leader)) + AddElement(/datum/element/corp_label/wy) + /obj/item/clothing/mask/gas/pmc/marsoc name = "\improper SOF armored balaclava" desc = "Designed for maximum protection -- and badassery. Provides protection against facial attacks, filters toxins, and conceals the wearer's identity." diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm index c2599b1f82dc..8b1390036977 100644 --- a/code/modules/clothing/shoes/colour.dm +++ b/code/modules/clothing/shoes/colour.dm @@ -8,6 +8,11 @@ flags_heat_protection = BODY_FLAG_FEET max_heat_protection_temperature = SHOE_MAX_HEAT_PROT +/obj/item/clothing/shoes/morgue + name = "morgue shoes" + icon_state = "morgue" + desc = "A pair of all-black shoes to wear in the morgue." + /obj/item/clothing/shoes/brown name = "brown shoes" desc = "A pair of brown shoes." @@ -48,6 +53,7 @@ /obj/item/clothing/shoes/white name = "white shoes" + desc = "A pair of white shoes. Not sterile." icon_state = "white" diff --git a/code/modules/clothing/shoes/marine_shoes.dm b/code/modules/clothing/shoes/marine_shoes.dm index e4d3a6fa2ad7..9fb56e887369 100644 --- a/code/modules/clothing/shoes/marine_shoes.dm +++ b/code/modules/clothing/shoes/marine_shoes.dm @@ -173,6 +173,10 @@ siemens_coefficient = 0.2 unacidable = TRUE +/obj/item/clothing/shoes/veteran/pmc/commando/Initialize() + . = ..() + AddElement(/datum/element/corp_label/wy) + /obj/item/clothing/shoes/veteran/pmc/commando/knife spawn_item_type = /obj/item/attachable/bayonet/wy @@ -186,6 +190,10 @@ unacidable = TRUE spawn_item_type = /obj/item/attachable/bayonet/wy +/obj/item/clothing/shoes/veteran/pmc/combat_android/Initialize() + . = ..() + AddElement(/datum/element/corp_label/wy) + /obj/item/clothing/shoes/veteran/pmc/combat_android/dark name = "\improper M7X Mark II greaves" desc = "A pair of heavily armored, optical camouflaged, acid-resistant boots, made to complete the M7X Mark II Apesuit." @@ -220,6 +228,13 @@ /obj/item/clothing/shoes/marine/corporate/knife spawn_item_type = /obj/item/attachable/bayonet +/obj/item/clothing/shoes/marine/cmb + name = "rugged boots" + desc = "Generic boots typically used by law enforcement types out on the frontier. Functional and stylish." + +/obj/item/clothing/shoes/marine/cmb/knife + spawn_item_type = /obj/item/attachable/bayonet + /obj/item/clothing/shoes/marine/ress name = "armored sandals" icon_state = "sandals" diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 42c68036a961..4cd17a009704 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -30,7 +30,7 @@ /obj/item/clothing/shoes/combat //Basically SWAT shoes combined with galoshes. name = "combat boots" - desc = "When you REALLY want to turn up the heat" + desc = "When you REALLY want to turn up the heat." icon_state = "swat" armor_melee = CLOTHING_ARMOR_MEDIUMHIGH armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH @@ -61,7 +61,7 @@ flags_armor_protection = BODY_FLAG_FEET /obj/item/clothing/shoes/galoshes - desc = "Rubber boots" + desc = "Rubber boots." name = "galoshes" icon_state = "galoshes" @@ -97,7 +97,7 @@ /obj/item/clothing/shoes/cyborg name = "cyborg boots" - desc = "Shoes for a cyborg costume" + desc = "Shoes for a cyborg costume." icon_state = "boots" /obj/item/clothing/shoes/slippers @@ -133,7 +133,7 @@ /obj/item/clothing/shoes/snow name = "snow boots" - desc = "When your feet are as cold as your heart" + desc = "When your feet are as cold as your heart." icon_state = "swat" siemens_coefficient = 0.6 flags_cold_protection = BODY_FLAG_FEET @@ -143,7 +143,7 @@ /obj/item/clothing/shoes/souto name = "Souto Man boots" - desc = "\improper Souto Man's boots. Harder than the kick of Souto Red" + desc = "\improper Souto Man's boots. Harder than the kick of Souto Red." icon_state = "souto_man" item_state = "souto_man" flags_inventory = CANTSTRIP|NOSLIPPING @@ -157,3 +157,21 @@ armor_internaldamage = CLOTHING_ARMOR_HARDCORE flags_inventory = CANTSTRIP|NOSLIPPING unacidable = TRUE + +/obj/item/clothing/shoes/footwrap_sandals + name = "foot wrapped sandals" + desc = "typical soldier footwear worn during old ancient times." + icon_state = "footwrap_sandals" + item_state = "footwrap_sandals" + item_icons = list( + WEAR_FEET = 'icons/mob/humans/onmob/clothing/feet.dmi' + ) + armor_melee = CLOTHING_ARMOR_MEDIUM + armor_bullet = CLOTHING_ARMOR_LOW + armor_laser = CLOTHING_ARMOR_LOW + armor_energy = CLOTHING_ARMOR_NONE + armor_bomb = CLOTHING_ARMOR_LOW + armor_bio = CLOTHING_ARMOR_LOW + armor_rad = CLOTHING_ARMOR_NONE + armor_internaldamage = CLOTHING_ARMOR_MEDIUMLOW + flags_inventory = NOSLIPPING diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 92a2060541fd..03bdc73a7e58 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -5,6 +5,7 @@ flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN flags_heat_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN + flags_bodypart_hidden = BODY_FLAG_CHEST min_cold_protection_temperature = HELMET_MIN_COLD_PROT max_heat_protection_temperature = HELMET_MAX_HEAT_PROT siemens_coefficient = 0.6 @@ -88,6 +89,10 @@ armor_bio = CLOTHING_ARMOR_MEDIUM armor_rad = CLOTHING_ARMOR_LOW +/obj/item/clothing/suit/armor/vest/security/Initialize() + . = ..() + AddElement(/datum/element/corp_label/wy) + /obj/item/clothing/suit/armor/vest/warden name = "Warden's jacket" desc = "An armored jacket with silver rank pips and livery." @@ -95,6 +100,7 @@ item_state = "armor" icon = 'icons/obj/items/clothing/suits/coats_robes.dmi' flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_ARMS item_icons = list( WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/coats_robes.dmi', WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/clothing/suits_lefthand.dmi', @@ -143,6 +149,7 @@ icon_state = "riot" item_state = "swat_suit" flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_LEGS|BODY_FLAG_ARMS slowdown = 1 armor_melee = CLOTHING_ARMOR_HIGH armor_bullet = CLOTHING_ARMOR_LOW @@ -164,6 +171,7 @@ item_state = "gladiator" icon = 'icons/obj/items/clothing/suits/misc_ert.dmi' flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_LEGS|BODY_FLAG_ARMS armor_melee = CLOTHING_ARMOR_HIGH armor_bullet = CLOTHING_ARMOR_LOW armor_laser = CLOTHING_ARMOR_LOW @@ -290,3 +298,40 @@ WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/clothing/suits_lefthand.dmi', WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/clothing/suits_righthand.dmi', ) + +/obj/item/clothing/suit/armor/roman + name = "imperial legionary armor" + desc = "A metal body armor also known as a Lorica segmentata that is used by the Roman heavy infantry called the Legionares." + icon = 'icons/obj/items/clothing/suits/misc_ert.dmi' + icon_state = "legionary_armor" + item_state = "legionary_armor" + item_icons = list( + WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/misc_ert.dmi' + ) + flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN + armor_melee = CLOTHING_ARMOR_HIGH + armor_bullet = CLOTHING_ARMOR_LOW + armor_laser = CLOTHING_ARMOR_LOW + armor_energy = CLOTHING_ARMOR_LOW + armor_bomb = CLOTHING_ARMOR_LOW + armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH + flags_inventory = BLOCKSHARPOBJ + siemens_coefficient = 0.5 + time_to_unequip = 20 + time_to_equip = 20 + allowed = list( + /obj/item/weapon/sword, + /obj/item/device/flashlight, + ) + uniform_restricted = list(/obj/item/clothing/under/tunic) + slowdown = SLOWDOWN_ARMOR_SUPER_LIGHT + +/obj/item/clothing/suit/armor/roman/centurion + name = "imperial centurion armor" + desc = "A metal body armor also known as a Lorica segmentata that is used by the Roman heavy infantry, this one has been outfitted with additional protection to the legs and arms with a stylish cloak." + icon_state = "centurion_armor" + item_state = "centurion_armor" + flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS + armor_melee = CLOTHING_ARMOR_VERYHIGH + armor_internaldamage = CLOTHING_ARMOR_HIGH + slowdown = SLOWDOWN_ARMOR_LIGHT diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index 2e81dc957094..9933d13a9ed8 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -56,7 +56,7 @@ /obj/item/clothing/suit/storage/synthbio name = "bio suit" - desc = "Synthetic compliant bio-hazard suit. Intended to allow a synthetic to offer the illusion of infection control to humans. Has had most of the internal protective lining removed, allowing it to hold equipment and be lighter to move in." + desc = "Synthetic compliant biohazard suit. Intended to allow a synthetic to offer the illusion of infection control to humans. Has had most of the internal protective lining removed, allowing it to hold equipment and be lighter to move in." icon_state = "bio_general" item_state = "bio_suit" icon = 'icons/obj/items/clothing/suits/hazard.dmi' diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 4a20e3a46b89..a3fbb508dedb 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -301,6 +301,7 @@ /obj/item/device/motiondetector, ) flags_armor_protection = BODY_FLAG_CHEST + flags_bodypart_hidden = BODY_FLAG_CHEST item_icons = list( WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/vests_aprons.dmi', ) @@ -404,6 +405,7 @@ /obj/item/device/motiondetector, ) flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_ARMS + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_ARMS var/zip_unzip = FALSE actions_types = list(/datum/action/item_action/toggle) item_icons = list( diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index f0b716b62c2d..665a2afa2373 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -1,5 +1,5 @@ /obj/item/clothing/suit/storage/labcoat - name = "labcoat" + name = "lab coat" desc = "A suit that protects against minor chemical spills." icon_state = "labcoat" item_state = "labcoat" //Is this even used for anything? @@ -69,7 +69,7 @@ /obj/item/clothing/suit/storage/labcoat/verb/toggle() - set name = "Toggle Labcoat Buttons" + set name = "Toggle Lab Coat Buttons" set category = "Object" set src in usr @@ -85,53 +85,53 @@ update_clothing_icon() /obj/item/clothing/suit/storage/labcoat/red - name = "red labcoat" + name = "red lab coat" desc = "A suit that protects against minor chemical spills. This one is red." icon_state = "red_labcoat" item_state = "red_labcoat" /obj/item/clothing/suit/storage/labcoat/blue - name = "blue labcoat" + name = "blue lab coat" desc = "A suit that protects against minor chemical spills. This one is blue." icon_state = "blue_labcoat" item_state = "blue_labcoat" /obj/item/clothing/suit/storage/labcoat/purple - name = "purple labcoat" + name = "purple lab coat" desc = "A suit that protects against minor chemical spills. This one is purple." icon_state = "purple_labcoat" item_state = "purple_labcoat" /obj/item/clothing/suit/storage/labcoat/orange - name = "orange labcoat" + name = "orange lab coat" desc = "A suit that protects against minor chemical spills. This one is orange." icon_state = "orange_labcoat" item_state = "orange_labcoat" /obj/item/clothing/suit/storage/labcoat/green - name = "green labcoat" + name = "green lab coat" desc = "A suit that protects against minor chemical spills. This one is green." icon_state = "green_labcoat" item_state = "green_labcoat" /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." + name = "The Mad's lab coat" + desc = "It makes you look capable of conking someone on the noggin and shooting them into space." icon_state = "labgreen" item_state = "labgreen" /obj/item/clothing/suit/storage/labcoat/genetics - name = "Geneticist labcoat" + name = "Geneticist's lab coat" 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/chemist - 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/pharmacist + name = "pharmaceutical physician's lab coat" + desc = "A suit that protects against minor chemical spills. Has an orange stripe on each shoulder." + icon_state = "labcoat_pharm" /obj/item/clothing/suit/storage/labcoat/virologist - name = "Virologist labcoat" + name = "virologist's lab coat" 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_vir" armor_melee = CLOTHING_ARMOR_NONE @@ -144,26 +144,26 @@ armor_internaldamage = CLOTHING_ARMOR_LOW /obj/item/clothing/suit/storage/labcoat/science - name = "Scientist labcoat" + name = "scientist's lab coat" desc = "A suit that protects against minor chemical spills. Has a purple stripe on the shoulder." icon_state = "labcoat_tox" -/obj/item/clothing/suit/storage/labcoat/officer - name = "Chief Medical Officer's labcoat" - desc = "A green sleek long labcoat, designed to distinguish a higher ranking medical personnel. Fabric has a better protection against chemical hazards." +/obj/item/clothing/suit/storage/labcoat/cmo + name = "chief medical officer's lab coat" + desc = "A long, green, sleek, and sturdy lab coat designed to distinguish a higher ranking medical personnel. The fabric provides extra protection against chemical and biological hazards." icon_state = "labcoatg" item_state = "labcoatg" armor_bio = CLOTHING_ARMOR_MEDIUM /obj/item/clothing/suit/storage/labcoat/researcher - name = "researcher's labcoat" - desc = "A high-quality labcoat, seemingly worn by scholars and researchers alike. It has a distinct leathery feel to it, and goads you towards adventure." + name = "researcher's lab coat" + desc = "A high-quality lab coat, seemingly worn by scholars and researchers alike. It has a distinct leathery feel to it, and goads you towards adventure." icon_state = "sciencecoat" item_state = "sciencecoat" /obj/item/clothing/suit/storage/labcoat/wy - name = "W-Y researcher's labcoat" - desc = "A high-quality corporate labcoat, seemingly worn by science consultants and researchers alike. Built using robust materials for engaging dangerous experiments." + name = "W-Y researcher's lab coat" + desc = "A high-quality corporate lab coat, seemingly worn by science consultants and researchers alike. Built using robust materials for engaging dangerous experiments." icon_state = "wy_rc_labcoat" icon = 'icons/obj/items/clothing/suits/suits_by_faction/WY.dmi' item_icons = list( @@ -173,6 +173,10 @@ armor_laser = CLOTHING_ARMOR_LOW armor_energy = CLOTHING_ARMOR_LOW +/obj/item/clothing/suit/storage/labcoat/wy/Initialize() + . = ..() + AddElement(/datum/element/corp_label/wy) + /obj/item/clothing/suit/chef/classic/medical name = "medical's apron" desc = "A basic and sterile white apron, good for surgical and, of course, other medical practices." @@ -189,6 +193,7 @@ icon_state = "snowsuit" flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_ARMS armor_melee = CLOTHING_ARMOR_MEDIUMLOW armor_bullet = CLOTHING_ARMOR_MEDIUMLOW armor_laser = CLOTHING_ARMOR_LOW @@ -250,6 +255,7 @@ armor_rad = CLOTHING_ARMOR_NONE armor_internaldamage = CLOTHING_ARMOR_LOW flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS + slowdown = SLOWDOWN_ARMOR_VERY_LIGHT allowed = list( /obj/item/weapon/gun, /obj/item/tank/emergency_oxygen, @@ -277,7 +283,7 @@ /obj/item/clothing/suit/storage/snow_suit/survivor/parka name = "Parent Parka" - desc = "A winter coat made to withstand the frigged cold weather of the arctic deserts. W-Y branded Parka" + desc = "A winter coat made to withstand the frigged cold weather of the arctic deserts. W-Y branded Parka." /obj/item/clothing/suit/storage/snow_suit/survivor/parka/red name = "Security Parka" @@ -346,6 +352,10 @@ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/WY.dmi' ) +/obj/item/clothing/suit/storage/snow_suit/liaison/Initialize() + . = ..() + AddElement(/datum/element/corp_label/wy) + /obj/item/clothing/suit/storage/snow_suit/liaison/modified name = "modified liaison's winter coat" desc = "A Weyland-Yutani winter coat. This one has been modified to holster guns and other objects. Only the best comfort and utility for the liaison surviving in a cold, hostile environment." @@ -365,13 +375,20 @@ ) /obj/item/clothing/suit/storage/labcoat/brown + name = "brown lab coat" + desc = "A suit that protects against minor chemical spills. This one is brown." icon_state = "labcoat_brown" item_state = "labcoat_brown" /obj/item/clothing/suit/storage/labcoat/short + name = "high-cut lab coat" + desc = "A suit that protects against minor chemical spills. This one exposes the legs a little more." icon_state = "labcoat_short" item_state = "labcoat_short" /obj/item/clothing/suit/storage/labcoat/long + name = "low-cut lab coat" + desc = "A suit that protects against minor chemical spills. This one drapes down quite low." icon_state = "labcoat_long" item_state = "labcoat_long" + diff --git a/code/modules/clothing/suits/marine_armor/WY/commando.dm b/code/modules/clothing/suits/marine_armor/WY/commando.dm index 421d194f6cd6..8ea0523a5e42 100644 --- a/code/modules/clothing/suits/marine_armor/WY/commando.dm +++ b/code/modules/clothing/suits/marine_armor/WY/commando.dm @@ -3,6 +3,7 @@ desc = "A modification of the W-Y PMC armor patterns. Designed for elite corporate mercenaries in mind." icon_state = "commando_armor" item_state_slots = list(WEAR_JACKET = "commando_armor") + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_LEGS|BODY_FLAG_ARMS armor_melee = CLOTHING_ARMOR_MEDIUMHIGH armor_bio = CLOTHING_ARMOR_MEDIUMHIGH armor_bullet = CLOTHING_ARMOR_VERYHIGH @@ -32,6 +33,7 @@ desc = "A modification of the standard Armat Systems M3 armor. Hooked up with harnesses and straps allowing the user to carry an M56 Smartgun." icon_state = "commando_armor_sg" flags_inventory = BLOCKSHARPOBJ|BLOCK_KNOCKDOWN|SMARTGUN_HARNESS + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_LEGS|BODY_FLAG_ARMS armor_melee = CLOTHING_ARMOR_MEDIUMHIGH armor_bio = CLOTHING_ARMOR_MEDIUMHIGH armor_bullet = CLOTHING_ARMOR_VERYHIGH @@ -55,6 +57,7 @@ armor_rad = CLOTHING_ARMOR_MEDIUMHIGH armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS|BODY_FLAG_FEET + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_LEGS|BODY_FLAG_ARMS|BODY_FLAG_FEET uniform_restricted = list(/obj/item/clothing/under/marine/veteran/pmc/apesuit) item_state_slots = list(WEAR_JACKET = "ape_suit") unacidable = TRUE diff --git a/code/modules/clothing/suits/marine_armor/WY/goon.dm b/code/modules/clothing/suits/marine_armor/WY/goon.dm index 1e42869336d1..7d437a20278e 100644 --- a/code/modules/clothing/suits/marine_armor/WY/goon.dm +++ b/code/modules/clothing/suits/marine_armor/WY/goon.dm @@ -32,3 +32,36 @@ item_state = "armor" storage_slots = 2 item_state_slots = list(WEAR_JACKET = "armor") + +/obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate/ppo + desc = "A basic vest with a Weyland-Yutani badge on the right breast. This variant is worn by Personal Protection Officers protecting Weyland-Yutani employees, as denoted by the blue badge." + icon_state = "ppo_armor" + item_state = "ppo_armor" + item_state_slots = list(WEAR_JACKET = "ppo_armor") + uniform_restricted = null + storage_slots = 1 + + armor_melee = CLOTHING_ARMOR_MEDIUMLOW + armor_bullet = CLOTHING_ARMOR_MEDIUM + armor_energy = CLOTHING_ARMOR_MEDIUMLOW + armor_bomb = CLOTHING_ARMOR_MEDIUMLOW + armor_rad = CLOTHING_ARMOR_MEDIUM + armor_internaldamage = CLOTHING_ARMOR_MEDIUMLOW + slowdown = SLOWDOWN_ARMOR_SUPER_LIGHT + +/obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate/ppo/strong + name = "\improper M4 pattern PPO armor" + desc = "A modification of the standard Armat Systems M3 armor. This variant is worn by Personal Protection Officers protecting Weyland-Yutani employees, as denoted by the blue detailing. Has some armor plating removed for extra mobility." + icon_state = "ppo_armor_strong" + item_state_slots = list(WEAR_JACKET = "ppo_armor_strong") + storage_slots = 2 + + armor_melee = CLOTHING_ARMOR_MEDIUM + armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH + armor_energy = CLOTHING_ARMOR_MEDIUM + armor_bio = CLOTHING_ARMOR_LOW + armor_bomb = CLOTHING_ARMOR_MEDIUMHIGH + armor_rad = CLOTHING_ARMOR_MEDIUM + armor_internaldamage = CLOTHING_ARMOR_MEDIUM + slowdown = SLOWDOWN_ARMOR_VERY_LIGHT + diff --git a/code/modules/clothing/suits/marine_armor/WY/pmc.dm b/code/modules/clothing/suits/marine_armor/WY/pmc.dm index 86c175697a79..e93f019a8ce6 100644 --- a/code/modules/clothing/suits/marine_armor/WY/pmc.dm +++ b/code/modules/clothing/suits/marine_armor/WY/pmc.dm @@ -6,6 +6,7 @@ item_icons = list( WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/WY.dmi' ) + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_LEGS armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH armor_energy = CLOTHING_ARMOR_MEDIUMLOW armor_bomb = CLOTHING_ARMOR_MEDIUM @@ -13,32 +14,16 @@ storage_slots = 2 slowdown = SLOWDOWN_ARMOR_LIGHT flags_atom = NO_GAMEMODE_SKIN|NO_NAME_OVERRIDE - allowed = list( - /obj/item/weapon/gun, - /obj/item/tank/emergency_oxygen, - /obj/item/device/flashlight, - /obj/item/ammo_magazine/, - /obj/item/weapon/baton, - /obj/item/restraint/handcuffs, - /obj/item/storage/fancy/cigarettes, - /obj/item/tool/lighter, - /obj/item/explosive/grenade, - /obj/item/storage/bible, - /obj/item/tool/crowbar, - /obj/item/storage/large_holster/katana, - /obj/item/storage/large_holster/machete, - /obj/item/weapon/sword/machete, - /obj/item/attachable/bayonet, - /obj/item/device/motiondetector, - /obj/item/tool/crew_monitor, - /obj/item/device/walkman, - ) uniform_restricted = list(/obj/item/clothing/under/marine/veteran/pmc) item_state_slots = list(WEAR_JACKET = "pmc_armor") lamp_icon = "pmc_lamp" light_color = LIGHT_COLOR_FLARE lamp_light_color = LIGHT_COLOR_FLARE +/obj/item/clothing/suit/storage/marine/veteran/pmc/Initialize() + . = ..() + AddElement(/datum/element/corp_label/wy) + /obj/item/clothing/suit/storage/marine/veteran/pmc/no_lamp flags_marine_armor = null actions_types = null @@ -53,6 +38,7 @@ name = "\improper M4 pattern PMC riot guard armor" icon_state = "guard_armor_spec" item_state_slots = list(WEAR_JACKET = "guard_armor_spec") + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_LEGS|BODY_FLAG_ARMS armor_melee = CLOTHING_ARMOR_MEDIUMHIGH armor_bullet = CLOTHING_ARMOR_HIGH armor_bomb = CLOTHING_ARMOR_MEDIUMHIGH @@ -62,6 +48,7 @@ name = "\improper M4 pattern PMC guard bulletproof armor" icon_state = "guard_vest" item_state_slots = list(WEAR_JACKET = "guard_vest") + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_LEGS armor_melee = CLOTHING_ARMOR_MEDIUMHIGH armor_bullet = CLOTHING_ARMOR_HIGH armor_bomb = CLOTHING_ARMOR_MEDIUMHIGH @@ -79,6 +66,7 @@ max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROT flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS|BODY_FLAG_FEET flags_heat_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS|BODY_FLAG_FEET + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_LEGS|BODY_FLAG_ARMS flags_marine_armor = null actions_types = null @@ -155,6 +143,7 @@ item_icons = list( WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/WY.dmi' ) + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_LEGS|BODY_FLAG_ARMS flags_inventory = BLOCKSHARPOBJ|BLOCK_KNOCKDOWN|SMARTGUN_HARNESS flags_atom = NO_GAMEMODE_SKIN|NO_NAME_OVERRIDE armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH @@ -165,3 +154,7 @@ item_state_slots = list(WEAR_JACKET = "heavy_armor") flags_marine_armor = null actions_types = null + +/obj/item/clothing/suit/storage/marine/smartgunner/veteran/pmc/Initialize() + . = ..() + AddElement(/datum/element/corp_label/wy) diff --git a/code/modules/clothing/suits/marine_armor/WY/wy_droid.dm b/code/modules/clothing/suits/marine_armor/WY/wy_droid.dm index cee5ba00e35e..8b58317c24d7 100644 --- a/code/modules/clothing/suits/marine_armor/WY/wy_droid.dm +++ b/code/modules/clothing/suits/marine_armor/WY/wy_droid.dm @@ -21,7 +21,7 @@ /obj/item/clothing/suit/storage/marine/veteran/pmc/wy_droid/dark name = "\improper M7X Mark II Apesuit" - desc = "The M7X Mark II Apesuit: Following recent archaeological studies on highly classified sites, W-Y's R and D Department managed to reverse engineer a more compact invisibility cloak for this armour from some their discoveries" + desc = "The M7X Mark II Apesuit: Following recent archaeological studies on highly classified sites, W-Y's R and D Department managed to reverse engineer a more compact invisibility cloak for this armour from some their discoveries." icon_state = "invis_android_jacket" uniform_restricted = list(/obj/item/clothing/under/marine/veteran/pmc/combat_android/dark) item_state_slots = list(WEAR_JACKET = "invis_android_jacket") diff --git a/code/modules/clothing/suits/marine_armor/_marine_armor.dm b/code/modules/clothing/suits/marine_armor/_marine_armor.dm index 0b75a69906ab..fe2d536bab7a 100644 --- a/code/modules/clothing/suits/marine_armor/_marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor/_marine_armor.dm @@ -44,6 +44,7 @@ flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS flags_heat_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS + flags_bodypart_hidden = BODY_FLAG_CHEST min_cold_protection_temperature = HELMET_MIN_COLD_PROT max_heat_protection_temperature = HELMET_MAX_HEAT_PROT blood_overlay_type = "armor" @@ -91,7 +92,7 @@ var/flashlight_cooldown = 0 //Cooldown for toggling the light var/locate_cooldown = 0 //Cooldown for SL locator var/armor_overlays[] - actions_types = list(/datum/action/item_action/toggle) + actions_types = list(/datum/action/item_action/toggle/lamp) var/flags_marine_armor = ARMOR_SQUAD_OVERLAY|ARMOR_LAMP_OVERLAY var/specialty = "M3 pattern marine" //Same thing here. Give them a specialty so that they show up correctly in vendors. speciality does NOTHING if you have NO_NAME_OVERRIDE w_class = SIZE_HUGE @@ -136,6 +137,7 @@ pockets.max_storage_space = 8 light_holder = new(src) + AddElement(/datum/element/corp_label/armat) /obj/item/clothing/suit/storage/marine/Destroy() QDEL_NULL(light_holder) @@ -276,6 +278,7 @@ desc = "A well tinkered and crafted hybrid of Smart-Gunner mesh and M3 pattern plates. Robust, yet nimble, with room for all your pouches." armor_bio = CLOTHING_ARMOR_MEDIUMHIGH armor_rad = CLOTHING_ARMOR_MEDIUM + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_LEGS storage_slots = 4 light_range = 5 //slightly higher specialty = "M4 pattern marine" @@ -290,6 +293,7 @@ armor_energy = CLOTHING_ARMOR_LOW armor_bio = CLOTHING_ARMOR_MEDIUMLOW armor_internaldamage = CLOTHING_ARMOR_MEDIUMLOW + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_LEGS storage_slots = 2 slowdown = SLOWDOWN_ARMOR_LIGHT allowed = list( @@ -320,6 +324,7 @@ desc = "A well-crafted suit of M3 Pattern Armor typically distributed to Wardens. Useful for letting your men know who is in charge." icon_state = "warden" uniform_restricted = list(/obj/item/clothing/under/marine/warden) + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_LEGS specialty = "M3 pattern warden MP" /obj/item/clothing/suit/storage/marine/MP/WO @@ -327,6 +332,7 @@ desc = "A well-crafted suit of M3 Pattern Armor typically distributed to Chief MPs. Useful for letting your men know who is in charge." icon_state = "warrant_officer" uniform_restricted = list(/obj/item/clothing/under/marine/officer/warrant) + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_LEGS specialty = "M3 pattern chief MP" black_market_value = 30 @@ -361,7 +367,7 @@ armor_bio = CLOTHING_ARMOR_MEDIUMLOW armor_internaldamage = CLOTHING_ARMOR_MEDIUMLOW slowdown = SLOWDOWN_ARMOR_LIGHT - uniform_restricted = list(/obj/item/clothing/under/marine/officer, /obj/item/clothing/under/rank/qm_suit, /obj/item/clothing/under/rank/chief_medical_officer, /obj/item/clothing/under/marine/dress) + uniform_restricted = list(/obj/item/clothing/under/marine/officer, /obj/item/clothing/under/rank/qm_suit, /obj/item/clothing/under/rank/cmo, /obj/item/clothing/under/marine/dress) specialty = "M3 pattern officer" item_state_slots = list(WEAR_JACKET = "officer") black_market_value = 20 @@ -405,6 +411,34 @@ specialty = "B12 pattern marine" light_range = 5 +/obj/item/clothing/suit/storage/marine/medium/leader/mod_a + name = "\improper modified M3 pattern marine armor 'A'" + desc = "A heavily altered suit of lightweight M3 pattern marine armor. The joints have been cut away to enhance mobility while additional pads have been fastened around the shoulders. It is incredibly beat-down." + icon_state = "MA" + specialty = "M3 pattern mod-'A' marine" + +/obj/item/clothing/suit/storage/marine/medium/leader/mod_b + name = "\improper modified M3 pattern marine armor 'B'" + desc = "A heavily altered suit of lightweight M3 pattern marine armor. The joints have been cut away to enhance mobility while additional pads have been fastened around the shoulders. It is incredibly beat-down." + icon_state = "MB" + armor_melee = CLOTHING_ARMOR_MEDIUM + storage_slots = 4 + specialty = "M3 pattern mod-'B' marine" + +/obj/item/clothing/suit/storage/marine/medium/leader/mod_c + name = "\improper modified M3 pattern marine armor 'C'" + desc = "A heavily altered suit of lightweight M3 pattern marine armor. The joints have been cut away to enhance mobility while additional pads have been fastened around the shoulders. It is incredibly beat-down." + icon_state = "MC" + slowdown = SLOWDOWN_ARMOR_LIGHT + armor_melee = CLOTHING_ARMOR_MEDIUMLOW + armor_bullet = CLOTHING_ARMOR_MEDIUMLOW + armor_bomb = CLOTHING_ARMOR_MEDIUMLOW + armor_bio = CLOTHING_ARMOR_MEDIUMLOW + armor_rad = CLOTHING_ARMOR_MEDIUMHIGH + armor_internaldamage = CLOTHING_ARMOR_LOW + storage_slots = 2 + specialty = "M3 pattern mod-'C' marine" + /obj/item/clothing/suit/storage/marine/tanker name = "\improper M3 pattern tanker armor" desc = "A modified and refashioned suit of M3 Pattern armor designed to be worn by the loader of a USCM vehicle crew. While the suit is a bit more encumbering to wear with the crewman uniform, it offers the loader a degree of protection that would otherwise not be enjoyed." @@ -620,6 +654,7 @@ specialty = "\improper M3-EOD pattern" icon_state = "H1" armor_variation = 6 + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_ARMS|BODY_FLAG_LEGS armor_melee = CLOTHING_ARMOR_MEDIUMHIGH armor_bullet = CLOTHING_ARMOR_HIGHPLUS armor_bomb = CLOTHING_ARMOR_HIGHPLUS @@ -640,10 +675,12 @@ /obj/item/clothing/suit/storage/marine/heavy/padless icon_state = "H2" armor_variation = 0 + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_LEGS /obj/item/clothing/suit/storage/marine/heavy/padless_lines icon_state = "H3" armor_variation = 0 + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_LEGS /obj/item/clothing/suit/storage/marine/heavy/carrier icon_state = "H4" @@ -676,6 +713,7 @@ flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS|BODY_FLAG_FEET flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS|BODY_FLAG_FEET flags_heat_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS|BODY_FLAG_FEET + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_LEGS slowdown = SLOWDOWN_ARMOR_HEAVY specialty = "B18 defensive" unacidable = TRUE @@ -719,6 +757,7 @@ flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS|BODY_FLAG_FEET flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS|BODY_FLAG_FEET flags_heat_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS|BODY_FLAG_FEET + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_ARMS|BODY_FLAG_LEGS slowdown = SLOWDOWN_ARMOR_HEAVY specialty = "M3-G4 grenadier" unacidable = TRUE @@ -729,6 +768,7 @@ desc = "A custom set of M3 armor designed for users of long-ranged explosive weaponry." icon_state = "demolitionist" armor_bomb = CLOTHING_ARMOR_HIGH + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_LEGS slowdown = SLOWDOWN_ARMOR_LIGHT specialty = "M3-T light" flags_item = MOB_LOCK_ON_EQUIP|NO_CRYO_STORE @@ -739,6 +779,7 @@ desc = "A custom set of M3 armor designed for USCM Scouts." icon_state = "scout_armor" armor_melee = CLOTHING_ARMOR_MEDIUMHIGH + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_LEGS slowdown = SLOWDOWN_ARMOR_LIGHT specialty = "M3-S light" flags_item = MOB_LOCK_ON_EQUIP|NO_CRYO_STORE diff --git a/code/modules/clothing/suits/marine_armor/ert.dm b/code/modules/clothing/suits/marine_armor/ert.dm index e091d62d61ca..a91772d52808 100644 --- a/code/modules/clothing/suits/marine_armor/ert.dm +++ b/code/modules/clothing/suits/marine_armor/ert.dm @@ -47,6 +47,10 @@ flags_marine_armor = ARMOR_LAMP_OVERLAY flags_atom = NO_GAMEMODE_SKIN|NO_NAME_OVERRIDE //Let's make these keep their name and icon. +/obj/item/clothing/suit/storage/marine/veteran/Initialize() + . = ..() + RemoveElement(/datum/element/corp_label/armat) + //===========================//DISTRESS\\================================\\ //=======================================================================\\ @@ -144,6 +148,9 @@ slowdown = SLOWDOWN_ARMOR_MEDIUM movement_compensation = SLOWDOWN_ARMOR_LIGHT +/obj/item/clothing/suit/storage/marine/faction/Initialize() + . = ..() + RemoveElement(/datum/element/corp_label/armat) /obj/item/clothing/suit/storage/marine/faction/UPP name = "\improper UM5 personal armor" @@ -161,6 +168,10 @@ storage_slots = 1 uniform_restricted = list(/obj/item/clothing/under/marine/veteran/UPP, /obj/item/clothing/under/marine/veteran/UPP/medic, /obj/item/clothing/under/marine/veteran/UPP/engi, /obj/item/clothing/under/marine/veteran/UPP/SOF_uniform) +/obj/item/clothing/suit/storage/marine/faction/UPP/Initialize() + . = ..() + AddElement(/datum/element/corp_label/norcomm) + /obj/item/clothing/suit/storage/marine/faction/UPP/support name = "\improper UL6 personal armor" desc = "Standard body armor of the UPP military, the UL6 (Union Light MK6) is a light body armor, slightly weaker than the M3 pattern body armor in service with the USCM, specialized towards ballistics protection. This set of personal armor lacks the iconic neck piece and some of the armor in favor of user mobility." @@ -204,6 +215,7 @@ slowdown = SLOWDOWN_ARMOR_HEAVY flags_inventory = BLOCKSHARPOBJ|BLOCK_KNOCKDOWN flags_armor_protection = BODY_FLAG_ALL_BUT_HEAD + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_LEGS|BODY_FLAG_ARMS armor_melee = CLOTHING_ARMOR_MEDIUMHIGH armor_bullet = CLOTHING_ARMOR_HIGHPLUS armor_laser = CLOTHING_ARMOR_MEDIUMLOW @@ -226,6 +238,7 @@ icon_state = "upp_coat_officer" slowdown = SLOWDOWN_ARMOR_NONE flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_ARMS armor_melee = CLOTHING_ARMOR_LOW //wear actual armor if you go into combat armor_bullet = CLOTHING_ARMOR_LOW armor_energy = CLOTHING_ARMOR_LOW @@ -249,6 +262,7 @@ armor_rad = CLOTHING_ARMOR_LOW armor_internaldamage = CLOTHING_ARMOR_LOW flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_ARMS storage_slots = 4 uniform_restricted = list(/obj/item/clothing/under/marine/veteran/UPP/officer) @@ -258,6 +272,7 @@ icon_state = "upp_coat_mp" slowdown = SLOWDOWN_ARMOR_NONE flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_ARMS armor_melee = CLOTHING_ARMOR_LOW //wear actual armor if you go into combat armor_bullet = CLOTHING_ARMOR_LOW armor_energy = CLOTHING_ARMOR_LOW @@ -323,6 +338,10 @@ WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/suits_by_faction/UPP.dmi' ) +/obj/item/clothing/suit/storage/CMB/pap/Initialize() + . = ..() + AddElement(/datum/element/corp_label/norcomm) + // UPP SOF /obj/item/clothing/suit/storage/marine/faction/UPP/SOF_armor @@ -527,6 +546,7 @@ blood_overlay_type = "coat" flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_ARMS armor_melee = CLOTHING_ARMOR_MEDIUMLOW armor_bullet = CLOTHING_ARMOR_MEDIUMLOW armor_energy = CLOTHING_ARMOR_LOW @@ -621,6 +641,10 @@ uniform_restricted = list(/obj/item/clothing/under/marine/veteran/cmb, /obj/item/clothing/under/CM_uniform) item_state_slots = list(WEAR_JACKET = "cmb_heavy_armor") +/obj/item/clothing/suit/storage/marine/veteran/cmb/Initialize() + . = ..() + AddElement(/datum/element/corp_label/armat) + /obj/item/clothing/suit/storage/marine/veteran/cmb/light name = "\improper M4R pattern CMB light armor" icon_state = "cmb_light_armor" @@ -820,6 +844,10 @@ uniform_restricted = list(/obj/item/clothing/under/marine/ua_riot) flags_atom = NO_GAMEMODE_SKIN +/obj/item/clothing/suit/storage/marine/veteran/ua_riot/Initialize() + . = ..() + AddElement(/datum/element/corp_label/armat) + /obj/item/clothing/suit/storage/marine/veteran/ua_riot/synth name = "\improper UA-M1S Synthetic body armor" desc = "Based on the M-3 pattern employed by the USCM, the UA-M1 body armor is employed by UA security, riot control and union-busting teams. The UA-1MS modification is Synthetic programming compliant, sacrificing protection for speed and carrying capacity." @@ -866,6 +894,10 @@ /obj/item/device/walkman, ) +/obj/item/clothing/suit/storage/marine/veteran/royal_marine/Initialize() + . = ..() + AddElement(/datum/element/corp_label/wy) + /obj/item/clothing/suit/storage/marine/veteran/royal_marine/light //RMC Rifleman Armor icon_state = "rmc_light" item_state = "rmc_light" @@ -879,12 +911,14 @@ name = "kestrel armoured carry vest" icon_state = "rmc_light_padded" item_state = "rmc_light_padded" + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_LEGS storage_slots = 7 /obj/item/clothing/suit/storage/marine/veteran/royal_marine/smartgun //Smartgun Spec Armor name = "kestrel armoured smartgun harness" icon_state = "rmc_smartgun" item_state = "rmc_smartgun" + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_LEGS flags_inventory = BLOCKSHARPOBJ|BLOCK_KNOCKDOWN|SMARTGUN_HARNESS /obj/item/clothing/suit/storage/marine/veteran/royal_marine/pointman //Pointman Spec Armor @@ -892,6 +926,7 @@ desc = "A heavier version of the armor system used by the Three World Empire's Royal Marines Commandos. Designers from a Weyland Yutani subsidary, Lindenthal-Ehrenfeld Militärindustrie, iterated on the USCMC's M3 pattern personal armor in their Tokonigara lab to create an armor systemed to suit the unique needs of the Three World Empire's smaller but better equipped Royal Marines." icon_state = "rmc_pointman" item_state = "rmc_pointman" + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_LEGS|BODY_FLAG_ARMS armor_melee = CLOTHING_ARMOR_HIGH armor_bullet = CLOTHING_ARMOR_HIGHPLUS armor_bomb = CLOTHING_ARMOR_HIGHPLUS @@ -929,6 +964,10 @@ slowdown = SLOWDOWN_ARMOR_SUPER_LIGHT // Gotta go fast +/obj/item/clothing/suit/storage/marine/veteran/royal_marine/light/iasf/Initialize() + . = ..() + AddElement(/datum/element/corp_label/alphatech) + /obj/item/clothing/suit/storage/marine/veteran/royal_marine/light/iasf/synth name = "goshawk airborne synthetic vest" diff --git a/code/modules/clothing/suits/marine_armor/ghillie.dm b/code/modules/clothing/suits/marine_armor/ghillie.dm index c5aac5a6ca21..006c154e515f 100644 --- a/code/modules/clothing/suits/marine_armor/ghillie.dm +++ b/code/modules/clothing/suits/marine_armor/ghillie.dm @@ -19,7 +19,7 @@ var/camouflage_enter_delay = 4 SECONDS var/can_camo = TRUE - actions_types = list(/datum/action/item_action/toggle, /datum/action/item_action/specialist/prepare_position) + actions_types = list(/datum/action/item_action/toggle/lamp, /datum/action/item_action/specialist/prepare_position) /obj/item/clothing/suit/storage/marine/ghillie/dropped(mob/user) if(ishuman(user) && !issynth(user)) @@ -29,10 +29,9 @@ /obj/item/clothing/suit/storage/marine/ghillie/select_gamemode_skin() . = ..() - switch(SSmapping.configs[GROUND_MAP].camouflage_type) - if("urban") - name = "\improper M3-LS pattern sniper armor" - desc = "A lightweight version of M3 pattern armor, with an integrated thermal signature dampering device, used by USCM snipers on urban recon missions. Very lightweight, but doesn't protect much." + if(SSmapping.configs[GROUND_MAP].camouflage_type == "urban" || "classic") + name = "\improper M3-LS pattern sniper armor" + desc = "A lightweight version of M3 pattern armor, with an integrated thermal signature dampering device, used by USCM snipers on urban recon missions. Very lightweight, but doesn't protect much." /obj/item/clothing/suit/storage/marine/ghillie/verb/camouflage() set name = "Prepare Position" diff --git a/code/modules/clothing/suits/marine_armor/intel.dm b/code/modules/clothing/suits/marine_armor/intel.dm index 46f24ace9716..2765ed4e7306 100644 --- a/code/modules/clothing/suits/marine_armor/intel.dm +++ b/code/modules/clothing/suits/marine_armor/intel.dm @@ -3,7 +3,7 @@ uniform_restricted = list(/obj/item/clothing/under/marine/officer/intel) specialty = "XM4 pattern intel" desc = "Tougher than steel, quieter than whispers, the XM4 Intel Armor provides capable protection combined with an experimental integrated motion tracker. It took an R&D team a weekend to develop and costs more than the Chinook Station... probably. When worn, uniform accessories such as webbing cannot be attached due to the motion sensors occupying the clips." - desc_lore = "ARMAT Perfection. The XM4 Soldier Awareness System mixes M4-style hard armor and a distributed series of motion sensors clipped onto the breastplate. When connected to any HUD optic, it replicates the effects of an M314 Motion Detector unit, increasing user situational awareness. It is currently undergoing field trials by intelligence operatives." + desc_lore = "Armat Perfection. The XM4 Soldier Awareness System mixes M4-style hard armor and a distributed series of motion sensors clipped onto the breastplate. When connected to any HUD optic, it replicates the effects of an M314 Motion Detector unit, increasing user situational awareness. It is currently undergoing field trials by intelligence operatives." storage_slots = 5 /// XM4 Integral Motion Detector Ability actions_types = list(/datum/action/item_action/toggle, /datum/action/item_action/intel/toggle_motion_detector) @@ -42,14 +42,16 @@ var/obj/item/clothing/suit/storage/marine/medium/rto/intel/recon = holder_item recon.toggle_motion_detector(owner) -/datum/action/item_action/intel/toggle_motion_detector/proc/update_icon() +/datum/action/item_action/intel/toggle_motion_detector/update_button_icon() if(!holder_item) return var/obj/item/clothing/suit/storage/marine/medium/rto/intel/recon = holder_item if(recon.motion_detector) - button.icon_state = "template_on" + action_icon_state = "motion_detector_off" else - button.icon_state = "template" + action_icon_state = "motion_detector" + button.overlays.Cut() + button.overlays += image('icons/mob/hud/actions.dmi', button, action_icon_state) /obj/item/clothing/suit/storage/marine/medium/rto/intel/process() if(!motion_detector) @@ -73,7 +75,7 @@ playsound(loc,'sound/items/detector_turn_off.ogg', 25, 1) motion_detector = !motion_detector var/datum/action/item_action/intel/toggle_motion_detector/TMD = locate(/datum/action/item_action/intel/toggle_motion_detector) in actions - TMD.update_icon() + TMD.update_button_icon() motion_detector() /obj/item/clothing/suit/storage/marine/medium/rto/intel/proc/motion_detector() diff --git a/code/modules/clothing/suits/marine_armor/spec_fire.dm b/code/modules/clothing/suits/marine_armor/spec_fire.dm index 1c2cac8674ea..0da09da02e46 100644 --- a/code/modules/clothing/suits/marine_armor/spec_fire.dm +++ b/code/modules/clothing/suits/marine_armor/spec_fire.dm @@ -13,6 +13,7 @@ flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS|BODY_FLAG_FEET flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS|BODY_FLAG_FEET flags_heat_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS|BODY_FLAG_FEET + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_LEGS flags_item = MOB_LOCK_ON_EQUIP|NO_CRYO_STORE specialty = "M35 pyrotechnician" actions_types = list(/datum/action/item_action/toggle, /datum/action/item_action/specialist/fire_shield) diff --git a/code/modules/clothing/suits/marine_coat.dm b/code/modules/clothing/suits/marine_coat.dm index 62bc12068520..8243486d9f82 100644 --- a/code/modules/clothing/suits/marine_coat.dm +++ b/code/modules/clothing/suits/marine_coat.dm @@ -10,6 +10,7 @@ blood_overlay_type = "coat" flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_ARMS flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_LEGS + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_ARMS min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT armor_melee = CLOTHING_ARMOR_LOW armor_bullet = CLOTHING_ARMOR_LOW @@ -109,6 +110,7 @@ flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN flags_heat_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN + flags_bodypart_hidden = BODY_FLAG_CHEST armor_melee = CLOTHING_ARMOR_MEDIUMLOW armor_bullet = CLOTHING_ARMOR_MEDIUM armor_laser = CLOTHING_ARMOR_LOW @@ -271,13 +273,13 @@ /obj/item/clothing/suit/storage/jacket/marine/dress/officer/patchless name = "commanding officer's jacket" - desc = "A patchless version of the officer jacket, its presence is still domineering" + desc = "A patchless version of the officer jacket, its presence is still domineering." icon_state = "co_plain" /obj/item/clothing/suit/storage/jacket/marine/dress/officer/commander name = "commanding officer's jacket" - desc = "The thought of looking even at the rank pins scare you with a court martial" + desc = "The thought of looking even at the rank pins scare you with a court martial." icon_state = "co_falcon" /obj/item/clothing/suit/storage/jacket/marine/dress/officer/falcon @@ -440,6 +442,7 @@ item_icons = list( WEAR_JACKET = 'icons/mob/humans/onmob/clothing/suits/vests_aprons.dmi' ) + flags_bodypart_hidden = BODY_FLAG_CHEST flags_atom = NO_GAMEMODE_SKIN has_buttons = FALSE diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index c5fad0fec7b7..028571d5e582 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -262,6 +262,7 @@ /obj/item/device/binoculars, /obj/item/attachable/bayonet, + /obj/item/storage/belt/gun/m10, /obj/item/storage/belt/gun/m4a3, /obj/item/storage/belt/gun/m44, /obj/item/storage/belt/gun/mateba, diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index 86416d7ca6ed..70a4b7af4174 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -142,7 +142,7 @@ */ /obj/item/clothing/head/radiation name = "Radiation Hood" - desc = "A hood with radiation protective properties. Label: Made with lead, do not eat insulation" + desc = "A hood with radiation protective properties. Label: Made with lead, do not eat insulation." icon_state = "rad" icon = 'icons/obj/items/clothing/hats/hazard.dmi' item_icons = list( diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index 35af3589f115..b847f188416c 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -154,7 +154,7 @@ /obj/item/clothing/under/lawyer/bluesuit name = "blue suit" - desc = "A classy suit and tie" + desc = "A classy suit and tie." icon_state = "bluesuit" /obj/item/clothing/under/lawyer/purpsuit diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index 1ba485b1a296..dcbc24192ae7 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -59,30 +59,10 @@ armor_rad = CLOTHING_ARMOR_LOW armor_internaldamage = CLOTHING_ARMOR_LOW -/obj/item/clothing/under/rank/chemist - desc = "It's made of a special fiber that gives special protection against biohazards. It has a chemist rank stripe on it." - name = "chemist's jumpsuit" - icon_state = "chemistry" - item_state = "w_suit" - icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/medical.dmi' - item_icons = list( - WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/medical.dmi', - WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/clothing/uniforms_lefthand.dmi', - WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/clothing/uniforms_righthand.dmi', - ) - armor_melee = CLOTHING_ARMOR_NONE - armor_bullet = CLOTHING_ARMOR_NONE - armor_laser = CLOTHING_ARMOR_NONE - armor_energy = CLOTHING_ARMOR_NONE - armor_bomb = CLOTHING_ARMOR_NONE - armor_bio = CLOTHING_ARMOR_LOW - armor_rad = CLOTHING_ARMOR_LOW - armor_internaldamage = CLOTHING_ARMOR_LOW - /* * Medical */ -/obj/item/clothing/under/rank/chief_medical_officer +/obj/item/clothing/under/rank/cmo desc = "It's a jumpsuit worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection." name = "chief medical officer's jumpsuit" icon_state = "cmo" @@ -203,8 +183,8 @@ item_state_slots = list(WEAR_BODY = "medical") /obj/item/clothing/under/rank/medical/lightblue - name = "medical scrubs" - desc = "They're made of a special fiber that provides minor protection against biohazards. These are in light blue." + name = "nurse's medical scrubs" + desc = "They're made of a special fiber that provides minor protection against biohazards. Associated with nurses, these are in a calming sky blue." icon_state = "scrubslightblue" icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/medical.dmi' item_icons = list( @@ -214,8 +194,8 @@ item_state_slots = list(WEAR_BODY = "scrubslightblue") /obj/item/clothing/under/rank/medical/blue - name = "medical scrubs" - desc = "They're made of a special fiber that provides minor protection against biohazards. These are in formal blue." + name = "doctor's medical scrubs" + desc = "They're made of a special fiber that provides minor protection against biohazards. Doctors without specialties wear these. These remind you of blueberries." icon_state = "scrubsblue" icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/medical.dmi' item_icons = list( @@ -225,8 +205,8 @@ item_state_slots = list(WEAR_BODY = "scrubsblue") /obj/item/clothing/under/rank/medical/green - name = "medical scrubs" - desc = "They're made of a special fiber that provides minor protection against biohazards. These are in jade green." + name = "surgeon's medical scrubs" + desc = "They're made of a special fiber that provides minor protection against biohazards. These are worn by doctors specializing in surgery, represented by jade green." icon_state = "scrubsgreen" icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/medical.dmi' item_icons = list( @@ -236,8 +216,8 @@ item_state_slots = list(WEAR_BODY = "scrubsgreen") /obj/item/clothing/under/rank/medical/purple - name = "medical scrubs" - desc = "They're made of a special fiber that provides minor protection against biohazards. These are in berry red." + name = "purple medical scrubs" + desc = "They're made of a special fiber that provides minor protection against biohazards. Fancy doctors like to wear these wine-colored scrubs." icon_state = "scrubspurple" icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/medical.dmi' item_icons = list( @@ -247,8 +227,8 @@ item_state_slots = list(WEAR_BODY = "scrubspurple") /obj/item/clothing/under/rank/medical/olive - name = "medical scrubs" - desc = "They're made of a special fiber that provides minor protection against biohazards. These are in olive green." + name = "olive green medical scrubs" + desc = "They're made of a special fiber that provides minor protection against biohazards. Doctors without specialties wear these to calm and ground patients. These are in olive green." icon_state = "scrubsolive" icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/medical.dmi' item_icons = list( @@ -258,8 +238,8 @@ item_state_slots = list(WEAR_BODY = "scrubsolive") /obj/item/clothing/under/rank/medical/grey - name = "medical scrubs" - desc = "They're made of a special fiber that provides minor protection against biohazards. These are in mundane grey." + name = "grey medical scrubs" + desc = "They're made of a special fiber that provides minor protection against biohazards. Doctors without specialties wear these to calm patients and to keep professional. These are neutral grey." icon_state = "scrubsgrey" icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/medical.dmi' item_icons = list( @@ -268,8 +248,41 @@ flags_jumpsuit = FALSE item_state_slots = list(WEAR_BODY = "scrubsgrey") +/obj/item/clothing/under/rank/medical/brown + name = "brown medical scrubs" + desc = "They're made of a special fiber that provides minor protection against biohazards. Doctors without specialties wear these to calm and ground patients. These are a ruddy brown." + icon_state = "scrubsbrown" + icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/medical.dmi' + item_icons = list( + WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/medical.dmi', + ) + flags_jumpsuit = FALSE + item_state_slots = list(WEAR_BODY = "scrubsbrown") + +/obj/item/clothing/under/rank/medical/morgue + name = "morgue medical scrubs" + desc = "They're made of a special fiber that provides minor protection against biohazards. They're worn by doctors who are making autopsies. These are black as coal. Morbid." + icon_state = "scrubsblack" + icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/medical.dmi' + item_icons = list( + WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/medical.dmi', + ) + flags_jumpsuit = FALSE + item_state_slots = list(WEAR_BODY = "scrubsblack") + +/obj/item/clothing/under/rank/medical/white + name = "white medical scrubs" + desc = "They're made of a special fiber that provides minor protection against biohazards. Cherished by all doctors who enjoy cleanliness, these are white as snow." + icon_state = "scrubswhite" + icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/medical.dmi' + item_icons = list( + WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/medical.dmi', + ) + flags_jumpsuit = FALSE + item_state_slots = list(WEAR_BODY = "scrubswhite") + /obj/item/clothing/under/rank/medical/orange - name = "medical scrubs" + name = "brig medical scrubs" desc = "They're made of a special fiber that provides minor protection against biohazards. These are in prisoner orange." icon_state = "scrubsorange" icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/medical.dmi' @@ -278,3 +291,25 @@ ) flags_jumpsuit = FALSE item_state_slots = list(WEAR_BODY = "scrubsorange") + +/obj/item/clothing/under/rank/medical/pharmacist + name = "pharmaceutical physician's medical scrubs" + desc = "They're made of a special fiber that provides minor protection against biohazards. Doctors with a specialty in pharmaceuticals wear these. These are white with orange shoulder stripes." + icon_state = "scrubspharm" + icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/medical.dmi' + item_icons = list( + WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/medical.dmi', + ) + flags_jumpsuit = FALSE + item_state_slots = list(WEAR_BODY = "scrubspharm") + +/obj/item/clothing/under/rank/medical/cmo + name = "chief medical officer's medical scrubs" + desc = "They're made of a special fiber that provides minor protection against biohazards. These are jade green and adorned with peach stripes that denote the wearer is the Chief Medical Officer." + icon_state = "scrubscmo" + icon = 'icons/obj/items/clothing/uniforms/uniforms_by_department/medical.dmi' + item_icons = list( + WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/medical.dmi', + ) + flags_jumpsuit = FALSE + item_state_slots = list(WEAR_BODY = "scrubscmo") diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm index e11c00ff0bf3..60c232f84f70 100644 --- a/code/modules/clothing/under/marine_uniform.dm +++ b/code/modules/clothing/under/marine_uniform.dm @@ -974,6 +974,7 @@ worn_state = "pmc_jumpsuit" min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE + undershirt = TRUE suit_restricted = list( /obj/item/clothing/suit/storage/marine/veteran/pmc, /obj/item/clothing/suit/storage/marine/smartgunner/veteran/pmc, @@ -986,6 +987,10 @@ /obj/item/clothing/suit/storage/snow_suit, ) //if you remove this, it allows you to wear the marine M3 armor over the pmc fatigues +/obj/item/clothing/under/marine/veteran/pmc/Initialize() + . = ..() + AddElement(/datum/element/corp_label/wy) + /obj/item/clothing/under/marine/veteran/pmc/leader name = "\improper PMC command fatigues" desc = "A white set of fatigues, designed for private security operators. The symbol of the Weyland-Yutani corporation is emblazed on the suit. This particular suit looks like it belongs to a high-ranking officer." @@ -1100,11 +1105,16 @@ has_sensor = UNIFORM_HAS_SENSORS suit_restricted = list(/obj/item/clothing/suit/storage/marine/faction/UPP, /obj/item/clothing/suit/gimmick/jason, /obj/item/clothing/suit/storage/snow_suit/soviet, /obj/item/clothing/suit/storage/snow_suit/survivor, /obj/item/clothing/suit/storage/webbing, /obj/item/clothing/suit/storage/webbing/brown, /obj/item/clothing/suit/storage/webbing/black) flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE + undershirt = TRUE item_icons = list( WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/UPP.dmi' ) +/obj/item/clothing/under/marine/veteran/UPP/Initialize() + . = ..() + AddElement(/datum/element/corp_label/norcomm) + /obj/item/clothing/under/marine/veteran/UPP/medic name = "\improper UPP medic fatigues" desc = "A set of medic UPP fatigues, mass produced for the armed-forces of the Union of Progressive Peoples. A rare sight, especially in ICC zones. This particular set sports the dark drab pattern of the UPP 17th battalion, 'Smoldering Sons', operating in the sparse UPP frontier in the Anglo-Japanese arm." @@ -1137,30 +1147,35 @@ desc = "A set of Civilian-style Orange Overalls with a dark tan undershirt. The material is of a poor quality, however it's better than nothing. Clothing of this style is typically given out to those who work laborious jobs." icon_state = "upp_uniform_civi1" worn_state = "upp_uniform_civi1" + suit_restricted = FALSE /obj/item/clothing/under/marine/veteran/UPP/civi2 name = "\improper UPP Civilian-style tan overalls" desc = "A set of Civilian-style Tan Overalls with a Blue undershirt. The material is of a poor quality, however it's better than nothing. Clothing of this style is typically given to those who work laborious jobs." icon_state = "upp_uniform_civi2" worn_state = "upp_uniform_civi2" + suit_restricted = FALSE /obj/item/clothing/under/marine/veteran/UPP/civi3 name = "\improper UPP Civilian-style shirt and pants" desc = "A set of Civilian-style tan shirt and jeans. The material, while poor, is comfortable enough to be worn during all periods of the day." icon_state = "upp_uniform_civi3" worn_state = "upp_uniform_civi3" + suit_restricted = FALSE /obj/item/clothing/under/marine/veteran/UPP/civi4 name = "\improper UPP Civilian-style Vest and pants" desc = "A set of Civilian-style Brown vest and orange pants. The material is surprisingly decent, something not often worn by the civilians of the UPP for two reasons: They typically can't afford such clothing, and if they can, it paints a target on their back." icon_state = "upp_uniform_civi4" worn_state = "upp_uniform_civi4" + suit_restricted = FALSE /obj/item/clothing/under/marine/veteran/UPP/civi5 name = "\improper Jùtóu Combine mining overalls" desc = "A durable, olive-green jumpsuit worn beneath a sleeveless, puffy orange work vest—standard issue for Jùtóu Combine laborers. The vest's faded fabric is lined with reinforced padding, offering minimal protection against workplace hazards. A red star insignia is stamped on the back, marking its wearer as part of the Combine’s industrial workforce. Stiff, uncomfortable, and mass-produced, but better than nothing in the unforgiving conditions of deep-space labor." icon_state = "miner_uniform" worn_state = "miner_uniform" + suit_restricted = FALSE /obj/item/clothing/under/marine/veteran/UPP/army name = "\improper UPP army jungle fatigues" @@ -1257,6 +1272,10 @@ /obj/item/clothing/under/marine/veteran/dutch/ranger icon_state = "dutch_jumpsuit2" +/obj/item/clothing/under/marine/veteran/dutch/vietnam + name = "\improper US Army uniform" + desc = "Standard-issue Army uniform. Used during the Vietnam War." + /obj/item/clothing/under/marine/veteran/van_bandolier name = "hunting clothes" desc = "A set of tailored clothes, made from fine but sturdy reinforced fabrics. Protects from thorns, weather, and the cuts and scrapes that forever bedevil outdoorsmen." @@ -1370,6 +1389,13 @@ worn_state = "colonist" has_sensor = UNIFORM_HAS_SENSORS +/obj/item/clothing/under/colonist/Initialize() + . = ..() + if(istypestrict(src, /obj/item/clothing/under/colonist)) + AddElement(/datum/element/corp_label/wy) + if(istypestrict(src, /obj/item/clothing/under/colonist/administrator)) + AddElement(/datum/element/corp_label/wy) + /obj/item/clothing/under/colonist/administrator name = "administrator uniform" desc = "An office grey polo with a Wey-Yu badge on the chest. Worn by administrators on colonies owned by the Company." @@ -1383,6 +1409,7 @@ item_icons = list( WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/workwear.dmi', ) + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_LEGS icon_state = "workwear_grey" worn_state = "workwear_grey" @@ -1513,6 +1540,10 @@ icon_state = "liaison_charcoal" worn_state = "liaison_charcoal" +/obj/item/clothing/under/liaison_suit/charcoal/Initialize() + . = ..() + AddElement(/datum/element/corp_label/wy) + /obj/item/clothing/under/liaison_suit/charcoal/skirt name = "liaison's charcoal suitskirt" desc = "A stiff, stylish charcoal suit commonly worn by businesswomen from the Weyland-Yutani corporation. Expertly crafted to make you look like a prick." @@ -1535,18 +1566,30 @@ icon_state = "liaison_formal" worn_state = "liaison_formal" +/obj/item/clothing/under/liaison_suit/formal/Initialize() + . = ..() + AddElement(/datum/element/corp_label/wy) + /obj/item/clothing/under/liaison_suit/suspenders name = "liaison's suspenders" desc = "A collared shirt, complimented by a pair of suspenders. Worn by Weyland-Yutani employees who ask the tough questions. Smells faintly of cigars and bad acting." icon_state = "liaison_suspenders" worn_state = "liaison_suspenders" +/obj/item/clothing/under/liaison_suit/suspenders/Initialize() + . = ..() + AddElement(/datum/element/corp_label/wy) + /obj/item/clothing/under/liaison_suit/blazer name = "liaison's blue blazer" desc = "A stiff but casual blue blazer. Similar can be found in any Weyland-Yutani office. Only the finest wear for the galaxy's most cunning." icon_state = "liaison_blue_blazer" worn_state = "liaison_blue_blazer" +/obj/item/clothing/under/liaison_suit/blazer/Initialize() + . = ..() + AddElement(/datum/element/corp_label/wy) + /obj/item/clothing/under/liaison_suit/field name = "corporate casual" desc = "A pair of dark brown slacks paired with a dark blue button-down shirt. A popular look among those in the corporate world that conduct the majority of their business from night clubs." @@ -1644,11 +1687,19 @@ WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/formal_uniforms.dmi', ) +/obj/item/clothing/under/stowaway/Initialize() + . = ..() + AddElement(/datum/element/corp_label/wy) + /obj/item/clothing/under/rank/chef/exec name = "\improper Weyland-Yutani suit" desc = "A formal white undersuit." flags_jumpsuit = FALSE +/obj/item/clothing/under/rank/chef/exec/Initialize() + . = ..() + AddElement(/datum/element/corp_label/wy) + /obj/item/clothing/under/rank/qm_suit name = "quartermaster suit" desc = "A nicely-fitting military suit for a quartermaster. It has shards of light Kevlar to help protect against stabbing weapons and bullets." @@ -1702,6 +1753,13 @@ worn_state = "green_utility" displays_id = FALSE +/obj/item/clothing/under/rank/utility/upp + name = "\improper green utility uniform" + desc = "A green-on-green utility uniform, popularly issued to UPP workers on the frontier." + has_sensor = UNIFORM_HAS_SENSORS + suit_restricted = FALSE + armor_energy = CLOTHING_ARMOR_LOW + /obj/item/clothing/under/rank/utility/yellow name = "\improper yellow utility uniform" desc = "A grey utility uniform with yellow suspenders, made for shipside crew." @@ -1805,6 +1863,7 @@ /obj/item/clothing/under/rank/synthetic/joe/Initialize() . = ..() camera = new /obj/structure/machinery/camera/autoname/almayer/containment/ares(src) + AddElement(/datum/element/corp_label/seegson) /obj/item/clothing/under/rank/synthetic/joe/Destroy() QDEL_NULL(camera) @@ -1851,7 +1910,7 @@ /obj/item/clothing/under/marine/veteran/royal_marine name = "royal marines commando uniform" - desc = "The field uniform of the royal marines commando. They have shards of light Kevlar to help protect against stabbing weapons and bullets. Onpar with similar USCM equipment" + desc = "The field uniform of the royal marines commando. They have shards of light Kevlar to help protect against stabbing weapons and bullets. Onpar with similar USCM equipment." icon = 'icons/obj/items/clothing/uniforms/uniforms_by_faction/TWE.dmi' item_icons = list( WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/TWE.dmi', @@ -1866,7 +1925,7 @@ /obj/item/clothing/under/marine/veteran/royal_marine/lt name = "royal marines commando officers uniform" - desc = "The officers uniform of the royal marines commando. They have shards of light Kevlar to help protect against stabbing weapons and bullets. Onpar with similar USCM equipment" + desc = "The officers uniform of the royal marines commando. They have shards of light Kevlar to help protect against stabbing weapons and bullets. Onpar with similar USCM equipment." icon_state = "rmc_uniform_lt" worn_state = "rmc_uniform_lt" diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 6f831275786e..6cda8af1021f 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -207,3 +207,13 @@ item_icons = list( WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/uniforms_by_faction/WY.dmi', ) + +/obj/item/clothing/under/tunic + name = "generic tunic" + desc = "A generic tunic woven by linen fabric. Its historical usage dates back to old human civillizations." + icon_state = "roman_tunic" + item_state = "roman_tunic" + icon = 'icons/obj/items/clothing/uniforms/misc_ert_colony.dmi' + item_icons = list( + WEAR_BODY = 'icons/mob/humans/onmob/clothing/uniforms/misc_ert_colony.dmi' + ) diff --git a/code/modules/clothing/under/rank_pins.dm b/code/modules/clothing/under/rank_pins.dm index 52258e4faa8e..d4c7ad437868 100644 --- a/code/modules/clothing/under/rank_pins.dm +++ b/code/modules/clothing/under/rank_pins.dm @@ -27,119 +27,279 @@ ################################################*/ //ENLISTED /obj/item/clothing/accessory/ranks/marine/e1 + icon_state = "ranks_me1" /obj/item/clothing/accessory/ranks/marine/e2 rank_short = PAY_SHORT_ME2 + icon_state = "ranks_me2" /obj/item/clothing/accessory/ranks/marine/e3 rank_short = PAY_SHORT_ME3 + icon_state = "ranks_me3" /obj/item/clothing/accessory/ranks/marine/e4 rank_short = PAY_SHORT_ME4 - icon_state = "ranks_nco" + icon_state = "ranks_me4" /obj/item/clothing/accessory/ranks/marine/e5 rank_short = PAY_SHORT_ME5 - icon_state = "ranks_nco" + icon_state = "ranks_me5" /obj/item/clothing/accessory/ranks/marine/e6 rank_short = PAY_SHORT_ME6 - icon_state = "ranks_snco" + icon_state = "ranks_me6" /obj/item/clothing/accessory/ranks/marine/e7 rank_short = PAY_SHORT_ME7 - icon_state = "ranks_snco" + icon_state = "ranks_me7" /obj/item/clothing/accessory/ranks/marine/e8 rank_short = PAY_SHORT_ME8 - icon_state = "ranks_snco" + icon_state = "ranks_me8" + +// Marine Enlisted 8E and above, except ME9 haven't been sprited. /obj/item/clothing/accessory/ranks/marine/e8e rank_short = PAY_SHORT_ME8E - icon_state = "ranks_snco" + icon_state = "ranks_me8" /obj/item/clothing/accessory/ranks/marine/e9 rank_short = PAY_SHORT_ME9 - icon_state = "ranks_snco" + icon_state = "ranks_me9" /obj/item/clothing/accessory/ranks/marine/e9e rank_short = PAY_SHORT_ME9E - icon_state = "ranks_snco" + icon_state = "ranks_me9" /obj/item/clothing/accessory/ranks/marine/e9c rank_short = PAY_SHORT_ME9C - icon_state = "ranks_snco" + icon_state = "ranks_me9" + +/obj/item/clothing/accessory/ranks/marine/wo + name = "rank boards" + rank_short = PAY_SHORT_MWO + icon_state = "ranks_warrant" + +/obj/item/clothing/accessory/ranks/marine/cwo + name = "rank boards" + rank_short = PAY_SHORT_MCWO + icon_state = "ranks_chiefwarrant" //OFFICERS /obj/item/clothing/accessory/ranks/marine/o1 - name = "rank boards" + name = "officer rank pins" rank_short = PAY_SHORT_MO1 - icon_state = "ranks_officer" + icon_state = "ranks_o1" /obj/item/clothing/accessory/ranks/marine/o2 - name = "rank boards" + name = "officer rank pins" rank_short = PAY_SHORT_MO2 - icon_state = "ranks_officer" + icon_state = "ranks_o2" /obj/item/clothing/accessory/ranks/marine/o3 - name = "rank boards" + name = "officer rank pins" rank_short = PAY_SHORT_MO3 - icon_state = "ranks_officer" + icon_state = "ranks_o3" /obj/item/clothing/accessory/ranks/marine/o4 - name = "rank boards" + name = "officer rank pins" rank_short = PAY_SHORT_MO4 - icon_state = "ranks_seniorofficer" + icon_state = "ranks_o4" /obj/item/clothing/accessory/ranks/marine/o5 - name = "rank boards" + name = "officer rank pins" rank_short = PAY_SHORT_MO5 - icon_state = "ranks_seniorofficer" + icon_state = "ranks_o5" /obj/item/clothing/accessory/ranks/marine/o6 - name = "rank boards" + name = "officer rank pins" rank_short = PAY_SHORT_MO6 - icon_state = "ranks_seniorofficer" + icon_state = "ranks_o6" /obj/item/clothing/accessory/ranks/marine/o6e - name = "rank boards" + name = "officer rank pins" rank_short = PAY_SHORT_MO6E - icon_state = "ranks_seniorofficer" + icon_state = "ranks_o6" /obj/item/clothing/accessory/ranks/marine/o6c - name = "rank boards" + name = "officer rank pins" rank_short = PAY_SHORT_MO6C - icon_state = "ranks_flagofficer" + icon_state = "ranks_o6" /obj/item/clothing/accessory/ranks/marine/o7 - name = "rank boards" + name = "officer rank pins" rank_short = PAY_SHORT_MO7 - icon_state = "ranks_flagofficer" + icon_state = "ranks_o7" /obj/item/clothing/accessory/ranks/marine/o8 - name = "rank boards" + name = "officer rank pins" rank_short = PAY_SHORT_MO8 - icon_state = "ranks_flagofficer" + icon_state = "ranks_o8" /obj/item/clothing/accessory/ranks/marine/o9 - name = "rank boards" + name = "officer rank pins" rank_short = PAY_SHORT_MO9 - icon_state = "ranks_flagofficer" + icon_state = "ranks_o9" /obj/item/clothing/accessory/ranks/marine/o10 - name = "rank boards" + name = "officer rank pins" rank_short = PAY_SHORT_MO10 - icon_state = "ranks_flagofficer" + icon_state = "ranks_o10" /obj/item/clothing/accessory/ranks/marine/o10c - name = "rank boards" + name = "officer rank pins" rank_short = PAY_SHORT_MO10C - icon_state = "ranks_flagofficer" + icon_state = "ranks_o10" /obj/item/clothing/accessory/ranks/marine/o10s - name = "rank boards" + name = "officer rank pins" rank_short = PAY_SHORT_MO10S - icon_state = "ranks_flagofficer" + icon_state = "ranks_o10" + +/*################################################ +################ ARMY ##################### +################################################*/ + +// Comented out until someone adds the faction file. + +/* +//ENLISTED +/obj/item/clothing/accessory/ranks/army/e1 + rank_short = PAY_SHORT_AE1 + icon_state = "ranks_ae1" + +/obj/item/clothing/accessory/ranks/army/e2 + rank_short = PAY_SHORT_AE2 + icon_state = "ranks_ae2" + +/obj/item/clothing/accessory/ranks/army/e3 + rank_short = PAY_SHORT_AE3 + icon_state = "ranks_ae3" + +/obj/item/clothing/accessory/ranks/army/e4s + rank_short = PAY_SHORT_AE4E + icon_state = "ranks_ae4s" + +/obj/item/clothing/accessory/ranks/army/e4 + rank_short = PAY_SHORT_AE4 + icon_state = "ranks_ae4" + +/obj/item/clothing/accessory/ranks/army/e5 + rank_short = PAY_SHORT_AE5 + icon_state = "ranks_ae5" + +/obj/item/clothing/accessory/ranks/army/e6 + rank_short = PAY_SHORT_AE6 + icon_state = "ranks_ae6" + +/obj/item/clothing/accessory/ranks/army/e7 + rank_short = PAY_SHORT_AE7 + icon_state = "ranks_ae7" + +//until a better sprites can be made, all above E7 will use its icon. -itus + +/obj/item/clothing/accessory/ranks/army/e8 + rank_short = PAY_SHORT_AE8 + icon_state = "ranks_ae7" + +/obj/item/clothing/accessory/ranks/army/e8c + rank_short = PAY_SHORT_AE8E + icon_state = "ranks_ae7" + +/obj/item/clothing/accessory/ranks/army/e9 + rank_short = PAY_SHORT_AE9 + icon_state = "ranks_ae7" + +/obj/item/clothing/accessory/ranks/army/e9e + rank_short = PAY_SHORT_AE9E + icon_state = "ranks_ae7" + +/obj/item/clothing/accessory/ranks/army/e9c + rank_short = PAY_SHORT_AE9C + icon_state = "ranks_ae7" + +/obj/item/clothing/accessory/ranks/army/wo + name = "rank boards" + rank_short = PAY_SHORT_AWO + icon_state = "ranks_warrant" + +/obj/item/clothing/accessory/ranks/army/cwo + name = "rank boards" + rank_short = PAY_SHORT_ACWO + icon_state = "ranks_chiefwarrant" + +//OFFICERS +/obj/item/clothing/accessory/army/o1 + name = "officer rank pins" + rank_short = PAY_SHORT_AO1 + icon_state = "ranks_o1" + +/obj/item/clothing/accessory/ranks/army/o2 + name = "officer rank pins" + rank_short = PAY_SHORT_AO2 + icon_state = "ranks_o2" + +/obj/item/clothing/accessory/ranks/army/o3 + name = "officer rank pins" + rank_short = PAY_SHORT_AO3 + icon_state = "ranks_o3" + +/obj/item/clothing/accessory/ranks/army/o4 + name = "officer rank pins" + rank_short = PAY_SHORT_AO4 + icon_state = "ranks_o4" + +/obj/item/clothing/accessory/ranks/army/o5 + name = "officer rank pins" + rank_short = PAY_SHORT_AO5 + icon_state = "ranks_o5" + +/obj/item/clothing/accessory/ranks/army/o6 + name = "officer rank pins" + rank_short = PAY_SHORT_AO6 + icon_state = "ranks_o6" + +/obj/item/clothing/accessory/ranks/army/o6e + name = "officer rank pins" + rank_short = PAY_SHORT_AO6E + icon_state = "ranks_o6" + +/obj/item/clothing/accessory/ranks/army/o6c + name = "officer rank pins" + rank_short = PAY_SHORT_AO6C + icon_state = "ranks_o6" + +/obj/item/clothing/accessory/ranks/army/o7 + name = "officer rank pins" + rank_short = PAY_SHORT_AO7 + icon_state = "ranks_o7" + +/obj/item/clothing/accessory/ranks/army/o8 + name = "officer rank pins" + rank_short = PAY_SHORT_AO8 + icon_state = "ranks_o8" + +/obj/item/clothing/accessory/ranks/army/o9 + name = "officer rank pins" + rank_short = PAY_SHORT_AO9 + icon_state = "ranks_o9" + +/obj/item/clothing/accessory/ranks/army/o10 + name = "officer rank pins" + rank_short = PAY_SHORT_AO10 + icon_state = "ranks_o10" + +/obj/item/clothing/accessory/ranks/army/o10c + name = "officer rank pins" + rank_short = PAY_SHORT_AO10C + icon_state = "ranks_o10" + +/obj/item/clothing/accessory/ranks/army/o10s + name = "officer rank pins" + rank_short = PAY_SHORT_AO10S + icon_state = "ranks_o11" + +*/ /*################################################ ################ NAVY ##################### @@ -251,7 +411,6 @@ name = "rank boards" rank_short = PAY_SHORT_NO10C icon_state = "ranks_flagofficer" - /*################################################ ################# SPECIAL ################# ################################################*/ diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm index 5d16f56f7df0..b41266b23808 100644 --- a/code/modules/clothing/under/ties.dm +++ b/code/modules/clothing/under/ties.dm @@ -41,11 +41,11 @@ /obj/item/clothing/accessory/proc/can_attach_to(mob/user, obj/item/clothing/C) return TRUE -//when user attached an accessory to S -/obj/item/clothing/accessory/proc/on_attached(obj/item/clothing/S, mob/living/user, silent) - if(!istype(S)) +//when user attached an accessory to clothing/clothes +/obj/item/clothing/accessory/proc/on_attached(obj/item/clothing/clothes, mob/living/user, silent) + if(!istype(clothes)) return - has_suit = S + has_suit = clothes forceMove(has_suit) has_suit.overlays += get_inv_overlay() @@ -53,11 +53,24 @@ if(!silent) to_chat(user, SPAN_NOTICE("You attach \the [src] to \the [has_suit].")) src.add_fingerprint(user) + + if(ismob(clothes.loc)) + var/mob/wearer = clothes.loc + if(LAZYLEN(actions)) + for(var/datum/action/action in actions) + action.give_to(wearer) return TRUE -/obj/item/clothing/accessory/proc/on_removed(mob/living/user, obj/item/clothing/C) +/obj/item/clothing/accessory/proc/on_removed(mob/living/user, obj/item/clothing/clothes) if(!has_suit) return + + if(ismob(clothes.loc)) + var/mob/wearer = clothes.loc + if(LAZYLEN(actions)) + for(var/datum/action/action in actions) + action.remove_from(wearer) + has_suit.overlays -= get_inv_overlay() has_suit = null if(usr) @@ -188,7 +201,8 @@ /obj/item/clothing/accessory/medal name = "medal" desc = "A medal." - icon_state = "bronze" + icon_state = "bronze_service" + item_state = "bronze" icon = 'icons/obj/items/clothing/accessory/medals.dmi' inv_overlay_icon = 'icons/obj/items/clothing/accessory/inventory_overlays/medals.dmi' accessory_icons = list( @@ -202,6 +216,7 @@ high_visibility = TRUE jumpsuit_hide_states = UNIFORM_JACKET_REMOVED worn_accessory_limit = 2 + var/awarding_faction /obj/item/clothing/accessory/medal/on_attached(obj/item/clothing/S, mob/living/user, silent) . = ..() @@ -306,72 +321,133 @@ . += "Awarded to: \'[recipient_rank] [recipient_name]\'. [citation_to_read]" +/obj/item/clothing/accessory/medal/ribbon + name = "award ribbon" + desc = "A military award ribbon." + +/obj/item/clothing/accessory/medal/ribbon/commendation + name = MARINE_RIBBON_COMMENDATION + desc = "A ribbon awarded to commend conduct and actions of note, often given alongside a formal letter of commendation. This is the most basic award given by the USCM." + icon_state = "ribbon_commendation" + awarding_faction = FACTION_MARINE + +/obj/item/clothing/accessory/medal/ribbon/leadership + name = MARINE_RIBBON_LEADERSHIP + desc = "A ribbon given to officers, NCOs, or squad leaders whose coordination, decision-making, or morale-keeping played a critical role in their unit's success or survival." + icon_state = "ribbon_leadership" + awarding_faction = FACTION_MARINE + +/obj/item/clothing/accessory/medal/ribbon/proficiency + name = MARINE_RIBBON_PROFICIENCY + desc = "A ribbon awarded for outstanding technical expertise in the field. Engineering, medical, or logistics personnel whose skill or innovation directly contributed to mission success." + icon_state = "ribbon_proficiency" + awarding_faction = FACTION_MARINE + +/obj/item/clothing/accessory/medal/purple_heart + name = MARINE_MEDAL_PURPLE_HEART + desc = "Awarded to those wounded or killed in action. A solemn token of sacrifice and resilience given in recognition of the physical and personal cost of service." + icon_state = "purple_heart" + awarding_faction = FACTION_MARINE + /obj/item/clothing/accessory/medal/bronze name = "bronze medal" desc = "A bronze medal." - -/obj/item/clothing/accessory/medal/bronze/conduct - name = MARINE_CONDUCT_MEDAL - desc = "A bronze medal awarded for distinguished conduct. Whilst a great honor, this is the most basic award given by the USCM" - icon_state = "bronze_b" - -/obj/item/clothing/accessory/medal/bronze/heart - name = MARINE_BRONZE_HEART_MEDAL - desc = "A bronze heart-shaped medal awarded for sacrifice. It is often awarded posthumously or for severe injury in the line of duty." - icon_state = "bronze_heart" - -/obj/item/clothing/accessory/medal/bronze/science - name = "nobel sciences award" - desc = "A bronze medal which represents significant contributions to the field of science or engineering." + icon_state = "bronze" /obj/item/clothing/accessory/medal/silver name = "silver medal" desc = "A silver medal." - icon_state = "silver_b" + icon_state = "silver" + item_state = "silver" -/obj/item/clothing/accessory/medal/silver/valor - name = MARINE_VALOR_MEDAL - desc = "A silver medal awarded for acts of exceptional valor." +/obj/item/clothing/accessory/medal/silver/star + name = MARINE_MEDAL_SILVER_STAR + desc = "Awarded for conspicuous gallantry in action. The Silver Star recognizes those who go beyond the call of duty: charging into danger, holding the line when all seems lost, or saving lives under relentless enemy fire." + icon_state = "silver_star" + awarding_faction = FACTION_MARINE -/obj/item/clothing/accessory/medal/silver/security - name = "robust security award" - desc = "An award for distinguished combat and sacrifice in defence of Wey-Yu's commercial interests. Often awarded to security staff." +/obj/item/clothing/accessory/medal/silver/valor + name = MARINE_MEDAL_VALOR + desc = "For acts of courage performed during combat operations. Recognizes marines who display calm, determination, and bravery under fire, contributing to the survival and morale of their squad." + awarding_faction = FACTION_MARINE + +/obj/item/clothing/accessory/medal/gold/corporate_award + name = WY_MEDAL_AWARD_1 + desc = "A small gold corporate badge awarded for notable service in the interests of Weyland-Yutani." + icon_state = "corporate_award" + awarding_faction = FACTION_WY + +/obj/item/clothing/accessory/medal/gold/corporate_award2 + name = WY_MEDAL_AWARD_2 + desc = "A large gold corporate badge awarded for notable service in the interests of Weyland-Yutani." + icon_state = "corporate_award2" + awarding_faction = FACTION_WY /obj/item/clothing/accessory/medal/gold name = "gold medal" desc = "A prestigious golden medal." - icon_state = "gold_b" - -/obj/item/clothing/accessory/medal/gold/captain - name = "medal of captaincy" - desc = "A golden medal awarded exclusively to those promoted to the rank of captain. It signifies the codified responsibilities of a captain to Wey-Yu, and their undisputable authority over their crew." + icon_state = "gold" + item_state = "gold" -/obj/item/clothing/accessory/medal/gold/heroism - name = MARINE_HEROISM_MEDAL - desc = "An extremely rare golden medal awarded only by the USCM. To receive such a medal is the highest honor and as such, very few exist." +/obj/item/clothing/accessory/medal/gold/cross + name = MARINE_MEDAL_GALACTIC_CROSS + desc = "The second highest decoration within the USCM. Granted for acts of valor performed under extreme conditions. When the mission's success or the survival of fellow marines hinged upon extraordinary courage and quick thinking." + icon_state = "ua_cross" + awarding_faction = FACTION_MARINE /obj/item/clothing/accessory/medal/platinum name = "platinum medal" desc = "A very prestigious platinum medal, only able to be handed out by generals due to special circumstances." - icon_state = "platinum_b" + icon_state = "platinum" + item_state = "platinum" + +/obj/item/clothing/accessory/medal/platinum/honor + name = MARINE_MEDAL_HONOR + desc = "The highest distinction awarded by the United States Colonial Marine Corps. Bestowed upon those whose actions demonstrate unparalleled bravery, self-sacrifice, and devotion to duty - often in the face of certain death. To wear this medal is to stand among legends of the Corps." + awarding_faction = "USCM HC" + +//Legacy medals. +//Keeping in code as to allow medal records to display correctly, but won't be issued further. +/obj/item/clothing/accessory/medal/legacy + name = "legacy medal" + desc = "An old and disused award." + +/obj/item/clothing/accessory/medal/legacy/distinguished_conduct + name = MARINE_LEGACY_MEDAL_CONDUCT + desc = "A bronze medal awarded for distinguished conduct. Whilst a great honor, this is one of the most basic awards given by the USCM." + icon_state = "conduct" + +/obj/item/clothing/accessory/medal/legacy/bronze_heart + name = MARINE_LEGACY_MEDAL_BRONZE_HEART + desc = "A bronze heart-shaped medal awarded for sacrifice. It is often awarded posthumously or for severe injury in the line of duty." + icon_state = "bronze_heart" + +/obj/item/clothing/accessory/medal/legacy/heroism + name = MARINE_LEGACY_MEDAL_HEROISM + desc = "An extremely rare golden medal awarded only by the USCM. To receive such a medal is the highest honor and as such, very few exist." + icon_state = "heroism" +//Playtime Service Medals /obj/item/clothing/accessory/medal/bronze/service name = "bronze service medal" desc = "A bronze medal awarded for a marine's service within the USCM. It is a very common medal, and is typically the first medal a marine would receive." - icon_state = "bronze" + icon_state = "bronze_service" /obj/item/clothing/accessory/medal/silver/service name = "silver service medal" desc = "A shiny silver medal awarded for a marine's service within the USCM. It is a somewhat common medal which signifies the amount of time a marine has spent in the line of duty." - icon_state = "silver" + icon_state = "silver_service" + /obj/item/clothing/accessory/medal/gold/service name = "gold service medal" desc = "A prestigious gold medal awarded for a marine's service within the USCM. It is a rare medal which signifies the amount of time a marine has spent in the line of duty." - icon_state = "gold" + icon_state = "gold_service" + /obj/item/clothing/accessory/medal/platinum/service name = "platinum service medal" desc = "The highest service medal that can be awarded to a marine; such medals are hand-given by USCM Generals to a marine. It signifies the sheer amount of time a marine has spent in the line of duty." - icon_state = "platinum" + icon_state = "platinum_service" + //Armbands /obj/item/clothing/accessory/armband name = "red armband" @@ -472,7 +548,7 @@ /obj/item/clothing/accessory/armband/mp name = "MP armband" - desc = "An armband worn by USCM Military Police officers on military installations. It is usually also worn by those from the provost office" + desc = "An armband worn by USCM Military Police officers on military installations. It is usually also worn by those from the provost office." icon_state = "armband_mp" //patches @@ -854,7 +930,7 @@ /obj/item/clothing/accessory/storage/black_vest/attackby(obj/item/W, mob/living/user) if(HAS_TRAIT(W, TRAIT_TOOL_WIRECUTTERS) && skillcheck(user, SKILL_RESEARCH, SKILL_RESEARCH_TRAINED)) var/components = 0 - var/obj/item/reagent_container/glass/beaker/vial + var/obj/item/reagent_container/glass/beaker/beaker var/obj/item/cell/battery for(var/obj/item in hold.contents) if(istype(item, /obj/item/device/radio) || istype(item, /obj/item/stack/cable_coil) || istype(item, /obj/item/device/healthanalyzer)) @@ -862,7 +938,7 @@ else if(istype(item, /obj/item/reagent_container/hypospray) && !istype(item, /obj/item/reagent_container/hypospray/autoinjector)) var/obj/item/reagent_container/hypospray/H = item if(H.mag) - vial = H.mag + beaker = H.mag components++ else if(istype(item, /obj/item/cell)) battery = item @@ -875,9 +951,9 @@ AH = new /obj/item/clothing/accessory/storage/black_vest/acid_harness/brown(get_turf(loc)) else AH = new /obj/item/clothing/accessory/storage/black_vest/acid_harness(get_turf(loc)) - if(vial) - AH.vial = vial - AH.hold.handle_item_insertion(vial) + if(beaker) + AH.beaker = beaker + AH.hold.handle_item_insertion(beaker) AH.battery = battery AH.hold.handle_item_insertion(battery) qdel(src) @@ -991,6 +1067,22 @@ new /obj/item/stack/cable_coil(src) new /obj/item/device/multitool(src) +/obj/item/clothing/accessory/storage/tool_webbing/yellow_drop + name = "Tool Drop Pouch" + desc = "A durable pair of drop pouches purpose-made for carrying tools." + icon_state = "drop_pouch_engineering" + +/obj/item/clothing/accessory/storage/tool_webbing/yellow_drop/small + name = "Small Tool Drop Pouch" + desc = "A durable pair of drop pouches purpose-made for carrying tools. These are the slightly smaller budget-version." + hold = /obj/item/storage/internal/accessory/tool_webbing/small + +/obj/item/clothing/accessory/storage/tool_webbing/yellow_drop/equipped + hold = /obj/item/storage/internal/accessory/tool_webbing/equipped + +/obj/item/clothing/accessory/storage/tool_webbing/yellow_drop/small/equipped + hold = /obj/item/storage/internal/accessory/tool_webbing/small/equipped + /obj/item/storage/internal/accessory/surg_vest storage_slots = 14 can_hold = list( @@ -1043,22 +1135,6 @@ /obj/item/clothing/accessory/storage/surg_vest/equipped hold = /obj/item/storage/internal/accessory/surg_vest/equipped -/obj/item/clothing/accessory/storage/surg_vest/blue - name = "blue surgical webbing vest" - desc = "A matte blue synthcotton vest purpose-made for holding surgical tools." - icon_state = "vest_blue" - -/obj/item/clothing/accessory/storage/surg_vest/blue/equipped - hold = /obj/item/storage/internal/accessory/surg_vest/equipped - -/obj/item/clothing/accessory/storage/surg_vest/drop_blue - name = "blue surgical drop pouch" - desc = "A matte blue synthcotton drop pouch purpose-made for holding surgical tools." - icon_state = "drop_pouch_surgical_blue" - -/obj/item/clothing/accessory/storage/surg_vest/drop_blue/equipped - hold = /obj/item/storage/internal/accessory/surg_vest/equipped - /obj/item/clothing/accessory/storage/surg_vest/drop_green name = "green surgical drop pouch" desc = "A greenish synthcotton drop pouch purpose-made for holding surgical tools." @@ -1086,6 +1162,30 @@ new /obj/item/tool/surgery/bonegel(src) new /obj/item/reagent_container/blood/OMinus(src) +/obj/item/clothing/accessory/storage/surg_vest/blue + name = "blue surgical webbing vest" + desc = "A matte blue synthcotton vest purpose-made for holding surgical tools." + icon_state = "vest_blue" + +/obj/item/clothing/accessory/storage/surg_vest/blue/equipped + hold = /obj/item/storage/internal/accessory/surg_vest/equipped + +/obj/item/clothing/accessory/storage/surg_vest/drop_blue + name = "blue surgical drop pouch" + desc = "A matte blue synthcotton drop pouch purpose-made for holding surgical tools." + icon_state = "drop_pouch_surgical_blue" + +/obj/item/clothing/accessory/storage/surg_vest/drop_blue/equipped + hold = /obj/item/storage/internal/accessory/surg_vest/equipped + +/obj/item/clothing/accessory/storage/surg_vest/black + name = "black surgical webbing vest" + desc = "A tactical black synthcotton vest purpose-made for holding surgical tools." + icon_state = "vest_black" + +/obj/item/clothing/accessory/storage/surg_vest/black/equipped + hold = /obj/item/storage/internal/accessory/surg_vest/equipped + /obj/item/clothing/accessory/storage/surg_vest/drop_black name = "black surgical drop pouch" desc = "A tactical black synthcotton drop pouch purpose-made for holding surgical tools." @@ -1243,7 +1343,7 @@ /obj/item/clothing/accessory/storage/holster/armpit name = "shoulder holster" - desc = "A worn-out handgun holster. Perfect for concealed carry" + desc = "A worn-out handgun holster. Perfect for concealed carry." icon_state = "holster" /obj/item/clothing/accessory/storage/holster/waist @@ -1388,3 +1488,56 @@ Wrist Accessories . = ..() . += " It reads: [SPAN_NOTICE("[worldtime2text()]")]" + + +//TEMPORARY + +/obj/item/clothing/accessory/helmet/cover + name = "potato cover" + desc = "ahelp if you see this." + garbage = TRUE // for all intents and purposes, yes + flags_obj = OBJ_IS_HELMET_GARB + w_class = SIZE_TINY + worn_accessory_slot = ACCESSORY_SLOT_HELM_C + worn_accessory_limit = 2 // cover a helmet with a raincover and a netting i guess + icon = 'icons/obj/items/clothing/helmet_garb.dmi' + accessory_icons = list( + WEAR_HEAD = 'icons/mob/humans/onmob/clothing/helmet_garb/helmet_covers.dmi', + ) + item_icons = list( + WEAR_AS_GARB = 'icons/mob/humans/onmob/clothing/helmet_garb/helmet_covers.dmi', + ) + +/obj/item/clothing/accessory/helmet/cover/raincover + name = "raincover" + desc = "The standard M10 combat helmet is already water-resistant at depths of up to 10 meters. This makes the top potentially water-proof. At least it's something." + icon_state = "raincover" + +/obj/item/clothing/accessory/helmet/cover/raincover/jungle + name = "jungle raincover" + icon_state = "raincover_jungle" + +/obj/item/clothing/accessory/helmet/cover/raincover/desert + name = "desert raincover" + icon_state = "raincover_desert" + +/obj/item/clothing/accessory/helmet/cover/raincover/urban + name = "urban raincover" + icon_state = "raincover_urban" + +/obj/item/clothing/accessory/helmet/cover/netting + name = "combat netting" + desc = "Probably combat netting for a helmet. Probably just an extra hairnet that got ordered for the phantom Almayer cooking staff. Probably useless." + icon_state = "netting" + +/obj/item/clothing/accessory/helmet/cover/netting/desert + name = "desert combat netting" + icon_state = "netting_desert" + +/obj/item/clothing/accessory/helmet/cover/netting/jungle + name = "jungle combat netting" + icon_state = "netting_jungle" + +/obj/item/clothing/accessory/helmet/cover/netting/urban + name = "urban combat netting" + icon_state = "netting_urban" diff --git a/code/modules/clothing/under/under.dm b/code/modules/clothing/under/under.dm index 8ffc6415ff30..c5795e088774 100644 --- a/code/modules/clothing/under/under.dm +++ b/code/modules/clothing/under/under.dm @@ -4,6 +4,7 @@ flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS flags_heat_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS + flags_bodypart_hidden = BODY_FLAG_CHEST|BODY_FLAG_LEGS|BODY_FLAG_ARMS flags_equip_slot = SLOT_ICLOTHING armor_melee = CLOTHING_ARMOR_NONE armor_bullet = CLOTHING_ARMOR_NONE @@ -29,6 +30,7 @@ var/removed_parts = 0 var/worn_state = null var/hood_state //for uniforms with hoods. + var/undershirt = FALSE drag_unequip = TRUE valid_accessory_slots = list(ACCESSORY_SLOT_DEFAULT, ACCESSORY_SLOT_TIE, ACCESSORY_SLOT_PATCH, ACCESSORY_SLOT_STORAGE, ACCESSORY_SLOT_UTILITY, ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_RANK, ACCESSORY_SLOT_DECOR, ACCESSORY_SLOT_MEDAL, ACCESSORY_SLOT_ARMOR_C, ACCESSORY_SLOT_WRIST_L, ACCESSORY_SLOT_WRIST_R, ACCESSORY_SLOT_MASK) sprite_sheets = list(SPECIES_MONKEY = 'icons/mob/humans/species/monkeys/onmob/uniform_monkey_0.dmi') @@ -199,9 +201,11 @@ to_chat(user, SPAN_NOTICE("You roll the jacket's sleeves in your hands.")) //visual representation that the sleeves have been rolled while jacket has been removed. else if(flags_jumpsuit & UNIFORM_SLEEVE_ROLLED) LAZYSET(item_state_slots, WEAR_BODY, "[worn_state]_d") + flags_bodypart_hidden &= ~(BODY_FLAG_ARMS) update_clothing_icon() else LAZYSET(item_state_slots, WEAR_BODY, worn_state) + flags_bodypart_hidden |= BODY_FLAG_ARMS update_clothing_icon() else if(show_message) to_chat(user, SPAN_WARNING("You cannot roll your sleeves!")) @@ -212,15 +216,21 @@ flags_jumpsuit ^= UNIFORM_JACKET_REMOVED if(flags_jumpsuit & UNIFORM_JACKET_REMOVED) LAZYSET(item_state_slots, WEAR_BODY, "[worn_state]_dj") + if(!undershirt) + flags_bodypart_hidden &= ~(BODY_FLAG_CHEST) + flags_bodypart_hidden &= ~(BODY_FLAG_ARMS) if(ismob(loc)) var/mob/M = loc M.update_inv_wear_id() else if(flags_jumpsuit & UNIFORM_SLEEVE_CUT) LAZYSET(item_state_slots, WEAR_BODY, "[worn_state]_df") + flags_bodypart_hidden |= BODY_FLAG_CHEST else if(flags_jumpsuit & UNIFORM_SLEEVE_ROLLED) LAZYSET(item_state_slots, WEAR_BODY, "[worn_state]_d") + flags_bodypart_hidden |= BODY_FLAG_CHEST else LAZYSET(item_state_slots, WEAR_BODY, worn_state) + flags_bodypart_hidden |= BODY_FLAG_ARMS|BODY_FLAG_CHEST update_clothing_icon() else if(show_message) to_chat(user, SPAN_WARNING("\The [src] doesn't have a removable jacket!")) @@ -241,6 +251,7 @@ return else flags_jumpsuit &= ~(UNIFORM_SLEEVE_ROLLABLE|UNIFORM_SLEEVE_CUTTABLE) + flags_bodypart_hidden &= ~(BODY_FLAG_ARMS) flags_jumpsuit |= UNIFORM_SLEEVE_CUT LAZYSET(item_state_slots, WEAR_BODY, "[worn_state]_df") update_clothing_icon() diff --git a/code/modules/cm_aliens/XenoStructures.dm b/code/modules/cm_aliens/XenoStructures.dm index 90c6219d032d..6234d3d5b081 100644 --- a/code/modules/cm_aliens/XenoStructures.dm +++ b/code/modules/cm_aliens/XenoStructures.dm @@ -30,8 +30,7 @@ construction_data = create_cause_data(initial(name), builder) if(block_range) for(var/turf/turf in range(block_range, src)) - var/obj/effect/build_blocker/blocker = new(turf, src) - blockers.Add(blocker) + blockers += WEAKREF(new /obj/effect/build_blocker(turf, src)) var/area/current_area = get_area(src) if(current_area.linked_lz) @@ -916,7 +915,7 @@ if(cur_hive_num == hive_number) xeno_announcement(SPAN_XENOANNOUNCE("THE HATCHERY WAS DESTROYED! VENGEANCE!"), cur_hive_num, XENO_GENERAL_ANNOUNCE) else - xeno_announcement(SPAN_XENOANNOUNCE("THE HATCHERY WAS DESTROYED!"), cur_hive_num, XENO_GENERAL_ANNOUNCE) + xeno_announcement(SPAN_XENOANNOUNCE("THE HATCHERY WAS DESTROYED! REJOICE!"), cur_hive_num, XENO_GENERAL_ANNOUNCE) var/datum/hive_status/hive = GLOB.hive_datum[hive_number] hive.has_hatchery = FALSE @@ -942,8 +941,7 @@ for(var/x_offset in -1 to 1) for(var/y_offset in -1 to 1) var/turf/turf_to_block = locate(x + x_offset, y + y_offset, z) - var/obj/effect/build_blocker/blocker = new(turf_to_block, src) - blockers += blocker + blockers += WEAKREF(new /obj/effect/build_blocker(turf_to_block, src)) START_PROCESSING(SSobj, src) @@ -957,7 +955,7 @@ if(cur_hive_num == hive_number) xeno_announcement(SPAN_XENOANNOUNCE("The King is growing at [get_area_name(loc)]. Protect it, as well as our pylons at their communications relays, at all costs!"), cur_hive_num, XENO_GENERAL_ANNOUNCE) else - xeno_announcement(SPAN_XENOANNOUNCE("Another hive's King is growing at [get_area_name(loc)]."), cur_hive_num, XENO_GENERAL_ANNOUNCE) + xeno_announcement(SPAN_XENOANNOUNCE("Another hive's King is growing at [get_area_name(loc)]. We must destroy the hatchery!"), cur_hive_num, XENO_GENERAL_ANNOUNCE) #define STAGE_GROWING 1 @@ -994,7 +992,7 @@ if(cur_hive_num == hive_number) xeno_announcement(SPAN_XENOANNOUNCE("The hatchery's progress has resumed!"), cur_hive_num, XENO_GENERAL_ANNOUNCE) else - xeno_announcement(SPAN_XENOANNOUNCE("Another hive's hatchery progress has resumed!"), cur_hive_num, XENO_GENERAL_ANNOUNCE) + xeno_announcement(SPAN_XENOANNOUNCE("Another hive's hatchery progress has resumed! We must stop it!"), cur_hive_num, XENO_GENERAL_ANNOUNCE) elder_overseer_message("The progress of the Serpent King's hatchery has resumed.") marine_announcement("ALERT.\n\nUNUSUAL ENERGY BUILDUP IN [uppertext(get_area_name(loc))] HAS BEEN RESUMED.", "[MAIN_AI_SYSTEM] Biological Scanner", 'sound/misc/notice1.ogg') announced_paused = FALSE @@ -1068,7 +1066,7 @@ if(cur_hive_num == hive_number) xeno_announcement(SPAN_XENOANNOUNCE("The King will hatch in approximately 5 minutes."), cur_hive_num, XENO_GENERAL_ANNOUNCE) else - xeno_announcement(SPAN_XENOANNOUNCE("Another hive's King will hatch in approximately 5 minutes."), cur_hive_num, XENO_GENERAL_ANNOUNCE) + xeno_announcement(SPAN_XENOANNOUNCE("Another hive's King will hatch in approximately 5 minutes. We must stop it!"), cur_hive_num, XENO_GENERAL_ANNOUNCE) #define KING_PLAYTIME_HOURS (50 HOURS) @@ -1242,7 +1240,7 @@ if(cur_hive_num == hive_number) xeno_announcement(SPAN_XENOANNOUNCE("The King will hatch in approximately twenty seconds."), cur_hive_num, XENO_GENERAL_ANNOUNCE) else - xeno_announcement(SPAN_XENOANNOUNCE("Another hive's King will hatch in approximately twenty seconds."), cur_hive_num, XENO_GENERAL_ANNOUNCE) + xeno_announcement(SPAN_XENOANNOUNCE("Another hive's King will hatch in approximately twenty seconds. STOP IT!"), cur_hive_num, XENO_GENERAL_ANNOUNCE) /// Causes the cocoon to change visually for hatching and initiates the next timer. /obj/effect/alien/resin/king_cocoon/proc/animate_hatch_king() @@ -1259,7 +1257,7 @@ if(cur_hive_num == hive_number) xeno_announcement(SPAN_XENOANNOUNCE("All hail the King."), cur_hive_num, XENO_GENERAL_ANNOUNCE) else - xeno_announcement(SPAN_XENOANNOUNCE("Another hive's King has hatched!"), cur_hive_num, XENO_GENERAL_ANNOUNCE) + xeno_announcement(SPAN_XENOANNOUNCE("Another hive's King has hatched! We must bring it down!"), cur_hive_num, XENO_GENERAL_ANNOUNCE) /// Actually hatches the King transferring the candidate into the spawned mob and initiates the next timer. /obj/effect/alien/resin/king_cocoon/proc/hatch_king() @@ -1299,7 +1297,7 @@ /obj/item/explosive/grenade/alien name = "alien grenade" - desc = "an alien grenade." + desc = "An alien grenade." icon_state = "neuro_nade_greyscale" item_state = "neuro_nade_greyscale" diff --git a/code/modules/cm_aliens/hivebuffs/hivebuff.dm b/code/modules/cm_aliens/hivebuffs/hivebuff.dm index 5ce150a0bb13..cef22f71aa2e 100644 --- a/code/modules/cm_aliens/hivebuffs/hivebuff.dm +++ b/code/modules/cm_aliens/hivebuffs/hivebuff.dm @@ -434,7 +434,7 @@ failed = TRUE break var/area/target_area = get_area(turf_to_check) - if(target_area.flags_area & AREA_NOTUNNEL) + if(target_area.flags_area & AREA_NOBURROW) failed = TRUE break for(var/obj/structure/struct in turf_to_check) @@ -474,38 +474,32 @@ if(!xeno.caste) return - if(!(xeno.caste.fire_immunity & FIRE_IMMUNITY_NO_IGNITE)) - RegisterSignal(xeno, COMSIG_LIVING_PREIGNITION, PROC_REF(fire_immune)) + var/valid_immunity = xeno.fire_immunity + if(xeno.fire_immunity & FIRE_IMMUNITY_XENO_FRENZY) + valid_immunity -= FIRE_IMMUNITY_XENO_FRENZY - if(xeno.caste.fire_immunity == FIRE_IMMUNITY_NONE) - RegisterSignal(xeno, list(COMSIG_LIVING_FLAMER_CROSSED, COMSIG_LIVING_FLAMER_FLAMED), PROC_REF(flamer_crossed_immune)) - - -/datum/hivebuff/fire/remove_buff_effects(mob/living/carbon/xenomorph/xeno) - if(!(xeno.caste.fire_immunity & FIRE_IMMUNITY_NO_IGNITE)) - UnregisterSignal(xeno, COMSIG_LIVING_PREIGNITION) - if(xeno.caste.fire_immunity == FIRE_IMMUNITY_NONE) - UnregisterSignal(xeno, list( - COMSIG_LIVING_FLAMER_CROSSED, - COMSIG_LIVING_FLAMER_FLAMED - )) - -/datum/hivebuff/fire/proc/flamer_crossed_immune(mob/living/living, datum/reagent/reagent) - SIGNAL_HANDLER - - if(reagent.fire_penetrating) + if((valid_immunity & FIRE_IMMUNITY_COMPLETE)) // Already completely fire immune, return return - . |= COMPONENT_NO_IGNITE + switch(valid_immunity) + if(FIRE_IMMUNITY_NONE) // No immunities whatsoever, make immune to ignition but not fire damage + RegisterSignal(xeno, COMSIG_LIVING_PREIGNITION, TYPE_PROC_REF(/mob/living/carbon/xenomorph, preignition_no_ignition)) + RegisterSignal(xeno, list(COMSIG_LIVING_FLAMER_CROSSED, COMSIG_LIVING_FLAMER_FLAMED), TYPE_PROC_REF(/mob/living/carbon/xenomorph, flamer_cross_no_ignition)) -/datum/hivebuff/fire/proc/fire_immune(mob/living/living) - SIGNAL_HANDLER + if(FIRE_IMMUNITY_NO_DAMAGE) // Immune to damage but not ignition, make them immune to ignition + RegisterSignal(xeno, COMSIG_LIVING_PREIGNITION, TYPE_PROC_REF(/mob/living/carbon/xenomorph, preignition_no_ignition)) + RegisterSignal(xeno, list(COMSIG_LIVING_FLAMER_CROSSED, COMSIG_LIVING_FLAMER_FLAMED), TYPE_PROC_REF(/mob/living/carbon/xenomorph, flamer_cross_no_ignition)) - if(living.fire_reagent?.fire_penetrating && !HAS_TRAIT(living, TRAIT_ABILITY_BURROWED)) - return + if(FIRE_IMMUNITY_NO_IGNITE) // Immune to ignition but not damage, make them immune to damage + RegisterSignal(xeno, list(COMSIG_LIVING_FLAMER_CROSSED, COMSIG_LIVING_FLAMER_FLAMED), TYPE_PROC_REF(/mob/living/carbon/xenomorph, flamer_cross_no_damage)) + + if(FIRE_IMMUNITY_BURROWER) // Burrower, get same immunities as FIRE_IMMUNITY_NONE + RegisterSignal(xeno, COMSIG_LIVING_PREIGNITION, TYPE_PROC_REF(/mob/living/carbon/xenomorph, preignition_no_ignition)) + RegisterSignal(xeno, list(COMSIG_LIVING_FLAMER_CROSSED, COMSIG_LIVING_FLAMER_FLAMED), TYPE_PROC_REF(/mob/living/carbon/xenomorph, flamer_cross_no_ignition)) - return COMPONENT_CANCEL_IGNITION +/datum/hivebuff/fire/remove_buff_effects(mob/living/carbon/xenomorph/xeno) + xeno.refresh_fire_immunity() // Returns all affected Xenos back to whatever fire immunity is logged on the mob /datum/hivebuff/adaptability name = "Boon of Adaptability" @@ -531,7 +525,7 @@ /datum/hivebuff/attack name = "Boon of Aggression" - desc = "Increases all xenomorph damage by 5 for 5 minutes" + desc = "Increases all xenomorph damage by 5 for 5 minutes." tier = HIVEBUFF_TIER_MINOR engage_flavourmessage = "The Queen has imbued us with sharp claws." @@ -549,7 +543,7 @@ /datum/hivebuff/attack/major name = "Major Boon of Aggression" - desc = "Increases all xenomorph damage by 10 for 10 minutes" + desc = "Increases all xenomorph damage by 10 for 10 minutes." tier = HIVEBUFF_TIER_MAJOR engage_flavourmessage = "The Queen has imbued us with razor-sharp claws." @@ -565,3 +559,30 @@ /datum/hivebuff/attack/major/remove_buff_effects(mob/living/carbon/xenomorph/xeno) xeno.damage_modifier -= XENO_DAMAGE_MOD_SMALL xeno.recalculate_damage() + + +/datum/hivebuff/boost_structure + name = "Boon of Fortification" + desc = "Gives buffs out to all the sturctures, not only do structures regenerate their own health slowly any recovery nodes of all sorts work twice as fast." + tier = HIVEBUFF_TIER_MINOR + + engage_flavourmessage = "The resin starts moving and shifting..." + duration = 5 MINUTES + number_of_required_pylons = 1 + cost = 1 + radial_icon = "building" + +/datum/hivebuff/boost_structure/apply_buff_effects(mob/living/carbon/xenomorph/xeno) + . = ..() + + var/hive_purchaser = hive.hivenumber + + + SEND_GLOBAL_SIGNAL(COMSIG_GLOB_BOOST_XENOMORPH_WALLS, hive_purchaser) + +/datum/hivebuff/boost_structure/remove_buff_effects(mob/living/carbon/xenomorph/xeno) + . = ..() + + var/hive_purchaser = hive.hivenumber + + SEND_GLOBAL_SIGNAL(COMSIG_GLOB_STOP_BOOST_XENOMORPH_WALLS, hive_purchaser) diff --git a/code/modules/cm_aliens/structures/fruit.dm b/code/modules/cm_aliens/structures/fruit.dm index daabc45c4874..9a3ce6672ecc 100644 --- a/code/modules/cm_aliens/structures/fruit.dm +++ b/code/modules/cm_aliens/structures/fruit.dm @@ -124,7 +124,7 @@ if(mature) // Someone might've eaten it before us! recipient.gain_health(75) to_chat(recipient, SPAN_XENOBOLDNOTICE("We recover a bit from our injuries.")) - recipient.balloon_alert(recipient, "we feel our wounds getting quickly mended!", text_color = "#17991B") + recipient.balloon_alert(recipient, "we recover a bit from our injuries", text_color = "#17991B") if(do_consume) finish_consume(recipient) @@ -192,7 +192,7 @@ desc = "A strange green-ish fruit-looking thing." fruit_type = /obj/item/reagent_container/food/snacks/resin_fruit/lesser -/obj/effect/alien/resin/fruit/lesser/get_examine_text(mob/user) //Need new subtype, so text dont get carried to other subtypes from parent. +/obj/effect/alien/resin/fruit/lesser/get_examine_text(mob/user) //Need new subtype, so text don't get carried to other subtypes from parent. . = ..() if(ishuman(user)) . += "[SPAN_NOTICE("A volleyball sized resin growth. Its translucent insides radiate faint green light. It appears to be loosely attached to the weeds below.")]" @@ -219,9 +219,9 @@ if(recipient && !QDELETED(recipient)) recipient.gain_health(heal_amount) //Every second, heal them for 20. - new /datum/effects/heal_over_time(recipient, regeneration_amount_total, regeneration_ticks, 1) + new /datum/effects/heal_over_time(recipient, regeneration_amount_total, regeneration_ticks, 1, show_baloon_alert = TRUE) to_chat(recipient, SPAN_XENOBOLDNOTICE("We recover a bit from our injuries, and begin to regenerate rapidly.")) - recipient.balloon_alert(recipient, "our flesh mends, and the regeneration quickens!", text_color = "#17991B") + recipient.balloon_alert(recipient, "we recover a bit and start regenerating rapidly", text_color = "#17991B") if(do_consume) finish_consume(recipient) @@ -255,9 +255,9 @@ if(mature && recipient && !QDELETED(recipient)) recipient.add_xeno_shield(clamp(overshield_amount, 0, recipient.maxHealth * 0.3), XENO_SHIELD_SOURCE_GARDENER, duration = shield_duration, decay_amount_per_second = shield_decay) //Every second, heal them for 5. - new /datum/effects/heal_over_time(recipient, regeneration_amount_total, regeneration_ticks, 1) + new /datum/effects/heal_over_time(recipient, regeneration_amount_total, regeneration_ticks, 1, show_baloon_alert = TRUE) to_chat(recipient, SPAN_XENOBOLDNOTICE("We feel our defense being bolstered, and begin to slowly regenerate.")) - recipient.balloon_alert(recipient, "our regeneration quickens and carapace thickens!", text_color = "#179973") + recipient.balloon_alert(recipient, "our regeneration quickens and carapace thickens", text_color = "#179973") if(do_consume) finish_consume(recipient) @@ -291,9 +291,9 @@ for(var/datum/effects/gain_xeno_cooldown_reduction_on_slash/E in recipient.effects_list) if(E.effect_source == "spore") qdel(E) - new /datum/effects/gain_xeno_cooldown_reduction_on_slash(recipient, bound_xeno, max_cooldown_reduction, cooldown_per_slash, 90 SECONDS, "spore") + new /datum/effects/gain_xeno_cooldown_reduction_on_slash(recipient, bound_xeno, max_cooldown_reduction, cooldown_per_slash, 90 SECONDS, "spore", show_baloon_alert = TRUE) to_chat(recipient, SPAN_XENOBOLDNOTICE("We feel a frenzy coming onto us! Our abilities will cool off faster as we slash!")) - recipient.balloon_alert(recipient, "we feel a frenzy coming onto us!", text_color = "#994617", delay = 1 SECONDS) + recipient.balloon_alert(recipient, "we feel a frenzy coming onto us", text_color = "#994617", delay = 1 SECONDS) if(do_consume) finish_consume(recipient) @@ -342,9 +342,9 @@ /obj/effect/alien/resin/fruit/speed/consume_effect(mob/living/carbon/xenomorph/recipient, do_consume = TRUE) if(mature && recipient && !QDELETED(recipient)) - new /datum/effects/xeno_speed(recipient, ttl = speed_duration, set_speed_modifier = speed_buff_amount, set_modifier_source = XENO_FRUIT_SPEED, set_end_message = SPAN_XENOWARNING("We feel the effects of the [name] wane...")) + new /datum/effects/xeno_speed(recipient, ttl = speed_duration, set_speed_modifier = speed_buff_amount, set_modifier_source = XENO_FRUIT_SPEED, set_end_message = SPAN_XENOWARNING("We feel the effects of the [name] wane..."), show_baloon_alert = TRUE) to_chat(recipient, SPAN_XENOBOLDNOTICE("The [name] invigorates us to move faster!")) - recipient.balloon_alert(recipient, "we feel invigorated to run faster!", text_color = "#5B248C", delay = 1 SECONDS) + recipient.balloon_alert(recipient, "we feel invigorated to run faster", text_color = "#5B248C", delay = 1 SECONDS) if(do_consume) finish_consume(recipient) @@ -373,9 +373,9 @@ /obj/effect/alien/resin/fruit/plasma/consume_effect(mob/living/carbon/xenomorph/recipient, do_consume = TRUE) if(mature && recipient && recipient.plasma_max > 0 && !QDELETED(recipient)) //With the current values (240, 15, 3), this will give the recipient 48 plasma every 3 seconds, for a total of 240 in 15 seconds. - new /datum/effects/plasma_over_time(recipient, plasma_amount, plasma_time, time_between_plasmas) + new /datum/effects/plasma_over_time(recipient, plasma_amount, plasma_time, time_between_plasmas, show_baloon_alert = TRUE) to_chat(recipient, SPAN_XENOBOLDNOTICE("The [name] boosts our plasma regeneration!")) - recipient.balloon_alert(recipient, "we feel our plasma rapidly regenerate!", text_color = "#287A90") + recipient.balloon_alert(recipient, "we feel our plasma rapidly regenerate", text_color = "#287A90") if(do_consume) finish_consume(recipient) @@ -541,7 +541,7 @@ /obj/item/reagent_container/food/snacks/resin_fruit/lesser fruit_type = /obj/effect/alien/resin/fruit/lesser -/obj/item/reagent_container/food/snacks/resin_fruit/lesser/get_examine_text(mob/user) //Need new subtype, so text dont get carried to other subtypes from parent. +/obj/item/reagent_container/food/snacks/resin_fruit/lesser/get_examine_text(mob/user) //Need new subtype, so text don't get carried to other subtypes from parent. . = ..() if(ishuman(user)) . += "[SPAN_NOTICE("It looks unappetizing... maybe the eggheads would want to study it instead.")]" diff --git a/code/modules/cm_aliens/structures/special/egg_morpher.dm b/code/modules/cm_aliens/structures/special/egg_morpher.dm index 63b26d428181..9f36d6af5fb9 100644 --- a/code/modules/cm_aliens/structures/special/egg_morpher.dm +++ b/code/modules/cm_aliens/structures/special/egg_morpher.dm @@ -34,7 +34,7 @@ /obj/effect/alien/resin/special/eggmorph/proc/update_minimap_icon() SSminimaps.remove_marker(src) - SSminimaps.add_marker(src, z, get_minimap_flag_for_faction(linked_hive?.hivenumber), "morpher") + SSminimaps.add_marker(src, get_minimap_flag_for_faction(linked_hive?.hivenumber), image('icons/UI_icons/map_blips.dmi', null, "morpher")) /obj/effect/alien/resin/special/eggmorph/Destroy() if(stored_huggers && linked_hive) @@ -116,7 +116,11 @@ if(!linked_hive || !COOLDOWN_FINISHED(src, spawn_cooldown) || stored_huggers == huggers_to_grow_max) return - COOLDOWN_START(src, spawn_cooldown, get_egg_cooldown()) + + if(boosted_structure) + COOLDOWN_START(src, spawn_cooldown, 30 SECONDS) + else + COOLDOWN_START(src, spawn_cooldown, get_egg_cooldown()) if(stored_huggers < huggers_to_grow_max) stored_huggers = min(huggers_to_grow_max, stored_huggers + 1) @@ -124,7 +128,7 @@ if(!range_bounds) range_bounds = SQUARE(x, y, EGGMORPG_RANGE) - var/list/targets = SSquadtree.players_in_range(range_bounds, z, QTREE_SCAN_MOBS | QTREE_EXCLUDE_OBSERVER) + var/list/targets = SSquadtree.players_in_range(range_bounds, z, QTREE_SCAN_MOBS | QTREE_FILTER_LIVING) if(isnull(targets) || !length(targets)) return @@ -196,7 +200,7 @@ /mob/living/carbon/xenomorph/proc/set_hugger_reserve_for_morpher(obj/effect/alien/resin/special/eggmorph/morpher in oview(1)) set name = "Set Hugger Reserve" - set desc = "Set Hugger Reserve" + set desc = "Set Hugger Reserve." set category = null if(!istype(morpher)) diff --git a/code/modules/cm_aliens/structures/special/hive_cluster.dm b/code/modules/cm_aliens/structures/special/hive_cluster.dm index 266748a96c80..130f32216365 100644 --- a/code/modules/cm_aliens/structures/special/hive_cluster.dm +++ b/code/modules/cm_aliens/structures/special/hive_cluster.dm @@ -19,15 +19,18 @@ var/damaged = FALSE var/plasma_stored = 0 var/plasma_required_to_repair = 300 + COOLDOWN_DECLARE(time_for_auto_repair) /obj/effect/alien/resin/special/cluster/Initialize(mapload, hive_ref) . = ..() node = place_node() update_minimap_icon() + RegisterSignal(SSdcs, COMSIG_GLOB_BOOST_XENOMORPH_WALLS, PROC_REF(start_boost)) + RegisterSignal(SSdcs, COMSIG_GLOB_STOP_BOOST_XENOMORPH_WALLS, PROC_REF(stop_boost)) /obj/effect/alien/resin/special/cluster/proc/update_minimap_icon() SSminimaps.remove_marker(src) - SSminimaps.add_marker(src, z, MINIMAP_FLAG_XENO, "cluster") + SSminimaps.add_marker(src, MINIMAP_FLAG_XENO, image('icons/ui_icons/map_blips.dmi', null, "cluster")) /obj/effect/alien/resin/special/cluster/Destroy() QDEL_NULL(node) @@ -41,6 +44,47 @@ else return ..() + +/obj/effect/alien/resin/special/cluster/process() + . = ..() + + if(!boosted_structure) + STOP_PROCESSING(SSobj, src) + return + + if(!COOLDOWN_FINISHED(src, time_for_auto_repair)) + return + + if(health <= maxhealth) + automatic_repair() + + COOLDOWN_START(src, time_for_auto_repair, 20 SECONDS) // 20 seconds because it takes 15 seconds for weeds to grow back. + +/obj/effect/alien/resin/special/cluster/proc/start_boost(source, hive_purchaser) + SIGNAL_HANDLER + if(hive_purchaser != src.linked_hive.hivenumber) + return + else + boosted_structure = TRUE + START_PROCESSING(SSdcs, src) + +/obj/effect/alien/resin/special/cluster/proc/stop_boost(source, hive_purchaser) + SIGNAL_HANDLER + if(hive_purchaser != src.linked_hive.hivenumber) + return + else + boosted_structure = FALSE + +/obj/effect/alien/resin/special/cluster/proc/automatic_repair() + damaged = FALSE + health = initial(health) + for(var/obj/effect/alien/weeds/W as anything in node.children) + if(get_dist(node, W) >= node.node_range) + continue + if(istype(W, /obj/effect/alien/weeds/weedwall)) + continue + addtimer(CALLBACK(W, TYPE_PROC_REF(/obj/effect/alien/weeds, weed_expand), node), CLUSTER_WEEDS_REGROWTH_TIME, TIMER_UNIQUE) + /obj/effect/alien/resin/special/cluster/proc/do_repair(mob/living/carbon/xenomorph/xeno) if(!istype(xeno)) return diff --git a/code/modules/cm_aliens/structures/special/pylon_core.dm b/code/modules/cm_aliens/structures/special/pylon_core.dm index a09d07ee8bc5..911100b5cdca 100644 --- a/code/modules/cm_aliens/structures/special/pylon_core.dm +++ b/code/modules/cm_aliens/structures/special/pylon_core.dm @@ -230,7 +230,7 @@ var/last_healed = 0 var/last_attempt = 0 // logs time of last attempt to prevent spam. if you want to destroy it, you must commit. var/last_larva_time = 0 - var/last_larva_queue_time = 0 + var/last_larva_pool_time = 0 var/last_surge_time = 0 var/spawn_cooldown = 30 SECONDS var/surge_cooldown = 90 SECONDS @@ -254,7 +254,7 @@ /obj/effect/alien/resin/special/pylon/core/proc/update_minimap_icon() SSminimaps.remove_marker(src) - SSminimaps.add_marker(src, z, get_minimap_flag_for_faction(linked_hive?.hivenumber), "core") + SSminimaps.add_marker(src, get_minimap_flag_for_faction(linked_hive?.hivenumber), image('icons/ui_icons/map_blips.dmi', null, "core")) /obj/effect/alien/resin/special/pylon/core/process() . = ..() @@ -275,8 +275,8 @@ var/spawning_larva = can_spawn_larva() && (last_larva_time + spawn_cooldown) < world.time if(spawning_larva) last_larva_time = world.time - if(spawning_larva || (last_larva_queue_time + spawn_cooldown * 4) < world.time) - last_larva_queue_time = world.time + if(spawning_larva || (last_larva_pool_time + spawn_cooldown * 4) < world.time) + last_larva_pool_time = world.time var/list/players_with_xeno_pref = get_alien_candidates(linked_hive) if(spawning_larva) var/i = 0 @@ -291,7 +291,7 @@ last_surge_time = world.time linked_hive.stored_larva++ linked_hive.hijack_burrowed_left-- - if(GLOB.xeno_queue_candidate_count < 1 + count_spawned) + if(GLOB.larva_pool_candidate_count < 1 + count_spawned) notify_ghosts(header = "Claim Xeno", message = "The Hive has gained another burrowed larva! Click to take it.", source = src, action = NOTIFY_JOIN_XENO, enter_link = "join_xeno=1") if(surge_cooldown > 30 SECONDS) //mostly for sanity purposes surge_cooldown = surge_cooldown - surge_incremental_reduction //ramps up over time @@ -419,7 +419,7 @@ linked_hive.hivecore_cooldown = TRUE INVOKE_ASYNC(src, PROC_REF(cooldownFinish),linked_hive) // start cooldown if(hardcore) - xeno_message(SPAN_XENOANNOUNCE("We can no longer gain new sisters or another Queen. Additionally, we are unable to heal if our Queen is dead"), 2, linked_hive.hivenumber) + xeno_message(SPAN_XENOANNOUNCE("We can no longer gain new sisters or another Queen. Additionally, we are unable to heal if our Queen is dead."), 2, linked_hive.hivenumber) linked_hive.hardcore = TRUE linked_hive.allow_queen_evolve = FALSE linked_hive.hive_structures_limit[XENO_STRUCTURE_CORE] = 0 diff --git a/code/modules/cm_aliens/structures/special/recovery_node.dm b/code/modules/cm_aliens/structures/special/recovery_node.dm index a0656d40177d..3d73ba30a7d0 100644 --- a/code/modules/cm_aliens/structures/special/recovery_node.dm +++ b/code/modules/cm_aliens/structures/special/recovery_node.dm @@ -9,10 +9,12 @@ /obj/effect/alien/resin/special/plasma_tree/Initialize(mapload, hive_ref) . = ..() update_minimap_icon() + RegisterSignal(SSdcs, COMSIG_GLOB_BOOST_XENOMORPH_WALLS, PROC_REF(enable_boost)) + RegisterSignal(SSdcs, COMSIG_GLOB_STOP_BOOST_XENOMORPH_WALLS, PROC_REF(disable_boost)) /obj/effect/alien/resin/special/plasma_tree/proc/update_minimap_icon() SSminimaps.remove_marker(src) - SSminimaps.add_marker(src, z, get_minimap_flag_for_faction(linked_hive?.hivenumber), "recovery_node") + SSminimaps.add_marker(src, get_minimap_flag_for_faction(linked_hive?.hivenumber), image('icons/UI_icons/map_blips.dmi', null, "recovery_node")) /obj/effect/alien/resin/special/plasma_tree/get_examine_text(mob/user) . = ..() @@ -22,6 +24,15 @@ /obj/effect/alien/resin/special/plasma_tree/process() update_minimap_icon() + + if(boosted_structure) + replenish_amount = 200 // Increase plasma replenish by a bit + if(health <= maxhealth) + health += 25 // Regenerate health by 25 + else + replenish_amount = 75 + + if(!COOLDOWN_FINISHED(src, last_replenish)) return @@ -43,7 +54,7 @@ var/mob/living/carbon/xenomorph/picked_candidate = pick(plasma_candidates) picked_candidate.visible_message(SPAN_HELPFUL("[picked_candidate] glows as a warm aura envelops them."), SPAN_HELPFUL("We feel a warm aura envelop us.")) - + picked_candidate.flick_heal_overlay(2 SECONDS, "#0e6faf") picked_candidate.gain_plasma(replenish_amount) //Recovery Node - Heals xenomorphs around it @@ -54,16 +65,17 @@ icon_state = "recovery" health = 400 var/heal_amount = 20 - var/heal_cooldown = 5 SECONDS - var/last_healed + COOLDOWN_DECLARE(last_heal) /obj/effect/alien/resin/special/recovery/Initialize(mapload, hive_ref) . = ..() update_minimap_icon() + RegisterSignal(SSdcs, COMSIG_GLOB_BOOST_XENOMORPH_WALLS, PROC_REF(enable_boost)) + RegisterSignal(SSdcs, COMSIG_GLOB_STOP_BOOST_XENOMORPH_WALLS, PROC_REF(disable_boost)) /obj/effect/alien/resin/special/recovery/proc/update_minimap_icon() SSminimaps.remove_marker(src) - SSminimaps.add_marker(src, z, get_minimap_flag_for_faction(linked_hive?.hivenumber), "recovery_node") + SSminimaps.add_marker(src, get_minimap_flag_for_faction(linked_hive?.hivenumber), image('icons/UI_icons/map_blips.dmi', null, "recovery_node")) /obj/effect/alien/resin/special/recovery/Destroy() . = ..() @@ -78,7 +90,14 @@ /obj/effect/alien/resin/special/recovery/process() update_minimap_icon() - if(last_healed && world.time < last_healed + heal_cooldown) + if(boosted_structure) + heal_amount = 100 // increase heal amount by abit, needs tweaking probably + if(health <= maxhealth) + health += 25 // Regenerate health by 25 + else + heal_amount = 25 + + if(!COOLDOWN_FINISHED(src, last_heal)) return var/list/heal_candidates = list() @@ -90,7 +109,9 @@ continue heal_candidates += xeno_in_range - last_healed = world.time + COOLDOWN_START(src, last_heal, 3 SECONDS) + + if(!length(heal_candidates)) return @@ -98,7 +119,5 @@ var/mob/living/carbon/xenomorph/picked_candidate = pick(heal_candidates) picked_candidate.visible_message(SPAN_HELPFUL("\The [picked_candidate] glows as a warm aura envelops them."), SPAN_HELPFUL("We feel a warm aura envelop us.")) - if(!do_after(picked_candidate, heal_cooldown, INTERRUPT_MOVED, BUSY_ICON_MEDICAL)) - return - + picked_candidate.flick_heal_overlay(2 SECONDS, "#00B800") picked_candidate.gain_health(heal_amount) diff --git a/code/modules/cm_aliens/structures/special_structure.dm b/code/modules/cm_aliens/structures/special_structure.dm index 83ca09547185..136b6ccd6212 100644 --- a/code/modules/cm_aliens/structures/special_structure.dm +++ b/code/modules/cm_aliens/structures/special_structure.dm @@ -14,7 +14,7 @@ unacidable = TRUE anchored = TRUE block_range = 1 - + var/boosted_structure = FALSE var/datum/hive_status/linked_hive plane = FLOOR_PLANE @@ -58,3 +58,18 @@ return TRUE return FALSE + +/obj/effect/alien/resin/special/proc/enable_boost(source, hive_purchaser) + SIGNAL_HANDLER + if(hive_purchaser != src.linked_hive.hivenumber) + return + else + boosted_structure = TRUE +/obj/effect/alien/resin/special/proc/disable_boost(source, hive_purchaser) + SIGNAL_HANDLER + if(hive_purchaser != src.linked_hive.hivenumber) + return + else + boosted_structure = FALSE + + diff --git a/code/modules/cm_aliens/structures/tunnel.dm b/code/modules/cm_aliens/structures/tunnel.dm index 1d1822e29556..e548e9344707 100644 --- a/code/modules/cm_aliens/structures/tunnel.dm +++ b/code/modules/cm_aliens/structures/tunnel.dm @@ -51,7 +51,7 @@ if(hivenumber == XENO_HIVE_NORMAL) RegisterSignal(SSdcs, COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING, PROC_REF(forsaken_handling)) - SSminimaps.add_marker(src, z, get_minimap_flag_for_faction(hivenumber), "xenotunnel") + SSminimaps.add_marker(src, get_minimap_flag_for_faction(hivenumber), image('icons/UI_icons/map_blips.dmi', null, "xenotunnel", VERY_HIGH_FLOAT_LAYER)) /obj/structure/tunnel/proc/forsaken_handling() SIGNAL_HANDLER @@ -293,6 +293,11 @@ return XENO_NO_DELAY_ACTION user.forceMove(src) //become one with the tunnel + + if(isqueen(user)) + var/mob/living/carbon/xenomorph/queen/queen_user = user + queen_user.end_temporary_maturity() + to_chat(user, SPAN_HIGHDANGER("Alt + Click the tunnel to exit, Ctrl + Click to choose a destination.")) pick_tunnel(user) return XENO_NO_DELAY_ACTION diff --git a/code/modules/cm_aliens/weeds.dm b/code/modules/cm_aliens/weeds.dm index 2d7722933af7..f3194841d4c0 100644 --- a/code/modules/cm_aliens/weeds.dm +++ b/code/modules/cm_aliens/weeds.dm @@ -599,6 +599,9 @@ /obj/effect/alien/weeds/node/forsaken hivenumber = XENO_HIVE_FORSAKEN +/obj/effect/alien/weeds/node/hunted + hivenumber = XENO_HIVE_HUNTED + /obj/effect/alien/weeds/node/pylon health = WEED_HEALTH_HIVE weed_strength = WEED_LEVEL_HIVE @@ -636,6 +639,9 @@ /obj/effect/alien/weeds/node/pylon/acid_spray_act() return +/obj/effect/alien/weeds/node/pylon/hunted + hivenumber = XENO_HIVE_HUNTED + /obj/effect/alien/weeds/node/pylon/cluster spread_on_semiweedable = TRUE diff --git a/code/modules/cm_marines/Donator_Items.dm b/code/modules/cm_marines/Donator_Items.dm index 27c2e24edfdf..76dfeb6454b9 100644 --- a/code/modules/cm_marines/Donator_Items.dm +++ b/code/modules/cm_marines/Donator_Items.dm @@ -234,7 +234,7 @@ /obj/item/clothing/glasses/fluff/eyepatch //GENERIC DONOR name = "An Eyepatch" - desc = "Badass +10. Donor Item" + desc = "Badass +10. Donor Item." icon = 'icons/obj/items/clothing/glasses/misc.dmi' item_icons = list( WEAR_EYES = 'icons/mob/humans/onmob/clothing/glasses/misc.dmi', @@ -285,8 +285,8 @@ item_state = "hunkjacket" /obj/item/clothing/suit/storage/marine/fluff/penguin //CKEY=tophatpenguin - name = "Trenchcoat" - desc = "An 18th-century trenchcoat. Someone who wears this means serious business. DONOR ITEM" + name = "Trench Coat" + desc = "An 18th-century trench coat. Someone who wears this means serious business. DONOR ITEM" icon_state = "detective" item_state = "det_suit" icon = 'icons/obj/items/clothing/suits/coats_robes.dmi' @@ -347,7 +347,7 @@ /obj/item/clothing/suit/storage/marine/fluff/feodrich //CKEY=feodrich (UNIQUE) name = "Doom Armor" - desc = "A uniform, of a famous Earth warrior... Donor Item" + desc = "A uniform, of a famous Earth warrior... Donor Item." item_state = "doom_armor" icon_state = "doom_armor" @@ -374,8 +374,8 @@ ) /obj/item/clothing/suit/storage/marine/fluff/john56 //CKEY=johnkilla56 - name = "A red trenchcoat" - desc = "A special trenchcoat made famous for instilling fear into greytide everywhere. DONOR ITEM" + name = "A red trench coat" + desc = "A special trench coat made famous for instilling fear into greytide everywhere. DONOR ITEM" icon_state = "hos" item_state = "hos" icon = 'icons/obj/items/clothing/suits/coats_robes.dmi' @@ -419,14 +419,14 @@ item_state = "riotjacket_u" /obj/item/clothing/suit/storage/marine/fluff/adjective - name = "HOS Trenchcoat" - desc = "A trenchcoat of authority. DONOR ITEM" + name = "HOS Trench Coat" + desc = "A trench coat of authority. DONOR ITEM" icon_state = "jensencoat" item_state = "jensencoat" /obj/item/clothing/suit/storage/marine/fluff/fickmacher //CKEY=fickmacher (UNIQUE) - name = "Selena's Trenchcoat" - desc = "A trenchcoat of authority. DONOR ITEM" + name = "Selena's Trench Coat" + desc = "A trench coat of authority. DONOR ITEM" icon_state = "jensencoat" item_state = "jensencoat" @@ -441,8 +441,8 @@ ) /obj/item/clothing/suit/storage/marine/fluff/mitii - name = "Mya's Trenchcoat" - desc = "A trenchcoat of authority. DONOR ITEM" + name = "Mya's Trench Coat" + desc = "A trench coat of authority. DONOR ITEM" icon_state = "hos" item_state = "hos" icon = 'icons/obj/items/clothing/suits/coats_robes.dmi' @@ -457,8 +457,8 @@ item_state = "hawkeye_jacket_u" /obj/item/clothing/suit/storage/marine/fluff/chimera //CKEY=theultimatechimera - name = "Brett's Trenchcoat" - desc = "A trenchcoat of authority. DONOR ITEM" + name = "Brett's Trench Coat" + desc = "A trench coat of authority. DONOR ITEM" icon_state = "hos" item_state = "hos" icon = 'icons/obj/items/clothing/suits/coats_robes.dmi' @@ -467,8 +467,8 @@ ) /obj/item/clothing/suit/storage/marine/fluff/devilzhand - name = "Tank's Trenchcoat" - desc = "A trenchcoat of authority. DONOR ITEM" + name = "Tank's Trench Coat" + desc = "A trench coat of authority. DONOR ITEM" icon_state = "jensencoat" item_state = "jensencoat" @@ -684,7 +684,7 @@ item_state = "kailas_armor" /obj/item/clothing/suit/storage/marine/fluff/fridrich - name = "Solid Black Labcoat" + name = "Solid Black Lab Coat" desc = "Very stylish. DONOR ITEM" icon_state = "Reznoriam" item_state = "Reznoriam" @@ -761,7 +761,7 @@ /obj/item/clothing/head/helmet/marine/fluff/feodrich //CKEY=feodrich (UNIQUE) name = "Doom Helmet" icon_state = "doom_helmet" - desc = "A Helmet, of a famous Earth warrior... Donor Item" + desc = "A Helmet, of a famous Earth warrior... Donor Item." flags_inventory = BLOCKSHARPOBJ flags_inv_hide = HIDEEARS|HIDEMASK|HIDEEYES|HIDEALLHAIR @@ -797,7 +797,7 @@ /obj/item/clothing/head/helmet/marine/fluff/john56 //CKEY=johnkilla56 name = "Priest hood" - desc = "Thought I walk through the valley in the shadow of death... Donor Item" + desc = "Thought I walk through the valley in the shadow of death... Donor Item." icon_state = "chaplain_hood" icon = 'icons/obj/items/clothing/hats/hats.dmi' item_icons = list( @@ -867,7 +867,7 @@ /obj/item/clothing/head/helmet/marine/fluff/ningajai name = "Anthony's helmet" - desc = "COG helmet owned by Anthony Carmine" + desc = "COG helmet owned by Anthony Carmine." icon_state = "anthonycarmine" flags_inventory = BLOCKSHARPOBJ flags_inv_hide = HIDEEARS|HIDEMASK|HIDEEYES|HIDEALLHAIR @@ -880,13 +880,13 @@ /obj/item/clothing/head/helmet/marine/fluff/goldtrimberet name = "beret" - desc = "A maroon beret with gold trim" + desc = "A maroon beret with gold trim." icon_state = "gtberet" flags_inventory = BLOCKSHARPOBJ /obj/item/clothing/head/helmet/marine/fluff/commandercookies //CKEY=commandercookies name = "Elliots Beret" - desc = "A dark maroon beret" + desc = "A dark maroon beret." icon_state = "eberet" flags_inventory = BLOCKSHARPOBJ @@ -1211,7 +1211,7 @@ /obj/item/clothing/head/helmet/marine/fluff/killaninja12 name = "space cowboy hat" - desc = "the name 'Maurice' is written inside the hat... UNIQUE DONOR ITEM" + desc = "The name 'Maurice' is written inside the hat... UNIQUE DONOR ITEM" icon_state = "killaninja12_u" item_state = "killaninja12_u" @@ -1226,7 +1226,7 @@ /obj/item/clothing/under/marine/fluff/feodrich //CKEY=feodrich (UNIQUE) name = "Doom Uniform" - desc = "A uniform, of a famous Earth warrior... Donor Item" + desc = "A uniform, of a famous Earth warrior... Donor Item." icon_state = "doom_suit" worn_state = "doom_suit" flags_jumpsuit = FALSE @@ -1240,7 +1240,7 @@ /obj/item/clothing/under/marine/fluff/john56 //CKEY=johnkilla56 name = "Pink Pride Jumpsuit" - desc = "A jumpsuit for showing your pride in pink... Donor Item" + desc = "A jumpsuit for showing your pride in pink... Donor Item." icon_state = "pink" icon = 'icons/obj/items/clothing/uniforms/jumpsuits.dmi' item_icons = list( @@ -1293,7 +1293,7 @@ /obj/item/clothing/under/marine/fluff/vintage //CKEY=vintagepalmer name = "Vintage Pink Jumpsuit" - desc = "A jumpsuit that was either once red, or once white and washed with a load of colors... Donor Item" + desc = "A jumpsuit that was either once red, or once white and washed with a load of colors... Donor Item." icon_state = "pink" worn_state = "pink" icon = 'icons/obj/items/clothing/uniforms/jumpsuits.dmi' @@ -1353,7 +1353,7 @@ /obj/item/clothing/under/marine/fluff/feweh //CKEY=feweh name = "Pink Fatigues" - desc = "For fighting breast cancer. With bullets. Donor Item" + desc = "For fighting breast cancer. With bullets. Donor Item." icon_state = "pink2" worn_state = "pink2" flags_jumpsuit = FALSE @@ -1583,7 +1583,7 @@ /obj/item/clothing/shoes/marine/fluff/feodrich //CKEY=feodrich (UNIQUE) name = "Doom Shoes" - desc = "A uniform, of a famous Earth warrior... Donor Item" + desc = "A uniform, of a famous Earth warrior... Donor Item." icon_state = "doom_boots" item_state = "doom_boots" @@ -1607,7 +1607,7 @@ /obj/item/clothing/glasses/fluff/sadokist //CKEY=sadokist name = "Tanya's Optics" - desc = "Custom Optics, owned by Tanya Edenia" + desc = "Custom Optics, owned by Tanya Edenia." icon = 'icons/obj/items/clothing/glasses/goggles.dmi' item_icons = list( WEAR_EYES = 'icons/mob/humans/onmob/clothing/glasses/goggles.dmi', @@ -1644,7 +1644,7 @@ /obj/item/storage/backpack/marine/fluff/mitii name = "Mya's Backpack" - desc = "A large security backpack, with a radio booster. Donor Item" + desc = "A large security backpack, with a radio booster. Donor Item." icon_state = "securitypack" item_state = "securitypack" flags_atom = parent_type::flags_atom | NO_GAMEMODE_SKIN // same sprite for all gamemodes @@ -1692,7 +1692,7 @@ /obj/item/clothing/glasses/fluff/alexwarhammer name = "Black Jack's Dank Shades" - desc = "+20 Badass points. Donor item" + desc = "+20 Badass points. Donor item." icon_state = "sun" item_state = "sun" diff --git a/code/modules/cm_marines/altitude_control_console.dm b/code/modules/cm_marines/altitude_control_console.dm index 9250ffd30a74..4b400d7eeaaa 100644 --- a/code/modules/cm_marines/altitude_control_console.dm +++ b/code/modules/cm_marines/altitude_control_console.dm @@ -77,7 +77,7 @@ GLOBAL_VAR_INIT(ship_alt, SHIP_ALT_MED) /obj/structure/machinery/computer/altitude_control_console/tgui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) - ui = new(user, src, "AltitudeControlConsole", "[src.name]") + ui = new(user, src, "AltitudeControlConsole", "[capitalize(name)]") ui.open() /obj/structure/machinery/computer/altitude_control_console/ui_state(mob/user) diff --git a/code/modules/cm_marines/anti_air.dm b/code/modules/cm_marines/anti_air.dm index 572e3f9289d2..2cce57876051 100644 --- a/code/modules/cm_marines/anti_air.dm +++ b/code/modules/cm_marines/anti_air.dm @@ -60,7 +60,7 @@ GLOBAL_DATUM(almayer_aa_cannon, /obj/structure/anti_air_cannon) /obj/structure/machinery/computer/aa_console/tgui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) - ui = new(user, src, "AntiAirConsole", "[src.name]") + ui = new(user, src, "AntiAirConsole", "[capitalize(name)]") ui.open() diff --git a/code/modules/cm_marines/custom_items.dm b/code/modules/cm_marines/custom_items.dm index e86cdcf8ab54..59c795e65471 100644 --- a/code/modules/cm_marines/custom_items.dm +++ b/code/modules/cm_marines/custom_items.dm @@ -28,7 +28,7 @@ GLOBAL_LIST_INIT(random_personal_possessions, generate_random_possessions()) continue kit_gear += current_path - if(!length(kit_gear)) //shouldnt let them get empty kits + if(!length(kit_gear)) //shouldn't let them get empty kits stack_trace("Missing gear in Donator Gear. [donor_key] has an empty Donator Kit.") continue diff --git a/code/modules/cm_marines/dropship_ammo.dm b/code/modules/cm_marines/dropship_ammo.dm index dbb9626a66de..d0772c87468b 100644 --- a/code/modules/cm_marines/dropship_ammo.dm +++ b/code/modules/cm_marines/dropship_ammo.dm @@ -59,6 +59,20 @@ update_health(rand(current_xenomorph.melee_damage_lower, current_xenomorph.melee_damage_upper)) return XENO_ATTACK_ACTION +/obj/structure/ship_ammo/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + if(unslashable || health <= 0) + return TAILSTAB_COOLDOWN_NONE + playsound(src, 'sound/effects/metalhit.ogg', 25, 1) + update_health(xeno.melee_damage_upper) + if(health <= 0) + xeno.visible_message(SPAN_DANGER("[xeno] smashes [src] with its tail!"), + SPAN_DANGER("We smash [src] with our tail!"), null, 5, CHAT_TYPE_XENO_COMBAT) + else + xeno.visible_message(SPAN_DANGER("[xeno] strikes [src] with its tail!"), + SPAN_DANGER("We strike [src] with our tail!"), null, 5, CHAT_TYPE_XENO_COMBAT) + xeno.tail_stab_animation(src, blunt_stab) + return TAILSTAB_COOLDOWN_NORMAL + /obj/structure/ship_ammo/attackby(obj/item/I, mob/user) if(istype(I, /obj/item/powerloader_clamp)) var/obj/item/powerloader_clamp/PC = I @@ -206,7 +220,7 @@ /obj/structure/ship_ammo/heavygun/antitank name = "\improper PGU-105 30mm Anti-tank ammo crate" icon_state = "30mm_crate_hv" - desc = "A crate full of PGU-105 Specialized 30mm APFSDS Titanium-Tungsten alloy penetrators, made for countering peer and near peer APCs, IFVs, and MBTs in CAS support. It is designed to penetrate up to the equivalent 1350mm of RHA when launched from a GAU-21. It is much less effective against soft targets however, in which case 30mm ball ammunition is recommended. WARNING: discarding petals from the ammunition can be harmful if the dropship does not pull out at the needed speeds. Please consult page 3574 of the manual, available for order at any ARMAT store. Can be loaded into the GAU-21 30mm cannon." + desc = "A crate full of PGU-105 Specialized 30mm APFSDS Titanium-Tungsten alloy penetrators, made for countering peer and near peer APCs, IFVs, and MBTs in CAS support. It is designed to penetrate up to the equivalent 1350mm of RHA when launched from a GAU-21. It is much less effective against soft targets however, in which case 30mm ball ammunition is recommended. WARNING: discarding petals from the ammunition can be harmful if the dropship does not pull out at the needed speeds. Please consult page 3574 of the manual, available for order at any Armat store. Can be loaded into the GAU-21 30mm cannon." travelling_time = 60 point_cost = 325 shrapnel_type = /datum/ammo/bullet/shrapnel/gau/at @@ -218,7 +232,7 @@ /obj/structure/ship_ammo/laser_battery name = "\improper BTU-17/LW Hi-Cap Laser Battery" icon_state = "laser_battery" - desc = "A high-capacity laser battery used to power laser beam weapons. Can be loaded into the LWU-6B Laser Cannon." + desc = "A high-capacity laser battery used to power laser beam weapons. Can be loaded into the LWU-6B Laser Cannon." travelling_time = 10 ammo_count = 100 max_ammo_count = 100 @@ -426,11 +440,11 @@ accuracy_range = 0 // pinpoint max_inaccuracy = 0 /// Special structures it needs to break with drop pod - var/list/breakeable_structures = list(/obj/structure/barricade, /obj/structure/surface/table) + var/list/breakable_structures = list(/obj/structure/barricade, /obj/structure/surface/table) /obj/structure/ship_ammo/sentry/detonate_on(turf/impact, obj/structure/dropship_equipment/weapon/fired_from) var/obj/structure/droppod/equipment/sentry/droppod = new(impact, /obj/structure/machinery/defenses/sentry/launchable, source_mob) - droppod.special_structures_to_damage = breakeable_structures + droppod.special_structures_to_damage = breakable_structures droppod.special_structure_damage = 500 droppod.drop_time = 5 SECONDS droppod.launch(impact) diff --git a/code/modules/cm_marines/dropship_equipment.dm b/code/modules/cm_marines/dropship_equipment.dm index 5d59e598caa2..03d96ec4e49d 100644 --- a/code/modules/cm_marines/dropship_equipment.dm +++ b/code/modules/cm_marines/dropship_equipment.dm @@ -48,6 +48,20 @@ update_health(rand(current_xenomorph.melee_damage_lower, current_xenomorph.melee_damage_upper)) return XENO_ATTACK_ACTION +/obj/structure/dropship_equipment/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + if(unslashable || health <= 0) + return TAILSTAB_COOLDOWN_NONE + playsound(src, 'sound/effects/metalhit.ogg', 25, 1) + update_health(xeno.melee_damage_upper) + if(health <= 0) + xeno.visible_message(SPAN_DANGER("[xeno] smashes [src] with its tail!"), + SPAN_DANGER("We smash [src] with our tail!"), null, 5, CHAT_TYPE_XENO_COMBAT) + else + xeno.visible_message(SPAN_DANGER("[xeno] strikes [src] with its tail!"), + SPAN_DANGER("We strike [src] with our tail!"), null, 5, CHAT_TYPE_XENO_COMBAT) + xeno.tail_stab_animation(src, blunt_stab) + return TAILSTAB_COOLDOWN_NORMAL + /obj/structure/dropship_equipment/attackby(obj/item/I, mob/user) if(istype(I, /obj/item/powerloader_clamp)) var/obj/item/powerloader_clamp/PC = I @@ -210,11 +224,11 @@ .["engaged"] = length(sentrygun.targets) /obj/structure/dropship_equipment/sentry_holder/on_launch() - if(ship_base && ship_base.base_category == DROPSHIP_WEAPON) //only external sentires are automatically undeployed + if(ship_base && ship_base.base_category == DROPSHIP_WEAPON) //only external sentries are automatically undeployed undeploy_sentry() /obj/structure/dropship_equipment/sentry_holder/on_arrival() - if(ship_base && auto_deploy && ship_base.base_category == DROPSHIP_WEAPON) //only external sentires are automatically deployed + if(ship_base && auto_deploy && ship_base.base_category == DROPSHIP_WEAPON) //only external sentries are automatically deployed deploy_sentry() /obj/structure/dropship_equipment/sentry_holder/equipment_interact(mob/user) @@ -322,7 +336,7 @@ /obj/structure/dropship_equipment/sentry_holder/Destroy() if(deployed_turret) - QDEL_NULL(deployed_turret.linked_cam) + QDEL_NULL(deployed_turret) . = ..() @@ -725,7 +739,7 @@ var/total_seconds = max(floor(ammo_travelling_time / 10), 1) for(var/i in 0 to total_seconds) sleep(1 SECONDS) - new /obj/effect/overlay/temp/blinking_laser (impact) //no decreased accuracy if laser dissapears, it will land where it is telegraphed to land + new /obj/effect/overlay/temp/blinking_laser (impact) //no decreased accuracy if laser disappears, it will land where it is telegraphed to land if(ammo_warn_sound) playsound(impact, ammo_warn_sound, ammo_warn_sound_volume, 1,15) @@ -760,7 +774,7 @@ /obj/structure/dropship_equipment/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 initial production run. Accepts PGU-100/PGU-105 ammo crates" + 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 initial production run. Accepts PGU-100/PGU-105 ammo crates." icon_state = "30mm_cannon" firing_sound = 'sound/effects/gau_incockpit.ogg' point_cost = 400 @@ -947,7 +961,7 @@ return FALSE if(busy_winch) - to_chat(user, SPAN_WARNING(" The winch is already in motion.")) + to_chat(user, SPAN_WARNING("The winch is already in motion.")) return FALSE if(world.time < medevac_cooldown) @@ -987,7 +1001,7 @@ return if(busy_winch) - to_chat(user, SPAN_WARNING(" The winch is already in motion.")) + to_chat(user, SPAN_WARNING("The winch is already in motion.")) return if(world.time < medevac_cooldown) @@ -995,7 +1009,7 @@ return if(selected_stretcher == linked_stretcher) //already linked to us, unlink it - to_chat(user, SPAN_NOTICE(" You move your dropship away from that stretcher's beacon.")) + to_chat(user, SPAN_NOTICE("You move your dropship away from that stretcher's beacon.")) linked_stretcher.visible_message(SPAN_NOTICE("[linked_stretcher] detects a dropship is no longer overhead.")) linked_stretcher.linked_medevac = null linked_stretcher = null @@ -1051,7 +1065,7 @@ if(!ship_base) //not installed return if(!skillcheck(user, SKILL_PILOT, SKILL_PILOT_TRAINED) && !skillcheck(user, SKILL_MEDICAL, SKILL_MEDICAL_DOCTOR)) - to_chat(user, SPAN_WARNING(" You don't know how to use [src].")) + to_chat(user, SPAN_WARNING("You don't know how to use [src].")) return if(!linked_shuttle) @@ -1062,7 +1076,7 @@ return if(busy_winch) - to_chat(user, SPAN_WARNING(" The winch is already in motion.")) + to_chat(user, SPAN_WARNING("The winch is already in motion.")) return if(!linked_stretcher) @@ -1072,7 +1086,7 @@ if(!is_ground_level(linked_stretcher.z)) linked_stretcher.linked_medevac = null linked_stretcher = null - to_chat(user, SPAN_WARNING(" There seems to be no medevac stretcher connected to [src].")) + to_chat(user, SPAN_WARNING("There seems to be no medevac stretcher connected to [src].")) return if(world.time < medevac_cooldown) @@ -1224,14 +1238,14 @@ return if(busy_winch) - to_chat(user, SPAN_WARNING(" The winch is already in motion.")) + to_chat(user, SPAN_WARNING("The winch is already in motion.")) return if(world.time < fulton_cooldown) to_chat(user, SPAN_WARNING("[src] was just used, you need to wait a bit before using it again.")) return - to_chat(user, SPAN_NOTICE(" You move your dropship above the selected balloon's beacon.")) + to_chat(user, SPAN_NOTICE("You move your dropship above the selected balloon's beacon.")) activate_winch(user, fult) @@ -1245,7 +1259,7 @@ return FALSE if(busy_winch) - to_chat(user, SPAN_WARNING(" The winch is already in motion.")) + to_chat(user, SPAN_WARNING("The winch is already in motion.")) return FALSE if(world.time < fulton_cooldown) @@ -1308,14 +1322,14 @@ return if(busy_winch) - to_chat(user, SPAN_WARNING(" The winch is already in motion.")) + to_chat(user, SPAN_WARNING("The winch is already in motion.")) return if(world.time < fulton_cooldown) to_chat(user, SPAN_WARNING("[src] was just used, you need to wait a bit before using it again.")) return - to_chat(user, SPAN_NOTICE(" You move your dropship above the selected balloon's beacon.")) + to_chat(user, SPAN_NOTICE("You move your dropship above the selected balloon's beacon.")) activate_winch(user, fulton) diff --git a/code/modules/cm_marines/equipment/gear.dm b/code/modules/cm_marines/equipment/gear.dm index 2d1bff8f6f4d..33fb84c2942d 100644 --- a/code/modules/cm_marines/equipment/gear.dm +++ b/code/modules/cm_marines/equipment/gear.dm @@ -138,7 +138,7 @@ is_animating = FALSE //animation finished return -/obj/structure/closet/bodybag/tarp/open() +/obj/structure/closet/bodybag/tarp/open(mob/user, force) COOLDOWN_START(src, toggle_delay, 3 SECONDS) //3 seconds must pass before tarp can be closed . = ..() handle_cloaking() diff --git a/code/modules/cm_marines/equipment/guncases.dm b/code/modules/cm_marines/equipment/guncases.dm index 0d5489b85b5f..b77dd86370ef 100644 --- a/code/modules/cm_marines/equipment/guncases.dm +++ b/code/modules/cm_marines/equipment/guncases.dm @@ -481,3 +481,25 @@ new /obj/item/ammo_magazine/smg/ppsh(src) new /obj/item/ammo_magazine/smg/ppsh(src) new /obj/item/ammo_magazine/smg/ppsh(src) + +//------------ M10 - Special Kits ------------ // + +/obj/item/storage/box/guncase/m10_custom_kit + name = "\improper M10 auto-pistol case" + desc = "A gun case containing the necessary attachments to assemble a custom M10 auto-pistol. Comes with two extended & two extended (AP) magazines." + storage_slots = 11 + + can_hold = list(/obj/item/weapon/gun/pistol/m10, /obj/item/ammo_magazine/pistol/m10/extended, /obj/item/ammo_magazine/pistol/m10/ap/extended, /obj/item/attachable/reddot/small, /obj/item/attachable/suppressor/sleek, /obj/item/attachable/compensator/m10/spiked, /obj/item/attachable/lasersight/micro, /obj/item/attachable/stock/m10_solid, /obj/item/storage/belt/gun/m10) + +/obj/item/storage/box/guncase/m10_custom_kit/fill_preset_inventory() + new /obj/item/weapon/gun/pistol/m10(src) + new /obj/item/ammo_magazine/pistol/m10/extended(src) + new /obj/item/ammo_magazine/pistol/m10/extended(src) + new /obj/item/ammo_magazine/pistol/m10/ap/extended(src) + new /obj/item/ammo_magazine/pistol/m10/ap/extended(src) + new /obj/item/attachable/reddot/small(src) + new /obj/item/attachable/suppressor/sleek(src) + new /obj/item/attachable/compensator/m10/spiked(src) + new /obj/item/attachable/lasersight/micro(src) + new /obj/item/attachable/stock/m10_solid(src) + new /obj/item/storage/belt/gun/m10(src) diff --git a/code/modules/cm_marines/equipment/kit_boxes.dm b/code/modules/cm_marines/equipment/kit_boxes.dm index 08bdc9876295..2141725bc3c7 100644 --- a/code/modules/cm_marines/equipment/kit_boxes.dm +++ b/code/modules/cm_marines/equipment/kit_boxes.dm @@ -11,6 +11,7 @@ can_hold = list() //Nada. Once you take the stuff out it doesn't fit back in. max_w_class = 0 foldable = null + unacidable = TRUE /// For statistics tracking. The kit's name var/kit_name = "" @@ -202,6 +203,7 @@ name = "\improper SHARP Operator equipment case" desc = "A large case containing a P9 SHARP rifle, M3-G4 Grenadier armor and helmet, and various pieces of additional equipment.\nDrag this sprite onto yourself to open it up!" kit_overlay = "grenadier" + kit_name = "sharp_operator" /obj/item/storage/box/spec/sharp_operator/fill_preset_inventory() new /obj/item/weapon/gun/rifle/sharp(src) @@ -277,7 +279,16 @@ squad_assignment_update = FALSE allowed_roles_list = list(JOB_SQUAD_MARINE, JOB_WO_SQUAD_MARINE) -/obj/item/spec_kit/rifleman/jobless +/obj/item/spec_kit/rifleman/can_use(mob/living/carbon/human/user) + for(var/allowed_role in allowed_roles_list) + if(user.job == allowed_role) + if(!skillcheckexplicit(user, SKILL_SPEC_WEAPONS, SKILL_SPEC_DEFAULT))//Expects no skill in specialist weapons at all. + to_chat(user, SPAN_WARNING("You already have specialization, give this kit to someone else!")) + return FALSE + return TRUE + +/obj/item/spec_kit/jobless + squad_assignment_update = FALSE allowed_roles_list = list() /obj/item/spec_kit/cryo @@ -324,17 +335,6 @@ return FALSE return TRUE -/obj/item/spec_kit/rifleman/can_use(mob/living/carbon/human/user) - if(!length(allowed_roles_list)) - return TRUE - - for(var/allowed_role in allowed_roles_list) - if(user.job == allowed_role)//Alternate check to normal kit as this is distributed to people without SKILL_SPEC_TRAINED. - if(skillcheck(user, SKILL_SPEC_WEAPONS, SKILL_SPEC_KITTED) && !skillcheckexplicit(user, SKILL_SPEC_WEAPONS, SKILL_SPEC_ALL)) - to_chat(user, SPAN_WARNING("You already have specialization, give this kit to someone else!")) - return FALSE - return TRUE - /obj/item/spec_kit/proc/select_and_spawn(mob/living/carbon/human/user) var/list/available_specialist_kits = list() for(var/path in GLOB.specialist_set_datums) @@ -619,6 +619,7 @@ new /obj/item/storage/pouch/general/large(src) new /obj/item/ammo_magazine/shotgun/buckshot(src) new /obj/item/ammo_magazine/shotgun/buckshot(src) + new /obj/item/pamphlet/skill/honorguard(src) /obj/item/storage/box/kit/spotter name = "\improper Spotter Kit" diff --git a/code/modules/cm_marines/equipment/maps.dm b/code/modules/cm_marines/equipment/maps.dm index 7003626827da..31866d7c3942 100644 --- a/code/modules/cm_marines/equipment/maps.dm +++ b/code/modules/cm_marines/equipment/maps.dm @@ -16,7 +16,7 @@ /obj/item/map/attack_self(mob/user) //Open the map ..() - user.visible_message(SPAN_NOTICE("[user] opens the [src.name]. ")) + user.visible_message(SPAN_NOTICE("[user] opens the [src.name].")) initialize_map() /obj/item/map/attack() @@ -84,13 +84,13 @@ /obj/item/map/big_red_map name = "\improper Solaris Ridge Map" - desc = "A censored blueprint of the Solaris Ridge facility" + desc = "A censored blueprint of the Solaris Ridge facility." html_link = "images/9/9e/Solaris_Ridge.png" color = "#e88a10" /obj/item/map/FOP_map name = "\improper Fiorina Orbital Penitentiary Map" - desc = "A labelled interior scan of Fiorina Orbital Penitentiary" + desc = "A labelled interior scan of Fiorina Orbital Penitentiary." html_link = "images/4/4c/Map_Prison.png" color = "#e88a10" @@ -114,13 +114,13 @@ /obj/item/map/corsat name = "\improper CORSAT map" - desc = "A blueprint of CORSAT station" + desc = "A blueprint of CORSAT station." html_link = "images/8/8e/CORSAT_Satellite.png" color = "red" /obj/item/map/kutjevo_map name = "\improper Kutjevo Refinery map" - desc = "An orbital scan of Kutjevo Refinery" + desc = "An orbital scan of Kutjevo Refinery." html_link = "images/0/0d/Kutjevo_a1.jpg" color = "red" @@ -138,7 +138,7 @@ /obj/item/map/new_varadero name = "\improper New Varadero map" - desc = "A labeled blueprint of the UA outpost New Varadero" + desc = "A labeled blueprint of the UA outpost New Varadero." html_link = "images/9/94/New_Varadero.png" color = "red" diff --git a/code/modules/cm_marines/equipment/mortar/mortars.dm b/code/modules/cm_marines/equipment/mortar/mortars.dm index 99dd36b20548..6f6eaab131ef 100644 --- a/code/modules/cm_marines/equipment/mortar/mortars.dm +++ b/code/modules/cm_marines/equipment/mortar/mortars.dm @@ -90,7 +90,7 @@ return XENO_NO_DELAY_ACTION if(fixed) - to_chat(xeno, SPAN_XENOWARNING("The [src]'s supports are bolted and welded into the floor. It looks like it's going to be staying there.")) + to_chat(xeno, SPAN_XENOWARNING("[src]'s supports are bolted and welded into the floor. It looks like it's going to be staying there.")) return XENO_NO_DELAY_ACTION if(firing) @@ -100,20 +100,32 @@ playsound(xeno, "alien_help", 25, 1) xeno.apply_damage(10, BURN) xeno.visible_message(SPAN_DANGER("[xeno] tried to knock the steaming hot [src] over, but burned itself and pulled away!"), - SPAN_XENOWARNING("The [src] is burning hot! Wait a few seconds.")) + SPAN_XENOWARNING("[src] is burning hot! Wait a few seconds.")) return XENO_ATTACK_ACTION - xeno.visible_message(SPAN_DANGER("[xeno] lashes at the [src] and knocks it over!"), - SPAN_DANGER("You knock the [src] over!")) + xeno.visible_message(SPAN_DANGER("[xeno] lashes at [src] and knocks it over!"), + SPAN_DANGER("You knock [src] over!")) xeno.animation_attack_on(src) xeno.flick_attack_overlay(src, "slash") playsound(loc, 'sound/effects/metalhit.ogg', 25) - var/obj/item/mortar_kit/MK = new /obj/item/mortar_kit(loc) - MK.name = name + var/obj/item/mortar_kit/kit = new /obj/item/mortar_kit(loc) + kit.name = name qdel(src) return XENO_ATTACK_ACTION +/obj/structure/mortar/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + if(unslashable || fixed || firing) + return TAILSTAB_COOLDOWN_NONE + playsound(src, 'sound/effects/metalhit.ogg', 25, 1) + xeno.visible_message(SPAN_DANGER("[xeno] smashes [src] with its tail knocking it over!"), + SPAN_DANGER("We smash [src] with our tail knocking it over!"), null, 5, CHAT_TYPE_XENO_COMBAT) + var/obj/item/mortar_kit/kit = new /obj/item/mortar_kit(loc) + kit.name = name + xeno.tail_stab_animation(src, blunt_stab) + qdel(src) + return TAILSTAB_COOLDOWN_NORMAL + /obj/structure/mortar/attack_hand(mob/user) if(isyautja(user)) to_chat(user, SPAN_WARNING("You kick [src] but nothing happens.")) @@ -153,13 +165,13 @@ /obj/structure/mortar/proc/toggle_lase_mode(mob/user) lase_mode = !lase_mode if(lase_mode) - to_chat(user, SPAN_NOTICE("You toggle the [src] to laser targeting mode.")) + to_chat(user, SPAN_NOTICE("You toggle [src] to laser targeting mode.")) reset_dials() if(linked_designator) RegisterSignal(linked_designator, COMSIG_DESIGNATOR_LASE, PROC_REF(retrieve_laser_target)) RegisterSignal(linked_designator, COMSIG_DESIGNATOR_LASE_OFF, PROC_REF(lost_laser_target)) else - to_chat(user, SPAN_NOTICE("You toggle the [src] to coordinate targeting mode.")) + to_chat(user, SPAN_NOTICE("You toggle [src] to coordinate targeting mode.")) if(aimed || aiming) lost_laser_target() if(linked_designator) @@ -237,7 +249,7 @@ /obj/structure/mortar/proc/handle_target(mob/user, temp_targ_x = 0, temp_targ_y = 0, temp_targ_z = 0, manual = FALSE) if(lase_mode) - user.visible_message(SPAN_WARNING("The [src] is set to laser targeting mode, switch to coordinate targeting in order to dial coordinates!")) + user.visible_message(SPAN_WARNING("[src] is set to laser targeting mode, switch to coordinate targeting in order to dial coordinates!")) return if(manual) temp_targ_x = tgui_input_real_number(user, "Input the longitude of the target.") @@ -276,7 +288,7 @@ SIGNAL_HANDLER if(!lase_mode) return - visible_message(SPAN_NOTICE("[icon2html(src, viewers(src))] The [src] has detected a target and beings calibrating...")) + visible_message(SPAN_NOTICE("[icon2html(src, viewers(src))] The [strip_improper(name)] has detected a target and begins calibrating...")) aiming = TRUE aimed = FALSE playsound(loc, "sound/machines/scanning.ogg", 25, 1) @@ -288,7 +300,7 @@ SIGNAL_HANDLER if(!lase_mode) return - visible_message(SPAN_NOTICE("[icon2html(src, viewers(src))] The [src] has lost the laser target and returns to it's normal position.")) + visible_message(SPAN_NOTICE("[icon2html(src, viewers(src))] The [strip_improper(name)] has lost the laser target and returns to it's normal position.")) aiming = FALSE aimed = FALSE playsound(loc, "sound/machines/scanning.ogg", 25, 1) @@ -303,13 +315,13 @@ aiming = FALSE aimed = FALSE return - visible_message(SPAN_NOTICE("[icon2html(src, viewers(src))] The [src] is ready to fire!")) + visible_message(SPAN_NOTICE("[icon2html(src, viewers(src))] The [strip_improper(name)] is ready to fire!")) aiming = FALSE aimed = TRUE /obj/structure/mortar/proc/handle_dial(mob/user, temp_dial_x = 0, temp_dial_y = 0, manual = FALSE) if(lase_mode) - user.visible_message(SPAN_WARNING("The [src] is set to laser targeting mode, switch to coordinate targeting in order to dial coordinates!")) + user.visible_message(SPAN_WARNING("[src] is set to laser targeting mode, switch to coordinate targeting in order to dial coordinates!")) return if(manual) temp_dial_x = tgui_input_number(user, "Set longitude adjustement from -10 to 10.", "Longitude", 0, 10, -10) @@ -341,15 +353,15 @@ /obj/structure/mortar/attackby(obj/item/item, mob/user) if(istype(item, /obj/item/device/binoculars/range/designator)) if(!skillcheck(user, SKILL_JTAC, SKILL_JTAC_TRAINED)) - to_chat(user, SPAN_WARNING("You don't know how to link your laser designator to the [src].")) + to_chat(user, SPAN_WARNING("You don't know how to link your laser designator to [src].")) return if(!lase_mode) - to_chat(user, SPAN_WARNING("You need to switch the [src] to laser targeting before linking your laser designator!")) + to_chat(user, SPAN_WARNING("You need to switch [src] to laser targeting before linking your laser designator!")) return if(aimed) - to_chat(user, SPAN_WARNING("The [src] is currently targeting something!")) + to_chat(user, SPAN_WARNING("[src] is currently targeting something!")) return - to_chat(user, SPAN_NOTICE("You begin linking your laser designator to the [src]..")) + to_chat(user, SPAN_NOTICE("You begin linking your laser designator to [src]...")) if(do_after(user, 2 SECONDS, INTERRUPT_ALL, BUSY_ICON_FRIENDLY)) if(linked_designator) // Unregister the previous laser designator signal, if switching linked laser designator UnregisterSignal(linked_designator, COMSIG_DESIGNATOR_LASE) @@ -366,13 +378,13 @@ var/turf/target_turf = locate(targ_x + dial_x + offset_x, targ_y + dial_y + offset_y, targ_z) if(lase_mode) if(!linked_designator) - to_chat(user, SPAN_WARNING("The [src] is in laser targeting mode, but there is no laser designator linked!")) + to_chat(user, SPAN_WARNING("[src] is in laser targeting mode, but there is no laser designator linked!")) return if(!aimed) to_chat(user, SPAN_WARNING("Cannot find valid laser target!")) return if(aiming) - to_chat(user, SPAN_WARNING("The [src] is still calibrating!")) + to_chat(user, SPAN_WARNING("[src] is still calibrating!")) else target_turf = get_turf(linked_designator.laser) var/area/target_area = get_area(target_turf) @@ -521,6 +533,7 @@ ) if(MODE_HAS_MODIFIER(/datum/gamemode_modifier/mortar_laser_warning)) new /obj/effect/overlay/temp/blinking_laser(target) + new /obj/effect/overlay/temp/mortar_impact (target, shell) sleep(2 SECONDS) // Wait out the rest of the landing time target.ceiling_debris_check(2) if(!protected_by_pylon(TURF_PROTECTION_MORTAR, target)) @@ -533,25 +546,25 @@ var/attempt_info var/can_fire = TRUE if(ship_side) - attempt_info = SPAN_WARNING(("[user ? "You" : "The [src]"] cannot aim the mortar while on a ship.")) + attempt_info = SPAN_WARNING(("[user ? "You" : "[src]"] cannot aim the mortar while on a ship.")) can_fire = FALSE if(test_dial_x + test_targ_x > world.maxx || test_dial_x + test_targ_x < 0) - attempt_info = SPAN_WARNING("[user ? "You" : "The [src]"] cannot [dialing ? "dial to" : "aim at"] this [lase_mode ? "target" : "coordinate"], it is outside of the area of operations.") + attempt_info = SPAN_WARNING("[user ? "You" : "[src]"] cannot [dialing ? "dial to" : "aim at"] this [lase_mode ? "target" : "coordinate"], it is outside of the area of operations.") can_fire = FALSE if(test_dial_x < -10 || test_dial_x > 10 || test_dial_y < -10 || test_dial_y > 10) - attempt_info = SPAN_WARNING("[user ? "You" : "The [src]"] cannot [dialing ? "dial to" : "aim at"] this [lase_mode ? "target" : "coordinate"], it is too far away from the original target.") + attempt_info = SPAN_WARNING("[user ? "You" : "[src]"] cannot [dialing ? "dial to" : "aim at"] this [lase_mode ? "target" : "coordinate"], it is too far away from the original target.") can_fire = FALSE if(test_dial_y + test_targ_y > world.maxy || test_dial_y + test_targ_y < 0) - attempt_info = SPAN_WARNING("[user ? "You" : "The [src]"] cannot [dialing ? "dial to" : "aim at"] this [lase_mode ? "target" : "coordinate"], it is outside of the area of operations.") + attempt_info = SPAN_WARNING("[user ? "You" : "[src]"] cannot [dialing ? "dial to" : "aim at"] this [lase_mode ? "target" : "coordinate"], it is outside of the area of operations.") can_fire = FALSE if(get_dist(src, locate(test_targ_x + test_dial_x, test_targ_y + test_dial_y, z)) < min_range) - attempt_info = SPAN_WARNING("[user ? "You" : "The [src]"] cannot [dialing ? "dial to" : "aim at"] this [lase_mode ? "target" : "coordinate"], it is too close to [user ? "your" : "the"] mortar.") + attempt_info = SPAN_WARNING("[user ? "You" : "[src]"] cannot [dialing ? "dial to" : "aim at"] this [lase_mode ? "target" : "coordinate"], it is too close to [user ? "your" : "the"] mortar.") can_fire = FALSE if(!is_ground_level(test_targ_z)) - attempt_info = SPAN_WARNING("[user ? "You" : "The [src]"] cannot [dialing ? "dial to" : "aim at"] this [lase_mode ? "target" : "coordinate"], it is outside of the area of operations.") + attempt_info = SPAN_WARNING("[user ? "You" : "[src]"] cannot [dialing ? "dial to" : "aim at"] this [lase_mode ? "target" : "coordinate"], it is outside of the area of operations.") can_fire = FALSE if(get_dist(src, locate(test_targ_x + test_dial_x, test_targ_y + test_dial_y, z)) > max_range) - attempt_info = SPAN_WARNING("[user ? "You" : "The [src]"] cannot [dialing ? "dial to" : "aim at"] this [lase_mode ? "target" : "coordinate"], it is too far from [user ? "your" : "the"] mortar.") + attempt_info = SPAN_WARNING("[user ? "You" : "[src]"] cannot [dialing ? "dial to" : "aim at"] this [lase_mode ? "target" : "coordinate"], it is too far from [user ? "your" : "the"] mortar.") can_fire = FALSE if(busy) attempt_info = SPAN_WARNING("Someone else is currently using this mortar.") @@ -576,7 +589,7 @@ //The portable mortar item /obj/item/mortar_kit name = "\improper M402 mortar portable kit" - 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" + 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." icon = 'icons/obj/structures/mortar.dmi' icon_state = "mortar_m402_carry" item_state = "mortar_m402_carry" diff --git a/code/modules/cm_marines/m2c.dm b/code/modules/cm_marines/m2c.dm index 23066841db91..dfc4a0d8d63e 100644 --- a/code/modules/cm_marines/m2c.dm +++ b/code/modules/cm_marines/m2c.dm @@ -366,7 +366,7 @@ return if(user.action_busy) return - user.visible_message(SPAN_NOTICE("[user] loads [src] with an ammo box! "), SPAN_NOTICE("You load [src] with an ammo box!")) + user.visible_message(SPAN_NOTICE("[user] loads [src] with an ammo box!"), SPAN_NOTICE("You load [src] with an ammo box!")) playsound(src.loc, 'sound/items/m56dauto_load.ogg', 75, 1) rounds = min(rounds + magazine.current_rounds, rounds_max) update_icon() @@ -493,7 +493,7 @@ return if((rounds > 0) && (user.a_intent & (INTENT_GRAB))) playsound(src.loc, 'sound/items/m56dauto_load.ogg', 75, 1) - user.visible_message(SPAN_NOTICE(" [user] removes [src]'s ammo box."),SPAN_NOTICE(" You remove [src]'s ammo box, preparing the gun for disassembly.")) + user.visible_message(SPAN_NOTICE("[user] removes [src]'s ammo box."),SPAN_NOTICE("You remove [src]'s ammo box, preparing the gun for disassembly.")) var/obj/item/ammo_magazine/m2c/used_ammo = new(user.loc) used_ammo.current_rounds = rounds user.put_in_active_hand(used_ammo) @@ -545,27 +545,27 @@ user.reset_view(src) if(dir == EAST) diff_x = -16 + user_old_x - user.client.pixel_x = viewoffset - user.client.pixel_y = 0 + user.client.set_pixel_x(viewoffset) + user.client.set_pixel_y(0) if(dir == WEST) diff_x = 16 + user_old_x - user.client.pixel_x = -viewoffset - user.client.pixel_y = 0 + user.client.set_pixel_x(-viewoffset) + user.client.set_pixel_y(0) if(dir == NORTH) diff_y = -16 + user_old_y - user.client.pixel_x = 0 - user.client.pixel_y = viewoffset + user.client.set_pixel_x(0) + user.client.set_pixel_y(viewoffset) if(dir == SOUTH) diff_y = 16 + user_old_y - user.client.pixel_x = 0 - user.client.pixel_y = -viewoffset + user.client.set_pixel_x(0) + user.client.set_pixel_y(-viewoffset) animate(user, pixel_x=diff_x, pixel_y=diff_y, 0.4 SECONDS) else if(user.client) user.client.change_view(GLOB.world_view_size) - user.client.pixel_x = 0 - user.client.pixel_y = 0 + user.client.set_pixel_x(0) + user.client.set_pixel_y(0) animate(user, pixel_x=user_old_x, pixel_y=user_old_y, 4, 1) diff --git a/code/modules/cm_marines/marines_consoles.dm b/code/modules/cm_marines/marines_consoles.dm index cf75e65edf38..91ed38b6dd1e 100644 --- a/code/modules/cm_marines/marines_consoles.dm +++ b/code/modules/cm_marines/marines_consoles.dm @@ -89,7 +89,7 @@ user_id_card = I if(authenticate(user, user_id_card)) return TRUE - // Well actualy we have no button for auth card ejection, so just spit it back in user's face + // Well actually we have no button for auth card ejection, so just spit it back in user's face else if(!user_id_card) return @@ -135,10 +135,10 @@ var/known_access_rights = get_access(ACCESS_LIST_MARINE_ALL) for(var/A in target_id_card.access) if(A in known_access_rights) - contents += " [get_access_desc(A)]
" + contents += " [get_access_desc(A)]
" contents += "
Modification Log:
" for(var/change in target_id_card.modification_log) - contents += " [change]
" + contents += " [change]
" var/obj/item/paper/P = new /obj/item/paper(src.loc) P.name = "Access Report" @@ -521,7 +521,7 @@ //This console changes a marine's squad. It's very simple. //It also does not: change or increment the squad count (used in the login randomizer), nor does it check for jobs. -//Which means you could get sillyiness like "Alpha Sulaco Chief Medical Officer" or "Delta Logistics Officer". +//Which means you could get silliness like "Alpha Sulaco Chief Medical Officer" or "Delta Logistics Officer". //But in the long run it's not really a big deal. /obj/structure/machinery/computer/squad_changer @@ -712,7 +712,7 @@ /obj/structure/machinery/computer/crew name = "crew monitoring computer" - desc = "Used to monitor active health sensors built into the wearer's uniform. You can see that the console highlights ship areas with BLUE and remote locations with RED." + desc = "Used to monitor active health sensors built into the wearer's uniform. You can see that the console highlights ship areas with BLUE and remote locations with RED." icon_state = "crew" circuit = /obj/item/circuitboard/computer/crew density = TRUE @@ -983,6 +983,7 @@ GLOBAL_LIST_EMPTY_TYPED(crew_monitor, /datum/crewmonitor) RAIDER_OFFICER_SQUAD = 11, JOB_SO = 12, JOB_SEA = 13, + JOB_SYNTH_CMD = 14, // 20-29: Aux Command JOB_AUXILIARY_OFFICER = 20, JOB_SYNTH = 21, @@ -990,6 +991,7 @@ GLOBAL_LIST_EMPTY_TYPED(crew_monitor, /datum/crewmonitor) JOB_DROPSHIP_PILOT = 23, JOB_DROPSHIP_CREW_CHIEF = 24, JOB_INTEL = 25, + JOB_SYNTH_INTEL = 25, JOB_CIA_LIAISON = 26, JOB_TANK_CREW = 27, // 30-39: Security @@ -997,21 +999,26 @@ GLOBAL_LIST_EMPTY_TYPED(crew_monitor, /datum/crewmonitor) JOB_PROVOST_TML = 30, JOB_WARDEN = 31, JOB_PROVOST_ENFORCER = 31, + JOB_POLICE_HG = 32, JOB_RIOT_CHIEF = 32, JOB_RIOT = 33, JOB_POLICE = 34, - JOB_PROVOST_ADVISOR = 35, + JOB_SYNTH_MP = 35, + JOB_PROVOST_ADVISOR = 36, // 40-49: MedSci JOB_CMO = 40, JOB_RESEARCHER = 41, JOB_DOCTOR = 42, JOB_SURGEON = 42, + JOB_PHARMACIST = 42, JOB_FIELD_DOCTOR = 43, - JOB_NURSE = 44, + JOB_SYNTH_MED = 44, + JOB_NURSE = 45, // 50-59: Engineering JOB_CHIEF_ENGINEER = 50, - JOB_ORDNANCE_TECH = 51, - JOB_MAINT_TECH = 52, + JOB_SYNTH_ENG = 51, + JOB_ORDNANCE_TECH = 52, + JOB_MAINT_TECH = 53, // 60-69: Cargo JOB_CHIEF_REQUISITION = 60, JOB_CARGO_TECH = 61, @@ -1020,8 +1027,9 @@ GLOBAL_LIST_EMPTY_TYPED(crew_monitor, /datum/crewmonitor) JOB_SYNTH_K9 = 71, // 150+: Civilian/other JOB_CORPORATE_LIAISON = 150, - JOB_CIA = 151, - JOB_PASSENGER = 152, + JOB_CORPORATE_BODYGUARD = 151, + JOB_CIA = 152, + JOB_PASSENGER = 153, // Non Almayer jobs lower then registered JOB_SYNTH_SURVIVOR = 160, JOB_SURVIVOR = 161, @@ -1070,7 +1078,7 @@ GLOBAL_LIST_EMPTY_TYPED(crew_monitor, /datum/crewmonitor) JOB_PMC_INVESTIGATOR = 224, JOB_PMC_ENGINEER = 225, JOB_PMC_STANDARD = 226, - JOB_PMC_DETAINER = 227, + JOB_PMC_SECURITY = 227, JOB_PMC_CROWD_CONTROL = 228, JOB_PMC_DOCTOR = 229, JOB_WY_GOON_LEAD = 230, @@ -1153,7 +1161,7 @@ GLOBAL_LIST_EMPTY_TYPED(crew_monitor, /datum/crewmonitor) // 60-69: Investigation Team JOB_PMC_LEAD_INVEST = 60, JOB_PMC_INVESTIGATOR = 61, - JOB_PMC_DETAINER = 62, + JOB_PMC_SECURITY = 62, JOB_PMC_CROWD_CONTROL = 63, // 70-79 PMCs Combat Team diff --git a/code/modules/cm_marines/orbital_cannon.dm b/code/modules/cm_marines/orbital_cannon.dm index 675d310ed103..6400cad58d64 100644 --- a/code/modules/cm_marines/orbital_cannon.dm +++ b/code/modules/cm_marines/orbital_cannon.dm @@ -245,7 +245,7 @@ GLOBAL_LIST_EMPTY(orbital_cannon_cancellation) var/obj/structure/ob_ammo/warhead/warhead = tray.warhead tray.warhead = null warhead.moveToNullspace() - warhead.warhead_impact(target) + warhead.warhead_impact(target, warhead) sleep(OB_CRASHING_DOWN) @@ -467,12 +467,13 @@ GLOBAL_LIST_EMPTY(orbital_cannon_cancellation) var/clear_delay = 3 var/double_explosion_delay = 6 -/obj/structure/ob_ammo/warhead/explosive/warhead_impact(turf/target) +/obj/structure/ob_ammo/warhead/explosive/warhead_impact(turf/target, obj/structure/ob_ammo/warhead/warhead) . = ..() if (!.) return new /obj/effect/overlay/temp/blinking_laser (target) + new /obj/effect/overlay/temp/ob_impact (target, warhead, 1.5) sleep(10) var/datum/cause_data/cause_data = create_cause_data(initial(name), source_mob) cell_explosion(target, clear_power, clear_falloff, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, cause_data) //break shit around @@ -515,12 +516,13 @@ GLOBAL_LIST_EMPTY(orbital_cannon_cancellation) var/fire_color = LIGHT_COLOR_CYAN var/fire_type = "white" -/obj/structure/ob_ammo/warhead/incendiary/warhead_impact(turf/target) +/obj/structure/ob_ammo/warhead/incendiary/warhead_impact(turf/target, obj/structure/ob_ammo/warhead/warhead) . = ..() if (!.) return new /obj/effect/overlay/temp/blinking_laser (target) + new /obj/effect/overlay/temp/ob_impact (target, warhead) sleep(10) var/datum/cause_data/cause_data = create_cause_data(initial(name), source_mob) cell_explosion(target, clear_power, clear_falloff, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, cause_data) //break shit around @@ -543,14 +545,14 @@ GLOBAL_LIST_EMPTY(orbital_cannon_cancellation) var/explosion_falloff = 150 var/delay_between_clusters = 0.4 SECONDS // how long between each firing? -/obj/structure/ob_ammo/warhead/cluster/warhead_impact(turf/target) +/obj/structure/ob_ammo/warhead/cluster/warhead_impact(turf/target, obj/structure/ob_ammo/warhead/warhead) . = ..() if (!.) return - start_cluster(target) + start_cluster(target, warhead) -/obj/structure/ob_ammo/warhead/cluster/proc/start_cluster(turf/target) +/obj/structure/ob_ammo/warhead/cluster/proc/start_cluster(turf/target, obj/structure/ob_ammo/warhead/warhead) set waitfor = 0 var/range_num = 12 @@ -564,13 +566,14 @@ GLOBAL_LIST_EMPTY(orbital_cannon_cancellation) var/area/selected_area = get_area(selected_turf) if(CEILING_IS_PROTECTED(selected_area?.ceiling, CEILING_PROTECTION_TIER_4)) continue - fire_in_a_hole(selected_turf) + fire_in_a_hole(selected_turf, warhead) sleep(delay_between_clusters) QDEL_IN(src, 5 SECONDS) // Leave time for last handle_ob_shake below -/obj/structure/ob_ammo/warhead/cluster/proc/fire_in_a_hole(turf/loc) +/obj/structure/ob_ammo/warhead/cluster/proc/fire_in_a_hole(turf/loc, obj/structure/ob_ammo/warhead/warhead) new /obj/effect/overlay/temp/blinking_laser (loc) + new /obj/effect/overlay/temp/ob_impact (loc, warhead, 0.5) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(cell_explosion), loc, explosion_power, explosion_falloff, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, create_cause_data(initial(name), source_mob)), 1 SECONDS) addtimer(CALLBACK(src, PROC_REF(handle_ob_shake), loc), 1 SECONDS) @@ -610,7 +613,7 @@ GLOBAL_LIST_EMPTY(orbital_cannon_cancellation) /obj/structure/machinery/computer/orbital_cannon_console/tgui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) - ui = new(user, src, "OrbitalCannonConsole", "[src.name]") + ui = new(user, src, "OrbitalCannonConsole", "[capitalize(name)]") ui.open() /obj/structure/machinery/computer/orbital_cannon_console/ui_state(mob/user) diff --git a/code/modules/cm_marines/overwatch.dm b/code/modules/cm_marines/overwatch.dm index 0707db0491bd..ca7dd716ee39 100644 --- a/code/modules/cm_marines/overwatch.dm +++ b/code/modules/cm_marines/overwatch.dm @@ -35,11 +35,9 @@ GLOBAL_LIST_EMPTY_TYPED(active_overwatch_consoles, /obj/structure/machinery/comp var/faction = FACTION_MARINE var/obj/structure/orbital_cannon/current_orbital_cannon - var/datum/tacmap/tacmap - var/minimap_type = MINIMAP_FLAG_USCM - - var/list/possible_options = list("Blue" = "crtblue", "Green" = "crtgreen", "Yellow" = "crtyellow", "Red" = "crtred") - var/list/chosen_theme = list("Blue", "Green", "Yellow", "Red") + var/minimap_flag = MINIMAP_FLAG_USCM + var/list/possible_options = list("Blue" = "crtblue", "Green" = "crtgreen", "Yellow" = "crtyellow", "Red" = "crtred", "Purple" = "crtpurple") + var/list/chosen_theme = list("Blue", "Green", "Yellow", "Red", "Purple") var/command_channel_key = ":v" var/freq = CRYO_FREQ @@ -64,8 +62,6 @@ GLOBAL_LIST_EMPTY_TYPED(active_overwatch_consoles, /obj/structure/machinery/comp COOLDOWN_DECLARE(cooldown_message) /// making a shipside announcement COOLDOWN_DECLARE(cooldown_shipside_message) - /// 10 minute cooldown between calls for 'general quarters' - COOLDOWN_DECLARE(general_quarters) /obj/structure/machinery/computer/overwatch/groundside_operations name = "Groundside Operations Console" @@ -83,12 +79,10 @@ GLOBAL_LIST_EMPTY_TYPED(active_overwatch_consoles, /obj/structure/machinery/comp GLOB.active_overwatch_consoles += src current_orbital_cannon = GLOB.almayer_orbital_cannon ob_cannon_safety = GLOB.ob_cannon_safety - tacmap = new /datum/tacmap/drawing(src, minimap_type) - else - tacmap = new(src, minimap_type) // Non-drawing version + + AddComponent(/datum/component/tacmap, has_drawing_tools=TRUE, minimap_flag=minimap_flag, has_update=TRUE) /obj/structure/machinery/computer/overwatch/Destroy() - QDEL_NULL(tacmap) GLOB.active_overwatch_consoles -= src current_orbital_cannon = null concurrent_users = null @@ -101,7 +95,7 @@ GLOBAL_LIST_EMPTY_TYPED(active_overwatch_consoles, /obj/structure/machinery/comp for(var/datum/squad/root_squad in GLOB.RoleAuthority.squads) root_squad.release_overwatch() break - QDEL_NULL(tacmap) + GLOB.active_overwatch_consoles -= src current_orbital_cannon = null concurrent_users = null @@ -175,29 +169,18 @@ GLOBAL_LIST_EMPTY_TYPED(active_overwatch_consoles, /obj/structure/machinery/comp /obj/structure/machinery/computer/overwatch/ui_static_data(mob/user) var/list/data = list() - data["mapRef"] = tacmap.map_holder.map_ref return data /obj/structure/machinery/computer/overwatch/groundside_operations/ui_static_data(mob/user) var/list/data = list() data["distress_time_lock"] = DISTRESS_TIME_LOCK - data["mapRef"] = tacmap.map_holder.map_ref return data - /obj/structure/machinery/computer/overwatch/tgui_interact(mob/user, datum/tgui/ui) - - if(!tacmap.map_holder) - var/level = SSmapping.levels_by_trait(tacmap.targeted_ztrait) - if(!level[1]) - return - tacmap.map_holder = SSminimaps.fetch_tacmap_datum(level[1], tacmap.allowed_flags) - ui = SStgui.try_update_ui(user, src, ui) if(!ui) - user.client.register_map_obj(tacmap.map_holder.map) if(istype(src, /obj/structure/machinery/computer/overwatch/groundside_operations)) ui = new(user, src, "CentralOverwatchConsole", "Groundside Operations Console") else @@ -607,7 +590,7 @@ GLOBAL_LIST_EMPTY_TYPED(active_overwatch_consoles, /obj/structure/machinery/comp if(.) return - var/mob/user = usr + var/mob/user = ui.user switch(action) if("pick_squad") if(current_squad) @@ -631,11 +614,12 @@ GLOBAL_LIST_EMPTY_TYPED(active_overwatch_consoles, /obj/structure/machinery/comp current_squad.send_squad_message("Your Overwatch officer is: [operator.name].", displayed_icon = src) visible_message("[icon2html(src, viewers(src))] [SPAN_BOLDNOTICE("Tactical data for squad '[current_squad]' loaded. All tactical functions initialized.")]") return TRUE + if("logout") if(istype(src, /obj/structure/machinery/computer/overwatch/groundside_operations)) for(var/datum/squad/resolve_root in GLOB.RoleAuthority.squads) if(resolve_root.name == "Root" && resolve_root.faction == faction) - current_squad = resolve_root // manually overrides the target squad to 'root', since goc's dont know how + current_squad = resolve_root // manually overrides the target squad to 'root', since goc's don't know how break if(current_squad?.release_overwatch()) if(isSilicon(user)) @@ -664,84 +648,88 @@ GLOBAL_LIST_EMPTY_TYPED(active_overwatch_consoles, /obj/structure/machinery/comp if("message") if(current_squad) - var/input = sanitize_control_chars(stripped_input(user, "Please write a message to announce to the squad:", "Squad Message")) + var/input = sanitize_control_chars(tgui_input_text(user, "Please write a message to announce to the squad:", "Squad Message")) if(input) - current_squad.send_message(input, 1) //message, adds username - current_squad.send_maptext(input, "Squad Message:") + current_squad.transmit_alert("", input, "", "Squad Message:", user) //message, adds username visible_message("[icon2html(src, viewers(src))] [SPAN_BOLDNOTICE("Message '[input]' sent to all Marines of squad '[current_squad]'.")]") log_overwatch("[key_name(user)] sent '[input]' to squad [current_squad].") if("sl_message") if(current_squad) - var/input = sanitize_control_chars(stripped_input(user, "Please write a message to announce to the squad leader:", "SL Message")) + var/input = sanitize_control_chars(tgui_input_text(user, "Please write a message to announce to the squad leader:", "SL Message")) if(input) - current_squad.send_message(input, 1, 1) //message, adds username, only to leader - current_squad.send_maptext(input, "Squad Leader Message:", 1) + current_squad.transmit_alert("", input, "", "Squad Leader Message:", user, only_leader=TRUE) //message, adds username, only to leader visible_message("[icon2html(src, viewers(src))] [SPAN_BOLDNOTICE("Message '[input]' sent to Squad Leader [current_squad.squad_leader] of squad '[current_squad]'.")]") log_overwatch("[key_name(user)] sent '[input]' to Squad Leader [current_squad.squad_leader] of squad [current_squad].") - if("check_primary") + if("remind_primary") if(current_squad) //This is already checked, but ehh. if(current_squad.primary_objective) visible_message("[icon2html(src, viewers(src))] [SPAN_BOLDNOTICE("Reminding '[current_squad]' of primary objectives: [current_squad.primary_objective].")]") - current_squad.send_message("Your primary objective is '[current_squad.primary_objective]'. See Status pane for details.") - current_squad.send_maptext(current_squad.primary_objective, "Primary Objective:") + current_squad.remind_objective(primary=TRUE) - if("check_secondary") + if("remind_secondary") if(current_squad) //This is already checked, but ehh. if(current_squad.secondary_objective) visible_message("[icon2html(src, viewers(src))] [SPAN_BOLDNOTICE("Reminding '[current_squad]' of secondary objectives: [current_squad.secondary_objective].")]") - current_squad.send_message("Your secondary objective is '[current_squad.secondary_objective]'. See Status pane for details.") - current_squad.send_maptext(current_squad.secondary_objective, "Secondary Objective:") + current_squad.remind_objective(primary=FALSE) if("set_primary") - var/input = sanitize_control_chars(stripped_input(usr, "What will be the squad's primary objective?", "Primary Objective")) + var/input = sanitize_control_chars(tgui_input_text(user, "What will be the squad's primary objective?", "Primary Objective")) var/datum/squad/target_squad = current_squad if(params["target_squad_ref"]) target_squad = locate(params["target_squad_ref"]) if(target_squad && input) - target_squad.primary_objective = "[input] ([worldtime2text()])" - target_squad.send_message("Your primary objective has been changed to '[input]'. See Status pane for details.") - target_squad.send_maptext(input, "Primary Objective Updated:") + target_squad.transmit_objective(input, primary=TRUE) visible_message("[icon2html(src, viewers(src))] [SPAN_BOLDNOTICE("Primary objective of squad '[target_squad]' set to '[input]'.")]") - log_overwatch("[key_name(usr)] set [target_squad]'s primary objective to '[input]'.") + log_overwatch("[key_name(user)] set [target_squad]'s primary objective to '[input]'.") return TRUE if("set_secondary") - var/input = sanitize_control_chars(stripped_input(usr, "What will be the squad's secondary objective?", "Secondary Objective")) + var/input = sanitize_control_chars(tgui_input_text(user, "What will be the squad's secondary objective?", "Secondary Objective")) var/datum/squad/target_squad = current_squad if(params["target_squad_ref"]) target_squad = locate(params["target_squad_ref"]) - if(input) - target_squad.secondary_objective = input + " ([worldtime2text()])" - target_squad.send_message("Your secondary objective has been changed to '[input]'. See Status pane for details.") - target_squad.send_maptext(input, "Secondary Objective Updated:") + if(target_squad && input) + target_squad.transmit_objective(input, primary=FALSE) visible_message("[icon2html(src, viewers(src))] [SPAN_BOLDNOTICE("Secondary objective of squad '[target_squad]' set to '[input]'.")]") - log_overwatch("[key_name(usr)] set [target_squad]'s secondary objective to '[input]'.") + log_overwatch("[key_name(user)] set [target_squad]'s secondary objective to '[input]'.") return TRUE + if("replace_lead") if(!params["ref"]) return change_lead(user, params["ref"]) + return TRUE if("insubordination") mark_insubordination() + return TRUE + if("transfer_marine") transfer_squad() + return TRUE if("change_locations_ignored") switch(z_hidden) if(HIDE_NONE) z_hidden = HIDE_ALMAYER - to_chat(user, "[icon2html(src, usr)] [SPAN_NOTICE("Marines on the Almayer are now hidden.")]") + to_chat(user, "[icon2html(src, user)] [SPAN_NOTICE("Marines on the Almayer are now hidden.")]") if(HIDE_ALMAYER) z_hidden = HIDE_GROUND - to_chat(user, "[icon2html(src, usr)] [SPAN_NOTICE("Marines on the ground are now hidden.")]") + to_chat(user, "[icon2html(src, user)] [SPAN_NOTICE("Marines on the ground are now hidden.")]") else z_hidden = HIDE_NONE - to_chat(user, "[icon2html(src, usr)] [SPAN_NOTICE("No location is ignored anymore.")]") + to_chat(user, "[icon2html(src, user)] [SPAN_NOTICE("No location is ignored anymore.")]") + return TRUE + if("tacmap_unpin") - tacmap.tgui_interact(user) + var/datum/component/tacmap/tacmap_component = GetComponent(/datum/component/tacmap) + if(user in tacmap_component.interactees) + tacmap_component.on_unset_interaction(user) + else + tacmap_component.show_tacmap(user) + if("dropbomb") if(isnull(params["x"]) || isnull(params["y"]) || isnull(params["z"])) return @@ -749,9 +737,9 @@ GLOBAL_LIST_EMPTY_TYPED(active_overwatch_consoles, /obj/structure/machinery/comp y_bomb = text2num(params["y"]) z_bomb = text2num(params["z"]) if(current_orbital_cannon.is_disabled) - to_chat(user, "[icon2html(src, usr)] [SPAN_WARNING("Orbital bombardment cannon disabled!")]") + to_chat(user, "[icon2html(src, user)] [SPAN_WARNING("Orbital bombardment cannon disabled!")]") else if(!COOLDOWN_FINISHED(current_orbital_cannon, ob_firing_cooldown)) - to_chat(user, "[icon2html(src, usr)] [SPAN_WARNING("Orbital bombardment cannon not yet ready to fire again! Please wait [COOLDOWN_TIMELEFT(current_orbital_cannon, ob_firing_cooldown)/10] seconds.")]") + to_chat(user, "[icon2html(src, user)] [SPAN_WARNING("Orbital bombardment cannon not yet ready to fire again! Please wait [COOLDOWN_TIMELEFT(current_orbital_cannon, ob_firing_cooldown)/10] seconds.")]") else handle_bombard(user) @@ -774,6 +762,7 @@ GLOBAL_LIST_EMPTY_TYPED(active_overwatch_consoles, /obj/structure/machinery/comp popleft(saved_coordinates) saved_coordinates += list(list("x" = text2num(params["x"]), "y" = text2num(params["y"]), "z" = text2num(params["z"]))) return TRUE + if("change_coordinate_comment") if(!params["index"] || !params["comment"]) return @@ -785,7 +774,7 @@ GLOBAL_LIST_EMPTY_TYPED(active_overwatch_consoles, /obj/structure/machinery/comp if("watch_camera") if(isRemoteControlling(user)) - to_chat(user, "[icon2html(src, user)] [SPAN_WARNING("Unable to override console camera viewer. Track with camera instead. ")]") + to_chat(user, "[icon2html(src, user)] [SPAN_WARNING("Unable to override console camera viewer. Track with camera instead.")]") return if(!params["target_ref"]) return @@ -830,6 +819,7 @@ GLOBAL_LIST_EMPTY_TYPED(active_overwatch_consoles, /obj/structure/machinery/comp disconnect_holder() cam = new_cam connect_holder(new_holder) + if("change_operator") if(operator != user) if(operator && isSilicon(operator)) @@ -838,18 +828,19 @@ GLOBAL_LIST_EMPTY_TYPED(active_overwatch_consoles, /obj/structure/machinery/comp if(istype(src, /obj/structure/machinery/computer/overwatch/groundside_operations)) for(var/datum/squad/resolve_root in GLOB.RoleAuthority.squads) if(resolve_root.name == "Root" && resolve_root.faction == faction) - current_squad = resolve_root // manually overrides the target squad to 'root', since goc's dont know how + current_squad = resolve_root // manually overrides the target squad to 'root', since goc's don't know how break if(!current_squad || current_squad.assume_overwatch(user)) operator = user if(isSilicon(user)) - to_chat(user, "[icon2html(src, usr)] [SPAN_BOLDNOTICE("Overwatch system AI override protocol successful.")]") + to_chat(user, "[icon2html(src, user)] [SPAN_BOLDNOTICE("Overwatch system AI override protocol successful.")]") current_squad?.send_squad_message("Attention. [operator.name] has engaged overwatch system control override.", displayed_icon = src) else var/mob/living/carbon/human/human = operator var/obj/item/card/id/ID = human.get_idcard() visible_message("[icon2html(src, viewers(src))] [SPAN_BOLDNOTICE("Basic overwatch systems initialized. Welcome, [ID ? "[ID.rank] ":""][operator.name]. Please select a squad.")]") current_squad?.send_squad_message("Attention. Your Overwatch officer is now [ID ? "[ID.rank] ":""][operator.name].", displayed_icon = src) + return TRUE // groundside ops functions @@ -882,12 +873,12 @@ GLOBAL_LIST_EMPTY_TYPED(active_overwatch_consoles, /obj/structure/machinery/comp if(squad == "root" && show_command_squad) for(var/datum/squad/resolve_root in GLOB.RoleAuthority.squads) if(resolve_root.name == "Root" && resolve_root.faction == faction) - current_squad = resolve_root // manually overrides the target squad to 'root', since goc's dont know how + current_squad = resolve_root // manually overrides the target squad to 'root', since goc's don't know how else current_squad = locate(params["squad"]) if("announce") - var/mob/living/carbon/human/human_user = usr // does not use operator, in case they are not operating, and cannot be operated by another operator, on behalf of the operator + var/mob/living/carbon/human/human_user = user // does not use operator, in case they are not operating, and cannot be operated by another operator, on behalf of the operator var/obj/item/card/id/idcard = human_user.get_active_hand() var/bio_fail = FALSE var/announcement_type = params["announcement_type"] @@ -901,23 +892,23 @@ GLOBAL_LIST_EMPTY_TYPED(active_overwatch_consoles, /obj/structure/machinery/comp to_chat(human_user, SPAN_WARNING("Biometrics failure! You require an authenticated ID card to perform this action!")) return FALSE - if(usr.client.prefs.muted & MUTE_IC) - to_chat(usr, SPAN_DANGER("You cannot send Announcements (muted).")) + if(user.client.prefs.muted & MUTE_IC) + to_chat(user, SPAN_DANGER("You cannot send Announcements (muted).")) return if((!COOLDOWN_FINISHED(src, cooldown_message) && announcement_type == "groundside") || (!COOLDOWN_FINISHED(src, cooldown_shipside_message) && announcement_type == "shipside")) - to_chat(usr, SPAN_WARNING("Please allow at least [COOLDOWN_COMM_MESSAGE*0.1] second\s to pass between announcements.")) + to_chat(user, SPAN_WARNING("Please allow at least [COOLDOWN_COMM_MESSAGE*0.1] second\s to pass between announcements.")) return FALSE - if(announcement_faction != FACTION_MARINE && usr.faction != announcement_faction) - to_chat(usr, SPAN_WARNING("Access denied.")) + if(announcement_faction != FACTION_MARINE && user.faction != announcement_faction) + to_chat(user, SPAN_WARNING("Access denied.")) return - var/input = stripped_multiline_input(usr, "Please write a message to announce to the station crew.", "Priority Announcement", "") - if(!input || !(usr in dview(1, src))) + var/input = stripped_multiline_input(user, "Please write a message to announce to the station crew.", "Priority Announcement", "") + if(!input || !(user in dview(1, src))) return FALSE var/signed = null - if(ishuman(usr)) - var/mob/living/carbon/human/human = usr + if(ishuman(user)) + var/mob/living/carbon/human/human = user var/obj/item/card/id/id = human.get_idcard() if(id) var/paygrade = get_paygrades(id.paygrade, FALSE, human.gender) @@ -925,32 +916,23 @@ GLOBAL_LIST_EMPTY_TYPED(active_overwatch_consoles, /obj/structure/machinery/comp if(announcement_type == "shipside") shipwide_ai_announcement(input, COMMAND_SHIP_ANNOUNCE, signature = signed) - message_admins("[key_name(user)] has made a shipwide annoucement.") + message_admins("[key_name(user)] has made a shipwide announcement.") log_announcement("[key_name(user)] has announced the following to the ship: [input]") COOLDOWN_START(src, cooldown_shipside_message, COOLDOWN_COMM_MESSAGE) else marine_announcement(input, announcement_title, faction_to_display = announcement_faction, add_PMCs = add_pmcs, signature = signed) - message_admins("[key_name(usr)] has made a command announcement.") - log_announcement("[key_name(usr)] has announced the following: [input]") + message_admins("[key_name(user)] has made a command announcement.") + log_announcement("[key_name(user)] has announced the following: [input]") COOLDOWN_START(src, cooldown_message, COOLDOWN_COMM_MESSAGE) if("selectlz") - if(SSticker.mode.active_lz) - return - var/lz_choices = list("lz1", "lz2") - var/new_lz = tgui_input_list(usr, "Select primary LZ", "LZ Select", lz_choices) - if(!new_lz) - return - if(new_lz == "lz1") - SSticker.mode.select_lz(locate(/obj/structure/machinery/computer/shuttle/dropship/flight/lz1)) - else - SSticker.mode.select_lz(locate(/obj/structure/machinery/computer/shuttle/dropship/flight/lz2)) + SSticker.mode.pick_a_lz(user) if("messageUSCM") if(!COOLDOWN_FINISHED(src, cooldown_central)) - to_chat(user, SPAN_WARNING("Arrays are re-cycling. Please stand by.")) + to_chat(user, SPAN_WARNING("Arrays are re-cycling. Please stand by.")) return FALSE - var/input = stripped_input(user, "Please choose a message to transmit to USCM. Please be aware that this process is very expensive, and abuse will lead to termination. Transmission does not guarantee a response. There is a small delay before you may send another message. Be clear and concise.", "To abort, send an empty message.", "") + var/input = stripped_input(user, "Please choose a message to transmit to USCM. Please be aware that this process is very expensive, and abuse will lead to termination. Transmission does not guarantee a response. There is a small delay before you may send another message. Be clear and concise.", "To abort, send an empty message.", "") if(!input || !(user in dview(1, src)) || !COOLDOWN_FINISHED(src, cooldown_central)) return FALSE @@ -963,7 +945,7 @@ GLOBAL_LIST_EMPTY_TYPED(active_overwatch_consoles, /obj/structure/machinery/comp open_medal_panel(user, src) if("activate_echo") - var/mob/living/carbon/human/human_user = usr + var/mob/living/carbon/human/human_user = user var/obj/item/card/id/idcard = human_user.get_active_hand() var/bio_fail = FALSE if(!istype(idcard)) @@ -976,16 +958,16 @@ GLOBAL_LIST_EMPTY_TYPED(active_overwatch_consoles, /obj/structure/machinery/comp to_chat(human_user, SPAN_WARNING("Biometrics failure! You require an authenticated ID card to perform this action!")) return FALSE - var/reason = strip_html(input(usr, "What is the purpose of Echo Squad?", "Activation Reason")) + var/reason = strip_html(input(user, "What is the purpose of Echo Squad?", "Activation Reason")) if(!reason) return - if(alert(usr, "Confirm activation of Echo Squad for [reason]", "Confirm Activation", "Yes", "No") != "Yes") return + if(alert(user, "Confirm activation of Echo Squad for [reason]", "Confirm Activation", "Yes", "No") != "Yes") return var/datum/squad/marine/echo/echo_squad = locate() in GLOB.RoleAuthority.squads if(!echo_squad) visible_message(SPAN_BOLDNOTICE("ERROR: Unable to locate Echo Squad database.")) return echo_squad.engage_squad(TRUE) - message_admins("[key_name(usr)] activated Echo Squad for '[reason]'.") + message_admins("[key_name(user)] activated Echo Squad for '[reason]'.") if("distress") if(!SSticker.mode) @@ -1043,17 +1025,21 @@ GLOBAL_LIST_EMPTY_TYPED(active_overwatch_consoles, /obj/structure/machinery/comp log_ares_security("Cancel Evacuation", "Cancelled the emergency evacuation.", user) if("general_quarters") - if(!COOLDOWN_FINISHED(src, general_quarters)) + var/datum/ares_datacore/datacore = GLOB.ares_datacore + if(GLOB.security_level < SEC_LEVEL_RED) + log_game("[key_name(user)] set red alert via the groundside operations console.") + message_admins("[key_name_admin(user)] set red alert via the groundside operations console.") + log_ares_security("Manual Security Update", "Changed the security level to red.", user) + set_security_level(SEC_LEVEL_RED, no_sound = TRUE, announce = FALSE) + if(!COOLDOWN_FINISHED(datacore, ares_quarters_cooldown)) to_chat(user, SPAN_WARNING("It has not been long enough since the last General Quarters call!")) playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) return FALSE - if(GLOB.security_level < SEC_LEVEL_RED) - set_security_level(SEC_LEVEL_RED, no_sound = TRUE, announce = FALSE) + COOLDOWN_START(datacore, ares_quarters_cooldown, 10 MINUTES) shipwide_ai_announcement("ATTENTION! GENERAL QUARTERS. ALL HANDS, MAN YOUR BATTLESTATIONS.", MAIN_AI_SYSTEM, 'sound/effects/GQfullcall.ogg') log_game("[key_name(user)] has called for general quarters via the groundside operations console.") message_admins("[key_name_admin(user)] has called for general quarters via the groundside operations console.") log_ares_security("General Quarters", "Called for general quarters via the groundside operations console.", user) - COOLDOWN_START(src, general_quarters, 10 MINUTES) . = TRUE /obj/structure/machinery/computer/overwatch/proc/transfer_talk(obj/item/camera, mob/living/sourcemob, message, verb = "says", datum/language/language, italics = FALSE, show_message_above_tv = FALSE) @@ -1135,7 +1121,7 @@ GLOBAL_LIST_EMPTY_TYPED(active_overwatch_consoles, /obj/structure/machinery/comp selected_sl.comm_title = "SL" else //an acting SL selected_sl.comm_title = "aSL" - ADD_TRAIT(selected_sl, TRAIT_LEADERSHIP, TRAIT_SOURCE_SQUAD_LEADER) + ADD_TRAIT(selected_sl, TRAIT_ACTING_LEAD, TRAIT_SOURCE_SQUAD_LEADER) var/obj/item/device/radio/headset/sl_headset = selected_sl.get_type_in_ears(/obj/item/device/radio/headset/almayer/marine) switch(faction) @@ -1158,6 +1144,9 @@ GLOBAL_LIST_EMPTY_TYPED(active_overwatch_consoles, /obj/structure/machinery/comp selected_sl.update_inv_head() //updating marine helmet leader overlays selected_sl.update_inv_wear_suit() + var/obj/item/device/radio/headset/earpiece = selected_sl.get_type_in_ears(/obj/item/device/radio/headset) + if(earpiece) + earpiece.locate_setting = TRACKER_LZ /obj/structure/machinery/computer/overwatch/check_eye(mob/user) if(user.is_mob_incapacitated(TRUE) || ui_status(user) == UI_CLOSE || user.blinded) //user can't see - not sure why canmove is here. @@ -1181,6 +1170,9 @@ GLOBAL_LIST_EMPTY_TYPED(active_overwatch_consoles, /obj/structure/machinery/comp if(!isRemoteControlling(user)) concurrent_users += WEAKREF(user) if(cam) + if(user.client.view != GLOB.world_view_size) + to_chat(user, SPAN_WARNING("You're too busy peering through binoculars.")) + return user.reset_view(cam) user.RegisterSignal(cam, COMSIG_PARENT_QDELETING, TYPE_PROC_REF(/mob, reset_observer_view_on_deletion)) @@ -1196,6 +1188,9 @@ GLOBAL_LIST_EMPTY_TYPED(active_overwatch_consoles, /obj/structure/machinery/comp ..() if(user.interactee == src) user.unset_interaction() + var/datum/component/tacmap/tacmap_component = GetComponent(/datum/component/tacmap) + tacmap_component.on_unset_interaction(user) + tacmap_component.close_popout_tacmaps(user) /// checks if the human has an overwatch camera at all /obj/structure/machinery/computer/overwatch/proc/marine_has_camera(mob/living/carbon/human/marine) @@ -1414,6 +1409,8 @@ GLOBAL_LIST_EMPTY_TYPED(active_overwatch_consoles, /obj/structure/machinery/comp var/mutable_appearance/warhead_appearance = mutable_appearance(current_orbital_cannon.tray.warhead.icon, current_orbital_cannon.tray.warhead.icon_state) notify_ghosts(header = "Bombardment Inbound", message = "\A [ob_name] targeting [get_area(T)] has been fired!", source = T, alert_overlay = warhead_appearance, extra_large = TRUE) + SScmtv.spectate_event("Orbital Bombardment", T, 40 SECONDS, zoom_out = TRUE) + /// Project ARES interface log. log_ares_bombardment(user.name, ob_name, "Bombardment fired at X[x_bomb], Y[y_bomb], Z[z_bomb] in [get_area(T)]") @@ -1493,10 +1490,11 @@ GLOBAL_LIST_EMPTY_TYPED(active_overwatch_consoles, /obj/structure/machinery/comp /obj/structure/machinery/computer/overwatch/clf faction = FACTION_CLF freq = CLF_FREQ + /obj/structure/machinery/computer/overwatch/upp faction = FACTION_UPP freq = UPP_FREQ - minimap_type = MINIMAP_FLAG_UPP + minimap_flag = MINIMAP_FLAG_UPP command_channel_key = "#v" ui_theme = "crtupp" possible_options = list("UPP" = "crtupp", "Green" = "crtgreen", "Yellow" = "crtyellow", "Red" = "crtred") diff --git a/code/modules/cm_marines/radar.dm b/code/modules/cm_marines/radar.dm index e2f0e3c7715f..e734dc68cd36 100644 --- a/code/modules/cm_marines/radar.dm +++ b/code/modules/cm_marines/radar.dm @@ -30,7 +30,7 @@ /datum/radar/tgui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if (!ui) - ui = new(user, src, "Radar", "[holder.name]") + ui = new(user, src, "Radar", "[capitalize(holder.name)]") ui.open() /datum/radar/ui_assets(mob/user) diff --git a/code/modules/cm_marines/smartgun_mount.dm b/code/modules/cm_marines/smartgun_mount.dm index 06d99deba3bc..ebe85b47fc90 100644 --- a/code/modules/cm_marines/smartgun_mount.dm +++ b/code/modules/cm_marines/smartgun_mount.dm @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////// -//Mounted MG, Replacment for the current jury rig code. +//Mounted MG, Replacement for the current jury rig code. // First thing we need is the ammo drum for this thing. /obj/item/ammo_magazine/m56d @@ -189,7 +189,7 @@ /obj/item/device/m56d_post //Adding this because I was fucken stupid and put a obj/structure/machinery in a box. Realized I couldn't take it out name = "\improper M56D folded mount" - desc = "The folded, foldable tripod mount for the M56D. (Place on ground and drag to you to unfold)." + desc = "The folded, foldable tripod mount for the M56D. (Place on ground and drag to you to unfold)." unacidable = TRUE w_class = SIZE_MEDIUM icon = 'icons/obj/items/weapons/guns/guns_by_faction/USCM/hmg.dmi' @@ -460,7 +460,7 @@ -// The actual Machinegun itself, going to borrow some stuff from current sentry code to make sure it functions. Also because they're similiar. +// The actual Machinegun itself, going to borrow some stuff from current sentry code to make sure it functions. Also because they're similar. /obj/structure/machinery/m56d_hmg name = "\improper M56D heavy machine gun" desc = "A deployable, heavy machine gun. While it is capable of taking the same rounds as the M56, it fires specialized tungsten rounds for increased armor penetration.
Drag its sprite onto yourself to man it. Ctrl-click it to cycle through firemodes." @@ -1002,30 +1002,30 @@ if(NORTH) diff_y = -16 + user_old_y if(user.client) - user.client.pixel_x = 0 - user.client.pixel_y = viewoffset + user.client.set_pixel_x(0) + user.client.set_pixel_y(viewoffset) if(SOUTH) diff_y = 16 + user_old_y if(user.client) - user.client.pixel_x = 0 - user.client.pixel_y = -viewoffset + user.client.set_pixel_x(0) + user.client.set_pixel_y(-viewoffset) if(EAST) diff_x = -16 + user_old_x if(user.client) - user.client.pixel_x = viewoffset - user.client.pixel_y = 0 + user.client.set_pixel_x(viewoffset) + user.client.set_pixel_y(0) if(WEST) diff_x = 16 + user_old_x if(user.client) - user.client.pixel_x = -viewoffset - user.client.pixel_y = 0 + user.client.set_pixel_x(-viewoffset) + user.client.set_pixel_y(0) animate(user, pixel_x=diff_x, pixel_y=diff_y, 0.4 SECONDS) else if(user.client) user.client.change_view(GLOB.world_view_size) - user.client.pixel_x = 0 - user.client.pixel_y = 0 + user.client.set_pixel_x(0) + user.client.set_pixel_y(0) animate(user, pixel_x=user_old_x, pixel_y=user_old_y, 4, 1) /obj/structure/machinery/m56d_hmg/check_eye(mob/living/user) @@ -1082,7 +1082,7 @@ if(display_ammo) var/chambered = in_chamber ? TRUE : FALSE - to_chat(operator, SPAN_DANGER("[rounds][chambered ? "+1" : ""] / [rounds_max] ROUNDS REMAINING")) + to_chat(operator, SPAN_DANGER("[rounds][chambered ? "+1" : ""] / [rounds_max] ROUNDS REMAINING.")) /// Toggles the gun's firemode one down the list /obj/structure/machinery/m56d_hmg/proc/do_toggle_firemode(mob/user, new_firemode) @@ -1127,7 +1127,7 @@ display_ammo() SEND_SIGNAL(src, COMSIG_GUN_STOP_FIRE) -///Update the target if you draged your mouse +///Update the target if you dragged your mouse /obj/structure/machinery/m56d_hmg/proc/change_target(datum/source, atom/src_object, atom/over_object, turf/src_location, turf/over_location, src_control, over_control, params) SIGNAL_HANDLER set_target(get_turf_on_clickcatcher(over_object, operator, params)) @@ -1214,6 +1214,9 @@ update_damage_state() update_icon() +/obj/structure/machinery/m56d_hmg/mg_turret/whiskey + ammo = /datum/ammo/bullet/machinegun/whiskey + /obj/structure/machinery/m56d_hmg/mg_turret/dropship name = "\improper scoped M56D heavy machine gun" desc = "A scoped M56D heavy machine gun mounted behind a metal shield. Drag its sprite onto yourself to man it. Ctrl-click it to toggle burst fire." diff --git a/code/modules/cm_marines/vehicle_part_fabricator.dm b/code/modules/cm_marines/vehicle_part_fabricator.dm index 453c3b5eeb25..46b7520f58d1 100644 --- a/code/modules/cm_marines/vehicle_part_fabricator.dm +++ b/code/modules/cm_marines/vehicle_part_fabricator.dm @@ -103,7 +103,7 @@ if((is_omnisentry && get_point_store() < omnisentry_price) || get_point_store() < entry.cost) if(!TIMER_COOLDOWN_CHECK(src, COOLDOWN_PRINTER_ERROR)) - balloon_alert_to_viewers("out of points - printing paused!") + balloon_alert_to_viewers("out of points - printing paused") visible_message(SPAN_WARNING("[src] flashes a warning light.")) TIMER_COOLDOWN_START(src, COOLDOWN_PRINTER_ERROR, 20 SECONDS) busy = FALSE diff --git a/code/modules/cm_phone/phone.dm b/code/modules/cm_phone/phone.dm index 8c76cd206c7e..4c48d017dee7 100644 --- a/code/modules/cm_phone/phone.dm +++ b/code/modules/cm_phone/phone.dm @@ -266,7 +266,7 @@ GLOBAL_LIST_EMPTY_TYPED(transmitters, /obj/structure/transmitter) if(T) if(T.attached_to && ismob(T.attached_to.loc)) var/mob/M = T.attached_to.loc - to_chat(M, SPAN_PURPLE("[icon2html(src, M)] [phone_id] has hung up on you.")) + to_chat(M, SPAN_PURPLE("[icon2html(src, M)] You hear a click as the phone goes dead. [phone_id] has hung up on you.")) T.hangup_loop.start() if(attached_to && ismob(attached_to.loc)) @@ -411,7 +411,7 @@ GLOBAL_LIST_EMPTY_TYPED(transmitters, /obj/structure/transmitter) var/zlevel_transfer = FALSE var/zlevel_transfer_timer = TIMER_ID_NULL var/zlevel_transfer_timeout = 5 SECONDS - var/can_be_raised = TRUE // This is for items like the scout helmet where you dont need to raise it. + var/can_be_raised = TRUE // This is for items like the scout helmet where you don't need to raise it. /obj/item/phone/Initialize(mapload) . = ..() diff --git a/code/modules/cm_preds/thrall_procs.dm b/code/modules/cm_preds/thrall_procs.dm index e21c2e409c5c..482ac790b21e 100644 --- a/code/modules/cm_preds/thrall_procs.dm +++ b/code/modules/cm_preds/thrall_procs.dm @@ -107,7 +107,7 @@ /obj/item/clothing/gloves/yautja/hunter/verb/stun_thrall() set name = "Stun Thrall" - set desc = "Stun your thrall when it misbehaves" + set desc = "Stun your thrall when it misbehaves." set category = "Yautja.Thrall" set src in usr @@ -139,7 +139,7 @@ if(master.stat == DEAD) to_chat(master, SPAN_WARNING("Little too late for that now!")) return - if(master.health < HEALTH_THRESHOLD_CRIT) + if(master.health < master.health_threshold_crit) to_chat(master, SPAN_WARNING("As you fall into unconsciousness you fail to activate your self-destruct device before you collapse.")) return if(master.stat) @@ -168,7 +168,8 @@ do_after(thrall, (80), INTERRUPT_NONE, BUSY_ICON_HOSTILE) if(thrall) - cell_explosion(thrall, 800, 550, EXPLOSION_FALLOFF_SHAPE_LINEAR, null) + var/datum/cause_data/cause_data = create_cause_data("thrall remote self-destruct", master) + cell_explosion(thrall, 800, 550, EXPLOSION_FALLOFF_SHAPE_LINEAR, explosion_cause_data=cause_data) thrall.gib() // kills the thrall qdel(thrall) diff --git a/code/modules/cm_preds/yaut_actions.dm b/code/modules/cm_preds/yaut_actions.dm index b0089d9ed3c0..9ca9e16e5cba 100644 --- a/code/modules/cm_preds/yaut_actions.dm +++ b/code/modules/cm_preds/yaut_actions.dm @@ -209,7 +209,7 @@ /datum/action/predator_action/bracer/capsule name = "Create Healing Capsule" - action_icon_state = "thwei" + action_icon_state = "gel_vial" listen_signal = COMSIG_KB_YAUTJA_CAPSULE active = PREDATOR_ACTION_ON_CLICK @@ -241,6 +241,7 @@ //Misc actions /datum/action/yautja_emote_panel name = "Open Emote Panel" + icon_file = 'icons/mob/hud/actions_yautja.dmi' button_icon_state = "pred_template" action_icon_state = "looc_toggle" diff --git a/code/modules/cm_preds/yaut_bracers.dm b/code/modules/cm_preds/yaut_bracers.dm index 7c8b48ffaeea..f1f3fe249455 100644 --- a/code/modules/cm_preds/yaut_bracers.dm +++ b/code/modules/cm_preds/yaut_bracers.dm @@ -2,16 +2,17 @@ name = "ancient alien bracers" desc = "A pair of strange, alien bracers." - icon = 'icons/obj/items/hunter/pred_gear.dmi' + icon = 'icons/obj/items/hunter/pred_bracers.dmi' icon_state = "bracer" item_icons = list( - WEAR_HANDS = 'icons/mob/humans/onmob/hunter/pred_gear.dmi' + WEAR_HANDS = 'icons/mob/humans/onmob/hunter/pred_bracers.dmi' ) siemens_coefficient = 0 flags_item = ITEM_PREDATOR flags_inventory = CANTSTRIP + flags_equip_slot = SLOT_NO_STORE|SLOT_HANDS flags_cold_protection = BODY_FLAG_HANDS flags_heat_protection = BODY_FLAG_HANDS flags_armor_protection = BODY_FLAG_HANDS @@ -47,6 +48,8 @@ COOLDOWN_DECLARE(bracer_recharge) /// What minimap icon this bracer should have var/minimap_icon + ///sprite style + var/material /obj/item/clothing/gloves/yautja/equipped(mob/user, slot) . = ..() @@ -96,7 +99,7 @@ charge = min(charge + charge_increase, charge_max) var/perc_charge = (charge / charge_max * 100) - human_holder.update_power_display(perc_charge) + human_holder.update_power_display(perc_charge, material) //Non-Yautja have a chance to get stunned with each power drain if(!HAS_TRAIT(human_holder, TRAIT_CLOAKED)) @@ -124,18 +127,25 @@ return if(!isyautja(owner)) + var/image/underlay = image('icons/ui_icons/map_blips.dmi', null, "bracer_stolen") + var/overlay_icon_state if(owner.stat >= DEAD) if(human_owner.undefibbable) - SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, "bracer_stolen", 'icons/ui_icons/map_blips.dmi', overlay_iconstates = list("undefibbable")) + overlay_icon_state = "undefibbable" else - SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, "bracer_stolen", 'icons/ui_icons/map_blips.dmi', overlay_iconstates = list("defibbable")) + overlay_icon_state = "defibbable" else - SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, "bracer_stolen", 'icons/ui_icons/map_blips.dmi') + overlay_icon_state = null + if(overlay_icon_state) + var/image/overlay = image('icons/ui_icons/map_blips.dmi', null, overlay_icon_state) + underlay.overlays += overlay + SSminimaps.add_marker(owner, MINIMAP_FLAG_YAUTJA, underlay) else + var/image/underlay = image('icons/ui_icons/map_blips.dmi', null, minimap_icon) if(owner?.stat >= DEAD) - SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, human_owner.assigned_equipment_preset.minimap_icon,, 'icons/ui_icons/map_blips.dmi', overlay_iconstates = list("undefibbable")) //defib/undefib status doesn't really matter because they're gonna explode in the end regardless - else - SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, human_owner.assigned_equipment_preset.minimap_icon, 'icons/ui_icons/map_blips.dmi') + var/image/overlay = image('icons/ui_icons/map_blips.dmi', null, "undefibbable") + underlay.overlays += overlay + SSminimaps.add_marker(owner, MINIMAP_FLAG_YAUTJA, underlay) /* *This is the main proc for checking AND draining the bracer energy. It must have human passed as an argument. *It can take a negative value in amount to restore energy. @@ -150,7 +160,7 @@ charge -= amount var/perc = (charge / charge_max * 100) - human.update_power_display(perc) + human.update_power_display(perc, material) return TRUE @@ -220,6 +230,24 @@ notification_sound = !notification_sound to_chat(usr, SPAN_NOTICE("The bracer's sound is now turned [notification_sound ? "on" : "off"].")) +/obj/item/clothing/gloves/yautja/thrall/update_minimap_icon() + if(!ishuman(owner)) + return + + var/mob/living/carbon/human/human_owner = owner + var/image/underlay = image('icons/ui_icons/map_blips.dmi', null, minimap_icon) + var/overlay_icon_state + if(owner.stat >= DEAD) + if(human_owner.undefibbable) + overlay_icon_state = "undefibbable" + else + overlay_icon_state = "defibbable" + var/image/overlay = image('icons/ui_icons/map_blips.dmi', null, overlay_icon_state) + underlay.overlays += overlay + SSminimaps.add_marker(owner, MINIMAP_FLAG_YAUTJA, underlay) + else + SSminimaps.add_marker(owner, MINIMAP_FLAG_YAUTJA, underlay) + /obj/item/clothing/gloves/yautja/hunter name = "clan bracers" desc = "An extremely complex, yet simple-to-operate set of armored bracers worn by the Yautja. It has many functions, activate them to use some." @@ -266,7 +294,7 @@ if(right_bracer_attachment) . += SPAN_NOTICE("The right bracer attachment is [right_bracer_attachment.attached_weapon].") -/obj/item/clothing/gloves/yautja/hunter/Initialize(mapload, new_translator_type, new_invis_sound, new_caster_material, new_owner_rank) +/obj/item/clothing/gloves/yautja/hunter/Initialize(mapload, new_translator_type, new_invis_sound, new_caster_material, new_owner_rank, new_bracer_material) . = ..() if(new_owner_rank) owner_rank = new_owner_rank @@ -278,6 +306,9 @@ if(new_caster_material) caster_material = new_caster_material caster = new(src, FALSE, caster_material) + if(new_bracer_material) + icon_state = "bracer_" + new_bracer_material + material = new_bracer_material /obj/item/clothing/gloves/yautja/hunter/emp_act(severity) . = ..() @@ -432,7 +463,7 @@ /obj/item/bracer_attachments/wristblades name = "wristblade bracer attachment" - desc = "A pair of huge, serrated blades" + desc = "A pair of huge, serrated blades." icon_state = "wrist" item_state = "wristblade" attached_weapon_type = /obj/item/weapon/bracer_attachment/wristblades @@ -441,7 +472,7 @@ /obj/item/bracer_attachments/scimitars name = "scimitar bracer attachment" - desc = "A pair of huge, serrated blades" + desc = "A pair of huge, serrated blades." icon_state = "scim" item_state = "scim" attached_weapon_type = /obj/item/weapon/bracer_attachment/scimitar @@ -450,13 +481,23 @@ /obj/item/bracer_attachments/scimitars_alt name = "scimitar bracer attachment" - desc = "A pair of huge, serrated blades" + desc = "A pair of huge, serrated blades." icon_state = "scim_alt" item_state = "scim_alt" attached_weapon_type = /obj/item/weapon/bracer_attachment/scimitar/alt deployment_sound = 'sound/weapons/scims_alt_on.ogg' retract_sound = 'sound/weapons/scims_alt_off.ogg' +/obj/item/bracer_attachments/shield + name ="shield bracer attachment" + desc ="A shield made of concentric metal alloy plates. The plates fold into one another for compact storage while still providing superior protection." + icon = 'icons/obj/items/hunter/pred_gear.dmi' + icon_state = "bracer_shield_off" + item_state = "bracer_shield_off" + attached_weapon_type = /obj/item/weapon/shield/riot/yautja/bracer_shield + deployment_sound = 'sound/weapons/wristblades_on.ogg' + retract_sound = 'sound/weapons/wristblades_off.ogg' + /obj/item/clothing/gloves/yautja/hunter/attackby(obj/item/attacking_item, mob/user) if(!istype(attacking_item, /obj/item/bracer_attachments)) return ..() @@ -618,7 +659,7 @@ return var/mob/living/carbon/human/hunter = user - var/atom/hunter_eye = hunter.client.eye + var/atom/hunter_eye = hunter.client.get_eye() var/dead_on_planet = 0 var/dead_on_almayer = 0 @@ -782,7 +823,7 @@ decloak(wearer, TRUE, DECLOAK_EXTINGUISHER) -/obj/item/clothing/gloves/yautja/hunter/decloak(mob/user, forced, force_multipler = DECLOAK_FORCED) +/obj/item/clothing/gloves/yautja/hunter/decloak(mob/user, forced, force_multiplier = DECLOAK_FORCED) if(!user) return @@ -792,7 +833,7 @@ UnregisterSignal(user, COMSIG_HUMAN_PRE_BULLET_ACT) UnregisterSignal(user, COMSIG_MOB_EFFECT_CLOAK_CANCEL) - var/decloak_timer = (DECLOAK_STANDARD * force_multipler) + var/decloak_timer = (DECLOAK_STANDARD * force_multiplier) if(forced) cloak_malfunction = world.time + decloak_timer @@ -933,12 +974,15 @@ if(boomer.stat == DEAD) to_chat(boomer, SPAN_WARNING("Little too late for that now!")) return - if(boomer.health < HEALTH_THRESHOLD_CRIT) + if(boomer.health < boomer.health_threshold_crit) to_chat(boomer, SPAN_WARNING("As you fall into unconsciousness you fail to activate your self-destruct device before you collapse.")) return - if(boomer.stat) + if(boomer.stat != CONSCIOUS) to_chat(boomer, SPAN_WARNING("Not while you're unconscious...")) return + if(boomer.is_mob_incapacitated() || (!exploding && HAS_TRAIT(boomer, TRAIT_HAULED))) + to_chat(boomer, SPAN_WARNING("You cannot do this in your current state.")) + return if(grounds?.flags_area & AREA_YAUTJA_HUNTING_GROUNDS) // Hunted need mask to escape to_chat(boomer, SPAN_WARNING("Your bracer will not allow you to activate a self-destruction sequence in order to protect the hunting preserve.")) return @@ -955,7 +999,16 @@ if(isspeciesyautja(victim)) message = "Are you sure you want to send this [victim.species] into the great hunting grounds?" if(istype(bracer)) - if(forced || alert(message,"Explosive Bracers", "Yes", "No") == "Yes") + if(forced || tgui_alert(boomer, message, "Explosive Bracers", list("Yes", "No"), 20 SECONDS) == "Yes") + if(boomer.stat == DEAD) + to_chat(boomer, SPAN_WARNING("Little too late for that now!")) + return + if(boomer.stat != CONSCIOUS) + to_chat(boomer, SPAN_WARNING("Not while you're unconscious...")) + return + if(boomer.is_mob_incapacitated() || HAS_TRAIT(boomer, TRAIT_HAULED)) + to_chat(boomer, SPAN_WARNING("You cannot do this in your current state.")) + return if(boomer.get_active_hand() == G && victim && victim.gloves == bracer && !bracer.exploding) var/area/A = get_area(boomer) var/turf/T = get_turf(boomer) @@ -974,13 +1027,13 @@ return if(exploding) - if(forced || alert("Are you sure you want to stop the countdown?","Bracers", "Yes", "No") == "Yes") + if(forced || tgui_alert(boomer, "Are you sure you want to stop the countdown?", "Explosive Bracers", list("Yes", "No"), 20 SECONDS) == "Yes") if(boomer.gloves != src) return if(boomer.stat == DEAD) to_chat(boomer, SPAN_WARNING("Little too late for that now!")) return - if(boomer.stat) + if(boomer.stat != CONSCIOUS) to_chat(boomer, SPAN_WARNING("Not while you're unconscious...")) return exploding = FALSE @@ -1000,15 +1053,18 @@ to_chat(boomer, SPAN_WARNING("Strange...something seems to be interfering with your bracer functions...")) return - if(forced || alert("Detonate the bracers? Are you sure?\n\nNote: If you activate SD for any non-accidental reason during or after a fight, you commit to the SD. By initially activating the SD, you have accepted your impending death to preserve any lost honor.","Explosive Bracers", "Yes", "No") == "Yes") + if(forced || tgui_alert(boomer, "Detonate the bracers? Are you sure?\n\nNote: If you activate SD for any non-accidental reason during or after a fight, you commit to the SD. By initially activating the SD, you have accepted your impending death to preserve any lost honor.", "Explosive Bracers", list("Yes", "No"), 20 SECONDS) == "Yes") if(boomer.gloves != src) return if(boomer.stat == DEAD) to_chat(boomer, SPAN_WARNING("Little too late for that now!")) return - if(boomer.stat) + if(boomer.stat != CONSCIOUS) to_chat(boomer, SPAN_WARNING("Not while you're unconscious...")) return + if(boomer.is_mob_incapacitated() || HAS_TRAIT(boomer, TRAIT_HAULED)) + to_chat(boomer, SPAN_WARNING("You cannot do this in your current state.")) + return if(grounds?.flags_area & AREA_YAUTJA_HUNTING_GROUNDS) //Hunted need mask to escape to_chat(boomer, SPAN_WARNING("Your bracer will not allow you to activate a self-destruction sequence in order to protect the hunting preserve.")) return @@ -1403,9 +1459,9 @@ /// The actual unlock/lock function. /obj/item/clothing/gloves/yautja/proc/toggle_lock_internal(mob/wearer, force_lock) if(((flags_item & NODROP) || (flags_inventory & CANTSTRIP)) && !force_lock) - return unlock_bracer() + return unlock_bracer(wearer) - return lock_bracer() + return lock_bracer(wearer) /obj/item/clothing/gloves/yautja/proc/lock_bracer(mob/wearer) flags_item |= NODROP @@ -1415,6 +1471,7 @@ to_chat(wearer, SPAN_WARNING("The bracer clamps securely around your forearm and beeps in a comfortable, familiar way.")) else to_chat(wearer, SPAN_WARNING("The bracer clamps painfully around your forearm and beeps angrily. It won't come off!")) + playsound(src, 'sound/items/air_release.ogg', 15, 1) return TRUE /obj/item/clothing/gloves/yautja/proc/unlock_bracer(mob/wearer) @@ -1425,4 +1482,5 @@ to_chat(wearer, SPAN_WARNING("The bracer beeps pleasantly, releasing its grip on your forearm.")) else to_chat(wearer, SPAN_WARNING("With an angry blare, the bracer releases your forearm.")) + playsound(src, 'sound/items/air_release.ogg', 15, 1) return TRUE diff --git a/code/modules/cm_preds/yaut_items.dm b/code/modules/cm_preds/yaut_items.dm index 01e04cf2ba37..56030a348123 100644 --- a/code/modules/cm_preds/yaut_items.dm +++ b/code/modules/cm_preds/yaut_items.dm @@ -331,6 +331,7 @@ GLOBAL_VAR_INIT(youngblood_timer_yautja, 0) black_market_value = 100 flags_item = ITEM_PREDATOR volume_settings = list(RADIO_VOLUME_QUIET_STR, RADIO_VOLUME_RAISED_STR) + minimap_flag = MINIMAP_FLAG_YAUTJA /obj/item/device/radio/headset/yautja/talk_into(mob/living/M as mob, message, channel, verb = "commands", datum/language/speaking) if(!isyautja(M)) //Nope. @@ -508,7 +509,7 @@ GLOBAL_VAR_INIT(youngblood_timer_yautja, 0) unacidable = TRUE ///List of where they can choose to go to var/static/list/potential_hunting_grounds = list() - ///If one has already been spawned, dont let more be spawned + ///If one has already been spawned, don't let more be spawned var/static/hunting_ground_activated = FALSE /obj/structure/machinery/hunting_ground_selection/Initialize(mapload, ...) @@ -865,79 +866,6 @@ GLOBAL_VAR_INIT(youngblood_timer_yautja, 0) else . += SPAN_WARNING("Scalp-collecting is supposed to be a joke. Has someone been going around doing this shit for real? What next, a necklace of severed ears? Jesus Christ.") -/obj/item/explosive/grenade/spawnergrenade/hellhound - name = "hellhound caller" - spawner_type = /mob/living/carbon/xenomorph/hellhound - deliveryamt = 1 - desc = "A strange piece of alien technology. It seems to call forth a hellhound." - icon = 'icons/obj/items/hunter/pred_gear.dmi' - icon_state = "hellnade" - w_class = SIZE_TINY - det_time = 30 - var/obj/structure/machinery/camera/current = null - var/turf/activated_turf = null - -/obj/item/explosive/grenade/spawnergrenade/hellhound/dropped(mob/user) - check_eye(user) - return ..() - -/obj/item/explosive/grenade/spawnergrenade/hellhound/attack_self(mob/living/carbon/human/user) - if(!active) - if(!HAS_TRAIT(user, TRAIT_YAUTJA_TECH)) - to_chat(user, SPAN_WARNING("What's this thing?")) - return - to_chat(user, SPAN_WARNING("You activate the hellhound beacon!")) - activate(user) - add_fingerprint(user) - if(iscarbon(user)) - var/mob/living/carbon/C = user - C.toggle_throw_mode(THROW_MODE_NORMAL) - ..() - -/obj/item/explosive/grenade/spawnergrenade/hellhound/activate(mob/user) - if(active) - return - - if(user) - msg_admin_attack("[key_name(user)] primed \a [src] in [get_area(user)] ([user.loc.x],[user.loc.y],[user.loc.z]).", user.loc.x, user.loc.y, user.loc.z) - icon_state = initial(icon_state) + "_active" - active = 1 - update_icon() - addtimer(CALLBACK(src, PROC_REF(prime), user), det_time) - -/obj/item/explosive/grenade/spawnergrenade/hellhound/prime(mob/user) - if(spawner_type && deliveryamt) - // Make a quick flash - var/turf/spawn_turf = get_turf(src) - if(ispath(spawner_type)) - var/mob/living/carbon/xenomorph/hellhound/hound = new spawner_type(spawn_turf) - var/datum/behavior_delegate/hellhound_base/hound_owner = hound.behavior_delegate - hound_owner.pred_owner = user - notify_ghosts(header = "Hellhound", message = "A hellhound has been called in [get_area(user)] by [user.real_name] click play as hellhound to play as one.", extra_large = TRUE) - return - -/obj/item/explosive/grenade/spawnergrenade/hellhound/check_eye(mob/user) - if (user.is_mob_incapacitated() || user.blinded ) - user.unset_interaction() - else if ( !current || get_turf(user) != activated_turf || src.loc != user ) //camera doesn't work, or we moved. - user.unset_interaction() - -/obj/item/explosive/grenade/spawnergrenade/hellhound/New() - . = ..() - - force = 20 - throwforce = 40 - -/obj/item/explosive/grenade/spawnergrenade/hellhound/on_set_interaction(mob/user) - ..() - user.reset_view(current) - -/obj/item/explosive/grenade/spawnergrenade/hellhound/on_unset_interaction(mob/user) - ..() - current = null - user.reset_view(null) - - // Hunting traps /obj/item/hunting_trap name = "hunting trap" @@ -975,9 +903,10 @@ GLOBAL_VAR_INIT(youngblood_timer_yautja, 0) /obj/item/hunting_trap/attack_self(mob/user as mob) ..() if(ishuman(user) && !user.stat && !user.is_mob_restrained()) - var/wait_time = 3 SECONDS if(!HAS_TRAIT(user, TRAIT_YAUTJA_TECH)) - wait_time = rand(5 SECONDS, 10 SECONDS) + to_chat(user, SPAN_WARNING("You don't know how to use this thing!")) + return + var/wait_time = 3 SECONDS if(!do_after(user, wait_time, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) return armed = TRUE @@ -1005,7 +934,7 @@ GLOBAL_VAR_INIT(youngblood_timer_yautja, 0) armed = FALSE anchored = TRUE - var/list/tether_effects = apply_tether(src, C, range = tether_range, resistable = TRUE) + var/list/tether_effects = apply_tether(src, C, range = tether_range, resistible = TRUE) tether_effect = tether_effects["tetherer_tether"] RegisterSignal(tether_effect, COMSIG_PARENT_QDELETING, PROC_REF(disarm)) @@ -1046,7 +975,7 @@ GLOBAL_VAR_INIT(youngblood_timer_yautja, 0) if(O == H) continue O.show_message(SPAN_WARNING("[icon2html(src, O)] [H] gets caught in \the [src]."), SHOW_MESSAGE_VISIBLE) - else if(isanimal(AM) && !istype(AM, /mob/living/simple_animal/parrot)) + else if(isanimal(AM) && !istype(AM, /mob/living/simple_animal/small/parrot)) armed = FALSE var/mob/living/simple_animal/SA = AM SA.health -= 20 @@ -1200,7 +1129,7 @@ GLOBAL_VAR_INIT(youngblood_timer_yautja, 0) return handle_dissolve(target, user) -///Checks for permission and items dissallowed to be dissolved. +///Checks for permission and items unallowed to be dissolved. /obj/item/tool/yautja_cleaner/proc/can_dissolve(obj/item/target, mob/user) if(!HAS_TRAIT(user, TRAIT_YAUTJA_TECH)) to_chat(user, SPAN_WARNING("You have no idea what this even does.")) @@ -1405,6 +1334,12 @@ GLOBAL_VAR_INIT(youngblood_timer_yautja, 0) desc = "Skull of a militant hive ruler, lord of destruction." icon_state = "king_skull" +/obj/item/skull/despoiler + name = "Despoiler skull" + desc = "Skull of a decrepit wretch, the surface still stinging your hands." + icon_state = "despoiler_skull" + + /obj/item/skull/lurker name = "Lurker skull" desc = "Skull of a stealthy xenomorph, a nocturnal entity." @@ -1507,6 +1442,11 @@ GLOBAL_VAR_INIT(youngblood_timer_yautja, 0) desc = "The pelt of a militant hive ruler, lord of destruction." icon_state = "king_pelt" +/obj/item/pelt/despoiler + name = "Despoiler pelt" + desc = "The pelt of a decrepit wretch, the surface still stinging your hands" + icon_state = "despoiler_pelt" + /obj/item/pelt/lurker name = "Lurker pelt" desc = "The pelt of a stealthy xenomorph, an ambushing predator." @@ -1687,7 +1627,7 @@ GLOBAL_VAR_INIT(youngblood_timer_yautja, 0) /obj/item/yautja/chain name = "metal chains" - desc = "the weld pattern tells you that these chains were made with heavy weights in mind, the sharp edge implies this was also made to pierce." + desc = "The weld pattern tells you that these chains were made with heavy weights in mind, the sharp edge implies this was also made to pierce." icon = 'icons/obj/items/hunter/pred_gear.dmi' icon_state = "metal_chain" item_state = "metal_chain" @@ -1703,7 +1643,7 @@ GLOBAL_VAR_INIT(youngblood_timer_yautja, 0) force = 1 throwforce = 1 unacidable = TRUE - var/obj/structure/machinery/computer/cameras/yautja/internal_camera + var/obj/structure/machinery/computer/cameras/internal/yautja/internal_camera /obj/item/device/houndcam/Initialize() . = ..() diff --git a/code/modules/cm_preds/yaut_machines.dm b/code/modules/cm_preds/yaut_machines.dm index 97a98140b9f6..71070e707f04 100644 --- a/code/modules/cm_preds/yaut_machines.dm +++ b/code/modules/cm_preds/yaut_machines.dm @@ -4,9 +4,8 @@ icon = 'icons/obj/structures/machinery/yautja_machines.dmi' icon_state = "globe" breakable = FALSE - - minimap_type = MINIMAP_FLAG_ALL - faction = FACTION_YAUTJA + minimap_flag = MINIMAP_FLAG_ALL + drawing = FALSE /obj/structure/machinery/autolathe/yautja name = "yautja autolathe" diff --git a/code/modules/cm_preds/yaut_mask.dm b/code/modules/cm_preds/yaut_mask.dm index 253cbdbcb3b8..3c38678fe276 100644 --- a/code/modules/cm_preds/yaut_mask.dm +++ b/code/modules/cm_preds/yaut_mask.dm @@ -315,7 +315,7 @@ /obj/item/clothing/accessory/mask name = "Mask Ornament" - desc = "An ornate addition to your mask" + desc = "An ornate addition to your mask." icon = 'icons/obj/items/hunter/pred_mask_accessories.dmi' accessory_icons = list(WEAR_FACE = 'icons/mob/humans/onmob/hunter/pred_mask_accessories.dmi') icon_state = null diff --git a/code/modules/cm_preds/yaut_procs.dm b/code/modules/cm_preds/yaut_procs.dm index 8dba362daf0a..74685832cffb 100644 --- a/code/modules/cm_preds/yaut_procs.dm +++ b/code/modules/cm_preds/yaut_procs.dm @@ -64,7 +64,7 @@ playsound(T.loc, 'sound/items/pred_bracer.ogg', 75, 1) //Update the power display thing. This is called in Life() -/mob/living/carbon/human/proc/update_power_display(perc) +/mob/living/carbon/human/proc/update_power_display(perc, material) if(hud_used?.pred_power_icon) switch(perc) if(91 to INFINITY) @@ -87,6 +87,8 @@ hud_used.pred_power_icon.icon_state = "powerbar20" else hud_used.pred_power_icon.icon_state = "powerbar10" + if(material) + hud_used.pred_power_icon.icon_state = hud_used.pred_power_icon.icon_state + "_" + material /mob/living/carbon/human/proc/butcher() set category = "Yautja.Misc" @@ -270,6 +272,7 @@ //music = "signal" ambience_exterior = AMBIENCE_YAUTJA ceiling = CEILING_METAL + powernet_name = "yautja_ship" requires_power = FALSE base_lighting_alpha = 155 base_lighting_color = "#ffc49c" diff --git a/code/modules/cm_preds/yaut_shield.dm b/code/modules/cm_preds/yaut_shield.dm deleted file mode 100644 index 9e05b2010ca7..000000000000 --- a/code/modules/cm_preds/yaut_shield.dm +++ /dev/null @@ -1,75 +0,0 @@ -/obj/item/weapon/shield/riot/yautja - name = "clan shield" - desc = "A large tribal shield made of a strange metal alloy. The face of the shield bears three skulls, two human, one alien." - icon = 'icons/obj/items/hunter/pred_gear.dmi' - icon_state = "shield" - base_icon_state = "shield" - item_icons = list( - WEAR_L_HAND = 'icons/mob/humans/onmob/hunter/items_lefthand.dmi', - WEAR_R_HAND = 'icons/mob/humans/onmob/hunter/items_righthand.dmi', - WEAR_BACK = 'icons/mob/humans/onmob/hunter/pred_gear.dmi' - ) - item_state = "shield" - flags_item = ITEM_PREDATOR - flags_equip_slot = SLOT_BACK - - passive_block = 15 - readied_block = 30 - - blocks_on_back = FALSE - - var/last_attack = 0 - var/cooldown_time = 25 SECONDS - -/obj/item/weapon/shield/riot/yautja/raise_shield(mob/user) - ..() - item_state = "[base_icon_state]_ready" - if(user.r_hand == src) - user.update_inv_r_hand() - if(user.l_hand == src) - user.update_inv_l_hand() - -/obj/item/weapon/shield/riot/yautja/lower_shield(mob/user) - ..() - item_state = base_icon_state - if(user.r_hand == src) - user.update_inv_r_hand() - if(user.l_hand == src) - user.update_inv_l_hand() - -/obj/item/weapon/shield/riot/yautja/attack(mob/living/M, mob/living/user) - . = ..() - if(. && (world.time > last_attack + cooldown_time)) - last_attack = world.time - M.throw_atom(get_step(M, user.dir), 1, SPEED_AVERAGE, user, FALSE) - M.apply_effect(3, DAZE) - M.apply_effect(5, SLOW) - -/obj/item/weapon/shield/riot/yautja/attackby(obj/item/attacking_item, mob/user) - if(cooldown < world.time - 25) - if(istype(attacking_item, /obj/item/weapon) && (attacking_item.flags_item & ITEM_PREDATOR)) - user.visible_message(SPAN_WARNING("[user] bashes [src] with [attacking_item]!")) - playsound(user.loc, 'sound/effects/shieldbash.ogg', 25, 1) - cooldown = world.time - else - ..() - -/obj/item/weapon/shield/riot/yautja/ancient - name = "ancient shield" - desc = "A large, ancient shield forged from an unknown golden alloy, gleaming with a luminous brilliance. Its worn surface and masterful craftsmanship hint at a forgotten purpose and a history lost to time." - icon = 'icons/obj/items/weapons/melee/shields.dmi' - icon_state = "ancient_shield" - base_icon_state = "ancient_shield" - item_icons = list( - WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/weapons/melee/shields_lefthand.dmi', - WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/weapons/melee/shields_righthand.dmi', - WEAR_BACK = 'icons/mob/humans/onmob/hunter/pred_gear.dmi' - ) - item_state = "ancient_shield" - -/obj/item/weapon/shield/riot/yautja/ancient/alt - name = "ancient shield" - desc = "A large, ornately crafted shield forged from an unknown alloy. The colossal metal skull of a Xenomorph dominates the center, its jagged edges and hollow eyes giving it a fearsome presence. The masterful craftsmanship and weathered battle scars whisper of long-forgotten hunts and a legacy etched in blood." - icon_state = "ancient_shield_alt" - base_icon_state = "ancient_shield_alt" - item_state = "ancient_shield_alt" diff --git a/code/modules/cm_preds/yaut_weapons.dm b/code/modules/cm_preds/yaut_weapons.dm index ba79c7ba42cb..afc2acf70605 100644 --- a/code/modules/cm_preds/yaut_weapons.dm +++ b/code/modules/cm_preds/yaut_weapons.dm @@ -60,7 +60,7 @@ w_class = SIZE_HUGE edge = TRUE sharp = IS_SHARP_ITEM_ACCURATE - flags_item = NOSHIELD|NODROP|ITEM_PREDATOR|ADJACENT_CLICK_DELAY + flags_item = NODROP|ITEM_PREDATOR|ADJACENT_CLICK_DELAY flags_equip_slot = NO_FLAGS hitsound = 'sound/weapons/wristblades_hit.ogg' attack_speed = 6 @@ -68,6 +68,8 @@ pry_capable = IS_PRY_CAPABLE_FORCE attack_verb = list("sliced", "slashed", "jabbed", "torn", "gored") + shield_sound = 'sound/items/parry.ogg' + var/speed_bonus_amount /obj/item/weapon/bracer_attachment/equipped(mob/user, slot) @@ -120,7 +122,7 @@ /obj/item/weapon/bracer_attachment/chain_gauntlets name = "chain gauntlets" plural_name = "wrist blades" - desc = "gauntlets made out of alien alloy, chains wrapped around it imply this was made for hand to hand combat, with some range." + desc = "Gauntlets made out of alien alloy, chains wrapped around it imply this was made for hand to hand combat, with some range." icon_state = "metal_gauntlet" hitsound = null item_state = "gauntlet" @@ -144,7 +146,7 @@ . += "Stack up your combo meter by using [SPAN_RED("HARM")] intent, you can then use these combo stacks on different intents to do different finishers." . += "Finish your combo on [SPAN_GREEN("HELP")] intent to slam the target to the ground, incapacitating them for a few seconds, if the target is a xenomorph you do extra damage as well." . += "Finish your combo on [SPAN_BLUE("SHOVE")] intent to throw the target away from you, if you have some chains wrapped around the gauntlet, you'll pull them back towards you. If you are using the special ability, the throw range will be further." - . += "Finish your combo on [SPAN_ORANGE("GRAB")] intent to do an execution that instantly kills your target, they must already be unconcious or in critical state." + . += "Finish your combo on [SPAN_ORANGE("GRAB")] intent to do an execution that instantly kills your target, they must already be unconscious or in critical state." /obj/item/weapon/bracer_attachment/chain_gauntlets/attack(mob/living/carbon/target, mob/living/carbon/human/user) . = ..() @@ -168,7 +170,7 @@ if(combo_counter >= 4 && target != user) var/facing = get_dir(user, target) var/reverse_facing = get_dir(target, user) - if(has_chain) // Generating the chain for the effect, its a bullet so it looks like youre "throwing it / it looks like its travelling" + if(has_chain) // Generating the chain for the effect, its a bullet so it looks like you're "throwing it / it looks like its travelling" var/obj/projectile/hook_projectile = new /obj/projectile(user.loc, create_cause_data("hook"), user) var/datum/ammo/ammoDatum = GLOB.ammo_list[/datum/ammo/yautja/gauntlet_hook] hook_projectile.generate_bullet(ammoDatum, bullet_generator = user) @@ -210,7 +212,7 @@ playsound(target, 'sound/effects/bang.ogg', 25, 0) playsound(target,"slam", 50, 1) animate(target, pixel_y = 0, time = 4, easing = BOUNCE_EASING) - sleep(10) // This is so people dont spam click and lineup 300 executions, i know its probably not the best way to do it. + sleep(10) // This is so people don't spam click and lineup 300 executions, i know its probably not the best way to do it. executing = FALSE if((INTENT_HARM)) // This is how you farm combo counters, so there's no special interaction. @@ -360,12 +362,18 @@ icon = 'icons/obj/items/hunter/pred_gear.dmi' item_icons = list( WEAR_BACK = 'icons/mob/humans/onmob/hunter/pred_gear.dmi', + WEAR_J_STORE = 'icons/mob/humans/onmob/hunter/pred_gear.dmi', WEAR_L_HAND = 'icons/mob/humans/onmob/hunter/items_lefthand.dmi', WEAR_R_HAND = 'icons/mob/humans/onmob/hunter/items_righthand.dmi' ) flags_item = ITEM_PREDATOR|ADJACENT_CLICK_DELAY var/human_adapted = FALSE + shield_type = SHIELD_DIRECTIONAL + shield_chance = SHIELD_CHANCE_LOW + shield_sound = 'sound/items/parry.ogg' + shield_flags = CAN_SHIELD_BASH + /obj/item/weapon/yautja/chain name = "chainwhip" desc = "A segmented, lightweight whip made of durable, acid-resistant metal. Not very common among Yautja Hunters, but still a dangerous weapon capable of shredding prey." @@ -384,6 +392,8 @@ attack_speed = 0.8 SECONDS hitsound = 'sound/weapons/chain_whip.ogg' + shield_type = SHIELD_NONE + shield_chance = SHIELD_CHANCE_NONE /obj/item/weapon/yautja/chain/attack(mob/target, mob/living/user) . = ..() @@ -408,6 +418,8 @@ attack_speed = 1 SECONDS unacidable = TRUE + shield_chance = SHIELD_CHANCE_MED + /obj/item/weapon/yautja/sword/alt_1 name = "rending sword" desc = "An expertly crafted Yautja blade carried by hunters who wish to fight up close. Razor sharp and capable of cutting flesh into ribbons. Commonly carried by aggressive and lethal hunters." @@ -448,6 +460,7 @@ hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") unacidable = TRUE + shield_flags = CAN_BLOCK_POUNCE|CAN_SHIELD_BASH /obj/item/weapon/yautja/scythe/attack(mob/living/target as mob, mob/living/carbon/human/user as mob) . = ..() @@ -466,11 +479,14 @@ icon_state = "predscythe_alt" item_state = "scythe_dual" + shield_chance = SHIELD_CHANCE_MED + /obj/item/weapon/yautja/sword/staff name = "cruel staff" desc = "A wicked and battered staff wrapped in worn crimson rags. A crescent shaped blade adorns the top, while the bottom is rounded and blunt." icon_state = "staff" item_state = "staff" + shield_flags = CAN_BLOCK_POUNCE|CAN_SHIELD_BASH //A little gift for the staff, not that it makes much difference for Yautja themselves. //Combistick /obj/item/weapon/yautja/chained/combistick @@ -492,6 +508,13 @@ hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("speared", "stabbed", "impaled") + shield_type = SHIELD_DIRECTIONAL_TWOHANDS + shield_chance = SHIELD_CHANCE_HIGH + shield_projectile_mult = PROJECTILE_BLOCK_PERC_40 + shield_flags = CAN_BLOCK_POUNCE|CAN_SHIELD_BASH + ///The stored chance for when unfolded. + var/active_shield_chance = SHIELD_CHANCE_HIGH + var/force_wielded = MELEE_FORCE_TIER_6 var/force_unwielded = MELEE_FORCE_TIER_2 var/force_storage = MELEE_FORCE_TIER_1 @@ -528,7 +551,7 @@ add_verb(user, /mob/living/carbon/human/proc/call_combi) linked_to = user - var/list/tether_effects = apply_tether(user, src, range = 6, resistable = FALSE) + var/list/tether_effects = apply_tether(user, src, range = 6, resistible = FALSE) chain = tether_effects["tetherer_tether"] RegisterSignal(chain, COMSIG_PARENT_QDELETING, PROC_REF(cleanup_chain)) RegisterSignal(src, COMSIG_ITEM_PICKUP, PROC_REF(on_pickup)) @@ -588,9 +611,6 @@ user.visible_message(SPAN_WARNING("[user] yanks [src]'s chain back, letting [src] fall at [user.p_their()]!"), SPAN_WARNING("You yank [src]'s chain back, letting it drop at your feet!")) cleanup_chain() -/obj/item/weapon/yautja/chained/combistick/IsShield() - return on - /obj/item/weapon/yautja/chained/combistick/verb/fold_combistick() set category = "Weapons" set name = "Collapse Combi-stick" @@ -652,6 +672,7 @@ overlays.Cut() add_blood(blood_color) on = TRUE + shield_chance = active_shield_chance update_icon() else unwield(user) @@ -666,6 +687,7 @@ attack_verb = list("thwacked", "smacked") overlays.Cut() on = FALSE + shield_chance = SHIELD_CHANCE_NONE update_icon() if(istype(user,/mob/living/carbon/human)) @@ -710,8 +732,8 @@ if(isyautja(hit_atom)) var/mob/living/carbon/human/human = hit_atom if(human.put_in_hands(src)) - hit_atom.visible_message(SPAN_NOTICE(" [hit_atom] expertly catches [src] out of the air. "), - SPAN_NOTICE(" You easily catch [src]. ")) + hit_atom.visible_message(SPAN_NOTICE("[hit_atom] expertly catches [src] out of the air."), + SPAN_NOTICE("You easily catch [src].")) return ..() @@ -734,6 +756,8 @@ hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("slashed", "chopped", "diced") + shield_chance = SHIELD_CHANCE_VLOW + /obj/item/weapon/yautja/knife name = "ceremonial dagger" desc = "A viciously sharp dagger inscribed with ancient Yautja markings. Smells thickly of blood. Carried by some hunters." @@ -753,6 +777,9 @@ actions_types = list(/datum/action/item_action/toggle/use) unacidable = TRUE + shield_chance = SHIELD_CHANCE_NONE + shield_type = SHIELD_NONE + /obj/item/weapon/yautja/knife/attack(mob/living/target, mob/living/carbon/human/user) if(target.stat != DEAD) return ..() @@ -942,6 +969,85 @@ to_chat(user, SPAN_WARNING("You finish flaying [current_limb].")) current_limb.flayed = TRUE +/obj/item/weapon/shield/riot/yautja + name = "clan shield" + desc = "A large tribal shield made of a strange metal alloy. The face of the shield bears three skulls, two human, one alien." + icon = 'icons/obj/items/hunter/pred_gear.dmi' + icon_state = "shield" + base_icon_state = "shield" + item_icons = list( + WEAR_L_HAND = 'icons/mob/humans/onmob/hunter/items_lefthand.dmi', + WEAR_R_HAND = 'icons/mob/humans/onmob/hunter/items_righthand.dmi', + WEAR_BACK = 'icons/mob/humans/onmob/hunter/pred_gear.dmi' + ) + item_state = "shield" + flags_item = ITEM_PREDATOR + flags_equip_slot = SLOT_BACK + + shield_type = SHIELD_DIRECTIONAL + readied_block = SHIELD_CHANCE_VHIGH + passive_block = SHIELD_CHANCE_MED + + blocks_on_back = FALSE + + COOLDOWN_DECLARE(attack_cooldown) + var/cooldown_time = 25 SECONDS + +/obj/item/weapon/shield/riot/yautja/raise_shield(mob/user) + ..() + item_state = "[base_icon_state]_ready" + if(user.r_hand == src) + user.update_inv_r_hand() + if(user.l_hand == src) + user.update_inv_l_hand() + +/obj/item/weapon/shield/riot/yautja/lower_shield(mob/user) + ..() + item_state = base_icon_state + if(user.r_hand == src) + user.update_inv_r_hand() + if(user.l_hand == src) + user.update_inv_l_hand() + +/obj/item/weapon/shield/riot/yautja/attack(mob/living/target, mob/living/user) + . = ..() + if(. && (COOLDOWN_FINISHED(src, attack_cooldown))) + COOLDOWN_START(src, attack_cooldown, cooldown_time) + target.throw_atom(get_step(target, user.dir), 1, SPEED_AVERAGE, user, FALSE) + target.apply_effect(3, DAZE) + target.apply_effect(5, SLOW) + + +/obj/item/weapon/shield/riot/yautja/ancient + name = "ancient shield" + desc = "A large, ancient shield forged from an unknown golden alloy, gleaming with a luminous brilliance. Its worn surface and masterful craftsmanship hint at a forgotten purpose and a history lost to time." + icon = 'icons/obj/items/weapons/melee/shields.dmi' + icon_state = "ancient_shield" + base_icon_state = "ancient_shield" + item_icons = list( + WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/weapons/melee/shields_lefthand.dmi', + WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/weapons/melee/shields_righthand.dmi', + WEAR_BACK = 'icons/mob/humans/onmob/hunter/pred_gear.dmi' + ) + item_state = "ancient_shield" + +/obj/item/weapon/shield/riot/yautja/ancient/alt + name = "ancient shield" + desc = "A large, ornately crafted shield forged from an unknown alloy. The colossal metal skull of a Xenomorph dominates the center, its jagged edges and hollow eyes giving it a fearsome presence. The masterful craftsmanship and weathered battle scars whisper of long-forgotten hunts and a legacy etched in blood." + icon_state = "ancient_shield_alt" + base_icon_state = "ancient_shield_alt" + item_state = "ancient_shield_alt" + +/obj/item/weapon/shield/riot/yautja/bracer_shield + name = "bracer shield" + desc = "A shield made of concentric metal alloy plates. The plates fold into one another for compact storage while still providing superior protection." + icon = 'icons/obj/items/hunter/pred_gear.dmi' + icon_state = "bracer_shield" + base_icon_state = "bracer_shield" + item_state = "bracer_shield" + flags_equip_slot = NO_FLAGS + flags_item = NODROP|ITEM_PREDATOR + /*######################################### ########### Two Handed Weapons ############ #########################################*/ @@ -949,17 +1055,19 @@ icon = 'icons/obj/items/hunter/pred_gear.dmi' item_icons = list( WEAR_BACK = 'icons/mob/humans/onmob/hunter/pred_gear.dmi', + WEAR_J_STORE = 'icons/mob/humans/onmob/hunter/pred_gear.dmi', WEAR_L_HAND = 'icons/mob/humans/onmob/hunter/items_lefthand.dmi', WEAR_R_HAND = 'icons/mob/humans/onmob/hunter/items_righthand.dmi' ) - flags_item = NOSHIELD|TWOHANDED|ITEM_PREDATOR|ADJACENT_CLICK_DELAY + flags_item = UNBLOCKABLE|TWOHANDED|ITEM_PREDATOR|ADJACENT_CLICK_DELAY unacidable = TRUE flags_equip_slot = SLOT_BACK w_class = SIZE_LARGE throw_speed = SPEED_VERY_FAST edge = TRUE hitsound = 'sound/weapons/bladeslice.ogg' + shield_flags = CAN_SHIELD_BASH var/human_adapted = FALSE /obj/item/weapon/twohanded/yautja/spear @@ -967,11 +1075,12 @@ desc = "A spear of exquisite design, used by an ancient civilisation." icon_state = "spearhunter" item_state = "spearhunter" - flags_item = NOSHIELD|TWOHANDED|ADJACENT_CLICK_DELAY + flags_item = TWOHANDED|ADJACENT_CLICK_DELAY force = MELEE_FORCE_TIER_3 force_wielded = MELEE_FORCE_TIER_7 sharp = IS_SHARP_ITEM_SIMPLE attack_verb = list("attacked", "stabbed", "jabbed", "torn", "gored") + shield_sound = 'sound/items/block_shield.ogg' var/busy_fishing = FALSE var/common_weight = 60 @@ -988,7 +1097,7 @@ busy_fishing = TRUE user.visible_message(SPAN_NOTICE("[user] starts aiming \the [src] at the water..."), SPAN_NOTICE("You prepare to catch something in the water..."), max_distance = 3) if(do_after(user, 5 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) - if(prob(60)) // fishing rods are prefered + if(prob(60)) // fishing rods are preferred busy_fishing = FALSE to_chat(user, SPAN_WARNING("You fail to catch anything!")) return @@ -1032,9 +1141,9 @@ flags_atom = FPRINT|QUICK_DRAWABLE|CONDUCT attack_verb = list("sliced", "slashed", "carved", "diced", "gored") attack_speed = 14 //Default is 7. + shield_flags = CAN_BLOCK_POUNCE|CAN_SHIELD_BASH var/skull_attached = FALSE - /obj/item/weapon/twohanded/yautja/glaive/attack(mob/living/target, mob/living/carbon/human/user) . = ..() if(!.) @@ -1087,7 +1196,7 @@ throwforce = MELEE_FORCE_WEAK icon_state = "glaive_alt" item_state = "glaive_alt" - flags_item = NOSHIELD|TWOHANDED|ADJACENT_CLICK_DELAY + flags_item = TWOHANDED|ADJACENT_CLICK_DELAY /obj/item/weapon/twohanded/yautja/glaive/longaxe name = "longaxe" @@ -1115,6 +1224,8 @@ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") attack_speed = 9 + shield_chance = SHIELD_CHANCE_VLOW + /obj/item/weapon/yautja/duelclub name = "duelling club" desc = "A crude metal club adorned with a skull. Used as a non-lethal training weapon for young yautja honing their combat skills." @@ -1131,6 +1242,9 @@ attack_verb = list("smashed", "beaten", "slammed", "struck", "smashed", "battered", "cracked") hitsound = 'sound/weapons/genhit3.ogg' + shield_chance = SHIELD_CHANCE_VLOW + shield_sound = 'sound/items/block_shield.ogg' + /obj/item/weapon/yautja/duelaxe name = "duelling hatchet" desc = "A short ceremonial duelling hatchet. Designed for ritual combat or settling disputes among Yautja. It features a keen edge capable of cleaving flesh or bone. Though smaller than traditional Yautja weapons." @@ -1148,6 +1262,8 @@ attack_verb = list("chopped", "torn", "cut") hitsound = 'sound/weapons/bladeslice.ogg' + shield_chance = SHIELD_CHANCE_VLOW + /obj/item/weapon/yautja/duelknife name = "duelling knife" desc = "A length of leather-bound wood studded with razor-sharp teeth. How crude." @@ -1162,6 +1278,9 @@ edge = 1 attack_speed = 12 + shield_chance = SHIELD_CHANCE_NONE + shield_type = SHIELD_NONE + /*######################################### ############## Ranged Weapons ############# #########################################*/ @@ -1172,13 +1291,14 @@ name = "spike launcher" desc = "A compact Yautja device in the shape of a crescent. It can rapidly fire damaging spikes and automatically recharges." - icon = 'icons/obj/items/hunter/pred_gear.dmi' + icon = 'icons/obj/items/weapons/guns/guns_by_faction/pred.dmi' icon_state = "spikelauncher" item_state = "spikelauncher" item_icons = list( - WEAR_BACK = 'icons/mob/humans/onmob/hunter/pred_gear.dmi', - WEAR_L_HAND = 'icons/mob/humans/onmob/hunter/items_lefthand.dmi', - WEAR_R_HAND = 'icons/mob/humans/onmob/hunter/items_righthand.dmi' + WEAR_BACK = 'icons/mob/humans/onmob/clothing/back/guns_by_type/pred_guns.dmi', + WEAR_J_STORE = 'icons/mob/humans/onmob/clothing/back/guns_by_type/pred_guns.dmi', + WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/weapons/guns/pred_guns_lefthand.dmi', + WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/weapons/guns/pred_guns_righthand.dmi' ) muzzle_flash = null // TO DO, add a decent one. @@ -1208,7 +1328,7 @@ verbs -= /obj/item/weapon/gun/verb/field_strip verbs -= /obj/item/weapon/gun/verb/use_toggle_burst verbs -= /obj/item/weapon/gun/verb/empty_mag - verbs -= /obj/item/weapon/gun/verb/use_unique_action + verbs -= /obj/item/verb/use_unique_action /obj/item/weapon/gun/launcher/spike/set_gun_config_values() ..() @@ -1267,20 +1387,21 @@ return TRUE /obj/item/weapon/gun/energy/yautja - icon = 'icons/obj/items/hunter/pred_gear.dmi' + icon = 'icons/obj/items/weapons/guns/guns_by_faction/pred.dmi' icon_state = null works_in_recharger = FALSE muzzle_flash = "muzzle_flash_blue" muzzle_flash_color = COLOR_MAGENTA item_icons = list( - WEAR_BACK = 'icons/mob/humans/onmob/hunter/pred_gear.dmi', - WEAR_L_HAND = 'icons/mob/humans/onmob/hunter/items_lefthand.dmi', - WEAR_R_HAND = 'icons/mob/humans/onmob/hunter/items_righthand.dmi' + WEAR_BACK = 'icons/mob/humans/onmob/clothing/back/guns_by_type/pred_guns.dmi', + WEAR_J_STORE = 'icons/mob/humans/onmob/clothing/back/guns_by_type/pred_guns.dmi', + WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/weapons/guns/pred_guns_lefthand.dmi', + WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/weapons/guns/pred_guns_righthand.dmi' ) /obj/item/weapon/gun/energy/yautja/plasmarifle name = "plasma rifle" - desc = "A long-barreled heavy plasma weapon. Intended for combat, not hunting. Has an integrated battery that allows for a functionally unlimited amount of shots to be discharged. Equipped with an internal gyroscopic stabilizer allowing its operator to fire the weapon one-handed if desired" + desc = "A long-barreled heavy plasma weapon. Intended for combat, not hunting. Has an integrated battery that allows for a functionally unlimited amount of shots to be discharged. Equipped with an internal gyroscopic stabilizer allowing its operator to fire the weapon one-handed if desired." icon_state = "plasmarifle" item_state = "plasmarifle" unacidable = TRUE @@ -1289,6 +1410,8 @@ zoomdevicename = "scope" flags_equip_slot = SLOT_BACK w_class = SIZE_HUGE + pixel_x = -2 + hud_offset = -2 var/charge_time = 0 var/last_regen = 0 flags_gun_features = GUN_UNUSUAL_DESIGN @@ -1303,7 +1426,7 @@ verbs -= /obj/item/weapon/gun/verb/field_strip verbs -= /obj/item/weapon/gun/verb/use_toggle_burst verbs -= /obj/item/weapon/gun/verb/empty_mag - verbs -= /obj/item/weapon/gun/verb/use_unique_action + verbs -= /obj/item/verb/use_unique_action /obj/item/weapon/gun/energy/yautja/plasmarifle/process() if(charge_time < 100) @@ -1313,7 +1436,6 @@ to_chat(loc, SPAN_NOTICE("[src] hums as it achieves maximum charge.")) update_icon() - /obj/item/weapon/gun/energy/yautja/plasmarifle/set_gun_config_values() ..() set_fire_delay(FIRE_DELAY_TIER_4*2) @@ -1323,7 +1445,6 @@ scatter_unwielded = SCATTER_AMOUNT_TIER_6 damage_mult = BASE_BULLET_DAMAGE_MULT - /obj/item/weapon/gun/energy/yautja/plasmarifle/get_examine_text(mob/user) if(isyautja(user)) . = ..() @@ -1332,12 +1453,6 @@ . = list() . += SPAN_NOTICE("This thing looks like an alien rifle of some kind. Strange.") -/obj/item/weapon/gun/energy/yautja/plasmarifle/update_icon() - if(last_regen < charge_time + 20 || last_regen > charge_time || charge_time > 95) - var/new_icon_state = charge_time <=15 ? null : icon_state + "[round(charge_time/33, 1)]" - update_special_overlay(new_icon_state) - last_regen = charge_time - /obj/item/weapon/gun/energy/yautja/plasmarifle/able_to_fire(mob/user) if(!HAS_TRAIT(user, TRAIT_YAUTJA_TECH)) to_chat(user, SPAN_WARNING("You have no idea how this thing works!")) @@ -1497,16 +1612,13 @@ icon_state = "plasma_ebony" var/base_icon_state = "plasma" var/base_item_state = "plasma_wear" + icon = 'icons/obj/items/hunter/pred_gear.dmi' item_icons = list( - WEAR_BACK = 'icons/mob/humans/onmob/hunter/pred_gear.dmi', - WEAR_J_STORE = 'icons/mob/humans/onmob/hunter/pred_gear.dmi', + WEAR_BACK = 'icons/mob/humans/onmob/hunter/suit_storage.dmi', + WEAR_J_STORE = 'icons/mob/humans/onmob/hunter/suit_storage.dmi', WEAR_L_HAND = 'icons/mob/humans/onmob/hunter/items_lefthand.dmi', WEAR_R_HAND = 'icons/mob/humans/onmob/hunter/items_righthand.dmi' ) - item_state_slots = list( - WEAR_BACK = "plasma_wear_off", - WEAR_J_STORE = "plasma_wear_off" - ) fire_sound = 'sound/weapons/pred_plasmacaster_fire.ogg' ammo = /datum/ammo/energy/yautja/caster/bolt/single_stun muzzle_flash = "muzzle_flash_blue" @@ -1530,8 +1642,6 @@ /obj/item/weapon/gun/energy/yautja/plasma_caster/Initialize(mapload, spawn_empty, caster_material = "ebony") icon_state = "[base_icon_state]_[caster_material]" item_state = "[base_item_state]_[caster_material]" - item_state_slots[WEAR_BACK] = "[base_item_state]_off_[caster_material]" - item_state_slots[WEAR_J_STORE] = "[base_item_state]_off_[caster_material]" . = ..() source = loc verbs -= /obj/item/weapon/gun/verb/field_strip @@ -1593,7 +1703,7 @@ switch(mode) if("stun") mode = "lethal" - to_chat(usr, SPAN_YAUTJABOLD("[src.source] beeps: [src] is now set to [mode] mode")) + to_chat(usr, SPAN_YAUTJABOLD("[src.source] beeps: [src] is now set to [mode] mode.")) strength = "plasma bolt" charge_cost = 100 set_fire_delay(FIRE_DELAY_TIER_6 * 3) @@ -1603,7 +1713,7 @@ if("lethal") mode = "stun" - to_chat(usr, SPAN_YAUTJABOLD("[src.source] beeps: [src] is now set to [mode] mode")) + to_chat(usr, SPAN_YAUTJABOLD("[src.source] beeps: [src] is now set to [mode] mode.")) strength = "stun bolts" charge_cost = 30 set_fire_delay(FIRE_DELAY_TIER_6) @@ -1666,7 +1776,7 @@ /obj/item/weapon/gun/bow name = "hunting bow" - desc = "An abnormal-sized weapon with an exeptionally tight string. Requires extraordinary strength to draw." + desc = "An abnormal-sized weapon with an exceptionally tight string. Requires extraordinary strength to draw." icon = 'icons/obj/items/hunter/pred_gear.dmi' icon_state = "bow" item_state = "bow" @@ -1821,7 +1931,6 @@ ammo_datum = /datum/ammo/arrow/expl to_chat(user, SPAN_NOTICE("You activate [src].")) - /obj/item/storage/belt/gun/quiver name = "quiver strap" desc = "A strap that can hold a bow with a quiver for arrows." @@ -1829,10 +1938,11 @@ max_storage_space = 20 icon_state = "quiver" item_state = "s_marinebelt" - flags_equip_slot = SLOT_WAIST|SLOT_SUIT_STORE + flags_equip_slot = SLOT_WAIST|SLOT_SUIT_STORE|SLOT_BACK // it's a quiver, quivers go on your back max_w_class = SIZE_LARGE icon = 'icons/obj/items/hunter/pred_gear.dmi' item_icons = list( + WEAR_BACK = 'icons/mob/humans/onmob/hunter/pred_gear.dmi', WEAR_WAIST = 'icons/mob/humans/onmob/hunter/pred_gear.dmi', WEAR_J_STORE = 'icons/mob/humans/onmob/hunter/pred_gear.dmi' ) @@ -1842,25 +1952,12 @@ ) explo_proof = TRUE unacidable = TRUE - skip_fullness_overlays = TRUE /obj/item/storage/belt/gun/quiver/full/fill_preset_inventory() handle_item_insertion(new /obj/item/weapon/gun/bow()) for(var/i = 1 to storage_slots - 1) new /obj/item/arrow(src) -/obj/item/storage/belt/gun/quiver/update_icon() - overlays.Cut() - if(content_watchers && flap) - icon_state = "quiver_open" - return - var/magazines = length(contents) - length(holstered_guns) - if(!magazines) - icon_state = "quiver_open" - return - icon_state = "quiver" - - #undef FLAY_STAGE_SCALP #undef FLAY_STAGE_STRIP #undef FLAY_STAGE_SKIN diff --git a/code/modules/cm_tech/hologram.dm b/code/modules/cm_tech/hologram.dm index 96df90c481fd..8702f25619aa 100644 --- a/code/modules/cm_tech/hologram.dm +++ b/code/modules/cm_tech/hologram.dm @@ -2,7 +2,7 @@ GLOBAL_LIST_EMPTY_TYPED(hologram_list, /mob/hologram) /mob/hologram name = "Hologram" - desc = "It seems to be a visual projection of someone" //jinkies! + desc = "It seems to be a visual projection of someone." //jinkies! icon = 'icons/mob/mob.dmi' icon_state = "hologram" blinded = FALSE @@ -73,7 +73,7 @@ GLOBAL_LIST_EMPTY_TYPED(hologram_list, /mob/hologram) if(M.client) M.client.perspective = EYE_PERSPECTIVE - M.client.eye = src + M.client.set_eye(src) return COMPONENT_OVERRIDE_VIEW @@ -123,6 +123,7 @@ GLOBAL_LIST_EMPTY_TYPED(hologram_list, /mob/hologram) /mob/hologram/look_up flags_atom = NO_ZFALL var/view_registered = TRUE + var/list/view_blocker_images = list() /mob/hologram/look_up/Initialize(mapload, mob/viewer) . = ..() @@ -130,15 +131,46 @@ GLOBAL_LIST_EMPTY_TYPED(hologram_list, /mob/hologram) if(viewer) UnregisterSignal(viewer, COMSIG_CLIENT_MOB_MOVE) RegisterSignal(viewer, COMSIG_MOVABLE_MOVED, PROC_REF(handle_move)) + RegisterSignal(viewer, COMSIG_MOB_GHOSTIZE, PROC_REF(end_lookup)) + update_view_blockers(viewer) /mob/hologram/look_up/Destroy() if(linked_mob) UnregisterSignal(linked_mob, COMSIG_MOVABLE_MOVED) + if(istype(linked_mob, /mob/living)) + var/mob/living/linked_living = linked_mob + linked_living.observed_atom = null + if(linked_mob.client) + linked_mob.client.images -= view_blocker_images + view_blocker_images.Cut() . = ..() -/mob/hologram/look_up/handle_move(mob/M, oldLoc, direct) +/mob/hologram/look_up/proc/update_view_blockers(mob/user) + if(!user || !user.client) + return + + user.client.images -= view_blocker_images + view_blocker_images.Cut() + var/list/turf/visible_turfs = alist() + + for(var/turf/cur_turf in view(world.view + 1, user)) + visible_turfs["[cur_turf.x]-[cur_turf.y]"] = TRUE + + for(var/x in user.x - world.view - 1 to user.x + world.view + 1) + for(var/y in user.y - world.view - 1 to user.y + world.view + 1) + if(visible_turfs["[x]-[y]"]) + continue + + var/turf/cur_turf = locate(x, y, user.z + 1) + + if(istransparentturf(cur_turf)) + var/image/view_blocker = image('icons/turf/floors/floors.dmi', cur_turf, "full_black", 100000) + view_blocker.plane = GAME_PLANE + view_blocker_images += view_blocker + user.client.images += view_blocker +/mob/hologram/look_up/handle_move(mob/M, oldLoc, direct) if(!isturf(M.loc) || HAS_TRAIT(src, TRAIT_ABILITY_BURROWED)) qdel(src) return @@ -146,6 +178,8 @@ GLOBAL_LIST_EMPTY_TYPED(hologram_list, /mob/hologram) if(isturf(M.loc) && isturf(oldLoc)) var/turf/mob_turf = M.loc var/turf/old_mob_turf = oldLoc + if(!direct) + direct = get_dir(old_mob_turf, mob_turf) if(mob_turf.z != old_mob_turf.z) qdel(src) return @@ -158,10 +192,13 @@ GLOBAL_LIST_EMPTY_TYPED(hologram_list, /mob/hologram) view_registered = FALSE linked_mob.reset_view() else if (!view_registered) - RegisterSignal(linked_mob, COMSIG_MOB_RESET_VIEW, PROC_REF(handle_view)) + RegisterSignal(linked_mob, COMSIG_MOB_RESET_VIEW, PROC_REF(end_lookup)) view_registered = TRUE linked_mob.reset_view() + if(linked_mob) + update_view_blockers(linked_mob) + /mob/hologram/look_up/movement_delay() if(linked_mob) return linked_mob.movement_delay() @@ -171,9 +208,13 @@ GLOBAL_LIST_EMPTY_TYPED(hologram_list, /mob/hologram) /mob/hologram/look_up/handle_view(mob/M, atom/target) if(M.client) M.client.perspective = EYE_PERSPECTIVE - M.client.eye = src + M.client.set_eye(src) return COMPONENT_OVERRIDE_VIEW /mob/hologram/look_up/take_damage(mob/M, damage, damagetype) return //no cancelation of looking up by taking damage + +/mob/hologram/look_up/proc/end_lookup() + SIGNAL_HANDLER + qdel(src) diff --git a/code/modules/cm_tech/implements/adv_weapon.dm b/code/modules/cm_tech/implements/adv_weapon.dm index 75db558c368c..788b9804c260 100644 --- a/code/modules/cm_tech/implements/adv_weapon.dm +++ b/code/modules/cm_tech/implements/adv_weapon.dm @@ -1,7 +1,7 @@ /obj/item/techtree_advanced_weapon_kit name = "advanced weapon kit" - desc = "It seems to be a kit to choose an advanced weapon" + desc = "It seems to be a kit to choose an advanced weapon." icon = 'icons/obj/items/tools.dmi' icon_state = "wrench" @@ -24,7 +24,7 @@ /obj/item/techtree_advanced_weapon_kit/railgun name = "advanced weapon kit" - desc = "It seems to be a kit to choose an advanced weapon" + desc = "It seems to be a kit to choose an advanced weapon." icon = 'icons/obj/items/tools.dmi' icon_state = "wrench" @@ -36,7 +36,7 @@ /obj/item/weapon/gun/rifle/techweb_railgun name = "\improper Railgun" - desc = "A poggers hellbliterator" + desc = "A poggers hellbliterator." icon_state = "m42a" item_state = "m42a" icon = 'icons/obj/items/weapons/guns/guns_by_faction/USCM/marksman_rifles.dmi' diff --git a/code/modules/cm_tech/implements/armor.dm b/code/modules/cm_tech/implements/armor.dm index 9570b72bea86..c3ef8ac7afb5 100644 --- a/code/modules/cm_tech/implements/armor.dm +++ b/code/modules/cm_tech/implements/armor.dm @@ -320,7 +320,7 @@ /obj/item/clothing/accessory/health/research_plate/emergency_injector/get_examine_text(mob/user) . = ..() - . += SPAN_INFO("ALT-Clicking the plate will toggle overdose protection") + . += SPAN_INFO("ALT-Clicking the plate will toggle overdose protection.") . += SPAN_INFO("Overdose protection seems to be [od_protection_mode == 1 ? "ON" : od_protection_mode == 2 ? "DYNAMIC" : "OFF"]") if(used) . += SPAN_WARNING("It is already used!") @@ -400,7 +400,7 @@ /obj/item/clothing/accessory/health/research_plate/anti_decay name = "experimental preservation plate" - desc = "preservation plate which activates once the user is dead, uses variety of different substances and sensors to slow down the decay and increase the time before the user is permanently dead to around 9 minutes instead of 5" + desc = "Preservation plate which activates once the user is dead, uses variety of different substances and sensors to slow down the decay and increase the time before the user is permanently dead to around 9 minutes instead of 5" var/mob/living/carbon/human/wearer @@ -435,7 +435,7 @@ /obj/item/clothing/accessory/health/research_plate/anti_decay/proc/reset_use() SIGNAL_HANDLER UnregisterSignal(wearer, COMSIG_HUMAN_REVIVED) - to_chat(wearer, SPAN_NOTICE("[icon2html(src, viewers(src))] \The [src] beeps: Registering user life signs, halting preservation efforts")) + to_chat(wearer, SPAN_NOTICE("[icon2html(src, viewers(src))] \The [src] beeps: Registering user life signs, halting preservation efforts.")) wearer.revive_grace_period = 9 MINUTES diff --git a/code/modules/cm_tech/implements/implants.dm b/code/modules/cm_tech/implements/implants.dm index 95b534ac0f63..4a6175b80197 100644 --- a/code/modules/cm_tech/implements/implants.dm +++ b/code/modules/cm_tech/implements/implants.dm @@ -186,7 +186,7 @@ /obj/item/device/internal_implant/rejuv/proc/check_revive(mob/living/M, list/damagedata, damagetype) SIGNAL_HANDLER - if((M.health - damagedata["damage"]) <= HEALTH_THRESHOLD_CRIT) + if((M.health - damagedata["damage"]) <= M.health_threshold_crit) UnregisterSignal(M, list( COMSIG_MOB_TAKE_DAMAGE, COMSIG_HUMAN_TAKE_DAMAGE, diff --git a/code/modules/cm_tech/implements/stims.dm b/code/modules/cm_tech/implements/stims.dm index f7307e2ef99b..28773f50055f 100644 --- a/code/modules/cm_tech/implements/stims.dm +++ b/code/modules/cm_tech/implements/stims.dm @@ -39,6 +39,7 @@ // maximum of 15 minutes per injector, has an OD of 15 volume = 5 uses_left = 1 + display_maptext = TRUE /obj/item/reagent_container/hypospray/autoinjector/stimulant/update_icon() overlays.Cut() @@ -59,11 +60,13 @@ name = "speed stimulant autoinjector" chemname = "speed_stimulant" desc = "A stimpack loaded with an experimental performance enhancement stimulant. Extremely muscle-stimulating. Lasts 5 minutes." + maptext_label = "StSp" /obj/item/reagent_container/hypospray/autoinjector/stimulant/brain_stimulant name = "brain stimulant stimpack" chemname = "brain_stimulant" desc = "A stimpack loaded with an experimental CNS stimulant. Extremely nerve-stimulating. Lasts 5 minutes." + maptext_label = "StBr" /obj/item/reagent_container/hypospray/autoinjector/stimulant/redemption_stimulant amount_per_transfer_from_this = 5 @@ -71,3 +74,4 @@ name = "redemption stimulant autoinjector" chemname = "redemption_stimulant" desc = "A stimpack loaded with an experimental bone, organ and muscle stimulant. Significantly increases what a human can take before they go down. Lasts 5 minutes." + maptext_label = "StRe" diff --git a/code/modules/cm_tech/tech.dm b/code/modules/cm_tech/tech.dm index 1750f7e7dbbf..c034b1263570 100644 --- a/code/modules/cm_tech/tech.dm +++ b/code/modules/cm_tech/tech.dm @@ -1,6 +1,6 @@ /datum/tech var/name = "tech" - var/desc = "placeholder description" + var/desc = "Placeholder description." var/icon = 'icons/effects/techtree/tech.dmi' var/icon_state = "unknown" @@ -30,7 +30,7 @@ SHOULD_CALL_PARENT(TRUE) if(!holder.has_access(M, TREE_ACCESS_MODIFY)) - to_chat(M, SPAN_WARNING("You lack the necessary permission required to use this tree")) + to_chat(M, SPAN_WARNING("You lack the necessary permission required to use this tree.")) return if(!check_tier_level(M)) diff --git a/code/modules/cm_tech/tech_memories.dm b/code/modules/cm_tech/tech_memories.dm index 966b23067e07..925ff78fe9a8 100644 --- a/code/modules/cm_tech/tech_memories.dm +++ b/code/modules/cm_tech/tech_memories.dm @@ -4,7 +4,7 @@ /datum/objective_memory_interface/tgui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) - ui = new(user, src, "TechMemories", "[holder.name] Objectives") + ui = new(user, src, "TechMemories", "[capitalize(holder.name)] Objectives") ui.open() ui.set_autoupdate(TRUE) diff --git a/code/modules/cm_tech/techtree.dm b/code/modules/cm_tech/techtree.dm index 0a02c82c33a7..f1ebdefbf6fd 100644 --- a/code/modules/cm_tech/techtree.dm +++ b/code/modules/cm_tech/techtree.dm @@ -160,7 +160,7 @@ return FALSE if(!has_access(M, TREE_ACCESS_VIEW) && !force) - to_chat(M, SPAN_WARNING("You do not have access to this tech tree")) + to_chat(M, SPAN_WARNING("You do not have access to this tech tree.")) return FALSE if(SEND_SIGNAL(M, COMSIG_MOB_ENTER_TREE, src, force) & COMPONENT_CANCEL_TREE_ENTRY) diff --git a/code/modules/cm_tech/trees/marine.dm b/code/modules/cm_tech/trees/marine.dm index 5ab2b7eaa36e..bdc248a4dc1c 100644 --- a/code/modules/cm_tech/trees/marine.dm +++ b/code/modules/cm_tech/trees/marine.dm @@ -1,4 +1,5 @@ GLOBAL_LIST_EMPTY(marine_leaders) +GLOBAL_LIST_EMPTY(marine_officers) // THE MARINE TECH TREE /datum/techtree/marine diff --git a/code/modules/defenses/bell_tower.dm b/code/modules/defenses/bell_tower.dm index fa904092c0da..683d0b0a50e8 100644 --- a/code/modules/defenses/bell_tower.dm +++ b/code/modules/defenses/bell_tower.dm @@ -25,7 +25,6 @@ SENTRY_CATEGORY_IFF = FACTION_MARINE, ) - /obj/structure/machinery/defenses/bell_tower/Initialize() . = ..() @@ -158,6 +157,9 @@ to_chat(to_apply, SPAN_WARNING("You feel very heavy.")) sound_to(to_apply, 'sound/items/detector.ogg') + var/minimap_flag = get_minimap_flag_for_faction(linked_tower.selected_categories[SENTRY_CATEGORY_IFF]) + new /obj/effect/temp_visual/minimap_blip(get_turf(target), minimap_flag) + /obj/structure/machinery/defenses/bell_tower/md name = "R-1NG motion detector tower" desc = "A tactical advanced version of the motion detector. Has an increased range, disrupts the activity of hostiles nearby." @@ -171,6 +173,9 @@ md.iff_signal = LAZYACCESS(faction_group, 1) md.toggle_active(null, FALSE) + var/minimap_flag = get_minimap_flag_for_faction(selected_categories[SENTRY_CATEGORY_IFF]) + SSminimaps.add_marker(src, minimap_flag, image('icons/ui_icons/map_blips.dmi', null, "md", HIGH_FLOAT_LAYER, dir = src.dir)) + if(!md.iff_signal) md.iff_signal = FACTION_MARINE @@ -178,7 +183,7 @@ if(md) md.linked_tower = null QDEL_NULL(md) - + SSminimaps.remove_marker(src) /obj/structure/machinery/defenses/bell_tower/cloaker @@ -260,7 +265,7 @@ STOP_PROCESSING(SSobj, src) return - var/list/targets = SSquadtree.players_in_range(SQUARE(M.x, M.y, area_range), M.z, QTREE_SCAN_MOBS | QTREE_EXCLUDE_OBSERVER) + var/list/targets = SSquadtree.players_in_range(SQUARE(M.x, M.y, area_range), M.z, QTREE_SCAN_MOBS | QTREE_FILTER_LIVING) if(!targets) return diff --git a/code/modules/defenses/planted_flag.dm b/code/modules/defenses/planted_flag.dm index 8a2f2ce37f1e..b5e34453aa21 100644 --- a/code/modules/defenses/planted_flag.dm +++ b/code/modules/defenses/planted_flag.dm @@ -94,7 +94,7 @@ if(!range_bounds) range_bounds = SQUARE(x, y, area_range) - var/list/targets = SSquadtree.players_in_range(SQUARE(x, y, area_range), z, QTREE_SCAN_MOBS | QTREE_EXCLUDE_OBSERVER) + var/list/targets = SSquadtree.players_in_range(SQUARE(x, y, area_range), z, QTREE_SCAN_MOBS | QTREE_FILTER_LIVING) if(!targets) return @@ -222,7 +222,7 @@ if(!M.x && !M.y && !M.z) return - var/list/targets = SSquadtree.players_in_range(SQUARE(M.x, M.y, area_range), M.z, QTREE_SCAN_MOBS | QTREE_EXCLUDE_OBSERVER) + var/list/targets = SSquadtree.players_in_range(SQUARE(M.x, M.y, area_range), M.z, QTREE_SCAN_MOBS | QTREE_FILTER_LIVING) targets |= M for(var/mob/living/carbon/human/H in targets) diff --git a/code/modules/defenses/sentry.dm b/code/modules/defenses/sentry.dm index 3a6323be588b..e98241b257c3 100644 --- a/code/modules/defenses/sentry.dm +++ b/code/modules/defenses/sentry.dm @@ -53,6 +53,9 @@ SENTRY_CATEGORY_IFF = FACTION_MARINE, ) + ///Minimap iconstate to use for this sentry + var/minimap_icon_state = "sentry" + /obj/structure/machinery/defenses/sentry/Initialize() . = ..() spark_system = new /datum/effect_system/spark_spread @@ -62,9 +65,11 @@ start_processing() set_range() update_icon() + update_minimap_icon() RegisterSignal(src, COMSIG_ATOM_TURF_CHANGE, PROC_REF(unset_range)) /obj/structure/machinery/defenses/sentry/Destroy() //Clear these for safety's sake. + SSminimaps.remove_marker(src) targets = null other_targets = null target = null @@ -81,7 +86,7 @@ if(!range_bounds) set_range() - targets = SSquadtree.players_in_range(range_bounds, z, QTREE_SCAN_MOBS | QTREE_EXCLUDE_OBSERVER) + targets = SSquadtree.players_in_range(range_bounds, z, QTREE_SCAN_MOBS | QTREE_FILTER_LIVING) if(!targets) return FALSE @@ -184,12 +189,14 @@ visible_message("[icon2html(src, viewers(src))] [SPAN_NOTICE("The [name] hums to life and emits several beeps.")]") visible_message("[icon2html(src, viewers(src))] [SPAN_NOTICE("The [name] buzzes in a monotone voice: 'Default systems initiated'")]") + update_minimap_icon() start_processing() set_range() /obj/structure/machinery/defenses/sentry/power_off_action() set_light(0) visible_message("[icon2html(src, viewers(src))] [SPAN_NOTICE("The [name] powers down and goes silent.")]") + update_minimap_icon(off = TRUE) stop_processing() unset_range() @@ -219,6 +226,7 @@ playsound(loc, 'sound/items/Screwdriver.ogg', 25, 1) user.visible_message(SPAN_NOTICE("[user] rotates [src]."), SPAN_NOTICE("You rotate [src].")) setDir(turn(dir, -90)) + update_minimap_icon() return if(istype(O, ammo)) @@ -255,6 +263,7 @@ playsound(loc, 'sound/mecha/critdestrsyndi.ogg', 25, 1) for(var/i = 1 to 6) setDir(pick(NORTH, EAST, SOUTH, WEST)) + update_minimap_icon() sleep(2) cell_explosion(loc, 10, 10, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, create_cause_data("sentry explosion", owner_mob)) @@ -286,6 +295,7 @@ if(omni_directional) setDir(get_dir(src, A)) + update_minimap_icon() for(var/i in 1 to burst) if(actual_fire(A)) break @@ -315,6 +325,7 @@ GIVE_BULLET_TRAIT(new_projectile, /datum/element/bullet_trait_iff, faction_group) new_projectile.fire_at(target, owner_mob, src, new_projectile.ammo.max_range, new_projectile.ammo.shell_speed, null, FALSE) muzzle_flash(Get_Angle(get_turf(src), target)) + update_minimap_icon(TRUE) ammo.current_rounds-- track_shot() if(ammo.current_rounds == 0) @@ -413,21 +424,23 @@ continue var/blocked = FALSE - for(var/turf/T in path) - if(T.density || T.opacity) + for(var/turf/turf in path) + if(turf.density || turf.opacity) blocked = TRUE break - for(var/obj/structure/S in T) + for(var/obj/structure/S in turf) if(S.opacity) blocked = TRUE break - for(var/obj/vehicle/multitile/V in T) + for(var/obj/vehicle/multitile/V in turf) blocked = TRUE break - for(var/obj/effect/particle_effect/smoke/S in T) + for(var/obj/effect/particle_effect/smoke/smoke in turf) + if(!smoke.obscuring) + continue blocked = TRUE break @@ -464,10 +477,30 @@ target = pick(unconscious_targets) if(!target) //No targets, don't bother firing + update_minimap_icon() return fire(target) +///Updates the vehicles minimap icon +/obj/structure/machinery/defenses/sentry/proc/update_minimap_icon(firing, off) + if(!minimap_icon_state) + return + SSminimaps.remove_marker(src) + if(off) + return + var/minimap_flags = NO_FLAGS + for(var/faction in faction_group) + minimap_flags |= get_minimap_flag_for_faction(faction) + if(!minimap_flags) + return + minimap_icon_state = initial(minimap_icon_state) + if(firing) + minimap_icon_state += "_firing" + else + minimap_icon_state += "_passive" + SSminimaps.add_marker(src, minimap_flags, image('icons/ui_icons/map_blips_larger.dmi', null, minimap_icon_state, HIGH_FLOAT_LAYER, dir = src.dir), -28.25, -28.25) + /obj/structure/machinery/defenses/sentry/premade name = "\improper UA-577 Gauss Turret" immobile = TRUE @@ -580,6 +613,7 @@ desc = "A fully-automated defence turret with mid-range targeting capabilities. Armed with a modified M32-S Autocannon and an internal belt feed and modified for UA warship use." fire_delay = 0.4 SECONDS omni_directional = TRUE + minimap_icon_state = "sentry_omni" /obj/structure/machinery/defenses/sentry/premade/deployable/almayer/mini name = "\improper UA 512-S mini sentry" @@ -626,6 +660,11 @@ if(TURRET_BATTERY_STATE_DEAD) . += SPAN_INFO("It appears to be offline.") +/obj/structure/machinery/defenses/sentry/premade/deployable/colony/landing_zone/handle_vehicle_bump(obj/vehicle/multitile/bumping_vehicle) + var/mob/driver = bumping_vehicle.seats[VEHICLE_DRIVER] + to_chat(driver, SPAN_WARNING("[src] is in the way!")) + return FALSE // Prevent movement over + /obj/structure/machinery/defenses/sentry/premade/deployable/colony/landing_zone/proc/set_battery_state(state) battery_state = state switch(state) @@ -665,6 +704,7 @@ omni_directional = TRUE choice_categories = list() selected_categories = list() + minimap_icon_state = "sentry_omni" var/obj/structure/dropship_equipment/sentry_holder/deployment_system var/obj/structure/machinery/camera/cas/linked_cam @@ -731,13 +771,13 @@ if(. == XENO_ATTACK_ACTION && turned_on) M.visible_message(SPAN_DANGER("The sentry's steel tusks cut into [M]!"), SPAN_DANGER("The sentry's steel tusks cut into you!"), null, 5, CHAT_TYPE_XENO_COMBAT) - M.apply_damage(20) + M.apply_damage(20, enviro=TRUE) /obj/structure/machinery/defenses/sentry/shotgun/hitby(atom/movable/AM) if(AM.throwing && turned_on) if(ismob(AM)) var/mob/living/L = AM - L.apply_damage(20) + L.apply_damage(20, enviro=TRUE) playsound(L, "bonk", 75, FALSE) L.visible_message(SPAN_DANGER("The sentry's steel tusks impale [L]!"), SPAN_DANGER("The sentry's steel tusks impale you!")) @@ -758,7 +798,7 @@ /obj/structure/machinery/defenses/sentry/launchable name = "\improper UA 571-O sentry post" - desc = "A deployable, omni-directional automated turret with AI targeting capabilities. Armed with an M30 Autocannon and a 100-round drum magazine with 500 rounds stored internally. Due to the deployment method it is incapable of being moved." + desc = "A deployable, omni-directional automated turret with AI targeting capabilities. Armed with an M30 Autocannon and a 100-round drum magazine with 500 rounds stored internally. Due to the deployment method it is incapable of being moved." ammo = new /obj/item/ammo_magazine/sentry/dropped faction_group = FACTION_LIST_MARINE omni_directional = TRUE @@ -826,7 +866,7 @@ return var/rounds_used = ammo.inherent_reload(user) - to_chat(user, SPAN_WARNING("[src]'s internal magazine was reloaded with [rounds_used] rounds, [ammo.max_inherent_rounds] rounds left in storage")) + to_chat(user, SPAN_WARNING("[src]'s internal magazine was reloaded with [rounds_used] rounds, [ammo.max_inherent_rounds] rounds left in storage.")) playsound(loc, 'sound/weapons/handling/m40sd_reload.ogg', 25, 1) update_icon() return FALSE @@ -866,6 +906,7 @@ omni_directional = TRUE handheld_type = /obj/item/defenses/handheld/sentry/wy ammo = new /obj/item/ammo_magazine/sentry/wy + minimap_icon_state = "sentry_omni" selected_categories = list( SENTRY_CATEGORY_IFF = SENTRY_FACTION_WEYLAND, ) @@ -930,6 +971,7 @@ disassemble_time = 2 SECONDS sentry_range = 3 omni_directional = TRUE + minimap_icon_state = "sentry_omni" handheld_type = /obj/item/defenses/handheld/sentry/upp/light /obj/structure/machinery/defenses/sentry/omni @@ -937,6 +979,7 @@ omni_directional = TRUE damage_mult = 0.7 sentry_range = 4 + minimap_icon_state = "sentry_omni" #undef SENTRY_FIREANGLE #undef SENTRY_RANGE diff --git a/code/modules/defenses/tesla_coil.dm b/code/modules/defenses/tesla_coil.dm index 8f30624ba01f..06b438c3a473 100644 --- a/code/modules/defenses/tesla_coil.dm +++ b/code/modules/defenses/tesla_coil.dm @@ -134,12 +134,12 @@ var/list/turf/path = get_line(src, M, include_start_atom = FALSE) var/blocked = FALSE - for(var/turf/T in path) - if(T.density || T.opacity) + for(var/turf/turf in path) + if(turf.density || turf.opacity) blocked = TRUE break - for(var/obj/structure/S in T) + for(var/obj/structure/S in turf) if(S.opacity) blocked = TRUE break @@ -148,7 +148,9 @@ blocked = TRUE break - for(var/obj/effect/particle_effect/smoke/S in T) + for(var/obj/effect/particle_effect/smoke/smoke in turf) + if(!smoke.obscuring) + continue blocked = TRUE break diff --git a/code/modules/desert_dam/filtration/consoles.dm b/code/modules/desert_dam/filtration/consoles.dm index 277b2485ed23..53f6d09cf617 100644 --- a/code/modules/desert_dam/filtration/consoles.dm +++ b/code/modules/desert_dam/filtration/consoles.dm @@ -48,7 +48,7 @@ GLOBAL_VAR_INIT(river_activated, FALSE) /obj/structure/machinery/filtration/console/tgui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) - ui = new(user, src, "FiltrationControl", "[src.name]") + ui = new(user, src, "FiltrationControl", "[capitalize(name)]") ui.open() /obj/structure/machinery/filtration/console/ui_state(mob/user) diff --git a/code/modules/desert_dam/filtration/filtration.dm b/code/modules/desert_dam/filtration/filtration.dm index 0061d9d2a60e..72921196cee0 100644 --- a/code/modules/desert_dam/filtration/filtration.dm +++ b/code/modules/desert_dam/filtration/filtration.dm @@ -176,34 +176,34 @@ Each var depends on others if(targets_present < 1) STOP_PROCESSING(SSobj, src) -/obj/effect/blocker/toxic_water/proc/cause_damage(mob/living/M) - if(M.stat == DEAD) +/obj/effect/blocker/toxic_water/proc/cause_damage(mob/living/target) + if(target.stat == DEAD) return - M.last_damage_data = create_cause_data("toxic water") - if(islarva(M)) - M.apply_damage(2,BURN) - else if(isxeno(M) && !islarva(M)) - M.apply_damage(34,BURN) - else if(isyautja(M)) - M.apply_damage(0.5,BURN) + target.last_damage_data = create_cause_data("toxic water") + if(islarva(target)) + target.apply_damage(2, BURN, enviro=TRUE) + else if(isxeno(target) && !islarva(target)) + target.apply_damage(34, BURN, enviro=TRUE) + else if(isyautja(target)) + target.apply_damage(0.5, BURN, enviro=TRUE) else var/dam_amount = 3 - if(M.body_position == LYING_DOWN) - M.apply_damage(dam_amount,BURN) - M.apply_damage(dam_amount,BURN) - M.apply_damage(dam_amount,BURN) - M.apply_damage(dam_amount,BURN) - M.apply_damage(dam_amount,BURN) + if(target.body_position == LYING_DOWN) + target.apply_damage(dam_amount, BURN, enviro=TRUE) + target.apply_damage(dam_amount, BURN, enviro=TRUE) + target.apply_damage(dam_amount, BURN, enviro=TRUE) + target.apply_damage(dam_amount, BURN, enviro=TRUE) + target.apply_damage(dam_amount, BURN, enviro=TRUE) else - M.apply_damage(dam_amount,BURN,"l_leg") - M.apply_damage(dam_amount,BURN,"l_foot") - M.apply_damage(dam_amount,BURN,"r_leg") - M.apply_damage(dam_amount,BURN,"r_foot") - M.apply_damage(dam_amount,BURN,"groin") - M.apply_effect(20,IRRADIATE,0) - if( !issynth(M) ) - to_chat(M, SPAN_DANGER("The water burns!")) - playsound(M, 'sound/bullets/acid_impact1.ogg', 10, 1) + target.apply_damage(dam_amount, BURN, "l_leg", enviro=TRUE) + target.apply_damage(dam_amount, BURN, "l_foot", enviro=TRUE) + target.apply_damage(dam_amount, BURN, "r_leg", enviro=TRUE) + target.apply_damage(dam_amount, BURN, "r_foot", enviro=TRUE) + target.apply_damage(dam_amount, BURN, "groin", enviro=TRUE) + target.apply_effect(20,IRRADIATE,0) + if( !issynth(target) ) + to_chat(target, SPAN_DANGER("The water burns!")) + playsound(target, 'sound/bullets/acid_impact1.ogg', 10, 1) /obj/effect/blocker/toxic_water/proc/disperse_spread(from_dir = 0) diff --git a/code/modules/desert_dam/motion_sensor/sensortower.dm b/code/modules/desert_dam/motion_sensor/sensortower.dm index 250d27f06dd2..bc3a0bf05cdb 100644 --- a/code/modules/desert_dam/motion_sensor/sensortower.dm +++ b/code/modules/desert_dam/motion_sensor/sensortower.dm @@ -28,8 +28,7 @@ /obj/structure/machinery/sensortower/Initialize(mapload, ...) . = ..() - SSminimaps.add_marker(src, z, MINIMAP_FLAG_ALL, "sensor_tower") - + SSminimaps.add_marker(src, MINIMAP_FLAG_ALL, image('icons/UI_icons/map_blips.dmi', null, "sensor_tower")) /obj/structure/machinery/sensortower/update_icon() ..() @@ -236,6 +235,9 @@ SPAN_DANGER("You stop destroying \the [src]'s internal machinery!"), null, 5, CHAT_TYPE_XENO_COMBAT) return XENO_NO_DELAY_ACTION +/obj/structure/machinery/sensortower/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + return TAILSTAB_COOLDOWN_NONE + /* Decreases the buildstate of the sensor tower and switches it off if affected by any explosion. Higher severity explosion will damage the sensor tower more */ diff --git a/code/modules/droppod/droppod_ui.dm b/code/modules/droppod/droppod_ui.dm index 39b9e0ac1cb6..f246f12df896 100644 --- a/code/modules/droppod/droppod_ui.dm +++ b/code/modules/droppod/droppod_ui.dm @@ -94,7 +94,7 @@ GLOBAL_LIST_INIT(droppod_target_mode, list( acceptableTurfs.Add(unchecked_turf) //Because orderedArea was an ordered linear list, acceptableTurfs will be as well. launch_list = list() //Anything in launch_list will go into the supplypod when it is launched - if (length(acceptableTurfs) && !custom_dropoff) //We dont fill the supplypod if acceptableTurfs is empty, if the pod is going in reverse (effectReverse=true), or if the pod is acitng like a missile (effectMissile=true) + if (length(acceptableTurfs) && !custom_dropoff) //We don't fill the supplypod if acceptableTurfs is empty, if the pod is going in reverse (effectReverse=true), or if the pod is acitng like a missile (effectMissile=true) switch(launch_choice) if(LAUNCH_ALL) //If we are launching all the turfs at once for (var/t in acceptableTurfs) diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm index 3850ae4b313e..d5921a81245b 100644 --- a/code/modules/economy/ATM.dm +++ b/code/modules/economy/ATM.dm @@ -41,6 +41,7 @@ log transactions spark_system = new /datum/effect_system/spark_spread spark_system.set_up(5, 0, src) spark_system.attach(src) + AddElement(/datum/element/corp_label/wy) /obj/structure/machinery/atm/Destroy() QDEL_NULL(spark_system) @@ -49,7 +50,7 @@ log transactions /obj/structure/machinery/atm/attackby(obj/item/I as obj, mob/user as mob) if(inoperable()) to_chat(user, SPAN_NOTICE("You try to use it ,but it appears to be unpowered!")) - return //so it doesnt brazil IDs when unpowered + return //so it doesn't brazil IDs when unpowered if(istype(I, /obj/item/card)) var/obj/item/card/id/idcard = I if(!held_card) @@ -279,7 +280,7 @@ log transactions T.time = worldtime2text() authenticated_account.transaction_log.Add(T) - to_chat(usr, SPAN_NOTICE(" [icon2html(src, usr)] Access granted. Welcome user '[authenticated_account.owner_name].'")) + to_chat(usr, SPAN_NOTICE("[icon2html(src, usr)] Access granted. Welcome user '[authenticated_account.owner_name].'")) previous_account_number = tried_account_num if("e_withdrawal") diff --git a/code/modules/economy/cash.dm b/code/modules/economy/cash.dm index 6847737ede2c..20a450fe884d 100644 --- a/code/modules/economy/cash.dm +++ b/code/modules/economy/cash.dm @@ -118,7 +118,7 @@ /obj/item/spacecash/c1 name = "1 dollar bill" icon_state = "spacecash1" - desc = "A single US Government minted one dollar bill. It has a picture of George Washington printed on it. Makes most people of English origin cry, but isn't worth very much. Could probably get you half a hot-dog in some systems. " + desc = "A single US Government minted one dollar bill. It has a picture of George Washington printed on it. Makes most people of English origin cry, but isn't worth very much. Could probably get you half a hot-dog in some systems." worth = 1 /obj/item/spacecash/c10 @@ -154,7 +154,7 @@ /obj/item/spacecash/c500 name = "500 dollars" icon_state = "spacecash500" - desc = "Five US Government minted hundred-dollar bills. All of them have pictures of Ben Franklin on them. They all eagarly glare at you, making you feel as if you owe them something. " + desc = "Five US Government minted hundred-dollar bills. All of them have pictures of Ben Franklin on them. They all eagerly glare at you, making you feel as if you owe them something." worth = 500 /obj/item/spacecash/c500/counterfeit diff --git a/code/modules/escape_menu/admin_buttons.dm b/code/modules/escape_menu/admin_buttons.dm index 661901c1b77a..87ce5d9acc26 100644 --- a/code/modules/escape_menu/admin_buttons.dm +++ b/code/modules/escape_menu/admin_buttons.dm @@ -52,16 +52,6 @@ ) ) - page_holder.give_screen_object( - new /atom/movable/screen/escape_menu/home_button( - null, - src, - "Tacmaps Panel", - /* offset = */ 6, - CALLBACK(src, PROC_REF(home_tacmaps)), - ) - ) - page_holder.give_screen_object( new /atom/movable/screen/escape_menu/home_button( null, @@ -127,12 +117,6 @@ GLOB.medals_panel.tgui_interact(client?.mob) -/datum/escape_menu/proc/home_tacmaps() - if(!client?.admin_holder.check_for_rights(R_ADMIN|R_MOD)) - return - - GLOB.tacmap_admin_panel.tgui_interact(client?.mob) - /datum/escape_menu/proc/home_teleport() if(!client?.admin_holder.check_for_rights(R_MOD)) return diff --git a/code/modules/escape_menu/details.dm b/code/modules/escape_menu/details.dm index 8cb4d2a94734..3c65ec4b5b4e 100644 --- a/code/modules/escape_menu/details.dm +++ b/code/modules/escape_menu/details.dm @@ -9,8 +9,8 @@ GLOBAL_DATUM(escape_menu_details, /atom/movable/screen/escape_menu/details) return GLOB.escape_menu_details /atom/movable/screen/escape_menu/details - screen_loc = "EAST:-180,NORTH:-25" - maptext_height = 100 + screen_loc = "EAST:-180,NORTH:-40" + maptext_height = 200 maptext_width = 200 /atom/movable/screen/escape_menu/details/Initialize(mapload) @@ -42,6 +42,7 @@ GLOBAL_DATUM(escape_menu_details, /atom/movable/screen/escape_menu/details) Round Time: [duration2text()]
[SSmapping.configs[GROUND_MAP].disable_ship_map ? "" : "Ship: [ship_map]
"] Ground: [ground_map]
+ Players: [length(GLOB.clients)] "} diff --git a/code/modules/escape_menu/escape_menu.dm b/code/modules/escape_menu/escape_menu.dm index 59b8372f9c1c..8f3e4ae8d33b 100644 --- a/code/modules/escape_menu/escape_menu.dm +++ b/code/modules/escape_menu/escape_menu.dm @@ -13,7 +13,7 @@ CLIENT_VERB(open_escape_menu) if (!isnull(current_escape_menu)) qdel(current_escape_menu) return - + SEND_SIGNAL(src, COMSIG_CLIENT_ESCAPE_MENU_OPEN) reset_held_keys() new /datum/escape_menu(src) diff --git a/code/modules/events/_events.dm b/code/modules/events/_events.dm index bbdc89899e17..17fc6f626224 100644 --- a/code/modules/events/_events.dm +++ b/code/modules/events/_events.dm @@ -74,7 +74,7 @@ ..() if(href_list["cancel"]) if(!triggering) - to_chat(usr, SPAN_ADMIN("You are too late to cancel that event")) + to_chat(usr, SPAN_ADMIN("You are too late to cancel that event.")) return triggering = FALSE message_admins("[key_name_admin(usr)] cancelled event [name].") @@ -88,7 +88,7 @@ Runs the event */ /datum/round_event_control/proc/run_event(random = FALSE, announce_chance_override = null, admin_forced = FALSE) /* - * We clear our signals first so we dont cancel a wanted event by accident, + * We clear our signals first so we don't cancel a wanted event by accident, * the majority of time the admin will probably want to cancel a single midround spawned random events * and not multiple events called by others admins * * In the worst case scenario we can still recall a event which we cancelled by accident, which is much better then to have a unwanted event diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index ea255beba3b6..f9b2e1fef738 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -31,13 +31,13 @@ Gunshots/explosions/opening doors/less rare audio (done) switch(halpick) if(0 to 15) //Screwy HUD - //to_chat(src, "Screwy HUD") + //to_chat(src, "Screwy HUD.") hal_screwyhud = pick(1,2,3,3,4,4) spawn(rand(100,250)) hal_screwyhud = 0 if(16 to 25) //Strange items - //to_chat(src, "Traitor Items") + //to_chat(src, "Traitor Items.") if(!halitem) halitem = new var/datum/custom_hud/ui_datum = GLOB.custom_huds_list[client.prefs.UI_style] @@ -122,7 +122,7 @@ Gunshots/explosions/opening doors/less rare audio (done) if(41 to 65) //Strange audio - //to_chat(src, "Strange Audio") + //to_chat(src, "Strange Audio.") switch(rand(1,12)) if(1) src << 'sound/machines/airlock.ogg' diff --git a/code/modules/gear_presets/_select_equipment.dm b/code/modules/gear_presets/_select_equipment.dm index 3d6870da7535..6d497a390a3e 100644 --- a/code/modules/gear_presets/_select_equipment.dm +++ b/code/modules/gear_presets/_select_equipment.dm @@ -51,7 +51,8 @@ var/list/uniform_sets = null - + /// All presets are in "All" and "Faction" (drawn from the faction variable) + var/selection_categories = list() /datum/equipment_preset/New() if(!manifest_title) @@ -88,10 +89,10 @@ return /datum/equipment_preset/proc/load_name(mob/living/carbon/human/new_human, randomise, client/mob_client) - new_human.gender = pick(60;MALE,40;FEMALE) + new_human.gender = pick(MALE, FEMALE) var/datum/preferences/A = new() A.randomize_appearance(new_human) - var/random_name = capitalize(pick(new_human.gender == MALE ? GLOB.first_names_male : GLOB.first_names_female)) + " " + capitalize(pick(GLOB.last_names)) + var/random_name = random_name(new_human.gender) new_human.change_real_name(new_human, random_name) new_human.age = rand(21,45) @@ -109,6 +110,8 @@ playtime = get_job_playtime(mob_client, job_title) if((playtime >= JOB_PLAYTIME_TIER_1) && !mob_client.prefs.playtime_perks) playtime = JOB_PLAYTIME_TIER_1 + else if((playtime <= JOB_PLAYTIME_TIER_4) && mob_client.can_skip_role_lock() && mob_client.prefs.skip_playtime_ranks) + playtime = JOB_PLAYTIME_TIER_4 var/final_paygrade for(var/current_paygrade as anything in paygrades) var/required_time = paygrades[current_paygrade] @@ -280,30 +283,13 @@ var/datum/character_trait/character_trait = GLOB.character_traits[trait] character_trait.apply_trait(new_human, src) -/datum/equipment_preset/proc/get_minimap_icon(mob/living/carbon/human/user) - var/image/background = mutable_appearance('icons/ui_icons/map_blips.dmi', user.assigned_squad?.background_icon ? user.assigned_squad.background_icon : minimap_background) - - if(islist(minimap_icon)) - for(var/icons in minimap_icon) - var/iconstate = icons ? icons : "unknown" - var/mutable_appearance/icon = image('icons/ui_icons/map_blips.dmi', icon_state = iconstate) - icon.appearance_flags = RESET_COLOR - - if(minimap_icon[icons]) - icon.color = minimap_icon[icons] - background.overlays += icon - else - var/obj/item/card/id/ID = user.get_idcard() - var/icon_to_use - if(ID.minimap_icon_override) - icon_to_use = ID.minimap_icon_override - else - icon_to_use = minimap_icon ? minimap_icon : "unknown" - var/mutable_appearance/icon = image('icons/ui_icons/map_blips.dmi', icon_state = icon_to_use) - icon.appearance_flags = RESET_COLOR - background.overlays += icon - - return background +/// condensed the backpack selector into a proc, 1 = bag, 2 = satchel, 3 = chestrig +/datum/equipment_preset/proc/get_backpack_item(mob/living/carbon/human/new_human, default_backpack = /obj/item/storage/backpack/marine/satchel, primary_backpack = /obj/item/storage/backpack/marine) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) + return primary_backpack + else if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 3)) + return /obj/item/storage/backpack/marine/satchel/chestrig + return default_backpack /datum/equipment_preset/strip //For removing all equipment name = "*strip*" @@ -758,7 +744,7 @@ GLOBAL_LIST_INIT(rebel_rifles, list( new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) -/datum/equipment_preset/proc/add_random_survivor_medical_gear(mob/living/carbon/human/new_human) // Randomized medical gear. Survivors wont have their gear all kitted out once the outbreak began much like a doctor on a coffee break wont carry their instruments around. This is a generation of items they may or maynot get when the outbreak happens +/datum/equipment_preset/proc/add_random_survivor_medical_gear(mob/living/carbon/human/new_human) // Randomized medical gear. Survivors won't have their gear all kitted out once the outbreak began much like a doctor on a coffee break won't carry their instruments around. This is a generation of items they may or maynot get when the outbreak happens var/random_gear = rand(0,4) switch(random_gear) if(0) @@ -773,7 +759,7 @@ GLOBAL_LIST_INIT(rebel_rifles, list( new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/surgical(new_human.back), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES) -/datum/equipment_preset/proc/add_random_survivor_research_gear(mob/living/carbon/human/new_human) // Randomized medical gear. Survivors wont have their gear all kitted out once the outbreak began much like a doctor on a coffee break wont carry their instruments around. This is a generation of items they may or maynot get when the outbreak happens +/datum/equipment_preset/proc/add_random_survivor_research_gear(mob/living/carbon/human/new_human) // Randomized medical gear. Survivors won't have their gear all kitted out once the outbreak began much like a doctor on a coffee break won't carry their instruments around. This is a generation of items they may or maynot get when the outbreak happens var/random_gear = rand(0,3) switch(random_gear) if(0) @@ -782,8 +768,6 @@ GLOBAL_LIST_INIT(rebel_rifles, list( new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/metal_foam(new_human), WEAR_IN_BACK) if(2) new_human.equip_to_slot_or_del(new /obj/structure/closet/bodybag/tarp/reactive(new_human), WEAR_IN_BACK) - if(3) - new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/antiweed(new_human), WEAR_IN_BACK) /datum/equipment_preset/proc/add_random_cl_survivor_loot(mob/living/carbon/human/new_human) // Loot Generation associated with CL survivor. Makes them a little more valuable and not a useless pick. @@ -908,7 +892,7 @@ GLOBAL_LIST_INIT(rebel_rifles, list( /** * Randomizes the primary weapon a survivor might find at the start of the outbreak in a gun cabinet. * For the most part you will stil get a shotgun but there is an off chance you get something unique. - * If you dont like the weapon deal with it. Cursed ammo for shotguns is intentional for scarcity reasons. + * If you don't like the weapon deal with it. Cursed ammo for shotguns is intentional for scarcity reasons. * Some weapons may not appear at all in a colony so they will need the extra ammo. * MERC, and DB needed a handfull of shells to compete with the normal CMB. */ @@ -1000,7 +984,7 @@ GLOBAL_LIST_INIT(rebel_rifles, list( list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), @@ -1016,9 +1000,12 @@ GLOBAL_LIST_INIT(rebel_rifles, list( list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Masterkey Shotgun", 0, /obj/item/attachable/attached_gun/shotgun, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Recoil Compensator", 0, /obj/item/attachable/compensator, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("M10 Compensator", 0, /obj/item/attachable/compensator/m10, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Mini Red-Dot Sight", 0, /obj/item/attachable/reddot/small, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Suppressor, Compact", 0, /obj/item/attachable/suppressor/sleek, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), diff --git a/code/modules/gear_presets/agents.dm b/code/modules/gear_presets/agents.dm index af4a449b1dbb..5cb616b9833a 100644 --- a/code/modules/gear_presets/agents.dm +++ b/code/modules/gear_presets/agents.dm @@ -111,12 +111,12 @@ /datum/equipment_preset/twe/representative/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = MALE + var/datum/preferences/A = new() A.randomize_appearance(new_human) - var/random_name - if(new_human.gender == MALE) - random_name = "[pick(GLOB.first_names_male_dutch)] [pick(GLOB.last_names_clf)]" - new_human.f_style = "Shaved" + + var/random_name = "[capitalize(pick(GLOB.first_names_male_dutch))] [capitalize(pick(GLOB.last_names_clf))]" + new_human.f_style = "Shaved" new_human.change_real_name(new_human, random_name) new_human.age = rand(17,35) diff --git a/code/modules/gear_presets/cia.dm b/code/modules/gear_presets/cia.dm index 1b01a893747f..12495094efd3 100644 --- a/code/modules/gear_presets/cia.dm +++ b/code/modules/gear_presets/cia.dm @@ -10,8 +10,8 @@ paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0) role_comm_title = "CIV" - minimap_background = "background_civillian" minimap_icon = "cia_ia" + minimap_background = "background_civilian" idtype = /obj/item/card/id/adaptive /datum/equipment_preset/cia/New() @@ -139,6 +139,7 @@ /datum/equipment_preset/clf/engineer/cia name = "CIA Spy (CLF Engineer)" skills = /datum/skills/cia + selection_categories = list("CIA") /datum/equipment_preset/clf/engineer/cia/New() . = ..() @@ -178,6 +179,7 @@ /datum/equipment_preset/upp/soldier/dressed/cia name = "CIA Spy (UPP Soldier)" skills = /datum/skills/cia + selection_categories = list("CIA") /datum/equipment_preset/upp/soldier/dressed/cia/New() . = ..() @@ -191,6 +193,7 @@ /datum/equipment_preset/upp/officer/senior/dressed/cia name = "CIA Spy (UPP Senior Officer)" skills = /datum/skills/cia_senior + selection_categories = list("CIA") /datum/equipment_preset/upp/officer/senior/dressed/cia/New() . = ..() diff --git a/code/modules/gear_presets/clf.dm b/code/modules/gear_presets/clf.dm index d23e42c84bd4..9a8ac98dd151 100644 --- a/code/modules/gear_presets/clf.dm +++ b/code/modules/gear_presets/clf.dm @@ -14,30 +14,27 @@ access = get_access(ACCESS_LIST_CLF_BASE) /datum/equipment_preset/clf/load_name(mob/living/carbon/human/new_human, randomise) - new_human.gender = pick(60;MALE, 40;FEMALE) - var/random_name + new_human.gender = pick(MALE, FEMALE) + var/first_name var/last_name - //gender checks - if(new_human.gender == MALE) - if(prob(40)) - first_name = "[capitalize(randomly_generate_japanese_word(rand(1, 3)))]" - else - first_name = "[pick(GLOB.first_names_male_clf)]" - new_human.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache") + if(prob(40)) + first_name = "[capitalize(randomly_generate_japanese_word(rand(1, 3)))]" else - if(prob(40)) - first_name = "[capitalize(randomly_generate_japanese_word(rand(1, 3)))]" - else - first_name = "[pick(GLOB.first_names_female_clf)]" - //surname + switch(new_human.gender) + if(FEMALE) + first_name = capitalize(pick(GLOB.first_names_female_clf)) + if(PLURAL, NEUTER) // Currently not possible here + first_name = capitalize(pick(MALE, FEMALE) == MALE ? pick(GLOB.first_names_male_clf) : pick(GLOB.first_names_female_clf)) + else // MALE + first_name = capitalize(pick(GLOB.first_names_male_clf)) + new_human.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache") if(prob(35)) last_name = "[capitalize(randomly_generate_japanese_word(rand(1, 4)))]" else last_name = "[pick(GLOB.last_names_clf)]" - //put them together - random_name = "[first_name] [last_name]" - new_human.change_real_name(new_human, random_name) + + new_human.change_real_name(new_human, "[first_name] [last_name]") new_human.age = rand(17,45) new_human.r_hair = 25 new_human.g_hair = 25 @@ -106,7 +103,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), @@ -172,7 +169,6 @@ role_comm_title = "TECH" minimap_icon = "clf_engi" - skills = /datum/skills/clf/combat_engineer /datum/equipment_preset/clf/engineer/load_gear(mob/living/carbon/human/new_human) @@ -227,7 +223,7 @@ list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), @@ -357,8 +353,8 @@ list("Medical Storage Rig", 0, /obj/item/storage/belt/medical, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -409,12 +405,14 @@ list("AUTOINJECTORS", 0, null, null, null), list("Autoinjector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Dylovene)", 1, /obj/item/reagent_container/hypospray/autoinjector/antitoxin, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Epinephrine)", 2, /obj/item/reagent_container/hypospray/autoinjector/adrenaline, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), - list("Autoinjector (Oxycodone)", 2, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Oxycodone)", 1, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Peridaxon)", 1, /obj/item/reagent_container/hypospray/autoinjector/peridaxon, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), - list("Autoinjector (Tricord)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Tricordrazine)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), list("PILL BOTTLES", 0, null, null, null), list("Pill Bottle (Bicaridine)", 5, /obj/item/storage/pill_bottle/bicaridine, null, VENDOR_ITEM_RECOMMENDED), @@ -422,6 +420,7 @@ list("Pill Bottle (Dylovene)", 5, /obj/item/storage/pill_bottle/antitox, null, VENDOR_ITEM_REGULAR), list("Pill Bottle (Inaprovaline)", 5, /obj/item/storage/pill_bottle/inaprovaline, null, VENDOR_ITEM_REGULAR), list("Pill Bottle (Kelotane)", 5, /obj/item/storage/pill_bottle/kelotane, null, VENDOR_ITEM_RECOMMENDED), + list("Pill Bottle (Oxycodone)", 5, /obj/item/storage/pill_bottle/oxycodone, null, VENDOR_ITEM_RECOMMENDED), list("Pill Bottle (Peridaxon)", 5, /obj/item/storage/pill_bottle/peridaxon, null, VENDOR_ITEM_REGULAR), list("Pill Bottle (Tramadol)", 5, /obj/item/storage/pill_bottle/tramadol, null, VENDOR_ITEM_RECOMMENDED), @@ -553,7 +552,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), @@ -677,7 +676,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), @@ -710,7 +709,7 @@ list("GENERAL SUPPLIES", 0, null, null, null), list("Megaphone", 5, /obj/item/device/megaphone, null, VENDOR_ITEM_REGULAR), - list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/clothing/accessory/device/whistle, null, VENDOR_ITEM_REGULAR), list("ENGINEERING SUPPLIES", 0, null, null, null), list("Entrenching Tool", 2, /obj/item/tool/shovel/etool, null, VENDOR_ITEM_REGULAR), @@ -727,13 +726,15 @@ list("Advanced Firstaid Kit", 12, /obj/item/storage/firstaid/adv, null, VENDOR_ITEM_REGULAR), list("Medical Splints", 1, /obj/item/stack/medical/splint, null, VENDOR_ITEM_REGULAR), - list("Injector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), - list("Injector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), - list("Injector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), - list("Injector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), - list("Injector (Oxycodone)", 2, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), - list("Injector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), - list("Injector (Tricord)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Dylovene)", 1, /obj/item/reagent_container/hypospray/autoinjector/antitoxin, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Oxycodone)", 1, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Peridaxon)", 1, /obj/item/reagent_container/hypospray/autoinjector/peridaxon, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Tricordrazine)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), list("Health Analyzer", 4, /obj/item/device/healthanalyzer, null, VENDOR_ITEM_REGULAR), list("Medical Helmet Optic", 4, /obj/item/device/helmet_visor/medical, null, VENDOR_ITEM_MANDATORY), @@ -780,19 +781,23 @@ access = get_access(ACCESS_LIST_CLF_ALL) /datum/equipment_preset/clf/synth/load_name(mob/living/carbon/human/new_human, randomise) - new_human.gender = pick(50;MALE,50;FEMALE) + new_human.gender = pick(MALE, FEMALE) + var/datum/preferences/A = new() A.randomize_appearance(new_human) + var/random_name if(prob(10)) random_name = "[capitalize(randomly_generate_japanese_word(rand(2, 3)))]" - else if(new_human.gender == MALE) - random_name = "[pick(GLOB.first_names_male_clf)]" else - random_name = "[pick(GLOB.first_names_female_clf)]" - - if(new_human.gender == MALE) - new_human.f_style = "5 O'clock Shadow" + switch(new_human.gender) + if(FEMALE) + random_name = capitalize(pick(GLOB.first_names_female_clf)) + if(PLURAL, NEUTER) // Currently not possible here + random_name = capitalize(pick(MALE, FEMALE) == MALE ? pick(GLOB.first_names_male_clf) : pick(GLOB.first_names_female_clf)) + else // MALE + random_name = capitalize(pick(GLOB.first_names_male_clf)) + new_human.f_style = "5 O'clock Shadow" new_human.change_real_name(new_human, random_name) new_human.r_hair = 15 @@ -886,7 +891,7 @@ list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -931,22 +936,24 @@ list("Roller Bed", 4, /obj/item/roller, null, VENDOR_ITEM_REGULAR), list("Stasis Bag", 6, /obj/item/bodybag/cryobag, null, VENDOR_ITEM_REGULAR), - list("Pillbottle (Bicaridine)", 5, /obj/item/storage/pill_bottle/bicaridine, null, VENDOR_ITEM_RECOMMENDED), - list("Pillbottle (Dexalin)", 5, /obj/item/storage/pill_bottle/dexalin, null, VENDOR_ITEM_REGULAR), - list("Pillbottle (Dylovene)", 5, /obj/item/storage/pill_bottle/antitox, null, VENDOR_ITEM_REGULAR), - list("Pillbottle (Inaprovaline)", 5, /obj/item/storage/pill_bottle/inaprovaline, null, VENDOR_ITEM_REGULAR), - list("Pillbottle (Kelotane)", 5, /obj/item/storage/pill_bottle/kelotane, null, VENDOR_ITEM_RECOMMENDED), - list("Pillbottle (Peridaxon)", 5, /obj/item/storage/pill_bottle/peridaxon, null, VENDOR_ITEM_REGULAR), - list("Pillbottle (Tramadol)", 5, /obj/item/storage/pill_bottle/tramadol, null, VENDOR_ITEM_RECOMMENDED), - - list("Injector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), - list("Injector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), - list("Injector (Epinephrine)", 2, /obj/item/reagent_container/hypospray/autoinjector/adrenaline, null, VENDOR_ITEM_REGULAR), - list("Injector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), - list("Injector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), - list("Injector (Oxycodone)", 2, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), - list("Injector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), - list("Injector (Tricord)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), + list("Pill Bottle (Bicaridine)", 5, /obj/item/storage/pill_bottle/bicaridine, null, VENDOR_ITEM_RECOMMENDED), + list("Pill Bottle (Dexalin)", 5, /obj/item/storage/pill_bottle/dexalin, null, VENDOR_ITEM_REGULAR), + list("Pill Bottle (Dylovene)", 5, /obj/item/storage/pill_bottle/antitox, null, VENDOR_ITEM_REGULAR), + list("Pill Bottle (Inaprovaline)", 5, /obj/item/storage/pill_bottle/inaprovaline, null, VENDOR_ITEM_REGULAR), + list("Pill Bottle (Kelotane)", 5, /obj/item/storage/pill_bottle/kelotane, null, VENDOR_ITEM_RECOMMENDED), + list("Pill Bottle (Peridaxon)", 5, /obj/item/storage/pill_bottle/peridaxon, null, VENDOR_ITEM_REGULAR), + list("Pill Bottle (Tramadol)", 5, /obj/item/storage/pill_bottle/tramadol, null, VENDOR_ITEM_RECOMMENDED), + + list("Autoinjector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Dylovene)", 1, /obj/item/reagent_container/hypospray/autoinjector/antitoxin, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Epinephrine)", 2, /obj/item/reagent_container/hypospray/autoinjector/adrenaline, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Oxycodone)", 1, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Peridaxon)", 1, /obj/item/reagent_container/hypospray/autoinjector/peridaxon, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Tricordrazine)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), list("Emergency Defibrillator", 4, /obj/item/device/defibrillator, null, VENDOR_ITEM_MANDATORY), list("Health Analyzer", 4, /obj/item/device/healthanalyzer, null, VENDOR_ITEM_REGULAR), @@ -961,7 +968,7 @@ list("Fulton Recovery Device", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), list("Motion Detector", 5, /obj/item/device/motiondetector, null, VENDOR_ITEM_REGULAR), list("Space Cleaner", 2, /obj/item/reagent_container/spray/cleaner, null, VENDOR_ITEM_REGULAR), - list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/clothing/accessory/device/whistle, null, VENDOR_ITEM_REGULAR), ) /datum/equipment_preset/clf/synth/combat @@ -1076,7 +1083,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), @@ -1109,7 +1116,7 @@ list("GENERAL SUPPLIES", 0, null, null, null), list("Megaphone", 5, /obj/item/device/megaphone, null, VENDOR_ITEM_REGULAR), - list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/clothing/accessory/device/whistle, null, VENDOR_ITEM_REGULAR), list("ENGINEERING SUPPLIES", 0, null, null, null), list("Entrenching Tool", 2, /obj/item/tool/shovel/etool, null, VENDOR_ITEM_REGULAR), @@ -1126,13 +1133,15 @@ list("Advanced Firstaid Kit", 12, /obj/item/storage/firstaid/adv, null, VENDOR_ITEM_REGULAR), list("Medical Splints", 1, /obj/item/stack/medical/splint, null, VENDOR_ITEM_REGULAR), - list("Injector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), - list("Injector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), - list("Injector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), - list("Injector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), - list("Injector (Oxycodone)", 2, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), - list("Injector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), - list("Injector (Tricord)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Dylovene)", 1, /obj/item/reagent_container/hypospray/autoinjector/antitoxin, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Oxycodone)", 1, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Peridaxon)", 1, /obj/item/reagent_container/hypospray/autoinjector/peridaxon, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Tricordrazine)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), list("Health Analyzer", 4, /obj/item/device/healthanalyzer, null, VENDOR_ITEM_REGULAR), list("Medical Helmet Optic", 4, /obj/item/device/helmet_visor/medical, null, VENDOR_ITEM_MANDATORY), @@ -1281,3 +1290,33 @@ spawn_rebel_weapon(new_human) spawn_rebel_weapon(new_human,1) + +/datum/equipment_preset/clf/specialist/hunted + name = "CLF Specialist (Hunted)" + faction = FACTION_HUNTED_CLF + +/datum/equipment_preset/clf/specialist/hunted/load_gear(mob/living/carbon/human/new_human) + var/obj/item/clothing/under/colonist/clf/terrorist = new() + var/obj/item/clothing/accessory/storage/webbing/five_slots/wearer = new() + terrorist.attach_accessory(new_human, wearer) + new_human.equip_to_slot_or_del(terrorist, WEAR_BODY) + + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/clf_patch, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/militia(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/headband/rebel(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/tool/screwdriver(new_human), WEAR_R_EAR) + new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet/tanto(new_human), WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/machete/full, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/flamer/survivor(new_human), WEAR_BACK) + + spawn_rebel_specialist_weapon(new_human, 1) diff --git a/code/modules/gear_presets/cmb.dm b/code/modules/gear_presets/cmb.dm index 69886bf5025c..905b8cf968a4 100644 --- a/code/modules/gear_presets/cmb.dm +++ b/code/modules/gear_presets/cmb.dm @@ -15,14 +15,13 @@ access = get_access(ACCESS_LIST_UA) /datum/equipment_preset/cmb/load_name(mob/living/carbon/human/new_human) - new_human.gender = pick(80;MALE,20;FEMALE) + new_human.gender = pick(MALE, FEMALE) var/datum/preferences/A = new() A.randomize_appearance(new_human) - var/random_name - random_name = capitalize(pick(new_human.gender == MALE ? GLOB.first_names_male : GLOB.first_names_female)) + " " + capitalize(pick(GLOB.last_names)) + var/random_name = random_name(new_human.gender) new_human.change_real_name(new_human, random_name) new_human.name = new_human.real_name - new_human.age = rand(22,45) + new_human.age = rand(20,45) var/static/list/colors = list("BLACK" = list(15, 15, 25), "BROWN" = list(102, 51, 0), "AUBURN" = list(139, 62, 19)) var/static/list/hair_colors = colors.Copy() + list("BLONDE" = list(197, 164, 30), "CARROT" = list(174, 69, 42)) @@ -42,11 +41,6 @@ new_human.f_style = pick("5 O'clock Shadow", "Shaved", "Full Beard", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache", "7 O'clock Shadow", "7 O'clock Moustache",) else new_human.h_style = pick("Ponytail 1", "Ponytail 2", "Ponytail 3", "Ponytail 4", "Pvt. Redding", "Pvt. Clarison", "Cpl. Dietrich", "Pvt. Vasquez", "Marine Bun", "Marine Bun 2", "Marine Flat Top",) - new_human.change_real_name(new_human, random_name) - new_human.age = rand(20,45) - new_human.r_hair = rand(15,35) - new_human.g_hair = rand(15,35) - new_human.b_hair = rand(25,45) /datum/equipment_preset/cmb/load_id(mob/living/carbon/human/new_human, client/mob_client) if(human_versus_human) @@ -542,18 +536,20 @@ new_human.allow_gun_usage = FALSE /datum/equipment_preset/cmb/synth/load_name(mob/living/carbon/human/new_human, randomise) - new_human.gender = pick(50;MALE,50;FEMALE) + new_human.gender = pick(MALE, FEMALE) + var/datum/preferences/A = new() A.randomize_appearance(new_human) - var/random_name - if(new_human.gender == MALE) - random_name = "[pick(GLOB.first_names_male)]" - else - random_name = "[pick(GLOB.first_names_female)]" - - if(new_human.gender == MALE) - new_human.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache") + var/random_name + switch(new_human.gender) + if(FEMALE) + random_name = capitalize(pick(GLOB.first_names_female)) + if(PLURAL, NEUTER) // Currently not possible + random_name = capitalize(pick(MALE, FEMALE) == MALE ? pick(GLOB.first_names_male) : pick(GLOB.first_names_female)) + else // MALE + random_name = capitalize(pick(GLOB.first_names_male)) + new_human.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache") new_human.change_real_name(new_human, random_name) new_human.h_style = pick("Crewcut", "Shaved Head", "Buzzcut", "Undercut", "Side Undercut") diff --git a/code/modules/gear_presets/contractor.dm b/code/modules/gear_presets/contractor.dm index 8a0578d145c9..3d7be49743fb 100644 --- a/code/modules/gear_presets/contractor.dm +++ b/code/modules/gear_presets/contractor.dm @@ -15,14 +15,13 @@ /datum/equipment_preset/contractor/load_name(mob/living/carbon/human/new_human) - new_human.gender = pick(60;MALE,40;FEMALE) + new_human.gender = pick(MALE, FEMALE) var/datum/preferences/A = new() A.randomize_appearance(new_human) - var/random_name - random_name = capitalize(pick(new_human.gender == MALE ? GLOB.first_names_male : GLOB.first_names_female)) + " " + capitalize(pick(GLOB.last_names)) + var/random_name = random_name(new_human.gender) new_human.change_real_name(new_human, random_name) new_human.name = new_human.real_name - new_human.age = rand(22,45) + new_human.age = rand(20,45) var/static/list/colors = list("BLACK" = list(15, 15, 25), "BROWN" = list(102, 51, 0), "AUBURN" = list(139, 62, 19)) var/static/list/hair_colors = colors.Copy() + list("BLONDE" = list(197, 164, 30), "CARROT" = list(174, 69, 42)) @@ -43,11 +42,6 @@ new_human.f_style = pick("5 O'clock Shadow", "Shaved", "Full Beard", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache", "7 O'clock Shadow", "7 O'clock Moustache",) else new_human.h_style = pick("Ponytail 1", "Ponytail 2", "Ponytail 3", "Ponytail 4", "Pvt. Redding", "Pvt. Clarison", "Cpl. Dietrich", "Pvt. Vasquez", "Marine Bun", "Marine Bun 2", "Marine Flat Top",) - new_human.change_real_name(new_human, random_name) - new_human.age = rand(20,45) - new_human.r_hair = rand(15,35) - new_human.g_hair = rand(15,35) - new_human.b_hair = rand(25,45) /datum/equipment_preset/contractor/load_id(mob/living/carbon/human/new_human, client/mob_client) if(human_versus_human) @@ -387,18 +381,20 @@ new_human.allow_gun_usage = FALSE /datum/equipment_preset/contractor/duty/synth/load_name(mob/living/carbon/human/new_human, randomise) - new_human.gender = pick(50;MALE,50;FEMALE) + new_human.gender = pick(MALE, FEMALE) + var/datum/preferences/A = new() A.randomize_appearance(new_human) - var/random_name - if(new_human.gender == MALE) - random_name = "[pick(GLOB.first_names_male)]" - else - random_name = "[pick(GLOB.first_names_female)]" - - if(new_human.gender == MALE) - new_human.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache") + var/random_name + switch(new_human.gender) + if(FEMALE) + random_name = capitalize(pick(GLOB.first_names_female)) + if(PLURAL, NEUTER) // Not currently possible + random_name = capitalize(pick(MALE, FEMALE) == MALE ? pick(GLOB.first_names_male) : pick(GLOB.first_names_female)) + else // MALE + random_name = capitalize(pick(GLOB.first_names_male)) + new_human.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache") new_human.change_real_name(new_human, random_name) new_human.h_style = pick("Crewcut", "Shaved Head", "Buzzcut", "Undercut", "Side Undercut") @@ -784,18 +780,20 @@ new_human.allow_gun_usage = FALSE /datum/equipment_preset/contractor/covert/synth/load_name(mob/living/carbon/human/new_human, randomise) - new_human.gender = pick(50;MALE,50;FEMALE) + new_human.gender = pick(MALE, FEMALE) + var/datum/preferences/A = new() A.randomize_appearance(new_human) - var/random_name - if(new_human.gender == MALE) - random_name = "[pick(GLOB.first_names_male)]" - else - random_name = "[pick(GLOB.first_names_female)]" - - if(new_human.gender == MALE) - new_human.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache") + var/random_name + switch(new_human.gender) + if(FEMALE) + random_name = capitalize(pick(GLOB.first_names_female)) + if(PLURAL, NEUTER) // Not currently possible + random_name = capitalize(pick(MALE, FEMALE) == MALE ? pick(GLOB.first_names_male) : pick(GLOB.first_names_female)) + else // MALE + random_name = capitalize(pick(GLOB.first_names_male)) + new_human.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache") new_human.change_real_name(new_human, random_name) new_human.h_style = pick("Crewcut", "Shaved Head", "Buzzcut", "Undercut", "Side Undercut") diff --git a/code/modules/gear_presets/corpses.dm b/code/modules/gear_presets/corpses.dm index 10510a59d4d5..5fbbf0a959ce 100644 --- a/code/modules/gear_presets/corpses.dm +++ b/code/modules/gear_presets/corpses.dm @@ -11,6 +11,7 @@ skills = /datum/skills/civilian idtype = /obj/item/card/id/lanyard var/xenovictim = FALSE //Set to true to make the corpse spawn as a victim of a xeno burst + selection_categories = list("Corpse") /datum/equipment_preset/corpse/load_languages(mob/living/carbon/human/new_human) return @@ -20,6 +21,7 @@ // These two values matter because they are checked on death for weed_food new_human.undefibbable = TRUE + SEND_SIGNAL(new_human, COMSIG_HUMAN_SET_UNDEFIBBABLE) if(xenovictim) new_human.chestburst = 2 @@ -783,7 +785,7 @@ languages = list(LANGUAGE_ENGLISH) assignment = JOB_WY_GOON job_title = JOB_WY_GOON - paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0) + paygrades = list(PAY_SHORT_WY_SEC = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/corpse/pmc/goon/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) @@ -837,7 +839,7 @@ flags = EQUIPMENT_PRESET_EXTRA assignment = JOB_WY_GOON job_title = JOB_WY_GOON - paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0) + paygrades = list(PAY_SHORT_WY_SEC = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/corpse/pmc/goon/kutjevo/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) @@ -855,6 +857,57 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/black, WEAR_R_STORE) +//*****************************************************************************************************/ + +//Trijent Goon + +/datum/equipment_preset/corpse/pmc/goon/trijent + name = "Corpse - Weyland-Yutani Corporate Security (Trijent Goon)" + flags = EQUIPMENT_PRESET_EXTRA + assignment = JOB_WY_GOON + job_title = JOB_WY_GOON + paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0) + +/datum/equipment_preset/corpse/pmc/goon/trijent/load_gear(mob/living/carbon/human/new_human) + + var/hat = rand(1,4) + switch(hat) + if(1 to 3) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate, WEAR_HEAD) + if(4) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/wy_cap, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/corporate/kutjevo, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate/knife, WEAR_FEET) + + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/pmc, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/wy/mod88_near_empty, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/black, WEAR_R_STORE) + + //Lead Goon + +/datum/equipment_preset/corpse/pmc/goon/lead/trijent + name = "Corpse - Weyland-Yutani Corporate Security Lead (Trijent Goon Lead)" + +/datum/equipment_preset/corpse/pmc/goon/lead/trijent/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/corporate/kutjevo/lead, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate/lead, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate/lead, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate/knife, WEAR_FEET) + + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/pmc, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/wy/mod88_near_empty, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/black, WEAR_R_STORE) + + //*****************************************************************************************************/ //Freelancer @@ -1123,7 +1176,7 @@ languages = list(LANGUAGE_ENGLISH) assignment = JOB_WY_GOON job_title = JOB_WY_GOON - paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0) + paygrades = list(PAY_SHORT_WY_SEC = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/corpse/pmc/hybrisa_goon/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) @@ -1451,6 +1504,73 @@ assignment = "NSPA Constable" xenovictim = TRUE +/datum/equipment_preset/corpse/hybrisa/nspa_constable/trijent + + name = "Corpse - Trijent NSPA Constable" + +/datum/equipment_preset/corpse/hybrisa/nspa_constable/trijent/load_gear(mob/living/carbon/human/new_human) + + var/choice = rand(1,16) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/blue, WEAR_EYES) + + switch(choice) + if(1 to 5) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/hybrisa/nspa_officer, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/full, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hybrisa/nspa_peaked_cap, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB/hybrisa/nspa_jacket, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) + if(6 to 7) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/hybrisa/nspa_officer, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/full, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hybrisa/nspa_peaked_cap, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB/hybrisa/nspa_formal_jacket, WEAR_JACKET) + if(8 to 10) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/hybrisa/nspa_officer/warm_weather, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/cmb, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/full, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hybrisa/nspa_peaked_cap, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/hybrisa/nspa_vest, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/slug, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/slug, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge/rubber, WEAR_IN_BACK) + if(10 to 12) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/hybrisa/nspa_officer/warm_weather, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/cmb, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/full, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hybrisa/nspa_peaked_cap, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB/hybrisa/nspa_hazard_jacket, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat, WEAR_HANDS) + if(12 to 14) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/hybrisa/nspa_officer/warm_weather, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/cmb, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/full, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hybrisa/nspa_peaked_cap_goldandsilver, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/nspa_hazard, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat, WEAR_HANDS) + if(14 to 16) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/hybrisa/nspa_officer, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/full, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hybrisa/nspa_peaked_cap_gold, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB/hybrisa/nspa_formal_jacket, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat, WEAR_HANDS) + ..() + +/datum/equipment_preset/corpse/hybrisa/nspa_constable/trijent/burst + + name = "Corpse - Burst - Trijent NSPA Constable" + assignment = "NSPA Constable" + xenovictim = TRUE + // KMCC Mining /datum/equipment_preset/corpse/hybrisa/kelland_miner diff --git a/code/modules/gear_presets/dust_raider.dm b/code/modules/gear_presets/dust_raider.dm index 3547b53ae8f4..33b79ae031f9 100644 --- a/code/modules/gear_presets/dust_raider.dm +++ b/code/modules/gear_presets/dust_raider.dm @@ -6,11 +6,10 @@ /datum/equipment_preset/dust_raider/load_name(mob/living/carbon/human/new_human) - new_human.gender = pick(60;MALE,40;FEMALE) + new_human.gender = pick(MALE, FEMALE) var/datum/preferences/A = new() A.randomize_appearance(new_human) - var/random_name - random_name = capitalize(pick(new_human.gender == MALE ? GLOB.first_names_male : GLOB.first_names_female)) + " " + capitalize(pick(GLOB.last_names)) + var/random_name = random_name(new_human.gender) new_human.change_real_name(new_human, random_name) new_human.name = new_human.real_name new_human.age = rand(21,45) diff --git a/code/modules/gear_presets/dutch.dm b/code/modules/gear_presets/dutch.dm index a26104e10a66..06f3736924ef 100644 --- a/code/modules/gear_presets/dutch.dm +++ b/code/modules/gear_presets/dutch.dm @@ -14,17 +14,23 @@ job_title = assignment /datum/equipment_preset/dutch/load_name(mob/living/carbon/human/new_human, randomise) - new_human.gender = pick(60;MALE,40;FEMALE) + new_human.gender = pick(MALE, FEMALE) + var/datum/preferences/human = new() human.randomize_appearance(new_human) - var/random_name - if(new_human.gender == MALE) - random_name = "[pick(GLOB.first_names_male_dutch)] [pick(GLOB.last_names)]" - new_human.f_style = "5 O'clock Shadow" - else - random_name = "[pick(GLOB.first_names_female_dutch)] [pick(GLOB.last_names)]" - new_human.change_real_name(new_human, random_name) + var/first_name + var/last_name = capitalize(pick(GLOB.last_names)) + switch(new_human.gender) + if(FEMALE) + first_name = capitalize(pick(GLOB.first_names_female_dutch)) + if(PLURAL, NEUTER) // Not currently possible + first_name = capitalize(pick(MALE, FEMALE) == MALE ? pick(GLOB.first_names_male_dutch) : pick(GLOB.first_names_female_dutch)) + else // MALE + first_name = capitalize(pick(GLOB.first_names_male_dutch)) + new_human.f_style = "5 O'clock Shadow" + + new_human.change_real_name(new_human, "[first_name] [last_name]") new_human.age = rand(25,35) new_human.r_hair = rand(10,30) new_human.g_hair = rand(10,30) @@ -35,8 +41,6 @@ idtype = /obj/item/card/id/dogtag /datum/equipment_preset/dutch/load_gear(mob/living/carbon/human/new_human) - - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/dutch(new_human), WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/storage/fancy/cigarettes/lucky_strikes(new_human), WEAR_IN_HELMET) new_human.equip_to_slot_or_del(new /obj/item/tool/lighter/zippo(new_human), WEAR_IN_HELMET) @@ -112,7 +116,7 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/emp_dutch(new_human), WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/jungle/knife(new_human), WEAR_FEET) - to_chat(new_human, SPAN_WARNING("You are a member of the Dutch's Dozen! You are fully aware of anything and everything regarding the Yautja, down to every minute detail. The Yautja mask on your leader's face serves to let the Yautja track you, or for you to place traps. The Yautja can detect their gear signatures, and will track this mask as soon as you arrive. The EMP grenades in your backpack have a very wide area range. They will interrupt Predator cloak and consume their bracer charge. REMEMBER: Your objective is to hunt, kill and loot the Predators planetside, and NOT hunt Xenomorphs.")) + to_chat(new_human, SPAN_WARNING("You are a member of the Dutch's Dozen! You are fully aware of anything and everything regarding the Yautja, down to every minute detail. The Yautja mask on your leader's face serves to let the Yautja track you, or for you to place traps. The Yautja can detect their gear signatures, and will track this mask as soon as you arrive. The EMP grenades in your backpack have a very wide area range. They will interrupt Predator cloak and consume their bracer charge. REMEMBER: Your objective is to hunt, kill and loot the Predators planetside, and NOT hunt Xenomorphs.")) /datum/equipment_preset/dutch/flamer name = JOB_DUTCH_FLAMETHROWER @@ -146,7 +150,7 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/jungle/knife(new_human), WEAR_FEET) - to_chat(new_human, SPAN_WARNING("You are a member of the Dutch's Dozen! You are fully aware of anything and everything regarding the Yautja, down to every minute detail. The Yautja mask on your leader's face serves to let the Yautja track you, or for you to place traps. The Yautja can detect their gear signatures, and will track this mask as soon as you arrive. The EMP grenades in your backpack have a very wide area range. They will interrupt Predator cloak and consume their bracer charge. REMEMBER: Your objective is to hunt, kill and loot the Predators planetside, and NOT hunt Xenomorphs.")) + to_chat(new_human, SPAN_WARNING("You are a member of the Dutch's Dozen! You are fully aware of anything and everything regarding the Yautja, down to every minute detail. The Yautja mask on your leader's face serves to let the Yautja track you, or for you to place traps. The Yautja can detect their gear signatures, and will track this mask as soon as you arrive. The EMP grenades in your backpack have a very wide area range. They will interrupt Predator cloak and consume their bracer charge. REMEMBER: Your objective is to hunt, kill and loot the Predators planetside, and NOT hunt Xenomorphs.")) /datum/equipment_preset/dutch/medic name = JOB_DUTCH_MEDIC @@ -189,7 +193,7 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/full_advanced(new_human), WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/jungle/knife(new_human), WEAR_FEET) - to_chat(new_human, SPAN_WARNING("You are a medic of the Dutch's Dozen! You are fully aware of anything and everything regarding the Yautja, down to every minute detail. The Yautja mask on your leader's face serves to let the Yautja track you, or for you to place traps. The Yautja can detect their gear signatures, and will track this mask as soon as you arrive. The EMP grenades in your backpack have a very wide area range. They will interrupt Predator cloak and consume their bracer charge. REMEMBER: Your objective is to help your team members hunt, kill and loot the Predators planetside, and NOT hunt Xenomorphs.")) + to_chat(new_human, SPAN_WARNING("You are a medic of the Dutch's Dozen! You are fully aware of anything and everything regarding the Yautja, down to every minute detail. The Yautja mask on your leader's face serves to let the Yautja track you, or for you to place traps. The Yautja can detect their gear signatures, and will track this mask as soon as you arrive. The EMP grenades in your backpack have a very wide area range. They will interrupt Predator cloak and consume their bracer charge. REMEMBER: Your objective is to help your team members hunt, kill and loot the Predators planetside, and NOT hunt Xenomorphs.")) /datum/equipment_preset/dutch/arnie name = "Dutch's Dozen - Arnold" @@ -238,4 +242,4 @@ new_human.set_species("Human Hero") //Arnold is STRONG. - to_chat(new_human, SPAN_WARNING("You are Dutch, the leader of the Dutch's Dozen! You are fully aware of anything and everything regarding the Yautja, down to every minute detail. The Yautja mask on your face serves to let the Yautja track you, or for you to place traps. The Yautja can detect their gear signatures, and will track this mask as soon as you arrive. The EMP grenades in your pouch have a very wide area range. They will interrupt Predator cloak and consume their bracer charge. REMEMBER: Your objective is to hunt, kill and loot the Predators planetside, and NOT hunt Xenomorphs.")) + to_chat(new_human, SPAN_WARNING("You are Dutch, the leader of the Dutch's Dozen! You are fully aware of anything and everything regarding the Yautja, down to every minute detail. The Yautja mask on your face serves to let the Yautja track you, or for you to place traps. The Yautja can detect their gear signatures, and will track this mask as soon as you arrive. The EMP grenades in your pouch have a very wide area range. They will interrupt Predator cloak and consume their bracer charge. REMEMBER: Your objective is to hunt, kill and loot the Predators planetside, and NOT hunt Xenomorphs.")) diff --git a/code/modules/gear_presets/fax_responders.dm b/code/modules/gear_presets/fax_responders.dm index bb086c455cb0..bd11d7965ff5 100644 --- a/code/modules/gear_presets/fax_responders.dm +++ b/code/modules/gear_presets/fax_responders.dm @@ -40,7 +40,7 @@ if(new_human.client && new_human.client.prefs) var/new_name = get_fax_responder_name(new_human.client) if(new_name) - final_name = new_name + final_name = capitalize_first_letters(new_name) new_human.change_real_name(new_human, final_name) diff --git a/code/modules/gear_presets/fun.dm b/code/modules/gear_presets/fun.dm index 93af507538e8..13a2f3e3f419 100644 --- a/code/modules/gear_presets/fun.dm +++ b/code/modules/gear_presets/fun.dm @@ -430,13 +430,13 @@ new_human.set_species(SPECIES_MONKEY) /datum/equipment_preset/fun/monkey/load_name(mob/living/carbon/human/new_human, randomise, client/mob_client) - new_human.gender = pick(60;MALE,40;FEMALE) + new_human.gender = pick(MALE, FEMALE) var/random_name = get_random_name(new_human) new_human.change_real_name(new_human, random_name) new_human.age = rand(1, 40) /datum/equipment_preset/fun/monkey/proc/get_random_name(mob/living/carbon/human/new_human) - return pick(GLOB.monkey_names) + return capitalize(pick(GLOB.monkey_names)) /datum/equipment_preset/fun/monkey/marine name = "Fun - Monkey Marine" diff --git a/code/modules/gear_presets/other.dm b/code/modules/gear_presets/other.dm index e80dae69542a..affbd038856e 100644 --- a/code/modules/gear_presets/other.dm +++ b/code/modules/gear_presets/other.dm @@ -18,16 +18,23 @@ access = get_access(ACCESS_LIST_EMERGENCY_RESPONSE) //ACCESS_COME_BACK_TO_ME /datum/equipment_preset/other/freelancer/load_name(mob/living/carbon/human/new_human, randomise) - new_human.gender = pick(60;MALE,40;FEMALE) + new_human.gender = pick(MALE, FEMALE) + var/datum/preferences/A = new() A.randomize_appearance(new_human) - var/random_name - if(new_human.gender == MALE) - random_name = "[pick(GLOB.first_names_male_colonist)] [pick(GLOB.last_names_colonist)]" - new_human.f_style = "5 O'clock Shadow" - else - random_name = "[pick(GLOB.first_names_female_colonist)] [pick(GLOB.last_names_colonist)]" - new_human.change_real_name(new_human, random_name) + + var/first_name + var/last_name = capitalize(pick(GLOB.last_names_colonist)) + switch(new_human.gender) + if(FEMALE) + first_name = capitalize(pick(GLOB.first_names_female_colonist)) + if(PLURAL, NEUTER) // Not currently possible + first_name = capitalize(pick(MALE, FEMALE) == MALE ? pick(GLOB.first_names_male_colonist) : pick(GLOB.first_names_female_colonist)) + else // MALE + first_name = capitalize(pick(GLOB.first_names_male_colonist)) + new_human.f_style = "5 O'clock Shadow" + + new_human.change_real_name(new_human, "[first_name] [last_name]") new_human.age = rand(20,45) new_human.r_hair = 25 new_human.g_hair = 25 @@ -83,7 +90,10 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/belt/shotgun, WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/C4, WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) - spawn_weapon(/obj/item/weapon/gun/shotgun/type23, pick(GLOB.shotgun_handfuls_8g), new_human, 0, 14) //shotgunner mini-spec + spawn_weapon(/obj/item/weapon/gun/shotgun/type23, pick(/obj/item/ammo_magazine/handful/shotgun/heavy/slug, + /obj/item/ammo_magazine/handful/shotgun/heavy/buckshot, + /obj/item/ammo_magazine/handful/shotgun/heavy/flechette, + /obj/item/ammo_magazine/handful/shotgun/heavy/dragonsbreath), new_human, 0, 14) //shotgunner mini-spec new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/stick, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/stick, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/stick, WEAR_IN_BACK) @@ -234,12 +244,6 @@ load_freelancer_soldier(new_human) - var/percentage = rand(1, 100) - switch(percentage) - if(1 to 66) - load_freelancer_rifleman(new_human) - else - load_freelancer_machinegunner(new_human) /datum/equipment_preset/other/freelancer/leader/hunted name = "Freelancer Leader (Hunted)" @@ -281,16 +285,23 @@ access = get_access(ACCESS_LIST_EMERGENCY_RESPONSE) /datum/equipment_preset/other/elite_merc/load_name(mob/living/carbon/human/new_human, randomise) - new_human.gender = pick(70;MALE,30;FEMALE) + new_human.gender = pick(MALE, FEMALE) + var/datum/preferences/A = new() A.randomize_appearance(new_human) - var/random_name - if(new_human.gender == MALE) - random_name = "[pick(GLOB.first_names_male_colonist)] [pick(GLOB.last_names_colonist)]" - new_human.f_style = "5 O'clock Shadow" - else - random_name = "[pick(GLOB.first_names_female_colonist)] [pick(GLOB.last_names_colonist)]" - new_human.change_real_name(new_human, random_name) + + var/first_name + var/last_name = capitalize(pick(GLOB.last_names_colonist)) + switch(new_human.gender) + if(FEMALE) + first_name = capitalize(pick(GLOB.first_names_female_colonist)) + if(PLURAL, NEUTER) // Not currently possible + first_name = capitalize(pick(MALE, FEMALE) == MALE ? pick(GLOB.first_names_male_colonist) : pick(GLOB.first_names_female_colonist)) + else // MALE + first_name = capitalize(pick(GLOB.first_names_male_colonist)) + new_human.f_style = "5 O'clock Shadow" + + new_human.change_real_name(new_human, "[first_name] [last_name]") new_human.age = rand(20,45) new_human.r_hair = rand(15,35) new_human.g_hair = rand(15,35) @@ -530,14 +541,10 @@ access = get_access(ACCESS_LIST_DELIVERY) /datum/equipment_preset/other/pizza/load_name(mob/living/carbon/human/new_human, randomise) - new_human.gender = pick(MALE,FEMALE) + new_human.gender = pick(MALE, FEMALE) var/datum/preferences/A = new() A.randomize_appearance(new_human) - var/random_name - if(new_human.gender == MALE) - random_name = "[pick(GLOB.first_names_male)] [pick(GLOB.last_names)]" - else - random_name = "[pick(GLOB.first_names_female)] [pick(GLOB.last_names)]" + var/random_name = random_name(new_human.gender) new_human.change_real_name(new_human, random_name) new_human.age = rand(17,45) @@ -627,7 +634,7 @@ new_human.gender = pick(MALE, FEMALE) var/datum/preferences/A = new A.randomize_appearance(new_human) - var/random_name = capitalize(pick(new_human.gender == MALE ? GLOB.first_names_male : GLOB.first_names_female)) + " " + capitalize(pick(GLOB.last_names)) + var/random_name = random_name(new_human.gender) new_human.change_real_name(new_human, random_name) new_human.age = rand(21,45) @@ -664,10 +671,21 @@ /datum/equipment_preset/other/gladiator/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = pick(MALE, FEMALE) + var/datum/preferences/A = new A.randomize_appearance(new_human) - var/random_name = capitalize(pick(new_human.gender == MALE ? GLOB.first_names_male_gladiator : GLOB.first_names_female_gladiator)) - new_human.change_real_name(new_human, random_name) + + var/first_name + var/last_name = capitalize(pick(GLOB.last_names_gladiator)) + switch(new_human.gender) + if(FEMALE) + first_name = capitalize(pick(GLOB.first_names_female_gladiator)) + if(PLURAL, NEUTER) // Not currently possible + first_name = capitalize(pick(MALE, FEMALE) == MALE ? pick(GLOB.first_names_male_gladiator) : pick(GLOB.first_names_female_gladiator)) + else // MALE + first_name = capitalize(pick(GLOB.first_names_male_gladiator)) + + new_human.change_real_name(new_human, "[first_name] [last_name]") new_human.age = rand(21,45) /datum/equipment_preset/other/gladiator/load_gear(mob/living/carbon/human/new_human) @@ -840,14 +858,13 @@ flags = EQUIPMENT_PRESET_EXTRA assignment = "DUMMY" job_title = "DUMMY" - paygrades = list(PAY_SHORT_CCMO) + paygrades = list(PAY_SHORT_CCMOC) idtype = /obj/item/card/id/dogtag uses_special_name = TRUE /datum/equipment_preset/other/professor_dummy/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = pick(MALE, FEMALE) - new_human.real_name = "Alex the Medical Mannequin" - new_human.name = new_human.real_name + new_human.change_real_name(new_human, "Alex the Medical Mannequin") new_human.age = rand(1,5) var/datum/preferences/A = new A.randomize_appearance(new_human) @@ -977,7 +994,7 @@ /datum/equipment_preset/uscm/tutorial_rifleman/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = pick(MALE, FEMALE) - var/mob_name = "[random_name(new_human.gender)]" + var/mob_name = random_name(new_human.gender) new_human.change_real_name(new_human, mob_name) var/datum/preferences/preferences = new preferences.randomize_appearance(new_human) @@ -1003,7 +1020,153 @@ /datum/equipment_preset/uscm_ship/uscm_medical/cmo/npc/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = pick(MALE, FEMALE) - var/mob_name = "[random_name(new_human.gender)]" + var/mob_name = random_name(new_human.gender) new_human.change_real_name(new_human, mob_name) var/datum/preferences/preferences = new preferences.randomize_appearance(new_human) + +///Hunting Grounds Historical Prey/// + +/datum/equipment_preset/other/hunted + name = "Hunted Warrior" + faction = FACTION_HUNTED_MISC + faction_group = FACTION_LIST_HUNTED + flags = EQUIPMENT_PRESET_EXTRA + +/datum/equipment_preset/other/hunted/roman + name = "Roman Legionary (Hunted)" + languages = list(LANGUAGE_FORGOTTEN) + idtype = null + skills = /datum/skills/gladiator/legionary + assignment = "Legionary" + job_title = "Legionnaire" + +/datum/equipment_preset/other/hunted/roman/load_name(mob/living/carbon/human/new_human, randomise) + new_human.gender = pick(MALE, FEMALE) + + var/datum/preferences/A = new + A.randomize_appearance(new_human) + + var/first_name + var/last_name = capitalize(pick(GLOB.last_names_gladiator)) + switch(new_human.gender) + if(FEMALE) + first_name = capitalize(pick(GLOB.first_names_female_gladiator)) + if(PLURAL, NEUTER) // Not currently possible + first_name = capitalize(pick(MALE, FEMALE) == MALE ? pick(GLOB.first_names_male_gladiator) : pick(GLOB.first_names_female_gladiator)) + else // MALE + first_name = capitalize(pick(GLOB.first_names_male_gladiator)) + + new_human.change_real_name(new_human, "[first_name] [last_name]") + new_human.age = rand(21,45) + +/datum/equipment_preset/other/hunted/roman/load_languages(mob/living/carbon/human/new_human, client/mob_client) + new_human.set_languages(list(LANGUAGE_FORGOTTEN)) + +/datum/equipment_preset/other/hunted/roman/load_traits(mob/living/carbon/human/new_human, client/mob_client) + return + +/datum/equipment_preset/other/hunted/roman/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/roman, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/tunic, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/roman, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/footwrap_sandals, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/roman, WEAR_R_HAND) + new_human.equip_to_slot_or_del(new /obj/item/weapon/sword/gladius, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/hunted, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/lantern/on, WEAR_R_STORE) + new_human.set_species("Human Hero") + new_human.universal_understand = FALSE + new_human.status_flags &= ~NO_PERMANENT_DAMAGE + new_human.status_flags |= STATUS_FLAGS_DEBILITATE + +/datum/equipment_preset/other/hunted/roman/centurion + name = "Roman Centurion (Hunted)" + assignment = "Centurion" + job_title = "Legionnaire" + +/datum/equipment_preset/other/hunted/roman/centurion/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/roman/centurion, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/tunic, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/roman/centurion, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/footwrap_sandals, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/roman, WEAR_R_HAND) + new_human.equip_to_slot_or_del(new /obj/item/weapon/javelin, WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/weapon/sword/gladius, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/hunted, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/lantern/on, WEAR_R_STORE) + new_human.set_species("Human Hero") + new_human.universal_understand = FALSE + new_human.status_flags &= ~NO_PERMANENT_DAMAGE + new_human.status_flags |= STATUS_FLAGS_DEBILITATE + +/datum/equipment_preset/other/hunted/roman/eaglebearer + name = "Roman Aquilifer (Hunted)" + assignment = "Aquilifer" + job_title = "Legionnaire" + skills = /datum/skills/gladiator/legionary/eaglebearer + +/datum/equipment_preset/other/hunted/roman/eaglebearer/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/roman/eaglebearer, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/tunic, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/roman/centurion, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/footwrap_sandals, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/aquilastaff, WEAR_R_HAND) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/hunted, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/lantern/on, WEAR_R_STORE) + new_human.set_species("Human Hero") + new_human.universal_understand = FALSE + new_human.status_flags &= ~NO_PERMANENT_DAMAGE + new_human.status_flags |= STATUS_FLAGS_DEBILITATE + +/datum/equipment_preset/other/hunted/vietnam + name = "Vietnam US Army Rifleman (Hunted)" + idtype = /obj/item/card/id/dogtag + skills = /datum/skills/dutchmerc + assignment = JOB_SQUAD_MARINE + job_title = JOB_SQUAD_MARINE + paygrades = list(PAY_SHORT_ME1 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME2 = JOB_PLAYTIME_TIER_1, PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_3) + role_comm_title = "RFN" + +/datum/equipment_preset/other/hunted/vietnam/load_name(mob/living/carbon/human/new_human, randomise) + new_human.gender = pick(MALE, FEMALE) + + var/datum/preferences/A = new() + A.randomize_appearance(new_human) + + var/first_name + var/last_name = capitalize(pick(GLOB.last_names_colonist)) + switch(new_human.gender) + if(FEMALE) + first_name = capitalize(pick(GLOB.first_names_female_colonist)) + if(PLURAL, NEUTER) // Not currently possible + first_name = capitalize(pick(MALE, FEMALE) == MALE ? pick(GLOB.first_names_male_colonist) : pick(GLOB.first_names_female_colonist)) + else // MALE + first_name = capitalize(pick(GLOB.first_names_male_colonist)) + new_human.f_style = "5 O'clock Shadow" + + new_human.change_real_name(new_human, "[first_name] [last_name]") + new_human.age = rand(20,45) + new_human.r_hair = 25 + new_human.g_hair = 25 + new_human.b_hair = 35 + +/datum/equipment_preset/other/hunted/vietnam/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/dutch/vietnam(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/storage/fancy/cigarettes/lucky_strikes(new_human), WEAR_IN_HELMET) + new_human.equip_to_slot_or_del(new /obj/item/tool/lighter/zippo(new_human), WEAR_IN_HELMET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/dutch/vietnam(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/dutch(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster(new_human), WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m1911(new_human), WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(new_human), WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(new_human), WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/jungle/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m16(new_human), WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16/ap(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16/ap(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/dutch/m16/ap(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/m16/ap(new_human), WEAR_L_STORE) diff --git a/code/modules/gear_presets/pmc.dm b/code/modules/gear_presets/pmc.dm index ed2559ff0c84..18c55a252fd1 100644 --- a/code/modules/gear_presets/pmc.dm +++ b/code/modules/gear_presets/pmc.dm @@ -20,29 +20,30 @@ return /datum/equipment_preset/pmc/load_name(mob/living/carbon/human/new_human, randomise) - new_human.gender = pick(MALE,FEMALE) - var/random_name - var/first_name - var/last_name + new_human.gender = pick(MALE, FEMALE) + var/datum/preferences/A = new() A.randomize_appearance(new_human) - if(new_human.gender == MALE) - if(prob(10)) - first_name = "[capitalize(randomly_generate_japanese_word(rand(2, 3)))]" - else - first_name = "[pick(GLOB.first_names_male_pmc)]" - new_human.f_style = "5 O'clock Shadow" + + var/first_name + var/last_name + if(prob(10)) + first_name = capitalize(randomly_generate_japanese_word(rand(2, 3))) else - if(prob(10)) - first_name = "[capitalize(randomly_generate_japanese_word(rand(2, 3)))]" - else - first_name = "[pick(GLOB.first_names_female_pmc)]" + switch(new_human.gender) + if(FEMALE) + first_name = capitalize(pick(GLOB.first_names_female_pmc)) + if(PLURAL, NEUTER) // Not currently possible + first_name = capitalize(pick(MALE, FEMALE) == MALE ? pick(GLOB.first_names_male_pmc) : pick(GLOB.first_names_female_pmc)) + else // MALE + first_name = capitalize(pick(GLOB.first_names_male_pmc)) + new_human.f_style = "5 O'clock Shadow" if(prob(25)) - last_name = "[capitalize(randomly_generate_japanese_word(rand(2, 4)))]" + last_name = capitalize(randomly_generate_japanese_word(rand(2, 4))) else - last_name = "[pick(GLOB.last_names_pmc)]" - random_name = "[first_name] [last_name]" - new_human.change_real_name(new_human, random_name) + last_name = pick(GLOB.last_names_pmc) + new_human.change_real_name(new_human, "[first_name] [last_name]") + new_human.age = rand(25,35) new_human.h_style = "Shaved Head" new_human.r_hair = 25 @@ -182,7 +183,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), @@ -240,17 +241,17 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), ) //*****************************************************************************************************/ -/datum/equipment_preset/pmc/pmc_detainer - name = "Weyland-Yutani PMC (Detainer)" +/datum/equipment_preset/pmc/pmc_security + name = "Weyland-Yutani PMC (Security)" flags = EQUIPMENT_PRESET_EXTRA - assignment = JOB_PMC_DETAINER - job_title = JOB_PMC_DETAINER + assignment = JOB_PMC_SECURITY + job_title = JOB_PMC_SECURITY minimap_icon = "pmc_mp" paygrades = list(PAY_SHORT_PMC_EN = JOB_PLAYTIME_TIER_0) skills = /datum/skills/pmc -/datum/equipment_preset/pmc/pmc_detainer/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/pmc/pmc_security/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/guard, WEAR_BODY) @@ -289,7 +290,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), new_human.equip_to_slot_or_del(new /obj/item/storage/box/zipcuffs/small, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/flash, WEAR_IN_BACK) -/datum/equipment_preset/pmc/pmc_detainer/get_antag_clothing_equipment() +/datum/equipment_preset/pmc/pmc_security/get_antag_clothing_equipment() return list( list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), list("Boots", 0, /obj/item/clothing/shoes/veteran/pmc/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY), @@ -319,7 +320,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), @@ -339,7 +340,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), ) -/datum/equipment_preset/pmc/pmc_detainer/get_antag_gear_equipment() +/datum/equipment_preset/pmc/pmc_security/get_antag_gear_equipment() return list( list("ENGINEERING SUPPLIES", 0, null, null, null), list("Entrenching Tool", 2, /obj/item/tool/shovel/etool, null, VENDOR_ITEM_RECOMMENDED), @@ -407,21 +408,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/pmc, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/mre/pmc, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/shotgun/black, WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/slug/es7, WEAR_IN_BELT) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/slug/es7, WEAR_IN_BELT) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/slug/es7, WEAR_IN_BELT) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/slug/es7, WEAR_IN_BELT) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/slug/es7, WEAR_IN_BELT) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/slug/es7, WEAR_IN_BELT) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/slug/es7, WEAR_IN_BELT) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag/es7, WEAR_IN_BELT) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag/es7, WEAR_IN_BELT) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag/es7, WEAR_IN_BELT) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag/es7, WEAR_IN_BELT) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag/es7, WEAR_IN_BELT) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag/es7, WEAR_IN_BELT) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag/es7, WEAR_IN_BELT) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/shotgun/black/es7_mixed, WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert/wy, WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/es7/tactical, WEAR_J_STORE) @@ -521,7 +508,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -537,6 +524,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Pressurized Reagent Canister Pouch (Revival Mix - Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival_tricord, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (Revival Mix - Peridaxon)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival_peri, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (Field Anesthetic)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/oxycodone, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), @@ -570,12 +558,14 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("AUTOINJECTORS", 0, null, null, null), list("Autoinjector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Dylovene)", 1, /obj/item/reagent_container/hypospray/autoinjector/antitoxin, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Epinephrine)", 2, /obj/item/reagent_container/hypospray/autoinjector/adrenaline, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), - list("Autoinjector (Oxycodone)", 2, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Oxycodone)", 1, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Peridaxon)", 1, /obj/item/reagent_container/hypospray/autoinjector/peridaxon, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), - list("Autoinjector (Tricord)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Tricordrazine)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), list("PILL BOTTLES", 0, null, null, null), list("Pill Bottle (Bicaridine)", 5, /obj/item/storage/pill_bottle/bicaridine, null, VENDOR_ITEM_RECOMMENDED), @@ -583,6 +573,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Pill Bottle (Dylovene)", 5, /obj/item/storage/pill_bottle/antitox, null, VENDOR_ITEM_REGULAR), list("Pill Bottle (Inaprovaline)", 5, /obj/item/storage/pill_bottle/inaprovaline, null, VENDOR_ITEM_REGULAR), list("Pill Bottle (Kelotane)", 5, /obj/item/storage/pill_bottle/kelotane, null, VENDOR_ITEM_RECOMMENDED), + list("Pill Bottle (Oxycodone)", 5, /obj/item/storage/pill_bottle/oxycodone, null, VENDOR_ITEM_RECOMMENDED), list("Pill Bottle (Peridaxon)", 5, /obj/item/storage/pill_bottle/peridaxon, null, VENDOR_ITEM_REGULAR), list("Pill Bottle (Tramadol)", 5, /obj/item/storage/pill_bottle/tramadol, null, VENDOR_ITEM_RECOMMENDED), @@ -711,7 +702,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -727,6 +718,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Pressurized Reagent Canister Pouch (Revival Mix - Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival_tricord, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (Revival Mix - Peridaxon)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival_peri, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (Field Anesthetic)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/oxycodone, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), @@ -760,12 +752,14 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("AUTOINJECTORS", 0, null, null, null), list("Autoinjector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Dylovene)", 1, /obj/item/reagent_container/hypospray/autoinjector/antitoxin, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Epinephrine)", 2, /obj/item/reagent_container/hypospray/autoinjector/adrenaline, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), - list("Autoinjector (Oxycodone)", 2, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Oxycodone)", 1, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Peridaxon)", 1, /obj/item/reagent_container/hypospray/autoinjector/peridaxon, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), - list("Autoinjector (Tricord)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Tricordrazine)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), list("PILL BOTTLES", 0, null, null, null), list("Pill Bottle (Bicaridine)", 5, /obj/item/storage/pill_bottle/bicaridine, null, VENDOR_ITEM_RECOMMENDED), @@ -773,6 +767,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Pill Bottle (Dylovene)", 5, /obj/item/storage/pill_bottle/antitox, null, VENDOR_ITEM_REGULAR), list("Pill Bottle (Inaprovaline)", 5, /obj/item/storage/pill_bottle/inaprovaline, null, VENDOR_ITEM_REGULAR), list("Pill Bottle (Kelotane)", 5, /obj/item/storage/pill_bottle/kelotane, null, VENDOR_ITEM_RECOMMENDED), + list("Pill Bottle (Oxycodone)", 5, /obj/item/storage/pill_bottle/oxycodone, null, VENDOR_ITEM_RECOMMENDED), list("Pill Bottle (Peridaxon)", 5, /obj/item/storage/pill_bottle/peridaxon, null, VENDOR_ITEM_REGULAR), list("Pill Bottle (Tramadol)", 5, /obj/item/storage/pill_bottle/tramadol, null, VENDOR_ITEM_RECOMMENDED), @@ -900,7 +895,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Autoinjector Pouch (Full)", 0, /obj/item/storage/pouch/autoinjector/full/wy, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -930,7 +925,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Essential SL Set", 0, /obj/effect/essentials_set/leader/upp, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), list("GENERAL SUPPLIES", 0, null, null, null), - list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/clothing/accessory/device/whistle, null, VENDOR_ITEM_REGULAR), list("ENGINEERING SUPPLIES", 0, null, null, null), list("Entrenching Tool", 2, /obj/item/tool/shovel/etool, null, VENDOR_ITEM_REGULAR), @@ -1047,7 +1042,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Autoinjector Pouch (Full)", 0, /obj/item/storage/pouch/autoinjector/full/wy, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -1077,7 +1072,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Essential SL Set", 0, /obj/effect/essentials_set/leader/upp, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), list("GENERAL SUPPLIES", 0, null, null, null), - list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/clothing/accessory/device/whistle, null, VENDOR_ITEM_REGULAR), list("ENGINEERING SUPPLIES", 0, null, null, null), list("Entrenching Tool", 2, /obj/item/tool/shovel/etool, null, VENDOR_ITEM_REGULAR), @@ -1176,7 +1171,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), @@ -1207,7 +1202,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Sandbags x25", 10, /obj/item/stack/sandbags_empty/half, null, VENDOR_ITEM_RECOMMENDED), list("SPECIAL AMMUNITION", 0, null, null, null), - list("Irradiated smartgun drum (10x28mm)", 15, /obj/item/ammo_magazine/smartgun/dirty, null, VENDOR_ITEM_REGULAR), + list("Irradiated smartgun drum (10x28mm)", 15, /obj/item/ammo_magazine/smartgun, null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), @@ -1301,7 +1296,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), @@ -1417,7 +1412,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Autoinjector Pouch (Full)", 0, /obj/item/storage/pouch/autoinjector/full/wy, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -1447,7 +1442,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Essential SL Set", 0, /obj/effect/essentials_set/leader/upp, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), list("GENERAL SUPPLIES", 0, null, null, null), - list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/clothing/accessory/device/whistle, null, VENDOR_ITEM_REGULAR), list("ENGINEERING SUPPLIES", 0, null, null, null), list("Entrenching Tool", 2, /obj/item/tool/shovel/etool, null, VENDOR_ITEM_REGULAR), @@ -1568,7 +1563,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -1584,6 +1579,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Pressurized Reagent Canister Pouch (Revival Mix - Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival_tricord, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (Revival Mix - Peridaxon)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival_peri, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (Field Anesthetic)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/oxycodone, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), @@ -1617,12 +1613,14 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("AUTOINJECTORS", 0, null, null, null), list("Autoinjector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Dylovene)", 1, /obj/item/reagent_container/hypospray/autoinjector/antitoxin, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Epinephrine)", 2, /obj/item/reagent_container/hypospray/autoinjector/adrenaline, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), - list("Autoinjector (Oxycodone)", 2, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Oxycodone)", 1, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Peridaxon)", 1, /obj/item/reagent_container/hypospray/autoinjector/peridaxon, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), - list("Autoinjector (Tricord)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Tricordrazine)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), list("PILL BOTTLES", 0, null, null, null), list("Pill Bottle (Bicaridine)", 5, /obj/item/storage/pill_bottle/bicaridine, null, VENDOR_ITEM_RECOMMENDED), @@ -1630,6 +1628,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Pill Bottle (Dylovene)", 5, /obj/item/storage/pill_bottle/antitox, null, VENDOR_ITEM_REGULAR), list("Pill Bottle (Inaprovaline)", 5, /obj/item/storage/pill_bottle/inaprovaline, null, VENDOR_ITEM_REGULAR), list("Pill Bottle (Kelotane)", 5, /obj/item/storage/pill_bottle/kelotane, null, VENDOR_ITEM_RECOMMENDED), + list("Pill Bottle (Oxycodone)", 5, /obj/item/storage/pill_bottle/oxycodone, null, VENDOR_ITEM_RECOMMENDED), list("Pill Bottle (Peridaxon)", 5, /obj/item/storage/pill_bottle/peridaxon, null, VENDOR_ITEM_REGULAR), list("Pill Bottle (Tramadol)", 5, /obj/item/storage/pill_bottle/tramadol, null, VENDOR_ITEM_RECOMMENDED), @@ -1758,7 +1757,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), @@ -1888,19 +1887,22 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), /datum/equipment_preset/pmc/synth/load_name(mob/living/carbon/human/new_human, randomise) - new_human.gender = pick(50;MALE,50;FEMALE) + new_human.gender = pick(MALE, FEMALE) + var/datum/preferences/A = new() A.randomize_appearance(new_human) + var/random_name if(prob(10)) random_name = "[capitalize(randomly_generate_japanese_word(rand(2, 3)))]" - else if(new_human.gender == MALE) - random_name = "[pick(GLOB.first_names_male_pmc)]" - else - random_name = "[pick(GLOB.first_names_female_pmc)]" - - if(new_human.gender == MALE) - new_human.f_style = "5 O'clock Shadow" + switch(new_human.gender) + if(FEMALE) + random_name = capitalize(pick(GLOB.first_names_female_pmc)) + if(PLURAL, NEUTER) // Not currently possible + random_name = capitalize(pick(MALE, FEMALE) == MALE ? pick(GLOB.first_names_male_pmc) : pick(GLOB.first_names_female_pmc)) + else // MALE + random_name = capitalize(pick(GLOB.first_names_male_pmc)) + new_human.f_style = "5 O'clock Shadow" new_human.change_real_name(new_human, random_name) new_human.r_hair = 15 @@ -1976,6 +1978,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Surgical Webbing Vest (Equipped)", 0, /obj/item/clothing/accessory/storage/surg_vest/equipped, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), list("Surgical Webbing Vest (Blue)(Equipped)", 0, /obj/item/clothing/accessory/storage/surg_vest/blue/equipped, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), list("Tool Webbing", 0, /obj/item/clothing/accessory/storage/tool_webbing/equipped, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Tool Drop Pouch", 0, /obj/item/clothing/accessory/storage/tool_webbing/yellow_drop/equipped, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), list("BACKPACK (CHOOSE 1)", 0, null, null, null), @@ -2002,7 +2005,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Document Pouch", 0, /obj/item/storage/pouch/document, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -2017,6 +2020,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Pressurized Reagent Canister Pouch (Revival Mix - Peridaxon)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival_peri, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pressurized Reagent Canister Pouch (Oxycodone)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/oxycodone, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pressurized Reagent Canister Pouch (Field Anesthetic)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/oxycodone, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Machete Pouch (Full)", 0, /obj/item/storage/pouch/machete/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -2044,12 +2048,14 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("AUTOINJECTORS", 0, null, null, null), list("Autoinjector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Dylovene)", 1, /obj/item/reagent_container/hypospray/autoinjector/antitoxin, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Epinephrine)", 2, /obj/item/reagent_container/hypospray/autoinjector/adrenaline, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), - list("Autoinjector (Oxycodone)", 2, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Oxycodone)", 1, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Peridaxon)", 1, /obj/item/reagent_container/hypospray/autoinjector/peridaxon, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), - list("Autoinjector (Tricord)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Tricordrazine)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), list("PILL BOTTLES", 0, null, null, null), list("Pill Bottle (Bicaridine)", 5, /obj/item/storage/pill_bottle/bicaridine, null, VENDOR_ITEM_RECOMMENDED), @@ -2057,6 +2063,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Pill Bottle (Dylovene)", 5, /obj/item/storage/pill_bottle/antitox, null, VENDOR_ITEM_REGULAR), list("Pill Bottle (Inaprovaline)", 5, /obj/item/storage/pill_bottle/inaprovaline, null, VENDOR_ITEM_REGULAR), list("Pill Bottle (Kelotane)", 5, /obj/item/storage/pill_bottle/kelotane, null, VENDOR_ITEM_RECOMMENDED), + list("Pill Bottle (Oxycodone)", 5, /obj/item/storage/pill_bottle/oxycodone, null, VENDOR_ITEM_RECOMMENDED), list("Pill Bottle (Peridaxon)", 5, /obj/item/storage/pill_bottle/peridaxon, null, VENDOR_ITEM_REGULAR), list("Pill Bottle (Tramadol)", 5, /obj/item/storage/pill_bottle/tramadol, null, VENDOR_ITEM_RECOMMENDED), @@ -2087,3 +2094,100 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Drop Pouch", 10, /obj/item/clothing/accessory/storage/droppouch, null, VENDOR_ITEM_REGULAR), ) +///Hunting Grounds PMC/// + +/datum/equipment_preset/pmc/pmc_standard/hunted + name = "Weyland-Yutani PMC (Standard) (Hunted)" + faction = FACTION_HUNTED_PMC + +/datum/equipment_preset/pmc/pmc_standard/hunted/load_gear(mob/living/carbon/human/new_human) + var/obj/item/clothing/under/marine/veteran/pmc/uniform = new() + if(prob(50)) + uniform.roll_suit_sleeves() + new_human.equip_to_slot_or_del(uniform, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/wy_faction, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/stack/medical/splint, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert/wy, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/pmc/backpack, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/enclosed, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/no_lamp, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/nsg23, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/wy/mod88, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/wy/nsg_ext, WEAR_L_STORE) + +/datum/equipment_preset/pmc/pmc_medic/hunted + name = "Weyland-Yutani PMC (Corporate Medic) (Hunted)" + faction = FACTION_HUNTED_PMC + +/datum/equipment_preset/pmc/pmc_medic/hunted/load_gear(mob/living/carbon/human/new_human) + + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/wy_faction, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/mre/pmc, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/mre/pmc, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/tool/lighter/zippo/blue, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/pmc, WEAR_IN_ACCESSORY) + if(new_human.disabilities & NEARSIGHTED) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(new_human), WEAR_EYES) + else + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/pmc/medic, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/low_charge, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/wy/partial, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/wy, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/surgical_case/regular, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/FixOVein, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/blood/OMinus, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/fp9000/pmc, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/wy/pmc_p90, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/fp9000, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/fp9000, WEAR_IN_JACKET) + +/datum/equipment_preset/pmc/technician/hunted + name = "Weyland-Yutani PMC (Corporate Technician) (Hunted)" + faction = FACTION_HUNTED_PMC + +/datum/equipment_preset/pmc/technician/hunted/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/enclosed/engineer, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/engineer, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/mre/pmc, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/pmc, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/engineer, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/wy/nsg23_pmc, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/wy_faction, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/nsg23/stripped, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/sebb, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/engineerpack/ert/pmc, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tactical, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/screwdriver/tactical, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/wirecutters/tactical, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/wrench, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/stack/cable_coil, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/multitool, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert/wy, WEAR_R_STORE) diff --git a/code/modules/gear_presets/royal_marines.dm b/code/modules/gear_presets/royal_marines.dm index 546c7e1ca63c..1a3125a4ebd4 100644 --- a/code/modules/gear_presets/royal_marines.dm +++ b/code/modules/gear_presets/royal_marines.dm @@ -7,10 +7,13 @@ minimap_background = "background_twe" /datum/equipment_preset/twe/royal_marine/load_name(mob/living/carbon/human/new_human, randomise) - new_human.gender = pick_weight(list(MALE = 80, FEMALE = 20,)) + new_human.gender = pick(MALE, FEMALE) var/datum/preferences/placeholder_pref = new() placeholder_pref.randomize_appearance(new_human) - var/random_name + var/random_name = random_name(new_human.gender) + new_human.change_real_name(new_human, random_name) + new_human.age = rand(20,45) + var/static/list/colors = list("BLACK" = list(15, 15, 25), "BROWN" = list(102, 51, 0), "AUBURN" = list(139, 62, 19)) var/static/list/hair_colors = colors.Copy() + list("BLONDE" = list(197, 164, 30), "CARROT" = list(174, 69, 42)) var/hair_color = pick(hair_colors) @@ -26,17 +29,10 @@ new_human.b_eyes = colors[eye_color][3] idtype = /obj/item/card/id/dogtag if(new_human.gender == MALE) - random_name = "[pick(GLOB.first_names_male)] [pick(GLOB.last_names)]" new_human.h_style = pick("Crewcut", "Shaved Head", "Buzzcut", "Undercut", "Side Undercut", "Pvt. Joker", "Marine Fade", "Low Fade", "Medium Fade", "High Fade", "No Fade", "Coffee House Cut", "Flat Top",) new_human.f_style = pick("5 O'clock Shadow", "Shaved", "Full Beard", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache", "7 O'clock Shadow", "7 O'clock Moustache",) else - random_name = "[pick(GLOB.first_names_female)] [pick(GLOB.last_names)]" new_human.h_style = pick("Ponytail 1", "Ponytail 2", "Ponytail 3", "Ponytail 4", "Pvt. Redding", "Pvt. Clarison", "Cpl. Dietrich", "Pvt. Vasquez", "Marine Bun", "Marine Bun 2", "Marine Flat Top",) - new_human.change_real_name(new_human, random_name) - new_human.age = rand(20,45) - new_human.r_hair = rand(15,35) - new_human.g_hair = rand(15,35) - new_human.b_hair = rand(25,45) /datum/equipment_preset/twe/royal_marine/load_id(mob/living/carbon/human/new_human, client/mob_client) if(human_versus_human) @@ -157,7 +153,7 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/rmc/incin, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/rmc/he, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/mre/twe, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l42a/ap, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l64/ap, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/m94, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large, WEAR_L_STORE) diff --git a/code/modules/gear_presets/survivors/fiorina_sciannex/preset_fiorina_sciannex.dm b/code/modules/gear_presets/survivors/fiorina_sciannex/preset_fiorina_sciannex.dm index 21d853ef5456..a82df629cb03 100644 --- a/code/modules/gear_presets/survivors/fiorina_sciannex/preset_fiorina_sciannex.dm +++ b/code/modules/gear_presets/survivors/fiorina_sciannex/preset_fiorina_sciannex.dm @@ -58,6 +58,7 @@ faction = FACTION_SURVIVOR minimap_icon = "mp" minimap_background = "background_ua" + /datum/equipment_preset/survivor/colonial_marshal/fiorina/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/ua_riot(new_human), WEAR_BODY) diff --git a/code/modules/gear_presets/survivors/fiorina_sciannex/riot_in_progress_insert_fiorina_nightmare.dm b/code/modules/gear_presets/survivors/fiorina_sciannex/riot_in_progress_insert_fiorina_nightmare.dm index 2f4a349bef76..1188026c1c3e 100644 --- a/code/modules/gear_presets/survivors/fiorina_sciannex/riot_in_progress_insert_fiorina_nightmare.dm +++ b/code/modules/gear_presets/survivors/fiorina_sciannex/riot_in_progress_insert_fiorina_nightmare.dm @@ -160,7 +160,7 @@ assignment = "United Americas Police Officer" skills = /datum/skills/civilian/survivor/marshal minimap_icon = "mp" - minimap_background = "background_ua" + minimap_background = "background_cmb" idtype = /obj/item/card/id/silver /datum/equipment_preset/survivor/cmb/ua/load_gear(mob/living/carbon/human/new_human) @@ -245,7 +245,7 @@ languages = ALL_SYNTH_LANGUAGES skills = /datum/skills/colonial_synthetic minimap_icon = "synth" - minimap_background = "background_ua" + minimap_background = "background_cmb" idtype = /obj/item/card/id/silver /datum/equipment_preset/synth/survivor/cmb/ua_synth/load_race(mob/living/carbon/human/new_human) diff --git a/code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm b/code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm index 5aeca5779632..f2eb70953737 100644 --- a/code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm +++ b/code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm @@ -1,5 +1,5 @@ ///*****************************LV-522 Force Recon Survivors*******************************************************/ -//Nanu told me to put them here so they dont clutter up survivors.dm +//Nanu told me to put them here so they don't clutter up survivors.dm /datum/equipment_preset/survivor/forecon paygrades = list(PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/dogtag @@ -253,7 +253,7 @@ idtype = /obj/item/card/id/gold role_comm_title = "FORECON CO" minimap_icon = "co" - minimap_background = "background_command" + minimap_background = "background_forecon" dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior) dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer) @@ -275,9 +275,13 @@ sidearm = /obj/item/weapon/gun/revolver/mateba/cmateba sidearmbelt = /obj/item/storage/belt/gun/mateba/cmateba sidearmammo = /obj/item/ammo_magazine/revolver/mateba - if(CO_GUN_MATEBA_COUNCIL) - sidearm = /obj/item/weapon/gun/revolver/mateba/cmateba - sidearmbelt = /obj/item/storage/belt/gun/mateba/cmateba + if(CO_GUN_MATEBA_CLASSIC) + sidearm = /obj/item/weapon/gun/revolver/mateba/impact + sidearmbelt = /obj/item/storage/belt/gun/mateba + sidearmammo = /obj/item/ammo_magazine/revolver/mateba + if(CO_GUN_2006M) + sidearm = /obj/item/weapon/gun/revolver/mateba/mtr6m + sidearmbelt = /obj/item/storage/belt/gun/mateba/mtr6m sidearmammo = /obj/item/ammo_magazine/revolver/mateba if(CO_GUN_DEAGLE) sidearm = /obj/item/weapon/gun/pistol/heavy/co @@ -287,6 +291,31 @@ sidearm = /obj/item/weapon/gun/pistol/m1911/custom sidearmbelt = /obj/item/storage/belt/gun/m4a3 sidearmammo = /obj/item/ammo_magazine/pistol/m1911 + //Council variants + if(CO_GUN_MATEBA_COUNCIL) + sidearm = /obj/item/weapon/gun/revolver/mateba/silver + sidearmbelt = /obj/item/storage/belt/gun/mateba/council + sidearmammo = /obj/item/ammo_magazine/revolver/mateba + if(CO_GUN_MATEBA_COUNCIL_GOLDEN) + sidearm = /obj/item/weapon/gun/revolver/mateba/golden + sidearmbelt = /obj/item/storage/belt/gun/mateba/council + sidearmammo = /obj/item/ammo_magazine/revolver/mateba + if(CO_GUN_2006M_COUNCIL) + sidearm = /obj/item/weapon/gun/revolver/mateba/mtr6m/golden + sidearmbelt = /obj/item/storage/belt/gun/mateba/council + sidearmammo = /obj/item/ammo_magazine/revolver/mateba + if(CO_GUN_2006MB_COUNCIL) + sidearm = /obj/item/weapon/gun/revolver/mateba/mtr6m/golden/black_handle + sidearmbelt = /obj/item/storage/belt/gun/mateba/council + sidearmammo = /obj/item/ammo_magazine/revolver/mateba + if(CO_GUN_2006MS_COUNCIL) + sidearm = /obj/item/weapon/gun/revolver/mateba/mtr6m/silver + sidearmbelt = /obj/item/storage/belt/gun/mateba/council + sidearmammo = /obj/item/ammo_magazine/revolver/mateba + if(CO_GUN_DEAGLE_COUNCIL) + sidearm = /obj/item/weapon/gun/pistol/heavy/co/gold + sidearmbelt = /obj/item/storage/belt/gun/m4a3/black + sidearmammo = /obj/item/ammo_magazine/pistol/heavy/super var/obj/item/clothing/under/marine/reconnaissance/uniform = new() var/obj/item/clothing/accessory/storage/droppouch/pouch = new() diff --git a/code/modules/gear_presets/survivors/lv_624/clfship_insert_lv624.dm b/code/modules/gear_presets/survivors/lv_624/clfship_insert_lv624.dm index cb9d63b0bbf3..984d00932eb4 100644 --- a/code/modules/gear_presets/survivors/lv_624/clfship_insert_lv624.dm +++ b/code/modules/gear_presets/survivors/lv_624/clfship_insert_lv624.dm @@ -60,6 +60,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/clf(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/militia(new_human), WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/sec/hos(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet/upp(new_human), WEAR_FACE) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine(new_human), WEAR_WAIST) @@ -113,6 +114,7 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/full/with_defib_and_analyzer(new_human), WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BELT) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF/medic(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet/upp(new_human), WEAR_FACE) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/ied(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv(new_human), WEAR_IN_BACK) @@ -161,6 +163,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/head/welding, WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF/cct, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet/upp(new_human), WEAR_FACE) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/engineerpack/ert, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BELT) new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BELT) @@ -191,8 +194,8 @@ job_title = JOB_CLF_SYNTH paygrades = list(PAY_SHORT_SYN = JOB_PLAYTIME_TIER_0) role_comm_title = "Syn" - minimap_background = "background_clf" minimap_icon = "clf_synth" + minimap_background = "background_clf" /datum/equipment_preset/synth/survivor/clf/load_race(mob/living/carbon/human/new_human) new_human.set_species(SYNTH_COLONY_GEN_ONE) diff --git a/code/modules/gear_presets/survivors/lv_624/corporate_dome_insert_lv624.dm b/code/modules/gear_presets/survivors/lv_624/corporate_dome_insert_lv624.dm index ff32cfc5eecb..97778e4fb04b 100644 --- a/code/modules/gear_presets/survivors/lv_624/corporate_dome_insert_lv624.dm +++ b/code/modules/gear_presets/survivors/lv_624/corporate_dome_insert_lv624.dm @@ -161,6 +161,8 @@ job_title = JOB_WY_GOON_SYNTH minimap_icon = "goon_synth" role_comm_title = "WY Syn" + faction = FACTION_WY + faction_group = list(FACTION_WY, FACTION_SURVIVOR, FACTION_PMC) equipment_to_spawn = list( WEAR_HEAD = /obj/item/clothing/head/cmcap/wy_cap, WEAR_L_EAR = /obj/item/device/radio/headset/distress/WY, diff --git a/code/modules/gear_presets/survivors/lv_759/iasf_survivor_insert.dm b/code/modules/gear_presets/survivors/lv_759/iasf_survivor_insert.dm index 7e0781695454..ac19a4ee7e0d 100644 --- a/code/modules/gear_presets/survivors/lv_759/iasf_survivor_insert.dm +++ b/code/modules/gear_presets/survivors/lv_759/iasf_survivor_insert.dm @@ -138,8 +138,8 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/rmc/survivor(new_human), WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/p90/twe(new_human), WEAR_J_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/p90/twe(new_human), WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/p90/twe(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/p90/ap(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/p90/ap(new_human), WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/rmc/medium/medic(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human.back), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini(new_human.back), WEAR_IN_BACK) @@ -163,8 +163,8 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/royal_marine/iasf (new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/royal_marine/light/iasf(new_human), WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/p90/twe(new_human), WEAR_J_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/p90/twe(new_human), WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/p90/twe(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/p90/ap(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/p90/ap(new_human), WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot(new_human), WEAR_BACK) ..() diff --git a/code/modules/gear_presets/survivors/lv_759/preset_hybrisa.dm b/code/modules/gear_presets/survivors/lv_759/preset_hybrisa.dm index c04026770a20..59f55c1ee9b4 100644 --- a/code/modules/gear_presets/survivors/lv_759/preset_hybrisa.dm +++ b/code/modules/gear_presets/survivors/lv_759/preset_hybrisa.dm @@ -395,14 +395,15 @@ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/slug(new_human), WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag(new_human), WEAR_IN_R_STORE) if(95 to 100) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hybrisa/nspa_peaked_cap_gold(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB/hybrisa/nspa_formal_jacket(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun(new_human), WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot(new_human), WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/slug(new_human), WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/slug(new_human), WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag(new_human), WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hybrisa/nspa_peaked_cap_gold, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB/hybrisa/nspa_formal_jacket, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/slug, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/slug, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE) ..() //////////////// MEDICAL & SCIENCE ////////////////// @@ -857,7 +858,7 @@ faction = FACTION_WY faction_group = list(FACTION_WY, FACTION_SURVIVOR) origin_override = ORIGIN_WY_SEC - paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0, PAY_SHORT_CSPO = JOB_PLAYTIME_TIER_4) + paygrades = list(PAY_SHORT_WY_SEC = JOB_PLAYTIME_TIER_0, PAY_SHORT_WY_SEC_SPEC = JOB_PLAYTIME_TIER_4) skills = /datum/skills/civilian/survivor/goon idtype = /obj/item/card/id/silver/cl access = list(ACCESS_CIVILIAN_PUBLIC,ACCESS_CIVILIAN_RESEARCH,ACCESS_CIVILIAN_ENGINEERING,ACCESS_CIVILIAN_LOGISTICS,ACCESS_CIVILIAN_BRIG,ACCESS_CIVILIAN_MEDBAY,ACCESS_CIVILIAN_COMMAND,ACCESS_WY_EXEC,ACCESS_WY_GENERAL,ACCESS_WY_COLONIAL) diff --git a/code/modules/gear_presets/survivors/misc.dm b/code/modules/gear_presets/survivors/misc.dm index 731be22e1252..adae378a7fab 100644 --- a/code/modules/gear_presets/survivors/misc.dm +++ b/code/modules/gear_presets/survivors/misc.dm @@ -240,8 +240,7 @@ Everything below isn't used or out of place. new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/sanitation(new_human), WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/commando/cbrn(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/cbrn_non_armored(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/grenade/bugkiller(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/glass/watertank/fuel(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(new_human), WEAR_FACE) if(2) // Janitor new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/janitor(new_human), WEAR_BODY) @@ -494,7 +493,7 @@ Everything below isn't used or out of place. flags = EQUIPMENT_PRESET_START_OF_ROUND assignment = JOB_WY_GOON job_title = JOB_WY_GOON - paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0) + paygrades = list(PAY_SHORT_WY_SEC = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/silver/cl skills = /datum/skills/civilian/survivor/goon faction = FACTION_WY diff --git a/code/modules/gear_presets/survivors/sorokyne_strata/preset_sorokyne_strata.dm b/code/modules/gear_presets/survivors/sorokyne_strata/preset_sorokyne_strata.dm index 9a53669cddb3..10821ff13a43 100644 --- a/code/modules/gear_presets/survivors/sorokyne_strata/preset_sorokyne_strata.dm +++ b/code/modules/gear_presets/survivors/sorokyne_strata/preset_sorokyne_strata.dm @@ -316,9 +316,9 @@ name = "UPP - Civilian" assignment = "Grazhdanin" flags = EQUIPMENT_PRESET_EXTRA - languages = list(LANGUAGE_RUSSIAN, LANGUAGE_CHINESE) + languages = list(LANGUAGE_ENGLISH, LANGUAGE_RUSSIAN, LANGUAGE_CHINESE) faction = FACTION_UPP - minimap_background = "background_upp_civillian" + minimap_background = "background_upp_civilian" paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0) skills = /datum/skills/civilian access = list(ACCESS_CIVILIAN_PUBLIC) @@ -427,7 +427,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp/black/knife(new_human), WEAR_FEET) if(9) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp/knife(new_human), WEAR_FEET) - + add_survivor_rare_item(new_human) add_survivor_weapon_civilian(new_human) ..() @@ -438,7 +438,7 @@ faction = FACTION_UPP faction_group = FACTION_LIST_SURVIVOR_UPP role_comm_title = "FPPB" - minimap_background = "background_upp_civillian" + minimap_background = "background_upp_civilian" skills = /datum/skills/civilian/survivor/fire_fighter access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_MEDBAY, ACCESS_CIVILIAN_COMMAND) flags = EQUIPMENT_PRESET_START_OF_ROUND @@ -474,14 +474,15 @@ new_human.equip_to_slot_or_del(new /obj/item/attachable/attached_gun/extinguisher(new_human.back), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini(new_human.back), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/utility/brown/upp(new_human), WEAR_BODY) - + add_survivor_rare_item(new_human) add_survivor_weapon_civilian(new_human) ..() /datum/equipment_preset/survivor/upp_miner name = "Survivor - UPP - Jutou Combine - Miner" assignment = "Jùtóu Combine - Shakhtyor" - minimap_background = "background_upp_civillian" + minimap_background = "background_upp_civilian" + skills = /datum/skills/civilian/survivor/miner languages = list(LANGUAGE_RUSSIAN, LANGUAGE_CHINESE) faction = FACTION_UPP faction_group = FACTION_LIST_SURVIVOR_UPP @@ -499,8 +500,9 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/upp(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/alt(new_human), WEAR_ACCESSORY) - + new_human.equip_to_slot_or_del(new /obj/item/tool/shovel(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/alt, WEAR_ACCESSORY) + add_survivor_rare_item(new_human) add_survivor_weapon_civilian(new_human) ..() @@ -570,3 +572,304 @@ add_random_cl_survivor_loot(new_human) add_ice_colony_survivor_equipment(new_human) ..() + +//------------------------------------------------------- + +//////////////// SYNTHETICS ///////////////////////// +//////////////////////////////////////////////////// + +/datum/equipment_preset/synth/survivor/sorokyne + flags = EQUIPMENT_PRESET_STUB + +// Civilian + +/datum/equipment_preset/synth/survivor/sorokyne/civilian + name = "Survivor - Sorokyne Strata - Synthetic - Civilian" + flags = EQUIPMENT_PRESET_START_OF_ROUND + faction = FACTION_UPP + faction_group = FACTION_LIST_SURVIVOR_UPP + origin_override = ORIGIN_UPP + + survivor_variant = CIVILIAN_SURVIVOR + +/datum/equipment_preset/synth/survivor/sorokyne/civilian/load_gear(mob/living/carbon/human/new_human) + var/choice = rand(1,6) + switch(choice) + if(1) // Miner + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/white/alt(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/civi5(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/webbing/brown(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/upp(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/alt(new_human), WEAR_ACCESSORY) + if(2) // Sanitation + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/utility/upp(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/sanitation(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/cbrn_non_armored(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/cbrn_non_armored(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/tool/mop(new_human), WEAR_R_HAND) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp(new_human), WEAR_ACCESSORY) + if(3) // Fire Protection + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/UPP/firefighter(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/upp_pfb(new_human), WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/vest/fire_light/upp/synth(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/upp(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/attachable/attached_gun/extinguisher(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/utility/brown/upp(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/twohanded/fireaxe(new_human), WEAR_R_HAND) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp(new_human), WEAR_ACCESSORY) + if(4) // Landing Pad Attendant Synth + new_human.equip_to_slot_or_del(new /obj/item/clothing/ears/earmuffs(new_human), WEAR_R_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/army(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/m94(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/general_belt(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/stack/flag/red(new_human), WEAR_IN_BELT) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/upp(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/lightstick/red(new_human), WEAR_R_HAND) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/prop/tableflag/upp(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/large_holster/machete/full(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp(new_human), WEAR_ACCESSORY) + if(5) // Bartender + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/ushanka/civi(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/upp_pfb(new_human), WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/army/alt(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/bottle/vodka(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/bottle/vodka(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/bottle/vodka(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/vest/tan(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/bottle/vodka(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/upp(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/bag/plasticbag(new_human), WEAR_R_HAND) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/baseballbat/metal(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/alt(new_human), WEAR_ACCESSORY) + if(6) // Chef Synth + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/civi(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/civi2(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/chef/classic/stain(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/tool/kitchen/utensil/fork(new_human), WEAR_R_HAND) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/tool/kitchen/knife/butcher(new_human), WEAR_L_HAND) + ..() + +// Engineer + +/datum/equipment_preset/synth/survivor/sorokyne/engineer + name = "Survivor - Sorokyne Strata - Synthetic - Reactor Plant Synthetic" // ENGINEER + flags = EQUIPMENT_PRESET_START_OF_ROUND + faction = FACTION_UPP + faction_group = FACTION_LIST_SURVIVOR_UPP + origin_override = ORIGIN_UPP + + survivor_variant = ENGINEERING_SURVIVOR + +/datum/equipment_preset/synth/survivor/sorokyne/engineer/load_gear(mob/living/carbon/human/new_human) + + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/civi/plant_worker(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/short(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/alt(new_human), WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/upp_pfb(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/med_small_stack(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/small_stack(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/nailgun(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/maintenance_jack(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/alt(new_human), WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/color/white/alt(new_human), WEAR_BODY) + + ..() + +// Medical + +/datum/equipment_preset/synth/survivor/sorokyne/doctor + name = "Survivor - Sorokyne Strata - Synthetic - Doctor" + flags = EQUIPMENT_PRESET_START_OF_ROUND + faction = FACTION_UPP + faction_group = FACTION_LIST_SURVIVOR_UPP + origin_override = ORIGIN_UPP + + survivor_variant = MEDICAL_SURVIVOR + +/datum/equipment_preset/synth/survivor/sorokyne/doctor/load_gear(mob/living/carbon/human/new_human) + var/random_civilian_satchel= rand(1,3) + switch(random_civilian_satchel) + if(1) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) + if(2) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black(new_human), WEAR_BACK) + if(3) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/blue(new_human), WEAR_BACK) + + var/random_tie= rand(1,6) + switch(random_tie) + if(1) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/tie/black(new_human), WEAR_ACCESSORY) + if(2) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/tie(new_human), WEAR_ACCESSORY) + if(3) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/tie/green(new_human), WEAR_ACCESSORY) + if(4) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/tie/purple(new_human), WEAR_ACCESSORY) + if(6) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/tie/red(new_human), WEAR_ACCESSORY) + + var/random_professional_shoe = rand(1,2) + switch(random_professional_shoe) + if(1) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) + if(2) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup/brown(new_human), WEAR_FEET) + + var/random_labcoat = rand(1,2) + switch(random_labcoat) + if(1) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/long(new_human), WEAR_JACKET) + if(2) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(new_human), WEAR_JACKET) + + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/alt(new_human), WEAR_ACCESSORY) + + var/random_professional_uniform= rand(1,3) + switch(random_professional_uniform) + if(1) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/brown(new_human), WEAR_BODY) + if(2) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/blue(new_human), WEAR_BODY) + if(3) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/black(new_human), WEAR_BODY) + + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/upp_pfb(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/civi/plant_worker(new_human), WEAR_HEAD) + + ..() + +// Security + +/datum/equipment_preset/synth/survivor/sorokyne/security + name = "Survivor - Sorokyne Strata - Synthetic - Army or PaP" // Either Army Reservist or PaP (COP) + flags = EQUIPMENT_PRESET_START_OF_ROUND + faction = FACTION_UPP + faction_group = FACTION_LIST_SURVIVOR_UPP + origin_override = ORIGIN_UPP + + survivor_variant = SECURITY_SURVIVOR + +/datum/equipment_preset/synth/survivor/sorokyne/security/load_gear(mob/living/carbon/human/new_human) + var/choice = rand(1,2) + switch(choice) + if(1) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/army_beret(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/army/alt(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/webbing/brown(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp/black/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/large_holster/machete/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/black/five_slot(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/recon(new_human), WEAR_L_EAR) + if(2) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/PaP(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/peaked/police(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB/pap(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp/black/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/upp_pfb(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/alt(new_human), WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/pap(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/UPP/full(new_human), WEAR_WAIST) + + ..() + +// Corporate + +/datum/equipment_preset/synth/survivor/sorokyne/corporate + name = "Survivor - Sorokyne Strata - Synthetic - Hyperdyne - Executive Bodyguard" + flags = EQUIPMENT_PRESET_START_OF_ROUND + faction_group = FACTION_HYPERDYNE + faction = FACTION_HYPERDYNE + faction_group = list(FACTION_HYPERDYNE, FACTION_LIST_SURVIVOR_UPP) + idtype = /obj/item/card/id/silver/cl/hyperdyne + survivor_variant = CORPORATE_SURVIVOR + +/datum/equipment_preset/synth/survivor/sorokyne/corporate/load_gear(mob/living/carbon/human/new_human) + var/choice = rand(1,2) + switch(choice) + if(1) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/hyperdyne(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/upp(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/detective/neutral(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/webbing/black(new_human), WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/hyperdyne_patch, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/large_holster/machete/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/combat(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/droppouch(new_human), WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/lawyer/brown(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/aviator(new_human), WEAR_EYES) + if(2) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/hyperdyne(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/upp(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/detective/grey(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/webbing/black(new_human), WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/hyperdyne_patch, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/large_holster/machete/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/combat(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/droppouch(new_human), WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/lawyer/light_brown(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/aviator/silver(new_human), WEAR_EYES) + add_random_cl_survivor_loot(new_human) + ..() + +// Science + +/datum/equipment_preset/synth/survivor/sorokyne/scientist + name = "Survivor - Sorokyne Strata - Synthetic - Cosmos Exploration Corps Researcher" + flags = EQUIPMENT_PRESET_START_OF_ROUND + faction = FACTION_UPP + faction_group = FACTION_LIST_SURVIVOR_UPP + origin_override = ORIGIN_UPP + + survivor_variant = SCIENTIST_SURVIVOR + +/datum/equipment_preset/synth/survivor/sorokyne/scientist/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/upp(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/upp_pfb(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/utility/brown/upp(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/brown(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/cec_patch, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/brown(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/tool/shovel(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/lantern(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap(new_human), WEAR_HEAD) + + ..() diff --git a/code/modules/gear_presets/survivors/survivors.dm b/code/modules/gear_presets/survivors/survivors.dm index c731cac4755d..abc993a387a8 100644 --- a/code/modules/gear_presets/survivors/survivors.dm +++ b/code/modules/gear_presets/survivors/survivors.dm @@ -14,15 +14,14 @@ access = list(ACCESS_CIVILIAN_PUBLIC) minimap_icon = "surv" - minimap_background = "background_civillian" - + minimap_background = "background_civilian" var/survivor_variant = CIVILIAN_SURVIVOR /datum/equipment_preset/survivor/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = pick(MALE, FEMALE) var/datum/preferences/A = new A.randomize_appearance(new_human) - var/random_name = capitalize(pick(new_human.gender == MALE ? GLOB.first_names_male : GLOB.first_names_female)) + " " + capitalize(pick(GLOB.last_names)) + var/random_name = random_name(new_human.gender) new_human.change_real_name(new_human, random_name) new_human.age = rand(21,45) diff --git a/code/modules/gear_presets/survivors/trijent/preset_trijent.dm b/code/modules/gear_presets/survivors/trijent/preset_trijent.dm index 2d5aea78bdd9..996c2d578aec 100644 --- a/code/modules/gear_presets/survivors/trijent/preset_trijent.dm +++ b/code/modules/gear_presets/survivors/trijent/preset_trijent.dm @@ -1,3 +1,7 @@ +/////////////////////// +///////HUMANS////////// +/////////////////////// + /datum/equipment_preset/survivor/chaplain/trijent name = "Survivor - Trijent Chaplain" assignment = "Trijent Dam Chaplain" @@ -9,38 +13,140 @@ add_survivor_rare_item(new_human) ..() -/datum/equipment_preset/survivor/security/trijent - name = "Survivor - Trijent Security Guard" - assignment = JOB_WY_SEC - job_title = JOB_WY_SEC - minimap_background = "background_goon" - minimap_icon = "cmp" - faction = FACTION_WY - idtype = /obj/item/card/id/silver/cl - faction_group = list(FACTION_WY, FACTION_SURVIVOR) - access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_COMMAND, ACCESS_CIVILIAN_MEDBAY, ACCESS_CIVILIAN_ENGINEERING, ACCESS_CIVILIAN_BRIG, ACCESS_WY_GENERAL, ACCESS_WY_COLONIAL, ACCESS_WY_MEDICAL, ACCESS_WY_ENGINEERING) - -/datum/equipment_preset/survivor/security/trijent/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/blue(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/wy_faction(new_human), WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/sec(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate/knife(new_human), WEAR_FEET) - ..() +/datum/equipment_preset/survivor/goon/trijent + name = "Survivor - Trijent Corporate Security Guard" + +/datum/equipment_preset/survivor/goon/trijent/load_gear(mob/living/carbon/human/new_human) + + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/corporate/kutjevo, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate/knife, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/wy_faction, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/wy/mod88_near_empty, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/black, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full/wy(new_human), WEAR_L_STORE) + + var/hat = rand(1,4) + switch(hat) + if(1 to 3) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate, WEAR_HEAD) + if(4) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/wy_cap, WEAR_HEAD) + + var/gun = rand(1,3) + switch(gun) + if(1) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/corporate/no_lock(new_human), WEAR_J_STORE) + if(2) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/p90(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/p90(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/p90(new_human), WEAR_J_STORE) + if(3) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m39/corporate/no_lock(new_human), WEAR_J_STORE) + +/datum/equipment_preset/survivor/nspa/trijent + name = "Survivor - Trijent NSPA Constable" + assignment = "NSPA Constable" + faction_group = FACTION_LIST_SURVIVOR_NSPA + paygrades = list(PAY_SHORT_CST = JOB_PLAYTIME_TIER_0, PAY_SHORT_SC = JOB_PLAYTIME_TIER_3, PAY_SHORT_SGT = JOB_PLAYTIME_TIER_4) + skills = /datum/skills/civilian/survivor/marshal + flags = EQUIPMENT_PRESET_START_OF_ROUND + idtype = /obj/item/card/id/nspa_silver + faction = FACTION_NSPA + access = list(ACCESS_CIVILIAN_PUBLIC,ACCESS_CIVILIAN_RESEARCH,ACCESS_CIVILIAN_ENGINEERING,ACCESS_CIVILIAN_LOGISTICS,ACCESS_CIVILIAN_BRIG,ACCESS_CIVILIAN_MEDBAY,ACCESS_CIVILIAN_COMMAND,) + survivor_variant = SECURITY_SURVIVOR + +/datum/equipment_preset/survivor/nspa/trijent/load_gear(mob/living/carbon/human/new_human) -/datum/equipment_preset/survivor/colonial_marshal/trijent - name = "Survivor - Trijent Colonial Marshal Deputy" - assignment = "CMB Deputy" - -/datum/equipment_preset/survivor/colonial_marshal/trijent/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/CMB(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc(new_human), WEAR_FEET) + var/choice = rand(1,100) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/blue, WEAR_EYES) + + switch(choice) + if(1 to 20) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/hybrisa/nspa_officer, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/l54/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hybrisa/nspa_peaked_cap, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB/hybrisa/nspa_jacket, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/mp5(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE) + if(20 to 40) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/hybrisa/nspa_officer, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/l54/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hybrisa/nspa_peaked_cap, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB/hybrisa/nspa_formal_jacket, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/mp5(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE) + if(40 to 75) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/hybrisa/nspa_officer/warm_weather, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/full, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/cmb(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hybrisa/nspa_peaked_cap, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/hybrisa/nspa_vest, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/slug, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/slug, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge/rubber, WEAR_IN_BACK) + if(75 to 80) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/hybrisa/nspa_officer/warm_weather, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/full, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/cmb(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hybrisa/nspa_peaked_cap, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB/hybrisa/nspa_hazard_jacket, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/mp5(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE) + if(80 to 95) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/hybrisa/nspa_officer/warm_weather, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/l54/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/cmb(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hybrisa/nspa_peaked_cap_goldandsilver, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/nspa_hazard, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/slug, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/slug, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE) + if(95 to 100) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/hybrisa/nspa_officer, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/l54/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hybrisa/nspa_peaked_cap_gold, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB/hybrisa/nspa_formal_jacket, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/slug, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/slug, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE) ..() /datum/equipment_preset/survivor/doctor/trijent @@ -113,3 +219,82 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) ..() + +/////////////////////// +///////SYNTHETICS////// +/////////////////////// + +/datum/equipment_preset/synth/survivor/nspa_synth + name = "Survivor - Synthetic - NSPA Investigative Synthetic" + idtype = /obj/item/card/id/nspa_silver + role_comm_title = "NSPA Syn" + paygrades = list(PAY_SHORT_CST = JOB_PLAYTIME_TIER_0) + faction = FACTION_NSPA + faction_group = list(FACTION_NSPA, FACTION_SURVIVOR) + survivor_variant = SECURITY_SURVIVOR + +/datum/equipment_preset/synth/survivor/nspa_synth/load_gear(mob/living/carbon/human/new_human) + var/choice = rand(1,100) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/camera, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/blue, WEAR_EYES) + + switch(choice) + if(1 to 20) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/hybrisa/nspa_officer, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/CMB/synth, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hybrisa/nspa_peaked_cap, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB/hybrisa/nspa_jacket, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/large_holster/machete/full, WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full, WEAR_R_STORE) + if(20 to 40) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/hybrisa/nspa_officer, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/CMB/synth, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hybrisa/nspa_peaked_cap, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB/hybrisa/nspa_formal_jacket, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/large_holster/machete/full, WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full, WEAR_R_STORE) + if(40 to 75) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/hybrisa/nspa_officer/warm_weather, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/CMB/synth, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/cmb(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hybrisa/nspa_peaked_cap, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/nspa_hazard, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/large_holster/machete/full, WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge/rubber, WEAR_IN_BACK) + if(75 to 80) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/hybrisa/nspa_officer/warm_weather, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/CMB/synth, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/cmb(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hybrisa/nspa_peaked_cap, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB/hybrisa/nspa_hazard_jacket, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/large_holster/machete/full, WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full, WEAR_R_STORE) + if(80 to 95) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/hybrisa/nspa_officer/warm_weather, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/CMB/synth, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/cmb(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hybrisa/nspa_peaked_cap_goldandsilver, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/nspa_hazard, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/large_holster/machete/full, WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full, WEAR_R_STORE) + if(95 to 100) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/hybrisa/nspa_officer, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/CMB/synth, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hybrisa/nspa_peaked_cap_gold, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB/hybrisa/nspa_formal_jacket, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/large_holster/machete/full, WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full, WEAR_R_STORE) + + ..() diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm index 88b16f36bac4..2d7b7b8a6e27 100644 --- a/code/modules/gear_presets/synths.dm +++ b/code/modules/gear_presets/synths.dm @@ -6,6 +6,7 @@ minimap_icon = "synth" skills = /datum/skills/synthetic var/preset_generation_support = FALSE + var/subtype /datum/equipment_preset/synth/New() . = ..() @@ -47,78 +48,6 @@ //*****************************************************************************************************/ -/datum/equipment_preset/synth/uscm - name = "USCM Synthetic" - flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE - faction = FACTION_MARINE - idtype = /obj/item/card/id/gold - assignment = JOB_SYNTH - job_title = "Synthetic" - role_comm_title = "Syn" - preset_generation_support = TRUE - - minimap_icon = "synth" - paygrades = list(PAY_SHORT_ME8 = JOB_PLAYTIME_TIER_0) - -/datum/equipment_preset/synth/uscm/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/marine/satchel - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/industrial - - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/synth(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/synthetic(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) - -//*****************************************************************************************************/ - -/datum/equipment_preset/synth/uscm/councillor - name = "USCM Synthetic Councillor" - flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE - faction = FACTION_MARINE - idtype = /obj/item/card/id/gold - assignment = JOB_SYNTH - job_title = "Synthetic" - role_comm_title = "Syn" - paygrades = list(PAY_SHORT_ME9 = JOB_PLAYTIME_TIER_0) - -/datum/equipment_preset/synth/uscm/councillor/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/satchel - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/industrial - - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/synth(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/synthetic/councillor(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) - -//*****************************************************************************************************/ - -/datum/equipment_preset/synth/uscm/wo - name = "WO Support Synthetic" - flags = EQUIPMENT_PRESET_START_OF_ROUND_WO - paygrades = list(PAY_SHORT_ME8 = JOB_PLAYTIME_TIER_0) - -/datum/equipment_preset/synth/uscm/wo/load_gear(mob/living/carbon/human/new_human) - - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/cm(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/synth(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/synthetic(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/RO(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest/brown_vest(new_human), WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/smartpack/a1/tan(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full(new_human), WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_L_STORE) - -//*****************************************************************************************************/ - /datum/equipment_preset/synth/survivor name = "Survivor - Synthetic - Classic Joe" flags = EQUIPMENT_PRESET_EXTRA @@ -160,7 +89,7 @@ /datum/equipment_preset/synth/survivor/New() . = ..() - access = get_access(ACCESS_LIST_COLONIAL_ALL) + get_region_accesses(2) + get_region_accesses(4) + ACCESS_MARINE_RESEARCH //Access to civillians stuff + medbay stuff + engineering stuff + research + access = get_access(ACCESS_LIST_COLONIAL_ALL) + get_region_accesses(2) + get_region_accesses(4) + ACCESS_MARINE_RESEARCH //Access to civilians stuff + medbay stuff + engineering stuff + research /datum/equipment_preset/synth/survivor/pmc/New() . = ..() @@ -219,7 +148,7 @@ WEAR_R_EAR = /obj/item/device/flashlight/pen, WEAR_FACE = /obj/item/clothing/mask/surgical, WEAR_EYES = /obj/item/clothing/glasses/hud/health, - WEAR_BODY = /obj/item/clothing/under/rank/chief_medical_officer, + WEAR_BODY = /obj/item/clothing/under/rank/cmo, WEAR_ACCESSORY = /obj/item/clothing/accessory/stethoscope, WEAR_BACK = /obj/item/storage/backpack/satchel/med, WEAR_IN_BACK = /obj/item/roller/surgical, @@ -748,7 +677,7 @@ name = "Synthetic - Working Joe" flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE faction = FACTION_MARINE - faction_group = list(FACTION_MARINE) + faction_group = FACTION_LIST_ARES_MARINE assignment = JOB_WORKING_JOE job_title = JOB_WORKING_JOE @@ -761,7 +690,7 @@ /datum/equipment_preset/synth/working_joe/New() . = ..() - access = get_access(ACCESS_LIST_GLOBAL) + access = get_access(ACCESS_LIST_MARINE_ALL) /datum/equipment_preset/synth/working_joe/load_race(mob/living/carbon/human/new_human) . = ..() @@ -880,7 +809,7 @@ new_human.bubble_icon = "syndibot" /datum/equipment_preset/synth/working_joe/load_name(mob/living/carbon/human/new_human, randomise) - if(src.faction == FACTION_UPP) + if(faction == FACTION_UPP) new_human.change_real_name(new_human, "Dzho Automaton №[rand(9)][rand(9)][ascii2text(rand(65, 90))][ascii2text(rand(65, 90))]") else new_human.change_real_name(new_human, "Working Joe #[rand(100)][rand(100)]") @@ -969,20 +898,24 @@ access = get_access(ACCESS_LIST_GLOBAL) /datum/equipment_preset/synth/infiltrator/load_name(mob/living/carbon/human/new_human, randomise) - new_human.gender = pick(MALE,FEMALE) - var/random_name - var/first_name - var/last_name + new_human.gender = pick(MALE, FEMALE) + var/datum/preferences/A = new() A.randomize_appearance(new_human) - if(new_human.gender == MALE) - first_name = "[pick(GLOB.first_names_male_colonist)]" - else - first_name ="[pick(GLOB.first_names_female_colonist)]" - last_name ="[pick(GLOB.last_names_colonist)]" - random_name = "[first_name] [last_name]" - new_human.change_real_name(new_human, random_name) + var/first_name + var/last_name + switch(new_human.gender) + if(FEMALE) + first_name = capitalize(pick(GLOB.first_names_female_colonist)) + if(PLURAL, NEUTER) // Not currently possible + first_name = capitalize(pick(MALE, FEMALE) == MALE ? pick(GLOB.first_names_male_colonist) : pick(GLOB.first_names_female_colonist)) + else // MALE + first_name = capitalize(pick(GLOB.first_names_male_colonist)) + + last_name = capitalize(pick(GLOB.last_names_colonist)) + new_human.change_real_name(new_human, "[first_name] [last_name]") + var/static/list/colors = list("BLACK" = list(15, 15, 25), "BROWN" = list(102, 51, 0), "AUBURN" = list(139, 62, 19)) var/static/list/hair_colors = colors.Copy() + list("BLONDE" = list(197, 164, 30), "CARROT" = list(174, 69, 42)) var/hair_color = pick(hair_colors) diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm index 1f5086349a91..181ec3bcc0fb 100644 --- a/code/modules/gear_presets/upp.dm +++ b/code/modules/gear_presets/upp.dm @@ -38,33 +38,29 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK) /datum/equipment_preset/upp/load_name(mob/living/carbon/human/new_human, randomise) - new_human.gender = pick(60;MALE,40;FEMALE) + new_human.gender = pick(MALE, FEMALE) + var/datum/preferences/A = new() A.randomize_appearance(new_human) - var/random_name + var/first_name var/last_name - //gender checks - if(new_human.gender == MALE) - if(prob(40)) - first_name = "[capitalize(randomly_generate_chinese_word(1))]" - else - first_name = "[pick(GLOB.first_names_male_upp)]" - new_human.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache") + if(prob(40)) + first_name = capitalize(randomly_generate_chinese_word(1)) else - if(prob(40)) - first_name = "[capitalize(randomly_generate_chinese_word(1))]" - else - first_name = "[pick(GLOB.first_names_female_upp)]" - //surname + switch(new_human.gender) + if(FEMALE) + first_name = capitalize(pick(GLOB.first_names_female_upp)) + if(PLURAL, NEUTER) // Not currently possible + first_name = capitalize(pick(MALE, FEMALE) == MALE ? pick(GLOB.first_names_male_upp) : pick(GLOB.first_names_female_upp)) + else // MALE + first_name = capitalize(pick(GLOB.first_names_male_upp)) if(prob(35)) - last_name = "[capitalize(randomly_generate_chinese_word(pick(20;1, 80;2)))]" + last_name = capitalize(randomly_generate_chinese_word(pick(20;1, 80;2))) else - last_name = "[pick(GLOB.last_names_upp)]" - //put them together - random_name = "[first_name] [last_name]" + last_name = capitalize(pick(GLOB.last_names_upp)) - new_human.change_real_name(new_human, random_name) + new_human.change_real_name(new_human, "[first_name] [last_name]") new_human.age = rand(17,35) new_human.h_style = pick("Crewcut", "Shaved Head", "Buzzcut", "Undercut", "Side Undercut", "Bun, Topknot") var/static/list/colors = list("BLACK" = list(15, 15, 25), "BROWN" = list(102, 51, 0), "AUBURN" = list(139, 62, 19)) @@ -219,7 +215,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), @@ -246,7 +242,7 @@ list("E-Tool", 5, /obj/item/tool/shovel/etool/folded, null, VENDOR_ITEM_REGULAR), list("Sandbags", 20, /obj/item/stack/sandbags_empty/half, null, VENDOR_ITEM_REGULAR), list("ES-11 Mobile Fuel Canister", 5, /obj/item/tool/weldpack/minitank, null, VENDOR_ITEM_REGULAR), - list("ME3 Hand Welder", 5, /obj/item/tool/weldingtool/simple, null, VENDOR_ITEM_REGULAR), + list("Seegson MCT", 5, /obj/item/tool/weldingtool/simple, null, VENDOR_ITEM_REGULAR), list("SPECIAL AMMUNITION", 0, null, null, null), list("Type 71 AP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/ap , null, VENDOR_ITEM_REGULAR), @@ -278,7 +274,7 @@ list("E-Tool", 5, /obj/item/tool/shovel/etool/folded, null, VENDOR_ITEM_REGULAR), list("Sandbags", 20, /obj/item/stack/sandbags_empty/half, null, VENDOR_ITEM_REGULAR), list("ES-11 Mobile Fuel Canister", 5, /obj/item/tool/weldpack/minitank, null, VENDOR_ITEM_REGULAR), - list("ME3 Hand Welder", 5, /obj/item/tool/weldingtool/simple, null, VENDOR_ITEM_REGULAR), + list("Seegson MCT", 5, /obj/item/tool/weldingtool/simple, null, VENDOR_ITEM_REGULAR), list("SPECIAL AMMUNITION", 0, null, null, null), list("Type 71 AP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/ap , null, VENDOR_ITEM_REGULAR), @@ -428,10 +424,11 @@ list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pressurized Reagent Canister Pouch (Field Anesthetic)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/oxycodone, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Vial Pouch (Full)", 0, /obj/item/storage/pouch/vials/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -485,12 +482,14 @@ list("AUTOINJECTORS", 0, null, null, null), list("Autoinjector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Dylovene)", 1, /obj/item/reagent_container/hypospray/autoinjector/antitoxin, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Epinephrine)", 2, /obj/item/reagent_container/hypospray/autoinjector/adrenaline, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), - list("Autoinjector (Oxycodone)", 2, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Oxycodone)", 1, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Peridaxon)", 1, /obj/item/reagent_container/hypospray/autoinjector/peridaxon, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), - list("Autoinjector (Tricord)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Tricordrazine)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), list("PILL BOTTLES", 0, null, null, null), list("Pill Bottle (Bicaridine)", 5, /obj/item/storage/pill_bottle/bicaridine, null, VENDOR_ITEM_RECOMMENDED), @@ -498,6 +497,7 @@ list("Pill Bottle (Dylovene)", 5, /obj/item/storage/pill_bottle/antitox, null, VENDOR_ITEM_REGULAR), list("Pill Bottle (Inaprovaline)", 5, /obj/item/storage/pill_bottle/inaprovaline, null, VENDOR_ITEM_REGULAR), list("Pill Bottle (Kelotane)", 5, /obj/item/storage/pill_bottle/kelotane, null, VENDOR_ITEM_RECOMMENDED), + list("Pill Bottle (Oxycodone)", 5, /obj/item/storage/pill_bottle/oxycodone, null, VENDOR_ITEM_RECOMMENDED), list("Pill Bottle (Peridaxon)", 5, /obj/item/storage/pill_bottle/peridaxon, null, VENDOR_ITEM_REGULAR), list("Pill Bottle (Tramadol)", 5, /obj/item/storage/pill_bottle/tramadol, null, VENDOR_ITEM_RECOMMENDED), @@ -525,7 +525,7 @@ list("UTILITIES", 0, null, null, null), list("Fire Extinguisher (Portable)", 3, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), list("UPP Motion Detector", 15, /obj/item/device/motiondetector/hacked, null, VENDOR_ITEM_REGULAR), - list("Whistle", 3, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Whistle", 3, /obj/item/clothing/accessory/device/whistle, null, VENDOR_ITEM_REGULAR), list("Large General Pouch", 15, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), ) @@ -624,7 +624,7 @@ list("POUCHES (Choose 2)", 0, null, null, null), list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -791,7 +791,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), @@ -836,7 +836,7 @@ list("Roller Bed", 5, /obj/item/roller, null, VENDOR_ITEM_REGULAR), list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), list("Fire Extinguisher (Portable)", 3, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), - list("Whistle", 3, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Whistle", 3, /obj/item/clothing/accessory/device/whistle, null, VENDOR_ITEM_REGULAR), list("UPP Motion Detector", 15, /obj/item/device/motiondetector/hacked, null, VENDOR_ITEM_REGULAR), list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), @@ -933,7 +933,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -982,7 +982,7 @@ list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), list("Fire Extinguisher (Portable)", 3, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), list("UPP Motion Detector", 8, /obj/item/device/motiondetector/hacked, null, VENDOR_ITEM_REGULAR), - list("Whistle", 3, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Whistle", 3, /obj/item/clothing/accessory/device/whistle, null, VENDOR_ITEM_REGULAR), list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), list("Tools Pouch (Full)", 5, /obj/item/storage/pouch/tools/full, null, VENDOR_ITEM_REGULAR), list("Autoinjector Pouch (Full)", 15, /obj/item/storage/pouch/autoinjector/full, null, VENDOR_ITEM_REGULAR), @@ -1108,7 +1108,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Autoinjector Pouch (Full)", 0, /obj/item/storage/pouch/autoinjector/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -1173,13 +1173,15 @@ list("Advanced Firstaid Kit", 12, /obj/item/storage/firstaid/adv, null, VENDOR_ITEM_REGULAR), list("Medical Splints", 1, /obj/item/stack/medical/splint, null, VENDOR_ITEM_REGULAR), - list("Injector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), - list("Injector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), - list("Injector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), - list("Injector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), - list("Injector (Oxycodone)", 2, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), - list("Injector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), - list("Injector (Tricord)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Dylovene)", 1, /obj/item/reagent_container/hypospray/autoinjector/antitoxin, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Oxycodone)", 1, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Peridaxon)", 1, /obj/item/reagent_container/hypospray/autoinjector/peridaxon, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Tricordrazine)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), list("Health Analyzer", 4, /obj/item/device/healthanalyzer, null, VENDOR_ITEM_REGULAR), list("Roller Bed", 2, /obj/item/roller, null, VENDOR_ITEM_REGULAR), @@ -1200,7 +1202,7 @@ list("Roller Bed", 5, /obj/item/roller, null, VENDOR_ITEM_REGULAR), list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), - list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/clothing/accessory/device/whistle, null, VENDOR_ITEM_REGULAR), list("Zip cuffs", 1, /obj/item/storage/box/zipcuffs, null, VENDOR_ITEM_REGULAR), list("UPP Motion Detector", 15, /obj/item/device/motiondetector/hacked, null, VENDOR_ITEM_REGULAR), list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), @@ -1311,10 +1313,10 @@ list("Type 43 Military Police Rig", 0, /obj/item/storage/belt/security/MP/UPP/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -1342,7 +1344,7 @@ list("Essential MP Set", 0, /obj/effect/essentials_set/leader/upp, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), list("GENERAL SUPPLIES", 0, null, null, null), - list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/clothing/accessory/device/whistle, null, VENDOR_ITEM_REGULAR), list("ENGINEERING SUPPLIES", 0, null, null, null), list("Entrenching Tool", 2, /obj/item/tool/shovel/etool, null, VENDOR_ITEM_REGULAR), @@ -1359,13 +1361,15 @@ list("Advanced Firstaid Kit", 12, /obj/item/storage/firstaid/adv, null, VENDOR_ITEM_REGULAR), list("Medical Splints", 1, /obj/item/stack/medical/splint, null, VENDOR_ITEM_REGULAR), - list("Injector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), - list("Injector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), - list("Injector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), - list("Injector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), - list("Injector (Oxycodone)", 2, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), - list("Injector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), - list("Injector (Tricord)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Dylovene)", 1, /obj/item/reagent_container/hypospray/autoinjector/antitoxin, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Oxycodone)", 1, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Peridaxon)", 1, /obj/item/reagent_container/hypospray/autoinjector/peridaxon, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Tricordrazine)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), list("Health Analyzer", 4, /obj/item/device/healthanalyzer, null, VENDOR_ITEM_REGULAR), list("Medical HUD Glasses", 4, /obj/item/clothing/glasses/hud/health, null, VENDOR_ITEM_MANDATORY), @@ -1393,7 +1397,7 @@ list("Roller Bed", 5, /obj/item/roller, null, VENDOR_ITEM_REGULAR), list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), - list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/clothing/accessory/device/whistle, null, VENDOR_ITEM_REGULAR), list("Zip cuffs", 1, /obj/item/storage/box/zipcuffs, null, VENDOR_ITEM_REGULAR), list("Motion Detector", 15, /obj/item/device/motiondetector/hacked, null, VENDOR_ITEM_REGULAR), list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), @@ -1510,8 +1514,8 @@ list("Type 41 Lifesaver Bag", 0, /obj/item/storage/belt/medical/lifesaver/upp/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_MANDATORY), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -1547,12 +1551,14 @@ list("AUTOINJECTORS", 0, null, null, null), list("Autoinjector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Dylovene)", 1, /obj/item/reagent_container/hypospray/autoinjector/antitoxin, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Epinephrine)", 2, /obj/item/reagent_container/hypospray/autoinjector/adrenaline, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), - list("Autoinjector (Oxycodone)", 2, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Oxycodone)", 1, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Peridaxon)", 1, /obj/item/reagent_container/hypospray/autoinjector/peridaxon, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), - list("Autoinjector (Tricord)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Tricordrazine)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), list("PILL BOTTLES", 0, null, null, null), list("Pill Bottle (Bicaridine)", 5, /obj/item/storage/pill_bottle/bicaridine, null, VENDOR_ITEM_RECOMMENDED), @@ -1560,6 +1566,7 @@ list("Pill Bottle (Dylovene)", 5, /obj/item/storage/pill_bottle/antitox, null, VENDOR_ITEM_REGULAR), list("Pill Bottle (Inaprovaline)", 5, /obj/item/storage/pill_bottle/inaprovaline, null, VENDOR_ITEM_REGULAR), list("Pill Bottle (Kelotane)", 5, /obj/item/storage/pill_bottle/kelotane, null, VENDOR_ITEM_RECOMMENDED), + list("Pill Bottle (Oxycodone)", 5, /obj/item/storage/pill_bottle/oxycodone, null, VENDOR_ITEM_RECOMMENDED), list("Pill Bottle (Peridaxon)", 5, /obj/item/storage/pill_bottle/peridaxon, null, VENDOR_ITEM_REGULAR), list("Pill Bottle (Tramadol)", 5, /obj/item/storage/pill_bottle/tramadol, null, VENDOR_ITEM_RECOMMENDED), @@ -1674,7 +1681,7 @@ list("POUCHES (Choose 2)", 0, null, null, null), list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -1810,10 +1817,10 @@ list("Type 73 Pistol Holster Rig", 0, /obj/item/storage/belt/gun/type47/t73, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -1842,7 +1849,7 @@ list("Essential SL Set", 0, /obj/effect/essentials_set/leader/upp, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), list("GENERAL SUPPLIES", 0, null, null, null), - list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/clothing/accessory/device/whistle, null, VENDOR_ITEM_REGULAR), list("ENGINEERING SUPPLIES", 0, null, null, null), list("Entrenching Tool", 2, /obj/item/tool/shovel/etool, null, VENDOR_ITEM_REGULAR), @@ -1859,13 +1866,15 @@ list("Advanced Firstaid Kit", 12, /obj/item/storage/firstaid/adv, null, VENDOR_ITEM_REGULAR), list("Medical Splints", 1, /obj/item/stack/medical/splint, null, VENDOR_ITEM_REGULAR), - list("Injector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), - list("Injector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), - list("Injector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), - list("Injector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), - list("Injector (Oxycodone)", 2, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), - list("Injector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), - list("Injector (Tricord)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Dylovene)", 1, /obj/item/reagent_container/hypospray/autoinjector/antitoxin, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Oxycodone)", 1, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Peridaxon)", 1, /obj/item/reagent_container/hypospray/autoinjector/peridaxon, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Tricordrazine)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), list("Health Analyzer", 4, /obj/item/device/healthanalyzer, null, VENDOR_ITEM_REGULAR), list("Medical HUD Glasses", 4, /obj/item/clothing/glasses/hud/health, null, VENDOR_ITEM_MANDATORY), @@ -1890,7 +1899,7 @@ list("Roller Bed", 5, /obj/item/roller, null, VENDOR_ITEM_REGULAR), list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), - list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/clothing/accessory/device/whistle, null, VENDOR_ITEM_REGULAR), list("Zip cuffs", 1, /obj/item/storage/box/zipcuffs, null, VENDOR_ITEM_REGULAR), list("Motion Detector", 15, /obj/item/device/motiondetector/hacked, null, VENDOR_ITEM_REGULAR), list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), @@ -1998,10 +2007,10 @@ list("Type 73 Pistol Holster Rig", 0, /obj/item/storage/belt/gun/type47/t73, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -2043,13 +2052,15 @@ list("Advanced Firstaid Kit", 12, /obj/item/storage/firstaid/adv, null, VENDOR_ITEM_REGULAR), list("Medical Splints", 1, /obj/item/stack/medical/splint, null, VENDOR_ITEM_REGULAR), - list("Injector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), - list("Injector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), - list("Injector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), - list("Injector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), - list("Injector (Oxycodone)", 2, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), - list("Injector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), - list("Injector (Tricord)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Dylovene)", 1, /obj/item/reagent_container/hypospray/autoinjector/antitoxin, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Oxycodone)", 1, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Peridaxon)", 1, /obj/item/reagent_container/hypospray/autoinjector/peridaxon, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Tricordrazine)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), list("Health Analyzer", 4, /obj/item/device/healthanalyzer, null, VENDOR_ITEM_REGULAR), list("Medical HUD Glasses", 4, /obj/item/clothing/glasses/hud/health, null, VENDOR_ITEM_MANDATORY), @@ -2065,7 +2076,7 @@ list("Roller Bed", 5, /obj/item/roller, null, VENDOR_ITEM_REGULAR), list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), - list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/clothing/accessory/device/whistle, null, VENDOR_ITEM_REGULAR), list("Zip cuffs", 1, /obj/item/storage/box/zipcuffs, null, VENDOR_ITEM_REGULAR), list("Motion Detector", 8, /obj/item/device/motiondetector/hacked, null, VENDOR_ITEM_REGULAR), list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), @@ -2164,10 +2175,10 @@ list("Type 74 Pistol Holster Rig", 0, /obj/item/storage/belt/gun/type47/t73/leader, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -2195,7 +2206,7 @@ list("Essential SL Set", 0, /obj/effect/essentials_set/leader/upp, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), list("GENERAL SUPPLIES", 0, null, null, null), - list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/clothing/accessory/device/whistle, null, VENDOR_ITEM_REGULAR), list("ENGINEERING SUPPLIES", 0, null, null, null), list("Entrenching Tool", 2, /obj/item/tool/shovel/etool, null, VENDOR_ITEM_REGULAR), @@ -2212,13 +2223,15 @@ list("Advanced Firstaid Kit", 12, /obj/item/storage/firstaid/adv, null, VENDOR_ITEM_REGULAR), list("Medical Splints", 1, /obj/item/stack/medical/splint, null, VENDOR_ITEM_REGULAR), - list("Injector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), - list("Injector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), - list("Injector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), - list("Injector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), - list("Injector (Oxycodone)", 2, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), - list("Injector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), - list("Injector (Tricord)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Dylovene)", 1, /obj/item/reagent_container/hypospray/autoinjector/antitoxin, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Oxycodone)", 1, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Peridaxon)", 1, /obj/item/reagent_container/hypospray/autoinjector/peridaxon, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Tricordrazine)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), list("Health Analyzer", 4, /obj/item/device/healthanalyzer, null, VENDOR_ITEM_REGULAR), list("Medical HUD Glasses", 4, /obj/item/clothing/glasses/hud/health, null, VENDOR_ITEM_MANDATORY), @@ -2243,7 +2256,7 @@ list("Roller Bed", 5, /obj/item/roller, null, VENDOR_ITEM_REGULAR), list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), - list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/clothing/accessory/device/whistle, null, VENDOR_ITEM_REGULAR), list("Zip cuffs", 1, /obj/item/storage/box/zipcuffs, null, VENDOR_ITEM_REGULAR), list("Motion Detector", 8, /obj/item/device/motiondetector/hacked, null, VENDOR_ITEM_REGULAR), list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), @@ -2365,10 +2378,10 @@ list("Type 74 Pistol Holster Rig", 0, /obj/item/storage/belt/gun/type47/t73/leader, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -2396,7 +2409,7 @@ list("Essential SL Set", 0, /obj/effect/essentials_set/leader/upp, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), list("GENERAL SUPPLIES", 0, null, null, null), - list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/clothing/accessory/device/whistle, null, VENDOR_ITEM_REGULAR), list("ENGINEERING SUPPLIES", 0, null, null, null), list("Entrenching Tool", 2, /obj/item/tool/shovel/etool, null, VENDOR_ITEM_REGULAR), @@ -2413,13 +2426,15 @@ list("Advanced Firstaid Kit", 12, /obj/item/storage/firstaid/adv, null, VENDOR_ITEM_REGULAR), list("Medical Splints", 1, /obj/item/stack/medical/splint, null, VENDOR_ITEM_REGULAR), - list("Injector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), - list("Injector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), - list("Injector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), - list("Injector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), - list("Injector (Oxycodone)", 2, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), - list("Injector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), - list("Injector (Tricord)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Dylovene)", 1, /obj/item/reagent_container/hypospray/autoinjector/antitoxin, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Oxycodone)", 1, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Peridaxon)", 1, /obj/item/reagent_container/hypospray/autoinjector/peridaxon, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Tricordrazine)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), list("Health Analyzer", 4, /obj/item/device/healthanalyzer, null, VENDOR_ITEM_REGULAR), list("Medical HUD Glasses", 4, /obj/item/clothing/glasses/hud/health, null, VENDOR_ITEM_MANDATORY), @@ -2444,7 +2459,7 @@ list("Roller Bed", 5, /obj/item/roller, null, VENDOR_ITEM_REGULAR), list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), - list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/clothing/accessory/device/whistle, null, VENDOR_ITEM_REGULAR), list("Zip cuffs", 1, /obj/item/storage/box/zipcuffs, null, VENDOR_ITEM_REGULAR), list("Motion Detector", 8, /obj/item/device/motiondetector/hacked, null, VENDOR_ITEM_REGULAR), list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), @@ -2564,10 +2579,10 @@ list("Type 74 Pistol Holster Rig", 0, /obj/item/storage/belt/gun/type47/t73/leader, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -2595,7 +2610,7 @@ list("Essential SL Set", 0, /obj/effect/essentials_set/leader/upp, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), list("GENERAL SUPPLIES", 0, null, null, null), - list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/clothing/accessory/device/whistle, null, VENDOR_ITEM_REGULAR), list("ENGINEERING SUPPLIES", 0, null, null, null), list("Entrenching Tool", 2, /obj/item/tool/shovel/etool, null, VENDOR_ITEM_REGULAR), @@ -2612,13 +2627,15 @@ list("Advanced Firstaid Kit", 12, /obj/item/storage/firstaid/adv, null, VENDOR_ITEM_REGULAR), list("Medical Splints", 1, /obj/item/stack/medical/splint, null, VENDOR_ITEM_REGULAR), - list("Injector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), - list("Injector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), - list("Injector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), - list("Injector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), - list("Injector (Oxycodone)", 2, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), - list("Injector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), - list("Injector (Tricord)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Dylovene)", 1, /obj/item/reagent_container/hypospray/autoinjector/antitoxin, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Oxycodone)", 1, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Peridaxon)", 1, /obj/item/reagent_container/hypospray/autoinjector/peridaxon, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Tricordrazine)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), list("Health Analyzer", 4, /obj/item/device/healthanalyzer, null, VENDOR_ITEM_REGULAR), list("Medical HUD Glasses", 4, /obj/item/clothing/glasses/hud/health, null, VENDOR_ITEM_MANDATORY), @@ -2643,7 +2660,7 @@ list("Roller Bed", 5, /obj/item/roller, null, VENDOR_ITEM_REGULAR), list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), - list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/clothing/accessory/device/whistle, null, VENDOR_ITEM_REGULAR), list("Motion Detector", 8, /obj/item/device/motiondetector/hacked, null, VENDOR_ITEM_REGULAR), list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), @@ -2866,20 +2883,23 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp/knife, WEAR_FEET) /datum/equipment_preset/upp/synth/load_name(mob/living/carbon/human/new_human, randomise) - new_human.gender = pick(50;MALE,50;FEMALE) + new_human.gender = pick(MALE, FEMALE) + var/datum/preferences/A = new() A.randomize_appearance(new_human) + var/random_name if(prob(10)) random_name = "[capitalize(randomly_generate_chinese_word(2))]" - else if(new_human.gender == MALE) - random_name = "[pick(GLOB.first_names_male_upp)]" else - random_name = "[pick(GLOB.first_names_female_upp)]" - - if(new_human.gender == MALE) - new_human.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache") - + switch(new_human.gender) + if(FEMALE) + random_name = capitalize(pick(GLOB.first_names_female_upp)) + if(PLURAL, NEUTER) // Not currently possible + random_name = capitalize(pick(MALE, FEMALE) == MALE ? pick(GLOB.first_names_male_upp) : pick(GLOB.first_names_female_upp)) + else // MALE + random_name = capitalize(pick(GLOB.first_names_male_upp)) + new_human.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache") new_human.change_real_name(new_human, random_name) new_human.h_style = pick("Crewcut", "Shaved Head", "Buzzcut", "Undercut", "Side Undercut") @@ -2992,7 +3012,7 @@ list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -3036,22 +3056,24 @@ list("Roller Bed", 4, /obj/item/roller, null, VENDOR_ITEM_REGULAR), list("Stasis Bag", 6, /obj/item/bodybag/cryobag, null, VENDOR_ITEM_REGULAR), - list("Pillbottle (Bicaridine)", 5, /obj/item/storage/pill_bottle/bicaridine, null, VENDOR_ITEM_RECOMMENDED), - list("Pillbottle (Dexalin)", 5, /obj/item/storage/pill_bottle/dexalin, null, VENDOR_ITEM_REGULAR), - list("Pillbottle (Dylovene)", 5, /obj/item/storage/pill_bottle/antitox, null, VENDOR_ITEM_REGULAR), - list("Pillbottle (Inaprovaline)", 5, /obj/item/storage/pill_bottle/inaprovaline, null, VENDOR_ITEM_REGULAR), - list("Pillbottle (Kelotane)", 5, /obj/item/storage/pill_bottle/kelotane, null, VENDOR_ITEM_RECOMMENDED), - list("Pillbottle (Peridaxon)", 5, /obj/item/storage/pill_bottle/peridaxon, null, VENDOR_ITEM_REGULAR), - list("Pillbottle (Tramadol)", 5, /obj/item/storage/pill_bottle/tramadol, null, VENDOR_ITEM_RECOMMENDED), - - list("Injector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), - list("Injector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), - list("Injector (Epinephrine)", 2, /obj/item/reagent_container/hypospray/autoinjector/adrenaline, null, VENDOR_ITEM_REGULAR), - list("Injector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), - list("Injector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), - list("Injector (Oxycodone)", 2, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), - list("Injector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), - list("Injector (Tricord)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), + list("Pill Bottle (Bicaridine)", 5, /obj/item/storage/pill_bottle/bicaridine, null, VENDOR_ITEM_RECOMMENDED), + list("Pill Bottle (Dexalin)", 5, /obj/item/storage/pill_bottle/dexalin, null, VENDOR_ITEM_REGULAR), + list("Pill Bottle (Dylovene)", 5, /obj/item/storage/pill_bottle/antitox, null, VENDOR_ITEM_REGULAR), + list("Pill Bottle (Inaprovaline)", 5, /obj/item/storage/pill_bottle/inaprovaline, null, VENDOR_ITEM_REGULAR), + list("Pill Bottle (Kelotane)", 5, /obj/item/storage/pill_bottle/kelotane, null, VENDOR_ITEM_RECOMMENDED), + list("Pill Bottle (Peridaxon)", 5, /obj/item/storage/pill_bottle/peridaxon, null, VENDOR_ITEM_REGULAR), + list("Pill Bottle (Tramadol)", 5, /obj/item/storage/pill_bottle/tramadol, null, VENDOR_ITEM_RECOMMENDED), + + list("Autoinjector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Dylovene)", 1, /obj/item/reagent_container/hypospray/autoinjector/antitoxin, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Epinephrine)", 2, /obj/item/reagent_container/hypospray/autoinjector/adrenaline, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Oxycodone)", 1, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Peridaxon)", 1, /obj/item/reagent_container/hypospray/autoinjector/peridaxon, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Tricordrazine)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), list("Emergency Defibrillator", 4, /obj/item/device/defibrillator, null, VENDOR_ITEM_MANDATORY), list("Health Analyzer", 4, /obj/item/device/healthanalyzer, null, VENDOR_ITEM_REGULAR), @@ -3066,7 +3088,7 @@ list("Fulton Recovery Device", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), list("Motion Detector", 5, /obj/item/device/motiondetector/hacked, null, VENDOR_ITEM_REGULAR), list("Space Cleaner", 2, /obj/item/reagent_container/spray/cleaner, null, VENDOR_ITEM_REGULAR), - list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/clothing/accessory/device/whistle, null, VENDOR_ITEM_REGULAR), ) /datum/job/antag/upp/synth/combat title = JOB_UPP_COMBAT_SYNTH @@ -3214,10 +3236,10 @@ list("NPZ92 Pistol Holster Rig", 0, /obj/item/storage/belt/gun/type47/np92/suppressed, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -3263,7 +3285,7 @@ list("Roller Bed", 5, /obj/item/roller, null, VENDOR_ITEM_REGULAR), list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), - list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/clothing/accessory/device/whistle, null, VENDOR_ITEM_REGULAR), list("Motion Detector", 15, /obj/item/device/motiondetector/hacked, null, VENDOR_ITEM_REGULAR), list("Large General Pouch", 15, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), ) @@ -3347,8 +3369,8 @@ list("Type 41 Ammo Load Rig", 0, /obj/item/storage/belt/marine/upp, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -3397,9 +3419,10 @@ list("Autoinjector (Epinephrine)", 2, /obj/item/reagent_container/hypospray/autoinjector/adrenaline, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), - list("Autoinjector (Oxycodone)", 2, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Oxycodone)", 1, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Peridaxon)", 1, /obj/item/reagent_container/hypospray/autoinjector/peridaxon, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), - list("Autoinjector (Tricord)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Tricordrazine)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), list("PILL BOTTLES", 0, null, null, null), list("Pill Bottle (Bicaridine)", 5, /obj/item/storage/pill_bottle/bicaridine, null, VENDOR_ITEM_RECOMMENDED), @@ -3407,6 +3430,7 @@ list("Pill Bottle (Dylovene)", 5, /obj/item/storage/pill_bottle/antitox, null, VENDOR_ITEM_REGULAR), list("Pill Bottle (Inaprovaline)", 5, /obj/item/storage/pill_bottle/inaprovaline, null, VENDOR_ITEM_REGULAR), list("Pill Bottle (Kelotane)", 5, /obj/item/storage/pill_bottle/kelotane, null, VENDOR_ITEM_RECOMMENDED), + list("Pill Bottle (Oxycodone)", 5, /obj/item/storage/pill_bottle/oxycodone, null, VENDOR_ITEM_RECOMMENDED), list("Pill Bottle (Peridaxon)", 5, /obj/item/storage/pill_bottle/peridaxon, null, VENDOR_ITEM_REGULAR), list("Pill Bottle (Tramadol)", 5, /obj/item/storage/pill_bottle/tramadol, null, VENDOR_ITEM_RECOMMENDED), @@ -3433,7 +3457,7 @@ list("UTILITIES", 0, null, null, null), list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), - list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/clothing/accessory/device/whistle, null, VENDOR_ITEM_REGULAR), list("Motion Detector", 15, /obj/item/device/motiondetector/hacked, null, VENDOR_ITEM_REGULAR), list("Large General Pouch", 15, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), ) @@ -3512,10 +3536,10 @@ list("NPZ92 Pistol Holster Rig", 0, /obj/item/storage/belt/gun/type47/np92/suppressed, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -3544,7 +3568,7 @@ list("Essential Leader Set", 0, /obj/effect/essentials_set/leader/upp, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), list("GENERAL SUPPLIES", 0, null, null, null), - list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/clothing/accessory/device/whistle, null, VENDOR_ITEM_REGULAR), list("ENGINEERING SUPPLIES", 0, null, null, null), list("Entrenching Tool", 2, /obj/item/tool/shovel/etool, null, VENDOR_ITEM_REGULAR), @@ -3561,13 +3585,15 @@ list("Advanced Firstaid Kit", 12, /obj/item/storage/firstaid/adv, null, VENDOR_ITEM_REGULAR), list("Medical Splints", 1, /obj/item/stack/medical/splint, null, VENDOR_ITEM_REGULAR), - list("Injector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), - list("Injector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), - list("Injector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), - list("Injector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), - list("Injector (Oxycodone)", 2, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), - list("Injector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), - list("Injector (Tricord)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Dylovene)", 1, /obj/item/reagent_container/hypospray/autoinjector/antitoxin, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Oxycodone)", 1, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Peridaxon)", 1, /obj/item/reagent_container/hypospray/autoinjector/peridaxon, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Tricordrazine)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), list("Health Analyzer", 4, /obj/item/device/healthanalyzer, null, VENDOR_ITEM_REGULAR), list("Medical HUD Glasses", 4, /obj/item/clothing/glasses/hud/health, null, VENDOR_ITEM_MANDATORY), @@ -3592,7 +3618,7 @@ list("Roller Bed", 5, /obj/item/roller, null, VENDOR_ITEM_REGULAR), list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), - list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/clothing/accessory/device/whistle, null, VENDOR_ITEM_REGULAR), list("Motion Detector", 15, /obj/item/device/motiondetector/hacked, null, VENDOR_ITEM_REGULAR), list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), @@ -3891,7 +3917,7 @@ list("POUCHES (Choose 2)", 0, null, null, null), list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -4005,7 +4031,7 @@ list("Essential SL Set", 0, /obj/effect/essentials_set/leader/upp, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), list("GENERAL SUPPLIES", 0, null, null, null), - list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/clothing/accessory/device/whistle, null, VENDOR_ITEM_REGULAR), list("ENGINEERING SUPPLIES", 0, null, null, null), list("Entrenching Tool", 2, /obj/item/tool/shovel/etool, null, VENDOR_ITEM_REGULAR), @@ -4019,13 +4045,15 @@ list("Advanced Firstaid Kit", 12, /obj/item/storage/firstaid/adv, null, VENDOR_ITEM_REGULAR), list("Medical Splints", 1, /obj/item/stack/medical/splint, null, VENDOR_ITEM_REGULAR), - list("Injector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), - list("Injector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), - list("Injector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), - list("Injector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), - list("Injector (Oxycodone)", 2, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), - list("Injector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), - list("Injector (Tricord)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Dylovene)", 1, /obj/item/reagent_container/hypospray/autoinjector/antitoxin, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Oxycodone)", 1, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Peridaxon)", 1, /obj/item/reagent_container/hypospray/autoinjector/peridaxon, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), + list("Autoinjector (Tricordrazine)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), list("Health Analyzer", 4, /obj/item/device/healthanalyzer, null, VENDOR_ITEM_REGULAR), list("Medical HUD Glasses", 4, /obj/item/clothing/glasses/hud/health, null, VENDOR_ITEM_MANDATORY), @@ -4033,7 +4061,7 @@ list("UTILITIES", 0, null, null, null), list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), - list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/clothing/accessory/device/whistle, null, VENDOR_ITEM_REGULAR), list("Motion Detector", 15, /obj/item/device/motiondetector/hacked, null, VENDOR_ITEM_REGULAR), list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), diff --git a/code/modules/gear_presets/uscm.dm b/code/modules/gear_presets/uscm.dm index 1ed120914f94..18ea0dbde614 100644 --- a/code/modules/gear_presets/uscm.dm +++ b/code/modules/gear_presets/uscm.dm @@ -76,10 +76,7 @@ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues) /datum/equipment_preset/uscm/pfc/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/marine/satchel - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/marine - + var/back_item = get_backpack_item(new_human) new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) /datum/equipment_preset/uscm/pfc/cryo @@ -108,10 +105,7 @@ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues) /datum/equipment_preset/uscm/sg/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/marine/satchel - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/marine - + var/back_item = get_backpack_item(new_human) new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) /datum/equipment_preset/uscm/sg/cryo @@ -167,10 +161,7 @@ minimap_background = "background_intel" /datum/equipment_preset/uscm/tank/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/marine/satchel - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/marine - + var/back_item = get_backpack_item(new_human) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/vc(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/tanker(new_human), WEAR_BODY) @@ -232,11 +223,9 @@ dress_hat = list(/obj/item/clothing/head/marine/dress_cover/officer) /datum/equipment_preset/uscm/intel/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/marine/satchel - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/marine - + var/back_item = get_backpack_item(new_human) new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/io(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/intel(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) @@ -255,7 +244,7 @@ var/obj/item/clothing/under/marine/officer/intel/U = new(new_human) new_human.equip_to_slot_or_del(U, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/intel(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/io(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp78(new_human), WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/rto/intel(new_human), WEAR_HEAD) @@ -286,10 +275,7 @@ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues) /datum/equipment_preset/uscm/spec/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/marine/satchel - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/marine - + var/back_item = get_backpack_item(new_human) new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/specrag(new_human), WEAR_HEAD) @@ -347,10 +333,7 @@ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues) /datum/equipment_preset/uscm/medic/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/marine/satchel/medic - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/marine/medic - + var/back_item = get_backpack_item(new_human, /obj/item/storage/backpack/marine/satchel/medic, /obj/item/storage/backpack/marine/medic) new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) /datum/equipment_preset/uscm/medic/cryo @@ -377,10 +360,7 @@ minimap_icon = "tl" /datum/equipment_preset/uscm/tl/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/marine/satchel - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/marine - + var/back_item = get_backpack_item(new_human) new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) /datum/equipment_preset/uscm/tl/cryo @@ -411,10 +391,7 @@ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues) /datum/equipment_preset/uscm/engineer/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/marine/satchel/tech - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/marine/tech - + var/back_item = get_backpack_item(new_human, /obj/item/storage/backpack/marine/satchel/tech, /obj/item/storage/backpack/marine/tech) new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) /datum/equipment_preset/uscm/engineer/cryo @@ -442,10 +419,7 @@ minimap_icon = "leader" /datum/equipment_preset/uscm/leader/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/marine/satchel - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/marine - + var/back_item = get_backpack_item(new_human) new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) /datum/equipment_preset/uscm/leader/cryo @@ -522,8 +496,11 @@ new_human.nutrition = NUTRITION_NORMAL /datum/equipment_preset/uscm/leader_equipped/load_gear(mob/living/carbon/human/new_human) + //backpack + var/back_item = get_backpack_item(new_human) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/leader(new_human), WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo/lead(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/medium/leader(new_human), WEAR_JACKET) @@ -708,9 +685,11 @@ new_human.nutrition = NUTRITION_NORMAL /datum/equipment_preset/uscm/specialist_equipped/load_gear(mob/living/carbon/human/new_human) - //TODO: add backpacks and satchels + //backpack + var/back_item = get_backpack_item(new_human) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/webbing(new_human), WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/storage/large_holster/m39/full(new_human), WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39(new_human), WEAR_IN_BACK) @@ -778,7 +757,10 @@ new_human.nutrition = NUTRITION_NORMAL /datum/equipment_preset/uscm/tl_equipped/load_gear(mob/living/carbon/human/new_human) - //TODO: add backpacks and satchels + //backpack + var/back_item = get_backpack_item(new_human) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + var/obj/item/clothing/under/marine/rto/U = new(new_human) var/obj/item/clothing/accessory/storage/webbing/W = new() U.attach_accessory(new_human, W) @@ -948,7 +930,7 @@ /datum/equipment_preset/uscm/marsoc/covert/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = MALE - new_human.change_real_name(new_human, "[pick(GLOB.nato_phonetic_alphabet)]") + new_human.change_real_name(new_human, capitalize(pick(GLOB.nato_phonetic_alphabet))) new_human.age = rand(20,30) /datum/equipment_preset/uscm/marsoc/covert/load_rank(mob/living/carbon/human/new_human) @@ -960,7 +942,7 @@ /datum/equipment_preset/uscm/marsoc/sg/covert/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = MALE - new_human.change_real_name(new_human, "[pick(GLOB.nato_phonetic_alphabet)]") + new_human.change_real_name(new_human, capitalize(pick(GLOB.nato_phonetic_alphabet))) new_human.age = rand(20,30) /datum/equipment_preset/uscm/marsoc/sg/covert/load_rank(mob/living/carbon/human/new_human) @@ -988,7 +970,7 @@ /datum/equipment_preset/uscm/marsoc/sl/covert/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = MALE - new_human.change_real_name(new_human, "[pick(GLOB.nato_phonetic_alphabet)]") + new_human.change_real_name(new_human, capitalize(pick(GLOB.nato_phonetic_alphabet))) new_human.age = rand(20,30) /datum/equipment_preset/uscm/marsoc/sl/covert/load_rank(mob/living/carbon/human/new_human) @@ -1092,7 +1074,7 @@ dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues) /datum/equipment_preset/uscm/pve/load_status(mob/living/carbon/human/new_human) - new_human.nutrition = NUTRITION_MAX + new_human.nutrition = NUTRITION_NORMAL /datum/equipment_preset/uscm/pve/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) @@ -1214,6 +1196,9 @@ dress_under = list(/obj/item/clothing/under/marine/dress/blues) dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues) +/datum/equipment_preset/uscm/pve/sg/load_status(mob/living/carbon/human/new_human) + new_human.nutrition = NUTRITION_NORMAL + /datum/equipment_preset/uscm/pve/sg/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(new_human), WEAR_HEAD) @@ -1242,8 +1227,6 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate(new_human), WEAR_R_STORE) spawn_marine_fluff_items(new_human) -/datum/equipment_preset/uscm/pve/sg/load_status(mob/living/carbon/human/new_human) - //## Team Leader ##// /datum/equipment_preset/uscm/pve/tl name = "USCM Solar Devils Team Leader" @@ -1381,7 +1364,7 @@ minimap_icon = "private" /datum/equipment_preset/uscm/hunted/rifleman/load_status(mob/living/carbon/human/new_human) - new_human.nutrition = NUTRITION_MAX + new_human.nutrition = NUTRITION_NORMAL /datum/equipment_preset/uscm/hunted/rifleman/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) @@ -1428,7 +1411,7 @@ minimap_icon = "tl" /datum/equipment_preset/uscm/hunted/tl/load_status(mob/living/carbon/human/new_human) - new_human.nutrition = NUTRITION_NORMAL + new_human.nutrition = NUTRITION_MAX /datum/equipment_preset/uscm/hunted/tl/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) @@ -1470,6 +1453,9 @@ minimap_icon = "smartgunner" +/datum/equipment_preset/uscm/hunted/sg/load_status(mob/living/carbon/human/new_human) + new_human.nutrition = NUTRITION_NORMAL + /datum/equipment_preset/uscm/hunted/sg/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(new_human), WEAR_HEAD) diff --git a/code/modules/gear_presets/uscm_co.dm b/code/modules/gear_presets/uscm_co.dm index b766b43baff0..29513ef3df7c 100644 --- a/code/modules/gear_presets/uscm_co.dm +++ b/code/modules/gear_presets/uscm_co.dm @@ -24,12 +24,13 @@ utility_under = list(/obj/item/clothing/under/marine, /obj/item/clothing/under/marine/officer/command, /obj/item/clothing/under/marine/officer/boiler) - utility_hat = list(/obj/item/clothing/head/cmcap, /obj/item/clothing/head/beret/cm/tan) + utility_hat = list(/obj/item/clothing/head/cmcap, /obj/item/clothing/head/cmcap/bridge, /obj/item/clothing/head/beret/cm/tan) + utility_gloves = list(/obj/item/clothing/gloves/marine, /obj/item/clothing/gloves/marine/brown, /obj/item/clothing/gloves/marine/grey, /obj/item/clothing/gloves/marine/fingerless) utility_extra = list(/obj/item/clothing/glasses/sunglasses, /obj/item/clothing/glasses/sunglasses/big, /obj/item/clothing/glasses/sunglasses/aviator, /obj/item/clothing/glasses/mbcg) service_under = list(/obj/item/clothing/under/marine/officer/formal/gray, /obj/item/clothing/under/marine/officer/formal/turtleneck) service_shoes = list(/obj/item/clothing/shoes/dress/commander) - service_extra = list(/obj/item/clothing/suit/storage/jacket/marine/dress/officer/bomber, /obj/item/clothing/suit/storage/jacket/marine/dress/officer/patchless) + service_extra = list(/obj/item/clothing/suit/storage/jacket/marine/service, /obj/item/clothing/suit/storage/jacket/marine/dress/officer/bomber, /obj/item/clothing/suit/storage/jacket/marine/dress/officer/patchless) service_hat = list(/obj/item/clothing/head/beret/cm, /obj/item/clothing/head/beret/marine/commander/dress, /obj/item/clothing/head/beret/marine/commander/black, /obj/item/clothing/head/marine/peaked/service) dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior) @@ -41,7 +42,6 @@ minimap_icon = "co" minimap_background = "background_command" - /datum/equipment_preset/uscm_co/New() . = ..() access = get_access(ACCESS_LIST_MARINE_ALL) @@ -52,7 +52,7 @@ /datum/equipment_preset/uscm_co/load_gear(mob/living/carbon/human/new_human) - var/sidearm = "Mateba" + var/sidearm = "Unica (camo comforting)" var/kit = null var/sidearmpath = /obj/item/storage/belt/gun/mateba/cmateba/full var/back_item = /obj/item/storage/backpack/satchel/lockable @@ -65,13 +65,30 @@ kit = /obj/item/storage/mateba_case/captain if(CO_GUN_MATEBA_SPECIAL) sidearmpath = /obj/item/storage/belt/gun/mateba/cmateba/special - if(CO_GUN_MATEBA_COUNCIL) - sidearmpath = /obj/item/storage/belt/gun/mateba/council/full - kit = /obj/item/storage/mateba_case/captain/council + if(CO_GUN_MATEBA_CLASSIC) + sidearmpath = /obj/item/storage/belt/gun/mateba/full + kit = /obj/item/storage/mateba_case/captain + if(CO_GUN_2006M) + sidearmpath = /obj/item/storage/belt/gun/mateba/mtr6m/full if(CO_GUN_DEAGLE) sidearmpath = /obj/item/storage/belt/gun/m4a3/heavy/co if(CO_GUN_M1911C) sidearmpath = /obj/item/storage/belt/gun/m4a3/m1911/commander + //Council variants + if(CO_GUN_MATEBA_COUNCIL) + sidearmpath = /obj/item/storage/belt/gun/mateba/council/full + kit = /obj/item/storage/mateba_case/captain/council + if(CO_GUN_MATEBA_COUNCIL_GOLDEN) + sidearmpath = /obj/item/storage/belt/gun/mateba/council/full_golden + kit = /obj/item/storage/mateba_case/captain/council_gold + if(CO_GUN_2006M_COUNCIL) + sidearmpath = /obj/item/storage/belt/gun/mateba/council/mtr6m/full + if(CO_GUN_2006MB_COUNCIL) + sidearmpath = /obj/item/storage/belt/gun/mateba/council/mtr6m/full_black + if(CO_GUN_2006MS_COUNCIL) + sidearmpath = /obj/item/storage/belt/gun/mateba/council/mtr6m/full_silver + if(CO_GUN_DEAGLE_COUNCIL) + sidearmpath = /obj/item/storage/belt/gun/m4a3/heavy/co_golden switch(whitelist_level) if(WHITELIST_COUNCIL) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/commander/council(new_human), WEAR_HEAD) @@ -308,15 +325,6 @@ service_extra = list(/obj/item/clothing/suit/storage/jacket/marine/dress/officer/commander, /obj/item/clothing/suit/storage/jacket/marine/dress/officer/bomber) -/datum/equipment_preset/uscm_co/visitor - name = "USCM Observer (Major) (VO)" - flags = EQUIPMENT_PRESET_EXTRA - - assignment = JOB_USCM_OBSV - job_title = JOB_USCM_OBSV - role_comm_title = "VO" - minimap_background = "background_medical_WO" - /datum/equipment_preset/uscm_co/council name = "USCM Commanding Officer (CO+)" flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE @@ -343,3 +351,20 @@ dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior, /obj/item/clothing/under/marine/dress/blues/general) service_extra = list(/obj/item/clothing/suit/storage/jacket/marine/dress/officer/commander, /obj/item/clothing/suit/storage/jacket/marine/dress/officer/bomber) + +/datum/equipment_preset/uscm_co/visitor + name = "USCM Observer (Major) (VO)" + flags = EQUIPMENT_PRESET_EXTRA + + assignment = JOB_USCM_OBSV + job_title = JOB_USCM_OBSV + role_comm_title = "VO" + minimap_background = "background_medical_WO" + +/datum/equipment_preset/uscm_co/visitor/ltcol + name = "USCM Observer (Lt. Col.) (VO)" + paygrades = list(PAY_SHORT_MO5 = JOB_PLAYTIME_TIER_0) + +/datum/equipment_preset/uscm_co/visitor/col + name = "USCM Observer (Colonel) (VO)" + paygrades = list(PAY_SHORT_MO6 = JOB_PLAYTIME_TIER_0) diff --git a/code/modules/gear_presets/uscm_event.dm b/code/modules/gear_presets/uscm_event.dm index efd2fa40c179..dde3dbcb1609 100644 --- a/code/modules/gear_presets/uscm_event.dm +++ b/code/modules/gear_presets/uscm_event.dm @@ -211,7 +211,7 @@ role_comm_title = "PvE" flags = EQUIPMENT_PRESET_EXTRA minimap_icon = "pve" - + dress_under = list(/obj/item/clothing/under/marine/dress/blues) dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues) dress_hat = list(/obj/item/clothing/head/marine/dress_cover) diff --git a/code/modules/gear_presets/uscm_medical.dm b/code/modules/gear_presets/uscm_medical.dm index 781c26b370c2..6aac4a720189 100644 --- a/code/modules/gear_presets/uscm_medical.dm +++ b/code/modules/gear_presets/uscm_medical.dm @@ -43,10 +43,9 @@ role_comm_title = "CMO" skills = /datum/skills/CMO - minimap_icon = list("doctor") + minimap_icon = "doctor" minimap_background = "background_command" - - utility_under = list(/obj/item/clothing/under/rank/chief_medical_officer) + utility_under = list(/obj/item/clothing/under/rank/cmo) utility_hat = list() utility_gloves = list() utility_shoes = list(/obj/item/clothing/shoes/white) @@ -57,7 +56,8 @@ if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chief_medical_officer(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/cmo(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/cmo(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/paper/research_notes/unique/tier_two(new_human), WEAR_L_STORE) new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) @@ -74,7 +74,7 @@ skills = /datum/skills/doctor access = list(ACCESS_MARINE_MEDBAY, ACCESS_MARINE_CHEMISTRY, ACCESS_MARINE_MORGUE, ACCESS_MARINE_DATABASE) - minimap_icon = list("doctor") + minimap_icon = "doctor" minimap_background = "background_medical" /datum/equipment_preset/uscm_ship/uscm_medical/doctor/load_gear(mob/living/carbon/human/new_human) @@ -82,6 +82,7 @@ if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/doc(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/blue(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET) @@ -98,10 +99,27 @@ if (new_human.client?.prefs && new_human.client.prefs.backbag == 1) back_item = /obj/item/storage/backpack/marine + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/doc(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/green(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET) + +/datum/equipment_preset/uscm_ship/uscm_medical/doctor/pharmacist + name = "USCM Pharmaceutical Physician" + assignment = JOB_PHARMACIST + +/datum/equipment_preset/uscm_ship/uscm_medical/doctor/pharmacist/load_gear(mob/living/carbon/human/new_human) + var/back_item = /obj/item/storage/backpack/marine/satchel + if (new_human.client?.prefs && new_human.client.prefs.backbag == 1) + back_item = /obj/item/storage/backpack/marine + + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/doc(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/pharmacist(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET) + + //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/uscm_medical/field_doctor @@ -113,7 +131,7 @@ role_comm_title = "Fld Doc" skills = /datum/skills/doctor - access = list(ACCESS_MARINE_MEDBAY, ACCESS_MARINE_CHEMISTRY, ACCESS_MARINE_MORGUE, ACCESS_MARINE_FIELD_DOC) + access = list(ACCESS_MARINE_MEDBAY, ACCESS_MARINE_CHEMISTRY, ACCESS_MARINE_MORGUE, ACCESS_MARINE_FIELD_DOC, ACCESS_MARINE_DATABASE) minimap_icon = "field_doctor" minimap_background = "background_medical" @@ -123,6 +141,7 @@ if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/doc(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/green(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET) @@ -137,10 +156,10 @@ paygrades = list(PAY_SHORT_ME4 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_1) role_comm_title = "Nurse" skills = /datum/skills/nurse + access = list(ACCESS_MARINE_MEDBAY, ACCESS_MARINE_CHEMISTRY, ACCESS_MARINE_MORGUE, ACCESS_MARINE_DATABASE) - minimap_icon = list("nurse") + minimap_icon = "nurse" minimap_background = "background_shipside" - dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior) dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/nco) dress_hat = list(/obj/item/clothing/head/marine/dress_cover) @@ -152,6 +171,7 @@ if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/doc(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/lightblue(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/armband/nurse(new_human), WEAR_ACCESSORY) @@ -164,13 +184,16 @@ access = list(ACCESS_MARINE_MEDBAY, ACCESS_MARINE_RESEARCH, ACCESS_MARINE_CHEMISTRY, ACCESS_MARINE_MORGUE) assignment = JOB_RESEARCHER job_title = JOB_RESEARCHER - paygrades = list(PAY_SHORT_MO1 = JOB_PLAYTIME_TIER_0) + paygrades = list(PAY_SHORT_CDOC = JOB_PLAYTIME_TIER_0, PAY_SHORT_CCMOA = JOB_PLAYTIME_TIER_1, PAY_SHORT_CCMOB = JOB_PLAYTIME_TIER_2, PAY_SHORT_CCMOC = JOB_PLAYTIME_TIER_3, PAY_SHORT_CCMOD = JOB_PLAYTIME_TIER_4) role_comm_title = "Rsr" skills = /datum/skills/researcher - minimap_icon = "researcher" - minimap_background = "background_medical" + faction = FACTION_WY + faction_group = FACTION_LIST_MARINE_WY + origin_override = ORIGIN_CIVILIAN + minimap_icon = "researcher" + minimap_background = "background_goon" utility_under = list(/obj/item/clothing/under/marine/officer/researcher) utility_hat = list() utility_gloves = list() @@ -186,7 +209,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/researcher(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) - + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/research(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/paper/research_notes/unique/tier_one(new_human), WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/reagent_container/syringe(new_human), WEAR_R_STORE) new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) diff --git a/code/modules/gear_presets/uscm_police.dm b/code/modules/gear_presets/uscm_police.dm index 196efdb9817c..6d8b6b66236f 100644 --- a/code/modules/gear_presets/uscm_police.dm +++ b/code/modules/gear_presets/uscm_police.dm @@ -1,8 +1,8 @@ /datum/equipment_preset/uscm_ship/uscm_police name = "USCM (police roles)" faction = FACTION_MARINE - minimap_background = "background_mp" minimum_age = 21 + minimap_background = "background_mp" //*****************************************************************************************************/ @@ -38,15 +38,16 @@ utility_under = list(/obj/item/clothing/under/marine/mp) utility_hat = list(/obj/item/clothing/head/beret/marine/mp) utility_extra = list(/obj/item/clothing/head/cmcap, /obj/item/clothing/head/beret/cm, /obj/item/clothing/head/beret/cm/tan) - service_over = list(/obj/item/clothing/suit/storage/jacket/marine/service/mp) + var/headset_item = /obj/item/device/radio/headset/almayer/mmpo + /datum/equipment_preset/uscm_ship/uscm_police/mp/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel/sec if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/security - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mmpo(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new headset_item(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) @@ -61,6 +62,21 @@ new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_R_STORE) +/datum/equipment_preset/uscm_ship/uscm_police/mp/honorguard + name = "USCM Military Police Honor Guard (MPHG)" + flags = EQUIPMENT_PRESET_EXTRA + + assignment = JOB_POLICE_HG + job_title = JOB_POLICE_HG + paygrades = list(PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME6 = JOB_PLAYTIME_TIER_1) + role_comm_title = "MPHG" + + minimap_icon = "honorguard" + headset_item = /obj/item/device/radio/headset/almayer/marine/mp_honor/com + +/datum/equipment_preset/uscm_ship/uscm_police/mp/honorguard/New() + . = ..() + access = get_access(ACCESS_LIST_MARINE_ALL) //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/uscm_police/warden @@ -106,7 +122,7 @@ if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/security - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mwcom(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/mw(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/warden(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) @@ -157,7 +173,7 @@ role_comm_title = "CMP" skills = /datum/skills/CMP - minimap_icon = list("cmp") + minimap_icon = "cmp" utility_under = list(/obj/item/clothing/under/marine/officer/warrant) utility_hat = list(/obj/item/clothing/head/beret/marine/mp/cmp) @@ -170,7 +186,7 @@ if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/security - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/cmpcom(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/cmp(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/warrant(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) @@ -200,7 +216,7 @@ role_comm_title = "RMP" skills = /datum/skills/CMP - minimap_icon = list("rmp") + minimap_icon = "rmp" utility_under = list(/obj/item/clothing/under/marine/officer/warrant) utility_hat = list(/obj/item/clothing/head/beret/marine/mp/cmp) @@ -213,7 +229,7 @@ /datum/equipment_preset/uscm_ship/uscm_police/riot_mp/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/cmpcom(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/cmp(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/warrant(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/riot/marine(new_human), WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/riot(new_human), WEAR_HEAD) @@ -244,7 +260,7 @@ name = "USCM Riot Chief MP (RCMP)" flags = EQUIPMENT_PRESET_EXTRA - minimap_icon = list("crmp") + minimap_icon = "crmp" assignment = JOB_RIOT_CHIEF job_title = JOB_RIOT_CHIEF diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm index ddb4e9a06bad..eeac596e38c8 100644 --- a/code/modules/gear_presets/uscm_ship.dm +++ b/code/modules/gear_presets/uscm_ship.dm @@ -30,6 +30,7 @@ faction_group = FACTION_LIST_MARINE_WY flags = EQUIPMENT_PRESET_START_OF_ROUND origin_override = ORIGIN_CIVILIAN + selection_categories = list(FACTION_MARINE) idtype = /obj/item/card/id/silver/cl access = list( @@ -73,6 +74,67 @@ //*****************************************************************************************************/ +/datum/equipment_preset/uscm_ship/corp_sec + name = "USCM CL Bodyguard (CB)" + faction = FACTION_WY + faction_group = FACTION_LIST_MARINE_WY + flags = EQUIPMENT_PRESET_START_OF_ROUND + origin_override = ORIGIN_CIVILIAN + selection_categories = list(FACTION_MARINE) + + idtype = /obj/item/card/id/silver/cl + access = list( + ACCESS_WY_GENERAL, + ACCESS_MARINE_COMMAND, + ACCESS_MARINE_RESEARCH, + ACCESS_MARINE_MEDBAY, + ACCESS_CIVILIAN_PUBLIC, + ACCESS_CIVILIAN_RESEARCH, + ACCESS_CIVILIAN_ENGINEERING, + ACCESS_CIVILIAN_LOGISTICS, + ACCESS_CIVILIAN_BRIG, + ACCESS_CIVILIAN_MEDBAY, + ACCESS_WY_FLIGHT, + ACCESS_CIVILIAN_COMMAND, + ) + assignment = JOB_CORPORATE_BODYGUARD + job_title = JOB_CORPORATE_BODYGUARD + paygrades = list(PAY_SHORT_WY_SEC_TPPO = JOB_PLAYTIME_TIER_0, PAY_SHORT_WY_SEC_PPO = JOB_PLAYTIME_TIER_1, PAY_SHORT_WY_SEC_PPS = JOB_PLAYTIME_TIER_3, PAY_SHORT_WY_SEC_PPC = JOB_PLAYTIME_TIER_4) + role_comm_title = "CB" + skills = /datum/skills/wy_goon + + minimap_icon = "goon_guard" + minimap_background = "background_goon" + +/datum/equipment_preset/uscm_ship/corp_sec/New() + . = ..() + access = get_access(ACCESS_LIST_MARINE_LIAISON) + list(ACCESS_WY_SECURITY) + +/datum/equipment_preset/uscm_ship/corp_sec/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY/security/guard, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/black, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/health/ceramic_plate, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/wy_faction, WEAR_ACCESSORY) + + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/corporate/black, WEAR_JACKET) + + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) + if(new_human.disabilities & NEARSIGHTED) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/blue/prescription, WEAR_EYES) + else + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/blue, WEAR_EYES) + + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/mre/wy, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert/wy, WEAR_R_STORE) + + new_human.equip_to_slot_or_del(new /obj/item/storage/box/zipcuffs/small, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tactical/sec/full, WEAR_L_STORE) + + +//*****************************************************************************************************/ + /datum/equipment_preset/uscm_ship/reporter name = "Combat Correspondent (Press)" flags = EQUIPMENT_PRESET_START_OF_ROUND @@ -99,7 +161,7 @@ idtype = /obj/item/card/id/silver/cl minimap_icon = "correspondent" - minimap_background = "background_civillian" + minimap_background = "background_civilian" dress_under = list() dress_over = list() dress_hat = list() @@ -134,8 +196,7 @@ idtype = /obj/item/card/id/dogtag minimap_icon = "correspondent" - minimap_background = "background_civillian" - + minimap_background = "background_civilian" dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/nco) dress_hat = list(/obj/item/clothing/head/marine/dress_cover) @@ -196,9 +257,9 @@ if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine/tech - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/ce(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/ce(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/ce(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(new_human), WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) @@ -234,6 +295,7 @@ if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine/tech + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mt(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/engi(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) @@ -315,7 +377,7 @@ if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/industrial - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/qm(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/qm(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/qm_suit(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/fingerless(new_human), WEAR_HANDS) @@ -473,7 +535,7 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/device/flash(new_human), WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/device/binoculars(new_human), WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/device/whistle(new_human), WEAR_R_HAND) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/device/whistle(new_human), WEAR_R_HAND) /datum/equipment_preset/uscm_ship/sea/load_rank(mob/living/carbon/human/rankee, client/mob_client) mob_client?.toggle_newplayer_ic_hud(TRUE) @@ -566,7 +628,7 @@ if(new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/po(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/po(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/pilot(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) @@ -584,7 +646,7 @@ if(new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/po(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/po(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/pilot(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(new_human), WEAR_HANDS) @@ -618,7 +680,7 @@ if(new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/po(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/po(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/pilot(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) @@ -636,7 +698,7 @@ if(new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/po(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/po(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/pilot(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(new_human), WEAR_HANDS) @@ -672,7 +734,7 @@ if(new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/po(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/po(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/pilot/dcc(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) @@ -690,7 +752,7 @@ if(new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/po(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/po(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/pilot/dcc(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(new_human), WEAR_HANDS) diff --git a/code/modules/gear_presets/uscm_synths.dm b/code/modules/gear_presets/uscm_synths.dm new file mode 100644 index 000000000000..68224ec098b6 --- /dev/null +++ b/code/modules/gear_presets/uscm_synths.dm @@ -0,0 +1,137 @@ +//*****************************************************************************************************/ + +/datum/equipment_preset/synth/uscm + name = "USCM Synthetic (Generalised)" + flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE + faction = FACTION_MARINE + idtype = /obj/item/card/id/gold + assignment = JOB_SYNTH + job_title = JOB_SYNTH + role_comm_title = "Syn" + preset_generation_support = FALSE + + minimap_icon = "synth" + paygrades = list(PAY_SHORT_MWO = JOB_PLAYTIME_TIER_0) + skills = /datum/skills/synthetic + + var/is_council = FALSE + +/datum/equipment_preset/synth/uscm/New() + . = ..() + access = get_access(ACCESS_LIST_MARINE_ALL) + +/datum/equipment_preset/synth/uscm/load_gear(mob/living/carbon/human/new_human) + var/back_item = /obj/item/storage/backpack/marine/satchel + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) + back_item = /obj/item/storage/backpack/industrial + if(!is_council) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/synth(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/synthetic(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + else + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/synth(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/synthetic/councillor(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + +/datum/equipment_preset/synth/uscm/councillor + name = "USCM Synthetic Council (Generalised)" + paygrades = list(PAY_SHORT_MCWO = JOB_PLAYTIME_TIER_0) + is_council = TRUE + +//*****************************************************************************************************/ + +/datum/equipment_preset/synth/uscm/wo + name = "WO Support Synthetic" + flags = EQUIPMENT_PRESET_START_OF_ROUND_WO + paygrades = list(PAY_SHORT_SYN = JOB_PLAYTIME_TIER_0) + +/datum/equipment_preset/synth/uscm/wo/load_gear(mob/living/carbon/human/new_human) + + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/cm(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/synth(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/synthetic(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/RO(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest/brown_vest(new_human), WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/smartpack/a1/tan(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_L_STORE) + +//*****************************************************************************************************/ + +/datum/equipment_preset/synth/uscm/engineering + name = "USCM Synthetic (Engineering)" + paygrades = list(PAY_SHORT_MWO = JOB_PLAYTIME_TIER_0) + subtype = "eng" + assignment = "Engineering Synthetic" + manifest_title = "Engineering Synthetic" + +/datum/equipment_preset/synth/uscm/engineering/council + name = "USCM Synthetic Council (Engineering)" + paygrades = list(PAY_SHORT_MCWO = JOB_PLAYTIME_TIER_0) + is_council = TRUE + +//*****************************************************************************************************/ + +/datum/equipment_preset/synth/uscm/medical + name = "USCM Synthetic (Medical)" + paygrades = list(PAY_SHORT_MWO = JOB_PLAYTIME_TIER_0) + subtype = "med" + assignment = "Medical Synthetic" + manifest_title = "Medical Synthetic" + +/datum/equipment_preset/synth/uscm/medical/council + name = "USCM Synthetic Council (Medical)" + paygrades = list(PAY_SHORT_MCWO = JOB_PLAYTIME_TIER_0) + is_council = TRUE + +//*****************************************************************************************************/ + +/datum/equipment_preset/synth/uscm/intel + name = "USCM Synthetic (Intel)" + paygrades = list(PAY_SHORT_MWO = JOB_PLAYTIME_TIER_0) + subtype = "io" + assignment = "Intelligence Synthetic" + manifest_title = "Intelligence Synthetic" + +/datum/equipment_preset/synth/uscm/intel/council + name = "USCM Synthetic Council (Intel)" + paygrades = list(PAY_SHORT_MCWO = JOB_PLAYTIME_TIER_0) + is_council = TRUE + +//*****************************************************************************************************/ + +/datum/equipment_preset/synth/uscm/command + name = "USCM Synthetic (Command)" + paygrades = list(PAY_SHORT_MWO = JOB_PLAYTIME_TIER_0) + subtype = "cmd" + assignment = "Command Support Synthetic" + manifest_title = "Command Support Synthetic" + +/datum/equipment_preset/synth/uscm/command/council + name = "USCM Synthetic Council (Command)" + paygrades = list(PAY_SHORT_MCWO = JOB_PLAYTIME_TIER_0) + is_council = TRUE + +//*****************************************************************************************************/ + +/datum/equipment_preset/synth/uscm/mp + name = "USCM Synthetic (MP)" + paygrades = list(PAY_SHORT_MWO = JOB_PLAYTIME_TIER_0) + subtype = "mp" + assignment = "Military Police Synthetic" + +/datum/equipment_preset/synth/uscm/mp/council + name = "USCM Synthetic Council (MP)" + paygrades = list(PAY_SHORT_MCWO = JOB_PLAYTIME_TIER_0) + is_council = TRUE + +//*****************************************************************************************************/ diff --git a/code/modules/gear_presets/whiteout.dm b/code/modules/gear_presets/whiteout.dm index d087b1f176bd..50a27d3a3e25 100644 --- a/code/modules/gear_presets/whiteout.dm +++ b/code/modules/gear_presets/whiteout.dm @@ -9,6 +9,7 @@ languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_RUSSIAN, LANGUAGE_GERMAN, LANGUAGE_FRENCH, LANGUAGE_SCANDINAVIAN, LANGUAGE_SPANISH, LANGUAGE_YAUTJA, LANGUAGE_XENOMORPH, LANGUAGE_TSL) //Synths after all. skills = /datum/skills/everything //They are Synths, programmed for Everything. minimap_icon = "whiteout" + minimap_background = "background_mp" idtype = /obj/item/card/id/pmc/ds paygrades = list(PAY_SHORT_CDNM = JOB_PLAYTIME_TIER_0) var/new_bubble_icon = "machine" @@ -30,9 +31,9 @@ new_human.gender = pick(MALE) var/random_name if(new_human.gender == MALE) - random_name = "[pick(GLOB.greek_letters)]" + random_name = capitalize(pick(GLOB.greek_letters)) else - random_name = "[pick(GLOB.greek_letters)]" + random_name = capitalize(pick(GLOB.greek_letters)) new_human.change_real_name(new_human, random_name) new_human.bubble_icon = new_bubble_icon new_human.age = rand(3, 5) diff --git a/code/modules/gear_presets/wo.dm b/code/modules/gear_presets/wo.dm index 33b840ee613c..6fcfeb0061e7 100644 --- a/code/modules/gear_presets/wo.dm +++ b/code/modules/gear_presets/wo.dm @@ -45,7 +45,7 @@ access = get_access(ACCESS_LIST_MARINE_ALL) /datum/equipment_preset/wo/commander/load_gear(mob/living/carbon/human/new_human) - var/sidearm = "Mateba" + var/sidearm = "Unica (camo comforting)" var/kit = null var/sidearmpath = /obj/item/storage/belt/gun/mateba/cmateba/full var/back_item = /obj/item/storage/backpack/satchel/lockable @@ -58,14 +58,29 @@ kit = /obj/item/storage/mateba_case/captain if(CO_GUN_MATEBA_SPECIAL) sidearmpath = /obj/item/storage/belt/gun/mateba/cmateba/special - if(CO_GUN_MATEBA_COUNCIL) - sidearmpath = /obj/item/storage/belt/gun/mateba/council/full - kit = /obj/item/storage/mateba_case/captain/council + if(CO_GUN_MATEBA_CLASSIC) + sidearmpath = /obj/item/storage/belt/gun/mateba/full + if(CO_GUN_2006M) + sidearmpath = /obj/item/storage/belt/gun/mateba/mtr6m/full if(CO_GUN_DEAGLE) sidearmpath = /obj/item/storage/belt/gun/m4a3/heavy/co if(CO_GUN_M1911C) sidearmpath = /obj/item/storage/belt/gun/m4a3/m1911/commander - + //Council variants + if(CO_GUN_MATEBA_COUNCIL) + sidearmpath = /obj/item/storage/belt/gun/mateba/council/full + kit = /obj/item/storage/mateba_case/captain/council + if(CO_GUN_MATEBA_COUNCIL_GOLDEN) + sidearmpath = /obj/item/storage/belt/gun/mateba/council/full_golden + kit = /obj/item/storage/mateba_case/captain/council_gold + if(CO_GUN_2006M_COUNCIL) + sidearmpath = /obj/item/storage/belt/gun/mateba/council/mtr6m/full + if(CO_GUN_2006MB_COUNCIL) + sidearmpath = /obj/item/storage/belt/gun/mateba/council/mtr6m/full_black + if(CO_GUN_2006MS_COUNCIL) + sidearmpath = /obj/item/storage/belt/gun/mateba/council/mtr6m/full_silver + if(CO_GUN_DEAGLE_COUNCIL) + sidearmpath = /obj/item/storage/belt/gun/m4a3/heavy/co_golden //back new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) if(kit) @@ -112,9 +127,7 @@ access = get_access(ACCESS_LIST_MARINE_MAIN) /datum/equipment_preset/wo/xo/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/satchel - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/marine + var/back_item = get_backpack_item(new_human, /obj/item/storage/backpack/satchel) //back new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) @@ -198,9 +211,7 @@ minimap_background = "background_mp" /datum/equipment_preset/wo/vhg/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/satchel/sec - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/security + var/back_item = get_backpack_item(new_human, /obj/item/storage/backpack/satchel/sec, /obj/item/storage/backpack/security) //back new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) @@ -241,9 +252,7 @@ minimap_background = "background_mp" /datum/equipment_preset/wo/hgs/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/satchel/sec - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/security + var/back_item = get_backpack_item(new_human, /obj/item/storage/backpack/satchel/sec, /obj/item/storage/backpack/security) //back new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) @@ -281,9 +290,7 @@ minimap_background = "background_mp" /datum/equipment_preset/wo/hg/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/satchel/sec - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/security + var/back_item = get_backpack_item(new_human, /obj/item/storage/backpack/satchel/sec, /obj/item/storage/backpack/security) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/mp_honor(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/boiler(new_human), WEAR_BODY) @@ -316,9 +323,7 @@ minimap_background = "background_shipside" /datum/equipment_preset/wo/mortar_crew/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/marine/satchel - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/marine + var/back_item = get_backpack_item(new_human, /obj/item/storage/backpack/marine/satchel) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/eng, WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/mortar, WEAR_L_EAR) @@ -353,9 +358,7 @@ minimap_background = "background_medical" /datum/equipment_preset/wo/quartermaster/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/marine/satchel/tech - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/industrial + var/back_item = get_backpack_item(new_human, /obj/item/storage/backpack/marine/satchel/tech, /obj/item/storage/backpack/marine/tech) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/bridge(new_human), WEAR_BODY) @@ -410,7 +413,7 @@ access = list(ACCESS_MARINE_CMO, ACCESS_MARINE_MEDBAY, ACCESS_MARINE_RESEARCH, ACCESS_MARINE_COMMAND, ACCESS_MARINE_CHEMISTRY, ACCESS_MARINE_MORGUE) assignment = JOB_WO_CMO job_title = JOB_WO_CMO - paygrades = list(PAY_SHORT_CCMO = JOB_PLAYTIME_TIER_0) + paygrades = list(PAY_SHORT_MO2 = JOB_PLAYTIME_TIER_0) role_comm_title = "HS" skills = /datum/skills/CMO idtype = /obj/item/card/id/silver @@ -419,11 +422,9 @@ minimap_background = "background_medical_WO" /datum/equipment_preset/wo/head_surgeon/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/marine/satchel/medic - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/marine/medic + var/back_item = get_backpack_item(new_human, /obj/item/storage/backpack/marine/satchel/medic, /obj/item/storage/backpack/marine/medic) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/cmo(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/cmo(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/green(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) @@ -454,7 +455,7 @@ access = list(ACCESS_MARINE_MEDBAY, ACCESS_MARINE_CHEMISTRY, ACCESS_MARINE_MORGUE) assignment = JOB_WO_DOCTOR job_title = JOB_WO_DOCTOR - paygrades = list(PAY_SHORT_CDOC = JOB_PLAYTIME_TIER_0) + paygrades = list(PAY_SHORT_MO1 = JOB_PLAYTIME_TIER_0) role_comm_title = "Doc" skills = /datum/skills/doctor idtype = /obj/item/card/id @@ -463,9 +464,7 @@ minimap_background = "background_medical_WO" /datum/equipment_preset/wo/doctor/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/marine/satchel/medic - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/marine/medic + var/back_item = get_backpack_item(new_human, /obj/item/storage/backpack/marine/satchel/medic, /obj/item/storage/backpack/marine/medic) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/doc(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/green(new_human), WEAR_BODY) @@ -495,7 +494,7 @@ access = list(ACCESS_MARINE_MEDBAY, ACCESS_MARINE_RESEARCH, ACCESS_MARINE_CHEMISTRY, ACCESS_MARINE_MORGUE) assignment = JOB_WO_RESEARCHER job_title = JOB_WO_RESEARCHER - paygrades = list(PAY_SHORT_CDOC = JOB_PLAYTIME_TIER_0) + paygrades = list(PAY_SHORT_MO1 = JOB_PLAYTIME_TIER_0) role_comm_title = "Chem" skills = /datum/skills/researcher idtype = /obj/item/card/id @@ -504,9 +503,7 @@ minimap_background = "background_medical_WO" /datum/equipment_preset/wo/chemist/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/marine/satchel/medic - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/marine/medic + var/back_item = get_backpack_item(new_human, /obj/item/storage/backpack/marine/satchel/medic, /obj/item/storage/backpack/marine/medic) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/doc(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/purple(new_human), WEAR_BODY) @@ -545,9 +542,7 @@ minimap_background = "background_medical" /datum/equipment_preset/wo/bcm/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/marine/satchel/tech - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/marine/tech + var/back_item = get_backpack_item(new_human, /obj/item/storage/backpack/marine/satchel/tech, /obj/item/storage/backpack/marine/tech) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/eng(new_human), WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom(new_human), WEAR_L_EAR) @@ -580,9 +575,7 @@ minimap_background = "background_shipside" /datum/equipment_preset/wo/bc/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/marine/satchel/tech - if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) - back_item = /obj/item/storage/backpack/marine/tech + var/back_item = get_backpack_item(new_human, /obj/item/storage/backpack/marine/satchel/tech, /obj/item/storage/backpack/marine/tech) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/eng(new_human), WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mt(new_human), WEAR_L_EAR) @@ -611,7 +604,7 @@ idtype = /obj/item/card/id/silver/cl minimap_icon = "correspondent" - minimap_background = "background_civillian" + minimap_background = "background_civilian" /datum/equipment_preset/wo/reporter/New() . = ..() @@ -659,6 +652,8 @@ var/back_item = /obj/item/storage/backpack/marine/satchel if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine + else if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 3)) + back_item = /obj/item/storage/backpack/marine/satchel/chestrig new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) @@ -695,6 +690,8 @@ var/back_item = /obj/item/storage/backpack/marine/satchel if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine + else if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 3)) + back_item = /obj/item/storage/backpack/marine/satchel/chestrig new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) @@ -767,8 +764,8 @@ new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/tool/shovel/etool/folded(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full(new_human), WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/low_grade_full(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full(new_human), WEAR_R_STORE) generate_random_marine_primary_for_wo(new_human) add_common_wo_equipment(new_human) @@ -829,6 +826,8 @@ var/back_item = /obj/item/storage/backpack/marine/satchel if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine + else if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 3)) + back_item = /obj/item/storage/backpack/marine/satchel/chestrig new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) diff --git a/code/modules/gear_presets/wy.dm b/code/modules/gear_presets/wy.dm index 4626af18099a..df7ff5e86bbf 100644 --- a/code/modules/gear_presets/wy.dm +++ b/code/modules/gear_presets/wy.dm @@ -213,7 +213,7 @@ new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/mod88/flashlight, WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/mod88, WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/mod88, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY/guard, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY/security/guard, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/sec, WEAR_HEAD) diff --git a/code/modules/gear_presets/wy_commandos.dm b/code/modules/gear_presets/wy_commandos.dm index 0ed66bbbced5..3f48f8c65004 100644 --- a/code/modules/gear_presets/wy_commandos.dm +++ b/code/modules/gear_presets/wy_commandos.dm @@ -147,7 +147,7 @@ new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun/l56a2/elite, WEAR_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles, WEAR_EYES) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/commando/full, WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_sg/full, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_sg/commando, WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked/pmc, WEAR_IN_BACK) @@ -189,7 +189,7 @@ new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun/l56a2/elite, WEAR_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles, WEAR_EYES) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/commando/full, WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_sg/full, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_sg/commando, WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked/pmc, WEAR_IN_BACK) @@ -214,15 +214,16 @@ /datum/equipment_preset/pmc/commando/leader/load_name(mob/living/carbon/human/new_human, randomise) //reference to Theo Stern from A:DD new_human.gender = MALE + var/datum/preferences/human = new() human.randomize_appearance(new_human) - var/random_name + var/random_name new_human.h_style = "Cpl. Dietrich" new_human.f_style = "Soulful Selleck" - random_name = "[pick(GLOB.first_names_male)] [pick(GLOB.last_names)]" - + random_name = random_name(new_human.gender) new_human.change_real_name(new_human, random_name) + new_human.age = rand(30,40) new_human.r_facial = 0 new_human.g_facial = 0 @@ -400,7 +401,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Autoinjector Pouch (Full)", 0, /obj/item/storage/pouch/autoinjector/full/wy, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Autoinjectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), diff --git a/code/modules/gear_presets/wy_goons.dm b/code/modules/gear_presets/wy_goons.dm index 94b55304118f..a95cc09dc9bd 100644 --- a/code/modules/gear_presets/wy_goons.dm +++ b/code/modules/gear_presets/wy_goons.dm @@ -23,18 +23,18 @@ var/datum/preferences/A = new() A.randomize_appearance(new_human) - var/random_name var/first_name var/last_name - //gender checks - if(new_human.gender == MALE) - first_name = "[pick(GLOB.first_names_male_pmc)]" - new_human.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache") - else - first_name = "[pick(GLOB.first_names_female_pmc)]" - last_name = "[pick(GLOB.last_names_pmc)]" - random_name = "[first_name] [last_name]" - new_human.change_real_name(new_human, random_name) + switch(new_human.gender) + if(FEMALE) + first_name = capitalize(pick(GLOB.first_names_female_pmc)) + if(PLURAL, NEUTER) // Not currently possible + first_name = capitalize(pick(MALE, FEMALE) == MALE ? pick(GLOB.first_names_male_pmc) : pick(GLOB.first_names_female_pmc)) + else // MALE + first_name = capitalize(pick(GLOB.first_names_male_pmc)) + new_human.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache") + last_name = capitalize(pick(GLOB.last_names_pmc)) + new_human.change_real_name(new_human, "[first_name] [last_name]") new_human.age = rand(17,35) @@ -66,7 +66,7 @@ assignment = JOB_WY_GOON job_title = JOB_WY_GOON - paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0) + paygrades = list(PAY_SHORT_WY_SEC = JOB_PLAYTIME_TIER_0) skills = /datum/skills/wy_goon minimap_icon = "goon_standard" @@ -81,7 +81,7 @@ helmet_type = /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate/hybrisa /datum/equipment_preset/goon/standard/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY/security, WEAR_L_EAR) new_human.equip_to_slot_or_del(new uniform_type, WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) @@ -110,7 +110,7 @@ name = "Weyland-Yutani Corporate Security Goon (CL Bodyguard)" /datum/equipment_preset/goon/standard/bodyguard/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY/security, WEAR_L_EAR) new_human.equip_to_slot_or_del(new uniform_type, WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) @@ -148,7 +148,7 @@ assignment = JOB_WY_GOON_TECH job_title = JOB_WY_GOON_TECH - paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0) + paygrades = list(PAY_SHORT_WY_SEC_SPEC = JOB_PLAYTIME_TIER_0) skills = /datum/skills/wy_goon_tech minimap_icon = "goon_engi" uniform_type = /obj/item/clothing/under/marine/veteran/pmc/corporate/engineer @@ -165,7 +165,7 @@ helmet_type = /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate/hybrisa /datum/equipment_preset/goon/engineer/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY/security, WEAR_L_EAR) new_human.equip_to_slot_or_del(new uniform_type, WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) @@ -195,7 +195,7 @@ assignment = JOB_WY_GOON_MEDIC job_title = JOB_WY_GOON_MEDIC - paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0) + paygrades = list(PAY_SHORT_WY_SEC_SPEC = JOB_PLAYTIME_TIER_0) skills = /datum/skills/wy_goon_medic minimap_icon = "goon_med" uniform_type = /obj/item/clothing/under/marine/veteran/pmc/corporate/medic @@ -212,7 +212,7 @@ helmet_type = /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate/hybrisa/medic /datum/equipment_preset/goon/medic/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY/security, WEAR_L_EAR) new_human.equip_to_slot_or_del(new uniform_type, WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate/medic, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) @@ -253,7 +253,7 @@ assignment = JOB_WY_GOON_LEAD job_title = JOB_WY_GOON_LEAD - paygrades = list(PAY_SHORT_CSPO = JOB_PLAYTIME_TIER_0) + paygrades = list(PAY_SHORT_WY_SEC_LEAD = JOB_PLAYTIME_TIER_0) skills = /datum/skills/wy_goon_lead minimap_icon = "goon_leader" uniform_type = /obj/item/clothing/under/marine/veteran/pmc/corporate/lead @@ -274,7 +274,7 @@ access = get_access(ACCESS_LIST_WY_GOON) + list(ACCESS_WY_LEADERSHIP) /datum/equipment_preset/goon/lead/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY/security, WEAR_L_EAR) new_human.equip_to_slot_or_del(new uniform_type, WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate/lead, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) @@ -300,7 +300,7 @@ name = "Weyland-Yutani Corporate Security Lead (CL Bodyguard)" /datum/equipment_preset/goon/lead/bodyguard/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY/security, WEAR_L_EAR) new_human.equip_to_slot_or_del(new uniform_type, WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate/lead, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) @@ -341,7 +341,7 @@ minimap_icon = "goon_sci" /datum/equipment_preset/goon/researcher/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY/security, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/regular/hippie, WEAR_EYES) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/detective/grey, WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/wy, WEAR_JACKET) @@ -385,3 +385,57 @@ paygrades = list(PAY_SHORT_CCMO = JOB_PLAYTIME_TIER_0) skills = /datum/skills/researcher minimap_icon = "goon_sci_lead" + +///Hunting Grounds Goons (Part of PMCs)/// + +/datum/equipment_preset/goon/standard/hunted + name = "Weyland-Yutani Corporate Security Goon (Hunted)" + faction = FACTION_HUNTED_PMC + +/datum/equipment_preset/goon/standard/hunted/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/corporate, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate/knife, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/pmc, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs/zip, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs/zip, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/mre/wy, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/wy/mod88, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/black, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/corporate, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/wy, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle, WEAR_IN_BACK) + +/datum/equipment_preset/goon/lead/hunted + name = "Weyland-Yutani Corporate Security Lead (Hunted)" + faction = FACTION_HUNTED_PMC + +/datum/equipment_preset/goon/lead/hunted/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/corporate/lead, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate/lead, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate/lead, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate/knife, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/pmc, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs/zip, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs/zip, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/mre/wy, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/wy/mod88, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/black, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/corporate, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/wy, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle, WEAR_IN_BACK) diff --git a/code/modules/gear_presets/yautja.dm b/code/modules/gear_presets/yautja.dm index 3cd79deb65cb..bb0bffde07ea 100644 --- a/code/modules/gear_presets/yautja.dm +++ b/code/modules/gear_presets/yautja.dm @@ -37,6 +37,7 @@ /datum/equipment_preset/yautja/load_gear(mob/living/carbon/human/new_human, client/mob_client) var/caster_material = "ebony" + var/bracer_material = "ebony" var/translator_type = PRED_TECH_MODERN var/invisibility_sound = PRED_TECH_MODERN @@ -44,10 +45,11 @@ mob_client = new_human.client if(mob_client?.prefs) caster_material = mob_client.prefs.predator_caster_material + bracer_material = mob_client.prefs.predator_bracer_material translator_type = mob_client.prefs.predator_translator_type invisibility_sound = mob_client.prefs.predator_invisibility_sound - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yautja/hunter(new_human, translator_type, invisibility_sound, caster_material, clan_rank), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yautja/hunter(new_human, translator_type, invisibility_sound, caster_material, clan_rank, bracer_material), WEAR_HANDS) if(new_human.client?.check_whitelist_status(WHITELIST_YAUTJA_COUNCIL)) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/yautja/overseer(new_human), WEAR_L_EAR) @@ -57,7 +59,7 @@ /datum/equipment_preset/yautja/load_name(mob/living/carbon/human/new_human, randomise) var/final_name = capitalize(pick(GLOB.pred_names)) + " " + capitalize(pick(GLOB.pred_last_names)) - new_human.gender = pick(80;MALE,20;FEMALE) // Female Hunters are rare + new_human.gender = pick_weight(list(MALE = 80, FEMALE = 20))// Female Hunters are rare new_human.age = rand(100,150) new_human.flavor_text = "" new_human.flavor_texts["general"] = new_human.flavor_text @@ -69,7 +71,7 @@ new_human.flavor_text = new_human.client.prefs.predator_flavor_text new_human.flavor_texts["general"] = new_human.flavor_text if(!final_name || final_name == "Undefined") //In case they don't have a name set or no prefs, there's a name. - final_name = capitalize(pick(GLOB.pred_names)) + " " + capitalize(pick(GLOB.pred_last_names)) + final_name = "[capitalize(pick(GLOB.pred_names))] [capitalize(pick(GLOB.pred_last_names))]" new_human.change_real_name(new_human, final_name) /datum/equipment_preset/yautja/youngblood //normal WL youngblood rank diff --git a/code/modules/hydroponics/hydro_tray.dm b/code/modules/hydroponics/hydro_tray.dm index 03aa64dd3d35..a6b5c6ae6aee 100644 --- a/code/modules/hydroponics/hydro_tray.dm +++ b/code/modules/hydroponics/hydro_tray.dm @@ -67,7 +67,7 @@ "Lifespan" = 0, "Potency" = 0, "Maturity" = 0, - "Bioluminecence" = 0, + "Bioluminescence" = 0, "Flowers" = 0, "New Chems" = 0, "New Chems2" = 0, @@ -219,7 +219,7 @@ animate(src, transform = matrix(rand(1,-1), rand(-0.5,0.5), MATRIX_TRANSLATE), time = 0.5, easing = EASE_IN) animate(transform = matrix(rand(-0.5,0.5), rand(1,-1), MATRIX_TRANSLATE), time = 0.5) animate(transform = matrix(0, 0, MATRIX_TRANSLATE), time = 0.5, easing = EASE_OUT) - visible_message(SPAN_NOTICE("[src] shakes itself in attempt to harvest its products")) + visible_message(SPAN_NOTICE("[src] shakes itself in attempt to harvest its products.")) harvest(null, TRUE) //this is ok check_level_sanity() diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm index 1138613eed1e..c2d818c989a2 100644 --- a/code/modules/hydroponics/seed_datums.dm +++ b/code/modules/hydroponics/seed_datums.dm @@ -376,7 +376,7 @@ GLOBAL_LIST_EMPTY(gene_tag_masks) // Gene obfuscation for delicious trial and maturation = max(0, min(30, maturation + (rand(-1,1) * degree))) if(prob(degree*5)) harvest_repeat = !harvest_repeat - if(11) //Bioluminecence + if(11) //Bioluminescence if(prob(degree*2)) biolum = !biolum if(biolum) @@ -1621,7 +1621,7 @@ GLOBAL_LIST_EMPTY(gene_tag_masks) // Gene obfuscation for delicious trial and seed_noun = "data" display_name = "runtimes" packet_icon = "seed-replicapod" - products = list(/mob/living/simple_animal/cat/Runtime) + products = list(/mob/living/simple_animal/small/cat/Runtime) plant_icon = "replicapod" requires_nutrients = 0 diff --git a/code/modules/keybindings/bindings_client.dm b/code/modules/keybindings/bindings_client.dm index 876217805e00..86311fc27372 100644 --- a/code/modules/keybindings/bindings_client.dm +++ b/code/modules/keybindings/bindings_client.dm @@ -76,6 +76,11 @@ CLIENT_VERB(keyDown, _key as text) if(kb.can_use(src) && kb.down(src) && keycount >= MAX_COMMANDS_PER_KEY) break + if(full_key in prefs.key_to_custom_keybind) + var/datum/keybinding/custom/kb = prefs.key_to_custom_keybind[full_key] + if(kb.can_use(src)) + kb.down(src) + admin_holder?.key_down(_key, src) mob.focus?.key_down(_key, src) diff --git a/code/modules/lighting/_LIGHTING_README.MD b/code/modules/lighting/_LIGHTING_README.MD index a7e7166e6b8d..f50212acce47 100644 --- a/code/modules/lighting/_LIGHTING_README.MD +++ b/code/modules/lighting/_LIGHTING_README.MD @@ -19,7 +19,7 @@ var/light_on Additionally, we have SSlighting, the lighting subsystem which handles lighting updates for Static and Hybrid lighting. This subsystems processes enqueued lighting object, corner and source updates, as well as taking enqueued hybrid lighting updates. -You shouldnt really be touching this as it primarily just stops too many updates from happening at once. +You shouldn't really be touching this as it primarily just stops too many updates from happening at once. ## The Lighting systems As mentioned previously,lighting is split into three seperate systems who's functionality, benefits and downsides will be discussed below diff --git a/code/modules/lighting/lighting_mask/lighting_mask.dm b/code/modules/lighting/lighting_mask/lighting_mask.dm index 8ec2fe2bb977..e76590d254bb 100644 --- a/code/modules/lighting/lighting_mask/lighting_mask.dm +++ b/code/modules/lighting/lighting_mask/lighting_mask.dm @@ -39,7 +39,7 @@ var/list/mutable_appearance/shadows var/times_calculated = 0 - //Please dont change these + //Please don't change these var/calculated_position_x var/calculated_position_y @@ -91,7 +91,7 @@ // - Center the overlay image // - Ok so apparently translate is affected by the scale we already did huh. // ^ Future me here, its because it works as translate then scale since its backwards. - // ^ ^ Future future me here, it totally shouldnt since the translation component of a matrix is independent to the scale component. + // ^ ^ Future future me here, it totally shouldn't since the translation component of a matrix is independent to the scale component. new_size_matrix.Translate(-128 + 16) //Adjust for pixel offsets var/invert_offsets = attached_atom.dir & (NORTH | EAST) @@ -113,7 +113,7 @@ rotated_matrix *= transform //Overlays cannot be edited while applied, meaning their transform cannot be changed. //Disconnect the shadows from the overlay, apply the transform and then reapply them as an overlay. - //Oh also since the matrix is really weird standard rotation matrices wont work here. + //Oh also since the matrix is really weird standard rotation matrices won't work here. overlays.Cut() //Disconnect from parent matrix, become a global position for(var/mutable_appearance/shadow as anything in shadows) //Mutable appearances are children of icon diff --git a/code/modules/lighting/lighting_mask/shadow_calculator.dm b/code/modules/lighting/lighting_mask/shadow_calculator.dm index 08ab8be07e8c..89b7d8558fa0 100644 --- a/code/modules/lighting/lighting_mask/shadow_calculator.dm +++ b/code/modules/lighting/lighting_mask/shadow_calculator.dm @@ -61,7 +61,7 @@ queue_mask_update() return awaiting_update = FALSE - //we moved to nullspace meanwhile dont bother + //we moved to nullspace meanwhile don't bother if(!attached_atom.loc) return diff --git a/code/modules/lighting/lighting_static/static_lighting_area.dm b/code/modules/lighting/lighting_static/static_lighting_area.dm index 2e95c77e9ecd..3597ed17c9a7 100644 --- a/code/modules/lighting/lighting_static/static_lighting_area.dm +++ b/code/modules/lighting/lighting_static/static_lighting_area.dm @@ -3,7 +3,7 @@ var/static_lighting = TRUE //Non static lighting areas. -//Any lighting area that wont support static lights. +//Any lighting area that won't support static lights. //These areas will NOT have corners generated. /area/space diff --git a/code/modules/lighting/lighting_static/static_lighting_atom.dm b/code/modules/lighting/lighting_static/static_lighting_atom.dm index 0f7be52b351f..086fbe2e0861 100644 --- a/code/modules/lighting/lighting_static/static_lighting_atom.dm +++ b/code/modules/lighting/lighting_static/static_lighting_atom.dm @@ -1,6 +1,6 @@ /atom - ///The light source, datum. Dont fuck with this directly + ///The light source, datum. don't fuck with this directly var/tmp/datum/static_light_source/static_light ///Static light sources currently attached to this atom, this includes ones owned by atoms inside this atom var/tmp/list/static_light_sources diff --git a/code/modules/lighting/lighting_static/static_lighting_corner.dm b/code/modules/lighting/lighting_static/static_lighting_corner.dm index 4f026e05e864..42493062b914 100644 --- a/code/modules/lighting/lighting_static/static_lighting_corner.dm +++ b/code/modules/lighting/lighting_static/static_lighting_corner.dm @@ -7,6 +7,7 @@ var/x = 0 var/y = 0 + var/z = 0 var/turf/master_NE var/turf/master_SE @@ -28,35 +29,48 @@ ///whether we are to be added to SSlighting's corners_queue list for an update var/needs_update = FALSE -/datum/static_lighting_corner/New(turf/new_turf, diagonal) +// Takes as an argument the coords to use as the bottom left (south west) of our corner +/datum/static_lighting_corner/New(x, y, z) . = ..() - save_master(new_turf, turn(diagonal, 180)) - - var/vertical = diagonal & ~(diagonal - 1) // The horizontal directions (4 and 8) are bigger than the vertical ones (1 and 2), so we can reliably say the lsb is the horizontal direction. - var/horizontal = diagonal & ~vertical // Now that we know the horizontal one we can get the vertical one. - - x = new_turf.x + (horizontal == EAST ? 0.5 : -0.5) - y = new_turf.y + (vertical == NORTH ? 0.5 : -0.5) - - // My initial plan was to make this loop through a list of all the dirs (horizontal, vertical, diagonal). - // Issue being that the only way I could think of doing it was very messy, slow and honestly overengineered. - // So we'll have this hardcode instead. - var/turf/new_master_turf - - // Diagonal one is easy. - new_master_turf = get_step(new_turf, diagonal) - if(new_master_turf) // In case we're on the map's border. - save_master(new_master_turf, diagonal) - - // Now the horizontal one. - new_master_turf = get_step(new_turf, horizontal) - if(new_master_turf) // Ditto. - save_master(new_master_turf, ((new_master_turf.x > x) ? EAST : WEST) | ((new_master_turf.y > y) ? NORTH : SOUTH)) // Get the dir based on coordinates. - - // And finally the vertical one. - new_master_turf = get_step(new_turf, vertical) - if (new_master_turf) - save_master(new_master_turf, ((new_master_turf.x > x) ? EAST : WEST) | ((new_master_turf.y > y) ? NORTH : SOUTH)) // Get the dir based on coordinates. + src.x = x + 0.5 + src.y = y + 0.5 + src.z = z + + // Alright. We're gonna take a set of coords, and from them do a loop clockwise + // To build out the turfs adjacent to us. This is pretty fast + var/turf/process_next = locate(x, y, z) + if(process_next) + master_SW = process_next + process_next.lighting_corner_NE = src + // Now, we go north! + process_next = get_step(process_next, NORTH) + else + // Yes this is slightly slower then having a guarenteeed turf, but there aren't many null turfs + // So this is pretty damn fast + process_next = locate(x, y + 1, z) + + // Ok, if we have a north turf, go there. otherwise, onto the next + if(process_next) + master_NW = process_next + process_next.lighting_corner_SE = src + // Now, TO THE EAST + process_next = get_step(process_next, EAST) + else + process_next = locate(x + 1, y + 1, z) + + // Etc etc + if(process_next) + master_NE = process_next + process_next.lighting_corner_SW = src + // Now, TO THE SOUTH AGAIN (SE) + process_next = get_step(process_next, SOUTH) + else + process_next = locate(x + 1, y, z) + + // anddd the last tile + if(process_next) + master_SE = process_next + process_next.lighting_corner_NW = src /datum/static_lighting_corner/proc/save_master(turf/master, dir) switch (dir) diff --git a/code/modules/lighting/lighting_static/static_lighting_object.dm b/code/modules/lighting/lighting_static/static_lighting_object.dm index d64f25a634b7..8932e1e7f7c9 100644 --- a/code/modules/lighting/lighting_static/static_lighting_object.dm +++ b/code/modules/lighting/lighting_static/static_lighting_object.dm @@ -11,7 +11,7 @@ /datum/static_lighting_object/New(turf/source) if(!isturf(source)) qdel(src, force=TRUE) - stack_trace("a lighting object was assigned to [source], a non turf! ") + stack_trace("a lighting object was assigned to [source], a non turf!") return ..() @@ -51,6 +51,7 @@ var/static/datum/static_lighting_corner/dummy/dummy_lighting_corner = new + var/turf/affected_turf = src.affected_turf var/datum/static_lighting_corner/red_corner = affected_turf.lighting_corner_SW || dummy_lighting_corner var/datum/static_lighting_corner/green_corner = affected_turf.lighting_corner_SE || dummy_lighting_corner var/datum/static_lighting_corner/blue_corner = affected_turf.lighting_corner_NW || dummy_lighting_corner @@ -58,22 +59,6 @@ var/max = max(red_corner.largest_color_luminosity, green_corner.largest_color_luminosity, blue_corner.largest_color_luminosity, alpha_corner.largest_color_luminosity) - var/rr = red_corner.cache_r - var/rg = red_corner.cache_g - var/rb = red_corner.cache_b - - var/gr = green_corner.cache_r - var/gg = green_corner.cache_g - var/gb = green_corner.cache_b - - var/br = blue_corner.cache_r - var/bg = blue_corner.cache_g - var/bb = blue_corner.cache_b - - var/ar = alpha_corner.cache_r - var/ag = alpha_corner.cache_g - var/ab = alpha_corner.cache_b - #if LIGHTING_SOFT_THRESHOLD != 0 var/set_luminosity = max > LIGHTING_SOFT_THRESHOLD #else @@ -81,35 +66,34 @@ // This number is mostly arbitrary. var/set_luminosity = max > 1e-6 #endif - - if((rr & gr & br & ar) && (rg + gg + bg + ag + rb + gb + bb + ab == 8)) + var/mutable_appearance/current_underlay = src.current_underlay + affected_turf.underlays -= current_underlay + if(red_corner.cache_r & green_corner.cache_r & blue_corner.cache_r & alpha_corner.cache_r && \ + (red_corner.cache_g + green_corner.cache_g + blue_corner.cache_g + alpha_corner.cache_g + \ + red_corner.cache_b + green_corner.cache_b + blue_corner.cache_b + alpha_corner.cache_b == 8)) //anything that passes the first case is very likely to pass the second, and addition is a little faster in this case - affected_turf.underlays -= current_underlay current_underlay.icon_state = "transparent" current_underlay.color = null - affected_turf.underlays += current_underlay else if(!set_luminosity) - affected_turf.underlays -= current_underlay current_underlay.icon_state = "dark" current_underlay.color = null - affected_turf.underlays += current_underlay else - affected_turf.underlays -= current_underlay current_underlay.icon_state = null current_underlay.color = list( - rr, rg, rb, 00, - gr, gg, gb, 00, - br, bg, bb, 00, - ar, ag, ab, 00, + red_corner.cache_r, red_corner.cache_g, red_corner.cache_b, 00, + green_corner.cache_r, green_corner.cache_g, green_corner.cache_b, 00, + blue_corner.cache_r, blue_corner.cache_g, blue_corner.cache_b, 00, + alpha_corner.cache_r, alpha_corner.cache_g, alpha_corner.cache_b, 00, 00, 00, 00, 01 ) - affected_turf.underlays += current_underlay - - var/area/A = affected_turf.loc - //We are luminous + // Of note. Most of the cost in this proc is here, I think because color matrix'd underlays DO NOT cache well, which is what adding to underlays does + // We use underlays because objects on each tile would fuck with maptick. if that ever changes, use an object for this instead + affected_turf.underlays += current_underlay if(set_luminosity) affected_turf.luminosity = set_luminosity + return + var/area/turf_area = affected_turf.loc //We are not lit by static light OR dynamic light. - else if(!LAZYLEN(affected_turf.hybrid_lights_affecting) && !A.base_lighting_alpha) + if(!LAZYLEN(affected_turf.hybrid_lights_affecting) && !turf_area.base_lighting_alpha) affected_turf.luminosity = 0 diff --git a/code/modules/lighting/lighting_static/static_lighting_setup.dm b/code/modules/lighting/lighting_static/static_lighting_setup.dm index 6e1641585b91..28c6aae955da 100644 --- a/code/modules/lighting/lighting_static/static_lighting_setup.dm +++ b/code/modules/lighting/lighting_static/static_lighting_setup.dm @@ -3,7 +3,7 @@ if(!A.static_lighting) continue - + // I hate this so much dude. why do areas not track their turfs lummyyyyyyy for(var/turf/T in A) new/datum/static_lighting_object(T) CHECK_TICK diff --git a/code/modules/lighting/lighting_static/static_lighting_source.dm b/code/modules/lighting/lighting_static/static_lighting_source.dm index f4993afc23b8..f4fd6a9ccbf1 100644 --- a/code/modules/lighting/lighting_static/static_lighting_source.dm +++ b/code/modules/lighting/lighting_static/static_lighting_source.dm @@ -68,15 +68,17 @@ if (top_atom) LAZYREMOVE(top_atom.static_light_sources, src) - if (needs_update) - SSlighting.static_sources_queue -= src + SSlighting.static_sources_queue -= src return ..() -#define EFFECT_UPDATE(level) \ +// Yes this doesn't align correctly on anything other than 4 width tabs. +// If you want it to go switch everybody to elastic tab stops. +// Actually that'd be great if you could! +#define EFFECT_UPDATE(level) \ if (needs_update == LIGHTING_NO_UPDATE) \ SSlighting.static_sources_queue += src; \ - if (needs_update < level) \ - needs_update = level; \ + if (needs_update < level) \ + needs_update = level; \ /// This proc will cause the light source to update the top atom, and add itself to the update queue. @@ -113,35 +115,77 @@ //Cubic lighting falloff. This has the *exact* same range as the original lighting falloff calculation, down to the exact decimal, but it looks a little unnatural due to the harsher falloff and how it's generally brighter across the board. //#define LUM_FALLOFF(C, T) (1 - CLAMP01((((C.x - T.x) * (C.x - T.x)) + ((C.y - T.y) * (C.y - T.y)) + LIGHTING_HEIGHT) / max(1, light_range*light_range))) -//Linear lighting falloff. This resembles the original lighting falloff calculation the best, but results in lights having a slightly larger range, which is most noticeable with large light sources. This also results in lights being diamond-shaped, fuck. This looks the darkest out of the three due to how lights are brighter closer to the source compared to the original falloff algorithm. This falloff method also does not at all take into account lighting height, as it acts as a flat reduction to light range with this method. +//Linear lighting falloff. This resembles the original lighting falloff calculation the best, but results in lights having a slightly larger range, which is most noticable with large light sources. This also results in lights being diamond-shaped, fuck. This looks the darkest out of the three due to how lights are brighter closer to the source compared to the original falloff algorithm. This falloff method also does not at all take into account lighting height, as it acts as a flat reduction to light range with this method. //#define LUM_FALLOFF(C, T) (1 - CLAMP01(((abs(C.x - T.x) + abs(C.y - T.y))) / max(1, light_range+1))) //Linear lighting falloff but with an octagonal shape in place of a diamond shape. Lummox JR please add pointer support. #define GET_LUM_DIST(DISTX, DISTY) (DISTX + DISTY + abs(DISTX - DISTY)*0.4) -#define LUM_FALLOFF(C, T) (1 - CLAMP01(max(GET_LUM_DIST(abs(C.x - T.x), abs(C.y - T.y)),LIGHTING_HEIGHT) / max(1, light_range+1))) +// This exists so we can cache the vars used in this macro, and save MASSIVE time :) +// Most of this is saving off datum var accesses, tho some of it does actually cache computation +// You will NEED to call this before you call APPLY_CORNER +#define SETUP_CORNERS_CACHE(lighting_source) \ + var/_turf_x = lighting_source.pixel_turf.x; \ + var/_turf_y = lighting_source.pixel_turf.y; \ + var/_turf_z = lighting_source.pixel_turf.z; \ + var/_range_divisor = max(1, lighting_source.light_range); \ + var/_light_power = lighting_source.light_power; \ + var/_applied_lum_r = lighting_source.applied_lum_r; \ + var/_applied_lum_g = lighting_source.applied_lum_g; \ + var/_applied_lum_b = lighting_source.applied_lum_b; \ + var/_lum_r = lighting_source.lum_r; \ + var/_lum_g = lighting_source.lum_g; \ + var/_lum_b = lighting_source.lum_b; \ + +#define SETUP_CORNERS_UPDATE_CACHE(lighting_source, range_divisor_old, light_power_old) \ + var/_light_update_shift = _light_power * (1 - range_divisor_old / _range_divisor); \ + var/_light_update_mult = _light_power * range_divisor_old / (_range_divisor * light_power_old); + +#define SETUP_CORNERS_REMOVAL_CACHE(lighting_source) \ + var/_applied_lum_r = lighting_source.applied_lum_r; \ + var/_applied_lum_g = lighting_source.applied_lum_g; \ + var/_applied_lum_b = lighting_source.applied_lum_b; + +#define LUM_FALLOFF(C) (1 - CLAMP01(sqrt((C.x - _turf_x) ** 2 + (C.y - _turf_y) ** 2 + LIGHTING_HEIGHT) / _range_divisor)) +#define LUM_FALLOFF_MULTIZ(C) (1 - CLAMP01(sqrt((C.x - _turf_x) ** 2 + (C.y - _turf_y) ** 2 + (C.z - _turf_z) ** 2 + LIGHTING_HEIGHT) / _range_divisor)) #define APPLY_CORNER(C) \ - . = LUM_FALLOFF(C, pixel_turf); \ - . *= light_power; \ + if(C.z == _turf_z) { \ + . = LUM_FALLOFF(C); \ + } \ + else { \ + . = LUM_FALLOFF_MULTIZ(C) \ + } \ + . *= _light_power; \ var/OLD = effect_str[C]; \ C.update_lumcount \ ( \ - (. * lum_r) - (OLD * applied_lum_r), \ - (. * lum_g) - (OLD * applied_lum_g), \ - (. * lum_b) - (OLD * applied_lum_b) \ + (. * _lum_r) - (OLD * _applied_lum_r), \ + (. * _lum_g) - (OLD * _applied_lum_g), \ + (. * _lum_b) - (OLD * _applied_lum_b) \ + ); + +#define UPDATE_CORNER(C) \ + var/OLD = effect_str[C]; \ + . = max(_light_update_mult * OLD + _light_update_shift, 0);\ + C.update_lumcount \ + ( \ + (. * _lum_r) - (OLD * _applied_lum_r), \ + (. * _lum_g) - (OLD * _applied_lum_g), \ + (. * _lum_b) - (OLD * _applied_lum_b) \ ); #define REMOVE_CORNER(C) \ . = -effect_str[C]; \ C.update_lumcount \ ( \ - . * applied_lum_r, \ - . * applied_lum_g, \ - . * applied_lum_b \ + . * _applied_lum_r, \ + . * _applied_lum_g, \ + . * _applied_lum_b \ ); /// This is the define used to calculate falloff. /datum/static_light_source/proc/remove_lum() + SETUP_CORNERS_REMOVAL_CACHE(src) applied = FALSE for(var/datum/static_lighting_corner/corner as anything in effect_str) REMOVE_CORNER(corner) @@ -150,6 +194,7 @@ effect_str = null /datum/static_light_source/proc/recalc_corner(datum/static_lighting_corner/corner) + SETUP_CORNERS_CACHE(src) LAZYINITLIST(effect_str) if (effect_str[corner]) // Already have one. REMOVE_CORNER(corner) @@ -158,8 +203,28 @@ APPLY_CORNER(corner) effect_str[corner] = . +// Keep in mind. Lighting corners accept the bottom left (northwest) set of cords to them as input +#define GENERATE_MISSING_CORNERS(gen_for) \ + if (!gen_for.lighting_corner_NE) { \ + gen_for.lighting_corner_NE = new /datum/static_lighting_corner(gen_for.x, gen_for.y, gen_for.z); \ + } \ + if (!gen_for.lighting_corner_SE) { \ + gen_for.lighting_corner_SE = new /datum/static_lighting_corner(gen_for.x, gen_for.y - 1, gen_for.z); \ + } \ + if (!gen_for.lighting_corner_SW) { \ + gen_for.lighting_corner_SW = new /datum/static_lighting_corner(gen_for.x - 1, gen_for.y - 1, gen_for.z); \ + } \ + if (!gen_for.lighting_corner_NW) { \ + gen_for.lighting_corner_NW = new /datum/static_lighting_corner(gen_for.x - 1, gen_for.y, gen_for.z); \ + } \ + gen_for.lighting_corners_initialised = TRUE; + /datum/static_light_source/proc/update_corners() var/update = FALSE + var/update_fluff = FALSE + var/update_range = FALSE + var/old_range + var/old_power var/atom/source_atom = src.source_atom if (QDELETED(source_atom)) @@ -167,12 +232,17 @@ return if (source_atom.light_power != light_power) + old_power = light_power light_power = source_atom.light_power - update = TRUE + update_fluff = TRUE if (source_atom.light_range != light_range) + if(light_range > source_atom.light_range) // less range, can reuse corners + update_fluff = TRUE + else + update_range = TRUE + old_range = light_range light_range = source_atom.light_range - update = TRUE if (!top_atom) top_atom = source_atom @@ -208,64 +278,85 @@ if (source_atom.light_color != light_color) light_color = source_atom.light_color PARSE_LIGHT_COLOR(src) - update = TRUE + update_fluff = TRUE else if (applied_lum_r != lum_r || applied_lum_g != lum_g || applied_lum_b != lum_b) - update = TRUE + update_fluff = TRUE - if (update) - needs_update = LIGHTING_CHECK_UPDATE + if (update || update_range) + needs_update = LIGHTING_FORCE_UPDATE applied = TRUE else if (needs_update == LIGHTING_CHECK_UPDATE) - return //nothing's changed + if (!update_fluff) + return //nothing's changed + else if (update_fluff) + needs_update = LIGHTING_FORCE_UPDATE //forces LIGHTING_VIS_UPDATE to update everything + + LAZYINITLIST(src.effect_str) + var/list/effect_str = src.effect_str + + var/list/datum/static_lighting_corner/corners + var/list/datum/static_lighting_corner/new_corners + var/list/datum/static_lighting_corner/gone_corners + + if (needs_update == LIGHTING_CHECK_UPDATE) //we dont need to find corners for color/power change only + corners = effect_str + new_corners = list() + gone_corners = list() + else if (source_turf) + corners = list() + + var/list/turf/impacted_turfs = list() + var/list/turf/check_below_turfs = list() + // half or more corners from these tiles is further than _range_divisor and others are in closer turfs + var/turf_light_range = max(CEILING(light_range - 1.5, 1), 0) - var/list/datum/static_lighting_corner/corners = list() - var/list/turf/turfs = list() - if (source_turf) var/oldlum = source_turf.luminosity - source_turf.luminosity = ceil(light_range) - for(var/turf/T in view(ceil(light_range), source_turf)) + source_turf.luminosity = turf_light_range + for(var/turf/T in view(turf_light_range, source_turf)) if(!IS_OPAQUE_TURF(T)) - if (!T.lighting_corners_initialised) - T.static_generate_missing_corners() - corners[T.lighting_corner_NE] = 0 - corners[T.lighting_corner_SE] = 0 - corners[T.lighting_corner_SW] = 0 - corners[T.lighting_corner_NW] = 0 - turfs += T - - var/turf/above = SSmapping.get_turf_above(T) - - while(above && istransparentturf(above)) - if (!above.lighting_corners_initialised) - above.static_generate_missing_corners() - corners[above.lighting_corner_NE] = 0 - corners[above.lighting_corner_SE] = 0 - corners[above.lighting_corner_SW] = 0 - corners[above.lighting_corner_NW] = 0 - - above = SSmapping.get_turf_above(above) - - turfs += above - - var/turf/below = SSmapping.get_turf_below(T) - var/turf/previous = T - - while(below && istransparentturf(previous)) - if (!below.lighting_corners_initialised) - below.static_generate_missing_corners() - corners[below.lighting_corner_NE] = 0 - corners[below.lighting_corner_SE] = 0 - corners[below.lighting_corner_SW] = 0 - corners[below.lighting_corner_NW] = 0 - - previous = below - below = SSmapping.get_turf_below(below) + impacted_turfs += T + if(istransparentturf(T)) + check_below_turfs += T // we need to go below only for transparent turfs + + var/list/turf/check_above_turfs = impacted_turfs + while(TRUE) // we know that it starts with len > 0 + var/list/turf/above_turfs = SSmapping.get_same_z_turfs_above(check_above_turfs) + if(above_turfs.len == 0) // levels are not connected + break + check_above_turfs = list() + for(var/turf/T as anything in above_turfs) + if(istransparentturf(T)) + check_above_turfs += T // turf from which we can see light below + if(check_above_turfs.len == 0) + break + impacted_turfs += check_above_turfs // add them to the impacted + + while(check_below_turfs.len > 0) + var/list/turf/below_turfs = SSmapping.get_same_z_turfs_below(check_below_turfs) + if(below_turfs.len == 0) // levels are not connected + break + impacted_turfs += below_turfs // add turfs that we found below transparent + check_below_turfs = list() + for(var/turf/T as anything in below_turfs) + if(istransparentturf(T)) + check_below_turfs += T // next time check only below transparent + + for(var/turf/T as anything in impacted_turfs) + if (!T.lighting_corners_initialised) + GENERATE_MISSING_CORNERS(T) + corners[T.lighting_corner_NE] = 0 + corners[T.lighting_corner_SE] = 0 + corners[T.lighting_corner_SW] = 0 + corners[T.lighting_corner_NW] = 0 source_turf.luminosity = oldlum - var/list/datum/static_lighting_corner/new_corners = (corners - effect_str) - LAZYINITLIST(effect_str) + new_corners = corners - effect_str + gone_corners = effect_str - corners + + SETUP_CORNERS_CACHE(src) + if (needs_update == LIGHTING_VIS_UPDATE) for (var/datum/static_lighting_corner/corner as anything in new_corners) APPLY_CORNER(corner) @@ -279,15 +370,32 @@ LAZYADD(corner.affecting, src) effect_str[corner] = . - for (var/datum/static_lighting_corner/corner as anything in corners - new_corners) // Existing corners - APPLY_CORNER(corner) - if (. != 0) - effect_str[corner] = . - else - LAZYREMOVE(corner.affecting, src) - effect_str -= corner + // New corners are a subset of corners. so if they're both the same length, there are NO old corners! + if(length(corners) != length(new_corners)) + var/list/datum/static_lighting_corner/to_remove_corners = list() + if(update) // full update of corners + for (var/datum/static_lighting_corner/corner as anything in corners - new_corners) // Existing corners + APPLY_CORNER(corner) + if (. != 0) + effect_str[corner] = . + else + LAZYREMOVE(corner.affecting, src) + to_remove_corners += corner + else // same as above, but without distance recalculation + if(isnull(old_range)) + old_range = light_range + if(isnull(old_power)) + old_power = light_power + SETUP_CORNERS_UPDATE_CACHE(src, max(1, old_range), old_power) + for (var/datum/static_lighting_corner/corner as anything in corners - new_corners) // Existing corners + UPDATE_CORNER(corner) + if (. != 0) + effect_str[corner] = . + else + LAZYREMOVE(corner.affecting, src) + to_remove_corners += corner + effect_str -= to_remove_corners - var/list/datum/static_lighting_corner/gone_corners = effect_str - corners for (var/datum/static_lighting_corner/corner as anything in gone_corners) REMOVE_CORNER(corner) LAZYREMOVE(corner.affecting, src) @@ -297,10 +405,15 @@ applied_lum_g = lum_g applied_lum_b = lum_b - UNSETEMPTY(effect_str) + UNSETEMPTY(src.effect_str) #undef EFFECT_UPDATE #undef LUM_FALLOFF #undef GET_LUM_DIST #undef REMOVE_CORNER +#undef UPDATE_CORNER #undef APPLY_CORNER +#undef SETUP_CORNERS_REMOVAL_CACHE +#undef SETUP_CORNERS_UPDATE_CACHE +#undef SETUP_CORNERS_CACHE +#undef GENERATE_MISSING_CORNERS diff --git a/code/modules/lighting/lighting_static/static_lighting_turf.dm b/code/modules/lighting/lighting_static/static_lighting_turf.dm index ec91e17e4fca..a513da8d92bc 100644 --- a/code/modules/lighting/lighting_static/static_lighting_turf.dm +++ b/code/modules/lighting/lighting_static/static_lighting_turf.dm @@ -44,21 +44,3 @@ overlays -= old_area.lighting_effect if(new_area.lighting_effect) overlays += new_area.lighting_effect - - - -/turf/proc/static_generate_missing_corners() - if (!lighting_corner_NE) - lighting_corner_NE = new/datum/static_lighting_corner(src, NORTH|EAST) - - if (!lighting_corner_SE) - lighting_corner_SE = new/datum/static_lighting_corner(src, SOUTH|EAST) - - if (!lighting_corner_SW) - lighting_corner_SW = new/datum/static_lighting_corner(src, SOUTH|WEST) - - if (!lighting_corner_NW) - lighting_corner_NW = new/datum/static_lighting_corner(src, NORTH|WEST) - - lighting_corners_initialised = TRUE - diff --git a/code/modules/mapping/map_template.dm b/code/modules/mapping/map_template.dm index 91b1b0c2d1a8..073deaebd90c 100644 --- a/code/modules/mapping/map_template.dm +++ b/code/modules/mapping/map_template.dm @@ -62,10 +62,6 @@ if(istype(movable_in_turf, /obj/docking_port/stationary)) ports += movable_in_turf - // Not sure if there is some importance here to make sure the area is in z - // first or not. Its defined In Initialize yet its run first in templates - // BEFORE so... hummm - SSmapping.reg_in_areas_in_z(areas) if(!SSatoms.initialized) return diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm index c49a32c77845..f12344560351 100644 --- a/code/modules/mapping/mapping_helpers.dm +++ b/code/modules/mapping/mapping_helpers.dm @@ -100,7 +100,7 @@ qdel(src) -GLOBAL_LIST_INIT_TYPED(sentry_spawns, /obj/effect/sentry_landmark, list()) +GLOBAL_LIST_INIT_TYPED(sentry_spawns, /list/obj/effect/sentry_landmark, list()) /// Allows a mapper to override the location of turrets on specific LZs, in specific placements. If multiple /// are placed, it picks randomly. diff --git a/code/modules/mapping/reader.dm b/code/modules/mapping/reader.dm index 345a0fc77f40..c6816593fc58 100644 --- a/code/modules/mapping/reader.dm +++ b/code/modules/mapping/reader.dm @@ -28,7 +28,7 @@ #define MAP_DMM "dmm" /** * TGM SPEC: - * TGM is a derevation of DMM, with restrictions placed on it + * TGM is a derivative of DMM, with restrictions placed on it * to make it easier to parse and to reduce merge conflicts/ease their resolution * * Requirements: @@ -134,7 +134,7 @@ #define TRIM_TEXT(text) (trim_reduced(text)) /** - * Helper and recommened way to load a map file + * Helper and recommend way to load a map file * - dmm_file: The path to the map file * - x_offset: The x offset to load the map at * - y_offset: The y offset to load the map at @@ -207,7 +207,7 @@ var/stored_index = 1 var/list/regexOutput //multiz lool - dmm_regex.next = stored_index // CM addition: Neccessary to reset start position in case of loading the same file concurrently. Putting it in Find() below is NOT enough! + dmm_regex.next = stored_index // CM addition: Necessary to reset start position in case of loading the same file concurrently. Putting it in Find() below is NOT enough! while(dmm_regex.Find(tfile, stored_index)) stored_index = dmm_regex.next // Datum var lookup is expensive, this isn't @@ -337,14 +337,14 @@ SSatoms.map_loader_begin(REF(src)) // Loading used to be done in this proc - // We make the assumption that if the inner procs runtime, we WANT to do cleanup on them, but we should stil tell our parents we failed + // We make the assumption that if the inner procs runtime, we WANT to do cleanup on them, but we should still tell our parents we failed // Since well, we did - var/sucessful = FALSE + var/successful = FALSE switch(map_format) if(MAP_TGM) - sucessful = _tgm_load(x_offset, y_offset, z_offset, crop_map, no_changeturf, x_lower, x_upper, y_lower, y_upper, z_lower, z_upper, place_on_top, new_z, delete) + successful = _tgm_load(x_offset, y_offset, z_offset, crop_map, no_changeturf, x_lower, x_upper, y_lower, y_upper, z_lower, z_upper, place_on_top, new_z, delete) else - sucessful = _dmm_load(x_offset, y_offset, z_offset, crop_map, no_changeturf, x_lower, x_upper, y_lower, y_upper, z_lower, z_upper, place_on_top, new_z, delete) + successful = _dmm_load(x_offset, y_offset, z_offset, crop_map, no_changeturf, x_lower, x_upper, y_lower, y_upper, z_lower, z_upper, place_on_top, new_z, delete) // And we are done lads, call it off SSatoms.map_loader_stop(REF(src)) @@ -368,7 +368,7 @@ testing("Skipped loading [turfsSkipped] default turfs") #endif - return sucessful + return successful // Wanna clear something up about maps, talking in 255x255 here // In the tgm format, each gridset contains 255 lines, each line representing one tile, with 255 total gridsets @@ -422,7 +422,7 @@ x_delta_with = min(x_delta_with, world.maxx) // We're gonna skip all the entries above the upper x, or maxx if cropMap is set - // The last column is guarenteed to have the highest x value we;ll encounter + // The last column is guaranteed to have the highest x value we;ll encounter // Even if z scales, this still works var/datum/grid_set/last_column = gridSets[length(gridSets)] var/final_x = last_column.xcrd + x_relative_to_absolute @@ -481,7 +481,7 @@ // We're gonna track the first and last pairs of coords we find // Since x is always incremented in steps of 1, we only need to deal in y - // The first x is guarenteed to be the lowest, the first y the highest, and vis versa + // The first x is guaranteed to be the lowest, the first y the highest, and vis versa // This is faster then doing mins and maxes inside the hot loop below var/first_found = FALSE var/first_y = 0 @@ -631,7 +631,7 @@ expanded_x = TRUE // We're gonna track the first and last pairs of coords we find - // The first x is guarenteed to be the lowest, the first y the highest, and vis versa + // The first x is guaranteed to be the lowest, the first y the highest, and vis versa // This is faster then doing mins and maxes inside the hot loop below var/first_found = FALSE var/first_x = 0 @@ -934,6 +934,11 @@ GLOBAL_LIST_EMPTY(map_model_default) // old_area.turfs_to_uncontain += crds // area_instance.contained_turfs.Add(crds) area_instance.contents.Add(crds) + if(old_area) + // Make sure atoms leave their old area and enter the new area + for(var/atom/turf_atom as anything in crds.GetAllTurfStrictContents()) + old_area.Exited(turf_atom) + area_instance.Entered(turf_atom, crds) if(GLOB.use_preloader) world.preloader_load(area_instance) @@ -1048,7 +1053,7 @@ GLOBAL_LIST_EMPTY(map_model_default) if(text[1] == "\"") // insert implied locate \" and length("\"") here // It's a minimal timesave but it is a timesave - // Safe becuase we're guarenteed trimmed constants + // Safe becuase we're guaranteed trimmed constants return copytext(text, 2, -1) // list diff --git a/code/modules/mapping/space_management/space_reservation.dm b/code/modules/mapping/space_management/space_reservation.dm index 63ec6485e3f3..62d02fcebf2f 100644 --- a/code/modules/mapping/space_management/space_reservation.dm +++ b/code/modules/mapping/space_management/space_reservation.dm @@ -41,6 +41,23 @@ ///Distance away from the cordon where we can put a "sort-cordon" and run some extra code (see make_repel). 0 makes nothing happen var/pre_cordon_distance = 0 +/datum/turf_reservation/proc/get_turf_z(turf/turf) + var/turf/bottom_left_turf + var/turf/top_right_turf + for(var/i in 1 to length(bottom_left_turfs)) + bottom_left_turf = bottom_left_turfs[i] + top_right_turf = top_right_turfs[i] + if(bottom_left_turf.x < turf.x && bottom_left_turf.y < turf.y && top_right_turf.x > turf.x && top_right_turf.y > turf.y) + return i + return null + +/datum/turf_reservation/proc/is_below(turf/turf_below, turf/turf_above) + var/turf_above_z = get_turf_z(turf_above) + var/turf_below_z = get_turf_z(turf_below) + if(isnull(turf_above_z) || isnull(turf_below_z)) + return FALSE + return turf_above_z > turf_below_z + /datum/turf_reservation/transit turf_type = /turf/open/space/transit pre_cordon_distance = 7 @@ -171,7 +188,7 @@ /// Calculates the effective bounds information for the given turf. Returns a list of the information, or null if not applicable. /datum/turf_reservation/proc/calculate_turf_bounds_information(turf/target) - for(var/z_idx in 1 to z_size) + for(var/z_idx in 1 to length(bottom_left_turfs)) var/turf/bottom_left = bottom_left_turfs[z_idx] var/turf/top_right = top_right_turfs[z_idx] var/bl_x = bottom_left.x @@ -205,13 +222,13 @@ return null var/z_idx = bounds_info["z_idx"] - // check what z level, if its the max, then there is no turf below - if(z_idx == z_size) + // check what z level, if its the min, then there is no turf below + if(z_idx == 1) return null var/offset_x = bounds_info["offset_x"] var/offset_y = bounds_info["offset_y"] - var/turf/bottom_left = bottom_left_turfs[z_idx + 1] + var/turf/bottom_left = bottom_left_turfs[z_idx - 1] return locate(bottom_left.x + offset_x, bottom_left.y + offset_y, bottom_left.z) /// Gets the turf above the given target. Returns null if there is no turf above the target @@ -222,12 +239,12 @@ var/z_idx = bounds_info["z_idx"] // check what z level, if its the min, then there is no turf above - if(z_idx == 1) + if(z_idx == z_size) return null var/offset_x = bounds_info["offset_x"] var/offset_y = bounds_info["offset_y"] - var/turf/bottom_left = bottom_left_turfs[z_idx - 1] + var/turf/bottom_left = bottom_left_turfs[z_idx + 1] return locate(bottom_left.x + offset_x, bottom_left.y + offset_y, bottom_left.z) /datum/turf_reservation/New() diff --git a/code/modules/mapping/space_management/traits.dm b/code/modules/mapping/space_management/traits.dm index 898f3550d163..6c3487468e1a 100644 --- a/code/modules/mapping/space_management/traits.dm +++ b/code/modules/mapping/space_management/traits.dm @@ -53,6 +53,10 @@ /datum/controller/subsystem/mapping/proc/get_turf_below(turf/T) if (!T) return + var/datum/turf_reservation/reservation = SSmapping.used_turfs[T] + if(reservation) + var/turf/below = reservation.get_turf_below(T) + return below var/offset = level_trait(T.z, ZTRAIT_DOWN) if (!offset) return @@ -62,11 +66,43 @@ /datum/controller/subsystem/mapping/proc/get_turf_above(turf/T) if (!T) return + var/datum/turf_reservation/reservation = SSmapping.used_turfs[T] + if(reservation) + var/turf/above = reservation.get_turf_above(T) + return above var/offset = level_trait(T.z, ZTRAIT_UP) if (!offset) return return locate(T.x, T.y, T.z + offset) +// Same as get_turf_below, but for multiple turfs from the same z level +/datum/controller/subsystem/mapping/proc/get_same_z_turfs_below(list/turf/turfs) + if (turfs.len < 1) + return list() + var/turf/first_turf = turfs[1] + var/offset = level_trait(first_turf.z, ZTRAIT_DOWN) + if(!offset) + return list() + var/new_z = first_turf.z + offset + var/list/turf/new_turfs = list() + for(var/turf/T as anything in turfs) + new_turfs += locate(T.x, T.y, new_z) + return new_turfs + +// Same as get_turf_above, but for multiple turfs from the same z level +/datum/controller/subsystem/mapping/proc/get_same_z_turfs_above(list/turf/turfs) + if (turfs.len < 1) + return list() + var/turf/first_turf = turfs[1] + var/offset = level_trait(first_turf.z, ZTRAIT_UP) + if(!offset) + return list() + var/new_z = first_turf.z + offset + var/list/turf/new_turfs = list() + for(var/turf/T as anything in turfs) + new_turfs += locate(T.x, T.y, new_z) + return new_turfs + // Prefer not to use this one too often /datum/controller/subsystem/mapping/proc/get_station_center() var/station_z = levels_by_trait(ZTRAIT_STATION)[1] @@ -86,9 +122,9 @@ /datum/controller/subsystem/mapping/proc/same_z_map(z1, z2) if(z1 == z2) return TRUE - + var/diff = z2 - z1 - var/direction = diff > 0 ? ZTRAIT_UP : ZTRAIT_DOWN + var/direction = diff > 0 ? ZTRAIT_UP : ZTRAIT_DOWN for(var/step in 1 to abs(diff)) if(!level_trait(z1, direction)) @@ -99,5 +135,5 @@ if(z1 == z2) return TRUE - return FALSE - + return FALSE + diff --git a/code/modules/mapping/verify.dm b/code/modules/mapping/verify.dm index f3fdd61b0f5b..3096ca147b8e 100644 --- a/code/modules/mapping/verify.dm +++ b/code/modules/mapping/verify.dm @@ -39,7 +39,7 @@ html += "
- [messages.Join("
- ")]
" + HTML += "Armor: " + HTML += TextPreview(flavor_texts["armor"]) + HTML += "
" HTML += "
" HTML +="\[Done\]" HTML += "" @@ -1755,6 +1787,13 @@ return . = ..() +/mob/living/carbon/human/throw_atom(atom/target, range, speed = 0, atom/thrower, spin, launch_type = NORMAL_LAUNCH, pass_flags = NO_FLAGS, list/end_throw_callbacks, list/collision_callbacks, tracking = FALSE) + var/turf/above = SSmapping.get_turf_above(thrower) + if(above && above.z == target.z) + to_chat(thrower, SPAN_WARNING("You can't throw someone that high!")) + return + ..() + /mob/living/carbon/human/equip_to_slot_if_possible(obj/item/equipping_item, slot, ignore_delay = 1, del_on_fail = 0, disable_warning = 0, redraw_mob = 1, permanent = 0) if(SEND_SIGNAL(src, COMSIG_HUMAN_ATTEMPTING_EQUIP, equipping_item, slot) & COMPONENT_HUMAN_CANCEL_ATTEMPT_EQUIP) diff --git a/code/modules/mob/living/carbon/human/human_abilities.dm b/code/modules/mob/living/carbon/human/human_abilities.dm index 272e7f5a18d4..c5699b558310 100644 --- a/code/modules/mob/living/carbon/human/human_abilities.dm +++ b/code/modules/mob/living/carbon/human/human_abilities.dm @@ -46,6 +46,33 @@ action_icon_state = "order_focus" order_type = COMMAND_ORDER_FOCUS +/datum/action/human_action/cycle_voice_level + name = "Cycle Voice Level" + action_icon_state = "leadership_voice_low" + +/datum/action/human_action/cycle_voice_level/action_activate() + . = ..() + if(!ishuman(owner)) // i actually don't know if this is necessary + return + var/mob/living/carbon/human/my_voice = owner + my_voice.cycle_voice_level() + update_button_icon() + +/datum/action/human_action/cycle_voice_level/update_button_icon() + var/mob/living/carbon/human/my_voice = owner + switch(my_voice.langchat_styles) // honestly, could probably merge this one with the cycle_voice_level proc + if("", null) + action_icon_state = "leadership_voice_off" + + if("langchat_smaller_bolded") + action_icon_state = "leadership_voice_low" + + if("langchat_bolded") + action_icon_state = "leadership_voice_high" + + button.overlays.Cut() + button.overlays += image('icons/mob/hud/actions.dmi', button, action_icon_state) + /datum/action/human_action/psychic_whisper name = "Psychic Whisper" action_icon_state = "cultist_channel_hivemind" @@ -183,7 +210,7 @@ CULT if(assigned_droppod) if(tgui_alert(H, "Do you want to recall the current pod?",\ - "Recall Droppod", list("No", "Yes")) == "Yes") + "Recall Droppod", list("Yes", "No")) == "Yes") if(!assigned_droppod) return @@ -330,7 +357,7 @@ CULT return var/mob/living/carbon/human/Hu = owner - if(H.skills && (skillcheck(H, SKILL_LEADERSHIP, SKILL_LEAD_EXPERT) || skillcheck(H, SKILL_POLICE, SKILL_POLICE_SKILLED))) + if(H.skills && (skillcheck(H, SKILL_LEADERSHIP, SKILL_LEAD_SKILLED) || skillcheck(H, SKILL_POLICE, SKILL_POLICE_SKILLED))) to_chat(Hu, SPAN_WARNING("This mind is too strong to target with your abilities.")) return @@ -382,7 +409,7 @@ CULT to_chat(H, SPAN_XENOMINORWARNING("You decide not to convert [chosen].")) return - var/datum/equipment_preset/preset = GLOB.gear_path_presets_list[/datum/equipment_preset/other/xeno_cultist] + var/datum/equipment_preset/preset = GLOB.equipment_presets.gear_path_presets_list[/datum/equipment_preset/other/xeno_cultist] preset.load_race(chosen) preset.load_status(chosen, H.hivenumber) @@ -579,8 +606,8 @@ CULT H.cancel_camera() H.reset_view() H.client.change_view(GLOB.world_view_size, target) - H.client.pixel_x = 0 - H.client.pixel_y = 0 + H.client.set_pixel_x(0) + H.client.set_pixel_y(0) //Similar to a cancel-camera-view button, but for mobs that were buckled to special vehicle seats. //Unbuckles them, which handles the view and offsets resets and other stuff. @@ -612,8 +639,8 @@ CULT H.unset_interaction() H.client.change_view(GLOB.world_view_size, target) - H.client.pixel_x = 0 - H.client.pixel_y = 0 + H.client.set_pixel_x(0) + H.client.set_pixel_y(0) H.reset_view() remove_from(H) diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 9c0f5c70f31e..5695e2bd9d65 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -9,7 +9,7 @@ SEND_SIGNAL(attacking_mob, COMSIG_LIVING_ATTACKHAND_HUMAN, src) - if((attacking_mob != src) && check_shields(0, attacking_mob.name)) + if((attacking_mob != src) && check_shields(attacking_mob.name, get_dir(src, attacking_mob), custom_response = TRUE)) visible_message(SPAN_DANGER("[attacking_mob] attempted to touch [src]!"), null, null, 5) return FALSE @@ -32,7 +32,7 @@ return 1 if(species.flags & IS_SYNTHETIC) - to_chat(attacking_mob, SPAN_DANGER("Your hands compress the metal chest uselessly... ")) + to_chat(attacking_mob, SPAN_DANGER("Your hands compress the metal chest uselessly...")) return 0 if(cpr_attempt_timer >= world.time) @@ -49,7 +49,7 @@ cpr_attempt_timer = world.time + HUMAN_STRIP_DELAY * attacking_mob.get_skill_duration_multiplier(SKILL_MEDICAL) if(do_after(attacking_mob, HUMAN_STRIP_DELAY * attacking_mob.get_skill_duration_multiplier(SKILL_MEDICAL), INTERRUPT_ALL, BUSY_ICON_GENERIC, src, INTERRUPT_MOVED, BUSY_ICON_MEDICAL)) if(stat != DEAD) - var/suff = min(getOxyLoss(), 10) //Pre-merge level, less healing, more prevention of dieing. + var/suff = min(getOxyLoss(), 10) //Pre-merge level, less healing, more prevention of dying. apply_damage(-suff, OXY) updatehealth() src.affected_message(attacking_mob, @@ -65,7 +65,7 @@ else attacking_mob.visible_message(SPAN_NOTICE("[attacking_mob] fails to perform CPR on [src]."), SPAN_HELPFUL("You fail to perform CPR on [src]. Incorrect rhythm. Do it slower.")) - balloon_alert(attacking_mob, "incorrect rhythm. do it slower") + balloon_alert(attacking_mob, "incorrect rhythm, do it slower") cpr_cooldown = world.time + 7 SECONDS cpr_attempt_timer = 0 return 1 @@ -198,10 +198,14 @@ //Target is not us var/t_him = "it" - if (gender == MALE) - t_him = "him" - else if (gender == FEMALE) - t_him = "her" + switch(gender) + if(MALE) + t_him = "him" + if(FEMALE) + t_him = "her" + if(PLURAL) + t_him = "them" + if (w_uniform) w_uniform.add_fingerprint(M) @@ -306,6 +310,11 @@ postscript += " (NANOSPLINTED)" else if(org.status & LIMB_SPLINTED) postscript += " (SPLINTED)" + if(org.status & LIMB_THIRD_DEGREE_BURNS) + postscript += "(SEVERE BURN)" + if(org.status & LIMB_ESCHAR) + postscript += " (ESCHAR)" + if(postscript) limb_message += "\t My [org.display_name] is [SPAN_WARNING("[english_list(status, final_comma_text = ",")].[postscript]")]" diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index f68727307fc3..383bc565d370 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -23,7 +23,7 @@ med_hud_set_armor() med_hud_set_status() - if(health <= HEALTH_THRESHOLD_DEAD || (species.has_organ["brain"] && !has_brain())) + if(health <= health_threshold_dead || (species.has_organ["brain"] && !has_brain())) death(last_damage_data) blinded = TRUE silent = 0 @@ -110,7 +110,7 @@ heal_overall_damage(-amount, 0) -/mob/living/carbon/human/adjustFireLoss(amount) +/mob/living/carbon/human/adjustFireLoss(amount, chemical = FALSE) if(amount > 0) var/burn_mod = get_burn_mod() if(burn_mod) @@ -119,44 +119,7 @@ if(amount > 0) take_overall_damage(0, amount) else - heal_overall_damage(0, -amount) - - -/mob/living/carbon/human/proc/adjustBruteLossByPart(amount, organ_name, obj/damage_source = null) - if(amount > 0) - var/brute_mod = get_brute_mod() - if(brute_mod) - amount *= brute_mod - - for(var/X in limbs) - var/obj/limb/O = X - if(O.name == organ_name) - if(amount > 0) - O.take_damage(amount, 0, sharp=is_sharp(damage_source), edge=has_edge(damage_source), used_weapon=damage_source) - else - //if you don't want to heal robot limbs, they you will have to check that yourself before using this proc. - O.heal_damage(-amount, 0, O.status & (LIMB_ROBOT|LIMB_SYNTHSKIN)) - break - - - -/mob/living/carbon/human/proc/adjustFireLossByPart(amount, organ_name, obj/damage_source = null) - if(amount > 0) - var/burn_mod = get_burn_mod() - if(burn_mod) - amount *= burn_mod - - for(var/X in limbs) - var/obj/limb/O = X - if(O.name == organ_name) - if(amount > 0) - O.take_damage(0, amount, sharp=is_sharp(damage_source), edge=has_edge(damage_source), used_weapon=damage_source) - else - //if you don't want to heal robot limbs, they you will have to check that yourself before using this proc. - O.heal_damage(0, -amount, O.status & (LIMB_ROBOT|LIMB_SYNTHSKIN)) - break - - + heal_overall_damage(0, -amount, chemical = chemical) /mob/living/carbon/human/getCloneLoss() if(species && species.flags & (IS_SYNTHETIC|NO_CLONE_LOSS)) @@ -242,15 +205,16 @@ //////////////////////////////////////////// -//Returns a list of damaged limbs -/mob/living/carbon/human/proc/get_damaged_limbs(brute, burn) +///Returns a list of damaged limbs (potentially excluding severe burns if chemical specifies and the limb is already at the healing threshold) +/mob/living/carbon/human/proc/get_damaged_limbs(brute, burn, chemical = FALSE) var/list/obj/limb/parts = list() - for(var/obj/limb/O in limbs) - if((brute && O.brute_dam) || (burn && O.burn_dam)) - parts += O + for(var/obj/limb/limb in limbs) + //unsalved burns do not heal by chems below certain threshold + if((brute && limb.brute_dam) || (burn && limb.burn_dam && (!chemical || limb.burn_dam > limb.burn_healing_threshold || !(limb.status & (LIMB_THIRD_DEGREE_BURNS | LIMB_ESCHAR))))) + parts += limb return parts -//Returns a list of damageable limbs +///Returns a list of damageable limbs /mob/living/carbon/human/proc/get_damageable_limbs(inclusion_chance) var/list/obj/limb/parts = list() for(var/obj/limb/limb in limbs) @@ -261,97 +225,86 @@ parts += limb return parts -//Heals ONE external organ, organ gets randomly selected from damaged ones. -//It automatically updates damage overlays if necesary -//It automatically updates health status -/mob/living/carbon/human/heal_limb_damage(brute, burn) - var/list/obj/limb/parts = get_damaged_limbs(brute,burn) +/** + * Heals ONE external organ, organ gets randomly selected from damaged ones. + * + * It automatically updates damage overlays if necessary. + * It automatically updates health status. + */ +/mob/living/carbon/human/heal_limb_damage(brute, burn, robo_repair = FALSE, chemical = FALSE) + var/list/obj/limb/parts = get_damaged_limbs(brute,burn,chemical) if(!length(parts)) return - var/obj/limb/picked = pick(parts) - if(brute != 0) - apply_damage(-brute, BRUTE, picked) - if(burn != 0) - apply_damage(-burn, BURN, picked) - UpdateDamageIcon() - updatehealth() - -/* -In most cases it makes more sense to use apply_damage() instead! And make sure to check armour if applicable. -*/ -//Damages ONE external organ, organ gets randomly selected from damagable ones. -//It automatically updates damage overlays if necesary -//It automatically updates health status -/mob/living/carbon/human/take_limb_damage(brute, burn, sharp = 0, edge = 0) + var/obj/limb/picked = pick(parts) + picked.heal_damage(brute, burn, robo_repair, chemical) + + +/** + * Damages ONE external organ, organ gets randomly selected from damagable ones. + * + * It automatically updates damage overlays if necessary. + * It automatically updates health status. + * + * In most cases it makes more sense to use apply_damage() instead! And make sure to check armour if applicable. + */ +/mob/living/carbon/human/take_limb_damage(brute, burn, sharp = 0, edge = 0, chemical = FALSE) var/list/obj/limb/parts = get_damageable_limbs() if(!length(parts)) return var/obj/limb/picked = pick(parts) if(brute != 0) - apply_damage(brute, BRUTE, picked, sharp, edge) + apply_damage(brute, BRUTE, picked, sharp, edge, chemical=chemical) if(burn != 0) - apply_damage(burn, BURN, picked, sharp, edge) - UpdateDamageIcon() - updatehealth() - + apply_damage(burn, BURN, picked, sharp, edge, chemical=chemical) //Heal MANY limbs, in random order -/mob/living/carbon/human/heal_overall_damage(brute, burn, robo_repair = FALSE) - var/list/obj/limb/parts = get_damaged_limbs(brute,burn) - - var/update = 0 - while(length(parts) && (brute>0 || burn>0) ) - var/obj/limb/picked = pick(parts) +/mob/living/carbon/human/heal_overall_damage(brute, burn, robo_repair = FALSE, chemical = FALSE) + var/list/obj/limb/parts = get_damaged_limbs(brute, burn, chemical) + while(length(parts) && (brute > 0 || burn > 0)) + var/obj/limb/picked = pick_n_take(parts) var/brute_was = picked.brute_dam var/burn_was = picked.burn_dam - update |= picked.heal_damage(brute, burn, robo_repair) + picked.heal_damage(brute, burn, robo_repair, chemical) brute -= (brute_was-picked.brute_dam) burn -= (burn_was-picked.burn_dam) - parts -= picked - updatehealth() - - if(update) - UpdateDamageIcon() - // damage MANY limbs, in random order /mob/living/carbon/human/take_overall_damage(brute, burn, used_weapon = null, limb_damage_chance = 80) if(status_flags & GODMODE) return //godmode var/list/obj/limb/parts = get_damageable_limbs(limb_damage_chance) var/amount_of_parts = length(parts) - for(var/obj/limb/L as anything in parts) - L.take_damage(brute / amount_of_parts, burn / amount_of_parts, sharp = FALSE, edge = FALSE, used_weapon = used_weapon) - updatehealth() - UpdateDamageIcon() + for(var/obj/limb/limb as anything in parts) + limb.take_damage(brute / amount_of_parts, burn / amount_of_parts, sharp=FALSE, edge=FALSE, used_weapon=used_weapon) // damage MANY LIMBS, in random order, but consider armor -/mob/living/carbon/human/proc/take_overall_armored_damage(damage, armour_type = ARMOR_MELEE, damage_type = BRUTE, limb_damage_chance = 80, penetration = 0) +/mob/living/carbon/human/proc/take_overall_armored_damage(damage, armor_type = ARMOR_MELEE, damage_type = BRUTE, limb_damage_chance = 80, penetration = 0) if(status_flags & GODMODE) return //godmode var/list/obj/limb/parts = get_damageable_limbs(limb_damage_chance) var/amount_of_parts = length(parts) - var/armour_config = GLOB.marine_ranged - if(armour_type == ARMOR_MELEE) - armour_config = GLOB.marine_melee - if(armour_type == ARMOR_BOMB) - armour_config = GLOB.marine_explosive + var/armor_config = GLOB.marine_ranged + switch(armor_type) + if(ARMOR_MELEE) + armor_config = GLOB.marine_melee + //if(ARMOR_BULLET, ARMOR_LASER, ARMOR_ENERGY, ARMOR_BIO) + // armor_config = GLOB.marine_ranged + if(ARMOR_BOMB) + armor_config = GLOB.marine_explosive + if(ARMOR_RAD, ARMOR_INTERNALDAMAGE) + armor_config = GLOB.marine_organ_damage for(var/obj/limb/L as anything in parts) - var/armor = getarmor(L, armour_type) - var/modified_damage = armor_damage_reduction(armour_config, damage, armor, penetration, 0, 0) + var/armor = getarmor(L, armor_type) + var/modified_damage = armor_damage_reduction(armor_config, damage, armor, penetration, 0, 0) if(damage_type == BURN) L.take_damage(burn = modified_damage / amount_of_parts) else L.take_damage(modified_damage / amount_of_parts) - updatehealth() - UpdateDamageIcon() - - //////////////////////////////////////////// @@ -373,11 +326,9 @@ This function restores all limbs. -/mob/living/carbon/human/proc/HealDamage(zone, brute, burn) - var/obj/limb/E = get_limb(zone) - if(E.heal_damage(brute, burn)) - UpdateDamageIcon() - +/mob/living/carbon/human/proc/HealDamage(zone, brute, burn, robo_repair = FALSE, chemical = FALSE) + var/obj/limb/limb = get_limb(zone) + limb.heal_damage(brute, burn, robo_repair, chemical) /mob/living/carbon/proc/get_limb(zone) return @@ -388,9 +339,9 @@ This function restores all limbs. return (locate(GLOB.limb_types_by_name[zone]) in limbs) -/mob/living/carbon/human/apply_armoured_damage(damage = 0, armour_type = ARMOR_MELEE, damage_type = BRUTE, def_zone = null, penetration = 0, armour_break_pr_pen = 0, armour_break_flat = 0) +/mob/living/carbon/human/apply_armoured_damage(damage = 0, armor_type = ARMOR_MELEE, damage_type = BRUTE, def_zone = null, penetration = 0, armour_break_pr_pen = 0, armour_break_flat = 0) if(damage <= 0) - return ..(damage, armour_type, damage_type, def_zone) + return ..(damage, armor_type, damage_type, def_zone) var/obj/limb/target_limb = null if(def_zone) @@ -400,13 +351,20 @@ This function restores all limbs. if(isnull(target_limb)) return FALSE - var/armor = getarmor(target_limb, armour_type) + var/armor = getarmor(target_limb, armor_type) - var/armour_config = GLOB.marine_ranged - if(armour_type == ARMOR_MELEE) - armour_config = GLOB.marine_melee + var/armor_config = GLOB.marine_ranged + switch(armor_type) + if(ARMOR_MELEE) + armor_config = GLOB.marine_melee + //if(ARMOR_BULLET, ARMOR_LASER, ARMOR_ENERGY, ARMOR_BIO) + // armor_config = GLOB.marine_ranged + if(ARMOR_BOMB) + armor_config = GLOB.marine_explosive + if(ARMOR_RAD, ARMOR_INTERNALDAMAGE) + armor_config = GLOB.marine_organ_damage - var/modified_damage = armor_damage_reduction(armour_config, damage, armor, penetration, 0, 0) + var/modified_damage = armor_damage_reduction(armor_config, damage, armor, penetration, 0, 0) apply_damage(modified_damage, damage_type, target_limb) return modified_damage @@ -418,7 +376,7 @@ This function restores all limbs. */ /mob/living/carbon/human/apply_damage(damage = 0, damagetype = BRUTE, def_zone = null, \ sharp = 0, edge = 0, obj/used_weapon = null, no_limb_loss = FALSE, \ - permanent_kill = FALSE, mob/firer = null, force = FALSE + permanent_kill = FALSE, mob/firer = null, force = FALSE, enviro = FALSE, chemical = FALSE ) if(protection_aura && damage > 0) damage = floor(damage * ((ORDER_HOLD_CALC_LEVEL - protection_aura) / ORDER_HOLD_CALC_LEVEL)) @@ -429,10 +387,11 @@ This function restores all limbs. if((damage > 25 && prob(20)) || (damage > 50 && prob(60))) INVOKE_ASYNC(src, PROC_REF(emote), "pain") - ..(damage, damagetype, def_zone) + ..(damage, damagetype, def_zone, enviro=enviro, chemical=chemical) + return TRUE - var/list/damagedata = list("damage" = damage) + var/list/damagedata = list("damage" = damage, "enviro" = enviro) if(SEND_SIGNAL(src, COMSIG_HUMAN_TAKE_DAMAGE, damagedata, damagetype) & COMPONENT_BLOCK_DAMAGE) return damage = damagedata["damage"] @@ -449,7 +408,8 @@ This function restores all limbs. var/list/damage_data = list( "bonus_damage" = 0, - "damage" = damage + "damage" = damage, + "enviro" = enviro ) SEND_SIGNAL(src, COMSIG_BONUS_DAMAGE, damage_data) damage += damage_data["bonus_damage"] @@ -461,16 +421,14 @@ This function restores all limbs. var/brute_mod = get_brute_mod() if(brute_mod) damage *= brute_mod - if(organ.take_damage(damage, 0, sharp, edge, used_weapon, no_limb_loss = no_limb_loss, attack_source = firer)) - UpdateDamageIcon() + organ.take_damage(damage, 0, sharp, edge, used_weapon, no_limb_loss = no_limb_loss, attack_source = firer) if(BURN) damageoverlaytemp = 20 if(!force) var/burn_mod = get_burn_mod() if(burn_mod) damage *= burn_mod - if(organ.take_damage(0, damage, sharp, edge, used_weapon, no_limb_loss = no_limb_loss, attack_source = firer)) - UpdateDamageIcon() + organ.take_damage(0, damage, sharp, edge, used_weapon, no_limb_loss = no_limb_loss, attack_source = firer) pain.apply_pain(damage, damagetype) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 04e489ef198f..922e5caab680 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -74,6 +74,9 @@ Contains most of the procs that are called when a mob is attacked by something var/obj/item/clothing/C = gear if(C.flags_armor_protection & def_zone.body_part) protection += C.get_armor(type) + var/datum/effects/acid/acid_effect = locate() in effects_list + if(acid_effect) + protection = acid_effect.adjust_armor(protection, type) return protection /mob/living/carbon/human/get_sharp_obj_blocker(obj/limb/limb) @@ -93,77 +96,6 @@ Contains most of the procs that are called when a mob is attacked by something return TRUE return FALSE -/mob/living/carbon/human/proc/check_shields(damage = 0, attack_text = "the attack", combistick=0) - var/block_effect = /obj/effect/block - var/owner_turf = get_turf(src) - if(l_hand && istype(l_hand, /obj/item/weapon))//Current base is the prob(50-d/3) - if(combistick && istype(l_hand,/obj/item/weapon/yautja/chained/combistick) && prob(66)) - var/obj/item/weapon/yautja/chained/combistick/C = l_hand - if(C.on) - return TRUE - - if(l_hand.IsShield() && istype(l_hand,/obj/item/weapon/shield)) // Activable shields - var/obj/item/weapon/shield/S = l_hand - var/shield_blocked_l = FALSE - if(S.shield_readied && prob(S.readied_block)) // User activated his shield before the attack. Lower if it blocks. - S.lower_shield(src) - shield_blocked_l = TRUE - else if(prob(S.passive_block)) - shield_blocked_l = TRUE - - if(shield_blocked_l) - new block_effect(owner_turf) - playsound(src, 'sound/items/block_shield.ogg', 70, vary = TRUE) - visible_message(SPAN_DANGER("[src] blocks [attack_text] with the [l_hand.name]!"), null, null, 5) - return TRUE - // We cannot return FALSE on fail here, because we haven't checked r_hand yet. Dual-wielding shields perhaps! - - var/obj/item/weapon/I = l_hand - if(I.IsShield() && !istype(I, /obj/item/weapon/shield) && (prob(50 - floor(damage / 3)))) // 'other' shields, like predweapons. Make sure that item/weapon/shield does not apply here, no double-rolls. - new block_effect(owner_turf) - playsound(src, 'sound/items/parry.ogg', 70, vary = TRUE) - visible_message(SPAN_DANGER("[src] blocks [attack_text] with the [l_hand.name]!"), null, null, 5) - return TRUE - - if(r_hand && istype(r_hand, /obj/item/weapon)) - if(combistick && istype(r_hand,/obj/item/weapon/yautja/chained/combistick) && prob(66)) - var/obj/item/weapon/yautja/chained/combistick/C = r_hand - if(C.on) - return TRUE - - if(r_hand.IsShield() && istype(r_hand,/obj/item/weapon/shield)) // Activable shields - var/obj/item/weapon/shield/S = r_hand - var/shield_blocked_r = FALSE - if(S.shield_readied && prob(S.readied_block)) // User activated his shield before the attack. Lower if it blocks. - shield_blocked_r = TRUE - S.lower_shield(src) - else if(prob(S.passive_block)) - shield_blocked_r = TRUE - - if(shield_blocked_r) - new block_effect(owner_turf) - playsound(src, 'sound/items/block_shield.ogg', 70, vary = TRUE) - visible_message(SPAN_DANGER("[src] blocks [attack_text] with the [r_hand.name]!"), null, null, 5) - return TRUE - - var/obj/item/weapon/I = r_hand - if(I.IsShield() && !istype(I, /obj/item/weapon/shield) && (prob(50 - floor(damage / 3)))) // other shields. Don't doublecheck activable here. - new block_effect(owner_turf) - playsound(src, 'sound/items/parry.ogg', 70, vary = TRUE) - visible_message(SPAN_DANGER("[src] blocks [attack_text] with the [r_hand.name]!"), null, null, 5) - return TRUE - - if(back && istype(back, /obj/item/weapon/shield/riot) && prob(20)) - var/obj/item/weapon/shield/riot/shield = back - if(shield.blocks_on_back) - visible_message(SPAN_DANGER("The [back] on [src]'s back blocks [attack_text]!"), null, null, 5) - return TRUE - - if(attack_text == "the pounce" && wear_suit && wear_suit.flags_inventory & BLOCK_KNOCKDOWN) - visible_message(SPAN_DANGER("[src] withstands [attack_text] with their [wear_suit.name]!"), null, null, 5) - return TRUE - return FALSE - //Returns 1 if the attack hit, 0 if it missed. @@ -187,7 +119,7 @@ Contains most of the procs that are called when a mob is attacked by something return FALSE var/hit_area = affecting.display_name - if((user != src) && check_shields(I.force, "the [I.name]")) + if((user != src) && !(I.flags_item & UNBLOCKABLE) && check_shields("the [I.name]", get_dir(src, user))) return FALSE if(LAZYLEN(I.attack_verb)) @@ -297,7 +229,7 @@ Contains most of the procs that are called when a mob is attacked by something return O.throwing = FALSE //it hit, so stop moving - if ((!launch_meta_valid || LM.thrower != src) && check_shields(impact_damage, "[O]")) + if ((!launch_meta_valid || LM.thrower != src) && check_shields("[O]", get_dir(src, LM.thrower), attack_type = SHIELD_ATTACK_PROJECTILE)) return var/obj/limb/affecting = get_limb(zone) @@ -335,7 +267,7 @@ Contains most of the procs that are called when a mob is attacked by something if (assailant) src.attack_log += text("\[[time_stamp()]\] Has been hit with \a [O], thrown by [key_name(M)]") M.attack_log += text("\[[time_stamp()]\] Hit [key_name(src)] with a thrown [O]") - if(!istype(src,/mob/living/simple_animal/mouse)) + if(!istype(src,/mob/living/simple_animal/small/mouse)) msg_admin_attack("[key_name(src)] was hit by \a [O], thrown by [key_name(M)] in [get_area(src)] ([src.loc.x],[src.loc.y],[src.loc.z]).", src.loc.x, src.loc.y, src.loc.z) if(last_damage_source) diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index 380ef4a29215..4e09975e2418 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -42,8 +42,8 @@ blood_type = "A+" //Player's bloodtype var/underwear = "Boxers (Camo Conforming)" //Which underwear the player wants - var/undershirt = "Undershirt (Tan)" //Which undershirt the player wants. - var/backbag = 2 //Which backpack type the player has chosen. Satchel or Backpack. + var/undershirt = "Undershirt (Tan) (Camo Conforming)" //Which undershirt the player wants. + var/backbag = 2 //Which backpack type the player has chosen. Satchel or Backpack or Chestrig. var/datum/species/species //Contains icon generation and language information, set during New(). @@ -121,6 +121,8 @@ var/datum/squad/assigned_squad //the squad this human is assigned to var/assigned_fireteam = 0 //the fireteam this human is assigned to var/squad_status = null //var for squad info window. Can be null, "M.I.A" and "K.I.A" + var/squad_primary_objective_ungarbled = TRUE + var/squad_secondary_objective_ungarbled = TRUE //moved from IDs to prevent some exploits and to make points more flexible var/marine_points = MARINE_TOTAL_BUY_POINTS diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index 67f6cf5cb0a2..51a8eea8ba05 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -250,14 +250,14 @@ if(sg.motion_detector) sg.motion_detector = FALSE var/datum/action/item_action/smartgun/toggle_motion_detector/TMD = locate(/datum/action/item_action/smartgun/toggle_motion_detector) in sg.actions - TMD.update_icon() + TMD.update_button_icon() sg.motion_detector() if(istype(i, /obj/item/clothing/suit/storage/marine/medium/rto/intel)) var/obj/item/clothing/suit/storage/marine/medium/rto/intel/xm4 = i if(xm4.motion_detector) xm4.motion_detector = FALSE var/datum/action/item_action/intel/toggle_motion_detector/TMD = locate(/datum/action/item_action/intel/toggle_motion_detector) in xm4.actions - TMD.update_icon() + TMD.update_button_icon() xm4.motion_detector() /mob/living/carbon/human/proc/disable_headsets() @@ -429,7 +429,7 @@ if(ishuman(mob)) var/mob/living/carbon/human/human = mob ignores_stripdrag_flag = human.species.ignores_stripdrag_flag - if(MODE_HAS_MODIFIER(/datum/gamemode_modifier/disable_stripdrag_enemy) && !ignores_stripdrag_flag && (stat == DEAD || health < HEALTH_THRESHOLD_CRIT) && !get_target_lock(mob.faction_group) && !(mob.status_flags & PERMANENTLY_DEAD)) + if(MODE_HAS_MODIFIER(/datum/gamemode_modifier/disable_stripdrag_enemy) && !ignores_stripdrag_flag && (stat == DEAD || health < health_threshold_crit) && !get_target_lock(mob.faction_group) && !(mob.status_flags & PERMANENTLY_DEAD)) to_chat(mob, SPAN_WARNING("You can't pull a crit or dead member of another faction!")) return FALSE return TRUE diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 4f4edbddc922..229e43d13338 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -25,7 +25,7 @@ var/obj/limb/E = get_limb(organ_name) if(!E || !E.is_usable()) . += MOVE_REDUCTION_LIMB_DESTROYED - if(E.status & LIMB_SPLINTED) + if(E.status & LIMB_SPLINTED || (!(E.status & LIMB_BROKEN) && (E.status & LIMB_ESCHAR))) . += MOVE_REDUCTION_LIMB_SPLINTED else if(E.status & LIMB_BROKEN) . += MOVE_REDUCTION_LIMB_BROKEN @@ -38,7 +38,7 @@ if(!E || !E.is_usable()) . += MOVE_REDUCTION_LIMB_DESTROYED // Splinted limbs are not as punishing - if(E.status & LIMB_SPLINTED) + if(E.status & LIMB_SPLINTED || (!(E.status & LIMB_BROKEN) && (E.status & LIMB_ESCHAR))) . += MOVE_REDUCTION_LIMB_SPLINTED else if(E.status & LIMB_BROKEN) . += MOVE_REDUCTION_LIMB_BROKEN diff --git a/code/modules/mob/living/carbon/human/human_shields.dm b/code/modules/mob/living/carbon/human/human_shields.dm new file mode 100644 index 000000000000..a970d2e4aa89 --- /dev/null +++ b/code/modules/mob/living/carbon/human/human_shields.dm @@ -0,0 +1,153 @@ +/** +*Attacking direction is determined by get_dir(DEFENDER, ATTACKER) +* +*Arguments: +* * attack_type - Checking if this is a Melee, Projectile or Pounce attack. +* * custom_response - Used to determine if the items involved are sending their own messages to chat about the interaction or whether this proc needs to generate an interaction message. +*/ +/mob/living/carbon/human/proc/check_shields(attack_text = "the attack", attacking_direction, attack_type = SHIELD_ATTACK_MELEE, custom_response = FALSE) + var/block_effect = /obj/effect/block + var/turf/owner_turf = get_turf(src) + + // First we handle the easy stuff. + + // Check if our armour blocks pounces. + if((attack_type == SHIELD_ATTACK_POUNCE) && wear_suit && wear_suit.flags_inventory & BLOCK_KNOCKDOWN) + if(!custom_response) + visible_message(SPAN_DANGER("[src] withstands [attack_text] with their [wear_suit.name]!"), max_distance=5) + new block_effect(owner_turf) + playsound(src, 'sound/items/block_shield.ogg', 70, vary = TRUE) + return TRUE + + if(back && istype(back, /obj/item/weapon/shield)) + var/obj/item/weapon/shield/back_shield = back + if(back_shield.blocks_on_back) + // Check if we can block a pounce at all. + if(attack_type == SHIELD_ATTACK_POUNCE && !(back_shield.shield_flags & CAN_BLOCK_POUNCE)) + return FALSE + switch(back_shield.shield_type) + if(SHIELD_DIRECTIONAL, SHIELD_DIRECTIONAL_TWOHANDS) + var/appropriate_dir = (attacking_direction in get_related_directions(reverse_direction(dir))) + if(appropriate_dir && prob(back_shield.passive_block)) + if(!custom_response) + visible_message(SPAN_DANGER("The [back_shield] on [src]'s back blocks [attack_text]!"), null, null, 5) + new block_effect(owner_turf) + playsound(src, back_shield.shield_sound, 70, vary = TRUE) + return TRUE + if(SHIELD_ABSOLUTE, SHIELD_ABSOLUTE_TWOHANDS) + if(prob(back_shield.passive_block)) + if(!custom_response) + visible_message(SPAN_DANGER("[src] is protected from [attack_text] by the [back_shield]!"), null, null, 5) + new block_effect(owner_turf) + playsound(src, back_shield.shield_sound, 70, vary = TRUE) + return TRUE + + // Now we get all the stats of our possible shields. + var/obj/item/weapon/left_hand_weapon + var/obj/item/weapon/shield/left_hand_shield + var/left_hand_type = SHIELD_NONE + var/left_hand_base_chance = 0 + var/left_hand_proj_mult = 0 + + var/obj/item/weapon/right_hand_weapon + var/obj/item/weapon/shield/right_hand_shield + var/right_hand_type = SHIELD_NONE + var/right_hand_base_chance = 0 + var/right_hand_proj_mult = 0 + + var/can_block_pounce = FALSE + + if(l_hand && istype(l_hand, /obj/item/weapon)) + left_hand_weapon = l_hand + if(left_hand_weapon.shield_flags & CAN_BLOCK_POUNCE) + can_block_pounce = TRUE + if(left_hand_weapon.shield_chance && left_hand_weapon.shield_type) + left_hand_type = left_hand_weapon.shield_type + left_hand_proj_mult = left_hand_weapon.shield_projectile_mult + left_hand_base_chance = left_hand_weapon.shield_chance + + if(!(left_hand_weapon.flags_item & WIELDED)) + if(left_hand_type == SHIELD_ABSOLUTE_TWOHANDS) + left_hand_base_chance = (left_hand_base_chance / 2) + if(left_hand_type == SHIELD_DIRECTIONAL_TWOHANDS) + left_hand_base_chance = (left_hand_base_chance / 3) + if(istype(left_hand_weapon, /obj/item/weapon/shield)) // Activable shields + left_hand_shield = left_hand_weapon + + if(!left_hand_shield) // Don't want to be sharing a dedicated shield and a weapon's block, else numbers could theoretically go over 100 + if(r_hand && istype(r_hand, /obj/item/weapon)) + right_hand_weapon = r_hand + if(right_hand_weapon.shield_flags & CAN_BLOCK_POUNCE) + can_block_pounce = TRUE + if(right_hand_weapon.shield_chance && right_hand_weapon.shield_type) + right_hand_type = right_hand_weapon.shield_type + right_hand_proj_mult = right_hand_weapon.shield_projectile_mult + right_hand_base_chance = right_hand_weapon.shield_chance + + if(!(right_hand_weapon.flags_item & WIELDED)) + if(right_hand_type == SHIELD_ABSOLUTE_TWOHANDS) + right_hand_base_chance = (right_hand_base_chance / 2) + if(left_hand_type == SHIELD_DIRECTIONAL_TWOHANDS) + right_hand_base_chance = (right_hand_base_chance / 3) + if(istype(right_hand_weapon, /obj/item/weapon/shield)) // Activable shields + right_hand_shield = right_hand_weapon + if(right_hand_shield) + left_hand_weapon = null + left_hand_type = SHIELD_NONE + left_hand_base_chance = 0 + left_hand_proj_mult = 0 + + // Check if we can block a pounce at all. + if((attack_type == SHIELD_ATTACK_POUNCE) && !can_block_pounce) + return FALSE + + /// Here we want to check for absolute first, and then directional. If one shield has absolute and the other doesn't, we still treat the total block as absolute. + var/checking_type + if(left_hand_type == SHIELD_ABSOLUTE_TWOHANDS || right_hand_type == SHIELD_ABSOLUTE_TWOHANDS) + checking_type = SHIELD_ABSOLUTE + else if(left_hand_type == SHIELD_ABSOLUTE || right_hand_type == SHIELD_ABSOLUTE) + checking_type = SHIELD_ABSOLUTE + else if(left_hand_type == SHIELD_DIRECTIONAL_TWOHANDS || right_hand_type == SHIELD_DIRECTIONAL_TWOHANDS) + checking_type = SHIELD_DIRECTIONAL + else if(left_hand_type == SHIELD_DIRECTIONAL || right_hand_type == SHIELD_DIRECTIONAL) + checking_type = SHIELD_DIRECTIONAL + else // If there aren't any shield types assigned to etiher possible weapon, we're not blocking anything. + return FALSE + + /// We go with the highest percentage possible, based on all of one weapon and half of the other. + var/checking_base_chance = max(left_hand_base_chance + (right_hand_base_chance/2), right_hand_base_chance + (left_hand_base_chance/2)) + + if(checking_base_chance <= 0) // Fail. + return FALSE + + /// We're not adding up projectile multipliers, we just take the highest available. + var/checking_proj_mult = max(left_hand_proj_mult, right_hand_proj_mult) + + /// Now we need to work out which weapon we're giving the glory of playing a sound and giving text. + var/obj/item/weapon/checking_weapon + if(left_hand_base_chance > right_hand_base_chance) + checking_weapon = left_hand_weapon + else + checking_weapon = right_hand_weapon + + /// Now we work out the real block chance. + var/block_chance = checking_base_chance + if(attack_type == SHIELD_ATTACK_PROJECTILE) + block_chance = (block_chance * checking_proj_mult) + + /// If there is no passed attack direction, we can't appropriately check for directional blocks, so we convert to absolute block instead. + if(!attacking_direction && checking_type == SHIELD_DIRECTIONAL) + checking_type = SHIELD_ABSOLUTE + + if(checking_type == SHIELD_DIRECTIONAL) + if(!(attacking_direction in get_related_directions(dir))) + return FALSE + + if(prob(block_chance)) + new block_effect(owner_turf) + playsound(src, checking_weapon.shield_sound, 70, vary = TRUE) + if(!custom_response) + visible_message(SPAN_DANGER("[src] blocks [attack_text] with the [checking_weapon.name]!"), null, null, 5) + return TRUE + + return FALSE diff --git a/code/modules/mob/living/carbon/human/human_stripping.dm b/code/modules/mob/living/carbon/human/human_stripping.dm index 953b539954d8..d346b66428f0 100644 --- a/code/modules/mob/living/carbon/human/human_stripping.dm +++ b/code/modules/mob/living/carbon/human/human_stripping.dm @@ -58,7 +58,7 @@ GLOBAL_LIST_INIT(strippable_human_items, create_strippable_list(list( var/mob/living/carbon/human/sourcehuman = source if(user.action_busy || user.is_mob_incapacitated() || !source.Adjacent(user)) return - if(MODE_HAS_MODIFIER(/datum/gamemode_modifier/disable_stripdrag_enemy) && (sourcehuman.stat == DEAD || sourcehuman.health < HEALTH_THRESHOLD_CRIT) && !sourcehuman.get_target_lock(user.faction_group)) + if(MODE_HAS_MODIFIER(/datum/gamemode_modifier/disable_stripdrag_enemy) && (sourcehuman.stat == DEAD || sourcehuman.health < sourcehuman.health_threshold_crit) && !sourcehuman.get_target_lock(user.faction_group)) to_chat(user, SPAN_WARNING("You can't toggle internals of a crit or dead member of another faction!")) return @@ -122,7 +122,7 @@ GLOBAL_LIST_INIT(strippable_human_items, create_strippable_list(list( var/mob/living/carbon/human/sourcemob = source if(user.action_busy || user.is_mob_incapacitated() || !source.Adjacent(user)) return - if(MODE_HAS_MODIFIER(/datum/gamemode_modifier/disable_stripdrag_enemy) && (sourcemob.stat == DEAD || sourcemob.health < HEALTH_THRESHOLD_CRIT) && !sourcemob.get_target_lock(user.faction_group)) + if(MODE_HAS_MODIFIER(/datum/gamemode_modifier/disable_stripdrag_enemy) && (sourcemob.stat == DEAD || sourcemob.health < sourcemob.health_threshold_crit) && !sourcemob.get_target_lock(user.faction_group)) to_chat(user, SPAN_WARNING("You can't strip a crit or dead member of another faction!")) return if(!sourcemob.w_uniform || !istype(sourcemob.w_uniform, /obj/item/clothing)) @@ -179,7 +179,7 @@ GLOBAL_LIST_INIT(strippable_human_items, create_strippable_list(list( var/mob/living/carbon/human/sourcemob = source if(user.action_busy || user.is_mob_incapacitated() || !source.Adjacent(user)) return - if(MODE_HAS_MODIFIER(/datum/gamemode_modifier/disable_stripdrag_enemy) && (sourcemob.stat == DEAD || sourcemob.health < HEALTH_THRESHOLD_CRIT) && !sourcemob.get_target_lock(user.faction_group)) + if(MODE_HAS_MODIFIER(/datum/gamemode_modifier/disable_stripdrag_enemy) && (sourcemob.stat == DEAD || sourcemob.health < sourcemob.health_threshold_crit) && !sourcemob.get_target_lock(user.faction_group)) to_chat(user, SPAN_WARNING("You can't remove splints of a crit or dead member of another faction!")) return sourcemob.attack_log += text("\[[time_stamp()]\] Has had their splints removed by [key_name(user)]") @@ -219,7 +219,7 @@ GLOBAL_LIST_INIT(strippable_human_items, create_strippable_list(list( var/mob/living/carbon/human/sourcemob = source if(user.action_busy || user.is_mob_incapacitated() || !source.Adjacent(user)) return - if(MODE_HAS_MODIFIER(/datum/gamemode_modifier/disable_stripdrag_enemy) && (sourcemob.stat == DEAD || sourcemob.health < HEALTH_THRESHOLD_CRIT) && !sourcemob.get_target_lock(user.faction_group)) + if(MODE_HAS_MODIFIER(/datum/gamemode_modifier/disable_stripdrag_enemy) && (sourcemob.stat == DEAD || sourcemob.health < sourcemob.health_threshold_crit) && !sourcemob.get_target_lock(user.faction_group)) to_chat(user, SPAN_WARNING("You can't strip a crit or dead member of another faction!")) return if(!istype(sourcemob.wear_id, /obj/item/card/id/dogtag)) @@ -235,7 +235,7 @@ GLOBAL_LIST_INIT(strippable_human_items, create_strippable_list(list( to_chat(user, SPAN_WARNING("You can't take a dogtag's information tag while its owner is alive.")) return - to_chat(user, SPAN_NOTICE("You take [sourcemob]'s information tag, leaving the ID tag")) + to_chat(user, SPAN_NOTICE("You take [sourcemob]'s information tag, leaving the ID tag.")) tag.dogtag_taken = TRUE tag.icon_state = tag.tags_taken_icon var/obj/item/dogtag/newtag = new(sourcemob.loc) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 0877cb499cf3..8e588e6b0973 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -7,7 +7,7 @@ return if(undefibbable && stat == DEAD || spawned_corpse) - GLOB.data_core.manifest_modify(real_name, WEAKREF(src), null, null, "*Deceased*") + GLOB.data_core.manifest_modify(real_name, WEAKREF(src), null, null, "Deceased") SShuman.processable_human_list -= src if(hardcore) qdel(src) //We just delete the corpse on WO to keep things simple and lag-free @@ -20,7 +20,7 @@ //Apparently, the person who wrote this code designed it so that //blinded get reset each cycle and then get activated later in the - //code. Very ugly. I dont care. Moving this stuff here so its easy + //code. Very ugly. I don't care. Moving this stuff here so its easy //to find it. //TODO: separate this out diff --git a/code/modules/mob/living/carbon/human/life/handle_regular_status_updates.dm b/code/modules/mob/living/carbon/human/life/handle_regular_status_updates.dm index 2fa89cf50f22..880db2e3b57f 100644 --- a/code/modules/mob/living/carbon/human/life/handle_regular_status_updates.dm +++ b/code/modules/mob/living/carbon/human/life/handle_regular_status_updates.dm @@ -38,7 +38,7 @@ if(regular_update && ((getOxyLoss() > 50))) apply_effect(3, PARALYZE) - if((src.species.flags & HAS_HARDCRIT) && HEALTH_THRESHOLD_CRIT > health) + if((species.flags & HAS_HARDCRIT) && health_threshold_crit > health) var/already_in_crit = FALSE for(var/datum/effects/crit/C in effects_list) already_in_crit = TRUE @@ -97,7 +97,7 @@ else if(ear_damage) ear_damage = max(ear_damage - 0.05, 0) - // This should be done only on updates abvoe, or even better in the AdjsutEarDeafnes handlers + // This should be done only on updates above, or even better in the AdjustEarDeafness handlers if(!ear_deaf && (client?.soundOutput?.status_flags & EAR_DEAF_MUTE)) client.soundOutput.status_flags ^= EAR_DEAF_MUTE client.soundOutput.apply_status() @@ -123,10 +123,10 @@ pain.apply_pain_reduction(PAIN_REDUCTION_FULL) paralyzed-- - if(drowsyness) - drowsyness = max(0,drowsyness - 2) + if(drowsiness) + drowsiness = max(0,drowsiness - 2) EyeBlur(2) - if(drowsyness > 10 && prob(5)) + if(drowsiness > 10 && prob(5)) sleeping++ apply_effect(5, PARALYZE) diff --git a/code/modules/mob/living/carbon/human/life/handle_stasis_bag.dm b/code/modules/mob/living/carbon/human/life/handle_stasis_bag.dm index d6718d0c98b6..55eb77c41b26 100644 --- a/code/modules/mob/living/carbon/human/life/handle_stasis_bag.dm +++ b/code/modules/mob/living/carbon/human/life/handle_stasis_bag.dm @@ -11,3 +11,15 @@ if(STASIS_IN_CRYO_CELL) if(sleeping < 10) sleeping += 10 //Puts the mob to sleep indefinitely. + + //APS Stuff + for(var/datum/reagent/antiparasitic_reagent in reagents.reagent_list) + var/datum/chem_property/property = antiparasitic_reagent.get_property(PROPERTY_ANTIPARASITIC) //If I have APS in me. Tell player APS is not working in stasis + if(property) //If we have APS and a 25% chance to run + var/obj/item/alien_embryo/embryo = locate() in contents //Check if we have an embryo in us + if(embryo) + if(prob(25) && embryo.stage >= 2) //Embryo should only be noticed when you are above stage 2 (This is the standard in embryo.dm) + to_chat(src, SPAN_NOTICE("As your metabolism slows down, something inside you relaxes.")) //Inform the marine the stasis makes it ineffective + break// otherwise, stop looping this handling regardless + + 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 f44cd7e7f3bd..d16373321244 100644 --- a/code/modules/mob/living/carbon/human/life/life_helpers.dm +++ b/code/modules/mob/living/carbon/human/life/life_helpers.dm @@ -160,11 +160,18 @@ /mob/living/carbon/human/proc/process_glasses(obj/item/clothing/glasses/G) + var/atom/movable/screen/plane_master/blackness/darkness_plane = hud_used?.plane_masters["[BLACKNESS_PLANE]"] + if(!G || !G.active) + darkness_plane?.alpha = 255 return see_in_dark += G.darkness_view if(G.vision_flags) sight |= G.vision_flags + + if(G.vision_flags & SEE_TURFS) + darkness_plane?.alpha = 0 + if(G.lighting_alpha < lighting_alpha) lighting_alpha = G.lighting_alpha diff --git a/code/modules/mob/living/carbon/human/powers/human_powers.dm b/code/modules/mob/living/carbon/human/powers/human_powers.dm index 845e7429ff54..390fc5fece7a 100644 --- a/code/modules/mob/living/carbon/human/powers/human_powers.dm +++ b/code/modules/mob/living/carbon/human/powers/human_powers.dm @@ -171,7 +171,7 @@ log_say("[key_name(src)] communed to [key_name(M)]: [text] (AREA: [get_area_name(loc)])") - to_chat(M, SPAN_NOTICE(" Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]")) + to_chat(M, SPAN_NOTICE("Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]")) if(istype(M,/mob/living/carbon/human)) var/mob/living/carbon/human/H = M if(H.species.name == species.name) @@ -289,7 +289,7 @@ // SEND_SIGNAL(src, COMSIG_LIVING_RESTING, new_resting, silent, instant) // update_resting() // HUD icons -/mob/living/carbon/human/proc/toggle_inherent_nightvison() +/mob/living/carbon/human/proc/toggle_inherent_nightvision() set category = "Synthetic" set name = "Toggle Nightvision" set desc = "Toggles inherent nightvision." @@ -380,17 +380,17 @@ var/viewoffset = 32 * tileoffset switch(dir) if(NORTH) - client.pixel_x = 0 - client.pixel_y = viewoffset + client.set_pixel_x(0) + client.set_pixel_y(viewoffset) if(SOUTH) - client.pixel_x = 0 - client.pixel_y = -viewoffset + client.set_pixel_x(0) + client.set_pixel_y(-viewoffset) if(EAST) - client.pixel_x = viewoffset - client.pixel_y = 0 + client.set_pixel_x(viewoffset) + client.set_pixel_y(0) if(WEST) - client.pixel_x = -viewoffset - client.pixel_y = 0 + client.set_pixel_x(-viewoffset) + client.set_pixel_y(0) /mob/living/carbon/human/proc/disable_zoom() SIGNAL_HANDLER @@ -398,6 +398,6 @@ return UnregisterSignal(src, COMSIG_MOB_MOVE_OR_LOOK) client.change_view(GLOB.world_view_size) - client.pixel_x = 0 - client.pixel_y = 0 + client.set_pixel_x(0) + client.set_pixel_y(0) is_zoomed = FALSE diff --git a/code/modules/mob/living/carbon/human/powers/issue_order.dm b/code/modules/mob/living/carbon/human/powers/issue_order.dm index ea0a554df253..33d9b8872b74 100644 --- a/code/modules/mob/living/carbon/human/powers/issue_order.dm +++ b/code/modules/mob/living/carbon/human/powers/issue_order.dm @@ -14,8 +14,16 @@ if(!skills) return FALSE var/order_level = skills.get_skill_level(SKILL_LEADERSHIP) - if(!order_level) - order_level = SKILL_LEAD_TRAINED + + switch(order_level) + if(SKILL_LEAD_TRAINED) + order_level = 1 + if(SKILL_LEAD_SKILLED) + order_level = 1.5 + if(SKILL_LEAD_EXPERT) + order_level = 2 + if(SKILL_LEAD_MASTER) + order_level = 3 if(!order) order = tgui_input_list(src, "Choose an order", "Order to send", list(COMMAND_ORDER_MOVE, COMMAND_ORDER_HOLD, COMMAND_ORDER_FOCUS, "help", "cancel")) @@ -32,37 +40,64 @@ command_aura_available = FALSE var/command_aura_strength = order_level var/command_aura_duration = (order_level + 1) * 10 SECONDS + var/command_aura_cooldown = COMMAND_ORDER_COOLDOWN + var/command_aura_range = COMMAND_ORDER_RANGE + + // whistle checks + var/obj/item/clothing/accessory/device/whistle/whistling = locate() in src.contents + var/list/leader_clothes = list(w_uniform, wear_suit) + for(var/obj/item/clothing/accessory in leader_clothes) + if(!whistling && accessory?.accessories) + whistling = locate() in accessory.accessories + if(whistling) + break + + var/leader_sound = null + if(whistling && whistling.leader_whistle) + command_aura_strength += 1.25 // just a minor buff :) + command_aura_cooldown += 800 //deciseconds, equivalent to 240 seconds with the default cooldown + command_aura_range += 3 + switch(order) + if(COMMAND_ORDER_MOVE) + leader_sound = 'sound/items/whistles/trench_whistle_move.ogg' + if(COMMAND_ORDER_HOLD) + leader_sound = 'sound/items/whistles/trench_whistle_hold.ogg' + if(COMMAND_ORDER_FOCUS) + leader_sound = 'sound/items/whistles/trench_whistle_focus.ogg' - var/turf/T = get_turf(src) - for(var/mob/living/carbon/human/H in range(COMMAND_ORDER_RANGE, T)) - if(H.stat == DEAD) + var/turf/turf = get_turf(src) + for(var/mob/living/carbon/human/inspiring in range(command_aura_range, turf)) + if(inspiring.stat == DEAD) continue - if(!ishumansynth_strict(H)) + if(!ishumansynth_strict(inspiring)) continue - H.activate_order_buff(order, command_aura_strength, command_aura_duration) + inspiring.activate_order_buff(order, command_aura_strength, command_aura_duration) - if(loc != T) //if we were inside something, the range() missed us. + if(loc != turf) //if we were inside something, the range() missed us. activate_order_buff(order, command_aura_strength, command_aura_duration) for(var/datum/action/A in actions) A.update_button_icon() // 1min cooldown on orders - addtimer(CALLBACK(src, PROC_REF(make_aura_available)), COMMAND_ORDER_COOLDOWN) + addtimer(CALLBACK(src, PROC_REF(make_aura_available)), command_aura_cooldown) if(src.client?.prefs?.toggle_prefs & TOGGLE_LEADERSHIP_SPOKEN_ORDERS) var/spoken_order = "" switch(order) if(COMMAND_ORDER_MOVE) - spoken_order = pick("*GET MOVING*!", "*GO, GO, GO*!", "*WE ARE ON THE MOVE*!", "*MOVE IT*!", "*DOUBLE TIME*!", "*KEEP UP LADIES*!", "*MOVE, MOVE, MOVE*!", "*ADVANCE*!", "*KICK YOUR FEET, TWINKLETOES*!", "*ON YOUR FEET SOLDIER, WE ARE LEAVING*!", "*WE ARE OSCAR MIKE*!", "*FORWARD*!", "*GET UP THERE*!", "*GET ON ME*!", "*CHARGE, FORWARD*!", "*ON ME MEN, LET'S MOVE*!", "*STEPPING OFF*!", "*STEP IT UP, LET'S ROLL*!", "*LET'S ROLL*!", "*STACK UP ON ME*!", "*FALL IN*!") + spoken_order = pick("GET MOVING!", "GO, GO, GO!", "WE ARE ON THE MOVE!", "MOVE IT!", "DOUBLE TIME!", "KEEP UP LADIES!", "MOVE, MOVE, MOVE!", "ADVANCE!", "KICK YOUR FEET, TWINKLETOES!", "ON YOUR FEET SOLDIER, WE ARE LEAVING!", "WE ARE OSCAR MIKE!", "FORWARD!", "GET UP THERE!", "GET ON ME!", "CHARGE, FORWARD!", "ON ME MEN, LET'S MOVE!", "STEPPING OFF!", "STEP IT UP, LET'S ROLL!", "LET'S ROLL!", "STACK UP ON ME!", "FALL IN!") if(COMMAND_ORDER_HOLD) - spoken_order = pick("*DUCK AND COVER*!", "*HOLD THE LINE*!", "*HOLD POSITION*!", "*STAND YOUR GROUND*!", "*STAND AND FIGHT*!", "*HOLD YOUR GROUND*!", "*HUNKER*!", "*HUNKER DOWN*!", "*HOLD HERE*!", "*HOLD WITH ME*!", "*TO ME, HOLD*!", "*DEFENSIVE POSITIONS*!", "*TAKE COVER AND FIRE*!", "*STAND FAST*!", "*NOT ONE STEP BACK*!", "*HOLD FAST*!", "*DIG IN AND HOLD*!", "*BRACE*!", "*TO THE LAST MAN*!", "*KEEP YOUR NERVE, HOLD STRONG*!", "*NO RETREAT, STAND FIRM*!") + spoken_order = pick("DUCK AND COVER!", "HOLD THE LINE!", "HOLD POSITION!", "STAND YOUR GROUND!", "STAND AND FIGHT!", "HOLD YOUR GROUND!", "HUNKER!", "HUNKER DOWN!", "HOLD HERE!", "HOLD WITH ME!", "TO ME, HOLD!", "DEFENSIVE POSITIONS!", "TAKE COVER AND FIRE!", "STAND FAST!", "NOT ONE STEP BACK!", "HOLD FAST!", "DIG IN AND HOLD!", "BRACE!", "TO THE LAST MAN!", "KEEP YOUR NERVE, HOLD STRONG!", "NO RETREAT, STAND FIRM!") if(COMMAND_ORDER_FOCUS) - spoken_order = pick("*FOCUS FIRE*!", "*PICK YOUR TARGETS*!", "*CENTER MASS*!", "*SHORT-CONTROLLED BURSTS*!", "*AIM YOUR SHOTS*!", "*ON MY MARK*!", "*AIMED SHOTS*!", "*GO FOR THE KILL*!", "*SHOOT 'EM DEAD*!", "*KILL THEM ALL*!", "*SUPPRESSIVE FIRE*!", "*TIGHTEN YOUR SHOTS*!", "*LOCK AND LOAD*!", "*TARGET THEIR WEAK SPOTS*!", "*ZERO IN ON THE ENEMY*!", "*EYES ON THE PRIZE*!", "*LET'S ROCK*!", "*HIT 'EM WHERE IT HURTS*!", "*SLAUGHTER 'EM*!", "*BRING THE PAIN*!", "*STEADY YOUR AIM*!", "*EYES UP AND FIRE*!", "*FIRING LANES*!", "*CROSSHAIRS, PEOPLE*!", "*STRIKE*!") + spoken_order = pick("FOCUS FIRE!", "PICK YOUR TARGETS!", "CENTER MASS!", "SHORT-CONTROLLED BURSTS!", "AIM YOUR SHOTS!", "ON MY MARK!", "AIMED SHOTS!", "GO FOR THE KILL!", "SHOOT 'EM DEAD!", "KILL THEM ALL!", "SUPPRESSIVE FIRE!", "TIGHTEN YOUR SHOTS!", "LOCK AND LOAD!", "TARGET THEIR WEAK SPOTS!", "ZERO IN ON THE ENEMY!", "EYES ON THE PRIZE!", "LET'S ROCK!", "HIT 'EM WHERE IT HURTS!", "SLAUGHTER 'EM!", "BRING THE PAIN!", "STEADY YOUR AIM!", "EYES UP AND FIRE!", "FIRING LANES!", "CROSSHAIRS, PEOPLE!", "STRIKE!") say(spoken_order) // if someone thinks about adding new lines, it'll be better to split the current ones we have into two different lists per order for readability, and have a coin flip pick between spoken_orders 1 or 2 else visible_message(SPAN_BOLDNOTICE("[src] gives an order to [order]!"), SPAN_BOLDNOTICE("You give an order to [order]!")) + if(whistling) + whistling.whistle_playsound(src, bypass_cooldown = TRUE, custom_sound = leader_sound, leader_slowdown = TRUE) + /mob/living/carbon/human/proc/make_aura_available() to_chat(src, SPAN_NOTICE("You can issue an order again.")) command_aura_available = TRUE @@ -123,3 +158,24 @@ marksman_aura = 0 hud_set_order() + +/mob/living/carbon/human/proc/cycle_voice_level() + if(!HAS_TRAIT(src, TRAIT_LEADERSHIP)) // just in case + to_chat(src, SPAN_WARNING("You don't particularly understand how to speak... 'authoritatively.'")) + return + + switch(langchat_styles) + if("", null) + langchat_styles = "langchat_smaller_bolded" + to_chat(src, SPAN_NOTICE("You will now speak authoritatively.")) + return + + if("langchat_smaller_bolded") + langchat_styles = "langchat_bolded" + to_chat(src, SPAN_NOTICE("You will now speak loudly and authoritatively.")) + return + + if("langchat_bolded") + langchat_styles = "" + to_chat(src, SPAN_NOTICE("You will now speak normally.")) + return diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 98f466f18319..ce90017980dd 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -316,7 +316,7 @@ target.flags_emote &= ~EMOTING_HIGH_FIVE var/extra_quip = "" if(prob(10)) - extra_quip = pick(" Down low!", " Eiffel Tower!") + extra_quip = pick("Down low!", "Eiffel Tower!") H.visible_message(SPAN_NOTICE("[H] gives [target] a high five![extra_quip]"), SPAN_NOTICE("You give [target] a high five![extra_quip]"), null, 4) playsound(target, 'sound/effects/snap.ogg', 25, 1) diff --git a/code/modules/mob/living/carbon/human/species/synth_k9.dm b/code/modules/mob/living/carbon/human/species/synth_k9.dm index 343dacd22cfc..8d336a5bf0f3 100644 --- a/code/modules/mob/living/carbon/human/species/synth_k9.dm +++ b/code/modules/mob/living/carbon/human/species/synth_k9.dm @@ -20,7 +20,7 @@ inherent_verbs = list( /mob/living/carbon/human/synthetic/proc/toggle_HUD, - /mob/living/carbon/human/proc/toggle_inherent_nightvison, + /mob/living/carbon/human/proc/toggle_inherent_nightvision, /mob/living/carbon/human/synthetic/synth_k9/proc/toggle_scent_tracking, /mob/living/carbon/human/synthetic/synth_k9/proc/toggle_binocular_vision, ) diff --git a/code/modules/mob/living/carbon/human/species/synthetic.dm b/code/modules/mob/living/carbon/human/species/synthetic.dm index 37eb7f0bdcdc..c624caf4ed42 100644 --- a/code/modules/mob/living/carbon/human/species/synthetic.dm +++ b/code/modules/mob/living/carbon/human/species/synthetic.dm @@ -52,7 +52,7 @@ inherent_verbs = list( /mob/living/carbon/human/synthetic/proc/toggle_HUD, - /mob/living/carbon/human/proc/toggle_inherent_nightvison, + /mob/living/carbon/human/proc/toggle_inherent_nightvision, ) /datum/species/synthetic/handle_post_spawn(mob/living/carbon/human/H) diff --git a/code/modules/mob/living/carbon/human/species/working_joe/_species.dm b/code/modules/mob/living/carbon/human/species/working_joe/_species.dm index 80ba738e650f..821d9d302ea5 100644 --- a/code/modules/mob/living/carbon/human/species/working_joe/_species.dm +++ b/code/modules/mob/living/carbon/human/species/working_joe/_species.dm @@ -32,6 +32,7 @@ /datum/species/synthetic/colonial/working_joe/handle_post_spawn(mob/living/carbon/human/joe) . = ..() give_action(joe, /datum/action/joe_emote_panel) + joe.AddElement(/datum/element/corp_label/seegson) // Special death noise for Working Joe /datum/species/synthetic/colonial/working_joe/handle_death(mob/living/carbon/human/dying_joe, gibbed) diff --git a/code/modules/mob/living/carbon/human/species/wy_droid/_species.dm b/code/modules/mob/living/carbon/human/species/wy_droid/_species.dm index 64a798e9b848..9b43ff9d9369 100644 --- a/code/modules/mob/living/carbon/human/species/wy_droid/_species.dm +++ b/code/modules/mob/living/carbon/human/species/wy_droid/_species.dm @@ -20,6 +20,7 @@ /datum/species/synthetic/colonial/wy_droid/handle_post_spawn(mob/living/carbon/human/wy_droid) . = ..() give_action(wy_droid, /datum/action/wy_droid_emote_panel) + wy_droid.AddElement(/datum/element/corp_label/wy) /datum/species/synthetic/colonial/wy_droid/handle_death(mob/living/carbon/human/dying_droid) playsound(get_turf(dying_droid),"wy_droid_death", 25, FALSE) diff --git a/code/modules/mob/living/carbon/human/species/wy_droid/status.dm b/code/modules/mob/living/carbon/human/species/wy_droid/status.dm index ad3e35f5fa0d..382ca50dd457 100644 --- a/code/modules/mob/living/carbon/human/species/wy_droid/status.dm +++ b/code/modules/mob/living/carbon/human/species/wy_droid/status.dm @@ -39,8 +39,8 @@ /datum/emote/living/carbon/human/synthetic/colonial/wy_droid/status/military_target key = "militarytarget" - sound = 'sound/voice/wy_droid/voicelines/military_target_aquired.ogg' - say_message = "Military target aquired." + sound = 'sound/voice/wy_droid/voicelines/military_target_acquired.ogg' + say_message = "Military target acquired." emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE /datum/emote/living/carbon/human/synthetic/colonial/wy_droid/status/hunter_speciman @@ -51,8 +51,8 @@ /datum/emote/living/carbon/human/synthetic/colonial/wy_droid/status/hunter_target key = "huntertarget" - sound = 'sound/voice/wy_droid/voicelines/hunter_target_aquired.ogg' - say_message = "Hunter target aquired." + sound = 'sound/voice/wy_droid/voicelines/hunter_target_acquired.ogg' + say_message = "Hunter target acquired." emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE /datum/emote/living/carbon/human/synthetic/colonial/wy_droid/status/alert_weyland diff --git a/code/modules/mob/living/carbon/human/species/yautja/_species.dm b/code/modules/mob/living/carbon/human/species/yautja/_species.dm index 5953270e138b..f7cf7dd232fd 100644 --- a/code/modules/mob/living/carbon/human/species/yautja/_species.dm +++ b/code/modules/mob/living/carbon/human/species/yautja/_species.dm @@ -144,11 +144,25 @@ H.message_thrall("Your master has fallen!") H.hunter_data.thrall = null -/datum/species/yautja/handle_dead_death(mob/living/carbon/human/H, gibbed) - set_predator_status(H, gibbed ? "Gibbed" : "Dead") - -/datum/species/yautja/handle_cryo(mob/living/carbon/human/H) - set_predator_status(H, "Cryo") +/datum/species/yautja/handle_dead_death(mob/living/carbon/human/predator, gibbed) + set_predator_status(predator, gibbed ? "Gibbed" : "Dead") + +/datum/species/yautja/handle_cryo(mob/living/carbon/human/predator) + set_predator_status(predator, "Cryo") + if(counts_for_slots(predator)) + SSticker.mode.pred_current_num-- + +/datum/species/yautja/proc/counts_for_slots(mob/living/carbon/human/predator) + if(predator.client?.check_whitelist_status(WHITELIST_YAUTJA_LEADER|WHITELIST_YAUTJA_COUNCIL)) + return FALSE + var/datum/job/pred_job = GLOB.RoleAuthority.roles_by_name[JOB_PREDATOR] + if(!pred_job) + return + if(predator.client) + var/pred_rank = pred_job.get_whitelist_status(predator.client) + if(pred_rank == CLAN_RANK_LEADER) + return FALSE + return TRUE /datum/species/yautja/proc/set_predator_status(mob/living/carbon/human/H, status = "Alive") if(!H.persistent_username) @@ -213,6 +227,7 @@ limb.time_to_knit = 600 // 1 minute to self heal bone break, time is in tenths of a second hunter.set_languages(list(LANGUAGE_YAUTJA)) + hunter.hud_used?.hide_actions_toggle.update_button_icon(hunter) give_action(hunter, /datum/action/yautja_emote_panel) give_action(hunter, /datum/action/predator_action/mark_for_hunt) give_action(hunter, /datum/action/predator_action/mark_panel) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 20fa019cf8eb..58ee27292c3a 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -83,6 +83,8 @@ There are several things that need to be remembered: overlays += images /mob/living/carbon/human/remove_overlay(cache_index) + if(cache_index > length(overlays_standing)) + return if(overlays_standing[cache_index]) var/image/I = overlays_standing[cache_index] SEND_SIGNAL(src, COMSIG_HUMAN_OVERLAY_REMOVED, cache_index, I) @@ -218,6 +220,8 @@ There are several things that need to be remembered: facial_s.layer = -FACIAL_LAYER if(facial_hair_style.do_coloration) facial_s.color = list(null, null, null, null, rgb(r_facial, g_facial, b_facial)) + if(head_organ.blocks_emissive != EMISSIVE_BLOCK_NONE) + facial_s.overlays += emissive_blocker(facial_s.icon, facial_s.icon_state, alpha = facial_s.alpha) overlays_standing[FACIAL_LAYER] = facial_s apply_overlay(FACIAL_LAYER) @@ -242,6 +246,8 @@ There are several things that need to be remembered: overlays_standing[HAIR_GRADIENT_LAYER] = gradient_overlay apply_overlay(HAIR_GRADIENT_LAYER) + if(head_organ.blocks_emissive != EMISSIVE_BLOCK_NONE) + hair_s.overlays += emissive_blocker(hair_s.icon, hair_s.icon_state, alpha = hair_s.alpha) overlays_standing[HAIR_LAYER] = hair_s apply_overlay(HAIR_LAYER) diff --git a/code/modules/mob/living/carbon/inventory.dm b/code/modules/mob/living/carbon/inventory.dm index e5673817b277..9e8792402298 100644 --- a/code/modules/mob/living/carbon/inventory.dm +++ b/code/modules/mob/living/carbon/inventory.dm @@ -16,6 +16,7 @@ throw_alert(ALERT_LEGCUFFED, /atom/movable/screen/alert/restrained/legcuffed, new_master = handcuffed) else clear_alert(ALERT_LEGCUFFED) + set_movement_intent(MOVE_INTENT_RUN) update_inv_legcuffed() diff --git a/code/modules/mob/living/carbon/xenomorph/Embryo.dm b/code/modules/mob/living/carbon/xenomorph/Embryo.dm index 63e910a008a8..ddc4e979d09c 100644 --- a/code/modules/mob/living/carbon/xenomorph/Embryo.dm +++ b/code/modules/mob/living/carbon/xenomorph/Embryo.dm @@ -16,6 +16,8 @@ var/hugger_ckey /// The total time the person is hugged divided by stages until burst var/per_stage_hugged_time = 90 //Set in Initialize due to config + /// How How many units of stims are drained per tick + var/stim_drain = 2 /obj/item/alien_embryo/Initialize(mapload, ...) . = ..() @@ -84,8 +86,11 @@ var/datum/hive_status/hive = GLOB.hive_datum[hivenumber] var/is_nested = HAS_TRAIT(affected_mob, TRAIT_NESTED) - if(is_nested && !(affected_mob.stat & DEAD) && stage <= 3 && affected_mob.reagents && affected_mob.reagents.get_reagent_amount("host_stabilizer") < 1) - affected_mob.reagents.add_reagent("host_stabilizer", 1) + if(is_nested && !(affected_mob.stat & DEAD) && stage <= 3 && affected_mob.reagents) + if(affected_mob.reagents.get_reagent_amount("host_stabilizer") < 1) + affected_mob.reagents.add_reagent("host_stabilizer", 1) + for(var/datum/reagent/generated/stim in affected_mob.reagents.reagent_list) + affected_mob.reagents.remove_reagent(stim.id, stim_drain, TRUE) //Low temperature seriously hampers larva growth (as in, way below livable), so does stasis if(!hive.hardcore) // Cannot progress if the hive has entered hardcore mode. @@ -180,9 +185,9 @@ // If the bursted person themselves has Xeno enabled, they get the honor of first dibs on the new larva. if((!isyautja(affected_mob) || (isyautja(affected_mob) && prob(20))) && is_nested) - if(affected_mob.first_xeno || (affected_mob.client?.prefs?.be_special & BE_ALIEN_AFTER_DEATH && !jobban_isbanned(affected_mob, JOB_XENOMORPH))) + if(affected_mob.first_xeno || (affected_mob.client?.prefs?.be_special & BE_ALIEN && !jobban_isbanned(affected_mob, JOB_XENOMORPH))) picked = affected_mob - else if(affected_mob.mind?.ghost_mob && affected_mob.client?.prefs?.be_special & BE_ALIEN_AFTER_DEATH && !jobban_isbanned(affected_mob, JOB_XENOMORPH)) + else if(affected_mob.mind?.ghost_mob && affected_mob.client?.prefs?.be_special & BE_ALIEN && !jobban_isbanned(affected_mob, JOB_XENOMORPH)) picked = affected_mob.mind.ghost_mob // This currently doesn't look possible else if(affected_mob.persistent_ckey) for(var/mob/dead/observer/cur_obs as anything in GLOB.observer_list) @@ -190,7 +195,7 @@ continue if(cur_obs.ckey != affected_mob.persistent_ckey) continue - if(cur_obs.client?.prefs?.be_special & BE_ALIEN_AFTER_DEATH && !jobban_isbanned(cur_obs, JOB_XENOMORPH)) + if(cur_obs.client?.prefs?.be_special & BE_ALIEN && !jobban_isbanned(cur_obs, JOB_XENOMORPH)) picked = cur_obs break @@ -252,7 +257,7 @@ new_xeno = new(affected_mob) if(hive) - hive.add_xeno(new_xeno) + new_xeno.set_hive_and_update(hive.hivenumber) if(!affected_mob.first_xeno && hive.hive_location && !ismonkey(affected_mob)) hive.increase_larva_after_burst(is_nested) hive.hive_ui.update_burrowed_larva() @@ -279,7 +284,7 @@ to_chat(new_xeno, "Talk in Hivemind using ; (e.g. ';My life for the queen!')") playsound_client(new_xeno.client, 'sound/effects/xeno_newlarva.ogg', 25, 1) - // Inform observers to grab some popcorn if it isnt nested + // Inform observers to grab some popcorn if it isn't nested if(!HAS_TRAIT(affected_mob, TRAIT_NESTED)) var/area/burst_area = get_area(src) var/area_text = burst_area ? " at [burst_area]" : "" @@ -332,8 +337,9 @@ for(var/mob/living/carbon/xenomorph/larva/larva_embryo in victim) var/datum/hive_status/hive = GLOB.hive_datum[larva_embryo.hivenumber] - larva_embryo.forceMove(get_turf(victim)) //moved to the turf directly so we don't get stuck inside a cryopod or another mob container. larva_embryo.grant_spawn_protection(1 SECONDS) + larva_embryo.forceMove(get_turf(victim)) //moved to the turf directly so we don't get stuck inside a cryopod or another mob container. + SEND_SIGNAL(larva_embryo, COMSIG_MOVABLE_Z_CHANGED, 0, (get_turf(victim)).z) playsound(larva_embryo, pick('sound/voice/alien_chestburst.ogg','sound/voice/alien_chestburst2.ogg'), 25) if(larva_embryo.client) @@ -380,6 +386,7 @@ O = victim_human.internal_organs_by_name[i] victim_human.internal_organs_by_name -= i victim_human.internal_organs -= O - victim.death(cause) // Certain species were still surviving bursting (predators), DEFINITELY kill them this time. + victim_human.undefibbable = TRUE victim.chestburst = 2 victim.update_burst() + victim.death(cause) // Certain species were still surviving bursting (predators), DEFINITELY kill them this time. diff --git a/code/modules/mob/living/carbon/xenomorph/Evolution.dm b/code/modules/mob/living/carbon/xenomorph/Evolution.dm index 10d2589e67e4..9597df4ecc30 100644 --- a/code/modules/mob/living/carbon/xenomorph/Evolution.dm +++ b/code/modules/mob/living/carbon/xenomorph/Evolution.dm @@ -32,6 +32,8 @@ GLOBAL_LIST_EMPTY(deevolved_ckeys) if(caste_type == XENO_CASTE_DRONE && !SSobjectives.first_drop_complete) castes_available = caste.early_evolves_to.Copy() + castes_available -= hive.blacklisted_castes + for(var/caste in castes_available) if(GLOB.xeno_datum_list[caste].minimum_evolve_time > ROUND_TIME) castes_available -= caste @@ -48,13 +50,17 @@ GLOBAL_LIST_EMPTY(deevolved_ckeys) for(var/caste in castes_available) fancy_caste_list[caste] = hive.evolution_menu_images[caste] - castepick = show_radial_menu(src, client?.eye, fancy_caste_list) + castepick = show_radial_menu(src, client?.get_eye(), fancy_caste_list) if(!castepick) //Changed my mind return if(SEND_SIGNAL(src, COMSIG_XENO_TRY_EVOLVE, castepick) & COMPONENT_OVERRIDE_EVOLVE) return // Message will be handled by component + if(castepick in hive.blacklisted_castes) + to_chat(src, SPAN_WARNING("The Hive cannot support this caste!")) + return + var/datum/caste_datum/caste_datum = GLOB.xeno_datum_list[castepick] if(caste_datum && caste_datum.minimum_evolve_time > ROUND_TIME) to_chat(src, SPAN_WARNING("The Hive cannot support this caste yet! ([floor((caste_datum.minimum_evolve_time - ROUND_TIME) / 10)] seconds remaining)")) @@ -71,10 +77,6 @@ GLOBAL_LIST_EMPTY(deevolved_ckeys) return if(castepick == XENO_CASTE_QUEEN) //Special case for dealing with queenae - if(hardcore) - to_chat(src, SPAN_WARNING("Nuh-uhh.")) - return - if(SSticker.mode && hive.xeno_queen_timer > world.time) to_chat(src, SPAN_WARNING("We must wait about [DisplayTimeText(hive.xeno_queen_timer - world.time, 1)] for the hive to recover from the previous Queen's death.")) return @@ -88,6 +90,16 @@ GLOBAL_LIST_EMPTY(deevolved_ckeys) to_chat(src, SPAN_WARNING("We require more plasma! Currently at: [plasma_stored] / [required_plasma].")) return + if(Check_WO()) + if(castepick != XENO_CASTE_QUEEN) //Prevent evolutions into T2s and T3s in WO + to_chat(src, SPAN_WARNING ("The Hive can only support evolving into Queens!")) + return + on_mob_jump() + forceMove(get_turf(pick(GLOB.queen_spawns))) + else if(hardcore) + to_chat(src, SPAN_WARNING("Nuh-uhh.")) + return + if(evolution_threshold && castepick != XENO_CASTE_QUEEN) //Does the caste have an evolution timer? Then check it if(evolution_stored < evolution_threshold) to_chat(src, SPAN_WARNING("We must wait before evolving. Currently at: [evolution_stored] / [evolution_threshold].")) @@ -130,7 +142,7 @@ GLOBAL_LIST_EMPTY(deevolved_ckeys) to_chat(src, SPAN_WARNING("There already is a Queen.")) return if(!hive.allow_queen_evolve) - to_chat(src, SPAN_WARNING("We can't find the strength to evolve into a Queen")) + to_chat(src, SPAN_WARNING("We can't find the strength to evolve into a Queen.")) return else if(!can_evolve(castepick, potential_queens)) return @@ -175,7 +187,7 @@ GLOBAL_LIST_EMPTY(deevolved_ckeys) new_xeno.generate_name() if(new_xeno.client) new_xeno.set_lighting_alpha(level_to_switch_to) - if(new_xeno.health - getBruteLoss(src) - getFireLoss(src) > 0) //Cmon, don't kill the new one! Shouldnt be possible though + if(new_xeno.health - getBruteLoss(src) - getFireLoss(src) > 0) //Cmon, don't kill the new one! Shouldn't be possible though new_xeno.bruteloss = bruteloss //Transfers the damage over. new_xeno.fireloss = fireloss //Transfers the damage over. new_xeno.updatehealth() @@ -240,10 +252,6 @@ GLOBAL_LIST_EMPTY(deevolved_ckeys) to_chat(src, SPAN_WARNING("Our link to the hive is being suppressed...we should wait a bit.")) return FALSE - if(hardcore) - to_chat(src, SPAN_WARNING("Nuh-uh.")) - return FALSE - if(lock_evolve) if(banished) to_chat(src, SPAN_WARNING("We are banished and cannot reach the hivemind.")) @@ -271,7 +279,7 @@ GLOBAL_LIST_EMPTY(deevolved_ckeys) to_chat(src, SPAN_WARNING("We cannot evolve while in this stance.")) return FALSE - if(world.time < (SSticker.mode.round_time_lobby + XENO_ROUNDSTART_PROGRESS_TIME_2)) + if(ROUND_TIME < XENO_ROUNDSTART_BOOSTED_EVO_TIME) if(caste_type == XENO_CASTE_LARVA || caste_type == XENO_CASTE_PREDALIEN_LARVA) var/turf/evoturf = get_turf(src) if(!locate(/obj/effect/alien/weeds) in evoturf) @@ -282,7 +290,7 @@ GLOBAL_LIST_EMPTY(deevolved_ckeys) /mob/living/carbon/xenomorph/proc/transmute_verb() set name = "Transmute" - set desc = "Transmute into a different caste of the same tier" + set desc = "Transmute into a different caste of the same tier." set category = "Alien" if(!check_state()) @@ -366,6 +374,10 @@ GLOBAL_LIST_EMPTY(deevolved_ckeys) to_chat(src, SPAN_WARNING("We can't deevolve.")) return FALSE + if(hardcore) + to_chat(src, SPAN_WARNING("We can't deevolve.")) + return FALSE + var/alleged_queens = hive.get_potential_queen_count() if(hive.allow_queen_evolve && !hive.living_xeno_queen && alleged_queens < 2 && isdrone(src)) to_chat(src, SPAN_XENONOTICE("The hive currently has no sister able to become Queen! The survival of the hive requires you to be a Drone!")) @@ -407,7 +419,7 @@ GLOBAL_LIST_EMPTY(deevolved_ckeys) GLOB.deevolved_ckeys += new_xeno.ckey /mob/living/carbon/xenomorph/proc/transmute(newcaste, message="We regress into our previous form.") - // We have to delete the organ before creating the new xeno because all old_xeno contents are dropped to the ground on Initalize() + // We have to delete the organ before creating the new xeno because all old_xeno contents are dropped to the ground on Initialize() var/obj/item/organ/xeno/organ = locate() in src if(!isnull(organ)) qdel(organ) @@ -440,8 +452,8 @@ GLOBAL_LIST_EMPTY(deevolved_ckeys) new_xeno.key = key if(new_xeno.client) new_xeno.client.change_view(GLOB.world_view_size) - new_xeno.client.pixel_x = 0 - new_xeno.client.pixel_y = 0 + new_xeno.client.set_pixel_x(0) + new_xeno.client.set_pixel_y(0) //Regenerate the new mob's name now that our player is inside if(newcaste == XENO_CASTE_LARVA) diff --git a/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm b/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm index 3fac8948b905..83e514c5e432 100644 --- a/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm +++ b/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm @@ -8,6 +8,7 @@ name = "facehugger" desc = "It has some sort of a tube at the end of its tail." icon = 'icons/mob/xenos/effects.dmi' + flags_obj = OBJ_IS_HELMET_GARB item_icons = list( WEAR_FACE = 'icons/mob/humans/onmob/clothing/masks/objects.dmi', WEAR_AS_GARB = 'icons/mob/humans/onmob/clothing/helmet_garb/misc.dmi', @@ -38,6 +39,8 @@ var/hivenumber = XENO_HIVE_NORMAL var/flags_embryo = NO_FLAGS var/impregnated = FALSE + /// How many units of stims are drained upon hugging + var/stim_drain = 30 /// The timer for the hugger to jump /// at the nearest human @@ -53,20 +56,21 @@ var/death_timer var/icon_xeno = 'icons/mob/xenos/effects.dmi' - var/icon_xenonid = 'icons/mob/xenonids/castes/tier_0/xenonid_crab.dmi' + var/icon_xenonid = 'icons/mob/xenos/effects_xenoids.dmi' /obj/item/clothing/mask/facehugger/Initialize(mapload, hive) . = ..() - var/new_icon = icon_xeno if (hive) hivenumber = hive - var/datum/hive_status/hive_s = GLOB.hive_datum[hivenumber] - if(HAS_TRAIT(hive_s, TRAIT_XENONID)) - new_icon = icon_xenonid + for(var/trait in hive_s.hive_inherited_traits) + ADD_TRAIT(src, trait, TRAIT_SOURCE_HIVE) - icon = new_icon set_hive_data(src, hivenumber) + if(HAS_TRAIT(src, TRAIT_NO_COLOR)) + color = null + if(HAS_TRAIT(src, TRAIT_XENONID)) + icon = icon_xenonid go_active() if (hivenumber != XENO_HIVE_TUTORIAL) @@ -314,6 +318,8 @@ if(!sterile) if(!human.species || !(human.species.flags & IS_SYNTHETIC)) //synthetics aren't paralyzed human.apply_effect(MIN_IMPREGNATION_TIME * 0.5 * knockout_mod, PARALYZE) //THIS MIGHT NEED TWEAKS + for(var/datum/reagent/generated/stim in human.reagents.reagent_list) // Banish them stims + human.reagents.remove_reagent(stim.id, stim_drain, TRUE) var/area/hug_area = get_area(src) var/name = hugger ? "[hugger]" : "\a [src]" @@ -548,11 +554,14 @@ m_helmet.add_hugger_damage() update_inv_head() - if(!wear_mask) + /// Don't need to continue if no mask or already can't infect. + if(!wear_mask || !can_infect) return can_infect var/obj/item/clothing/mask/W = wear_mask - if(istype(W)) + if(!istype(W)) + drop_inv_item_on_ground(wear_mask) // drop any item from the face that isn't being checked for anti-hug. + else if(W.flags_item & NODROP) return FALSE @@ -571,7 +580,6 @@ else visible_message(SPAN_DANGER("[hugger] smashes against [src]'s [W.name] and rips it off!")) drop_inv_item_on_ground(W) - return can_infect /datum/species/proc/handle_hugger_attachment(mob/living/carbon/human/target, obj/item/clothing/mask/facehugger/hugger, mob/living/carbon/xenomorph/facehugger/mob_hugger) diff --git a/code/modules/mob/living/carbon/xenomorph/Powers.dm b/code/modules/mob/living/carbon/xenomorph/Powers.dm index d1e5c4cf8f09..f43f824708e3 100644 --- a/code/modules/mob/living/carbon/xenomorph/Powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/Powers.dm @@ -277,5 +277,5 @@ for(var/mob/living/carbon/xenomorph/X in hive.totalXenos) to_chat(X, SPAN_XENOANNOUNCE("[src.name] has declared: [NM.mark_meaning.desc] in [sanitize_area(current_area_name)]! (Watch) (Track)")) - //this is killing the tgui chat and I dont know why + //this is killing the tgui chat and I don't know why return TRUE diff --git a/code/modules/mob/living/carbon/xenomorph/XenoAttacks.dm b/code/modules/mob/living/carbon/xenomorph/XenoAttacks.dm index 250b4495a7ad..cf25fadeef89 100644 --- a/code/modules/mob/living/carbon/xenomorph/XenoAttacks.dm +++ b/code/modules/mob/living/carbon/xenomorph/XenoAttacks.dm @@ -14,7 +14,7 @@ M.flick_attack_overlay(src, "punch") visible_message(SPAN_DANGER("[S] [S.attacktext] [src]!"), null, null, 5, CHAT_TYPE_MELEE_HIT) var/damage = rand(S.melee_damage_lower, S.melee_damage_upper) - apply_damage(damage, BRUTE) + apply_damage(damage, BRUTE, enviro=TRUE) last_damage_data = create_cause_data(initial(M.name), M) S.attack_log += text("\[[time_stamp()]\] attacked [key_name(src)]") attack_log += text("\[[time_stamp()]\] was attacked by [key_name(S)]") @@ -172,7 +172,7 @@ if(xeno.behavior_delegate) damage = xeno.behavior_delegate.melee_attack_modify_damage(damage, src) - //Frenzy auras stack in a way, then the raw value is multipled by two to get the additive modifier + //Frenzy auras stack in a way, then the raw value is multiplied by two to get the additive modifier if(xeno.frenzy_aura > 0) damage += (xeno.frenzy_aura * FRENZY_DAMAGE_MULTIPLIER) diff --git a/code/modules/mob/living/carbon/xenomorph/XenoOverwatch.dm b/code/modules/mob/living/carbon/xenomorph/XenoOverwatch.dm index 94b058dd60b4..d80e3ecf4ed9 100644 --- a/code/modules/mob/living/carbon/xenomorph/XenoOverwatch.dm +++ b/code/modules/mob/living/carbon/xenomorph/XenoOverwatch.dm @@ -177,7 +177,7 @@ // Is our observed xeno configured and are we alive? if(observed_xeno && !stat) client.perspective = EYE_PERSPECTIVE - client.eye = observed_xeno + client.set_eye(observed_xeno) // Handle HREF clicks through hive status and hivemind /mob/living/carbon/xenomorph/Topic(href, href_list) diff --git a/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm b/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm index 5a9b099f2123..b2dc61b608c6 100644 --- a/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm +++ b/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm @@ -117,28 +117,41 @@ else if(!(caste_type == XENO_CASTE_QUEEN)) . += "Queen's Location: [hive.living_xeno_queen.loc.loc.name]" - if(hive.slashing_allowed == XENO_SLASH_ALLOWED) + if (CHECK_MULTIPLE_BITFIELDS(hive.hive_flags, XENO_SLASH_ALLOW_ALL)) . += "Slashing: PERMITTED" + else if (HAS_FLAG(hive.hive_flags, XENO_SLASH_NORMAL)) + . += "Slashing: RESTRICTED AGAINST INFECTED" else . += "Slashing: FORBIDDEN" - if(hive.construction_allowed == XENO_LEADER) - . += "Construction Placement: LEADERS" - else if(hive.construction_allowed == NORMAL_XENO) - . += "Construction Placement: ANYONE" - else if(hive.construction_allowed == XENO_NOBODY) - . += "Construction Placement: NOBODY" + var/str_builder = "NOBODY" + if (CHECK_MULTIPLE_BITFIELDS(hive.hive_flags, XENO_CONSTRUCTION_ALLOW_ALL)) + str_builder = "ANYONE" else - . += "Construction Placement: QUEEN" - - if(hive.destruction_allowed == XENO_LEADER) - . += "Special Structure Destruction: LEADERS" - else if(hive.destruction_allowed == NORMAL_XENO) - . += "Special Structure Destruction: BUILDERS and LEADERS" - else if(hive.construction_allowed == XENO_NOBODY) - . += "Construction Placement: NOBODY" + if (HAS_FLAG(hive.hive_flags, XENO_CONSTRUCTION_QUEEN)) + str_builder = "QUEEN" + if (HAS_FLAG(hive.hive_flags, XENO_CONSTRUCTION_LEADERS)) + str_builder += " and " + if (HAS_FLAG(hive.hive_flags, XENO_CONSTRUCTION_LEADERS)) + str_builder += "LEADERS" + . += "Special Structure Placement: [str_builder]" + + str_builder = "NOBODY" + if (CHECK_MULTIPLE_BITFIELDS(hive.hive_flags, XENO_DECONSTRUCTION_ALLOW_ALL)) + str_builder = "ANYONE" else - . += "Special Structure Destruction: QUEEN" + if (HAS_FLAG(hive.hive_flags, XENO_DECONSTRUCTION_QUEEN)) + str_builder = "QUEEN" + if (HAS_FLAG(hive.hive_flags, XENO_DECONSTRUCTION_LEADERS)) + str_builder += " and " + if (HAS_FLAG(hive.hive_flags, XENO_DECONSTRUCTION_LEADERS)) + str_builder += "LEADERS" + . += "Special Structure Destruction: [str_builder]" + + if (HAS_FLAG(hive.hive_flags, XENO_UNNESTING_RESTRICTED)) + . += "Unnesting: BUILDERS" + else + . += "Unnesting: ANYONE" if(hive.hive_orders) . += "Hive Orders: [hive.hive_orders]" @@ -300,10 +313,10 @@ throwing = FALSE return - if (pounceAction.can_be_shield_blocked) + if(pounceAction.can_be_shield_blocked) if(ishuman(M) && (M.dir in reverse_nearby_direction(dir))) var/mob/living/carbon/human/H = M - if(H.check_shields(15, "the pounce")) //Human shield block. + if(H.check_shields("the pounce", get_dir(H, src), attack_type = SHIELD_ATTACK_POUNCE, custom_response = TRUE)) //Human shield block. visible_message(SPAN_DANGER("[src] slams into [H]!"), SPAN_XENODANGER("We slam into [H]!"), null, 5) KnockDown(1) @@ -312,20 +325,13 @@ playsound(H, "bonk", 75, FALSE) //bonk return - if(isyautja(H)) - if(H.check_shields(0, "the pounce", 1)) - visible_message(SPAN_DANGER("[H] blocks the pounce of [src] with the combistick!"), SPAN_XENODANGER("[H] blocks our pouncing form with the combistick!"), null, 5) - apply_effect(3, WEAKEN) - throwing = FALSE - playsound(H, "bonk", 75, FALSE) - return - else if(prob(75)) //Body slam the fuck out of xenos jumping at your front. - visible_message(SPAN_DANGER("[H] body slams [src]!"), - SPAN_XENODANGER("[H] body slams us!"), null, 5) - KnockDown(3) - Stun(3) - throwing = FALSE - return + if(isyautja(H) && prob(75))//Body slam the fuck out of xenos jumping at your front. + visible_message(SPAN_DANGER("[H] body slams [src]!"), + SPAN_XENODANGER("[H] body slams us!"), null, 5) + KnockDown(3) + Stun(3) + throwing = FALSE + return if(iscolonysynthetic(H) && prob(60)) visible_message(SPAN_DANGER("[H] withstands being pounced and slams down [src]!"), SPAN_XENODANGER("[H] throws us down after withstanding the pounce!"), null, 5) @@ -572,12 +578,12 @@ if(SSticker?.mode?.hardcore) nocrit = TRUE if(wowave < 15) - maxHealth = ((maxHealth+abs(crit_health))*(wowave/15)*(3/4))+((maxHealth)*1/4) //if it's wo we give xeno's less hp in lower rounds. This makes help the marines feel good. - health = ((health+abs(crit_health))*(wowave/15)*(3/4))+((health)*1/4) //if it's wo we give xeno's less hp in lower rounds. This makes help the marines feel good. + maxHealth = ((maxHealth+abs(health_threshold_dead))*(wowave/15)*(3/4))+((maxHealth)*1/4) //if it's wo we give xeno's less hp in lower rounds. This makes help the marines feel good. + health = ((health+abs(health_threshold_dead))*(wowave/15)*(3/4))+((health)*1/4) //if it's wo we give xeno's less hp in lower rounds. This makes help the marines feel good. else - maxHealth = maxHealth+abs(crit_health) // From round 15 and on we give them only a slight boost - health = health+abs(crit_health) // From round 15 and on we give them only a slight boost - crit_health = -1 // Do not put this at 0 or xeno's will just vanish on WO due to how the garbage collector works. + maxHealth = maxHealth+abs(health_threshold_dead) // From round 15 and on we give them only a slight boost + health = health+abs(health_threshold_dead) // From round 15 and on we give them only a slight boost + health_threshold_dead = -1 // Do not put this at 0 or xeno's will just vanish on WO due to how the garbage collector works. // Handle queued actions. @@ -654,7 +660,7 @@ if(HAS_TRAIT(src, TRAIT_ABILITY_BURROWED)) return FALSE - if(caste.fire_immunity & FIRE_IMMUNITY_NO_DAMAGE) + if(fire_immunity & (FIRE_IMMUNITY_NO_DAMAGE || FIRE_IMMUNITY_COMPLETE)) burn_amount *= 0.5 apply_damage(burn_amount, BURN) @@ -687,9 +693,9 @@ target.xenos_tracking |= src tracked_marker = target to_chat(src, SPAN_XENONOTICE("We start tracking the [target.mark_meaning.name] resin mark.")) - to_chat(src, SPAN_INFO("Shift click the compass to watch the mark, alt click to stop tracking")) + to_chat(src, SPAN_INFO("Shift click the compass to watch the mark, alt click to stop tracking.")) -/mob/living/carbon/xenomorph/proc/stop_tracking_resin_mark(destroyed, silent = FALSE) //tracked_marker shouldnt be nulled outside this PROC!! >:C +/mob/living/carbon/xenomorph/proc/stop_tracking_resin_mark(destroyed, silent = FALSE) //tracked_marker shouldn't be nulled outside this PROC!! >:C if(QDELETED(src)) return diff --git a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm index e6702223e54b..4091a7cf2349 100644 --- a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm +++ b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm @@ -84,7 +84,7 @@ var/slash_sound = "alien_claw_flesh" health = 5 maxHealth = 5 - var/crit_health = -100 // What negative healthy they die in. + health_threshold_dead = -100 // What negative healthy they die in. var/gib_chance = 5 // % chance of them exploding when taking damage. Goes up with damage inflicted. speed = -0.5 // Speed. Positive makes you go slower. (1.5 is equivalent to FAT mutation) can_crawl = FALSE @@ -133,6 +133,11 @@ var/weed_level = WEED_LEVEL_STANDARD var/acid_level = 0 + // Fire Immunity/Vulnerability/Resistance + // Basically copies of the respective vars on caste_datum for referance simplicity + var/fire_immunity = FIRE_IMMUNITY_NONE + var/fire_modifier_mult = 0 + /// The xeno's strain, if they've taken one. var/datum/xeno_strain/strain = null @@ -155,8 +160,6 @@ var/tier = 1 //This will track their "tier" to restrict/limit evolutions var/time_of_birth - var/pslash_delay = 0 - var/hardcore = 0 //Set to 1 in New() when Whiskey Outpost is active. Prevents queen evolution and deactivates dchat death messages ///Can the xeno rest and passively heal? @@ -182,6 +185,9 @@ /// this is the resin mark that is currently being tracked by the xeno var/obj/effect/alien/resin/marker/tracked_marker + ///The type of minimap this xeno has access too + var/datum/action/minimap/minimap_type = /datum/action/minimap/xeno + var/datum/weakref/minimap_ref ////////////////////////////////////////////////////////////////// // @@ -318,6 +324,8 @@ var/icon_xeno var/icon_xenonid + var/xenonid_pixel_x + var/xenonid_pixel_y /// Stores the overlay icon for spitting/drooling when acid-based abilities are selected var/acid_overlay @@ -418,25 +426,15 @@ old_xeno.iff_tag = null if(hive) - for(var/trait in hive.hive_inherant_traits) + for(var/trait in hive.hive_inherited_traits) ADD_TRAIT(src, trait, TRAIT_SOURCE_HIVE) //Set caste stuff if(caste_type && GLOB.xeno_datum_list[caste_type]) caste = GLOB.xeno_datum_list[caste_type] - //Fire immunity signals - if (HAS_FLAG(caste.fire_immunity, FIRE_IMMUNITY_NO_DAMAGE | FIRE_IMMUNITY_NO_IGNITE | FIRE_IMMUNITY_XENO_FRENZY)) - if(caste.fire_immunity & FIRE_IMMUNITY_NO_IGNITE) - RegisterSignal(src, COMSIG_LIVING_PREIGNITION, PROC_REF(fire_immune)) - - RegisterSignal(src, list(COMSIG_LIVING_FLAMER_CROSSED, COMSIG_LIVING_FLAMER_FLAMED), PROC_REF(flamer_crossed_immune)) - else - UnregisterSignal(src, list( - COMSIG_LIVING_PREIGNITION, - COMSIG_LIVING_FLAMER_CROSSED, - COMSIG_LIVING_FLAMER_FLAMED - )) + //Fire immunity stuff + set_initial_fire_immunity() if(caste.spit_types && length(caste.spit_types)) ammo = GLOB.ammo_list[caste.spit_types[1]] @@ -486,17 +484,16 @@ SStracking.start_tracking("hive_[src.hivenumber]", src) //WO GAMEMODE - if(SSticker?.mode?.hardcore) //Prevents healing and queen evolution + if(SSticker?.mode?.hardcore) hardcore = TRUE - can_heal = FALSE time_of_birth = world.time //Minimap - if(z && hivenumber != XENO_HIVE_TUTORIAL) + if(hivenumber != XENO_HIVE_TUTORIAL) INVOKE_NEXT_TICK(src, PROC_REF(add_minimap_marker)) //Sight - sight |= SEE_MOBS + sight |= (SEE_MOBS|SEE_BLACKNESS|SEE_TURFS) see_invisible = SEE_INVISIBLE_LIVING see_in_dark = 12 @@ -521,6 +518,13 @@ if (hive && hive.hive_ui) hive.hive_ui.update_all_xeno_data() + if(hive.hivenumber != XENO_HIVE_NORMAL) + remove_verb(src, /mob/living/carbon/xenomorph/verb/view_tacmaps) + minimap_ref = WEAKREF(new minimap_type(hive_number=hive.hivenumber)) + var/datum/action/minimap/ref = minimap_ref.resolve() + ref.give_to(src, ref) + RegisterSignal(hive, COMSIG_XENO_REVEAL_TACMAP, PROC_REF(update_minimap_see_humans)) + creation_time = world.time Decorate() @@ -528,6 +532,14 @@ RegisterSignal(src, COMSIG_MOB_SCREECH_ACT, PROC_REF(handle_screech_act)) SEND_GLOBAL_SIGNAL(COMSIG_GLOB_XENO_SPAWN, src) +/mob/living/carbon/xenomorph/proc/update_minimap_see_humans() + var/datum/action/minimap/ref = minimap_ref.resolve() + ref.remove_from(src) + + minimap_ref = WEAKREF(new /datum/action/minimap/xeno/see_humans) + ref = minimap_ref.resolve() + ref.give_to(src, ref) + /mob/living/carbon/xenomorph/proc/handle_screech_act(mob/self, mob/living/carbon/xenomorph/queen/queen) SIGNAL_HANDLER if(queen.can_not_harm(src)) @@ -538,10 +550,16 @@ /mob/living/carbon/xenomorph/proc/add_minimap_marker(flags) if(!flags) flags = get_minimap_flag_for_faction(hivenumber) + + var/image/background = image('icons/ui_icons/map_blips.dmi', null, caste.minimap_background) + var/image/xeno = image('icons/ui_icons/map_blips.dmi', null, caste.minimap_icon) + background.overlays += xeno if(IS_XENO_LEADER(src)) - SSminimaps.add_marker(src, z, hud_flags = flags, given_image = caste.get_minimap_icon(), overlay_iconstates = list(caste.minimap_leadered_overlay)) + var/image/overlay = image('icons/ui_icons/map_blips.dmi', null, "xenoleader") + background.overlays += overlay + SSminimaps.add_marker(src, flags, background) return - SSminimaps.add_marker(src, z, hud_flags = flags, given_image = caste.get_minimap_icon()) + SSminimaps.add_marker(src, flags, background) /mob/living/carbon/xenomorph/initialize_pass_flags(datum/pass_flags_container/PF) ..() @@ -555,27 +573,136 @@ /mob/living/carbon/xenomorph/initialize_stamina() stamina = new /datum/stamina/none(src) -/mob/living/carbon/xenomorph/proc/fire_immune(mob/living/L) +// Fire Immunity Signal Procs +// No Damage - Can be set on fire, but will not take damage. No preignition proc. +/mob/living/carbon/xenomorph/proc/flamer_cross_no_damage(mob/living/carbon/xenomorph/xeno, datum/reagent/reagent_thing) + SIGNAL_HANDLER + + if(reagent_thing.fire_penetrating) + return + + . = COMPONENT_NO_BURN + + if(fire_immunity & FIRE_IMMUNITY_XENO_FRENZY) + . |= COMPONENT_XENO_FRENZY + +// No Ignition - Cannot be set on fire, but will take damage. Has preignition and flamer proc +/mob/living/carbon/xenomorph/proc/preignition_no_ignition(mob/living/carbon/xenomorph/xeno) SIGNAL_HANDLER - if(L.fire_reagent?.fire_penetrating && !HAS_TRAIT(src, TRAIT_ABILITY_BURROWED)) + if(xeno.fire_reagent?.fire_penetrating && !HAS_TRAIT(src, TRAIT_ABILITY_BURROWED)) return return COMPONENT_CANCEL_IGNITION -/mob/living/carbon/xenomorph/proc/flamer_crossed_immune(mob/living/L, datum/reagent/R) +/mob/living/carbon/xenomorph/proc/flamer_cross_no_ignition(mob/living/carbon/xenomorph/xeno, datum/reagent/reagent_thing) SIGNAL_HANDLER - if(R.fire_penetrating) + if(reagent_thing.fire_penetrating) return - . = COMPONENT_NO_BURN - // Burrowed xenos also cannot be ignited - if((caste.fire_immunity & FIRE_IMMUNITY_NO_IGNITE) || HAS_TRAIT(src, TRAIT_ABILITY_BURROWED)) - . |= COMPONENT_NO_IGNITE - if(caste.fire_immunity & FIRE_IMMUNITY_XENO_FRENZY) + . |= COMPONENT_NO_IGNITE + + if(fire_immunity & FIRE_IMMUNITY_XENO_FRENZY) + . |= COMPONENT_XENO_FRENZY + +// Complete Immunity - Cannot be set on fire and will not take damage +/mob/living/carbon/xenomorph/proc/preignition_complete_immunity(mob/living/carbon/xenomorph/xeno) + SIGNAL_HANDLER + + if(xeno.fire_reagent?.fire_penetrating && !HAS_TRAIT(src, TRAIT_ABILITY_BURROWED)) + return + + return COMPONENT_CANCEL_IGNITION + +/mob/living/carbon/xenomorph/proc/flamer_cross_complete_immunity(mob/living/carbon/xenomorph/xeno, datum/reagent/reagent_thing) + SIGNAL_HANDLER + + if(reagent_thing.fire_penetrating) + return + + . |= COMPONENT_NO_IGNITE + . |= COMPONENT_NO_BURN + + if(fire_immunity & FIRE_IMMUNITY_XENO_FRENZY) + . |= COMPONENT_XENO_FRENZY + +// Burrower Immunity - Same as Complete Immunity, however requires TRAIT_ABILITY_BURROWED for effects to kick in +/mob/living/carbon/xenomorph/proc/preignition_burrower_immunity(mob/living/carbon/xenomorph/xeno) + SIGNAL_HANDLER + + if(!HAS_TRAIT(xeno, TRAIT_ABILITY_BURROWED)) + return + + if(xeno.fire_reagent?.fire_penetrating && !HAS_TRAIT(src, TRAIT_ABILITY_BURROWED)) + return + + return COMPONENT_CANCEL_IGNITION + +/mob/living/carbon/xenomorph/proc/flamer_cross_burrower_immunity(mob/living/carbon/xenomorph/xeno, datum/reagent/reagent_thing) + SIGNAL_HANDLER + + if(!HAS_TRAIT(xeno, TRAIT_ABILITY_BURROWED)) + return + + if(reagent_thing.fire_penetrating) + return + + . |= COMPONENT_NO_IGNITE + . |= COMPONENT_NO_BURN + + if(fire_immunity & FIRE_IMMUNITY_XENO_FRENZY) . |= COMPONENT_XENO_FRENZY +/// Registers the caste_datum's fire immunity info onto the mob, then adds signals. The mob immunity is what gets altered by strains and/or other things. +/mob/living/carbon/xenomorph/proc/set_initial_fire_immunity() + fire_immunity = caste.fire_immunity + fire_modifier_mult = caste.fire_modifier_mult + add_fire_immunity_signals() + +/// Removes any registered signals, re-registers the the caste_datum's initial fire immunity info onto the mob, then reapplies signals. +/// As the caste info should *NOT* be changed by anything, this is more of an admin failsafe to make *absolutely sure* that the Xeno is back to initial fire immunity should something go wrong somehow. +/mob/living/carbon/xenomorph/proc/reset_to_initial_fire_immunity() + remove_fire_immunity_signals() + fire_immunity = initial(caste.fire_immunity) + fire_modifier_mult = initial(caste.fire_modifier_mult) + add_fire_immunity_signals() + +/// Removes and readds fire immunity signals. This is to account for frequently shifting immunities, like hivebuff. +/mob/living/carbon/xenomorph/proc/refresh_fire_immunity() + remove_fire_immunity_signals() + add_fire_immunity_signals() + +/// The actual proc that adds fire immunity signals based on fire immunity flags registered to the Xenomorph. +/mob/living/carbon/xenomorph/proc/add_fire_immunity_signals() + var/valid_immunity = fire_immunity + if(fire_immunity & FIRE_IMMUNITY_XENO_FRENZY) + valid_immunity -= FIRE_IMMUNITY_XENO_FRENZY + + switch(valid_immunity) + if(FIRE_IMMUNITY_NO_DAMAGE) + RegisterSignal(src, list(COMSIG_LIVING_FLAMER_CROSSED, COMSIG_LIVING_FLAMER_FLAMED), PROC_REF(flamer_cross_no_damage)) + + if(FIRE_IMMUNITY_NO_IGNITE) + RegisterSignal(src, COMSIG_LIVING_PREIGNITION, PROC_REF(preignition_no_ignition)) + RegisterSignal(src, list(COMSIG_LIVING_FLAMER_CROSSED, COMSIG_LIVING_FLAMER_FLAMED), PROC_REF(flamer_cross_no_ignition)) + + if(FIRE_IMMUNITY_COMPLETE) + RegisterSignal(src, COMSIG_LIVING_PREIGNITION, PROC_REF(preignition_complete_immunity)) + RegisterSignal(src, list(COMSIG_LIVING_FLAMER_CROSSED, COMSIG_LIVING_FLAMER_FLAMED), PROC_REF(flamer_cross_complete_immunity)) + + if(FIRE_IMMUNITY_BURROWER) + RegisterSignal(src, COMSIG_LIVING_PREIGNITION, PROC_REF(preignition_burrower_immunity)) + RegisterSignal(src, list(COMSIG_LIVING_FLAMER_CROSSED, COMSIG_LIVING_FLAMER_FLAMED), PROC_REF(flamer_cross_burrower_immunity)) + +/// Removes all fire immunity related signals on a Xenomorph. +/mob/living/carbon/xenomorph/proc/remove_fire_immunity_signals() + UnregisterSignal(src, list( + COMSIG_LIVING_PREIGNITION, + COMSIG_LIVING_FLAMER_CROSSED, + COMSIG_LIVING_FLAMER_FLAMED + )) + //Off-load this proc so it can be called freely //Since Xenos change names like they change shoes, we need somewhere to hammer in all those legos //We set their name first, then update their real_name AND their mind name @@ -604,8 +731,6 @@ name_client_postfix = client.xeno_postfix ? ("-"+client.xeno_postfix) : "" age_xeno() full_designation = "[name_client_prefix][nicknumber][name_client_postfix]" - if(!HAS_TRAIT(src, TRAIT_NO_COLOR)) - color = in_hive.color var/age_display = show_age_prefix ? age_prefix : "" var/name_display = "" @@ -785,9 +910,12 @@ var/mob/living/carbon/human/H = puller if(H.ally_of_hivenumber(hivenumber)) return TRUE - puller.apply_effect(rand(caste.tacklestrength_min,caste.tacklestrength_max), WEAKEN) playsound(puller.loc, 'sound/weapons/pierce.ogg', 25, 1) puller.visible_message(SPAN_WARNING("[puller] tried to pull [src] but instead gets a tail swipe to the head!")) + if(stealth) + puller.apply_effect(caste.tacklestrength_min, WEAKEN) + return FALSE + puller.apply_effect(rand(caste.tacklestrength_min,caste.tacklestrength_max), WEAKEN) return FALSE if(issynth(puller) && (mob_size >= 4 || istype(src, /mob/living/carbon/xenomorph/warrior))) var/mob/living/carbon/human/synthetic/puller_synth = puller @@ -845,7 +973,7 @@ /mob/living/carbon/xenomorph/get_eye_protection() return EYE_PROTECTION_WELDING -/mob/living/carbon/xenomorph/get_pull_miltiplier() +/mob/living/carbon/xenomorph/get_pull_multiplier() return pull_multiplier /mob/living/carbon/xenomorph/proc/set_faction(new_faction = FACTION_XENOMORPH) @@ -862,7 +990,7 @@ new_hive.add_xeno(src) - for(var/trait in new_hive.hive_inherant_traits) + for(var/trait in new_hive.hive_inherited_traits) ADD_TRAIT(src, trait, TRAIT_SOURCE_HIVE) generate_name() @@ -902,6 +1030,7 @@ recalculate_damage() recalculate_evasion() recalculate_tackle() + recalculate_fire_immunity() /mob/living/carbon/xenomorph/proc/recalculate_tackle() tackle_min = caste.tackle_min @@ -912,7 +1041,10 @@ /mob/living/carbon/xenomorph/proc/recalculate_health() var/new_max_health = nocrit ? health_modifier + maxHealth : health_modifier + caste.max_health - if (new_max_health == maxHealth) + if(hive) + new_max_health += hive.hive_stat_modifier_flat["health"] + new_max_health *= hive.hive_stat_modifier_multiplier["health"] + if(new_max_health == maxHealth) return var/currentHealthRatio = 1 if(health < maxHealth) @@ -928,6 +1060,11 @@ var/new_plasma_max = plasmapool_modifier * caste.plasma_max plasma_gain = plasmagain_modifier + caste.plasma_gain + if(hive) + new_plasma_max += hive.hive_stat_modifier_flat["plasmapool"] + new_plasma_max *= hive.hive_stat_modifier_multiplier["plasmapool"] + plasma_gain += hive.hive_stat_modifier_flat["plasmagain"] + plasma_gain *= hive.hive_stat_modifier_multiplier["plasmagain"] if (new_plasma_max == plasma_max) return var/plasma_ratio = plasma_stored / plasma_max @@ -939,6 +1076,9 @@ /mob/living/carbon/xenomorph/proc/recalculate_speed() recalculate_move_delay = TRUE speed = speed_modifier + if(hive) + speed += hive.hive_stat_modifier_flat["speed"] + speed *= hive.hive_stat_modifier_multiplier["speed"] if(caste) speed += caste.speed SEND_SIGNAL(src, COMSIG_XENO_RECALCULATE_SPEED) @@ -947,6 +1087,11 @@ //We are calculating it in a roundabout way not to give anyone 100% armor deflection, so we're dividing the differences armor_deflection = armor_modifier + floor(100 - (100 - caste.armor_deflection)) armor_explosive_buff = explosivearmor_modifier + if(hive) + armor_deflection += hive.hive_stat_modifier_flat["armor"] + armor_deflection *= hive.hive_stat_modifier_multiplier["armor"] + armor_explosive_buff += hive.hive_stat_modifier_flat["explosivearmor"] + armor_explosive_buff *= hive.hive_stat_modifier_multiplier["explosivearmor"] /mob/living/carbon/xenomorph/proc/recalculate_damage() melee_damage_lower = damage_modifier @@ -956,10 +1101,22 @@ melee_damage_lower += caste.melee_damage_lower melee_damage_upper += caste.melee_damage_upper melee_vehicle_damage += caste.melee_vehicle_damage + if(hive) + melee_damage_lower += hive.hive_stat_modifier_flat["damage"] + melee_damage_upper += hive.hive_stat_modifier_flat["damage"] + melee_vehicle_damage += hive.hive_stat_modifier_flat["damage"] + melee_damage_lower *= hive.hive_stat_modifier_multiplier["damage"] + melee_damage_upper *= hive.hive_stat_modifier_multiplier["damage"] + melee_vehicle_damage *= hive.hive_stat_modifier_multiplier["damage"] /mob/living/carbon/xenomorph/proc/recalculate_evasion() if(caste) evasion = evasion_modifier + caste.evasion + if(hive) + evasion += hive.hive_stat_modifier_flat["evasion"] + evasion *= hive.hive_stat_modifier_multiplier["evasion"] + +/mob/living/carbon/xenomorph/proc/recalculate_fire_immunity() /mob/living/carbon/xenomorph/proc/recalculate_actions() recalculate_acid() @@ -1069,7 +1226,7 @@ . = ..() if (. & IGNITE_IGNITED) RegisterSignal(src, COMSIG_XENO_PRE_HEAL, PROC_REF(cancel_heal)) - if(!caste || !(caste.fire_immunity & FIRE_IMMUNITY_NO_DAMAGE) || fire_reagent.fire_penetrating) + if(!(fire_immunity & (FIRE_IMMUNITY_NO_DAMAGE || FIRE_IMMUNITY_COMPLETE)) || fire_reagent.fire_penetrating) INVOKE_ASYNC(src, TYPE_PROC_REF(/mob, emote), "roar") /mob/living/carbon/xenomorph/ExtinguishMob() @@ -1087,9 +1244,9 @@ if(length(resin_build_order)) selected_resin = resin_build_order[1] -/mob/living/carbon/xenomorph/ghostize(can_reenter_corpse = TRUE, aghosted = FALSE) +/mob/living/carbon/xenomorph/ghostize(can_reenter_corpse = TRUE, aghosted = FALSE, transfer = FALSE) . = ..() - if(. && !can_reenter_corpse && stat != DEAD && !QDELETED(src) && !should_block_game_interaction(src)) + if(. && !can_reenter_corpse && !transfer && stat != DEAD && !QDELETED(src) && !should_block_game_interaction(src)) handle_ghost_message() if(selected_ability) selected_ability.action_deselect() @@ -1159,3 +1316,47 @@ if(new_player.mind) new_player.mind_initialize() new_player.mind.transfer_to(target, TRUE) + +/** + * Checks if user can mount src + * + * Arguments: + * * user - The mob trying to mount + * * target_mounting - Is the target initiating the mounting process? + */ +/mob/living/carbon/xenomorph/proc/can_mount(mob/living/user, target_mounting = FALSE) + return FALSE + +/** + * Handles the target trying to ride src + * + * Arguments: + * * target - The mob being put on the back + * * target_mounting - Is the target initiating the mounting process? + */ +/mob/living/carbon/xenomorph/proc/carry_target(mob/living/carbon/target, target_mounting = FALSE) + if(!ismob(target)) + return + if(target.is_mob_incapacitated()) + if(target_mounting) + to_chat(target, SPAN_XENOWARNING("You cannot mount [src]!")) + return + to_chat(src, SPAN_XENOWARNING("[target] cannot mount you!")) + return + visible_message(SPAN_NOTICE("[target_mounting ? "[target] starts to mount [src]" : "[src] starts hoisting [target] onto [p_their()] back..."]"), + SPAN_NOTICE("[target_mounting ? "[target] starts to mount on your back" : "You start to lift [target] onto your back..."]")) + if(!do_after(target_mounting ? target : src, 5 SECONDS, NONE, BUSY_ICON_HOSTILE, target_mounting ? src : target)) + visible_message(SPAN_WARNING("[target_mounting ? "[target] fails to mount on [src]" : "[src] fails to carry [target]!"]")) + return + //Second check to make sure they're still valid to be carried + if(target.is_mob_incapacitated()) + return + buckle_mob(target, usr, target_hands_needed = 1) + +/mob/living/carbon/xenomorph/MouseDrop_T(atom/dropping, mob/user) + . = ..() + if(isxeno(user)) + return + if(!can_mount(user, TRUE)) + return + INVOKE_ASYNC(src, PROC_REF(carry_target), dropping, TRUE) // target_mounting is always true, the runner should never be buckling someone to itself (unless someone wants to make it happen) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm b/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm index 69027af7b1b3..2933838155e9 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm @@ -182,22 +182,23 @@ return if(!client) return + QDEL_NULL(observed_atom) is_zoomed = 1 client.change_view(viewsize) var/viewoffset = 32 * tileoffset switch(dir) if(NORTH) - client.pixel_x = 0 - client.pixel_y = viewoffset + client.set_pixel_x(0) + client.set_pixel_y(viewoffset) if(SOUTH) - client.pixel_x = 0 - client.pixel_y = -viewoffset + client.set_pixel_x(0) + client.set_pixel_y(-viewoffset) if(EAST) - client.pixel_x = viewoffset - client.pixel_y = 0 + client.set_pixel_x(viewoffset) + client.set_pixel_y(0) if(WEST) - client.pixel_x = -viewoffset - client.pixel_y = 0 + client.set_pixel_x(-viewoffset) + client.set_pixel_y(0) for (var/datum/action/xeno_action/onclick/toggle_long_range/action in actions) action.on_zoom_in() @@ -207,8 +208,8 @@ if(!client) return client.change_view(GLOB.world_view_size) - client.pixel_x = 0 - client.pixel_y = 0 + client.set_pixel_x(0) + client.set_pixel_y(0) is_zoomed = 0 // Since theres several ways we can get here, we need to update the ability button state and handle action's specific effects for (var/datum/action/xeno_action/onclick/toggle_long_range/action in actions) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_abilities.dm index c3bd10c693e1..0ea27be28d18 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_abilities.dm @@ -14,10 +14,6 @@ if(!action_cooldown_check()) return - if(SSticker?.mode?.hardcore) - to_chat(xenomorph, SPAN_XENOWARNING("A certain presence is preventing us from burrowing here.")) - return - if(HAS_TRAIT(xenomorph, TRAIT_ABILITY_BURROWED)) xenomorph.tunnel(get_turf(A)) else @@ -41,4 +37,3 @@ action_type = XENO_ACTION_ACTIVATE //doesn't really need a macro xeno_cooldown = 4 MINUTES cooldown_message = "We can dig a tunnel again." - diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/crusher/crusher_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/crusher/crusher_abilities.dm index df3145bf305c..eae9b09a1855 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/crusher/crusher_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/crusher/crusher_abilities.dm @@ -21,7 +21,7 @@ tracks_target = FALSE var/direct_hit_damage = 60 var/frontal_armor = 15 - // Object types that dont reduce cooldown when hit + // Object types that don't reduce cooldown when hit var/list/not_reducing_objects = list() diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_abilities.dm index 1b40dedd4e7d..f9af963abccf 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_abilities.dm @@ -50,6 +50,7 @@ /datum/action/xeno_action/activable/tail_stab/slam name = "Tail Slam" + action_icon_state = "tail_slam" blunt_stab = TRUE /datum/action/xeno_action/onclick/soak diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_macros.dm b/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_macros.dm index 7e27141c202b..d63bcfa9453a 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_macros.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_macros.dm @@ -33,4 +33,3 @@ set hidden = TRUE var/action_name = "Soak" handle_xeno_macro(src, action_name) - diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/despoiler/despoiler_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/despoiler/despoiler_abilities.dm new file mode 100644 index 000000000000..ec4a4c77bea1 --- /dev/null +++ b/code/modules/mob/living/carbon/xenomorph/abilities/despoiler/despoiler_abilities.dm @@ -0,0 +1,30 @@ +/datum/action/xeno_action/activable/xeno_spit/despoiler + xeno_cooldown = 5 SECONDS + ability_primacy = XENO_PRIMARY_ACTION_1 + plasma_cost = 75 + +/datum/action/xeno_action/onclick/corrosive_slash + name = "Corrosive Slash" + action_icon_state = "corrosive_slash" + macro_path = /datum/action/xeno_action/verb/corrosive_slash + ability_primacy = XENO_PRIMARY_ACTION_2 + action_type = XENO_ACTION_ACTIVATE + xeno_cooldown = 12 SECONDS + plasma_cost = 100 + + var/buff_duration = 5 SECONDS + var/slash_speedup = 2 + +/datum/action/xeno_action/activable/tail_stab/despoiler + name = "Finishing Acid Stab" + charge_time = 2 SECONDS + + +/datum/action/xeno_action/onclick/decomposing_enzymes + name = "Decomposing Enzymes" + action_icon_state = "decomposing_enzymes" + macro_path = /datum/action_xeno_action/verb/decomposing_enzymes + xeno_cooldown = 24 SECONDS + plasma_cost = 50 + ability_primacy = XENO_PRIMARY_ACTION_3 + diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/despoiler/despoiler_macros.dm b/code/modules/mob/living/carbon/xenomorph/abilities/despoiler/despoiler_macros.dm new file mode 100644 index 000000000000..e9ac5099e74e --- /dev/null +++ b/code/modules/mob/living/carbon/xenomorph/abilities/despoiler/despoiler_macros.dm @@ -0,0 +1,13 @@ +/datum/action/xeno_action/verb/corrosive_slash() + set category = "Alien" + set name = "Empower Slashes" + set hidden = TRUE + var/action_name = "Empower Slashes" + handle_xeno_macro(src, action_name) + +/datum/action_xeno_action/verb/decomposing_enzymes() + set category = "Alien" + set name = "Decomposing enzymes" + set hidden = TRUE + var/action_name = "Decomposing enzymes" + handle_xeno_macro(src, action_name) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_powers.dm index 6eef21c6d5af..b034ec2164be 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_powers.dm @@ -20,7 +20,7 @@ did_hug = facehugger.handle_hug(L) log_attack("[key_name] [did_hug ? "successfully hugged" : "tried to hug"] [key_name(L)] (Pounce Distance: [facehugger.pounce_distance]) at [get_location_in_text(L)]") -/datum/action/xeno_action/activable/pounce/facehugger/use_ability() +/datum/action/xeno_action/activable/pounce/facehugger/use_ability(atom/target) for(var/obj/structure/machinery/door/airlock/current_airlock in get_turf(owner)) if(current_airlock.density) //if its CLOSED YOU'RE SCUTTLING AND CANNOT POUNCE!!! to_chat(owner, SPAN_WARNING("We cannot do that while squeezing and scuttling!")) @@ -29,7 +29,7 @@ if(HAS_TRAIT(owner, TRAIT_IMMOBILIZED)) to_chat(owner, SPAN_WARNING("We cannot do that while immobilized!")) return FALSE - + return ..() /datum/action/xeno_action/onclick/toggle_long_range/facehugger/on_zoom_out() diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm index 96175188e2d0..c163db244e0e 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm @@ -89,6 +89,11 @@ action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_3 + /// In addition to the cooldown on building, you also get an increased cooldown after canceling that building. + var/xeno_cooldown_interrupt_modifier = 3 + /// Something went wrong, for example, you can't build here + var/xeno_cooldown_fail = 1 + /// Placement time increase modifier var/build_speed_mod = 1 plasma_cost = 1 @@ -334,7 +339,7 @@ if(movement_slowdown) xeno.speed_modifier -= movement_slowdown xeno.recalculate_speed() - button.icon_state = "template" + button.icon_state = "template_xeno" /datum/action/xeno_action/onclick/toggle_long_range/proc/on_zoom_in() return @@ -400,7 +405,7 @@ /datum/action/xeno_action/onclick/xenohide/can_use_action() var/mob/living/carbon/xenomorph/xeno = owner - if(xeno && !xeno.buckled && !xeno.is_mob_incapacitated()) + if(xeno && !xeno.buckled && !xeno.is_mob_incapacitated() && !LAZYLEN(xeno.buckled_mobs)) if(!(SEND_SIGNAL(xeno, COMSIG_LIVING_SHIMMY_LAYER) & COMSIG_LIVING_SHIMMY_LAYER_CANCEL)) return TRUE @@ -410,7 +415,7 @@ UnregisterSignal(xeno, COMSIG_MOB_STATCHANGE) if(xeno.layer == XENO_HIDING_LAYER) xeno.layer = initial(xeno.layer) - button.icon_state = "template" + button.icon_state = "template_xeno" xeno.update_wounds() xeno.update_layer() apply_cooldown(4) //2 second cooldown after attacking @@ -522,85 +527,6 @@ if(xeno && !xeno.is_mob_incapacitated() || !xeno.buckled || !xeno.evolving && xeno.plasma_stored >= plasma_cost) return TRUE - -/datum/action/xeno_action/onclick/tacmap - name = "View Tactical Map" - action_icon_state = "toggle_queen_zoom" - - var/mob/living/carbon/xenomorph/queen/tracked_queen - var/hivenumber - -/datum/action/xeno_action/onclick/tacmap/Destroy() - tracked_queen = null - return ..() - -/datum/action/xeno_action/onclick/tacmap/give_to(mob/living/carbon/xenomorph/xeno) - . = ..() - - hivenumber = xeno.hive.hivenumber - RegisterSignal(xeno.hive, COMSIG_HIVE_NEW_QUEEN, PROC_REF(handle_new_queen)) - RegisterSignal(xeno.hive, COMSIG_XENO_REVEAL_TACMAP, PROC_REF(handle_unhide_tacmap)) - - if(!xeno.hive.living_xeno_queen && !xeno.hive.allow_no_queen_actions) - hide_from(xeno) - return - - if(!xeno.hive.living_xeno_queen?.ovipositor && !xeno.hive.tacmap_requires_queen_ovi) - hide_from(xeno) - - handle_new_queen(new_queen = xeno.hive.living_xeno_queen) - -/datum/action/xeno_action/onclick/tacmap/remove_from(mob/living/carbon/xenomorph/xeno) - . = ..() - UnregisterSignal(GLOB.hive_datum[hivenumber], COMSIG_HIVE_NEW_QUEEN) - -/// handles the addition of a new queen, hiding if appropriate -/datum/action/xeno_action/onclick/tacmap/proc/handle_new_queen(datum/hive_status/hive, mob/living/carbon/xenomorph/queen/new_queen) - SIGNAL_HANDLER - - if(tracked_queen) - UnregisterSignal(tracked_queen, list(COMSIG_QUEEN_MOUNT_OVIPOSITOR, COMSIG_QUEEN_DISMOUNT_OVIPOSITOR)) - - tracked_queen = new_queen - - if(!tracked_queen?.ovipositor) - hide_from(owner) - - RegisterSignal(tracked_queen, COMSIG_QUEEN_MOUNT_OVIPOSITOR, PROC_REF(handle_mount_ovipositor)) - RegisterSignal(tracked_queen, COMSIG_QUEEN_DISMOUNT_OVIPOSITOR, PROC_REF(handle_dismount_ovipositor)) - -/// deals with the queen mounting the ovipositor, unhiding the action from the user -/datum/action/xeno_action/onclick/tacmap/proc/handle_mount_ovipositor() - SIGNAL_HANDLER - - unhide_from(owner) - -/// deals with the queen dismounting the ovipositor, hiding the action from the user -/datum/action/xeno_action/onclick/tacmap/proc/handle_dismount_ovipositor() - SIGNAL_HANDLER - - var/mob/living/carbon/xenomorph/xeno = owner - if(xeno.hive?.tacmap_requires_queen_ovi) - hide_from(owner) - -/datum/action/xeno_action/onclick/tacmap/proc/handle_unhide_tacmap() - SIGNAL_HANDLER - - unhide_from(owner) - -/datum/action/xeno_action/onclick/tacmap/can_use_action() - if(!owner) - return FALSE - var/mob/living/carbon/xenomorph/xeno = owner - if(xeno.is_mob_incapacitated() || xeno.dazed) - return FALSE - return TRUE - -/datum/action/xeno_action/onclick/tacmap/use_ability(atom/target) - var/mob/living/carbon/xenomorph/xeno = owner - xeno.xeno_tacmap() - return ..() - /datum/action/xeno_action/active_toggle/toggle_meson_vision name = "Toggle Meson Vision" action_icon_state = "project_xeno" @@ -610,11 +536,11 @@ /datum/action/xeno_action/active_toggle/toggle_meson_vision/enable_toggle() . = ..() - owner.sight |= SEE_TURFS + owner.hud_used.plane_masters["[BLACKNESS_PLANE]"].alpha = 0 /datum/action/xeno_action/active_toggle/toggle_meson_vision/disable_toggle() . = ..() - owner.sight &= ~SEE_TURFS + owner.hud_used.plane_masters["[BLACKNESS_PLANE]"].alpha = 255 /mob/living/carbon/xenomorph/proc/add_abilities() if(!base_actions) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm index 800da1d10c3e..22b4855896af 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm @@ -31,9 +31,21 @@ return var/obj/effect/alien/weeds/node/node = locate() in turf - if(node && node.weed_strength >= xeno.weed_level) - to_chat(xeno, SPAN_WARNING("There's a pod here already!")) - return + if(node) + if(node.weed_strength > xeno.weed_level) + to_chat(xeno, SPAN_WARNING("The node here is too strong to uproot.")) + return + + if(node.hivenumber != xeno.hivenumber) + to_chat(xeno, SPAN_WARNING("The other hive's node resists your attempt to uproot it.")) + return + + if(!do_after(xeno, 1 SECONDS, INTERRUPT_ALL, BUSY_ICON_GENERIC, node, INTERRUPT_ALL)) + to_chat(xeno, SPAN_WARNING("There's a pod here already! You decide to not replace it.")) + return + to_chat(xeno, SPAN_NOTICE("We uproot and replace the weed node.")) + playsound(xeno.loc, "alien_resin_break", 25) + qdel(node) var/obj/effect/alien/resin/trap/resin_trap = locate() in turf if(resin_trap) @@ -115,7 +127,7 @@ /datum/action/xeno_action/onclick/xeno_resting/use_ability(atom/target) var/mob/living/carbon/xenomorph/xeno = owner xeno.lay_down() - button.icon_state = xeno.resting ? "template_active" : "template" + button.icon_state = xeno.resting ? "template_active" : "template_xeno" return ..() // Shift spits @@ -255,11 +267,11 @@ switch(xeno_owner.build_resin(target, thick, make_message, plasma_cost != 0, build_speed_mod)) if(SECRETE_RESIN_INTERRUPT) if(xeno_cooldown) - apply_cooldown_override(xeno_cooldown * 3) + apply_cooldown_override(xeno_cooldown * xeno_cooldown_interrupt_modifier) return FALSE if(SECRETE_RESIN_FAIL) if(xeno_cooldown) - apply_cooldown_override(1) + apply_cooldown_override(xeno_cooldown_fail) return FALSE return TRUE @@ -424,7 +436,7 @@ return else var/static/list/phero_selections = list("Help" = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_help"), "Frenzy" = image(icon = 'icons/mob/radial.dmi', icon_state = "phero_frenzy"), "Warding" = image(icon = 'icons/mob/radial.dmi', icon_state = "phero_warding"), "Recovery" = image(icon = 'icons/mob/radial.dmi', icon_state = "phero_recov")) - pheromone = lowertext(show_radial_menu(src, src.client?.eye, phero_selections)) + pheromone = lowertext(show_radial_menu(src, src.client?.get_eye(), phero_selections)) if(pheromone == "help") to_chat(src, SPAN_XENONOTICE("
Pheromones provide a buff to all Xenos in range at the cost of some stored plasma every second, as follows:
Frenzy (Red) - Increased run speed, damage and chance to knock off headhunter masks.
Warding (Green) - While in critical state, increased maximum negative health and slower off weed bleedout.
Recovery (Blue) - Increased plasma and health regeneration.
")) return @@ -448,84 +460,101 @@ for(var/mob/living/carbon/xenomorph/L in hive.xeno_leader_list) L.handle_xeno_leader_pheromones() -/datum/action/xeno_action/activable/pounce/use_ability(atom/A) - var/mob/living/carbon/xenomorph/X = owner +/datum/action/xeno_action/activable/pounce/use_ability(atom/target) + var/mob/living/carbon/xenomorph/xeno = owner if(!action_cooldown_check()) return - if(!A) + if(!target) return - if(A.layer >= FLY_LAYER)//anything above that shouldn't be pounceable (hud stuff) + while(istype(target, /turf/open_space)) + target = SSmapping.get_turf_below(target) + + if(target.layer >= FLY_LAYER)//anything above that shouldn't be pounceable (hud stuff) return - if(!isturf(X.loc)) - to_chat(X, SPAN_XENOWARNING("We can't [action_text] from here!")) + if(!isturf(xeno.loc)) + to_chat(xeno, SPAN_XENOWARNING("We can't [action_text] from here!")) return - if(!X.check_state()) + if(!xeno.check_state()) return - if(X.legcuffed) - to_chat(X, SPAN_XENODANGER("We can't [action_text] with that thing on our leg!")) + if(xeno.legcuffed) + to_chat(xeno, SPAN_XENODANGER("We can't [action_text] with that thing on our leg!")) return if(!check_and_use_plasma_owner()) return - if(X.layer == XENO_HIDING_LAYER) //Xeno is currently hiding, unhide him - var/datum/action/xeno_action/onclick/xenohide/hide = get_action(X, /datum/action/xeno_action/onclick/xenohide) + if(xeno.layer == XENO_HIDING_LAYER) //Xeno is currently hiding, unhide him + var/datum/action/xeno_action/onclick/xenohide/hide = get_action(xeno, /datum/action/xeno_action/onclick/xenohide) if(hide) hide.post_attack() - if(isravager(X)) - X.emote("roar") + if(isravager(xeno)) + xeno.emote("roar") if (!tracks_target) - A = get_turf(A) - - if(A.z != X.z && X.mob_size >= MOB_SIZE_BIG) - if (!do_after(X, 2 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) - return + target = get_turf(target) //everyone gets (extra) timer to pounce up - if(A.z > X.z) - if (!do_after(X, 0.5 SECONDS, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE)) - return + if(target.z != xeno.z) + var/maximum_z = max(target.z, xeno.z) + var/list/turf/path = get_line(locate(xeno.x, xeno.y, maximum_z), locate(target.x, target.y, maximum_z)) + for(var/turf/turf_in_path in path) + while(istype(turf_in_path, /turf/open_space)) + turf_in_path = SSmapping.get_turf_below(turf_in_path) + + if(turf_in_path.density && turf_in_path.turf_flags & TURF_HULL) + to_chat(xeno, SPAN_WARNING("You can't jump over an object in your path.")) + return + for(var/obj/structure/cur_obj in turf_in_path.contents) + if(cur_obj.density && cur_obj.unslashable && cur_obj.unacidable) + to_chat(xeno, SPAN_WARNING("You can't jump over an object in your path.")) + return + if (!do_after(xeno, 0.5 SECONDS, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE)) + return + if(target.z != xeno.z && xeno.mob_size >= MOB_SIZE_BIG) + if (!do_after(xeno, 2 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) + return apply_cooldown() if (windup) - X.set_face_dir(get_cardinal_dir(X, A)) + xeno.set_face_dir(get_cardinal_dir(xeno, target)) if (!windup_interruptable) - ADD_TRAIT(X, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Pounce")) - X.anchored = TRUE + ADD_TRAIT(xeno, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Pounce")) + xeno.anchored = TRUE pre_windup_effects() - if (!do_after(X, windup_duration, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE)) - to_chat(X, SPAN_XENODANGER("We cancel our [action_text]!")) + if (!do_after(xeno, windup_duration, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE)) + to_chat(xeno, SPAN_XENODANGER("We cancel our [action_text]!")) if (!windup_interruptable) - REMOVE_TRAIT(X, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Pounce")) - X.anchored = FALSE + REMOVE_TRAIT(xeno, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Pounce")) + xeno.anchored = FALSE post_windup_effects(interrupted = TRUE) return if (!windup_interruptable) - REMOVE_TRAIT(X, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Pounce")) - X.anchored = FALSE + REMOVE_TRAIT(xeno, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Pounce")) + xeno.anchored = FALSE post_windup_effects() - X.visible_message(SPAN_XENOWARNING("\The [X] [action_text][findtext(action_text, "e", -1) || findtext(action_text, "p", -1) ? "s" : "es"] at [A]!"), SPAN_XENOWARNING("We [action_text] at [A]!")) + xeno.visible_message(SPAN_XENOWARNING("[xeno] [action_text][findtext(action_text, "e", -1) || findtext(action_text, "p", -1) ? "s" : "es"] at [target]!"), SPAN_XENOWARNING("We [action_text] at [target]!")) pre_pounce_effects() - X.pounce_distance = get_dist(X, A) - X.throw_atom(A, distance, throw_speed, X, launch_type = LOW_LAUNCH, pass_flags = pounce_pass_flags, collision_callbacks = pounce_callbacks, tracking=TRUE) - X.update_icons() + xeno.pounce_distance = get_dist(xeno, target) + if(xeno.z != target.z) + xeno.pounce_distance += 2 + xeno.throw_atom(target, distance, throw_speed, xeno, launch_type = LOW_LAUNCH, pass_flags = pounce_pass_flags, collision_callbacks = pounce_callbacks, tracking=TRUE) + xeno.update_icons() additional_effects_always() ..() @@ -596,7 +625,7 @@ else xeno.layer = initial(xeno.layer) to_chat(xeno, SPAN_NOTICE("We have stopped hiding.")) - button.icon_state = "template" + button.icon_state = "template_xeno" UnregisterSignal(xeno, COMSIG_MOB_STATCHANGE) xeno.update_wounds() apply_cooldown() @@ -703,130 +732,143 @@ return alien_weeds -/datum/action/xeno_action/activable/place_construction/use_ability(atom/A) - var/mob/living/carbon/xenomorph/X = owner - if(!X.check_state()) +/datum/action/xeno_action/activable/place_construction/use_ability(atom/target) + var/mob/living/carbon/xenomorph/xeno = owner + if(!xeno.check_state()) return FALSE - if(isstorage(A.loc) || X.contains(A) || istype(A, /atom/movable/screen)) + if(isstorage(target.loc) || xeno.contains(target) || istype(target, /atom/movable/screen)) return FALSE - //Make sure construction is unrestricted - if(X.hive && X.hive.construction_allowed == XENO_LEADER && X.hive_pos == NORMAL_XENO) - to_chat(X, SPAN_WARNING("Construction is currently restricted to Leaders only!")) - return FALSE - else if(X.hive && X.hive.construction_allowed == XENO_QUEEN && !istype(X.caste, /datum/caste_datum/queen)) - to_chat(X, SPAN_WARNING("Construction is currently restricted to Queen only!")) + if(!xeno.hive) return FALSE - else if(X.hive && X.hive.construction_allowed == XENO_NOBODY) - to_chat(X, SPAN_WARNING("The hive is too weak and fragile to have the strength to design constructions.")) + + if(SSticker?.mode?.hardcore) + to_chat(xeno, SPAN_XENOWARNING("The hive is too inexperienced to design constructions.")) return FALSE - var/turf/T = get_turf(A) + //Make sure construction is unrestricted + if(IS_NORMAL_XENO(xeno)) + if(!HAS_FLAG(xeno.hive.hive_flags, XENO_CONSTRUCTION_NORMAL)) + to_chat(xeno, SPAN_WARNING("Construction by normal sisters is currently restricted!")) + return FALSE + else if(IS_XENO_LEADER(xeno)) + if(!HAS_FLAG(xeno.hive.hive_flags, XENO_CONSTRUCTION_LEADERS)) + to_chat(xeno, SPAN_WARNING("Construction by leader sisters is currently restricted!")) + return FALSE + else if(isqueen(xeno)) + if(!HAS_FLAG(xeno.hive.hive_flags, XENO_CONSTRUCTION_QUEEN)) + to_chat(xeno, SPAN_WARNING("We are currently not allowed to designate construction!")) + return FALSE + else + to_chat(xeno, SPAN_DANGER("Something went wrong!")) + CRASH("Something went wrong determining hive_pos during place_construction!") - var/area/AR = get_area(T) - if(isnull(AR) || !(AR.is_resin_allowed)) - if(!AR || AR.flags_area & AREA_UNWEEDABLE) - to_chat(X, SPAN_XENOWARNING("This area is unsuited to host the hive!")) + var/turf/target_turf = get_turf(target) + + var/area/target_area = get_area(target_turf) + if(isnull(target_area) || !(target_area.is_resin_allowed)) + if(!target_area || target_area.flags_area & AREA_UNWEEDABLE) + to_chat(xeno, SPAN_XENOWARNING("This area is unsuited to host the hive!")) return - to_chat(X, SPAN_XENOWARNING("It's too early to spread the hive this far.")) + to_chat(xeno, SPAN_XENOWARNING("It's too early to spread the hive this far.")) return FALSE - if(T.z != X.z) - to_chat(X, SPAN_XENOWARNING("This area is too far away to affect!")) + if(target_turf.z != xeno.z) + to_chat(xeno, SPAN_XENOWARNING("This area is too far away to affect!")) return FALSE - if(SSinterior.in_interior(X)) - to_chat(X, SPAN_XENOWARNING("It's too tight in here to build.")) + if(SSinterior.in_interior(xeno)) + to_chat(xeno, SPAN_XENOWARNING("It's too tight in here to build.")) return FALSE - if(!X.check_alien_construction(T)) + if(!xeno.check_alien_construction(target_turf)) return FALSE var/choice = XENO_STRUCTURE_CORE - if(X.hive.hivecore_cooldown) - to_chat(X, SPAN_WARNING("The weeds are still recovering from the death of the hive core, wait until the weeds have recovered!")) + if(xeno.hive.hivecore_cooldown) + to_chat(xeno, SPAN_WARNING("The weeds are still recovering from the death of the hive core, wait until the weeds have recovered!")) return FALSE - if(X.hive.has_structure(XENO_STRUCTURE_CORE) || !X.hive.can_build_structure(XENO_STRUCTURE_CORE)) - choice = tgui_input_list(X, "Choose a structure to build", "Build structure", X.hive.hive_structure_types + "help", theme = "hive_status") + if(xeno.hive.has_structure(XENO_STRUCTURE_CORE) || !xeno.hive.can_build_structure(XENO_STRUCTURE_CORE)) + choice = tgui_input_list(xeno, "Choose a structure to build", "Build structure", xeno.hive.hive_structure_types + "help", theme = "hive_status") if(!choice) return if(choice == "help") var/message = "Placing a construction node creates a template for special structures that can benefit the hive, which require the insertion of plasma to construct the following:
" - for(var/structure_name in X.hive.hive_structure_types) - var/datum/construction_template/xenomorph/structure_type = X.hive.hive_structure_types[structure_name] + for(var/structure_name in xeno.hive.hive_structure_types) + var/datum/construction_template/xenomorph/structure_type = xeno.hive.hive_structure_types[structure_name] message += "[capitalize_first_letters(structure_name)] - [initial(structure_type.description)]
" - to_chat(X, SPAN_NOTICE(message)) + to_chat(xeno, SPAN_NOTICE(message)) return TRUE - if(!X.check_state(TRUE) || !X.check_plasma(400)) + if(!xeno.check_state(TRUE) || !xeno.check_plasma(400)) return FALSE - var/structure_type = X.hive.hive_structure_types[choice] + var/structure_type = xeno.hive.hive_structure_types[choice] var/datum/construction_template/xenomorph/structure_template = new structure_type() - if(!spacecheck(X, T, structure_template)) + if(!spacecheck(xeno, target_turf, structure_template)) // spacecheck already cleans up the template return FALSE - if((choice == XENO_STRUCTURE_EGGMORPH) && locate(/obj/structure/flora/grass/tallgrass) in T) - to_chat(X, SPAN_WARNING("The tallgrass is preventing us from building the egg morpher!")) + if((choice == XENO_STRUCTURE_EGGMORPH) && locate(/obj/structure/flora/grass/tallgrass) in target_turf) + to_chat(xeno, SPAN_WARNING("The tallgrass is preventing us from building the egg morpher!")) qdel(structure_template) return FALSE - if(!do_after(X, XENO_STRUCTURE_BUILD_TIME, INTERRUPT_NO_NEEDHAND|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) + if(!do_after(xeno, XENO_STRUCTURE_BUILD_TIME, INTERRUPT_NO_NEEDHAND|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) return FALSE - if(!spacecheck(X, T, structure_template)) //doublechecking + if(!spacecheck(xeno, target_turf, structure_template)) //doublechecking // spacecheck already cleans up the template return FALSE - if(choice == XENO_STRUCTURE_CORE && AR.unoviable_timer) - to_chat(X, SPAN_WARNING("This area does not feel right for you to build this in.")) + if(choice == XENO_STRUCTURE_CORE && target_area.unoviable_timer) + to_chat(xeno, SPAN_WARNING("This area does not feel right for you to build this in.")) qdel(structure_template) return FALSE - if((choice == XENO_STRUCTURE_CORE) && isqueen(X) && X.hive.has_structure(XENO_STRUCTURE_CORE)) - if(X.hive.hive_location.hardcore || world.time > XENOMORPH_PRE_SETUP_CUTOFF) - to_chat(X, SPAN_WARNING("We can't rebuild this structure!")) + if((choice == XENO_STRUCTURE_CORE) && isqueen(xeno) && xeno.hive.has_structure(XENO_STRUCTURE_CORE)) + if(xeno.hive.hive_location.hardcore || world.time > XENOMORPH_PRE_SETUP_CUTOFF) + to_chat(xeno, SPAN_WARNING("We can't rebuild this structure!")) qdel(structure_template) return FALSE - if(alert(X, "Are we sure that we want to move the hive and destroy the old hive core?", , "Yes", "No") != "Yes") + if(alert(xeno, "Are we sure that we want to move the hive and destroy the old hive core?", , "Yes", "No") != "Yes") qdel(structure_template) return FALSE - qdel(X.hive.hive_location) - else if(!X.hive.can_build_structure(choice)) - to_chat(X, SPAN_WARNING("We can't build any more [choice]s for the hive.")) + qdel(xeno.hive.hive_location) + else if(!xeno.hive.can_build_structure(choice)) + to_chat(xeno, SPAN_WARNING("We can't build any more [choice]s for the hive.")) qdel(structure_template) return FALSE - if(QDELETED(T)) - to_chat(X, SPAN_WARNING("We cannot build here!")) + if(QDELETED(target_turf)) + to_chat(xeno, SPAN_WARNING("We cannot build here!")) qdel(structure_template) return FALSE - var/queen_on_zlevel = !X.hive.living_xeno_queen || SSmapping.same_z_map(X.hive.living_xeno_queen.z, T.z) + var/queen_on_zlevel = !xeno.hive.living_xeno_queen || SSmapping.same_z_map(xeno.hive.living_xeno_queen.z, target_turf.z) if(!queen_on_zlevel) - to_chat(X, SPAN_WARNING("Our link to the Queen is too weak here. She is on another world.")) + to_chat(xeno, SPAN_WARNING("Our link to the Queen is too weak here. She is on another world.")) qdel(structure_template) return FALSE - if(SSinterior.in_interior(X)) - to_chat(X, SPAN_WARNING("It's too tight in here to build.")) + if(SSinterior.in_interior(xeno)) + to_chat(xeno, SPAN_WARNING("It's too tight in here to build.")) qdel(structure_template) return FALSE - if(T.is_weedable < FULLY_WEEDABLE) - to_chat(X, SPAN_WARNING("\The [T] can't support a [structure_template.name]!")) + if(target_turf.is_weedable < FULLY_WEEDABLE) + to_chat(xeno, SPAN_WARNING("\The [target_turf] can't support a [structure_template.name]!")) qdel(structure_template) return FALSE - var/obj/effect/alien/weeds/weeds = locate() in T + var/obj/effect/alien/weeds/weeds = locate() in target_turf if(weeds?.block_structures >= BLOCK_SPECIAL_STRUCTURES) - to_chat(X, SPAN_WARNING("\The [weeds] block the construction of any special structures!")) + to_chat(xeno, SPAN_WARNING("\The [weeds] block the construction of any special structures!")) qdel(structure_template) return FALSE - X.use_plasma(400) - X.place_construction(T, structure_template) + xeno.use_plasma(400) + xeno.place_construction(target_turf, structure_template) return ..() @@ -1003,7 +1045,7 @@ return TRUE -/mob/living/carbon/xenomorph/proc/can_bombard_turf(atom/target, range = 5, atom/bombard_source) // I couldnt be arsed to do actual raycasting :I This is horribly inaccurate. +/mob/living/carbon/xenomorph/proc/can_bombard_turf(atom/target, range = 5, atom/bombard_source) // I couldn't be arsed to do actual raycasting :I This is horribly inaccurate. if(!bombard_source || !isturf(bombard_source.loc)) to_chat(src, SPAN_XENODANGER("That target is obstructed!")) return FALSE @@ -1057,9 +1099,15 @@ return FALSE if(stabbing_xeno.z != targetted_atom.z) - return + var/turf/xeno_turf = get_turf(stabbing_xeno) + var/turf/xeno_turf_above = SSmapping.get_turf_above(xeno_turf) + var/turf/xeno_turf_below = SSmapping.get_turf_below(xeno_turf) + if(xeno_turf_above?.z != targetted_atom.z && xeno_turf_below?.z != targetted_atom.z) + return var/distance = get_dist(stabbing_xeno, targetted_atom) + if(stabbing_xeno.z != targetted_atom.z) + distance++ if(distance > stab_range) return FALSE @@ -1075,7 +1123,7 @@ var/atom/barrier = path_turf.handle_barriers(stabbing_xeno, null, (PASS_MOB_THRU_XENO|PASS_OVER_THROW_MOB|PASS_TYPE_CRAWLER)) if(barrier != path_turf) - var/tail_stab_cooldown_multiplier = barrier.handle_tail_stab(stabbing_xeno) + var/tail_stab_cooldown_multiplier = barrier.handle_tail_stab(stabbing_xeno, blunt_stab) if(!tail_stab_cooldown_multiplier) to_chat(stabbing_xeno, SPAN_WARNING("There's something blocking our strike!")) else @@ -1083,7 +1131,7 @@ xeno_attack_delay(stabbing_xeno) return FALSE - var/tail_stab_cooldown_multiplier = targetted_atom.handle_tail_stab(stabbing_xeno) + var/tail_stab_cooldown_multiplier = targetted_atom.handle_tail_stab(stabbing_xeno, blunt_stab) if(tail_stab_cooldown_multiplier) stabbing_xeno.animation_attack_on(targetted_atom) apply_cooldown(cooldown_modifier = tail_stab_cooldown_multiplier) @@ -1123,15 +1171,33 @@ /datum/action/xeno_action/activable/tail_stab/proc/pre_ability_act(mob/living/carbon/xenomorph/stabbing_xeno, atom/targetted_atom) return -/datum/action/xeno_action/activable/tail_stab/proc/ability_act(mob/living/carbon/xenomorph/stabbing_xeno, mob/living/carbon/target, obj/limb/limb) - - target.last_damage_data = create_cause_data(initial(stabbing_xeno.caste_type), stabbing_xeno) - - /// To reset the direction if they haven't moved since then in below callback. - var/last_dir = stabbing_xeno.dir +/// This proc plays a tail stab 'animation' by changing the xenomorph's direction, and resets the xenomorph's direction after a short delay. +/mob/living/carbon/xenomorph/proc/tail_stab_animation(target, blunt = FALSE) + // This is the direction the xenomorph is reset to afterwards. + var/last_dir = dir /// Direction var to make the tail stab look cool and immersive. var/stab_direction + if(blunt) + // The xeno smashes the target with their tail, moving it to the side and thus their direction as well. + stab_direction = turn(get_dir(src, target), pick(90, -90)) + else + // The xeno flips around for a second to impale the target with their tail. These look awsome. + stab_direction = turn(get_dir(src, target), 180) + + if(last_dir != stab_direction) + setDir(stab_direction) + addtimer(CALLBACK(src, PROC_REF(reset_direction), last_dir, dir), 0.5 SECONDS) + +/// Reset the xenomorph's direction after the tail stab 'animation', unless they've moved since then +/mob/living/carbon/xenomorph/proc/reset_direction(last_dir, new_dir) + if(new_dir == dir) + setDir(last_dir) + +/datum/action/xeno_action/activable/tail_stab/proc/ability_act(mob/living/carbon/xenomorph/stabbing_xeno, mob/living/carbon/target, obj/limb/limb, apply_behavior_delagate = TRUE) + + target.last_damage_data = create_cause_data(initial(stabbing_xeno.caste_type), stabbing_xeno) + var/stab_overlay if(blunt_stab) @@ -1140,32 +1206,22 @@ playsound(target, 'sound/effects/comical_bonk.ogg', 50, TRUE) else playsound(target, "punch", 50, TRUE) - // The xeno smashes the target with their tail, moving it to the side and thus their direction as well. - stab_direction = turn(stabbing_xeno.dir, pick(90, -90)) stab_overlay = "slam" else stabbing_xeno.visible_message(SPAN_XENOWARNING("\The [stabbing_xeno] skewers [target] through the [limb ? limb.display_name : "chest"] with its razor sharp tail!"), SPAN_XENOWARNING("We skewer [target] through the [limb? limb.display_name : "chest"] with our razor sharp tail!")) playsound(target, "alien_bite", 50, TRUE) - // The xeno flips around for a second to impale the target with their tail. These look awsome. - stab_direction = turn(get_dir(stabbing_xeno, target), 180) stab_overlay = "tail" log_attack("[key_name(stabbing_xeno)] tailstabbed [key_name(target)] at [get_area_name(stabbing_xeno)]") target.attack_log += text("\[[time_stamp()]\] was tailstabbed by [key_name(stabbing_xeno)]") stabbing_xeno.attack_log += text("\[[time_stamp()]\] tailstabbed [key_name(target)]") - if(last_dir != stab_direction) - stabbing_xeno.setDir(stab_direction) - stabbing_xeno.emote("tail") - /// Ditto. - var/new_dir = stabbing_xeno.dir - addtimer(CALLBACK(src, PROC_REF(reset_direction), stabbing_xeno, last_dir, new_dir), 0.5 SECONDS) - + stabbing_xeno.tail_stab_animation(target, blunt_stab) stabbing_xeno.animation_attack_on(target) stabbing_xeno.flick_attack_overlay(target, stab_overlay) var/damage = (stabbing_xeno.melee_damage_upper + stabbing_xeno.frenzy_aura * FRENZY_DAMAGE_MULTIPLIER) * TAILSTAB_MOB_DAMAGE_MULTIPLIER - if(stabbing_xeno.behavior_delegate) + if(stabbing_xeno.behavior_delegate && apply_behavior_delagate) stabbing_xeno.behavior_delegate.melee_attack_additional_effects_target(target) stabbing_xeno.behavior_delegate.melee_attack_additional_effects_self() damage = stabbing_xeno.behavior_delegate.melee_attack_modify_damage(damage, target) @@ -1180,7 +1236,3 @@ target.handle_blood_splatter(get_dir(owner.loc, target.loc)) return target -/datum/action/xeno_action/activable/tail_stab/proc/reset_direction(mob/living/carbon/xenomorph/stabbing_xeno, last_dir, new_dir) - // If the xenomorph is still holding the same direction as the tail stab animation's changed it to, reset it back to the old direction so the xenomorph isn't stuck facing backwards. - if(new_dir == stabbing_xeno.dir) - stabbing_xeno.setDir(last_dir) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_abilities.dm index 0b22d04a29d5..bef374015015 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_abilities.dm @@ -37,7 +37,6 @@ no_cooldown_msg = FALSE // Needed for onclick actions ability_primacy = XENO_SCREECH - /datum/action/xeno_action/activable/queen_give_plasma name = "Give Plasma (400)" action_icon_state = "queen_give_plasma" @@ -173,7 +172,7 @@ hide_from(Q) /datum/action/xeno_action/activable/bombard/queen/get_bombard_source() - var/mob/hologram/queen/H = owner?.client?.eye + var/mob/hologram/queen/H = owner?.client?.get_eye() if(istype(H)) return H return owner diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm index 0f6e87ab0eaa..2b94e79e0a37 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm @@ -75,7 +75,7 @@ if(new_xeno.ckey) GLOB.deevolved_ckeys += new_xeno.ckey -/datum/action/xeno_action/onclick/remove_eggsac/use_ability(atom/A) +/datum/action/xeno_action/onclick/remove_eggsac/use_ability(atom/target) var/mob/living/carbon/xenomorph/queen/X = owner if(!X.check_state()) return @@ -100,7 +100,7 @@ X.dismount_ovipositor() return ..() -/datum/action/xeno_action/onclick/grow_ovipositor/use_ability(atom/Atom) +/datum/action/xeno_action/onclick/grow_ovipositor/use_ability(atom/target) var/mob/living/carbon/xenomorph/queen/xeno = owner if(!xeno.check_state()) return @@ -155,7 +155,7 @@ xeno.mount_ovipositor() return ..() -/datum/action/xeno_action/onclick/set_xeno_lead/use_ability(atom/A) +/datum/action/xeno_action/onclick/set_xeno_lead/use_ability(atom/target) var/mob/living/carbon/xenomorph/queen/xeno = owner if(!xeno.check_state()) return @@ -164,7 +164,7 @@ return var/datum/hive_status/hive = xeno.hive if(xeno.observed_xeno) - if(!length(hive.open_xeno_leader_positions) && xeno.observed_xeno.hive_pos == NORMAL_XENO) + if(!length(hive.open_xeno_leader_positions) && IS_NORMAL_XENO(xeno.observed_xeno)) to_chat(xeno, SPAN_XENOWARNING("You currently have [length(hive.xeno_leader_list)] promoted leaders. You may not maintain additional leaders until your power grows.")) return var/mob/living/carbon/xenomorph/targeted_xeno = xeno.observed_xeno @@ -172,7 +172,7 @@ to_chat(xeno, SPAN_XENOWARNING("You cannot add yourself as a leader!")) return apply_cooldown() - if(targeted_xeno.hive_pos == NORMAL_XENO) + if(IS_NORMAL_XENO(targeted_xeno)) if(!hive.add_hive_leader(targeted_xeno)) to_chat(xeno, SPAN_XENOWARNING("Unable to add the leader.")) return @@ -192,7 +192,7 @@ if(length(possible_xenos) > 1) var/mob/living/carbon/xenomorph/selected_xeno = tgui_input_list(xeno, "Target", "Watch which leader?", possible_xenos, theme="hive_status") - if(!selected_xeno || selected_xeno.hive_pos == NORMAL_XENO || selected_xeno == xeno.observed_xeno || selected_xeno.stat == DEAD || !xeno.check_state()) + if(!selected_xeno || IS_NORMAL_XENO(selected_xeno) || selected_xeno == xeno.observed_xeno || selected_xeno.stat == DEAD || !xeno.check_state()) return xeno.overwatch(selected_xeno) else if(length(possible_xenos)) @@ -201,49 +201,49 @@ to_chat(xeno, SPAN_XENOWARNING("There are no Xenomorph leaders. Overwatch a Xenomorph to make it a leader.")) return ..() -/datum/action/xeno_action/activable/queen_heal/use_ability(atom/A, verbose) - var/mob/living/carbon/xenomorph/queen/X = owner - if(!X.check_state()) +/datum/action/xeno_action/activable/queen_heal/use_ability(atom/target, verbose) + var/mob/living/carbon/xenomorph/queen/queen = owner + if(!queen.check_state()) return if(!action_cooldown_check()) return - var/turf/T = get_turf(A) - if(!T) - to_chat(X, SPAN_WARNING("You must select a valid turf to heal around.")) + var/turf/target_turf = get_turf(target) + if(!target_turf) + to_chat(queen, SPAN_WARNING("You must select a valid turf to heal around.")) return - if(!SSmapping.same_z_map(X.loc.z, T.loc.z)) - to_chat(X, SPAN_XENOWARNING("You are too far away to do this here.")) + if(!SSmapping.same_z_map(queen.loc.z, target_turf.loc.z)) + to_chat(queen, SPAN_XENOWARNING("You are too far away to do this here.")) return if(!check_and_use_plasma_owner()) return - for(var/mob/living/carbon/xenomorph/Xa in range(4, T)) - if(!X.can_not_harm(Xa)) + for(var/mob/living/carbon/xenomorph/current_xeno in range(4, target_turf)) + if(!queen.can_not_harm(current_xeno)) continue - if(SEND_SIGNAL(Xa, COMSIG_XENO_PRE_HEAL) & COMPONENT_CANCEL_XENO_HEAL) + if(SEND_SIGNAL(current_xeno, COMSIG_XENO_PRE_HEAL) & COMPONENT_CANCEL_XENO_HEAL) if(verbose) - to_chat(X, SPAN_XENOMINORWARNING("You cannot heal [Xa]!")) + to_chat(queen, SPAN_XENOMINORWARNING("You cannot heal [current_xeno]!")) continue - if(Xa == X) + if(current_xeno == queen) continue - if(Xa.stat == DEAD || QDELETED(Xa)) + if(current_xeno.stat == DEAD || QDELETED(current_xeno)) continue - if(!Xa.caste.can_be_queen_healed) + if(!current_xeno.caste.can_be_queen_healed) continue - new /datum/effects/heal_over_time(Xa, Xa.maxHealth * 0.3, 2 SECONDS, 2) - Xa.flick_heal_overlay(3 SECONDS, "#D9F500") //it's already hard enough to gauge health without hp overlays! + new /datum/effects/heal_over_time(current_xeno, current_xeno.maxHealth * 0.3, 2 SECONDS, 2) + current_xeno.flick_heal_overlay(3 SECONDS, "#D9F500") //it's already hard enough to gauge health without hp overlays! apply_cooldown() - to_chat(X, SPAN_XENONOTICE("You channel your plasma to heal your sisters' wounds around this area.")) + to_chat(queen, SPAN_XENONOTICE("You channel your plasma to heal your sisters' wounds around this area.")) return ..() /datum/action/xeno_action/onclick/manage_hive/proc/give_evo_points() @@ -324,7 +324,7 @@ xeno.use_plasma(plasma_cost_jelly) return -/datum/action/xeno_action/onclick/send_thoughts/use_ability(atom/Atom) +/datum/action/xeno_action/onclick/send_thoughts/use_ability(atom/target) var/mob/living/carbon/xenomorph/queen/thought_sender = owner var/static/list/options = list( "Psychic Radiance (100)" = icon(/datum/action/xeno_action::icon_file, "psychic_radiance"), @@ -336,7 +336,7 @@ if(thought_sender.client?.prefs.no_radials_preference) choice = tgui_input_list(thought_sender, "Communicate", "Send Thoughts", options, theme="hive_status") else - choice = show_radial_menu(thought_sender, thought_sender?.client.eye, options) + choice = show_radial_menu(thought_sender, thought_sender?.client.get_eye(), options) if(!choice) return @@ -351,10 +351,10 @@ queen_order() return ..() -/datum/action/xeno_action/onclick/manage_hive/use_ability(atom/Atom) +/datum/action/xeno_action/onclick/manage_hive/use_ability(atom/target) var/mob/living/carbon/xenomorph/queen/queen_manager = owner plasma_cost = 0 - var/list/options = list("Banish (500)", "Re-Admit (100)", "De-evolve (500)", "Reward Jelly (500)", "Exchange larva for evolution (100)", "Purchase Buffs") + var/list/options = list("Banish (500)", "Re-Admit (100)", "De-evolve (500)", "Reward Jelly (500)", "Exchange larva for evolution (100)", "Permissions", "Purchase Buffs") if(queen_manager.hive.hivenumber == XENO_HIVE_CORRUPTED) var/datum/hive_status/corrupted/hive = queen_manager.hive options += "Add Personal Ally" @@ -362,7 +362,10 @@ options += "Remove Personal Ally" options += "Clear Personal Allies" - var/choice = tgui_input_list(queen_manager, "Manage The Hive", "Hive Management", options, theme="hive_status") + if(queen_manager.hive.hivenumber == XENO_HIVE_NORMAL) + options += "Edit Tacmap" + + var/choice = tgui_input_list(queen_manager, "Manage The Hive", "Hive Management", options, theme="hive_status") switch(choice) if("Banish (500)") banish() @@ -380,10 +383,37 @@ remove_personal_ally() if("Clear Personal Allies") clear_personal_allies() + if("Permissions") + permissions() if("Purchase Buffs") purchase_buffs() + if("Edit Tacmap") + edit_tacmap() return ..() +/datum/action/xeno_action/onclick/manage_hive/proc/edit_tacmap() + var/mob/living/carbon/xenomorph/queen/xeno = owner + var/datum/component/tacmap/tacmap_component = xeno.GetComponent(/datum/component/tacmap) + + if(xeno in tacmap_component.interactees) + tacmap_component.on_unset_interaction(xeno) + tacmap_component.close_popout_tacmaps(xeno) + else + tacmap_component.show_tacmap(xeno) + +/datum/action/xeno_action/onclick/manage_hive/proc/permissions() + var/mob/living/carbon/xenomorph/queen/xeno = owner + var/choice = tgui_input_list(xeno, "Choose what hive permissions to change.", "Hive Permissions", list("Harming", "Construction", "Deconstruction", "Unnesting"), theme="hive_status") + switch(choice) + if("Harming") + xeno.claw_toggle() + if("Construction") + xeno.construction_toggle() + if("Deconstruction") + xeno.destruction_toggle() + if("Unnesting") + xeno.unnesting_toggle() + /datum/action/xeno_action/onclick/manage_hive/proc/purchase_buffs() var/mob/living/carbon/xenomorph/queen/xeno = owner @@ -411,7 +441,7 @@ else var/tier = HIVEBUFF_TIER_MINOR if(major_available) - tier = show_radial_menu(xeno, xeno?.client?.eye, radial_images_tiers) + tier = show_radial_menu(xeno, xeno?.client?.get_eye(), radial_images_tiers) if(tier == HIVEBUFF_TIER_MAJOR) for(var/filtered_buffname as anything in buffs) @@ -424,7 +454,7 @@ if(initial(filtered_buff.tier) == HIVEBUFF_TIER_MINOR) radial_images[initial(filtered_buff.name)] += image(initial(filtered_buff.hivebuff_radial_dmi), initial(filtered_buff.radial_icon)) - selection = show_radial_menu(xeno, xeno?.client?.eye, radial_images, radius = 72, tooltips = TRUE) + selection = show_radial_menu(xeno, xeno?.client?.get_eye(), radial_images, radius = 72, tooltips = TRUE) if(!selection) return FALSE @@ -462,7 +492,7 @@ var/list/target_list = list() if(!user_xeno.client) return - for(var/mob/living/carbon/human/possible_target in range(7, user_xeno.client.eye)) + for(var/mob/living/carbon/human/possible_target in range(7, user_xeno.client.get_eye())) if(possible_target.stat == DEAD) continue if(possible_target.status_flags & CORRUPTED_ALLY) @@ -545,7 +575,7 @@ to_chat(user_xeno, SPAN_WARNING("We don't have personal allies.")) return - if(tgui_alert(user_xeno, "Are you sure you want to clear personal allies?", "Clear Personal Allies", list("No", "Yes"), 10 SECONDS) != "Yes") + if(tgui_alert(user_xeno, "Are you sure you want to clear personal allies?", "Clear Personal Allies", list("Yes", "No"), 10 SECONDS) != "Yes") return if(!length(hive.personal_allies)) @@ -680,7 +710,7 @@ action_icon_state = "queen_eye" plasma_cost = 0 -/datum/action/xeno_action/onclick/eye/use_ability(atom/A) +/datum/action/xeno_action/onclick/eye/use_ability(atom/target) . = ..() if(!owner) return @@ -699,7 +729,7 @@ recently_built_turfs = null return ..() -/datum/action/xeno_action/activable/expand_weeds/use_ability(atom/atom) +/datum/action/xeno_action/activable/expand_weeds/use_ability(atom/target) var/mob/living/carbon/xenomorph/queen/xeno = owner if(!xeno.check_state()) @@ -708,7 +738,7 @@ if(!action_cooldown_check()) return - var/turf/turf_to_get = get_turf(atom) + var/turf/turf_to_get = get_turf(target) if(!turf_to_get || turf_to_get.is_weedable < FULLY_WEEDABLE || turf_to_get.density || !SSmapping.same_z_map(turf_to_get.z, xeno.z)) to_chat(xeno, SPAN_XENOWARNING("You can't do that here.")) @@ -771,13 +801,6 @@ /datum/action/xeno_action/activable/expand_weeds/proc/reset_turf_cooldown(turf/T) recently_built_turfs -= T - -/mob/living/carbon/xenomorph/proc/xeno_tacmap() - set name = "View Xeno Tacmap" - set desc = "This opens a tactical map, where you can see where every xenomorph is." - set category = "Alien" - hive.tacmap.tgui_interact(src) - /datum/action/xeno_action/onclick/screech/use_ability(atom/target) var/mob/living/carbon/xenomorph/queen/xeno = owner @@ -808,6 +831,8 @@ xeno.visible_message(SPAN_XENOHIGHDANGER("[xeno] emits an ear-splitting guttural roar!")) xeno.create_shriekwave(14) //Adds the visual effect. Wom wom wom, 14 shriekwaves + SScmtv.spectate_event("Queen Screech", xeno, 10 SECONDS) + FOR_DVIEW(var/mob/mob, world.view, owner, HIDE_INVISIBLE_OBSERVER) if(mob && mob.client) if(isxeno(mob)) @@ -918,42 +943,42 @@ ghost.show_message(rendered_message, SHOW_MESSAGE_AUDIBLE) return -/datum/action/xeno_action/activable/queen_give_plasma/use_ability(atom/A) - var/mob/living/carbon/xenomorph/queen/X = owner - if(!X.check_state()) +/datum/action/xeno_action/activable/queen_give_plasma/use_ability(atom/target) + var/mob/living/carbon/xenomorph/queen/queen = owner + if(!queen.check_state()) return if(!action_cooldown_check()) return - var/mob/living/carbon/xenomorph/target = A - if(!istype(target) || target.stat == DEAD) - to_chat(X, SPAN_WARNING("You must target the xeno you want to give plasma to.")) + var/mob/living/carbon/xenomorph/target_xeno = target + if(!istype(target_xeno) || target_xeno.stat == DEAD) + to_chat(queen, SPAN_WARNING("You must target_xeno the xeno you want to give plasma to.")) return - if(target == X) - to_chat(X, SPAN_XENOWARNING("We cannot give plasma to yourself!")) + if(target_xeno == queen) + to_chat(queen, SPAN_XENOWARNING("We cannot give plasma to yourself!")) return - if(!X.can_not_harm(target)) - to_chat(X, SPAN_WARNING("You can only target xenos part of your hive!")) + if(!queen.can_not_harm(target_xeno)) + to_chat(queen, SPAN_WARNING("You can only target_xeno xenos part of your hive!")) return - if(!target.caste.can_be_queen_healed) - to_chat(X, SPAN_XENOWARNING("This caste cannot be given plasma!")) + if(!target_xeno.caste.can_be_queen_healed) + to_chat(queen, SPAN_XENOWARNING("This caste cannot be given plasma!")) return - if(SEND_SIGNAL(target, COMSIG_XENO_PRE_HEAL) & COMPONENT_CANCEL_XENO_HEAL) - to_chat(X, SPAN_XENOWARNING("This xeno cannot be given plasma!")) + if(SEND_SIGNAL(target_xeno, COMSIG_XENO_PRE_HEAL) & COMPONENT_CANCEL_XENO_HEAL) + to_chat(queen, SPAN_XENOWARNING("This xeno cannot be given plasma!")) return if(!check_and_use_plasma_owner()) return - target.gain_plasma(target.plasma_max * 0.75) - target.flick_heal_overlay(3 SECONDS, COLOR_CYAN) + target_xeno.gain_plasma(target_xeno.plasma_max * 0.75) + target_xeno.flick_heal_overlay(3 SECONDS, COLOR_CYAN) apply_cooldown() - to_chat(X, SPAN_XENONOTICE("You transfer some plasma to [target].")) + to_chat(queen, SPAN_XENONOTICE("You transfer some plasma to [target_xeno].")) return ..() /datum/action/xeno_action/onclick/send_thoughts/proc/queen_order() @@ -991,4 +1016,3 @@ // We don't test or apply the cooldown here because the proc does it since verbs can activate it too xeno.hive_message() return ..() - diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/spitter/spitter_macros.dm b/code/modules/mob/living/carbon/xenomorph/abilities/spitter/spitter_macros.dm index 5c3a5dfd423e..3066438eead8 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/spitter/spitter_macros.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/spitter/spitter_macros.dm @@ -1,6 +1,6 @@ /datum/action/xeno_action/verb/verb_charge_spit() set category = "Alien" - set name = "Spitter Frenzy" - set hidden = TRUE - var/action_name = "Dodge" + set name = "Charge Spit" + set hidden = FALSE + var/action_name = "Charge Spit" handle_xeno_macro(src, action_name) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/xeno_action.dm b/code/modules/mob/living/carbon/xenomorph/abilities/xeno_action.dm index c8018a453de0..eaceabb09a7b 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/xeno_action.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/xeno_action.dm @@ -1,5 +1,6 @@ /datum/action/xeno_action icon_file = 'icons/mob/hud/actions_xeno.dmi' + button_icon_state = "template_xeno" var/plasma_cost = 0 var/macro_path var/action_type = XENO_ACTION_CLICK // Determines how macros interact with this action. Defines are in xeno.dm in the defines folder. @@ -178,7 +179,7 @@ if(xeno.client && xeno.client.prefs && xeno.client.prefs.toggle_prefs & TOGGLE_ABILITY_DEACTIVATION_OFF) return to_chat(xeno, "You will no longer use [name] with [xeno.get_ability_mouse_name()].") - button.icon_state = "template" + button.icon_state = "template_xeno" xeno.set_selected_ability(null) if(charge_time) stop_charging_ability() @@ -197,15 +198,17 @@ to_chat(xeno, SPAN_INFO("It has [charges] uses left.")) if(charge_time) start_charging_ability() - if(ability_uses_acid_overlay && !(xeno.acid_overlay in xeno.overlays) && !xeno.resting) - xeno.overlays += xeno.acid_overlay + if(ability_uses_acid_overlay && !xeno.resting && xeno.stat != DEAD) + if(!HAS_TRAIT(xeno, TRAIT_FLOORED)) + xeno.overlays |= xeno.acid_overlay + // Called when a different action is clicked on and this one is deselected. /datum/action/xeno_action/activable/proc/action_deselect() var/mob/living/carbon/xenomorph/xeno = owner if(ability_uses_acid_overlay) xeno.overlays -= xeno.acid_overlay - button.icon_state = "template" + button.icon_state = "template_xeno" /datum/action/xeno_action/activable/remove_from(mob/living/carbon/xenomorph/xeno) ..() @@ -456,7 +459,7 @@ /datum/action/xeno_action/active_toggle/proc/disable_toggle() action_active = FALSE - button.icon_state = "template" + button.icon_state = "template_xeno" if(action_end_message) to_chat(owner, SPAN_WARNING(action_end_message)) diff --git a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm index 7575dca281c8..aa0f17c074d1 100644 --- a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm +++ b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm @@ -8,7 +8,7 @@ */ // this proc could use refactoring at some point -/mob/living/carbon/human/attack_alien(mob/living/carbon/xenomorph/attacking_xeno, dam_bonus) +/mob/living/carbon/human/attack_alien(mob/living/carbon/xenomorph/attacking_xeno, dam_bonus, unblockable = FALSE) if(attacking_xeno.fortify || HAS_TRAIT(attacking_xeno, TRAIT_ABILITY_BURROWED)) return XENO_NO_DELAY_ACTION @@ -35,7 +35,7 @@ if(attacking_xeno == src || anchored || buckled) return XENO_NO_DELAY_ACTION - if(check_shields(0, attacking_xeno.name)) // Blocking check + if(!unblockable && check_shields(attacking_xeno.name, get_dir(src, attacking_xeno), custom_response = TRUE)) // Blocking check attacking_xeno.visible_message(SPAN_DANGER("[attacking_xeno]'s grab is blocked by [src]'s shield!"), SPAN_DANGER("Our grab was blocked by [src]'s shield!"), null, 5, CHAT_TYPE_XENO_COMBAT) return XENO_ATTACK_ACTION @@ -50,7 +50,7 @@ SPAN_XENONOTICE("We try to strike [src] but fail due to our restraints!")) return XENO_ATTACK_ACTION - if(attacking_xeno.can_not_harm(src)) + if(attacking_xeno.can_not_harm(src, check_hive_flags=FALSE)) // We manually check hive_flags later attacking_xeno.animation_attack_on(src) attacking_xeno.visible_message(SPAN_NOTICE("[attacking_xeno] nibbles [src]"), SPAN_XENONOTICE("We nibble [src]")) @@ -64,13 +64,31 @@ return XENO_NO_DELAY_ACTION if(attacking_xeno.caste && !attacking_xeno.caste.is_intelligent) - if(HAS_TRAIT(src, TRAIT_NESTED) && (status_flags & XENO_HOST)) + var/embryo_allied = FALSE + if(status_flags & XENO_HOST) for(var/obj/item/alien_embryo/embryo in src) if(HIVE_ALLIED_TO_HIVE(attacking_xeno.hivenumber, embryo.hivenumber)) - to_chat(attacking_xeno, SPAN_WARNING("We should not harm this host! It has a sister inside.")) - return XENO_NO_DELAY_ACTION + embryo_allied = TRUE + break + + if(embryo_allied) + if(HAS_TRAIT(src, TRAIT_NESTED)) + attacking_xeno.animation_attack_on(src) + attacking_xeno.visible_message(SPAN_NOTICE("[attacking_xeno] nibbles [src]"), + SPAN_XENONOTICE("We nibble [src], as it has a sister inside we should not harm.")) + return XENO_NO_DELAY_ACTION + if(!HAS_FLAG(attacking_xeno.hive.hive_flags, XENO_SLASH_INFECTED)) + attacking_xeno.animation_attack_on(src) + attacking_xeno.visible_message(SPAN_NOTICE("[attacking_xeno] nibbles [src]"), + SPAN_XENONOTICE("We nibble [src], as queen forbade slashing of infected hosts!")) + return XENO_ATTACK_ACTION + if(!HAS_FLAG(attacking_xeno.hive.hive_flags, XENO_SLASH_NORMAL)) + attacking_xeno.animation_attack_on(src) + attacking_xeno.visible_message(SPAN_NOTICE("[attacking_xeno] nibbles [src]"), + SPAN_XENONOTICE("We nibble [src], as queen forbade slashing!")) + return XENO_ATTACK_ACTION - if(check_shields(0, attacking_xeno.name)) // Blocking check + if(!unblockable && check_shields(attacking_xeno.name, get_dir(src, attacking_xeno), custom_response = TRUE)) // Blocking check attacking_xeno.visible_message(SPAN_DANGER("[attacking_xeno]'s slash is blocked by [src]'s shield!"), SPAN_DANGER("Our slash is blocked by [src]'s shield!"), null, 5, CHAT_TYPE_XENO_COMBAT) return XENO_ATTACK_ACTION @@ -80,7 +98,7 @@ var/damage = rand(attacking_xeno.melee_damage_lower, attacking_xeno.melee_damage_upper) + dam_bonus var/acid_damage = 0 - //Frenzy auras stack in a way, then the raw value is multipled by two to get the additive modifier + //Frenzy auras stack in a way, then the raw value is multiplied by two to get the additive modifier if(attacking_xeno.frenzy_aura > 0) damage += (attacking_xeno.frenzy_aura * FRENZY_DAMAGE_MULTIPLIER) if(acid_damage) @@ -113,13 +131,20 @@ knock_chance += 2 * attacking_xeno.frenzy_aura if(attacking_xeno.caste && attacking_xeno.caste.is_intelligent) knock_chance += 2 - knock_chance += min(floor(damage * 0.25), 10) //Maximum of 15% chance. + knock_chance += min(floor(damage * 0.25), 10) + if(stat) + knock_chance = 75 // If you're unconscious, how are you keeping it on so well. + else if(HAS_TRAIT(src, TRAIT_YAUTJA_TECH)) + knock_chance = min(knock_chance, 15) //Maximum of 15% chance. + else + knock_chance = min(knock_chance, 20)//If they don't know how it works (not Yautja) it's less useful. + if(prob(knock_chance)) playsound(loc, "alien_claw_metal", 25, 1) attacking_xeno.visible_message(SPAN_DANGER("[attacking_xeno] smashes off [src]'s [wear_mask.name]!"), SPAN_DANGER("We smash off [src]'s [wear_mask.name]!"), null, 5) drop_inv_item_on_ground(wear_mask) - if(isyautja(src)) + if(isspeciesyautja(src)) emote("roar") else emote("scream") @@ -189,7 +214,7 @@ return XENO_NO_DELAY_ACTION attacking_xeno.animation_attack_on(src) - if(check_shields(0, attacking_xeno.name)) // Blocking check + if(!unblockable && check_shields(attacking_xeno.name, get_dir(src, attacking_xeno), custom_response = TRUE)) // Blocking check attacking_xeno.visible_message(SPAN_DANGER("[attacking_xeno]'s tackle is blocked by [src]'s shield!"), SPAN_DANGER("We tackle is blocked by [src]'s shield!"), null, 5, CHAT_TYPE_XENO_COMBAT) return XENO_ATTACK_ACTION @@ -205,10 +230,11 @@ var/knocked_down if(attacking_xeno.attempt_tackle(src, tackle_mult, tackle_min_offset, tackle_max_offset)) - playsound(loc, 'sound/weapons/alien_knockdown.ogg', 25, 1) var/strength = rand(attacking_xeno.tacklestrength_min, attacking_xeno.tacklestrength_max) - Stun(strength) - KnockDown(strength) // Purely for knockdown visuals. All the heavy lifting is done by Stun + var/datum/status_effect/incapacitating/stun/stun = Stun(strength, resistible=TRUE) + var/stun_resisted = strength != stun.last_amount + playsound(loc, 'sound/weapons/alien_knockdown.ogg', 25, stun_resisted ? 1.5 : 0) + KnockDown(stun.last_amount) // Purely for knockdown visuals. All the heavy lifting is done by Stun attacking_xeno.visible_message(SPAN_DANGER("[attacking_xeno] tackles down [src]!"), SPAN_DANGER("We tackle down [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) SEND_SIGNAL(src, COMSIG_MOB_TACKLED_DOWN, attacking_xeno) @@ -255,7 +281,7 @@ M.track_slashes(M.caste_type) //Adds to slash stat. var/damage = rand(M.melee_damage_lower, M.melee_damage_upper) - //Frenzy auras stack in a way, then the raw value is multipled by two to get the additive modifier + //Frenzy auras stack in a way, then the raw value is multiplied by two to get the additive modifier if(M.frenzy_aura > 0) damage += (M.frenzy_aura * FRENZY_DAMAGE_MULTIPLIER) @@ -272,9 +298,9 @@ last_damage_data = create_cause_data(initial(M.name), M) M.visible_message(SPAN_DANGER("[M] [M.slashes_verb] [src]!"), SPAN_DANGER("We [M.slash_verb] [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) - attack_log += text("\[[time_stamp()]\] was [M.slash_verb]ed by [key_name(M)]") - M.attack_log += text("\[[time_stamp()]\] [M.slash_verb]ed [key_name(src)]") - log_attack("[key_name(M)] [M.slash_verb]ed [key_name(src)]") + attack_log += text("\[[time_stamp()]\] was [M.slash_verb]ed by [key_name(M)] at [get_area(src)] ([loc.x],[loc.y],[loc.z])") + M.attack_log += text("\[[time_stamp()]\] [M.slash_verb]ed [key_name(src)] at [get_area(src)] ([loc.x],[loc.y],[loc.z])") + log_attack("[key_name(M)] [M.slash_verb]ed [key_name(src)] at [get_area(src)] ([loc.x],[loc.y],[loc.z]).") if(custom_slashed_sound) playsound(loc, custom_slashed_sound, 25, 1) @@ -344,6 +370,24 @@ SPAN_DANGER("We [M.slash_verb] [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) return XENO_ATTACK_ACTION +/obj/structure/surface/table/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + if(!breakable || unslashable || health <= 0) + return TAILSTAB_COOLDOWN_NONE + if(sheet_type == /obj/item/stack/sheet/wood) + playsound(src, 'sound/effects/woodhit.ogg', 25, 1) + else + playsound(src, 'sound/effects/metalhit.ogg', 25, 1) + health -= xeno.melee_damage_upper + if(health <= 0) + xeno.visible_message(SPAN_DANGER("[xeno] destroys [src] with its tail!"), + SPAN_DANGER("We destroy [src] with our tail!"), null, 5, CHAT_TYPE_XENO_COMBAT) + deconstruct(FALSE) + else + xeno.visible_message(SPAN_DANGER("[xeno] strikes [src] with its tail!"), + SPAN_DANGER("We strike [src] with our tail!"), null, 5, CHAT_TYPE_XENO_COMBAT) + xeno.tail_stab_animation(src, blunt_stab) + return TAILSTAB_COOLDOWN_NORMAL + //Breaking barricades /obj/structure/barricade/attack_alien(mob/living/carbon/xenomorph/M) M.animation_attack_on(src) @@ -359,10 +403,10 @@ if(is_wired) M.visible_message(SPAN_DANGER("The barbed wire slices into [M]!"), SPAN_DANGER("The barbed wire slices into us!"), null, 5, CHAT_TYPE_XENO_COMBAT) - M.apply_damage(10) + M.apply_damage(10, enviro=TRUE) return XENO_ATTACK_ACTION -/obj/structure/barricade/handle_tail_stab(mob/living/carbon/xenomorph/xeno) +/obj/structure/barricade/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) take_damage((xeno.melee_damage_upper * 1.2) * brute_multiplier) if(barricade_hitsound) playsound(src, barricade_hitsound, 25, 1) @@ -372,7 +416,8 @@ xeno.visible_message(SPAN_DANGER("[xeno] strikes \the [src] with its tail!"), SPAN_DANGER("We strike \the [src] with our tail!"), null, 5, CHAT_TYPE_XENO_COMBAT) if(is_wired) xeno.visible_message(SPAN_DANGER("The barbed wire slices into \the [xeno]'s tail!"), SPAN_DANGER("The barbed wire slices into our tail!"), null, 5, CHAT_TYPE_XENO_COMBAT) - xeno.apply_damage(5) + xeno.apply_damage(5, enviro=TRUE) + xeno.tail_stab_animation(src, blunt_stab) return TAILSTAB_COOLDOWN_NORMAL /obj/structure/surface/rack/attack_alien(mob/living/carbon/xenomorph/M) @@ -383,10 +428,20 @@ deconstruct(FALSE) return XENO_ATTACK_ACTION +/obj/structure/surface/rack/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + if(unslashable) + return TAILSTAB_COOLDOWN_NONE + playsound(src, 'sound/effects/metalhit.ogg', 25, 1) + deconstruct(FALSE) + xeno.visible_message(SPAN_DANGER("[xeno] destroys [src] with its tail!"), + SPAN_DANGER("We destroy [src] with our tail!"), null, 5, CHAT_TYPE_XENO_COMBAT) + xeno.tail_stab_animation(src, blunt_stab) + return TAILSTAB_COOLDOWN_NORMAL + //Default "structure" proc. This should be overwritten by sub procs. //If we sent it to monkey we'd get some weird shit happening. /obj/structure/attack_alien(mob/living/carbon/xenomorph/M) - // fuck off dont destroy my unslashables + // fuck off don't destroy my unslashables if(unslashable || health <= 0 && !HAS_TRAIT(usr, TRAIT_OPPOSABLE_THUMBS)) to_chat(M, SPAN_WARNING("We stare at \the [src] cluelessly.")) return XENO_NO_DELAY_ACTION @@ -414,17 +469,41 @@ attack_hand(M) return XENO_NONCOMBAT_ACTION +/obj/structure/bed/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + if(unslashable) + return TAILSTAB_COOLDOWN_NONE + playsound(src, hit_bed_sound, 25, 1) + xeno.visible_message(SPAN_DANGER("[xeno] destroys [src] with its tail!"), + SPAN_DANGER("We destroy [src] with our tail!"), null, 5, CHAT_TYPE_XENO_COMBAT) + unbuckle() + deconstruct(FALSE) + xeno.tail_stab_animation(src, blunt_stab) + return TAILSTAB_COOLDOWN_NORMAL //Medevac stretchers. Unbuckle ony /obj/structure/bed/medevac_stretcher/attack_alien(mob/living/carbon/xenomorph/M) unbuckle() return XENO_NONCOMBAT_ACTION +/obj/structure/bed/medevac_stretcher/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + unbuckle() + xeno.visible_message(SPAN_DANGER("[xeno] smacks [src] with its tail!"), + SPAN_DANGER("We smack [src] with our tail!"), null, 5, CHAT_TYPE_XENO_COMBAT) + xeno.tail_stab_animation(src, blunt_stab) + return TAILSTAB_COOLDOWN_LOW + //Portable surgical bed. Ditto, though it's meltable. /obj/structure/bed/portable_surgery/attack_alien(mob/living/carbon/xenomorph/M) unbuckle() return XENO_NONCOMBAT_ACTION +/obj/structure/bed/portable_surgery/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + unbuckle() + xeno.visible_message(SPAN_DANGER("[xeno] smacks [src] with its tail!"), + SPAN_DANGER("We smack [src] with our tail!"), null, 5, CHAT_TYPE_XENO_COMBAT) + xeno.tail_stab_animation(src, blunt_stab) + return TAILSTAB_COOLDOWN_LOW + //Smashing lights /obj/structure/machinery/light/attack_alien(mob/living/carbon/xenomorph/M) if(is_broken()) //Ignore if broken. Note that we can't use defines here @@ -446,6 +525,16 @@ attack_generic(M, M.melee_damage_lower) return XENO_ATTACK_ACTION +/obj/structure/window/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + if(not_damageable) //Impossible to destroy + return TAILSTAB_COOLDOWN_NONE + health -= xeno.melee_damage_upper + xeno.visible_message(SPAN_DANGER("[xeno] smashes [src] with its tail!"), + SPAN_DANGER("We smash [src] with our tail!"), null, 5, CHAT_TYPE_XENO_COMBAT) + healthcheck(TRUE, TRUE, TRUE, xeno) + xeno.tail_stab_animation(src, blunt_stab) + return TAILSTAB_COOLDOWN_NORMAL + //Slashing bots /obj/structure/machinery/bot/attack_alien(mob/living/carbon/xenomorph/M) M.animation_attack_on(src) @@ -473,6 +562,15 @@ toggle_cam_status(M, TRUE) return XENO_ATTACK_ACTION +/obj/structure/machinery/camera/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + . = TAILSTAB_COOLDOWN_NONE + if(status) + . = ..() + if(. != TAILSTAB_COOLDOWN_NONE) + wires = 0 //wires all cut + light_disabled = 0 + toggle_cam_status(xeno, TRUE) + //Slashing windoors /obj/structure/machinery/door/window/attack_alien(mob/living/carbon/xenomorph/M) M.animation_attack_on(src) @@ -485,6 +583,20 @@ take_damage(damage) return XENO_ATTACK_ACTION +/obj/structure/machinery/door/window/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + if(unslashable || health <= 0) + return TAILSTAB_COOLDOWN_NONE + playsound(src, 'sound/effects/Glasshit.ogg', 25, 1) + update_health(40) + if(health <= 0) + xeno.visible_message(SPAN_DANGER("[xeno] shatters [src] with its tail!"), + SPAN_DANGER("We shatter [src] with our tail!"), null, 5, CHAT_TYPE_XENO_COMBAT) + else + xeno.visible_message(SPAN_DANGER("[xeno] smashes [src] with its tail!"), + SPAN_DANGER("We smash [src] with our tail!"), null, 5, CHAT_TYPE_XENO_COMBAT) + xeno.tail_stab_animation(src, blunt_stab) + return TAILSTAB_COOLDOWN_NORMAL + //Slashing grilles /obj/structure/grille/attack_alien(mob/living/carbon/xenomorph/M) M.animation_attack_on(src) @@ -492,7 +604,7 @@ var/damage_dealt = 5 M.visible_message(SPAN_DANGER("[M] mangles [src]!"), SPAN_DANGER("We mangle [src]!"), - SPAN_DANGER("We hear twisting metal!"), 5, CHAT_TYPE_XENO_COMBAT) + SPAN_DANGER("You hear twisting metal!"), 5, CHAT_TYPE_XENO_COMBAT) if(shock(M, 70)) M.visible_message(SPAN_DANGER("ZAP! [M] spazzes wildly amongst a smell of burnt ozone."), @@ -504,6 +616,25 @@ healthcheck() return XENO_ATTACK_ACTION +/obj/structure/grille/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + if(unslashable || health <= 0) + return TAILSTAB_COOLDOWN_NONE + playsound(src, 'sound/effects/grillehit.ogg', 25, 1) + + xeno.visible_message(SPAN_DANGER("[xeno] mangles [src] with its tail!"), + SPAN_DANGER("We mangle [src] with our tail!"), + SPAN_DANGER("You hear twisting metal!"), 5, CHAT_TYPE_XENO_COMBAT) + + if(shock(xeno, 70)) + xeno.visible_message(SPAN_DANGER("ZAP! [xeno] spazzes wildly amongst a smell of burnt ozone."), + SPAN_DANGER("ZAP! You twitch and dance like a monkey on hyperzine!"), + SPAN_DANGER("You hear a sharp ZAP and a smell of ozone.")) + + health -= 5 + healthcheck() + xeno.tail_stab_animation(src, blunt_stab) + return TAILSTAB_COOLDOWN_NORMAL + //Slashing fences /obj/structure/fence/attack_alien(mob/living/carbon/xenomorph/M) M.animation_attack_on(src) @@ -516,11 +647,25 @@ healthcheck() return XENO_ATTACK_ACTION -/obj/structure/fence/electrified/attack_alien(mob/living/carbon/xenomorph/M) +/obj/structure/fence/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + xeno.visible_message(SPAN_DANGER("[xeno] mangles [src] with its tail!"), + SPAN_DANGER("We mangle [src] with our tail!"), + SPAN_DANGER("You hear twisting metal!"), 5, CHAT_TYPE_XENO_COMBAT) + + health -= 25 + healthcheck() + xeno.tail_stab_animation(src, blunt_stab) + return TAILSTAB_COOLDOWN_NORMAL + +/obj/structure/fence/electrified/attack_alien(mob/living/carbon/xenomorph/user) if(electrified && !cut) - electrocute_mob(M, get_area(breaker_switch), src, 0.75) + electrocute_mob(user, get_area(breaker_switch), src, 0.75) return ..() +/obj/structure/fence/electrified/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + if(electrified && !cut) + electrocute_mob(xeno, get_area(breaker_switch), src, 0.25) + return ..() //Slashin mirrors /obj/structure/mirror/attack_alien(mob/living/carbon/xenomorph/M) @@ -539,6 +684,17 @@ shatter() return XENO_ATTACK_ACTION +/obj/structure/mirror/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + if(unslashable) + return TAILSTAB_COOLDOWN_NONE + if(shattered) + playsound(loc, 'sound/effects/hit_on_shattered_glass.ogg', 25, 1) + return TAILSTAB_COOLDOWN_LOW + shatter() + xeno.visible_message(SPAN_DANGER("[xeno] smashes [src] with its tail!"), + SPAN_DANGER("We smash [src] with our tail!"), null, 5, CHAT_TYPE_XENO_COMBAT) + xeno.tail_stab_animation(src, blunt_stab) + return TAILSTAB_COOLDOWN_NORMAL //airlock assemblies /obj/structure/airlock_assembly/attack_alien(mob/living/carbon/xenomorph/xeno) @@ -557,6 +713,21 @@ xeno.visible_message(SPAN_DANGER("[xeno] [xeno.slashes_verb] [src]!"), SPAN_DANGER("We [xeno.slash_verb] [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) +/obj/structure/airlock_assembly/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + if(unslashable || health <= 0) + return TAILSTAB_COOLDOWN_NONE + playsound(src, 'sound/effects/metalhit.ogg', 25, 1) + update_health(xeno.melee_damage_upper) + if(health <= 0) + xeno.visible_message(SPAN_DANGER("[xeno] destroys [src] with its tail!"), + SPAN_DANGER("We destroy [src] with our tail!"), null, 5, CHAT_TYPE_XENO_COMBAT) + if(!unacidable) + qdel(src) + else + xeno.visible_message(SPAN_DANGER("[xeno] strikes [src] with its tail!"), + SPAN_DANGER("We strike [src] with our tail!"), null, 5, CHAT_TYPE_XENO_COMBAT) + xeno.tail_stab_animation(src, blunt_stab) + return TAILSTAB_COOLDOWN_NORMAL //Prying open doors /obj/structure/machinery/door/airlock/attack_alien(mob/living/carbon/xenomorph/M) @@ -672,6 +843,9 @@ SPAN_DANGER("We pry [src] open."), null, 5, CHAT_TYPE_XENO_COMBAT) return XENO_NO_DELAY_ACTION +/obj/structure/machinery/door/firedoor/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + return TAILSTAB_COOLDOWN_NONE + /obj/structure/mineral_door/resin/attack_larva(mob/living/carbon/xenomorph/larva/M) var/turf/cur_loc = M.loc if(!istype(cur_loc)) @@ -724,6 +898,20 @@ SPAN_DANGER("We [M.slash_verb] \the [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) return XENO_ATTACK_ACTION +/obj/structure/machinery/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + if(unslashable || health <= 0) + return TAILSTAB_COOLDOWN_NONE + playsound(src, 'sound/effects/metalhit.ogg', 25, 1) + update_health(xeno.melee_damage_upper) + if(health <= 0) + xeno.visible_message(SPAN_DANGER("[xeno] destroys [src] with its tail!"), + SPAN_DANGER("We destroy [src] with our tail!"), null, 5, CHAT_TYPE_XENO_COMBAT) + else + xeno.visible_message(SPAN_DANGER("[xeno] strikes [src] with its tail!"), + SPAN_DANGER("We strike [src] with our tail!"), null, 5, CHAT_TYPE_XENO_COMBAT) + xeno.tail_stab_animation(src, blunt_stab) + return TAILSTAB_COOLDOWN_NORMAL + // Destroying reagent dispensers /obj/structure/reagent_dispensers/attack_alien(mob/living/carbon/xenomorph/M) if(unslashable || health <= 0 && !HAS_TRAIT(usr, TRAIT_OPPOSABLE_THUMBS)) @@ -743,6 +931,22 @@ SPAN_DANGER("We [M.slash_verb] \the [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) return XENO_ATTACK_ACTION +/obj/structure/reagent_dispensers/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + if(unslashable || health <= 0) + return TAILSTAB_COOLDOWN_NONE + playsound(src, 'sound/effects/metalhit.ogg', 25, 1) + update_health(xeno.melee_damage_upper) + if(health <= 0) + xeno.visible_message(SPAN_DANGER("[xeno] destroys [src] with its tail!"), + SPAN_DANGER("We destroy [src] with our tail!"), null, 5, CHAT_TYPE_XENO_COMBAT) + if(!unacidable) + qdel(src) + else + xeno.visible_message(SPAN_DANGER("[xeno] strikes [src] with its tail!"), + SPAN_DANGER("We strike [src] with our tail!"), null, 5, CHAT_TYPE_XENO_COMBAT) + xeno.tail_stab_animation(src, blunt_stab) + return TAILSTAB_COOLDOWN_NORMAL + // Destroying filing cabinets /obj/structure/filingcabinet/attack_alien(mob/living/carbon/xenomorph/M) if(unslashable || health <= 0) @@ -762,6 +966,22 @@ SPAN_DANGER("We [M.slash_verb] \the [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) return XENO_ATTACK_ACTION +/obj/structure/filingcabinet/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + if(unslashable || health <= 0) + return TAILSTAB_COOLDOWN_NONE + playsound(src, 'sound/effects/metalhit.ogg', 25, 1) + update_health(xeno.melee_damage_upper) + if(health <= 0) + xeno.visible_message(SPAN_DANGER("[xeno] destroys [src] with its tail!"), + SPAN_DANGER("We destroy [src] with our tail!"), null, 5, CHAT_TYPE_XENO_COMBAT) + if(!unacidable) + qdel(src) + else + xeno.visible_message(SPAN_DANGER("[xeno] strikes [src] with its tail!"), + SPAN_DANGER("We strike [src] with our tail!"), null, 5, CHAT_TYPE_XENO_COMBAT) + xeno.tail_stab_animation(src, blunt_stab) + return TAILSTAB_COOLDOWN_NORMAL + // Destroying morgues & crematoriums /obj/structure/morgue/attack_alien(mob/living/carbon/xenomorph/alien) if(unslashable) @@ -781,6 +1001,22 @@ SPAN_DANGER("We [alien.slash_verb] \the [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) return XENO_ATTACK_ACTION +/obj/structure/morgue/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + if(unslashable || health <= 0) + return TAILSTAB_COOLDOWN_NONE + var destroyloc = loc + playsound(src, 'sound/effects/metalhit.ogg', 25, 1) + update_health(xeno.melee_damage_upper) + if(health <= 0) + xeno.visible_message(SPAN_DANGER("[xeno] destroys [src] with its tail!"), + SPAN_DANGER("We destroy [src] with our tail!"), null, 5, CHAT_TYPE_XENO_COMBAT) + new /obj/item/stack/sheet/metal(destroyloc, 2) + else + xeno.visible_message(SPAN_DANGER("[xeno] strikes [src] with its tail!"), + SPAN_DANGER("We strike [src] with our tail!"), null, 5, CHAT_TYPE_XENO_COMBAT) + xeno.tail_stab_animation(src, blunt_stab) + return TAILSTAB_COOLDOWN_NORMAL + // Destroying hydroponics trays /obj/structure/machinery/portable_atmospherics/hydroponics/attack_alien(mob/living/carbon/xenomorph/alien) if(unslashable) @@ -873,7 +1109,7 @@ set_broken() visible_message(SPAN_DANGER("[src]'s electronics are destroyed!"), null, null, 5) else if(wiresexposed) - for(var/wire = 1; wire <= length(get_wire_descriptions()); wire++) // Cut all the wires because xenos don't know any better + for(var/wire = 1; wire <= length(GLOB.apc_wire_descriptions); wire++) // Cut all the wires because xenos don't know any better if(!isWireCut(wire)) // Xenos don't need to mend the wires either cut(wire, M, FALSE) // This is XOR so it toggles; FALSE just because we don't want the messages update_icon() @@ -887,6 +1123,9 @@ beenhit++ return XENO_ATTACK_ACTION +/obj/structure/machinery/power/apc/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + return TAILSTAB_COOLDOWN_NONE + /obj/structure/ladder/attack_alien(mob/living/carbon/xenomorph/M) attack_hand(M) return XENO_NO_DELAY_ACTION @@ -894,22 +1133,36 @@ /obj/structure/ladder/attack_larva(mob/living/carbon/xenomorph/larva/M) return attack_hand(M) -/obj/structure/machinery/colony_floodlight/attack_alien(mob/living/carbon/xenomorph/M) +/obj/structure/machinery/colony_floodlight/attack_alien(mob/living/carbon/xenomorph/xeno) if(!is_on) - to_chat(M, SPAN_WARNING("Why bother? It's just some weird metal thing.")) + to_chat(xeno, SPAN_WARNING("Why bother? It's just some weird metal thing.")) return XENO_NO_DELAY_ACTION if(damaged) - to_chat(M, SPAN_WARNING("It's already damaged.")) + to_chat(xeno, SPAN_WARNING("It's already damaged.")) return XENO_NO_DELAY_ACTION - M.animation_attack_on(src) - M.visible_message("[M] slashes away at [src]!","We slash and claw at the bright light!", max_distance = 5, message_flags = CHAT_TYPE_XENO_COMBAT) - health = max(health - rand(M.melee_damage_lower, M.melee_damage_upper), 0) + xeno.animation_attack_on(src) + xeno.visible_message(SPAN_DANGER("[xeno] slashes away at [src]!"), + SPAN_DANGER("We slash and claw at the bright light!"), max_distance = 5, message_flags = CHAT_TYPE_XENO_COMBAT) + health = max(health - rand(xeno.melee_damage_lower, xeno.melee_damage_upper), 0) if(!health) set_damaged() else playsound(loc, 'sound/effects/Glasshit.ogg', 25, 1) return XENO_ATTACK_ACTION +/obj/structure/machinery/colony_floodlight/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + if(!is_on || damaged) + return TAILSTAB_COOLDOWN_NONE + xeno.visible_message(SPAN_DANGER("[xeno] smashes [src] with its tail!"), + SPAN_DANGER("We smash at the bright light with our tail!"), max_distance = 5, message_flags = CHAT_TYPE_XENO_COMBAT) + health = max(health - xeno.melee_damage_upper, 0) + if(!health) + set_damaged() + else + playsound(loc, 'sound/effects/Glasshit.ogg', 25, 1) + xeno.tail_stab_animation(src, blunt_stab) + return TAILSTAB_COOLDOWN_NORMAL + /obj/structure/machinery/colony_floodlight/attack_larva(mob/living/carbon/xenomorph/larva/M) M.visible_message("[M] starts biting [src]!","In a rage, we start biting [src], but with no effect!", null, 5, CHAT_TYPE_XENO_COMBAT) @@ -951,7 +1204,7 @@ if(welded) difficulty = 30 // if its welded shut it should be harder to smash open if(prob(difficulty)) - break_open() + break_open(M) M.visible_message(SPAN_DANGER("[M] smashes \the [src] open!"), SPAN_DANGER("We smash \the [src] open!"), null, 5, CHAT_TYPE_XENO_COMBAT) else @@ -959,6 +1212,24 @@ SPAN_DANGER("We smash [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT) return XENO_ATTACK_ACTION +/obj/structure/closet/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + if(unslashable || unacidable) + return TAILSTAB_COOLDOWN_NONE + playsound(src, 'sound/effects/metalhit.ogg', 25, 1) + if(!opened) + var/difficulty = 70 //if its just closed we can smash open quite easily + if(welded) + difficulty = 30 // if its welded shut it should be harder to smash open + if(prob(difficulty)) + break_open(xeno) + xeno.visible_message(SPAN_DANGER("[xeno] smashes [src] open with its tail!"), + SPAN_DANGER("We smash [src] open with our tail!"), null, 5, CHAT_TYPE_XENO_COMBAT) + else + xeno.visible_message(SPAN_DANGER("[xeno] smashes [src] with its tail!"), + SPAN_DANGER("We smash [src] with our tail!"), null, 5, CHAT_TYPE_XENO_COMBAT) + xeno.tail_stab_animation(src, blunt_stab) + return TAILSTAB_COOLDOWN_NORMAL + /obj/structure/machinery/vending/attack_alien(mob/living/carbon/xenomorph/M) if(is_tipped_over) to_chat(M, SPAN_WARNING("There's no reason to bother with that old piece of trash.")) @@ -997,12 +1268,36 @@ tip_over() return XENO_NO_DELAY_ACTION +/obj/structure/machinery/vending/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + if(is_tipped_over || unslashable) + return TAILSTAB_COOLDOWN_NONE + if(prob(xeno.melee_damage_upper)) + playsound(loc, 'sound/effects/metalhit.ogg', 25, 1) + xeno.visible_message(SPAN_DANGER("[xeno] smashes [src] with its tail beyond recognition!"), + SPAN_DANGER("You enter a frenzy and smash [src] with your tail apart!"), null, 5, CHAT_TYPE_XENO_COMBAT) + malfunction() + tip_over() + else + xeno.visible_message(SPAN_DANGER("[xeno] slashes [src] with its tail!"), + SPAN_DANGER("You slash [src] with your tail!"), null, 5, CHAT_TYPE_XENO_COMBAT) + playsound(loc, 'sound/effects/metalhit.ogg', 25, 1) + xeno.tail_stab_animation(src, blunt_stab) + return TAILSTAB_COOLDOWN_NORMAL /obj/structure/inflatable/attack_alien(mob/living/carbon/xenomorph/M) M.animation_attack_on(src) deflate(1) return XENO_ATTACK_ACTION +/obj/structure/inflatable/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + if(unslashable) + return TAILSTAB_COOLDOWN_NONE + xeno.visible_message(SPAN_DANGER("[xeno] punctures [src] with its tail!"), + SPAN_DANGER("We puncture [src] with our tail!"), null, 5, CHAT_TYPE_XENO_COMBAT) + xeno.tail_stab_animation(src, blunt_stab) + deflate(TRUE) + return TAILSTAB_COOLDOWN_NORMAL + /obj/structure/machinery/vending/proc/tip_over() var/matrix/A = matrix() is_tipped_over = TRUE diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Boiler.dm b/code/modules/mob/living/carbon/xenomorph/castes/Boiler.dm index 45f27abe4414..5714e6cf15c4 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Boiler.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Boiler.dm @@ -22,9 +22,9 @@ acid_level = 3 caste_luminosity = 2 spit_types = list(/datum/ammo/xeno/boiler_gas/acid, /datum/ammo/xeno/boiler_gas) - fire_immunity = FIRE_VULNERABILITY + fire_immunity = FIRE_MODIFIER // 3x fire damage - fire_vulnerability_mult = FIRE_MULTIPLIER_DEADLY + fire_modifier_mult = FIRE_MULTIPLIER_DEADLY tackle_min = 2 tackle_max = 6 @@ -75,7 +75,6 @@ /datum/action/xeno_action/activable/spray_acid/boiler, //3rd macro /datum/action/xeno_action/onclick/toggle_long_range/boiler, //4th macro /datum/action/xeno_action/onclick/acid_shroud, //5th macro - /datum/action/xeno_action/onclick/tacmap, ) skull = /obj/item/skull/boiler pelt = /obj/item/pelt/boiler @@ -87,8 +86,6 @@ smoke.cause_data = create_cause_data(initial(caste_type), src) see_in_dark = 20 - update_icon_source() - /mob/living/carbon/xenomorph/boiler/Destroy() if(smoke) qdel(smoke) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Burrower.dm b/code/modules/mob/living/carbon/xenomorph/castes/Burrower.dm index fe1064da8511..73202490da9f 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Burrower.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Burrower.dm @@ -16,6 +16,7 @@ deevolves_to = list(XENO_CASTE_DRONE) caste_desc = "A digger and trapper." + fire_immunity = FIRE_IMMUNITY_BURROWER acid_level = 2 weed_level = WEED_LEVEL_STANDARD evolution_allowed = FALSE @@ -47,6 +48,7 @@ plasma_types = list(PLASMA_PURPLE) pixel_x = -12 old_x = -12 + xenonid_pixel_x = -16 base_pixel_x = 0 base_pixel_y = -20 tier = 2 @@ -65,7 +67,6 @@ /datum/action/xeno_action/activable/burrow, //third macro /datum/action/xeno_action/onclick/tremor, //fourth macro /datum/action/xeno_action/active_toggle/toggle_meson_vision, - /datum/action/xeno_action/onclick/tacmap, ) inherent_verbs = list( @@ -84,7 +85,7 @@ skull = /obj/item/skull/burrower pelt = /obj/item/pelt/burrower -/mob/living/carbon/xenomorph/burrower/ex_act(severity) +/mob/living/carbon/xenomorph/burrower/ex_act(severity, direction, datum/cause_data/cause_data, pierce=0, enviro=FALSE) if(HAS_TRAIT(src, TRAIT_ABILITY_BURROWED)) return ..() @@ -121,7 +122,7 @@ return var/area/current_area = get_area(current_turf) - if(current_area.flags_area & AREA_NOTUNNEL) + if(current_area.flags_area & AREA_NOBURROW) to_chat(src, SPAN_XENOWARNING("There's no way to burrow here.")) return @@ -154,12 +155,6 @@ if(hauled) hauled.forceMove(src) - if(caste.fire_immunity == FIRE_IMMUNITY_NONE) - RegisterSignal(src, COMSIG_LIVING_PREIGNITION, PROC_REF(fire_immune)) - RegisterSignal(src, list( - COMSIG_LIVING_FLAMER_CROSSED, - COMSIG_LIVING_FLAMER_FLAMED, - ), PROC_REF(flamer_crossed_immune)) add_traits(list(TRAIT_ABILITY_BURROWED, TRAIT_UNDENSE, TRAIT_IMMOBILIZED), TRAIT_SOURCE_ABILITY("Burrow")) playsound(src.loc, 'sound/effects/burrowing_b.ogg', 25) update_icons() @@ -181,12 +176,6 @@ if(caste_type && GLOB.xeno_datum_list[caste_type]) caste = GLOB.xeno_datum_list[caste_type] to_chat(src, SPAN_NOTICE("You resurface.")) - if(caste.fire_immunity == FIRE_IMMUNITY_NONE) - UnregisterSignal(src, list( - COMSIG_LIVING_PREIGNITION, - COMSIG_LIVING_FLAMER_CROSSED, - COMSIG_LIVING_FLAMER_FLAMED, - )) remove_traits(list(TRAIT_ABILITY_BURROWED, TRAIT_UNDENSE, TRAIT_IMMOBILIZED), TRAIT_SOURCE_ABILITY("Burrow")) invisibility = FALSE alpha = initial(alpha) @@ -249,7 +238,7 @@ return var/area/area_to_get = get_area(target) - if(area_to_get.flags_area & AREA_NOTUNNEL || get_dist(src, target) > 15) + if(area_to_get.flags_area & AREA_NOBURROW || get_dist(src, target) > 15) to_chat(src, SPAN_XENOWARNING("There's no way to tunnel over there.")) return @@ -362,7 +351,8 @@ to_chat(xenomorph, SPAN_XENOWARNING("We can't do that from there.")) return - if(!turf.can_dig_xeno_tunnel() || !is_ground_level(turf.z)) + var/area/current_area = get_area(turf) + if(!turf.can_dig_xeno_tunnel() || !is_ground_level(turf.z) || current_area.flags_area & AREA_NOTUNNEL) to_chat(xenomorph, SPAN_XENOWARNING("We scrape around, but we can't seem to dig through that kind of floor.")) return diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Carrier.dm b/code/modules/mob/living/carbon/xenomorph/castes/Carrier.dm index 73baf1526bd4..711d6ce06577 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Carrier.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Carrier.dm @@ -72,7 +72,6 @@ /datum/action/xeno_action/activable/throw_hugger, //3rd macro /datum/action/xeno_action/activable/retrieve_egg, //4th macro /datum/action/xeno_action/onclick/set_hugger_reserve, - /datum/action/xeno_action/onclick/tacmap, ) inherent_verbs = list( diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Crusher.dm b/code/modules/mob/living/carbon/xenomorph/castes/Crusher.dm index 41c3a29b614a..e4b135b5773f 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Crusher.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Crusher.dm @@ -60,7 +60,6 @@ /datum/action/xeno_action/activable/pounce/crusher_charge, /datum/action/xeno_action/onclick/crusher_stomp, /datum/action/xeno_action/onclick/crusher_shield, - /datum/action/xeno_action/onclick/tacmap, ) claw_type = CLAW_TYPE_VERY_SHARP @@ -523,6 +522,6 @@ found.on_removal() qdel(found) to_chat(xeno, SPAN_XENOHIGHDANGER("We feel our enhanced shield end!")) - button.icon_state = "template" + button.icon_state = "template_xeno" xeno.overlay_shields() diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Defender.dm b/code/modules/mob/living/carbon/xenomorph/castes/Defender.dm index 2c1e3d4f588a..17d51bd063bf 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Defender.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Defender.dm @@ -50,7 +50,6 @@ /datum/action/xeno_action/activable/headbutt, /datum/action/xeno_action/onclick/tail_sweep, /datum/action/xeno_action/activable/fortify, - /datum/action/xeno_action/onclick/tacmap, ) icon_xeno = 'icons/mob/xenos/castes/tier_1/defender.dmi' @@ -130,7 +129,7 @@ xeno.ability_speed_modifier -= speed_debuff xeno.armor_deflection_buff -= armor_buff xeno.mob_size = MOB_SIZE_XENO //no longer knockback immune - button.icon_state = "template" + button.icon_state = "template_xeno" xeno.update_icons() apply_cooldown() @@ -278,7 +277,7 @@ UnregisterSignal(owner, COMSIG_MOB_DEATH) fortify_switch(xeno, FALSE) if(xeno.selected_ability != src) - button.icon_state = "template" + button.icon_state = "template_xeno" apply_cooldown() return ..() diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Despoiler.dm b/code/modules/mob/living/carbon/xenomorph/castes/Despoiler.dm new file mode 100644 index 000000000000..b13029eaa296 --- /dev/null +++ b/code/modules/mob/living/carbon/xenomorph/castes/Despoiler.dm @@ -0,0 +1,156 @@ +/datum/caste_datum/despoiler + caste_type = XENO_CASTE_DESPOILER + tier = 3 + + melee_damage_lower = XENO_DAMAGE_TIER_1 + melee_damage_upper = XENO_DAMAGE_TIER_3 + melee_vehicle_damage = XENO_DAMAGE_TIER_4 + max_health = XENO_HEALTH_TIER_9 + plasma_gain = XENO_PLASMA_GAIN_TIER_7 + plasma_max = XENO_PLASMA_TIER_5 + xeno_explosion_resistance = XENO_EXPLOSIVE_ARMOR_TIER_2 + armor_deflection = XENO_ARMOR_TIER_2 + evasion = XENO_EVASION_NONE + speed = XENO_SPEED_HELLHOUND + + deevolves_to = list(XENO_CASTE_SPITTER) + acid_level = 3 + + + tackle_min = 4 + tackle_max = 6 + tackle_chance = 25 + tacklestrength_min = 3 + tacklestrength_max = 4 + + behavior_delegate_type = /datum/behavior_delegate/despoiler_base + minimap_icon = "despoiler" + spit_types = list(/datum/ammo/xeno/acid/despoiler) + minimum_evolve_time = 15 MINUTES + evolution_allowed = FALSE + + +/mob/living/carbon/xenomorph/despoiler + caste_type = XENO_CASTE_DESPOILER + name = XENO_CASTE_DESPOILER + desc = "An emaciated acidic terror, barely alive and constantly leaking acid." + icon_size = 64 + icon_state = "Despoiler Walking" + plasma_types = list(PLASMA_NEUROTOXIN, PLASMA_PURPLE) + pixel_x = -16 + old_x = -16 + mob_size = MOB_SIZE_BIG + drag_delay = 6 //pulling a big dead xeno is hard + tier = 3 + organ_value = 3000 + + base_actions = list( + /datum/action/xeno_action/onclick/xeno_resting, + /datum/action/xeno_action/onclick/release_haul, + /datum/action/xeno_action/watch_xeno, + /datum/action/xeno_action/activable/tail_stab/despoiler, + /datum/action/xeno_action/activable/corrosive_acid/strong, + /datum/action/xeno_action/activable/xeno_spit/despoiler, + /datum/action/xeno_action/onclick/corrosive_slash, + /datum/action/xeno_action/onclick/decomposing_enzymes, + ) + + icon_xeno = 'icons/mob/xenos/castes/tier_3/despoiler.dmi' + icon_xenonid = null // if someone makes xenoid sprites in future feel free to + acid_overlay = "Despoiler-Spit" + + weed_food_icon = 'icons/mob/xenos/weeds_64x64.dmi' + weed_food_states = list("Despoiler_1","Despoiler_2","Despoiler_3") + weed_food_states_flipped = list("Despoiler_1","Despoiler_2","Despoiler_3") + + skull = /obj/item/skull/despoiler + pelt = /obj/item/pelt/despoiler + + + +/datum/action/xeno_action/onclick/corrosive_slash/use_ability(atom/targeted_atom) + var/mob/living/carbon/xenomorph/xeno = owner + + if (!istype(xeno)) + return + + if (!action_cooldown_check()) + return + + if (!check_and_use_plasma_owner()) + return + + var/datum/behavior_delegate/despoiler_base/behavior = xeno.behavior_delegate + if (istype(behavior)) + behavior.slashes_enhanced = TRUE + xeno.attack_speed_modifier -= slash_speedup + + to_chat(xeno, SPAN_XENOHIGHDANGER("Our slashes will apply stronger acid!")) + + addtimer(CALLBACK(src, PROC_REF(unbuff_slash)), buff_duration) + + apply_cooldown() + return ..() + +/datum/action/xeno_action/onclick/corrosive_slash/proc/unbuff_slash() + var/mob/living/carbon/xenomorph/xeno = owner + if (!istype(xeno)) + return + var/datum/behavior_delegate/despoiler_base/behavior = xeno.behavior_delegate + if (istype(behavior)) + if (!behavior.slashes_enhanced) + return + behavior.slashes_enhanced = FALSE + xeno.attack_speed_modifier += slash_speedup + to_chat(xeno, SPAN_XENODANGER("Our power weakens, our slashes will no longer apply stronger acid!")) + + +/datum/behavior_delegate/despoiler_base + name = "Base Despoiler Behavior Delegate" + + var/slashes_enhanced = FALSE + +/datum/behavior_delegate/despoiler_base/melee_attack_modify_damage(original_damage, mob/living/carbon/target_carbon) + if (!isxeno_human(target_carbon)) + return original_damage + var/datum/effects/acid/acid_effect = locate() in target_carbon.effects_list + var/speed_up_progress = 10 + if (slashes_enhanced) + speed_up_progress = 20 + to_chat(bound_xeno, SPAN_XENOHIGHDANGER("We significantly strengthen our attack, covering [target_carbon] in acid!")) + if(acid_effect) + acid_effect.enhance_acid(super_acid = TRUE) + + if(!acid_effect) + acid_effect = new /datum/effects/acid/(target_carbon) + + acid_effect.increment_duration(speed_up_progress) + + + to_chat(target_carbon, SPAN_XENOHIGHDANGER("You feel a burning pain as [bound_xeno] slashes you, covering you in acid!")) + + return original_damage + +/datum/action/xeno_action/activable/tail_stab/despoiler/ability_act(mob/living/carbon/xenomorph/stabbing_xeno, mob/living/carbon/target, obj/limb/limb, apply_behavior_delagate = FALSE) + . = ..() + var/datum/effects/acid/acid_effect = locate() in target.effects_list + if(!acid_effect) + return + target.apply_armoured_damage(acid_effect.acid_level * 15, ARMOR_BIO, BURN, limb ? limb.name : "chest", acid_effect.acid_level * 10 ) + +/datum/action/xeno_action/onclick/decomposing_enzymes/use_ability(atom/target) + . = ..() + + var/mob/living/carbon/xenomorph/xeno = owner + XENO_ACTION_CHECK_USE_PLASMA(xeno) + + playsound(xeno, 'sound/voice/xeno_praetorian_screech.ogg', 75, 0, status = 0) + xeno.visible_message(SPAN_XENOHIGHDANGER("[xeno] begins to exude a carrion gas!")) + xeno.create_shriekwave() + + var/datum/effect_system/smoke_spread/decomposing_enzymes/smoke_gas = new() + smoke_gas.set_up(3, 0, get_turf(xeno), null, 6) + smoke_gas.start() + + apply_cooldown() + diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Drone.dm b/code/modules/mob/living/carbon/xenomorph/castes/Drone.dm index 1b5d7c78aebd..8857404790c0 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Drone.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Drone.dm @@ -48,7 +48,7 @@ /mob/living/carbon/xenomorph/drone caste_type = XENO_CASTE_DRONE name = XENO_CASTE_DRONE - desc = "An alien drone" + desc = "An alien drone." icon = 'icons/mob/xenos/castes/tier_1/drone.dmi' icon_size = 48 icon_state = "Drone Walking" @@ -57,6 +57,7 @@ organ_value = 800 pixel_x = -12 old_x = -12 + xenonid_pixel_x = -8 base_actions = list( /datum/action/xeno_action/onclick/xeno_resting, /datum/action/xeno_action/onclick/release_haul, @@ -69,7 +70,6 @@ /datum/action/xeno_action/onclick/choose_resin, //second macro /datum/action/xeno_action/activable/secrete_resin, //third macro /datum/action/xeno_action/activable/transfer_plasma, //fourth macro - /datum/action/xeno_action/onclick/tacmap, ) inherent_verbs = list( /mob/living/carbon/xenomorph/proc/vent_crawl, diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm b/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm index d4bd9ff68bde..fe6ec44f52ea 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm @@ -29,12 +29,14 @@ pixel_y = -6 old_x = -8 old_y = -6 + xenonid_pixel_x = -1 + xenonid_pixel_y = 0 layer = MOB_LAYER mob_flags = NOBIOSCAN see_in_dark = 8 tier = 0 //Facehuggers don't count towards Pop limits acid_blood_damage = 5 - crit_health = 0 + health_threshold_dead = 0 crit_grace_time = 0 gib_chance = 75 mob_size = MOB_SIZE_SMALL @@ -52,7 +54,6 @@ /datum/action/xeno_action/watch_xeno, /datum/action/xeno_action/onclick/xenohide, /datum/action/xeno_action/activable/pounce/facehugger, - /datum/action/xeno_action/onclick/tacmap, ) inherent_verbs = list( /mob/living/carbon/xenomorph/proc/vent_crawl, @@ -87,11 +88,14 @@ 3 MINUTES,\ ) +/mob/living/carbon/xenomorph/facehugger/warn_away_timer() + return // Ghostizing will just convert to regular hugger + /mob/living/carbon/xenomorph/facehugger/initialize_pass_flags(datum/pass_flags_container/PF) ..() if (PF) PF.flags_pass = PASS_MOB_THRU|PASS_FLAGS_CRAWLER - PF.flags_can_pass_all = PASS_ALL^PASS_OVER_THROW_ITEM + PF.flags_can_pass_all = PASS_ALL|PASS_OVER_THROW_ITEM /mob/living/carbon/xenomorph/facehugger/Logout() . = ..() @@ -99,6 +103,9 @@ if(stat == DEAD) return + if(QDELETED(src)) + return + if(!aghosted) gib() @@ -172,7 +179,7 @@ qdel(src) return did_hug -/mob/living/carbon/xenomorph/facehugger/ghostize(can_reenter_corpse, aghosted) +/mob/living/carbon/xenomorph/facehugger/ghostize(can_reenter_corpse = FALSE, aghosted = FALSE, transfer = FALSE) if(!aghosted && !can_reenter_corpse && !QDELETED(src) && stat != DEAD) // Become a npc once again new /obj/item/clothing/mask/facehugger(loc, hivenumber) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Hellhound.dm b/code/modules/mob/living/carbon/xenomorph/castes/Hellhound.dm index 6f05178e02aa..3a4574f9439c 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Hellhound.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Hellhound.dm @@ -68,7 +68,6 @@ /datum/action/xeno_action/activable/pounce/gorge, /datum/action/xeno_action/onclick/sense_owner, /datum/action/xeno_action/onclick/toggle_long_range/runner, - /datum/action/xeno_action/onclick/tacmap, ) inherent_verbs = list( /mob/living/carbon/xenomorph/proc/vent_crawl, diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Hivelord.dm b/code/modules/mob/living/carbon/xenomorph/castes/Hivelord.dm index 8e2d06571ae2..24300fc63e47 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Hivelord.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Hivelord.dm @@ -75,7 +75,6 @@ /datum/action/xeno_action/activable/transfer_plasma/hivelord, // to be consistent with drone placement /datum/action/xeno_action/active_toggle/toggle_speed, //fourth macro /datum/action/xeno_action/active_toggle/toggle_meson_vision, - /datum/action/xeno_action/onclick/tacmap, ) inherent_verbs = list( diff --git a/code/modules/mob/living/carbon/xenomorph/castes/King.dm b/code/modules/mob/living/carbon/xenomorph/castes/King.dm index a53a6afee538..d3acc0bed437 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/King.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/King.dm @@ -57,7 +57,6 @@ /datum/action/xeno_action/activable/destroy, /datum/action/xeno_action/onclick/king_shield, /datum/action/xeno_action/onclick/emit_pheromones, - /datum/action/xeno_action/onclick/tacmap, ) icon_xeno = 'icons/mob/xenos/castes/tier_4/king.dmi' @@ -81,6 +80,10 @@ . = ..() AddComponent(/datum/component/footstep, 2 , 35, 11, 4, "alien_footstep_large") RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(post_move)) + hive = GLOB.hive_datum[hivenumber] + hive.banned_allies = list("All") + if(hive.break_all_alliances()) + xeno_message(SPAN_XENOANNOUNCE("With the arrival of the King, all alliances have been broken."), 3, hivenumber) /mob/living/carbon/xenomorph/king/initialize_pass_flags(datum/pass_flags_container/pass_flags) . = ..() @@ -124,6 +127,11 @@ icon_xeno = 'icons/mob/xenos/castes/tier_4/rogueking.dmi' icon = 'icons/mob/xenos/castes/tier_4/rogueking.dmi' +/mob/living/carbon/xenomorph/king/death(cause, gibbed) + . = ..() + if(hive) + hive.setup_banned_allies() + /* REND ABILITY 3x3 aoe damage centred on the King. Basic ability, spammable, low damage. @@ -297,7 +305,7 @@ return var/area/target_area = get_area(target_turf) - if(target_area.flags_area & AREA_NOTUNNEL) + if(target_area.flags_area & AREA_NOBURROW) to_chat(xeno, SPAN_XENONOTICE("We cannot leap to that area!")) var/list/leap_line = get_line(xeno, target) @@ -366,9 +374,8 @@ owner.mouse_opacity = MOUSE_OPACITY_TRANSPARENT SLEEP_CHECK_DEATH(7, owner) - while(target_turf && owner.loc != target_turf) - owner.forceMove(get_step(owner, get_dir(owner, target_turf))) - SLEEP_CHECK_DEATH(0.5, owner) + SLEEP_CHECK_DEATH(0.5 * (abs(owner.x-target_turf.x) + abs(owner.y - target_turf.y) + abs(owner.z - target_turf.z)), owner) + owner.forceMove(target_turf) animate(owner, alpha = 100, transform = matrix()*0.7, time = 7) var/descentTime = 5 diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm b/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm index 2a6f5b1e5580..b0b884f06a76 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm @@ -36,7 +36,7 @@ see_in_dark = 8 tier = 0 //Larva's don't count towards Pop limits age = XENO_NO_AGE - crit_health = -25 + health_threshold_dead = -25 gib_chance = 25 mob_size = MOB_SIZE_SMALL speaking_noise = "larva_talk" @@ -44,7 +44,6 @@ /datum/action/xeno_action/onclick/xeno_resting, /datum/action/xeno_action/watch_xeno, /datum/action/xeno_action/onclick/xenohide, - /datum/action/xeno_action/onclick/tacmap, ) inherent_verbs = list( /mob/living/carbon/xenomorph/proc/vent_crawl, @@ -69,11 +68,25 @@ generate_name() return ..() +/mob/living/carbon/xenomorph/larva/warn_away_timer() + if(away_timer != XENO_LEAVE_TIMER_LARVA - XENO_AVAILABLE_TIMER) + return + if(aghosted) + return + if(health <= 0) + return + var/area/area = get_area(src) + if(should_block_game_interaction(src) && (!area || !(area.flags_area & AREA_ALLOW_XENO_JOIN))) + return //xenos on admin z level don't count + + to_chat(client, SPAN_ALERTWARNING("You are inactive and will be available to ghosts in [XENO_AVAILABLE_TIMER] second\s!")) + playsound_client(client, sound('sound/effects/xeno_evolveready.ogg')) + /mob/living/carbon/xenomorph/larva/initialize_pass_flags(datum/pass_flags_container/pass_flags) ..() if (pass_flags) pass_flags.flags_pass = PASS_MOB_THRU|PASS_FLAGS_CRAWLER - pass_flags.flags_can_pass_all = PASS_ALL^PASS_OVER_THROW_ITEM + pass_flags.flags_can_pass_all = PASS_ALL|PASS_OVER_THROW_ITEM /mob/living/carbon/xenomorph/larva/corrupted AUTOWIKI_SKIP(TRUE) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm b/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm index 176d8a88c18a..d092d8e12e39 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm @@ -37,6 +37,7 @@ plasma_types = list(PLASMA_CATECHOLAMINE) pixel_x = -12 old_x = -12 + xenonid_pixel_x = -9 tier = 2 organ_value = 2000 base_actions = list( @@ -47,7 +48,6 @@ /datum/action/xeno_action/activable/pounce/lurker, /datum/action/xeno_action/onclick/lurker_invisibility, /datum/action/xeno_action/onclick/lurker_assassinate, - /datum/action/xeno_action/onclick/tacmap, ) inherent_verbs = list( /mob/living/carbon/xenomorph/proc/vent_crawl, @@ -92,7 +92,7 @@ next_slash_buffed = FALSE var/datum/action/xeno_action/onclick/lurker_assassinate/ability = get_action(bound_xeno, /datum/action/xeno_action/onclick/lurker_assassinate) if (ability) - ability.button.icon_state = "template" + ability.button.icon_state = "template_xeno" return original_damage @@ -278,7 +278,7 @@ animate(xeno, alpha = initial(xeno.alpha), time = 0.1 SECONDS, easing = QUAD_EASING) to_chat(xeno, SPAN_XENOHIGHDANGER("We feel our invisibility end!")) - button.icon_state = "template" + button.icon_state = "template_xeno" xeno.update_icons() xeno.speed_modifier += speed_buff diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Praetorian.dm b/code/modules/mob/living/carbon/xenomorph/castes/Praetorian.dm index 175a39bb845d..621903578c1c 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Praetorian.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Praetorian.dm @@ -63,7 +63,6 @@ /datum/action/xeno_action/activable/pounce/base_prae_dash, /datum/action/xeno_action/activable/prae_acid_ball, /datum/action/xeno_action/activable/spray_acid/base_prae_spray_acid, - /datum/action/xeno_action/onclick/tacmap, ) icon_xeno = 'icons/mob/xenos/castes/tier_3/praetorian.dmi' diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Predalien.dm b/code/modules/mob/living/carbon/xenomorph/castes/Predalien.dm index e84e36b95555..7a7d20ced49c 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Predalien.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Predalien.dm @@ -64,7 +64,6 @@ /datum/action/xeno_action/activable/feral_smash, /datum/action/xeno_action/activable/feralfrenzy, /datum/action/xeno_action/onclick/toggle_gut_targeting, - /datum/action/xeno_action/onclick/tacmap, ) weed_food_icon = 'icons/mob/xenos/weeds_64x64.dmi' diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm index 4c83f61a8d1c..15db5b7ab6df 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm @@ -23,7 +23,7 @@ is_intelligent = 1 evolution_allowed = FALSE - fire_immunity = FIRE_IMMUNITY_NO_DAMAGE|FIRE_IMMUNITY_NO_IGNITE + fire_immunity = FIRE_IMMUNITY_COMPLETE caste_desc = "The Queen, in all her glory." spit_types = list(/datum/ammo/xeno/toxin/queen, /datum/ammo/xeno/acid/spatter) can_hold_facehuggers = 0 @@ -46,7 +46,6 @@ minimum_evolve_time = 0 minimap_icon = "xenoqueen" - minimap_background = "xeno_ruler" royal_caste = TRUE @@ -116,12 +115,20 @@ med_hud_set_status() add_to_all_mob_huds() - hud_used = Q.hud_used - Q.sight |= SEE_TURFS|SEE_OBJS /mob/hologram/queen/proc/exit_hologram() SIGNAL_HANDLER + + var/obj/structure/tent/tent = locate() in ((get_turf(linked_mob)).contents) + + var/atom/movable/screen/plane_master/roof/roof_plane = linked_mob.hud_used.plane_masters["[ROOF_PLANE]"] + + if(!tent) + roof_plane?.invisibility = 0 + else if (roof_plane?.invisibility == 0) + roof_plane?.invisibility = INVISIBILITY_MAXIMUM + qdel(src) /mob/hologram/queen/handle_move(mob/living/carbon/xenomorph/X, NewLoc, direct) @@ -238,9 +245,9 @@ M.client.perspective = EYE_PERSPECTIVE if(is_watching) - M.client.eye = is_watching + M.client.set_eye(is_watching) else - M.client.eye = src + M.client.set_eye(src) return COMPONENT_OVERRIDE_VIEW @@ -272,6 +279,7 @@ wall_smash = 0 pixel_x = -29 //new offsets for the much bigger sprite. old_x = -29 + xenonid_pixel_x = -16 mob_size = MOB_SIZE_IMMOBILE drag_delay = 6 //pulling a big dead xeno is hard tier = 0 //Queen doesn't count towards population limit. @@ -318,7 +326,6 @@ /datum/action/xeno_action/activable/info_marker/queen, /datum/action/xeno_action/onclick/manage_hive, /datum/action/xeno_action/onclick/send_thoughts, - /datum/action/xeno_action/onclick/tacmap, /datum/action/xeno_action/onclick/toggle_seethrough, ) @@ -326,7 +333,7 @@ /mob/living/carbon/xenomorph/proc/claw_toggle, /mob/living/carbon/xenomorph/proc/construction_toggle, /mob/living/carbon/xenomorph/proc/destruction_toggle, - /mob/living/carbon/xenomorph/proc/toggle_unnesting, + /mob/living/carbon/xenomorph/proc/unnesting_toggle, /mob/living/carbon/xenomorph/queen/proc/set_orders, /mob/living/carbon/xenomorph/queen/proc/hive_message, /mob/living/carbon/xenomorph/proc/rename_tunnel, @@ -378,9 +385,6 @@ bubble_icon = "alienroyal" -/mob/living/carbon/xenomorph/queen/can_destroy_special() - return TRUE - /mob/living/carbon/xenomorph/queen/get_organ_icon() return "heart_t3" @@ -451,6 +455,8 @@ AddComponent(/datum/component/footstep, 2 , 35, 11, 4, "alien_footstep_large") AddComponent(/datum/component/seethrough_mob) + if(hive.hivenumber == XENO_HIVE_NORMAL) + AddComponent(/datum/component/tacmap, has_drawing_tools=TRUE, minimap_flag=get_minimap_flag_for_faction(hive.hivenumber), has_update=TRUE, drawing=TRUE) RegisterSignal(src, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(check_block)) /mob/living/carbon/xenomorph/queen/proc/check_block(mob/queen, turf/new_loc) @@ -502,7 +508,6 @@ full_designation = "[name_client_prefix][nicknumber][name_client_postfix]" - color = hive.color //Update linked data so they show up properly change_real_name(src, name) @@ -517,6 +522,11 @@ SIGNAL_HANDLER if(queen_age_temp_timer_id == TIMER_ID_NULL) CRASH("[src] called on_take_damage when not temporarily mature!") + if(damage_data["enviro"]) + return + var/damage = damage_data["damage"] + if(damage < 5) + return var/new_duration = min(timeleft(queen_age_temp_timer_id) + XENO_QUEEN_TEMP_AGE_EXTENSION, XENO_QUEEN_TEMP_AGE_DURATION) queen_age_temp_timer_id = addtimer(CALLBACK(src, PROC_REF(refresh_combat_effective)), new_duration, TIMER_OVERRIDE|TIMER_UNIQUE|TIMER_STOPPABLE|TIMER_NO_HASH_WAIT) @@ -557,6 +567,14 @@ refresh_combat_effective() +/mob/living/carbon/xenomorph/queen/proc/end_temporary_maturity() + if(queen_age_temp_timer_id == TIMER_ID_NULL) + return + deltimer(queen_age_temp_timer_id) + queen_age_temp_timer_id = TIMER_ID_NULL + UnregisterSignal(src, COMSIG_XENO_TAKE_DAMAGE) + refresh_combat_effective() + /// When not on ovipositor, refreshes all mobile_abilities including mobile_aged_abilities if applicable /mob/living/carbon/xenomorph/queen/proc/refresh_combat_abilities() if(ovipositor) @@ -624,7 +642,8 @@ // Grant temporary maturity if near the hive_location for early game if(!queen_aged) - var/near_hive = hive?.hive_location && (get_area(hive.hive_location) == get_area(src) || get_dist(hive.hive_location, src) <= 10) + // Explicitly requires queen to not be inside something (e.g. a tunnel) + var/near_hive = hive?.hive_location && loc == get_turf(src) && (get_area(hive.hive_location) == get_area(src) || get_dist(hive.hive_location, src) <= 10) if(near_hive && ROUND_TIME < XENO_QUEEN_AGE_TIME * 2 && !is_mob_incapacitated(TRUE)) make_combat_effective(temporary=TRUE) else if(queen_age_temp_timer_id != TIMER_ID_NULL) @@ -674,7 +693,7 @@ /mob/living/carbon/xenomorph/queen/proc/hive_message() set category = "Alien" set name = "Word of the Queen (50)" - set desc = "Send a message to all aliens in the hive that is big and visible" + set desc = "Send a message to all aliens in the hive that is big and visible." if(client.prefs.muted & MUTE_IC) to_chat(src, SPAN_DANGER("You cannot send Announcements (muted).")) return @@ -708,8 +727,8 @@ return TRUE /mob/living/carbon/xenomorph/proc/claw_toggle() - set name = "Permit/Disallow Slashing" - set desc = "Allows you to permit the hive to harm." + set name = "Permit/Disallow Harming" + set desc = "Allows you to permit the hive to harm/slash." set category = "Alien" if(stat) @@ -720,26 +739,50 @@ to_chat(src, SPAN_WARNING("You can't do that now.")) CRASH("[src] attempted to toggle slashing without a linked hive") - if(pslash_delay) + if(hive.hive_flags_locked) + to_chat(src, SPAN_WARNING("You can't do that now.")) + return + + if(TIMER_COOLDOWN_CHECK(src, COOLDOWN_TOGGLE_SLASH)) to_chat(src, SPAN_WARNING("You must wait a bit before you can toggle this again.")) return - pslash_delay = TRUE - addtimer(CALLBACK(src, TYPE_PROC_REF(/mob/living/carbon/xenomorph, do_claw_toggle_cooldown)), 30 SECONDS) + var/current_setting = null + if(CHECK_MULTIPLE_BITFIELDS(hive.hive_flags, XENO_SLASH_ALLOW_ALL)) + current_setting = "Allowed" + else if(!(hive.hive_flags & XENO_SLASH_INFECTED) && (hive.hive_flags & XENO_SLASH_NORMAL)) + current_setting = "Restricted - Infected Hosts" + else if(!(hive.hive_flags & XENO_SLASH_ALLOW_ALL)) + current_setting = "Forbidden" - var/choice = tgui_input_list(usr, "Choose which level of slashing hosts to permit to your hive.","Harming", list("Allowed", "Restricted - Hosts of Interest", "Forbidden"), theme="hive_status") + var/choice = tgui_input_list(src, "Choose which level of harming hosts to permit to your hive.", "Harming", list("Forbidden", "Restricted - Infected Hosts", "Allowed"), theme="hive_status", default=current_setting) + if(!choice) + return if(choice == "Allowed") - to_chat(src, SPAN_XENONOTICE("You allow slashing.")) - xeno_message(SPAN_XENOANNOUNCE("The Queen has permitted the harming of hosts! Go hog wild!"), 2, hivenumber) - hive.slashing_allowed = XENO_SLASH_ALLOWED + if(current_setting == choice) + to_chat(src, SPAN_XENOWARNING("You already allow harming.")) + return + to_chat(src, SPAN_XENONOTICE("You allow harming.")) + xeno_message(SPAN_XENOANNOUNCE("The Queen has permitted the harming of hosts! Go hog wild!"), hivenumber=hivenumber) + hive.hive_flags |= XENO_SLASH_ALLOW_ALL + else if(choice == "Restricted - Infected Hosts") + if(current_setting == choice) + to_chat(src, SPAN_XENOWARNING("You already forbid harming of infected hosts.")) + return + to_chat(src, SPAN_XENONOTICE("You forbid harming of infected hosts.")) + xeno_message(SPAN_XENOANNOUNCE("The Queen has restricted the harming of hosts. You can no longer slash infected hosts."), hivenumber=hivenumber) + hive.hive_flags &= ~XENO_SLASH_INFECTED + hive.hive_flags |= XENO_SLASH_NORMAL else if(choice == "Forbidden") - to_chat(src, SPAN_XENONOTICE("You forbid slashing entirely.")) - xeno_message(SPAN_XENOANNOUNCE("The Queen has forbidden the harming of hosts. You can no longer slash your enemies."), 2, hivenumber) - hive.slashing_allowed = XENO_SLASH_FORBIDDEN + if(current_setting == choice) + to_chat(src, SPAN_XENOWARNING("You already forbid harming entirely.")) + return + to_chat(src, SPAN_XENONOTICE("You forbid harming entirely.")) + xeno_message(SPAN_XENOANNOUNCE("The Queen has forbidden the harming of hosts. You can no longer slash your enemies."), hivenumber=hivenumber) + hive.hive_flags &= ~XENO_SLASH_ALLOW_ALL -/mob/living/carbon/xenomorph/proc/do_claw_toggle_cooldown() - pslash_delay = FALSE + TIMER_COOLDOWN_START(src, COOLDOWN_TOGGLE_SLASH, 30 SECONDS) /mob/living/carbon/xenomorph/proc/construction_toggle() set name = "Permit/Disallow Construction Placement" @@ -750,20 +793,55 @@ to_chat(src, SPAN_WARNING("You can't do that now.")) return - var/choice = tgui_input_list(usr, "Choose which level of construction placement freedom to permit to your hive.","Harming", list("Queen", "Leaders", "Anyone"), theme="hive_status") + if(!hive) + to_chat(src, SPAN_WARNING("You can't do that now.")) + CRASH("[src] attempted to toggle construction without a linked hive") + + if(hive.hive_flags_locked) + to_chat(src, SPAN_WARNING("You can't do that now.")) + return + + if(TIMER_COOLDOWN_CHECK(src, COOLDOWN_TOGGLE_CONSTRUCTION)) + to_chat(src, SPAN_WARNING("You must wait a bit before you can toggle this again.")) + return + + var/current_setting = null + if(CHECK_MULTIPLE_BITFIELDS(hive.hive_flags, XENO_CONSTRUCTION_ALLOW_ALL)) + current_setting = "Anyone" + else if(!(hive.hive_flags & XENO_CONSTRUCTION_NORMAL) && CHECK_MULTIPLE_BITFIELDS(hive.hive_flags, XENO_CONSTRUCTION_QUEEN|XENO_CONSTRUCTION_LEADERS)) + current_setting = "Leaders" + else if(!(hive.hive_flags & (XENO_CONSTRUCTION_LEADERS|XENO_CONSTRUCTION_NORMAL)) && (hive.hive_flags & XENO_CONSTRUCTION_QUEEN)) + current_setting = "Queen" + + var/choice = tgui_input_list(src, "Choose which level of construction placement freedom to permit to your hive.", "Construction", list("Queen", "Leaders", "Anyone"), theme="hive_status", default=current_setting) + if(!choice) + return if(choice == "Anyone") + if(current_setting == choice) + to_chat(src, SPAN_XENOWARNING("You already allow construction placement to all builder castes.")) + return to_chat(src, SPAN_XENONOTICE("You allow construction placement to all builder castes.")) - xeno_message("The Queen has permitted the placement of construction nodes to all builder castes!", hivenumber = src.hivenumber) - hive.construction_allowed = NORMAL_XENO + xeno_message("The Queen has permitted the placement of construction nodes to all builder castes!", hivenumber=hivenumber) + hive.hive_flags |= XENO_CONSTRUCTION_ALLOW_ALL else if(choice == "Leaders") + if(current_setting == choice) + to_chat(src, SPAN_XENOWARNING("You already restrict construction placement to leaders only.")) + return to_chat(src, SPAN_XENONOTICE("You restrict construction placement to leaders only.")) - xeno_message("The Queen has restricted the placement of construction nodes to leading builder castes only.", hivenumber = src.hivenumber) - hive.construction_allowed = XENO_LEADER + xeno_message("The Queen has restricted the placement of construction nodes to leading builder castes only.", hivenumber=hivenumber) + hive.hive_flags &= ~XENO_CONSTRUCTION_NORMAL + hive.hive_flags |= XENO_CONSTRUCTION_QUEEN|XENO_CONSTRUCTION_LEADERS else if(choice == "Queen") + if(current_setting == choice) + to_chat(src, SPAN_XENOWARNING("You already forbid construction placement entirely.")) + return to_chat(src, SPAN_XENONOTICE("You forbid construction placement entirely.")) - xeno_message("The Queen has forbidden the placement of construction nodes to all but herself.", hivenumber = src.hivenumber) - hive.construction_allowed = XENO_QUEEN + xeno_message("The Queen has forbidden the placement of construction nodes to all but herself.", hivenumber=hivenumber) + hive.hive_flags &= ~(XENO_CONSTRUCTION_LEADERS|XENO_CONSTRUCTION_NORMAL) + hive.hive_flags |= XENO_CONSTRUCTION_QUEEN + + TIMER_COOLDOWN_START(src, COOLDOWN_TOGGLE_CONSTRUCTION, 30 SECONDS) /mob/living/carbon/xenomorph/proc/destruction_toggle() set name = "Permit/Disallow Special Structure Destruction" @@ -774,38 +852,102 @@ to_chat(src, SPAN_WARNING("You can't do that now.")) return - var/choice = tgui_input_list(usr, "Choose which level of destruction freedom to permit to your hive.","Harming", list("Queen", "Leaders", "Anyone"), theme="hive_status") + if(!hive) + to_chat(src, SPAN_WARNING("You can't do that now.")) + CRASH("[src] attempted to toggle deconstruction without a linked hive") + + if(hive.hive_flags_locked) + to_chat(src, SPAN_WARNING("You can't do that now.")) + return + + if(TIMER_COOLDOWN_CHECK(src, COOLDOWN_TOGGLE_DECONSTRUCTION)) + to_chat(src, SPAN_WARNING("You must wait a bit before you can toggle this again.")) + return + + var/current_setting = null + if(CHECK_MULTIPLE_BITFIELDS(hive.hive_flags, XENO_DECONSTRUCTION_ALLOW_ALL)) + current_setting = "Anyone" + else if(!(hive.hive_flags & XENO_DECONSTRUCTION_NORMAL) && CHECK_MULTIPLE_BITFIELDS(hive.hive_flags, XENO_DECONSTRUCTION_QUEEN|XENO_DECONSTRUCTION_LEADERS)) + current_setting = "Leaders" + else if(!(hive.hive_flags & (XENO_DECONSTRUCTION_LEADERS|XENO_DECONSTRUCTION_NORMAL)) && (hive.hive_flags & XENO_DECONSTRUCTION_QUEEN)) + current_setting = "Queen" + + var/choice = tgui_input_list(src, "Choose which level of destruction freedom to permit to your hive.", "Deconstruction", list("Queen", "Leaders", "Anyone"), theme="hive_status", default=current_setting) + if(!choice) + return if(choice == "Anyone") + if(current_setting == choice) + to_chat(src, SPAN_XENOWARNING("You already allow special structure destruction to all builder castes and leaders.")) + return to_chat(src, SPAN_XENONOTICE("You allow special structure destruction to all builder castes and leaders.")) - xeno_message("The Queen has permitted the destruction of special structures to all builder castes and leaders!", hivenumber = src.hivenumber) - hive.destruction_allowed = NORMAL_XENO + xeno_message("The Queen has permitted the destruction of special structures to all builder castes and leaders!", hivenumber=hivenumber) + hive.hive_flags |= XENO_DECONSTRUCTION_ALLOW_ALL else if(choice == "Leaders") + if(current_setting == choice) + to_chat(src, SPAN_XENOWARNING("You already restrict special structure destruction to leaders only.")) + return to_chat(src, SPAN_XENONOTICE("You restrict special structure destruction to leaders only.")) - xeno_message("The Queen has restricted the destruction of special structures to leaders only.", hivenumber = src.hivenumber) - hive.destruction_allowed = XENO_LEADER + xeno_message("The Queen has restricted the destruction of special structures to leaders only.", hivenumber=hivenumber) + hive.hive_flags &= ~XENO_DECONSTRUCTION_NORMAL + hive.hive_flags |= XENO_DECONSTRUCTION_QUEEN|XENO_DECONSTRUCTION_LEADERS else if(choice == "Queen") + if(current_setting == choice) + to_chat(src, SPAN_XENOWARNING("You already forbid special structure destruction entirely.")) + return to_chat(src, SPAN_XENONOTICE("You forbid special structure destruction entirely.")) - xeno_message("The Queen has forbidden the destruction of special structures to all but herself.", hivenumber = src.hivenumber) - hive.destruction_allowed = XENO_QUEEN + xeno_message("The Queen has forbidden the destruction of special structures to all but herself.", hivenumber=hivenumber) + hive.hive_flags &= ~(XENO_DECONSTRUCTION_LEADERS|XENO_DECONSTRUCTION_NORMAL) + hive.hive_flags |= XENO_DECONSTRUCTION_QUEEN + + TIMER_COOLDOWN_START(src, COOLDOWN_TOGGLE_DECONSTRUCTION, 30 SECONDS) -/mob/living/carbon/xenomorph/proc/toggle_unnesting() +/mob/living/carbon/xenomorph/proc/unnesting_toggle() set name = "Permit/Disallow Unnesting" set desc = "Allows you to restrict unnesting to drones." set category = "Alien" if(stat) to_chat(src, SPAN_WARNING("You can't do that now.")) + + if(!hive) + to_chat(src, SPAN_WARNING("You can't do that now.")) + CRASH("[src] attempted to toggle unnesting without a linked hive") + + if(hive.hive_flags_locked) + to_chat(src, SPAN_WARNING("You can't do that now.")) + return + + if(TIMER_COOLDOWN_CHECK(src, COOLDOWN_TOGGLE_UNNESTING)) + to_chat(src, SPAN_WARNING("You must wait a bit before you can toggle this again.")) return - hive.unnesting_allowed = !hive.unnesting_allowed + var/current_setting = null + if(!(hive.hive_flags & XENO_UNNESTING_RESTRICTED)) + current_setting = "Anyone" + else if(hive.hive_flags & XENO_UNNESTING_RESTRICTED) + current_setting = "Drone castes" + + var/choice = tgui_input_list(src, "Choose which level of unnesting freedom to permit to your hive.", "Unnesting", list("Drone castes", "Anyone"), theme="hive_status", default=current_setting) + if(!choice) + return - if(hive.unnesting_allowed) + if(choice == "Anyone") + if(!(hive.hive_flags & XENO_UNNESTING_RESTRICTED)) + to_chat(src, SPAN_XENOWARNING("You have already allowed everyone to unnest hosts.")) + return to_chat(src, SPAN_XENONOTICE("You have allowed everyone to unnest hosts.")) - xeno_message("The Queen has allowed everyone to unnest hosts.", hivenumber = src.hivenumber) + xeno_message("The Queen has allowed everyone to unnest hosts.", hivenumber=hivenumber) + hive.hive_flags &= ~XENO_UNNESTING_RESTRICTED else + if(hive.hive_flags & XENO_UNNESTING_RESTRICTED) + to_chat(src, SPAN_XENOWARNING("You have already forbidden anyone to unnest hosts, except for the drone caste.")) + return to_chat(src, SPAN_XENONOTICE("You have forbidden anyone to unnest hosts, except for the drone caste.")) - xeno_message("The Queen has forbidden anyone to unnest hosts, except for the drone caste.", hivenumber = src.hivenumber) + xeno_message("The Queen has forbidden anyone to unnest hosts, except for the drone caste.", hivenumber=hivenumber) + hive.hive_flags |= XENO_UNNESTING_RESTRICTED + + TIMER_COOLDOWN_START(src, COOLDOWN_TOGGLE_UNNESTING, 30 SECONDS) /mob/living/carbon/xenomorph/queen/handle_screech_act(mob/self, mob/living/carbon/xenomorph/queen/queen) return COMPONENT_SCREECH_ACT_CANCEL @@ -936,8 +1078,6 @@ for(var/path in immobile_abilities) give_action(src, path) - add_verb(src, /mob/living/carbon/xenomorph/proc/xeno_tacmap) - ADD_TRAIT(src, TRAIT_ABILITY_NO_PLASMA_TRANSFER, TRAIT_SOURCE_ABILITY("Ovipositor")) ADD_TRAIT(src, TRAIT_ABILITY_OVIPOSITOR, TRAIT_SOURCE_ABILITY("Ovipositor")) @@ -985,8 +1125,6 @@ set_resin_build_order(GLOB.resin_build_order_drone) // This needs to occur before we update the abilities so we can update the choose resin icon refresh_combat_abilities() - remove_verb(src, /mob/living/carbon/xenomorph/proc/xeno_tacmap) - REMOVE_TRAIT(src, TRAIT_ABILITY_NO_PLASMA_TRANSFER, TRAIT_SOURCE_ABILITY("Ovipositor")) REMOVE_TRAIT(src, TRAIT_ABILITY_OVIPOSITOR, TRAIT_SOURCE_ABILITY("Ovipositor")) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Ravager.dm b/code/modules/mob/living/carbon/xenomorph/castes/Ravager.dm index 66ce478ca4b0..c1e89b2bde21 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Ravager.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Ravager.dm @@ -59,7 +59,6 @@ /datum/action/xeno_action/activable/pounce/charge, /datum/action/xeno_action/onclick/empower, /datum/action/xeno_action/activable/scissor_cut, - /datum/action/xeno_action/onclick/tacmap, ) icon_xeno = 'icons/mob/xenos/castes/tier_3/ravager.dmi' @@ -144,7 +143,7 @@ xeno.visible_message(SPAN_XENODANGER("[xeno] starts empowering!"), SPAN_XENODANGER("We start empowering ourself!")) activated_once = TRUE button.icon_state = "template_active" - get_inital_shield() + get_initial_shield() addtimer(CALLBACK(src, PROC_REF(timeout)), time_until_timeout) apply_cooldown() return ..() @@ -156,7 +155,7 @@ var/datum/behavior_delegate/ravager_base/behavior = xeno.behavior_delegate activated_once = FALSE - button.icon_state = "template" + button.icon_state = "template_xeno_xeno" xeno.visible_message(SPAN_XENOWARNING("[xeno] gets empowered by the surrounding enemies!"), SPAN_XENOWARNING("We feel a rush of power from the surrounding enemies!")) xeno.create_empower() @@ -218,7 +217,7 @@ xeno.visible_message(SPAN_DANGER("[xeno]'s glow slowly dims."), SPAN_XENOHIGHDANGER("Our glow fades away, the power leaving our form!")) xeno.remove_filter("empower_rage") -/datum/action/xeno_action/onclick/empower/proc/get_inital_shield() +/datum/action/xeno_action/onclick/empower/proc/get_initial_shield() var/mob/living/carbon/xenomorph/xeno = owner if(!activated_once) @@ -253,7 +252,7 @@ behavior.mid_charge = TRUE xeno.visible_message(SPAN_XENODANGER("[xeno] uses its shield to bash [human] as it charges at them!"), SPAN_XENODANGER("We use our shield to bash [human] as we charge at them!")) human.apply_effect(behavior.knockdown_amount, WEAKEN) - human.attack_alien(xeno, rand(xeno.melee_damage_lower, xeno.melee_damage_upper)) + human.attack_alien(xeno, rand(xeno.melee_damage_lower, xeno.melee_damage_upper), unblockable=TRUE) behavior.mid_charge = FALSE var/facing = get_dir(xeno, human) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Runner.dm b/code/modules/mob/living/carbon/xenomorph/castes/Runner.dm index 830bf6f9bcb0..94e5f3bc24fe 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Runner.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Runner.dm @@ -38,6 +38,7 @@ icon = 'icons/mob/xenos/castes/tier_1/runner.dmi' icon_state = "Runner Walking" icon_size = 64 + buckle_flags = CAN_BUCKLE layer = MOB_LAYER plasma_types = list(PLASMA_CATECHOLAMINE) tier = 1 @@ -60,7 +61,6 @@ /datum/action/xeno_action/activable/pounce/runner, /datum/action/xeno_action/activable/runner_skillshot, /datum/action/xeno_action/onclick/toggle_long_range/runner, - /datum/action/xeno_action/onclick/tacmap, ) inherent_verbs = list( /mob/living/carbon/xenomorph/proc/vent_crawl, @@ -88,6 +88,18 @@ if(is_zoomed) zoom_out() +/mob/living/carbon/xenomorph/runner/can_mount(mob/living/user, target_mounting = FALSE) + if(!target_mounting) + user = pulling + if(!ishuman(user)) + return FALSE + var/mob/living/carbon/human/human_pulled = user + if(human_pulled.stat == DEAD) + return FALSE + if(!istype(back, /obj/item/storage/backpack/marine/saddle)) //cant ride without a saddle + return FALSE + return TRUE + /datum/behavior_delegate/runner_base name = "Base Runner Behavior Delegate" diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Sentinel.dm b/code/modules/mob/living/carbon/xenomorph/castes/Sentinel.dm index 48ba8d08c509..3d87e6d6932e 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Sentinel.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Sentinel.dm @@ -38,6 +38,7 @@ plasma_types = list(PLASMA_NEUROTOXIN) pixel_x = -12 old_x = -12 + xenonid_pixel_x = -9 tier = 1 organ_value = 800 base_actions = list( @@ -49,7 +50,6 @@ /datum/action/xeno_action/activable/slowing_spit, //first macro /datum/action/xeno_action/activable/scattered_spit, //second macro /datum/action/xeno_action/onclick/paralyzing_slash, //third macro - /datum/action/xeno_action/onclick/tacmap, ) inherent_verbs = list( /mob/living/carbon/xenomorph/proc/vent_crawl, @@ -223,4 +223,4 @@ behavior.next_slash_buffed = FALSE to_chat(unbuffslash_user, SPAN_XENODANGER("We have waited too long, our slash will no longer apply neurotoxin!")) - button.icon_state = "template" + button.icon_state = "template_xeno" diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Spitter.dm b/code/modules/mob/living/carbon/xenomorph/castes/Spitter.dm index 21c7d1704c00..7ef2595cbc3a 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Spitter.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Spitter.dm @@ -15,7 +15,7 @@ caste_desc = "Ptui!" spit_types = list(/datum/ammo/xeno/acid, /datum/ammo/xeno/acid/spatter) - evolves_to = list(XENO_CASTE_PRAETORIAN, XENO_CASTE_BOILER) + evolves_to = list(XENO_CASTE_PRAETORIAN, XENO_CASTE_BOILER, XENO_CASTE_DESPOILER) deevolves_to = list(XENO_CASTE_SENTINEL) acid_level = 2 @@ -38,6 +38,7 @@ plasma_types = list(PLASMA_NEUROTOXIN) pixel_x = -12 old_x = -12 + xenonid_pixel_x = -9 organ_value = 2000 tier = 2 base_actions = list( @@ -49,7 +50,6 @@ /datum/action/xeno_action/activable/xeno_spit/spitter, /datum/action/xeno_action/onclick/charge_spit, /datum/action/xeno_action/activable/spray_acid/spitter, - /datum/action/xeno_action/onclick/tacmap, ) inherent_verbs = list( /mob/living/carbon/xenomorph/proc/vent_crawl, diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm b/code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm index e02235b75c57..d04b4cdfbb68 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm @@ -52,7 +52,6 @@ /datum/action/xeno_action/activable/warrior_punch, /datum/action/xeno_action/activable/lunge, /datum/action/xeno_action/activable/fling, - /datum/action/xeno_action/onclick/tacmap, ) claw_type = CLAW_TYPE_SHARP @@ -158,7 +157,7 @@ // This part is then outside the for loop if(final_lifesteal >= max_lifesteal) bound_xeno.add_filter("empower_rage", 1, list("type" = "outline", "color" = color, "size" = 1, "alpha" = 90)) - bound_xeno.visible_message(SPAN_DANGER("[bound_xeno.name] glows as it heals even more from its injuries!."), SPAN_XENODANGER("We glow as we heal even more from our injuries!")) + bound_xeno.visible_message(SPAN_DANGER("[bound_xeno.name] glows as it heals even more from its injuries!"), SPAN_XENODANGER("We glow as we heal even more from our injuries!")) bound_xeno.flick_heal_overlay(2 SECONDS, "#00B800") if(istype(bound_xeno) && world.time > emote_cooldown && bound_xeno) bound_xeno.emote("roar") diff --git a/code/modules/mob/living/carbon/xenomorph/castes/caste_datum.dm b/code/modules/mob/living/carbon/xenomorph/castes/caste_datum.dm index 08521af26d77..c8f2d5b3b3cf 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/caste_datum.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/caste_datum.dm @@ -42,7 +42,10 @@ ///Chance of deflecting projectiles. var/armor_deflection = 0 + var/fire_immunity = FIRE_IMMUNITY_NONE + /// If fire_immunity is set to be vulnerable, how much will fire damage be multiplied. Defines in xeno.dm + var/fire_modifier_mult = 0 var/fire_intensity_resistance = 0 /// Windup for spits @@ -100,9 +103,6 @@ var/caste_luminosity = 0 - /// if fire_immunity is set to be vulnerable, how much will fire damage be multiplied. Defines in xeno.dm - var/fire_vulnerability_mult = 0 - var/burrow_cooldown = 5 SECONDS var/tunnel_cooldown = 10 SECONDS ///whether the xeno heals even outside weeds. @@ -170,13 +170,3 @@ /datum/caste_datum/proc/get_caste_requirement(client/client) return minimum_xeno_playtime - client.get_total_xeno_playtime() - -/datum/caste_datum/proc/get_minimap_icon() - var/image/background = mutable_appearance('icons/ui_icons/map_blips.dmi', minimap_background) - - var/iconstate = minimap_icon ? minimap_icon : "unknown" - var/mutable_appearance/icon = image('icons/ui_icons/map_blips.dmi', icon_state = iconstate) - icon.appearance_flags = RESET_COLOR - background.overlays += icon - - return background diff --git a/code/modules/mob/living/carbon/xenomorph/castes/lesser_drone.dm b/code/modules/mob/living/carbon/xenomorph/castes/lesser_drone.dm index 1ddf4919ae66..30230e9b6386 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/lesser_drone.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/lesser_drone.dm @@ -44,6 +44,7 @@ icon = 'icons/mob/xenos/castes/tier_1/drone.dmi' icon_size = 48 icon_state = "Lesser Drone Walking" + xenonid_pixel_x = -9 plasma_types = list(PLASMA_PURPLE) tier = 0 mob_flags = NOBIOSCAN @@ -54,7 +55,7 @@ counts_for_slots = FALSE counts_for_roundend = FALSE refunds_larva_if_banished = FALSE - crit_health = 0 + health_threshold_dead = 0 gib_chance = 100 acid_blood_damage = 15 base_actions = list( @@ -67,7 +68,6 @@ /datum/action/xeno_action/onclick/plant_weeds/lesser, //first macro /datum/action/xeno_action/onclick/choose_resin, //second macro /datum/action/xeno_action/activable/secrete_resin, //third macro - /datum/action/xeno_action/onclick/tacmap, ) inherent_verbs = list( /mob/living/carbon/xenomorph/proc/vent_crawl, @@ -101,18 +101,19 @@ return age = XENO_NORMAL - hud_update() - xeno_jitter(25) +/mob/living/carbon/xenomorph/lesser_drone/warn_away_timer() + return // Ghostizing will just gib + /mob/living/carbon/xenomorph/lesser_drone/initialize_pass_flags(datum/pass_flags_container/PF) ..() if (PF) PF.flags_pass = PASS_MOB_IS_XENO|PASS_MOB_THRU_XENO PF.flags_can_pass_all = PASS_MOB_IS_XENO|PASS_MOB_THRU_XENO -/mob/living/carbon/xenomorph/lesser_drone/ghostize(can_reenter_corpse = FALSE, aghosted = FALSE) +/mob/living/carbon/xenomorph/lesser_drone/ghostize(can_reenter_corpse = FALSE, aghosted = FALSE, transfer = FALSE) . = ..() if(. && !aghosted && !QDELETED(src)) gib() diff --git a/code/modules/mob/living/carbon/xenomorph/damage_procs.dm b/code/modules/mob/living/carbon/xenomorph/damage_procs.dm index 5bed5dfd1b59..9054aeaf0a0e 100644 --- a/code/modules/mob/living/carbon/xenomorph/damage_procs.dm +++ b/code/modules/mob/living/carbon/xenomorph/damage_procs.dm @@ -44,7 +44,7 @@ return return ..() -/mob/living/carbon/xenomorph/ex_act(severity, direction, datum/cause_data/cause_data, pierce=0) +/mob/living/carbon/xenomorph/ex_act(severity, direction, datum/cause_data/cause_data, pierce=0, enviro=FALSE) if(body_position == LYING_DOWN && direction) severity *= EXPLOSION_PRONE_MULTIPLIER @@ -80,8 +80,8 @@ if (damage >= 0) b_loss += damage * 0.5 f_loss += damage * 0.5 - apply_damage(b_loss, BRUTE) - apply_damage(f_loss, BURN) + apply_damage(b_loss, BRUTE, enviro=enviro) + apply_damage(f_loss, BURN, enviro=enviro) updatehealth() var/powerfactor_value = round( damage * 0.05 ,1) @@ -136,12 +136,11 @@ return modified_damage -/mob/living/carbon/xenomorph/apply_damage(damage = 0, damagetype = BRUTE, def_zone = null, used_weapon = null, sharp = 0, edge = 0, force = FALSE) +/mob/living/carbon/xenomorph/apply_damage(damage = 0, damagetype = BRUTE, def_zone = null, used_weapon = null, sharp = 0, edge = 0, force = FALSE, enviro = FALSE , chemical = FALSE) if(!damage) return - - var/list/damagedata = list("damage" = damage) + var/list/damagedata = list("damage" = damage, "enviro" = enviro) if(SEND_SIGNAL(src, COMSIG_XENO_TAKE_DAMAGE, damagedata, damagetype) & COMPONENT_BLOCK_DAMAGE) return damage = damagedata["damage"] @@ -157,7 +156,8 @@ var/list/damage_data = list( "bonus_damage" = 0, - "damage" = damage + "damage" = damage, + "enviro" = enviro ) SEND_SIGNAL(src, COMSIG_BONUS_DAMAGE, damage_data) damage += damage_data["bonus_damage"] @@ -271,7 +271,7 @@ var/splash_chance = 40 //Base chance of getting splashed. Decreases with # of victims. var/i = 0 //Tally up our victims. - for(var/mob/living/carbon/human/victim in orange(radius, src)) //Loop through all nearby victims, including the tile. + for(var/mob/living/carbon/human/victim in range(radius, src)) //Loop through all nearby victims, including the tile. splash_chance = 65 - (i * 5) if(HAS_TRAIT(victim, TRAIT_HAULED)) continue diff --git a/code/modules/mob/living/carbon/xenomorph/death.dm b/code/modules/mob/living/carbon/xenomorph/death.dm index 73d71f4c010f..24b25417f8cd 100644 --- a/code/modules/mob/living/carbon/xenomorph/death.dm +++ b/code/modules/mob/living/carbon/xenomorph/death.dm @@ -3,6 +3,8 @@ /// Doesn't count tier 0 GLOBAL_VAR_INIT(total_dead_xenos, 0) +#define LAST_XENO_HEAL_COOLDOWN "last_xeno_heal_cooldown" + /mob/living/carbon/xenomorph/death(cause, gibbed) var/msg = "lets out a waning guttural screech, green blood bubbling from its maw." . = ..(cause, gibbed, msg) @@ -19,6 +21,9 @@ GLOBAL_VAR_INIT(total_dead_xenos, 0) if(SSticker?.mode?.hardcore) ghostize() + if(hauled_mob) + release_haul(stuns=FALSE) + set_light_range(0) if(pulledby) @@ -73,8 +78,10 @@ GLOBAL_VAR_INIT(total_dead_xenos, 0) if(hive && hive.living_xeno_queen == src) notify_ghosts(header = "Queen Death", message = "The Queen has been slain!", source = src, action = NOTIFY_ORBIT) - xeno_message(SPAN_XENOANNOUNCE("A sudden tremor ripples through the hive... the Queen has been slain! Vengeance!"),3, hivenumber) - hive.slashing_allowed = XENO_SLASH_ALLOWED + SScmtv.spectate_event("Queen Death", src) + xeno_message(SPAN_XENOANNOUNCE("A sudden tremor ripples through the hive... the Queen has been slain! Vengeance!"), 3, hivenumber) + if(!hive.hive_flags_locked) + hive.hive_flags = initial(hive.hive_flags) hive.set_living_xeno_queen(null) //on the off chance there was somehow two queen alive for(var/mob/living/carbon/xenomorph/queen/Q in GLOB.living_xeno_list) @@ -95,7 +102,7 @@ GLOBAL_VAR_INIT(total_dead_xenos, 0) playsound(loc, prob(50) == 1 ? 'sound/voice/alien_death.ogg' : 'sound/voice/alien_death2.ogg', 25, 1) var/area/A = get_area(src) if(hive && hive.living_xeno_queen) - if(!HAS_TRAIT(src, TRAIT_TEMPORARILY_MUTED)) + if(!HAS_TRAIT(src, TRAIT_TEMPORARILY_MUTED) && !hardcore) xeno_message("Hive: [src] has died[A? " at [sanitize_area(A.name)]":""]! [banished ? "They were banished from the hive." : ""]", death_fontsize, hivenumber) if(hive && IS_XENO_LEADER(src)) //Strip them from the Xeno leader list, if they are indexed in here @@ -137,7 +144,9 @@ GLOBAL_VAR_INIT(total_dead_xenos, 0) // Tell the xeno she is the last one, heal her and make her fight to the death if(xeno.client) to_chat(xeno, SPAN_XENOANNOUNCE("Your carapace rattles with RAGE. You are all that remains of the hive! Go out fighting, kill them all!")) - xeno.rejuvenate() + if(!TIMER_COOLDOWN_CHECK(xeno, LAST_XENO_HEAL_COOLDOWN)) + xeno.rejuvenate() + TIMER_COOLDOWN_START(xeno, LAST_XENO_HEAL_COOLDOWN, 10 MINUTES) if(!isqueen(xeno)) xeno.can_heal = FALSE notify_ghosts(header = "Last Xenomorph", message = "There is only one Xenomorph left: [xeno.name].", source = xeno, action = NOTIFY_ORBIT) @@ -178,3 +187,5 @@ GLOBAL_VAR_INIT(total_dead_xenos, 0) /mob/living/carbon/xenomorph/revive() SEND_SIGNAL(src, COMSIG_XENO_REVIVED) ..() + +#undef LAST_XENO_HEAL_COOLDOWN diff --git a/code/modules/mob/living/carbon/xenomorph/hive_faction.dm b/code/modules/mob/living/carbon/xenomorph/hive_faction.dm index e16a5cccd915..bc16134e22af 100644 --- a/code/modules/mob/living/carbon/xenomorph/hive_faction.dm +++ b/code/modules/mob/living/carbon/xenomorph/hive_faction.dm @@ -30,7 +30,7 @@ GLOBAL_LIST_INIT(hive_alliable_factions, generate_alliable_factions()) ui = SStgui.try_update_ui(user, src, ui) if(!ui) - ui = new(user, src, "HiveFaction", "[assoc_hive.name] Faction Panel") + ui = new(user, src, "HiveFaction", "[capitalize(assoc_hive.name)] Faction Panel") ui.open() ui.set_autoupdate(FALSE) diff --git a/code/modules/mob/living/carbon/xenomorph/hive_status.dm b/code/modules/mob/living/carbon/xenomorph/hive_status.dm index 2a7fa10d5606..188ee29bc176 100644 --- a/code/modules/mob/living/carbon/xenomorph/hive_status.dm +++ b/code/modules/mob/living/carbon/xenomorph/hive_status.dm @@ -1,5 +1,5 @@ /datum/hive_status - var/name = "Normal Hive" + var/name = FACTION_XENOMORPH // Used for the faction of the xenomorph. Not recommended to modify. var/internal_faction @@ -10,10 +10,13 @@ var/hivenumber = XENO_HIVE_NORMAL var/mob/living/carbon/xenomorph/queen/living_xeno_queen var/egg_planting_range = 15 - var/slashing_allowed = XENO_SLASH_ALLOWED //This initial var allows the queen to turn on or off slashing. Slashing off means harm intent does much less damage. - var/construction_allowed = NORMAL_XENO //Who can place construction nodes for special structures - var/destruction_allowed = NORMAL_XENO //Who can destroy special structures - var/unnesting_allowed = TRUE + + /// Toggles for the hive that are reset on queen death unless hive_flags_locked + var/hive_flags = XENO_SLASH_ALLOW_ALL|XENO_CONSTRUCTION_ALLOW_ALL|XENO_DECONSTRUCTION_ALLOW_ALL + + /// Whether hive_flags are locked (as in cannot be changed by a queen) + var/hive_flags_locked = FALSE + var/hive_orders = "" //What orders should the hive have var/color = null var/ui_color = null // Color for hive status collapsible buttons and xeno count list @@ -69,7 +72,7 @@ /// If hit limit of larva from pylons var/hit_larva_pylon_limit = FALSE - var/list/hive_inherant_traits + var/list/hive_inherited_traits // Cultist Info var/mob/living/carbon/leading_cult_sl @@ -95,6 +98,9 @@ var/list/list/hive_structures = list() //Stringref list of structures that have been built var/list/list/hive_constructions = list() //Stringref list of structures that are being built + /// Lazylist of possible caste defines the hive disallows evolution to + var/list/blacklisted_castes = null + var/datum/hive_status_ui/hive_ui var/datum/mark_menu_ui/mark_ui var/datum/hive_faction_ui/faction_ui @@ -102,6 +108,10 @@ var/list/tunnels = list() var/list/allies = list() + /// The list of factions this hive is forbidden to ally with. + var/list/banned_allies + /// Admin override var. + var/allow_banned_allies = FALSE var/list/resin_marks = list() @@ -130,7 +140,6 @@ /// This number divides the total xenos counted for slots to give the max number of lesser drones var/playable_lesser_drones_max_divisor = 3 - var/datum/tacmap/drawing/xeno/tacmap var/minimap_type = MINIMAP_FLAG_XENO /// Can this hive see humans on the tacmap @@ -165,12 +174,35 @@ /// Has a King hatchery var/has_hatchery = FALSE + // Hive Stat Modifiers + // Makes sweeping increases/decreases to certain stats of Xenos in the Hive + // Flat decreases obviously just need - added before the value (except for speed cause speed is special and needs the opposite) + var/list/hive_stat_modifier_multiplier = list( + "damage" = XENO_HIVE_STATMOD_MULT_NONE, + "health" = XENO_HIVE_STATMOD_MULT_NONE, + "armor" = XENO_HIVE_STATMOD_MULT_NONE, + "explosivearmor" = XENO_HIVE_STATMOD_MULT_NONE, + "plasmapool" = XENO_HIVE_STATMOD_MULT_NONE, + "plasmagain" = XENO_HIVE_STATMOD_MULT_NONE, + "speed" = XENO_HIVE_STATMOD_MULT_NONE, + "evasion" = XENO_HIVE_STATMOD_MULT_NONE, + ) + var/list/hive_stat_modifier_flat = list( + "damage" = XENO_HIVE_STATMOD_FLAT_NONE, + "health" = XENO_HIVE_STATMOD_FLAT_NONE, + "armor" = XENO_HIVE_STATMOD_FLAT_NONE, + "explosivearmor" = XENO_HIVE_STATMOD_FLAT_NONE, + "plasmapool" = XENO_HIVE_STATMOD_FLAT_NONE, + "plasmagain" = XENO_HIVE_STATMOD_FLAT_NONE, + "speed" = XENO_HIVE_STATMOD_FLAT_NONE, + "evasion" = XENO_HIVE_STATMOD_FLAT_NONE, + ) + /datum/hive_status/New() hive_ui = new(src) mark_ui = new(src) faction_ui = new(src) minimap_type = get_minimap_flag_for_faction(hivenumber) - tacmap = new(src, minimap_type) if(!internal_faction) internal_faction = name for(var/number in 1 to 999) @@ -188,6 +220,8 @@ RegisterSignal(SSdcs, COMSIG_GLOB_POST_SETUP, PROC_REF(post_setup)) + setup_banned_allies() + ///Generate the image()'s requried for the evolution radial menu. /datum/hive_status/proc/generate_evo_menu_images() for(var/datum/caste_datum/caste as anything in subtypesof(/datum/caste_datum)) @@ -216,6 +250,10 @@ for(var/datum/caste_datum/current_caste as anything in available_castes) castes_available += initial(current_caste.caste_type) + castes_available -= blacklisted_castes + if(!length(castes_available)) + return + var/castes = castes_available.Join(", ") xeno_message(SPAN_XENOANNOUNCE("The Hive is now strong enough to support: [castes]")) xeno_maptext("The Hive can now support: [castes]", "Hive Strengthening") @@ -232,11 +270,15 @@ playsound_client(current_mob.client, get_sfx("evo_screech"), current_mob.loc, 70, "minor") if(ishuman(current_mob)) - to_chat(current_mob, SPAN_HIGHDANGER("You hear a distant screech and feel your insides freeze up... something new is with you in this colony.")) + to_chat(current_mob, SPAN_HIGHDANGER("You hear a distant screech and feel your insides freeze up... something new is with you in this colony.")) if(issynth(current_mob)) to_chat(current_mob, SPAN_HIGHDANGER("You hear the distant call of an unknown bioform, it sounds like they're informing others to change form. You begin to analyze and decrypt the strange vocalization.")) +/datum/hive_status/proc/setup_banned_allies() + banned_allies = DEFAULT_ALLY_BAN_LIST + banned_allies -= name + /// Adds a xeno to this hive /datum/hive_status/proc/add_xeno(mob/living/carbon/xenomorph/X) if(!X || !istype(X)) @@ -460,7 +502,7 @@ list(XENO_CASTE_LARVA = 0, XENO_CASTE_QUEEN = 0), list(XENO_CASTE_DRONE = 0, XENO_CASTE_RUNNER = 0, XENO_CASTE_SENTINEL = 0, XENO_CASTE_DEFENDER = 0), list(XENO_CASTE_HIVELORD = 0, XENO_CASTE_BURROWER = 0, XENO_CASTE_CARRIER = 0, XENO_CASTE_LURKER = 0, XENO_CASTE_SPITTER = 0, XENO_CASTE_WARRIOR = 0), - list(XENO_CASTE_BOILER = 0, XENO_CASTE_CRUSHER = 0, XENO_CASTE_PRAETORIAN = 0, XENO_CASTE_RAVAGER = 0) + list(XENO_CASTE_BOILER = 0, XENO_CASTE_CRUSHER = 0, XENO_CASTE_PRAETORIAN = 0, XENO_CASTE_RAVAGER = 0, XENO_CASTE_DESPOILER = 0) ) for(var/mob/living/carbon/xenomorph/xeno as anything in totalXenos) @@ -482,7 +524,7 @@ list(XENO_CASTE_LARVA = "", XENO_CASTE_QUEEN = "", XENO_CASTE_PREDALIEN_LARVA = "", XENO_CASTE_HELLHOUND = ""), list(XENO_CASTE_DRONE = "", XENO_CASTE_RUNNER = "", XENO_CASTE_SENTINEL = "", XENO_CASTE_DEFENDER = "", XENO_CASTE_PREDALIEN = ""), list(XENO_CASTE_HIVELORD = "", XENO_CASTE_BURROWER = "", XENO_CASTE_CARRIER = "", XENO_CASTE_LURKER = "", XENO_CASTE_SPITTER = "", XENO_CASTE_WARRIOR = ""), - list(XENO_CASTE_BOILER = "", XENO_CASTE_CRUSHER = "", XENO_CASTE_PRAETORIAN = "", XENO_CASTE_RAVAGER = "") + list(XENO_CASTE_BOILER = "", XENO_CASTE_CRUSHER = "", XENO_CASTE_PRAETORIAN = "", XENO_CASTE_RAVAGER = "", XENO_CASTE_DESPOILER = "") ) for(var/caste in GLOB.xeno_datum_list) @@ -789,7 +831,7 @@ qdel(xeno) continue if(xeno.hunter_data.hunted && !isqueen(xeno)) - to_chat(xeno, SPAN_XENOANNOUNCE("The Queen has left without you, seperating you from her hive! You must defend yourself from the headhunter before you can enter hibernation...")) + to_chat(xeno, SPAN_XENOANNOUNCE("The Queen has left without you, separating you from her hive! You must defend yourself from the headhunter before you can enter hibernation...")) xeno.set_hive_and_update(XENO_HIVE_FORSAKEN) else to_chat(xeno, SPAN_XENOANNOUNCE("The Queen has left without you, you quickly find a hiding place to enter hibernation as you lose touch with the hive mind.")) @@ -800,16 +842,17 @@ continue if(xeno.tier >= 1) xenos_count++ - for(var/i in GLOB.alive_mob_list) - var/mob/living/potential_host = i - if(!(potential_host.status_flags & XENO_HOST)) - continue + for(var/mob/living/potential_host as anything in GLOB.alive_mob_list) if(!is_ground_level(potential_host.z) || get_area(potential_host) == hijacked_dropship) continue - var/obj/item/alien_embryo/A = locate() in potential_host - if(A && A.hivenumber != hivenumber) + var/obj/item/clothing/mask/facehugger/hugger = locate() in potential_host + if(hugger && hugger.hivenumber == hivenumber) + hugger.hivenumber = XENO_HIVE_FORSAKEN + if(!(potential_host.status_flags & XENO_HOST)) continue for(var/obj/item/alien_embryo/embryo in potential_host) + if(embryo.hivenumber != hivenumber) + continue embryo.hivenumber = XENO_HIVE_FORSAKEN potential_host.update_med_icon() for(var/mob/living/carbon/human/current_human as anything in GLOB.alive_human_list) @@ -953,8 +996,8 @@ to_chat(user, SPAN_WARNING("You cannot become a facehugger until you are no longer alive in a nest.")) return FALSE - if(world.time - user.client?.player_details.larva_queue_time < XENO_JOIN_DEAD_TIME) - var/time_left = floor((user.client.player_details.larva_queue_time + XENO_JOIN_DEAD_TIME - world.time) / 10) + if(world.time - user.client?.player_details.larva_pool_time < XENO_JOIN_DEAD_TIME) + var/time_left = floor((user.client.player_details.larva_pool_time + XENO_JOIN_DEAD_TIME - world.time) / 10) to_chat(user, SPAN_WARNING("You ghosted too recently. You cannot become a facehugger until [XENO_JOIN_DEAD_TIME / 600] minutes have passed ([time_left] seconds remaining).")) return FALSE @@ -1033,8 +1076,8 @@ to_chat(user, SPAN_WARNING("You cannot become a lesser drone until you are no longer alive in a nest.")) return FALSE - if(world.time - user.client?.player_details.larva_queue_time < XENO_JOIN_DEAD_TIME) - var/time_left = floor((user.client.player_details.larva_queue_time + XENO_JOIN_DEAD_TIME - world.time) / 10) + if(world.time - user.client?.player_details.larva_pool_time < XENO_JOIN_DEAD_TIME) + var/time_left = floor((user.client.player_details.larva_pool_time + XENO_JOIN_DEAD_TIME - world.time) / 10) to_chat(user, SPAN_WARNING("You ghosted too recently. You cannot become a lesser drone until [XENO_JOIN_DEAD_TIME / 600] minutes have passed ([time_left] seconds remaining).")) return FALSE @@ -1111,7 +1154,7 @@ stored_larva++ /datum/hive_status/corrupted - name = "Corrupted Hive" + name = FACTION_XENOMORPH_CORRUPTED reporting_id = "corrupted" hivenumber = XENO_HIVE_CORRUPTED prefix = "Corrupted " @@ -1137,8 +1180,11 @@ return TRUE return FALSE +/datum/hive_status/corrupted/setup_banned_allies() + banned_allies = list(FACTION_XENOMORPH_TUTORIAL, FACTION_XENOMORPH_HELLHOUNDS) + /datum/hive_status/alpha - name = "Alpha Hive" + name = FACTION_XENOMORPH_ALPHA reporting_id = "alpha" hivenumber = XENO_HIVE_ALPHA prefix = "Alpha " @@ -1149,7 +1195,7 @@ dynamic_evolution = FALSE /datum/hive_status/bravo - name = "Bravo Hive" + name = FACTION_XENOMORPH_BRAVO reporting_id = "bravo" hivenumber = XENO_HIVE_BRAVO prefix = "Bravo " @@ -1160,7 +1206,7 @@ dynamic_evolution = FALSE /datum/hive_status/charlie - name = "Charlie Hive" + name = FACTION_XENOMORPH_CHARLIE reporting_id = "charlie" hivenumber = XENO_HIVE_CHARLIE prefix = "Charlie " @@ -1171,7 +1217,7 @@ dynamic_evolution = FALSE /datum/hive_status/delta - name = "Delta Hive" + name = FACTION_XENOMORPH_DELTA reporting_id = "delta" hivenumber = XENO_HIVE_DELTA prefix = "Delta " @@ -1182,15 +1228,14 @@ dynamic_evolution = FALSE /datum/hive_status/feral - name = "Feral Hive" + name = FACTION_XENOMORPH_FERAL reporting_id = "feral" hivenumber = XENO_HIVE_FERAL prefix = "Feral " color = "#828296" ui_color = "#828296" - construction_allowed = XENO_NOBODY - destruction_allowed = XENO_NOBODY + hive_flags = parent_type::hive_flags & ~(XENO_CONSTRUCTION_ALLOW_ALL|XENO_DECONSTRUCTION_ALLOW_ALL) dynamic_evolution = FALSE allow_no_queen_actions = TRUE allow_no_queen_evo = TRUE @@ -1199,7 +1244,7 @@ tacmap_requires_queen_ovi = FALSE /datum/hive_status/forsaken - name = "Forsaken Hive" + name = FACTION_XENOMORPH_FORSAKEN reporting_id = "forsaken" hivenumber = XENO_HIVE_FORSAKEN prefix = "Forsaken " @@ -1216,11 +1261,32 @@ need_round_end_check = TRUE + hive_stat_modifier_multiplier = list( + "damage" = XENO_HIVE_STATMOD_MULT_NONE, + "health" = XENO_HIVE_STATMOD_MULT_MED, + "armor" = XENO_HIVE_STATMOD_MULT_NONE, + "explosivearmor" = XENO_HIVE_STATMOD_MULT_NONE, + "plasmapool" = XENO_HIVE_STATMOD_MULT_NONE, + "plasmagain" = XENO_HIVE_STATMOD_MULT_LOW, + "speed" = XENO_HIVE_STATMOD_MULT_NONE, + "evasion" = XENO_HIVE_STATMOD_MULT_NONE, + ) + hive_stat_modifier_flat = list( + "damage" = XENO_HIVE_STATMOD_FLAT_10, + "health" = XENO_HIVE_STATMOD_FLAT_NONE, + "armor" = XENO_HIVE_STATMOD_FLAT_15, + "explosivearmor" = XENO_HIVE_STATMOD_FLAT_30, + "plasmapool" = XENO_HIVE_STATMOD_FLAT_NONE, + "plasmagain" = XENO_HIVE_STATMOD_FLAT_NONE, + "speed" = -XENO_HIVE_STATMOD_FLAT_LOWMED_SPEED, + "evasion" = XENO_HIVE_STATMOD_FLAT_NONE, + ) + /datum/hive_status/forsaken/can_delay_round_end(mob/living/carbon/xenomorph/xeno) return FALSE /datum/hive_status/tutorial - name = "Tutorial Hive" + name = FACTION_XENOMORPH_TUTORIAL reporting_id = "tutorial" hivenumber = XENO_HIVE_TUTORIAL prefix = "Inquisitive " @@ -1239,11 +1305,14 @@ XENO_STRUCTURE_RECOVERY = 999, ) +/datum/hive_status/tutorial/setup_banned_allies() + banned_allies = list("All") + /datum/hive_status/tutorial/can_delay_round_end(mob/living/carbon/xenomorph/xeno) return FALSE /datum/hive_status/yautja - name = "Hellhound Pack" + name = FACTION_XENOMORPH_HELLHOUNDS reporting_id = "hellhounds" hivenumber = XENO_HIVE_YAUTJA internal_faction = FACTION_YAUTJA @@ -1261,19 +1330,45 @@ /datum/hive_status/yautja/can_delay_round_end(mob/living/carbon/xenomorph/xeno) return FALSE +/datum/hive_status/hunted + name = FACTION_XENOMORPH_HUNTED + reporting_id = "hunted" + hivenumber = XENO_HIVE_HUNTED + + ui_color = "#135029" + dynamic_evolution = FALSE + allow_no_queen_actions = TRUE + allow_no_queen_evo = TRUE + allow_queen_evolve = FALSE + latejoin_burrowed = FALSE + tacmap_requires_queen_ovi = TRUE // No tacmap + + need_round_end_check = TRUE + + blacklisted_castes = list( + XENO_CASTE_DRONE, + XENO_CASTE_QUEEN, + XENO_CASTE_BURROWER, + XENO_CASTE_CARRIER, + XENO_CASTE_HIVELORD, + ) + +/datum/hive_status/hunted/can_delay_round_end(mob/living/carbon/xenomorph/xeno) + return FALSE + /datum/hive_status/mutated - name = "Mutated Hive" + name = FACTION_XENOMORPH_MUTATED reporting_id = "mutated" hivenumber = XENO_HIVE_MUTATED prefix = "Mutated " color = "#6abd99" ui_color = "#6abd99" - hive_inherant_traits = list(TRAIT_XENONID, TRAIT_NO_COLOR) + hive_inherited_traits = list(TRAIT_XENONID, TRAIT_NO_COLOR) latejoin_burrowed = FALSE /datum/hive_status/corrupted/tamed - name = "Tamed Hive" + name = FACTION_XENOMORPH_TAMED reporting_id = "tamed" hivenumber = XENO_HIVE_TAMED prefix = "Tamed " @@ -1289,6 +1384,10 @@ var/mob/living/carbon/human/leader var/list/allied_factions +// Tamed allies are handled differently. +/datum/hive_status/corrupted/tamed/setup_banned_allies() + banned_allies = list("All") + /datum/hive_status/corrupted/tamed/New() . = ..() hive_structures_limit[XENO_STRUCTURE_EGGMORPH] = 0 @@ -1337,7 +1436,7 @@ return ..() /datum/hive_status/corrupted/renegade - name = "Renegade Hive" + name = FACTION_XENOMORPH_RENEGADE reporting_id = "renegade" hivenumber = XENO_HIVE_RENEGADE prefix = "Renegade " @@ -1355,6 +1454,9 @@ for(var/faction in FACTION_LIST_HUMANOID) //renegades allied to all humanoids, but it mostly affects structures. Their ability to attack humanoids and other xenos (including of the same hive) depends on iff settings allies[faction] = TRUE +/datum/hive_status/corrupted/renegade/setup_banned_allies() + banned_allies = FACTION_LIST_XENOMORPH + /datum/hive_status/corrupted/renegade/can_spawn_as_hugger(mob/dead/observer/user) to_chat(user, SPAN_WARNING("The [name] cannot support facehuggers.")) return FALSE @@ -1380,23 +1482,27 @@ /datum/hive_status/corrupted/renegade/faction_is_ally(faction, ignore_queen_check = TRUE) return ..() -/datum/hive_status/proc/on_queen_death() //break alliances on queen's death - if(allow_no_queen_actions || living_xeno_queen) - return +/datum/hive_status/proc/break_all_alliances() var/broken_alliances = FALSE for(var/faction in allies) if(!allies[faction]) continue change_stance(faction, FALSE) broken_alliances = TRUE + return broken_alliances +/datum/hive_status/proc/on_queen_death() //on queen's death + if(allow_no_queen_actions || living_xeno_queen) + return - if(broken_alliances) + if(break_all_alliances()) xeno_message(SPAN_XENOANNOUNCE("With the death of the Queen, all alliances have been broken."), 3, hivenumber) /datum/hive_status/proc/change_stance(faction, should_ally) if(faction == name) return + if(!allow_banned_allies && should_ally && (("All" in banned_allies) || (faction in banned_allies))) + return if(allies[faction] == should_ally) return allies[faction] = should_ally @@ -1581,7 +1687,7 @@ /datum/xeno_mark_define var/name = "xeno_declare" var/icon_state = "empty" - var/desc = "Xenos make psychic markers with this meaning as positional lasting communication to eachother" + var/desc = "Xenos make psychic markers with this meaning as positional lasting communication to eachother." /datum/xeno_mark_define/fortify name = "Fortify" diff --git a/code/modules/mob/living/carbon/xenomorph/hive_status_ui.dm b/code/modules/mob/living/carbon/xenomorph/hive_status_ui.dm index 10c63e25b844..bd37342fdd85 100644 --- a/code/modules/mob/living/carbon/xenomorph/hive_status_ui.dm +++ b/code/modules/mob/living/carbon/xenomorph/hive_status_ui.dm @@ -165,6 +165,12 @@ .["hive_location"] = hive_location .["burrowed_larva"] = burrowed_larva .["evilution_level"] = evilution_level + .["evilution_note"] = "" + if(!assoc_hive.allow_no_queen_evo) + if(!assoc_hive.living_xeno_queen) + .["evilution_note"] = " (NO QUEEN)" + else if(!(assoc_hive.living_xeno_queen.ovipositor || assoc_hive.evolution_without_ovipositor)) + .["evilution_note"] = " (NO OVIPOSITOR)" .["pylon_status"] = pylon_status .["xeno_background"] = xeno_background @@ -193,7 +199,7 @@ ui = SStgui.try_update_ui(user, src, ui) if (!ui) - ui = new(user, src, "HiveStatus", "[assoc_hive.name] Status") + ui = new(user, src, "HiveStatus", "[capitalize(assoc_hive.name)] Status") ui.open() ui.set_autoupdate(FALSE) diff --git a/code/modules/mob/living/carbon/xenomorph/items/iff_tag.dm b/code/modules/mob/living/carbon/xenomorph/items/iff_tag.dm index a23fc9dc52f6..bdb6e8c50117 100644 --- a/code/modules/mob/living/carbon/xenomorph/items/iff_tag.dm +++ b/code/modules/mob/living/carbon/xenomorph/items/iff_tag.dm @@ -49,7 +49,7 @@ faction_groups |= id_faction_groups if("Remove") faction_groups = list() - to_chat(programmer, SPAN_NOTICE("You [option] the IFF group data, the IFF group on the tag now reads as: [english_list(faction_groups, "None")]")) + to_chat(programmer, SPAN_NOTICE("You [option] the IFF group data, the IFF group on the tag now reads as: [english_list(faction_groups, "None")].")) if(xeno?.hive.hivenumber == XENO_HIVE_RENEGADE) //it's important to know their IFF settings for renegade to_chat(xeno, SPAN_NOTICE("Your instincts have changed, you seem compelled to protect [english_list(faction_groups, "no one")].")) return TRUE diff --git a/code/modules/mob/living/carbon/xenomorph/life.dm b/code/modules/mob/living/carbon/xenomorph/life.dm index cbfa93359363..7f81ce714da6 100644 --- a/code/modules/mob/living/carbon/xenomorph/life.dm +++ b/code/modules/mob/living/carbon/xenomorph/life.dm @@ -18,7 +18,6 @@ zoom_out() if(stat != DEAD) //Stop if dead. Performance boost - update_progression() //Status updates, death etc. @@ -34,21 +33,39 @@ handle_environment() if(client) handle_regular_hud_updates() + warn_away_timer() + +/mob/living/carbon/xenomorph/proc/warn_away_timer() + if(away_timer != XENO_LEAVE_TIMER - XENO_AVAILABLE_TIMER) + return + if(aghosted) + return + if(health <= 0) + return + var/area/area = get_area(src) + if(should_block_game_interaction(src) && (!area || !(area.flags_area & AREA_ALLOW_XENO_JOIN))) + return //xenos on admin z level don't count + + to_chat(client, SPAN_ALERTWARNING("You are inactive and will be available to ghosts in [XENO_AVAILABLE_TIMER] second\s!")) + playsound_client(client, sound('sound/effects/xeno_evolveready.ogg')) /mob/living/carbon/xenomorph/proc/update_progression() if(isnull(hive)) return + if(!caste) + return + var/progress_amount = 1 if(SSxevolution) progress_amount = SSxevolution.get_evolution_boost_power(hive.hivenumber) - var/ovipositor_check = (hive.allow_no_queen_evo || hive.evolution_without_ovipositor || (hive.living_xeno_queen && hive.living_xeno_queen.ovipositor)) - if(caste && caste.evolution_allowed && (ovipositor_check || caste?.evolve_without_queen)) + var/ovipositor_check = hive.allow_no_queen_evo || hive.evolution_without_ovipositor || (hive.living_xeno_queen && hive.living_xeno_queen.ovipositor) + if(caste.evolution_allowed && (ovipositor_check || caste.evolve_without_queen)) if(evolution_stored >= evolution_threshold) if(!got_evolution_message) evolve_message() got_evolution_message = TRUE - if(ROUND_TIME < XENO_ROUNDSTART_PROGRESS_TIME_2) + if(ROUND_TIME < XENO_ROUNDSTART_BOOSTED_EVO_TIME) evolution_stored += progress_amount return @@ -81,9 +98,9 @@ if(istype(G)) G.die() drop_inv_item_on_ground(G) - if(!caste || !(caste.fire_immunity & FIRE_IMMUNITY_NO_DAMAGE) || fire_reagent.fire_penetrating) - if(caste.fire_immunity & FIRE_VULNERABILITY && caste.fire_vulnerability_mult >= 1) - apply_damage(PASSIVE_BURN_DAM_CALC(fire_reagent.intensityfire, fire_reagent.durationfire, fire_stacks) * caste.fire_vulnerability_mult, BURN) + if(!(fire_immunity & (FIRE_IMMUNITY_NO_DAMAGE || FIRE_IMMUNITY_COMPLETE)) || fire_reagent.fire_penetrating) + if(fire_immunity & FIRE_MODIFIER && fire_modifier_mult != 1) + apply_damage(PASSIVE_BURN_DAM_CALC(fire_reagent.intensityfire, fire_reagent.durationfire, fire_stacks) * fire_modifier_mult, BURN) else apply_damage(armor_damage_reduction(GLOB.xeno_fire, PASSIVE_BURN_DAM_CALC(fire_reagent.intensityfire, fire_reagent.durationfire, fire_stacks)), BURN) INVOKE_ASYNC(src, TYPE_PROC_REF(/mob, emote), pick("roar", "needhelp")) @@ -141,7 +158,7 @@ if(frenzy_aura != frenzy_new || warding_aura != warding_new || recovery_aura != recovery_new) frenzy_aura = frenzy_new - if(health > crit_health || warding_new > warding_aura || !check_weeds_for_healing()) + if(health > health_threshold_dead || warding_new > warding_aura || !check_weeds_for_healing()) warding_aura = warding_new recovery_aura = recovery_new recalculate_move_delay = TRUE @@ -182,7 +199,7 @@ /mob/living/carbon/xenomorph/handle_regular_status_updates(regular_update = TRUE) - if(regular_update && health <= 0 && (!caste || (caste.fire_immunity & FIRE_IMMUNITY_NO_IGNITE) || !on_fire)) //Sleeping Xenos are also unconscious, but all crit Xenos are under 0 HP. Go figure + if(regular_update && health <= 0 && ((fire_immunity & (FIRE_IMMUNITY_NO_IGNITE || FIRE_IMMUNITY_COMPLETE)) || !on_fire)) //Sleeping Xenos are also unconscious, but all crit Xenos are under 0 HP. Go figure if(!check_weeds_for_healing()) //In crit, damage is maximal if you're caught off weeds apply_damage(2.5 - warding_aura*0.5, BRUTE) //Warding can heavily lower the impact of bleedout. Halved at 2.5 phero, stopped at 5 phero else @@ -295,7 +312,7 @@ clear_fullscreen("dazed") /*Heal 1/70th of your max health in brute per tick. 1 as a bonus, to help smaller pools. -Additionally, recovery pheromones mutiply this base healing, up to 2.5 times faster at level 5 +Additionally, recovery pheromones multiply this base healing, up to 2.5 times faster at level 5 Modified via m, to multiply the number of wounds healed. Heal from fire half as fast Xenos don't actually take oxyloss, oh well @@ -319,9 +336,9 @@ Make sure their actual health updates immediately.*/ if(!current_turf || !istype(current_turf)) return - var/recoveryActual = (!caste || (caste.fire_immunity & FIRE_IMMUNITY_NO_IGNITE) || !on_fire) ? recovery_aura : 0 + var/recoveryActual = ((fire_immunity & (FIRE_IMMUNITY_NO_IGNITE || FIRE_IMMUNITY_COMPLETE)) || !on_fire) ? recovery_aura : 0 var/env_temperature = loc.return_temperature() - if(caste && !(caste.fire_immunity & FIRE_IMMUNITY_NO_DAMAGE)) + if(caste && !(fire_immunity & (FIRE_IMMUNITY_NO_DAMAGE || FIRE_IMMUNITY_COMPLETE))) if(env_temperature > (T0C + 66)) apply_damage((env_temperature - (T0C + 66)) / 5, BURN) //Might be too high, check in testing. updatehealth() //Make sure their actual health updates immediately @@ -493,9 +510,9 @@ Make sure their actual health updates immediately.*/ health = maxHealth - getFireLoss() - getBruteLoss() //Xenos can only take brute and fire damage. if(stat != DEAD && !gibbing) - var/warding_health = crit_health != 0 ? warding_aura * 20 : 0 - if(health <= crit_health - warding_health) //dead - if(prob(gib_chance + 0.5*(crit_health - health))) + var/warding_health = health_threshold_dead != 0 ? warding_aura * 20 : 0 + if(health <= health_threshold_dead - warding_health) //dead + if(prob(gib_chance + 0.5*(health_threshold_dead - health))) async_gib(last_damage_data) else death(last_damage_data) diff --git a/code/modules/mob/living/carbon/xenomorph/resin_constructions.dm b/code/modules/mob/living/carbon/xenomorph/resin_constructions.dm index 524a1020e451..5433863d390b 100644 --- a/code/modules/mob/living/carbon/xenomorph/resin_constructions.dm +++ b/code/modules/mob/living/carbon/xenomorph/resin_constructions.dm @@ -74,7 +74,7 @@ return FALSE if(istype(T, /turf/closed/wall)) // Can't build in walls with no density - to_chat(X, SPAN_WARNING("This area is too unstable to support a construction")) + to_chat(X, SPAN_WARNING("This area is too unstable to support a construction.")) return FALSE if(!X.check_alien_construction(T, check_doors = !can_build_on_doors)) diff --git a/code/modules/mob/living/carbon/xenomorph/say.dm b/code/modules/mob/living/carbon/xenomorph/say.dm index 969109a47fe3..1e0ffb688315 100644 --- a/code/modules/mob/living/carbon/xenomorph/say.dm +++ b/code/modules/mob/living/carbon/xenomorph/say.dm @@ -92,7 +92,7 @@ if(!message || stat || !hive) return - if(!hive.living_xeno_queen && !SSticker?.mode?.hardcore && !hive.allow_no_queen_actions && ROUND_TIME > SSticker.mode.round_time_evolution_ovipositor) + if(!hive.living_xeno_queen && !SSticker?.mode?.hardcore && !hive.allow_no_queen_actions && SSticker.mode.evolution_ovipositor_threshold) to_chat(src, SPAN_WARNING("There is no Queen. You are alone.")) return @@ -121,7 +121,7 @@ if(S.client.prefs && S.client.prefs.toggles_chat & CHAT_GHOSTHIVEMIND) track = "(F)" if(isqueen(src)) - var/mob/hologram/queen/queen_eye = client?.eye + var/mob/hologram/queen/queen_eye = client?.get_eye() if(istype(queen_eye)) track += " (E)" ghostrend = SPAN_XENOQUEEN("Hivemind, [src.name][track] hisses, '[message]'") diff --git a/code/modules/mob/living/carbon/xenomorph/seethrough.dm b/code/modules/mob/living/carbon/xenomorph/seethrough.dm index ba24721edb18..290d5bbbec24 100644 --- a/code/modules/mob/living/carbon/xenomorph/seethrough.dm +++ b/code/modules/mob/living/carbon/xenomorph/seethrough.dm @@ -35,7 +35,7 @@ render_source_atom.appearance_flags |= ( RESET_COLOR | RESET_TRANSFORM) - render_source_atom.vis_flags |= (VIS_INHERIT_ID | VIS_INHERIT_PLANE | VIS_INHERIT_LAYER) + render_source_atom.vis_flags |= (VIS_INHERIT_ID | VIS_INHERIT_PLANE | VIS_INHERIT_LAYER | VIS_UNDERLAY) render_source_atom.render_source = "*transparent_bigmob[personal_uid]" diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/crusher/charger.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/crusher/charger.dm index 02c659ad06c3..8fda44609fcb 100644 --- a/code/modules/mob/living/carbon/xenomorph/strains/castes/crusher/charger.dm +++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/crusher/charger.dm @@ -631,7 +631,7 @@ // ye olde weldertanke -/obj/structure/reagent_dispensers/fueltank/handle_charge_collision(mob/living/carbon/xenomorph/xeno, datum/action/xeno_action/onclick/charger_charge/charger_ability) +/obj/structure/reagent_dispensers/tank/fuel/handle_charge_collision(mob/living/carbon/xenomorph/xeno, datum/action/xeno_action/onclick/charger_charge/charger_ability) if(!charger_ability.momentum) charger_ability.stop_momentum() return @@ -680,7 +680,7 @@ COMSIG_XENO_STOP_MOMENTUM, COMSIG_XENO_START_CHARGING, )) - button.icon_state = "template" + button.icon_state = "template_xeno" return ..() /datum/action/xeno_action/activable/tumble/use_ability(atom/Target) diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/hivelord/designer.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/hivelord/designer.dm index 5f0735582b96..b1d1c20b8cee 100644 --- a/code/modules/mob/living/carbon/xenomorph/strains/castes/hivelord/designer.dm +++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/hivelord/designer.dm @@ -97,7 +97,7 @@ /datum/design_mark var/name = "xeno_declare" var/icon_state = "empty" - var/desc = "Xenos make psychic markers with this meaning as positional lasting communication to eachother" + var/desc = "Xenos make psychic markers with this meaning as positional lasting communication to eachother." /datum/design_mark/resin_wall name = "Resin Wall" @@ -1147,7 +1147,7 @@ if(owner.client.prefs.no_radials_preference) choice = tgui_input_list(owner, "Choose Desing Option", "Pick", options, theme="hive_status") else - choice = show_radial_menu(owner, owner?.client.eye, options, radius = 50) + choice = show_radial_menu(owner, owner?.client.get_eye(), options, radius = 50) var/des = FALSE var/rem = FALSE diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/hivelord/resin_whisperer.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/hivelord/resin_whisperer.dm index a67579acb3a6..087ed055046d 100644 --- a/code/modules/mob/living/carbon/xenomorph/strains/castes/hivelord/resin_whisperer.dm +++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/hivelord/resin_whisperer.dm @@ -12,7 +12,7 @@ /datum/action/xeno_action/active_toggle/toggle_speed, ) actions_to_add = list( - /datum/action/xeno_action/activable/secrete_resin/remote, //third macro + /datum/action/xeno_action/activable/secrete_resin/remote/whisperer, //third macro /datum/action/xeno_action/onclick/toggle_long_range/whisperer, //fourth macro /datum/action/xeno_action/activable/transfer_plasma/hivelord, // readding it so it gets at the end of the ability list /datum/action/xeno_action/active_toggle/toggle_speed, // readding it so it gets at the end of the ability list @@ -33,7 +33,6 @@ var/datum/action/xeno_action/onclick/choose_resin/choose_resin_ability = action choose_resin_ability.update_button_icon(hivelord.selected_resin) break // Don't need to keep looking - /* * Coerce Resin ability */ @@ -48,7 +47,7 @@ no_cooldown_msg = TRUE - build_speed_mod = 2.5 // the actual building part takes twice as long + build_speed_mod = 2.5 macro_path = /datum/action/xeno_action/verb/verb_coerce_resin action_type = XENO_ACTION_CLICK @@ -56,6 +55,12 @@ var/last_use = 0 var/care_about_adjacency = TRUE +/datum/action/xeno_action/activable/secrete_resin/remote/whisperer + xeno_cooldown = 1.5 SECONDS // Slower than a drone, faster than a queen. + xeno_cooldown_interrupt_modifier = 1 // Spam penalty like value of xeno_cooldown + xeno_cooldown_fail = 0.5 // She specializes in this, which is why she adapts better after mistakes. + build_speed_mod = 1.5 // She builds the walls and then proceeds to the next ones as planned without any unnecessary waiting. + /datum/action/xeno_action/activable/secrete_resin/remote/use_ability(atom/target_atom, mods) if(!can_remote_build()) to_chat(owner, SPAN_XENONOTICE("We must be standing on weeds to establish a connection to the resin.")) diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/praetorian/dancer.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/praetorian/dancer.dm index 9d46eff47252..75e9e4ecdf82 100644 --- a/code/modules/mob/living/carbon/xenomorph/strains/castes/praetorian/dancer.dm +++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/praetorian/dancer.dm @@ -163,7 +163,7 @@ if (behavior.dodge_activated) behavior.dodge_activated = FALSE - button.icon_state = "template" + button.icon_state = "template_xeno" dodge_remove.speed_modifier += speed_buff_amount dodge_remove.remove_temp_pass_flags(PASS_MOB_THRU) dodge_remove.recalculate_speed() diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/praetorian/oppressor.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/praetorian/oppressor.dm index 3b717bd1afbd..0379febfd282 100644 --- a/code/modules/mob/living/carbon/xenomorph/strains/castes/praetorian/oppressor.dm +++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/praetorian/oppressor.dm @@ -112,22 +112,58 @@ break var/blocked = FALSE - for(var/obj/structure/structure in temp) - if(structure.opacity || ((istype(structure, /obj/structure/barricade) || istype(structure, /obj/structure/girder) && structure.density || istype(structure, /obj/structure/machinery/door)) && structure.density)) + var/allow_one_more_step = FALSE + for(var/obj/structure in temp) + if(istype(structure, /obj/effect/particle_effect/smoke)) + continue + if(!structure.density && !structure.opacity) + continue + if(istype(structure, /obj/structure/girder)) blocked = TRUE - break + continue + if(istype(structure, /obj/structure/window/reinforced)) + var/obj/structure/window/reinforced/pane_glass = structure + var/pane_facing = pane_glass.dir + if(pane_facing == turn(facing, 180)) + blocked = TRUE + else if(pane_facing == facing) + allow_one_more_step = TRUE + continue + if(istype(structure, /obj/structure/surface/table)) + var/obj/structure/surface/table/flip_table = structure + var/table_facing = flip_table.dir + if(flip_table.flipped) + if(table_facing == turn(facing, 180)) + blocked = TRUE + else if(table_facing == facing) + allow_one_more_step = TRUE + continue + if(istype(structure, /obj/structure/barricade)) + var/obj/structure/barricade/cade = structure + var/cade_facing = cade.dir + if(cade_facing == turn(facing, 180)) + blocked = TRUE + else if(cade_facing == facing) + allow_one_more_step = TRUE + continue + if(structure.pass_flags.flags_can_pass_all & PASS_HIGH_OVER) + continue + blocked = TRUE if(blocked) break turf = temp - if (turf in turflist) + if(turf in turflist) break turflist += turf facing = get_dir(turf, atom) telegraph_atom_list += new /obj/effect/xenomorph/xeno_telegraph/abduct_hook(turf, windup) + if(allow_one_more_step) + break + if(!length(turflist)) to_chat(abduct_user, SPAN_XENOWARNING("We don't have any room to do our abduction!")) return @@ -159,39 +195,39 @@ abduct_user.visible_message(SPAN_XENODANGER("\The [abduct_user] suddenly uncoils its tail, firing it towards [atom]!"), SPAN_XENODANGER("We uncoil our tail, sending it out towards \the [atom]!")) var/list/targets = list() - for (var/turf/target_turf in turflist) - for (var/mob/living/carbon/target in target_turf) + for(var/turf/target_turf in turflist) + for(var/mob/living/carbon/target in target_turf) if(!isxeno_human(target) || abduct_user.can_not_harm(target) || target.is_dead() || target.is_mob_incapacitated(TRUE) || target.mob_size >= MOB_SIZE_BIG) continue targets += target - if (LAZYLEN(targets) == 1) - abduct_user.balloon_alert(abduct_user, "our tail catches and slows one target!", text_color = "#51a16c") - else if (LAZYLEN(targets) == 2) - abduct_user.balloon_alert(abduct_user, "our tail catches and roots two targets!", text_color = "#51a16c") - else if (LAZYLEN(targets) >= 3) - abduct_user.balloon_alert(abduct_user, "our tail catches and stuns [LAZYLEN(targets)] targets!", text_color = "#51a16c") + if(LAZYLEN(targets) == 1) + abduct_user.balloon_alert(abduct_user, "slowed one target", text_color = "#51a16c") + else if(LAZYLEN(targets) == 2) + abduct_user.balloon_alert(abduct_user, "rooted two targets", text_color = "#51a16c") + else if(LAZYLEN(targets) >= 3) + abduct_user.balloon_alert(abduct_user, "stunned [LAZYLEN(targets)] targets", text_color = "#51a16c") apply_cooldown() - for (var/mob/living/carbon/target in targets) + for(var/mob/living/carbon/target in targets) abduct_user.visible_message(SPAN_XENODANGER("\The [abduct_user]'s hooked tail coils itself around [target]!"), SPAN_XENODANGER("Our hooked tail coils itself around [target]!")) target.apply_effect(0.2, WEAKEN) - if (LAZYLEN(targets) == 1) + if(LAZYLEN(targets) == 1) new /datum/effects/xeno_slow(target, abduct_user, null, null, 2.5 SECONDS) target.apply_effect(1, SLOW) - else if (LAZYLEN(targets) == 2) + else if(LAZYLEN(targets) == 2) ADD_TRAIT(target, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Abduct")) - if (ishuman(target)) + if(ishuman(target)) var/mob/living/carbon/human/target_human = target target_human.update_xeno_hostile_hud() addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(unroot_human), target, TRAIT_SOURCE_ABILITY("Abduct")), get_xeno_stun_duration(target, 2.5 SECONDS)) to_chat(target, SPAN_XENOHIGHDANGER("[abduct_user] has pinned you to the ground! You cannot move!")) target.set_effect(2, DAZE) - else if (LAZYLEN(targets) >= 3) + else if(LAZYLEN(targets) >= 3) target.apply_effect(get_xeno_stun_duration(target, 1.3), WEAKEN) to_chat(target, SPAN_XENOHIGHDANGER("You are slammed into the other victims of [abduct_user]!")) diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/praetorian/valkyrie.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/praetorian/valkyrie.dm index fc713e46274f..6232fad98629 100644 --- a/code/modules/mob/living/carbon/xenomorph/strains/castes/praetorian/valkyrie.dm +++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/praetorian/valkyrie.dm @@ -10,7 +10,6 @@ /datum/action/xeno_action/activable/pounce/base_prae_dash, /datum/action/xeno_action/activable/prae_acid_ball, /datum/action/xeno_action/activable/spray_acid/base_prae_spray_acid, - /datum/action/xeno_action/onclick/tacmap, ) actions_to_add = list( /datum/action/xeno_action/activable/tail_stab/tail_fountain, @@ -19,7 +18,6 @@ /datum/action/xeno_action/activable/high_gallop, /datum/action/xeno_action/onclick/fight_or_flight, /datum/action/xeno_action/activable/prae_retrieve, - /datum/action/xeno_action/onclick/tacmap, ) diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/praetorian/vanguard.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/praetorian/vanguard.dm index 57df69eb71ca..2f259dc39e2e 100644 --- a/code/modules/mob/living/carbon/xenomorph/strains/castes/praetorian/vanguard.dm +++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/praetorian/vanguard.dm @@ -205,7 +205,7 @@ return activated_once = FALSE - button.icon_state = dash_user.selected_ability == src ? "template_on" : "template" + button.icon_state = dash_user.selected_ability == src ? "template_on" : "template_xeno" var/list/target_mobs = list() var/list/list_of_targets = orange(1, dash_user) diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/berserker.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/berserker.dm index 68c0f910a5dd..80e265d2fedd 100644 --- a/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/berserker.dm +++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/berserker.dm @@ -222,7 +222,7 @@ var/debilitate = TRUE // Do we apply neg. status effects to the target? if (carbon.mob_size >= MOB_SIZE_BIG) - to_chat(xeno, SPAN_XENOWARNING("We creature is too massive to target")) + to_chat(xeno, SPAN_XENOWARNING("We creature is too massive to target.")) return if (carbon.stat == DEAD) diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm index 87fcf0d55622..653feba9bb31 100644 --- a/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm +++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm @@ -177,7 +177,7 @@ return shield_active = FALSE - button.icon_state = "template" + button.icon_state = "template_xeno" for (var/datum/xeno_shield/shield in xeno.xeno_shields) if (shield.shield_source == XENO_SHIELD_SOURCE_HEDGE_RAV) diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/runner/acid.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/runner/acid.dm index 9adc1f1a7288..e5df2e3f3d26 100644 --- a/code/modules/mob/living/carbon/xenomorph/strains/castes/runner/acid.dm +++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/runner/acid.dm @@ -89,11 +89,11 @@ if(target_human.stat == DEAD) return - for(var/datum/effects/acid/acid_effect in target_mob.effects_list) - qdel(acid_effect) - break - - new /datum/effects/acid(target_mob, bound_xeno, initial(bound_xeno.caste_type)) + var/datum/effects/acid/acid_effect = locate() in target_mob.effects_list + if(acid_effect) + acid_effect.prolong_duration() + else + new /datum/effects/acid(target_mob, bound_xeno, initial(bound_xeno.caste_type)) if(isxeno_human(target_mob)) //Will the runner get acid stacks var/obj/item/alien_embryo/embryo = locate(/obj/item/alien_embryo) in target_mob.contents if(embryo?.stage >= 4) //very late stage hugged in case the runner unnests them diff --git a/code/modules/mob/living/carbon/xenomorph/strains/xeno_strain.dm b/code/modules/mob/living/carbon/xenomorph/strains/xeno_strain.dm index 2d774c627b54..3c0bb563ecf6 100644 --- a/code/modules/mob/living/carbon/xenomorph/strains/xeno_strain.dm +++ b/code/modules/mob/living/carbon/xenomorph/strains/xeno_strain.dm @@ -33,6 +33,10 @@ for(var/action_path in actions_to_add) give_action(xeno, action_path) + var/datum/action/minimap/ref = xeno.minimap_ref.resolve() + ref.remove_from(xeno) + ref.give_to(xeno, ref) + // Update the xeno's behavior delegate. if(behavior_delegate_type) if(xeno.behavior_delegate) @@ -101,7 +105,7 @@ /mob/living/carbon/xenomorph/verb/reset_strain() set name = "Reset Strain" - set desc = "Reset your strain" + set desc = "Reset your strain." set category = "Alien" // Firstly, make sure the xeno is actually able to take a strain. @@ -109,7 +113,7 @@ return if(!COOLDOWN_FINISHED(src, next_strain_reset)) - to_chat(src, SPAN_WARNING("We lack the strength to reset our strain. We will be able to reset it in [round((next_strain_reset - world.time) / 600, 1)] minutes")) + to_chat(src, SPAN_WARNING("We lack the strength to reset our strain. We will be able to reset it in [round((next_strain_reset - world.time) / 600, 1)] minutes.")) return // Show the user the strain's description, and double check that they want it. diff --git a/code/modules/mob/living/carbon/xenomorph/update_icons.dm b/code/modules/mob/living/carbon/xenomorph/update_icons.dm index 08116dbaff9b..f85adbe7791d 100644 --- a/code/modules/mob/living/carbon/xenomorph/update_icons.dm +++ b/code/modules/mob/living/carbon/xenomorph/update_icons.dm @@ -29,17 +29,34 @@ /mob/living/carbon/xenomorph/proc/update_icon_source() if(HAS_TRAIT(src, TRAIT_XENONID)) - icon = icon_xenonid + if(!icon_xenonid) + if(HAS_TRAIT_FROM(src, TRAIT_NO_COLOR, TRAIT_SOURCE_HIVE)) + REMOVE_TRAIT(src, TRAIT_NO_COLOR, TRAIT_SOURCE_HIVE) + color = hive.color + else + icon = icon_xenonid if(isqueen(src)) var/mob/living/carbon/xenomorph/queen/Q = src Q.queen_standing_icon = icon_xenonid Q.queen_ovipositor_icon = 'icons/mob/xenonids/castes/tier_4/ovipositor.dmi' + if(!isnull(xenonid_pixel_x)) + old_x = xenonid_pixel_x + pixel_x = xenonid_pixel_x + if(!isnull(xenonid_pixel_y)) + old_y = xenonid_pixel_y + pixel_y = xenonid_pixel_y else icon = icon_xeno if(isqueen(src)) var/mob/living/carbon/xenomorph/queen/Q = src Q.queen_standing_icon = icon_xeno Q.queen_ovipositor_icon = 'icons/mob/xenos/castes/tier_4/ovipositor.dmi' + if(!isnull(xenonid_pixel_x)) + old_x = src::old_x + pixel_x = src::pixel_x + if(!isnull(xenonid_pixel_y)) + old_y = src::old_y + pixel_y = src::pixel_y var/mutation_caste_state = "[get_strain_icon()] [caste.caste_type]" if(!walking_state_cache[mutation_caste_state]) @@ -51,6 +68,7 @@ walking_state_cache[mutation_caste_state] = cache_walking_state has_walking_icon_state = walking_state_cache[mutation_caste_state] update_icons() + color = HAS_TRAIT(src, TRAIT_NO_COLOR) ? null : hive.color /mob/living/carbon/xenomorph/update_icons() if(!caste) @@ -104,6 +122,8 @@ . = ..() update_icons() update_wounds() + overlays -= acid_overlay + /mob/living/carbon/xenomorph/on_floored_end() . = ..() update_icons() @@ -333,7 +353,7 @@ var/new_icon_state - if(health > HEALTH_THRESHOLD_DEAD) + if(health > health_threshold_dead) if(health_threshold > 3) new_icon_state = "none" else if(body_position == LYING_DOWN) diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_helpers.dm b/code/modules/mob/living/carbon/xenomorph/xeno_helpers.dm index 2bca2ca224fd..4d4185882b7c 100644 --- a/code/modules/mob/living/carbon/xenomorph/xeno_helpers.dm +++ b/code/modules/mob/living/carbon/xenomorph/xeno_helpers.dm @@ -1,5 +1,5 @@ /mob/living/carbon/xenomorph/can_ventcrawl() - return (mob_size < MOB_SIZE_BIG && caste.can_vent_crawl) + return (mob_size < MOB_SIZE_BIG && caste.can_vent_crawl && !LAZYLEN(buckled_mobs)) /mob/living/carbon/xenomorph/ventcrawl_carry() var/mob/living/carbon/human/user = hauled_mob?.resolve() @@ -13,15 +13,17 @@ return FALSE /mob/living/carbon/xenomorph/proc/can_destroy_special() - if(hive) - if(IS_XENO_LEADER(src)) - if(hive.destruction_allowed == NORMAL_XENO || hive.destruction_allowed == XENO_LEADER) - return TRUE - if(hive.destruction_allowed == NORMAL_XENO && isxeno_builder(src)) + if(!hive) + return FALSE + if(isqueen(src)) + if(HAS_FLAG(hive.hive_flags, XENO_DECONSTRUCTION_QUEEN)) return TRUE - if(isqueen(src)) + else if(IS_XENO_LEADER(src)) + if(HAS_FLAG(hive.hive_flags, XENO_DECONSTRUCTION_LEADERS)) + return TRUE + else if(isxeno_builder(src)) + if(HAS_FLAG(hive.hive_flags, XENO_DECONSTRUCTION_NORMAL)) return TRUE - return FALSE /mob/living/carbon/xenomorph/proc/get_plasma_percentage() diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_verbs.dm b/code/modules/mob/living/carbon/xenomorph/xeno_verbs.dm index b8b6d7895b00..dbfb8b41241b 100644 --- a/code/modules/mob/living/carbon/xenomorph/xeno_verbs.dm +++ b/code/modules/mob/living/carbon/xenomorph/xeno_verbs.dm @@ -7,7 +7,7 @@ if(!hive) return - if((!hive.living_xeno_queen || SSmapping.configs[GROUND_MAP].map_name == MAP_WHISKEY_OUTPOST) && !hive.allow_no_queen_actions) //No Hive status on WO + if((!hive.living_xeno_queen) && !hive.allow_no_queen_actions) to_chat(src, SPAN_WARNING("There is no Queen. We are alone.")) return @@ -104,7 +104,7 @@ /mob/living/carbon/xenomorph/verb/toggle_auto_shove() set name = "Toggle Automatic Shove" - set desc = "Toggles whethever you will automatically shove people as the Queen" + set desc = "Toggles whethever you will automatically shove people as the Queen." set category = "Alien" @@ -155,9 +155,20 @@ if(observed_xeno) overwatch(observed_xeno, TRUE) +/mob/living/carbon/xenomorph/verb/view_tacmaps() + set name = "View Tacmap" + set category = "Alien" + GLOB.tacmap_viewer.tgui_interact(src) + +/mob/living/carbon/xenomorph/look_up() + if(is_zoomed) + to_chat(src, SPAN_WARNING("You cannot look up while zoomed!")) + return + + . = ..() // /mob/living/carbon/xenomorph/verb/enter_tree() // set name = "Enter Techtree" -// set desc = "Enter the Xenomorph techtree" +// set desc = "Enter the Xenomorph techtree." // set category = "Alien.Techtree" // var/datum/techtree/T = GET_TREE(TREE_XENO) diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm index aeb0159c84f3..03ff52069d2a 100644 --- a/code/modules/mob/living/damage_procs.dm +++ b/code/modules/mob/living/damage_procs.dm @@ -15,11 +15,12 @@ Returns standard 0 if fail */ -/mob/living/proc/apply_damage(damage = 0, damagetype = BRUTE, def_zone = null, used_weapon = null, sharp = 0, edge = 0, force = FALSE) + +/mob/living/proc/apply_damage(damage = 0, damagetype = BRUTE, def_zone = null, used_weapon = null, sharp = 0, edge = 0, force = FALSE, enviro = FALSE , chemical = FALSE) if(!damage) return FALSE - var/list/damagedata = list("damage" = damage) + var/list/damagedata = list("damage" = damage, "enviro" = enviro) if(SEND_SIGNAL(src, COMSIG_MOB_TAKE_DAMAGE, damagedata, damagetype) & COMPONENT_BLOCK_DAMAGE) return damage = damagedata["damage"] @@ -28,7 +29,7 @@ if(BRUTE) adjustBruteLoss(damage) if(BURN) - adjustFireLoss(damage) + adjustFireLoss(damage, chemical) if(TOX) adjustToxLoss(damage) if(OXY) @@ -46,21 +47,21 @@ updatehealth() return 1 -/mob/living/proc/apply_damages(brute = 0, burn = 0, tox = 0, oxy = 0, clone = 0, halloss = 0, brain = 0, def_zone = null) +/mob/living/proc/apply_damages(brute = 0, burn = 0, tox = 0, oxy = 0, clone = 0, halloss = 0, brain = 0, def_zone = null, chemical = FALSE) if(brute) - apply_damage(brute, BRUTE, def_zone) + apply_damage(brute, BRUTE, def_zone, chemical) if(burn) - apply_damage(burn, BURN, def_zone) + apply_damage(burn, BURN, def_zone, chemical) if(tox) - apply_damage(tox, TOX, def_zone) + apply_damage(tox, TOX, def_zone, chemical) if(oxy) - apply_damage(oxy, OXY, def_zone) + apply_damage(oxy, OXY, def_zone, chemical) if(clone) - apply_damage(clone, CLONE, def_zone) + apply_damage(clone, CLONE, def_zone, chemical) if(halloss) - apply_damage(halloss, HALLOSS, def_zone) + apply_damage(halloss, HALLOSS, def_zone, chemical) if(brain) - apply_damage(brain, BRAIN, def_zone) + apply_damage(brain, BRAIN, def_zone, chemical) return 1 /mob/living/proc/apply_internal_damage(damage = 0, organ) @@ -104,7 +105,7 @@ if(EYE_BLUR) EyeBlur(effect) if(DROWSY) - drowsyness = max(drowsyness, effect) + drowsiness = max(drowsiness, effect) if(ROOT) Root(effect) updatehealth() @@ -139,7 +140,7 @@ if(EYE_BLUR) AdjustEyeBlur(effect) if(DROWSY) - drowsyness = POSITIVE(drowsyness + effect) + drowsiness = POSITIVE(drowsiness + effect) if(ROOT) AdjustRoot(effect) updatehealth() @@ -171,7 +172,7 @@ if(EYE_BLUR) SetEyeBlur(effect) if(DROWSY) - drowsyness = POSITIVE(effect) + drowsiness = POSITIVE(effect) if(ROOT) SetRoot(effect) updatehealth() diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index c2114bd8353d..9ef0a24c2eab 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -23,10 +23,11 @@ GLOB.living_mob_list += src /mob/living/Destroy() + GLOB.living_player_list -= src GLOB.living_mob_list -= src cleanup_status_effects() pipes_shown = null - observed_atom = null + QDEL_NULL(observed_atom) . = ..() @@ -72,8 +73,7 @@ for(var/obj/limb/affecting in H.limbs) if(!affecting) continue - if(affecting.take_damage(0, divided_damage+extradam)) //TODO: fix the extradam stuff. Or, ebtter yet...rewrite this entire proc ~Carn - H.UpdateDamageIcon() + affecting.take_damage(0, divided_damage+extradam) //TODO: fix the extradam stuff. Or, better yet...rewrite this entire proc ~Carn H.updatehealth() return 1 @@ -107,7 +107,7 @@ if(passed_object) if(recursion > 8) - debug_log("Recursion went long for get_contents() for [src] ending at the object [passed_object]. Likely object_one is holding object_two which is holding object_one ad naseum.") + debug_log("Recursion went long for get_contents() for [src] ending at the object [passed_object]. Likely object_one is holding object_two which is holding object_one ad nauseum.") return total_contents total_contents += passed_object.contents @@ -150,7 +150,7 @@ if(client) to_chat(usr, "[src]'s Metainfo:
[client.prefs.metadata]") else - to_chat(usr, "[src] does not have any stored infomation!") + to_chat(usr, "[src] does not have any stored information!") else to_chat(usr, "OOC Metadata is not supported by this server!") @@ -226,7 +226,7 @@ /mob/living/resist_grab(moving_resist) if(!pulledby) return - // vars for checks of strengh + // vars for checks of strength var/pulledby_is_strong = HAS_TRAIT(pulledby, TRAIT_SUPER_STRONG) var/src_is_strong = HAS_TRAIT(src, TRAIT_SUPER_STRONG) @@ -262,11 +262,11 @@ . += 10 do_bump_delay = 0 - if (drowsyness > 0) + if (drowsiness > 0) . += 6 - if(pulling && pulling.drag_delay && get_pull_miltiplier()) //Dragging stuff can slow you down a bit. - var/pull_delay = pulling.get_pull_drag_delay() * get_pull_miltiplier() + if(pulling && pulling.drag_delay && get_pull_multiplier()) //Dragging stuff can slow you down a bit. + var/pull_delay = pulling.get_pull_drag_delay() * get_pull_multiplier() var/grab_level_delay = 0 switch(grab_level) @@ -274,6 +274,10 @@ grab_level_delay = 6 if(GRAB_CHOKE) grab_level_delay = 9 + if(ismob(pulling)) + var/mob/pulled_mob = pulling + if(pulled_mob.pulling) + grab_level_delay = 9 // its a chain pull... . += max(pull_speed + (pull_delay + reagent_move_delay_modifier) + grab_level_delay, 0) //harder grab makes you slower move_delay = . @@ -296,7 +300,7 @@ . = drag_delay //whether we are slowed when dragging things -/mob/living/proc/get_pull_miltiplier() +/mob/living/proc/get_pull_multiplier() if(!HAS_TRAIT(src, TRAIT_DEXTROUS)) if(grab_level == GRAB_CARRY) return 0.1 @@ -371,6 +375,14 @@ to_chat(src, SPAN_WARNING("[living_mob] is restraining [pulled_mob], you cannot push past.")) now_pushing = FALSE return + if(!pulling) + // treat it as if we're also pulling just for move delay + pulling = living_mob.pulling + if(client) + client.recalculate_move_delay() + else + movement_delay() + pulling = null if(ishuman(living_mob)) if(!(living_mob.status_flags & CANPUSH)) @@ -415,13 +427,6 @@ ..() -/mob/living/throw_atom(atom/target, range, speed = 0, atom/thrower, spin, launch_type = NORMAL_LAUNCH, pass_flags = NO_FLAGS, list/end_throw_callbacks, list/collision_callbacks, tracking = FALSE) - var/turf/above = SSmapping.get_turf_above(thrower) - if(above && above.z == target.z) - to_chat(thrower, SPAN_WARNING("You can't throw someone that high!")) - return - ..() - /mob/living/launch_towards(datum/launch_metadata/LM, tracking = FALSE) if(src) SEND_SIGNAL(src, COMSIG_MOB_MOVE_OR_LOOK, TRUE, dir, dir) @@ -498,7 +503,7 @@ // If this proc causes issues you can probably disable it until then. /mob/living/carbon/update_stat() if(stat != DEAD) - if(health <= HEALTH_THRESHOLD_DEAD) + if(health <= health_threshold_dead) death() return else if(HAS_TRAIT(src, TRAIT_KNOCKEDOUT)) @@ -552,6 +557,7 @@ return . = lying_angle lying_angle = new_lying + SEND_SIGNAL(src, COMSIG_LIVING_SET_LYING_ANGLE) if(lying_angle != lying_prev) update_transform(instant_update = on_movement) // Don't use transition for eg. crawling movement, because we already have the movement glide lying_prev = lying_angle diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index d892c96b90a5..4f8c1eccbbf9 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -21,11 +21,18 @@ /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) +/mob/living/emp_act(severity, datum/cause_data/cause_data) . = ..() - var/list/L = src.get_contents() - for(var/obj/O in L) - O.emp_act(severity) + var/list/my_stuff = get_contents() + for(var/obj/thing in my_stuff) + thing.emp_act(severity, cause_data) + +/mob/living/carbon/human/emp_act(severity, datum/cause_data/cause_data) + . = ..() + if(isspeciessynth(src)) + to_chat(src, SPAN_DANGER("*BZZZT*")) + to_chat(src, SPAN_DANGER("Warning: Electromagnetic pulse detected.")) + log_emp(src, cause_data) //this proc handles being hit by a thrown atom /mob/living/hitby(atom/movable/AM) @@ -77,7 +84,7 @@ if(assailant) src.attack_log += text("\[[time_stamp()]\] Has been hit with \a [O], thrown by [key_name(M)]") M.attack_log += text("\[[time_stamp()]\] Hit [key_name(src)] with a thrown [O]") - if(!istype(src,/mob/living/simple_animal/mouse)) + if(!istype(src,/mob/living/simple_animal/small/mouse)) if(src.loc) msg_admin_attack("[key_name(src)] was hit by \a [O], thrown by [key_name(M)] in [get_area(src)] ([src.loc.x],[src.loc.y],[src.loc.z]).", src.loc.x, src.loc.y, src.loc.z) else diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm index 197d3018d89b..21626c3a528d 100644 --- a/code/modules/mob/living/living_defines.dm +++ b/code/modules/mob/living/living_defines.dm @@ -5,6 +5,11 @@ var/maxHealth = 100 //Maximum health that should be possible. var/health = 100 //A mob's health + ///How much health a mob has when it dies. + var/health_threshold_dead = -100 + ///How much health a mob has when it goes into crit state. + var/health_threshold_crit = -50 + //Damage related vars, NOTE: THESE SHOULD ONLY BE MODIFIED BY PROCS var/bruteloss = 0 //Brutal damage caused by brute force (punching, being clubbed by a toolbox ect... this also accounts for pressure damage) var/oxyloss = 0 //Oxygen depravation damage (no air in lungs) @@ -55,7 +60,6 @@ var/fire_stacks = 0 //Tracks how many stacks of fire we have on, max is var/datum/reagent/fire_reagent - var/is_being_hugged = 0 //Is there a hugger humping our face? var/chestburst = 0 // 0: normal, 1: bursting, 2: bursted. var/first_xeno = FALSE //Are they the first wave of infected? var/in_stasis = FALSE //Is the mob in stasis bag? diff --git a/code/modules/mob/living/living_health_procs.dm b/code/modules/mob/living/living_health_procs.dm index e82a1ea19a2c..d8e5b61269de 100644 --- a/code/modules/mob/living/living_health_procs.dm +++ b/code/modules/mob/living/living_health_procs.dm @@ -39,7 +39,7 @@ /mob/living/getFireLoss() return fireloss -/mob/living/proc/adjustFireLoss(amount) +/mob/living/proc/adjustFireLoss(amount, chemical = FALSE) if(status_flags & GODMODE) return 0 //godmode fireloss = min(max(fireloss + amount, 0),(maxHealth*2)) @@ -104,7 +104,7 @@ if(S) return S.get_duration_left() / GLOBAL_STATUS_MULTIPLIER return 0 -/mob/living/proc/Stun(amount) +/mob/living/proc/Stun(amount, resistible = FALSE) if(!(status_flags & CANSTUN)) return amount = GetStunDuration(amount) @@ -113,9 +113,9 @@ if(nst_stim.get_property(PROPERTY_NERVESTIMULATING)) nst_stim.volume += max(min((-1*amount)/10, 0), -10) if(S) - S.update_duration(amount, increment = TRUE) + S.update_duration(amount, increment=TRUE, resistible=resistible) else if(amount > 0) - S = apply_status_effect(/datum/status_effect/incapacitating/stun, amount) + S = apply_status_effect(/datum/status_effect/incapacitating/stun, amount, resistible) return S /mob/living/proc/SetStun(amount, ignore_canstun = FALSE) //Sets remaining duration if(!(status_flags & CANSTUN)) @@ -509,10 +509,9 @@ return COMPONENT_NO_IGNITE // heal ONE limb, organ gets randomly selected from damaged ones. -/mob/living/proc/heal_limb_damage(brute, burn) +/mob/living/proc/heal_limb_damage(brute, burn, chemical = FALSE) apply_damage(-brute, BRUTE) - apply_damage(-burn, BURN) - src.updatehealth() + apply_damage(-burn, BURN, chemical = chemical) // damage ONE limb, organ gets randomly selected from damaged ones. /mob/living/proc/take_limb_damage(brute, burn) @@ -520,13 +519,11 @@ return 0 //godmode apply_damage(brute, BRUTE) apply_damage(burn, BURN) - src.updatehealth() // heal MANY limbs, in random order /mob/living/proc/heal_overall_damage(brute, burn) apply_damage(-brute, BRUTE) apply_damage(-burn, BURN) - src.updatehealth() // damage MANY limbs, in random order /mob/living/proc/take_overall_damage(brute, burn, used_weapon = null, limb_damage_chance = 80) @@ -534,17 +531,13 @@ return 0 //godmode apply_damage(brute, BRUTE) apply_damage(burn, BURN) - src.updatehealth() /mob/living/proc/restore_all_organs() return - - /mob/living/proc/revive(keep_viruses) rejuvenate() - /mob/living/proc/rejuvenate() heal_all_damage() @@ -555,7 +548,7 @@ recalculate_move_delay = TRUE sdisabilities = 0 disabilities = 0 - drowsyness = 0 + drowsiness = 0 hallucination = 0 jitteriness = 0 dizziness = 0 diff --git a/code/modules/mob/living/living_healthscan.dm b/code/modules/mob/living/living_healthscan.dm index d878f97d817a..79e6186bcac3 100644 --- a/code/modules/mob/living/living_healthscan.dm +++ b/code/modules/mob/living/living_healthscan.dm @@ -56,7 +56,7 @@ GLOBAL_LIST_INIT(known_implants, subtypesof(/obj/item/implant)) if(!ui) ui = new(user, src, "HealthScan", "Health Scan") ui.open() - ui.set_autoupdate(FALSE) + ui.set_autoupdate(isobserver(user)) /** * Returns TRUE if the target is either dead or appears to be dead. @@ -184,9 +184,16 @@ GLOBAL_LIST_INIT(known_implants, subtypesof(/obj/item/implant)) bleeding_check = TRUE break - if((!limb.brute_dam && !limb.burn_dam && !(limb.status & LIMB_DESTROYED)) && !bleeding_check && !internal_bleeding_check && !(implant && detail_level >= DETAIL_LEVEL_BODYSCAN ) && !(limb.status & LIMB_UNCALIBRATED_PROSTHETIC) && !(limb.status & LIMB_BROKEN) && !(limb.status & LIMB_SPLINTED) && !(limb.status & LIMB_SPLINTED_INDESTRUCTIBLE) && !(limb.get_incision_depth())) + if(!limb.brute_dam && !limb.burn_dam && !(limb.status & (LIMB_THIRD_DEGREE_BURNS|LIMB_ESCHAR|LIMB_DESTROYED|LIMB_UNCALIBRATED_PROSTHETIC|LIMB_BROKEN|LIMB_SPLINTED|LIMB_SPLINTED_INDESTRUCTIBLE)) && !bleeding_check && !internal_bleeding_check && !(implant && detail_level >= DETAIL_LEVEL_BODYSCAN) && !(limb.get_incision_depth())) continue + var/list/core_body_parts = list("head", "chest", "groin") + var/eschar = null + if(limb.status & LIMB_ESCHAR) + eschar = "Eschar" + var/third_degree_burns = null + if(limb.status & LIMB_THIRD_DEGREE_BURNS) + third_degree_burns = "Severe burns" var/list/current_list = list( "name" = limb.display_name, "brute" = floor(limb.brute_dam), @@ -195,6 +202,8 @@ GLOBAL_LIST_INIT(known_implants, subtypesof(/obj/item/implant)) "salved" = limb.is_salved(), "missing" = (limb.status & LIMB_DESTROYED), "limb_status" = null, + "limb_third_degree_burns" = third_degree_burns, + "limb_eschar" = eschar, "bleeding" = bleeding_check, "implant" = implant, "internal_bleeding" = internal_bleeding_check @@ -255,7 +264,7 @@ GLOBAL_LIST_INIT(known_implants, subtypesof(/obj/item/implant)) //checking for open incisions, but since eyes and mouths incisions are "head incisions" but not "head surgeries" gotta do some snowflake if(limb.name == "head") - if(human_target_mob.active_surgeries["head"]) + if(human_target_mob.active_surgeries["head"] || limb.get_incision_depth()) current_list["open_incision"] = TRUE var/zone @@ -318,7 +327,7 @@ GLOBAL_LIST_INIT(known_implants, subtypesof(/obj/item/implant)) "color" = "red" )) if(human_target_mob.stat == DEAD) - if((human_target_mob.health + 20) > HEALTH_THRESHOLD_DEAD) + if((human_target_mob.health + 20) > human_target_mob.health_threshold_dead) if(issynth(human_target_mob)) advice += list(list( "advice" = "Reboot the synthetic with a reset key!", @@ -344,7 +353,7 @@ GLOBAL_LIST_INIT(known_implants, subtypesof(/obj/item/implant)) "icon" = "band-aid", "color" = "orange" //BRI'ISH???? )) - if(((human_target_mob.health + 50) < HEALTH_THRESHOLD_DEAD) && !issynth(human_target_mob)) + if(((human_target_mob.health + 50) < human_target_mob.health_threshold_dead) && !issynth(human_target_mob)) advice += list(list( "advice" = "Administer a single dose of epinephrine.", "icon" = "syringe", @@ -392,7 +401,7 @@ GLOBAL_LIST_INIT(known_implants, subtypesof(/obj/item/implant)) advice += temp_advice if(human_target_mob.getFireLoss(organic_only = TRUE) > 30) temp_advice = list(list( - "advice" = "Administer a single dose of kelotane.", + "advice" = "Administer a single dose of kelotane and apply kits to areas with severe burns.", "icon" = "syringe", "color" = "yellow" )) @@ -489,14 +498,16 @@ GLOBAL_LIST_INIT(known_implants, subtypesof(/obj/item/implant)) if(ishuman(target_mob)) var/mob/living/carbon/human/target_human = target_mob target_human.change_holo_card(ui.user) - return TRUE + ui.send_update(list("holocard" = get_holo_card_color(target_mob))) + return FALSE if("change_ui_mode") switch(ui_mode) if(UI_MODE_CLASSIC) ui_mode = UI_MODE_MINIMAL if(UI_MODE_MINIMAL) ui_mode = UI_MODE_CLASSIC - return TRUE + ui.send_update(list("ui_mode" = ui_mode)) + return FALSE /// legacy proc for to_chat messages on health analysers /mob/living/proc/health_scan(mob/living/carbon/human/user, ignore_delay = FALSE, show_limb_damage = TRUE, show_browser = TRUE, alien = FALSE, do_checks = TRUE) // ahem. FUCK WHOEVER CODED THIS SHIT AS NUMBERS AND NOT DEFINES. diff --git a/code/modules/mob/living/living_verbs.dm b/code/modules/mob/living/living_verbs.dm index e762b2e02376..6c8bdde31d63 100644 --- a/code/modules/mob/living/living_verbs.dm +++ b/code/modules/mob/living/living_verbs.dm @@ -71,7 +71,7 @@ return visible_message("[BB] begins to wiggle violently!") if(do_after(src, 5 SECONDS, INTERRUPT_UNCONSCIOUS, BUSY_ICON_HOSTILE, BB))//5 second unzip from inside - BB.open() + BB.open(src) ///The medical machines below are listed separately to allow easier changes to each process @@ -159,7 +159,7 @@ if(istype(SC.loc, /obj/structure/bigDelivery)) //Do this to prevent contents from being opened into nullspace (read: bluespace) var/obj/structure/bigDelivery/BD = SC.loc BD.attack_hand(src) - SC.open() + SC.open(src) return else C.welded = 0 @@ -170,7 +170,7 @@ if(istype(C.loc, /obj/structure/bigDelivery)) //nullspace ect... read the comment above var/obj/structure/bigDelivery/BD = C.loc BD.attack_hand(src) - C.open() + C.open(src) return //breaking out of handcuffs & putting out fires diff --git a/code/modules/mob/living/login.dm b/code/modules/mob/living/login.dm index 79b00a7a2af4..15005e297c89 100644 --- a/code/modules/mob/living/login.dm +++ b/code/modules/mob/living/login.dm @@ -4,8 +4,12 @@ mind_initialize() //updates the mind (or creates and initializes one if one doesn't exist) mind.active = 1 //indicates that the mind is currently synced with a client + throw_alert(ALERT_MULTI_Z, /atom/movable/screen/alert/multi_z) + ..() + GLOB.living_player_list |= src + if(LAZYLEN(pipes_shown)) //ventcrawling, need to reapply pipe vision var/obj/structure/pipes/A = loc if(istype(A)) //a sanity check just to be safe diff --git a/code/modules/mob/living/logout.dm b/code/modules/mob/living/logout.dm index 297156ee72c5..a8b3492a6274 100644 --- a/code/modules/mob/living/logout.dm +++ b/code/modules/mob/living/logout.dm @@ -1,7 +1,13 @@ /mob/living/Logout() ..() + + clear_alert(ALERT_MULTI_Z) + if (mind) if(!key) //key and mind have become separated. mind.active = 0 //This is to stop say, a mind.transfer_to call on a corpse causing a ghost to re-enter its body. if(!immune_to_ssd && sleeping < 2 && mind.active) sleeping = 2 //This causes instant sleep, but does not prolong it. See life.dm for furthering SSD. + + GLOB.living_player_list -= src + diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 7809ad9d381b..9813d70d594e 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -26,10 +26,11 @@ GLOBAL_LIST_INIT(department_radio_keys, list( ":u" = RADIO_CHANNEL_REQ, ".u" = RADIO_CHANNEL_REQ, "#u" = RADIO_CHANNEL_UPP_GEN, ":v" = RADIO_CHANNEL_COMMAND , ".v" = RADIO_CHANNEL_COMMAND , "#v" = RADIO_CHANNEL_UPP_CMD, ":x" = RADIO_CHANNEL_HYPERDYNE, ".x" = RADIO_CHANNEL_HYPERDYNE, "#x" = RADIO_CHANNEL_HYPERDYNE, - ":y" = RADIO_CHANNEL_WY, ".y" = RADIO_CHANNEL_WY, "#y" = RADIO_CHANNEL_WY, + ":y" = RADIO_CHANNEL_WY, ".y" = RADIO_CHANNEL_WY, "#y" = RADIO_CHANNEL_WY_SEC, ":z" = RADIO_CHANNEL_HIGHCOM, ".z" = RADIO_CHANNEL_HIGHCOM, "#z" = RADIO_CHANNEL_PMC_CMD, - //0-9 available + ":1" = RADIO_CHANNEL_WY_PUB, ".1" = RADIO_CHANNEL_WY_PUB, "#1" = RADIO_CHANNEL_WY_PUB, + //1-9 available )) /proc/channel_to_prefix(channel) @@ -56,7 +57,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list( html = "\nYour message has been automatically filtered due to its contents. Trying to circumvent this filter will get you banned.", ) SEND_SOUND(user, sound('sound/effects/adminhelp_new.ogg')) - log_admin("[user.ckey] triggered the chat filter with the following message: [message].") + log_admin("[user?.ckey] triggered the chat filter with the following message: [message].") return FALSE return TRUE @@ -171,7 +172,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list( if(not_dead_speaker) langchat_speech(message, listening, speaking) for(var/mob/M as anything in listening) - M.hear_say(message, verb, speaking, alt_name, italics, src, speech_sound, sound_vol) + M.hear_say(message, verb, speaking, alt_name, italics, src, speech_sound, sound_vol, message_mode) for(var/obj/hearing_obj as anything in listening_obj) if(hearing_obj) //It's possible that it could be deleted in the meantime. diff --git a/code/modules/mob/living/silicon/decoy/decoy.dm b/code/modules/mob/living/silicon/decoy/decoy.dm index bd898dfbaaf4..7ec8a627ddcf 100644 --- a/code/modules/mob/living/silicon/decoy/decoy.dm +++ b/code/modules/mob/living/silicon/decoy/decoy.dm @@ -23,6 +23,7 @@ GLOB.ai_mob_list += src real_name = MAIN_AI_SYSTEM ADD_TRAIT(src, TRAIT_IMMOBILIZED, TRAIT_SOURCE_INHERENT) + AddElement(/datum/element/corp_label/wy) /mob/living/silicon/decoy/ship_ai/Destroy() QDEL_NULL(ai_headset) @@ -35,7 +36,7 @@ ..() if(stat == DEAD) return FALSE - if(health <= HEALTH_THRESHOLD_DEAD && stat != DEAD) + if(health <= health_threshold_dead && stat != DEAD) death() /mob/living/silicon/decoy/updatehealth() diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 4f985feb3e5d..ad1274dd995e 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -34,19 +34,20 @@ /mob/living/silicon/drop_held_items() return -/mob/living/silicon/emp_act(severity) +/mob/living/silicon/emp_act(severity, datum/cause_data/cause_data) . = ..() switch(severity) if(1) - src.take_limb_damage(20) + take_limb_damage(20) apply_effect(rand(5,10), STUN) if(2) - src.take_limb_damage(10) + take_limb_damage(10) apply_effect(rand(1,5), STUN) flash_eyes(EYE_PROTECTION_FLAVOR, TRUE, light_type = /atom/movable/screen/fullscreen/flash/noise) to_chat(src, SPAN_DANGER("*BZZZT*")) to_chat(src, SPAN_DANGER("Warning: Electromagnetic pulse detected.")) + log_emp(src, cause_data) /mob/living/silicon/stun_effect_act(stun_amount, agony_amount) return //immune @@ -119,7 +120,7 @@ for(var/datum/language/L in languages) dat += "[L.name] (:[L.key])
Speech Synthesizer: [(L in speech_synthesizer_langs)? "YES":"NOT SUPPORTED"]
[L.desc]
" - src << browse(dat, "window=checklanguage") + src << browse(HTML_SKELETON(dat), "window=checklanguage") return @@ -148,11 +149,11 @@ if(HUD_toggled[HUD_nbr]) HUD_toggled[HUD_nbr] = 0 H.remove_hud_from(src, src) - to_chat(src, SPAN_NOTICE(" [hud_choice] Disabled")) + to_chat(src, SPAN_NOTICE("[hud_choice] Disabled")) else HUD_toggled[HUD_nbr] = 1 H.add_hud_to(src, src) - to_chat(src, SPAN_NOTICE(" [hud_choice] Enabled")) + to_chat(src, SPAN_NOTICE("[hud_choice] Enabled")) /mob/living/silicon/verb/pose() set name = "Set Pose" @@ -175,21 +176,21 @@ ..() SSmob.living_misc_mobs += src -/mob/living/silicon/ex_act(severity) +/mob/living/silicon/ex_act(severity, direction, datum/cause_data/cause_data, pierce=0, enviro=FALSE) flash_eyes() switch(severity) if(0 to EXPLOSION_THRESHOLD_LOW) if (stat != 2) - apply_damage(30, BRUTE) + apply_damage(30, BRUTE, enviro=enviro) if(EXPLOSION_THRESHOLD_LOW to EXPLOSION_THRESHOLD_MEDIUM) if (stat != 2) - apply_damage(60, BRUTE) - apply_damage(60, BURN) + apply_damage(60, BRUTE, enviro=enviro) + apply_damage(60, BURN, enviro=enviro) if(EXPLOSION_THRESHOLD_MEDIUM to INFINITY) if (stat != 2) - apply_damage(100, BRUTE) - apply_damage(100, BURN) + apply_damage(100, BRUTE, enviro=enviro) + apply_damage(100, BURN, enviro=enviro) if(!anchored) gib() diff --git a/code/modules/mob/living/simple_animal/bat.dm b/code/modules/mob/living/simple_animal/bat.dm index eea7998bda67..ccb4b48991cd 100644 --- a/code/modules/mob/living/simple_animal/bat.dm +++ b/code/modules/mob/living/simple_animal/bat.dm @@ -1,4 +1,4 @@ -/mob/living/simple_animal/bat +/mob/living/simple_animal/small/bat name = "bat" desc = "It's a spooky bat!" icon = 'icons/mob/animal.dmi' @@ -10,12 +10,7 @@ speak_emote = list("screeches") emote_hear = list("screeches") -/mob/living/simple_animal/bat/initialize_pass_flags(datum/pass_flags_container/PF) - ..() - if (PF) - PF.flags_pass = PASS_OVER|PASS_FLAGS_CRAWLER - -/mob/living/simple_animal/bat/Life(delta_time) +/mob/living/simple_animal/small/bat/Life(delta_time) . = ..() if(!ckey && stat == CONSCIOUS && prob(5)) if(locate(/turf/closed,get_step(src, NORTH))) diff --git a/code/modules/mob/living/simple_animal/friendly/bunny.dm b/code/modules/mob/living/simple_animal/friendly/bunny.dm index 1ac2f3703518..3948326b9a44 100644 --- a/code/modules/mob/living/simple_animal/friendly/bunny.dm +++ b/code/modules/mob/living/simple_animal/friendly/bunny.dm @@ -1,12 +1,12 @@ //Bunny -/mob/living/simple_animal/bunny +/mob/living/simple_animal/small/bunny name = "bunny" desc = "A little white bunny rabbit. Likes carrots, allegedly." icon_state = "bunny" icon_living = "bunny" icon_dead = "bunny_dead" - emote_hear = list("purrs", "hums", "squeaks") - emote_see = list("flaps their ears", "sniffs") + emote_hear = list("purrs.", "hums.", "squeaks.") + emote_see = list("flaps their ears.", "sniffs.") speak_chance = 1 turns_per_move = 5 meat_type = /obj/item/reagent_container/food/snacks/meat @@ -17,7 +17,7 @@ black_market_value = 50 dead_black_market_value = 0 -/mob/living/simple_animal/bunny/dave +/mob/living/simple_animal/small/bunny/dave name = "Dave" desc = "Dave. The coolest bunny rabbit in town." icon_state = "dave" diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index bb386c0a7642..310cce5040cd 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -1,15 +1,15 @@ //Cat -/mob/living/simple_animal/cat +/mob/living/simple_animal/small/cat name = "cat" real_name = "cat" desc = "A domesticated, feline pet. Has a tendency to adopt crewmembers." icon_state = "cat2" icon_living = "cat2" icon_dead = "cat2_dead" - speak = list("Meow!","Esp!","Purr!","HSSSSS") + speak = list("Meow!","Esp!","Purr!","HSSSSS!") speak_emote = list("purrs", "meows") - emote_hear = list("meows","mews") - emote_see = list("shakes their head", "shivers") + emote_hear = list("meows.","mews.", "mrrps.") + emote_see = list("shakes their head.", "shivers.", "licks their paw.") speak_chance = 1 turns_per_move = 5 meat_type = /obj/item/reagent_container/food/snacks/meat @@ -21,12 +21,12 @@ var/mob/living/movement_target /// The mobs that src will track to hunt and kill. var/static/list/hunting_targets = list( - /mob/living/simple_animal/mouse, - /mob/living/simple_animal/alien_slug, - /mob/living/simple_animal/bat, - /mob/living/simple_animal/parrot, - /mob/living/simple_animal/chick, - /mob/living/simple_animal/lizard, + /mob/living/simple_animal/small/mouse, + /mob/living/simple_animal/small/alien_slug, + /mob/living/simple_animal/small/bat, + /mob/living/simple_animal/small/parrot, + /mob/living/simple_animal/small/chick, + /mob/living/simple_animal/small/lizard, /mob/living/carbon/xenomorph/facehugger, /mob/living/carbon/xenomorph/larva, ) @@ -45,16 +45,11 @@ var/miaow_counter = 0 var/attack_damage = 25 -/mob/living/simple_animal/cat/initialize_pass_flags(datum/pass_flags_container/PF) - ..() - if (PF) - PF.flags_pass = PASS_FLAGS_CRAWLER - -/mob/living/simple_animal/cat/Destroy() +/mob/living/simple_animal/small/cat/Destroy() movement_target = null . = ..() -/mob/living/simple_animal/cat/Life(delta_time) +/mob/living/simple_animal/small/cat/Life(delta_time) //MICE! if(stat == DEAD) return ..() @@ -98,7 +93,7 @@ if(stat == CONSCIOUS && !resting && !buckled) handle_movement_target() -/mob/living/simple_animal/cat/death() +/mob/living/simple_animal/small/cat/death() . = ..() if(!.) return //was already dead @@ -107,7 +102,7 @@ if(user) user.count_niche_stat(STATISTICS_NICHE_CAT) -/mob/living/simple_animal/cat/proc/handle_movement_target() +/mob/living/simple_animal/small/cat/proc/handle_movement_target() turns_since_scan++ if(turns_since_scan > 5) walk_to(src,0) @@ -130,7 +125,7 @@ stop_automated_movement = 1 walk_to(src,movement_target,0,3) -/mob/living/simple_animal/cat/MouseDrop(atom/over_object) +/mob/living/simple_animal/small/cat/MouseDrop(atom/over_object) if(!CAN_PICKUP(usr, src)) return ..() var/mob/living/carbon/H = over_object @@ -143,13 +138,13 @@ else return ..() -/mob/living/simple_animal/cat/get_scooped(mob/living/carbon/grabber) +/mob/living/simple_animal/small/cat/get_scooped(mob/living/carbon/grabber) if (stat >= DEAD) return ..() //RUNTIME IS ALIVE! SQUEEEEEEEE~ -/mob/living/simple_animal/cat/Runtime +/mob/living/simple_animal/small/cat/Runtime name = "Runtime" desc = "Her fur has the look and feel of velvet, and her tail quivers occasionally." icon_state = "cat" @@ -157,7 +152,7 @@ icon_dead = "cat_dead" holder_type = /obj/item/holder/cat/blackcat/Runtime -/mob/living/simple_animal/cat/blackcat +/mob/living/simple_animal/small/cat/blackcat name = "black cat" desc = "It's a cat, now in black!" icon_state = "cat" @@ -165,7 +160,7 @@ icon_dead = "cat_dead" holder_type = /obj/item/holder/cat/blackcat -/mob/living/simple_animal/cat/Jones +/mob/living/simple_animal/small/cat/Jones name = "Jones" real_name = "Jones" desc = "A tough, old stray whose origin no one seems to know." @@ -176,9 +171,9 @@ maxHealth = 50 holder_type = /obj/item/holder/cat/Jones -/mob/living/simple_animal/cat/kitten +/mob/living/simple_animal/small/cat/kitten name = "kitten" - desc = "D'aaawwww" + desc = "D'aaawwww." icon_state = "kitten" icon_living = "kitten" icon_dead = "kitten_dead" diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm index 35f5edbebe9d..d96b9c022012 100644 --- a/code/modules/mob/living/simple_animal/friendly/corgi.dm +++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm @@ -1,15 +1,15 @@ //Corgi -/mob/living/simple_animal/corgi +/mob/living/simple_animal/big/corgi name = "\improper corgi" real_name = "corgi" desc = "It's a corgi." icon_state = "corgi" icon_living = "corgi" icon_dead = "corgi_dead" - speak = list("YAP", "Woof!", "Bark!", "AUUUUUU") + speak = list("YAP!", "Ruff!", "Woof!", "Bark!", "Awooo!", "AUUUUU!", "Arf!") speak_emote = list("barks", "woofs") - emote_hear = list("barks", "woofs", "yaps","pants") - emote_see = list("shakes its head", "shivers") + emote_hear = list("barks.", "woofs.", "yaps.", "pants.") + emote_see = list("shakes its head.", "shivers.") speak_chance = 1 turns_per_move = 10 holder_type = /obj/item/holder/corgi @@ -25,7 +25,7 @@ var/obj/item/inventory_head var/obj/item/inventory_back -/mob/living/simple_animal/corgi/MouseDrop(atom/over_object) +/mob/living/simple_animal/big/corgi/MouseDrop(atom/over_object) if(!CAN_PICKUP(usr, src)) return ..() var/mob/living/carbon/H = over_object @@ -39,7 +39,7 @@ return ..() //IAN! SQUEEEEEEEEE~ -/mob/living/simple_animal/corgi/Ian +/mob/living/simple_animal/big/corgi/Ian name = "Ian" real_name = "Ian" //Intended to hold the name without altering it. gender = MALE @@ -51,11 +51,11 @@ response_disarm = "bops" response_harm = "kicks" -/mob/living/simple_animal/corgi/Ian/Life(delta_time) +/mob/living/simple_animal/big/corgi/Ian/Life(delta_time) ..() INVOKE_ASYNC(src, PROC_REF(look_for_food)) -/mob/living/simple_animal/corgi/Ian/proc/look_for_food() +/mob/living/simple_animal/big/corgi/Ian/proc/look_for_food() //Feeding, chasing food, FOOOOODDDD if(!stat && !resting && !buckled) turns_since_scan++ @@ -95,16 +95,16 @@ movement_target.attack_animal(src) else if(ishuman(movement_target.loc) ) if(prob(20)) - INVOKE_ASYNC(src, PROC_REF(emote), "stares at [movement_target] that [movement_target.loc] has with a sad puppy-face") + INVOKE_ASYNC(src, PROC_REF(emote), "stares at [movement_target] that [movement_target.loc] has with a sad puppy-face.") if(prob(1)) - INVOKE_ASYNC(src, PROC_REF(emote), pick("dances around","chases its tail")) + INVOKE_ASYNC(src, PROC_REF(emote), pick("dances around.","chases its tail.")) spawn(0) for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2)) setDir(i) sleep(1) -/mob/living/simple_animal/corgi/death() +/mob/living/simple_animal/big/corgi/death() . = ..() if(!.) return //was already dead @@ -118,12 +118,12 @@ desc = "Tastes like... well you know..." -/mob/living/simple_animal/corgi/attackby(obj/item/O as obj, mob/user as mob) //Marker -Agouri +/mob/living/simple_animal/big/corgi/attackby(obj/item/O as obj, mob/user as mob) //Marker -Agouri if(istype(O, /obj/item/newspaper)) if(!stat) for(var/mob/M as anything in viewers(user, null)) if ((M.client && !( M.blinded ))) - M.show_message(SPAN_NOTICE("[user] baps [name] on the nose with the rolled-up [O]"), SHOW_MESSAGE_VISIBLE) + M.show_message(SPAN_NOTICE("[user] baps [name] on the nose with the rolled-up [O]."), SHOW_MESSAGE_VISIBLE) spawn(0) for(var/i in list(1,2,4,8,4,2,1,2)) setDir(i) @@ -131,7 +131,7 @@ else ..() -/mob/living/simple_animal/corgi/regenerate_icons() +/mob/living/simple_animal/big/corgi/regenerate_icons() overlays = list() if(inventory_head) @@ -155,24 +155,31 @@ return -/mob/living/simple_animal/corgi/puppy +/mob/living/simple_animal/big/corgi/puppy // "big" corgi puppy name = "\improper corgi puppy" real_name = "corgi" desc = "It's a corgi puppy." icon_state = "puppy" icon_living = "puppy" icon_dead = "puppy_dead" + density = FALSE + +/mob/living/simple_animal/big/corgi/puppy/initialize_pass_flags(datum/pass_flags_container/pass_flags) + ..() + if(pass_flags) + pass_flags.flags_pass = PASS_MOB_THRU|PASS_FLAGS_CRAWLER + pass_flags.flags_can_pass_all = PASS_ALL^PASS_OVER_THROW_ITEM //pupplies cannot wear anything. -/mob/living/simple_animal/corgi/puppy/Topic(href, href_list) +/mob/living/simple_animal/big/corgi/puppy/Topic(href, href_list) if(href_list["remove_inv"] || href_list["add_inv"]) - to_chat(usr, SPAN_DANGER("You can't fit this on [src]")) + to_chat(usr, SPAN_DANGER("You can't fit this on [src].")) return ..() //LISA! SQUEEEEEEEEE~ -/mob/living/simple_animal/corgi/Lisa +/mob/living/simple_animal/big/corgi/Lisa name = "Lisa" real_name = "Lisa" gender = FEMALE @@ -188,13 +195,13 @@ var/puppies = 0 //Lisa already has a cute bow! -/mob/living/simple_animal/corgi/Lisa/Topic(href, href_list) +/mob/living/simple_animal/big/corgi/Lisa/Topic(href, href_list) if(href_list["remove_inv"] || href_list["add_inv"]) to_chat(usr, SPAN_DANGER("[src] already has a cute bow!")) return ..() -/mob/living/simple_animal/corgi/Lisa/Life(delta_time) +/mob/living/simple_animal/big/corgi/Lisa/Life(delta_time) ..() if(!stat && !resting && !buckled) @@ -204,7 +211,7 @@ var/alone = 1 var/ian = 0 for(var/mob/M in oviewers(7, src)) - if(istype(M, /mob/living/simple_animal/corgi/Ian)) + if(istype(M, /mob/living/simple_animal/big/corgi/Ian)) if(M.client) alone = 0 break @@ -214,11 +221,11 @@ alone = 0 break if(alone && ian && puppies < 4) - new /mob/living/simple_animal/corgi/puppy(loc) + new /mob/living/simple_animal/big/corgi/puppy(loc) if(prob(1)) - INVOKE_ASYNC(src, PROC_REF(emote), pick("dances around","chases her tail")) + INVOKE_ASYNC(src, PROC_REF(emote), pick("dances around.","chases her tail.")) spawn(0) for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2)) setDir(i) diff --git a/code/modules/mob/living/simple_animal/friendly/crab.dm b/code/modules/mob/living/simple_animal/friendly/crab.dm index cea58d5f5c4c..5ec48216068b 100644 --- a/code/modules/mob/living/simple_animal/friendly/crab.dm +++ b/code/modules/mob/living/simple_animal/friendly/crab.dm @@ -1,5 +1,5 @@ //Look Sir, free crabs! -/mob/living/simple_animal/crab +/mob/living/simple_animal/small/crab name = "crab" desc = "A hard-shelled crustacean. Seems quite content to lounge around all the time." icon_state = "crab" @@ -7,8 +7,8 @@ icon_dead = "crab_dead" mob_size = MOB_SIZE_SMALL speak_emote = list("clicks") - emote_hear = list("clicks") - emote_see = list("clacks") + emote_hear = list("clicks.") + emote_see = list("clacks.") speak_chance = 1 turns_per_move = 5 meat_type = /obj/item/reagent_container/food/snacks/meat @@ -22,7 +22,7 @@ var/obj/item/inventory_head var/obj/item/inventory_mask -/mob/living/simple_animal/crab/Life(delta_time) +/mob/living/simple_animal/small/crab/Life(delta_time) ..() //CRAB movement if(!ckey && !stat) @@ -34,7 +34,7 @@ regenerate_icons() //COFFEE! SQUEEEEEEEEE! -/mob/living/simple_animal/crab/Coffee +/mob/living/simple_animal/small/crab/Coffee name = "Coffee" real_name = "Coffee" desc = "It's Coffee, the other pet!" diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index 34ce8cc5d0ad..6aef90cb7d78 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -5,10 +5,10 @@ icon_state = "goat" icon_living = "goat" icon_dead = "goat_dead" - speak = list("EHEHEHEHEH","eh?") - speak_emote = list("brays") - emote_hear = list("brays") - emote_see = list("shakes its head", "stamps a foot", "glares around") + speak = list("MEHEHEHEHEH!","Mehh?","Maa!","MAAAA!","Mehh!","AAAAAAAAAA!") + speak_emote = list("bleats") + emote_hear = list("bleats.") + emote_see = list("shakes its head.", "wiggles its tail.", "stamps a foot.", "glares around.") speak_chance = 1 turns_per_move = 5 see_in_dark = 6 @@ -68,17 +68,17 @@ else ..() //cow -/mob/living/simple_animal/cow +/mob/living/simple_animal/big/cow name = "cow" desc = "Known for their milk, just don't tip them over." icon_state = "cow" icon_living = "cow" icon_dead = "cow_dead" icon_gib = "cow_gib" - speak = list("moo?","moo","MOOOOOO") + speak = list("Moo?","Moo.", "Mooooo!","Mmmmmm.","MrrrrrOOOOOO!","MOOOOOO!") speak_emote = list("moos","moos hauntingly") - emote_hear = list("brays") - emote_see = list("shakes its head") + emote_hear = list("moos.") + emote_see = list("shakes its head.", "flicks its ear", "swishes its tail.", "licks at its side.") speak_chance = 1 turns_per_move = 5 see_in_dark = 6 @@ -91,18 +91,18 @@ health = 50 var/datum/reagents/udder = null -/mob/living/simple_animal/cow/New() +/mob/living/simple_animal/big/cow/New() udder = new(50) udder.my_atom = src ..() -/mob/living/simple_animal/cow/Destroy() +/mob/living/simple_animal/big/cow/Destroy() if(udder) udder.my_atom = null QDEL_NULL(udder) return ..() -/mob/living/simple_animal/cow/attackby(obj/item/O as obj, mob/user as mob) +/mob/living/simple_animal/big/cow/attackby(obj/item/O as obj, mob/user as mob) var/obj/item/reagent_container/glass/G = O if(stat == CONSCIOUS && istype(G) && G.is_open_container()) user.visible_message(SPAN_NOTICE("[user] milks [src] using \the [O].")) @@ -114,13 +114,13 @@ else ..() -/mob/living/simple_animal/cow/Life(delta_time) +/mob/living/simple_animal/big/cow/Life(delta_time) . = ..() if(stat == CONSCIOUS) if(udder && prob(5)) udder.add_reagent("milk", rand(5, 10)) -/mob/living/simple_animal/cow/death() +/mob/living/simple_animal/big/cow/death() . = ..() if(!.) return //was already dead @@ -129,7 +129,7 @@ if(user) user.count_niche_stat(STATISTICS_NICHE_COW) -/mob/living/simple_animal/cow/attack_hand(mob/living/carbon/M as mob) +/mob/living/simple_animal/big/cow/attack_hand(mob/living/carbon/M as mob) if(!stat && M.a_intent == INTENT_DISARM && icon_state != icon_dead) M.visible_message(SPAN_WARNING("[M] tips over [src]."), SPAN_NOTICE("You tip over [src].")) @@ -139,24 +139,24 @@ if(!stat && M) icon_state = icon_living var/list/responses = list( "[src] looks at you imploringly.", - "[src] looks at you pleadingly", + "[src] looks at you pleadingly.", "[src] looks at you with a resigned expression.", "[src] seems resigned to its fate.") to_chat(M, pick(responses)) else ..() -/mob/living/simple_animal/chick +/mob/living/simple_animal/small/chick name = "\improper chick" desc = "Adorable! They make such a racket though." icon_state = "chick" icon_living = "chick" icon_dead = "chick_dead" icon_gib = "chick_gib" - speak = list("Cherp.","Cherp?","Chirrup.","Cheep!") + speak = list("Chirp.","Chirp?","Chirrup.","Cheep!","Peep!") speak_emote = list("cheeps") - emote_hear = list("cheeps") - emote_see = list("pecks at the ground","flaps its tiny wings") + emote_hear = list("cheeps.") + emote_see = list("pecks at the ground.","flaps its tiny wings.", "scratches around with its foot, looking for scraps.") speak_chance = 2 turns_per_move = 2 meat_type = /obj/item/reagent_container/food/snacks/meat @@ -169,39 +169,34 @@ var/amount_grown = 0 mob_size = MOB_SIZE_SMALL -/mob/living/simple_animal/chick/New() +/mob/living/simple_animal/small/chick/New() ..() pixel_x = rand(-6, 6) pixel_y = rand(0, 10) -/mob/living/simple_animal/chick/initialize_pass_flags(datum/pass_flags_container/PF) - ..() - if (PF) - PF.flags_pass = PASS_UNDER - -/mob/living/simple_animal/chick/Life(delta_time) +/mob/living/simple_animal/small/chick/Life(delta_time) . = ..() if(!.) return if(stat == CONSCIOUS) amount_grown += rand(1,2) if(amount_grown >= 100) - new /mob/living/simple_animal/chicken(loc) + new /mob/living/simple_animal/small/chicken(loc) qdel(src) GLOBAL_VAR_INIT(MAX_CHICKENS, 50) GLOBAL_VAR_INIT(chicken_count, 0) -/mob/living/simple_animal/chicken +/mob/living/simple_animal/small/chicken name = "\improper chicken" desc = "Hopefully the eggs are good this season." icon_state = "chicken" icon_living = "chicken" icon_dead = "chicken_dead" - speak = list("Cluck!","BWAAAAARK BWAK BWAK BWAK!","Bwaak bwak.") + speak = list("Cluck!", "Bawk bwak.", "Bwarrrrk...", "Bawk!", "Bawk bawk bwak.", "BWAAAAARK BWAK BWAK BWAK!","Bwaak bwak.") speak_emote = list("clucks","croons") - emote_hear = list("clucks") - emote_see = list("pecks at the ground","flaps its wings viciously") + emote_hear = list("clucks.") + emote_see = list("pecks at the ground.","flaps its wings viciously.", "scratches around with its foot, looking for scraps.") speak_chance = 2 turns_per_move = 3 meat_type = /obj/item/reagent_container/food/snacks/meat @@ -215,7 +210,7 @@ GLOBAL_VAR_INIT(chicken_count, 0) var/body_color mob_size = MOB_SIZE_SMALL -/mob/living/simple_animal/chicken/New() +/mob/living/simple_animal/small/chicken/New() if(!body_color) body_color = pick( list("brown","black","white") ) icon_state = "chicken_[body_color]" @@ -226,12 +221,7 @@ GLOBAL_VAR_INIT(chicken_count, 0) pixel_y = rand(0, 10) GLOB.chicken_count++ -/mob/living/simple_animal/chicken/initialize_pass_flags(datum/pass_flags_container/PF) - ..() - if (PF) - PF.flags_pass = PASS_UNDER - -/mob/living/simple_animal/chicken/death() +/mob/living/simple_animal/small/chicken/death() ..() GLOB.chicken_count-- if(last_damage_data) @@ -239,7 +229,7 @@ GLOBAL_VAR_INIT(chicken_count, 0) if(user) user.count_niche_stat(STATISTICS_NICHE_CHICKEN) -/mob/living/simple_animal/chicken/attackby(obj/item/O as obj, mob/user as mob) +/mob/living/simple_animal/small/chicken/attackby(obj/item/O as obj, mob/user as mob) if(istype(O, /obj/item/reagent_container/food/snacks/grown/wheat)) //feedin' dem chickens if(!stat && eggsleft < 8) user.visible_message(SPAN_NOTICE("[user] feeds [O] to [name]! It clucks happily."),SPAN_NOTICE("You feed [O] to [name]! It clucks happily.")) @@ -248,11 +238,11 @@ GLOBAL_VAR_INIT(chicken_count, 0) eggsleft += rand(1, 4) //world << eggsleft else - to_chat(user, SPAN_NOTICE(" [name] doesn't seem hungry!")) + to_chat(user, SPAN_NOTICE("[name] doesn't seem hungry!")) else ..() -/mob/living/simple_animal/chicken/Life(delta_time) +/mob/living/simple_animal/small/chicken/Life(delta_time) . = ..() if(!.) return @@ -271,7 +261,7 @@ GLOBAL_VAR_INIT(chicken_count, 0) amount_grown += rand(1,2) if(amount_grown >= 100) visible_message("[src] hatches with a quiet cracking sound.") - new /mob/living/simple_animal/chick(get_turf(src)) + new /mob/living/simple_animal/small/chick(get_turf(src)) STOP_PROCESSING(SSobj, src) qdel(src) else diff --git a/code/modules/mob/living/simple_animal/friendly/lizard.dm b/code/modules/mob/living/simple_animal/friendly/lizard.dm index b639b79ffd60..95f1b44c8be5 100644 --- a/code/modules/mob/living/simple_animal/friendly/lizard.dm +++ b/code/modules/mob/living/simple_animal/friendly/lizard.dm @@ -1,4 +1,4 @@ -/mob/living/simple_animal/lizard +/mob/living/simple_animal/small/lizard name = "Lizard" desc = "A cute tiny lizard." icon = 'icons/mob/critter.dmi' diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index 5df2def8a8f2..7457233cb216 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -1,4 +1,4 @@ -/mob/living/simple_animal/mouse +/mob/living/simple_animal/small/mouse name = "mouse" real_name = "mouse" desc = "It's a small, disease-ridden rodent." @@ -6,9 +6,9 @@ icon_living = "mouse_gray" icon_dead = "mouse_gray_dead" speak = list("Squeek!","SQUEEK!","Squeek?") - speak_emote = list("squeeks","squeeks","squiks") - emote_hear = list("squeeks","squeaks","squiks") - emote_see = list("runs in a circle", "shakes", "scritches at something") + speak_emote = list("squeeks.","squeeks.","squiks.") + emote_hear = list("squeeks.","squeaks.","squiks.") + emote_see = list("runs in a circle.", "shakes.", "scritches at something.") mob_size = MOB_SIZE_SMALL speak_chance = 1 turns_per_move = 5 @@ -19,11 +19,10 @@ response_help = "pets the" response_disarm = "gently pushes aside the" response_harm = "stamps on the" - density = FALSE layer = ABOVE_LYING_MOB_LAYER min_oxy = 16 //Require at least 16kPA oxygen - minbodytemp = 223 //Below -50 Degrees Celcius - maxbodytemp = 323 //Above 50 Degrees Celcius + minbodytemp = 223 //Below -50 Degrees Celsius + maxbodytemp = 323 //Above 50 Degrees Celsius universal_speak = FALSE universal_understand = TRUE holder_type = /obj/item/holder/mouse @@ -32,7 +31,7 @@ ///the icon_state prefix to use for the icon_state, icon_living, and icon_dead var/icon_base = "mouse" -/mob/living/simple_animal/mouse/Life(delta_time) +/mob/living/simple_animal/small/mouse/Life(delta_time) ..() if(stat == CONSCIOUS && prob(speak_chance)) FOR_DVIEW(var/mob/mob, world.view, src, HIDE_INVISIBLE_OBSERVER) @@ -53,7 +52,7 @@ else if(prob(5)) INVOKE_ASYNC(src, PROC_REF(emote), "snuffles") -/mob/living/simple_animal/mouse/New() +/mob/living/simple_animal/small/mouse/New() ..() add_verb(src, list( @@ -70,12 +69,7 @@ if(!desc) desc = "It's a small [body_color] rodent, often seen hiding in maintenance areas and making a nuisance of itself." -/mob/living/simple_animal/mouse/initialize_pass_flags(datum/pass_flags_container/PF) - ..() - if (PF) - PF.flags_pass = PASS_FLAGS_CRAWLER - -/mob/living/simple_animal/mouse/splat(mob/killer) +/mob/living/simple_animal/small/mouse/splat(mob/killer) health = 0 set_stat(DEAD) icon_dead = "[icon_base]_[body_color]_splat" @@ -85,11 +79,11 @@ if(client) client.time_died_as_mouse = world.time -/mob/living/simple_animal/mouse/start_pulling(atom/movable/AM)//Prevents mouse from pulling things +/mob/living/simple_animal/small/mouse/start_pulling(atom/movable/AM)//Prevents mouse from pulling things to_chat(src, SPAN_WARNING("You are too small to pull anything.")) return -/mob/living/simple_animal/mouse/Crossed(AM as mob|obj) +/mob/living/simple_animal/small/mouse/Crossed(AM as mob|obj) if( ishuman(AM) ) if(!ckey && stat == UNCONSCIOUS) set_stat(CONSCIOUS) @@ -97,17 +91,17 @@ wander = TRUE else if(!stat && prob(5)) var/mob/M = AM - to_chat(M, SPAN_NOTICE(" [icon2html(src, M)] Squeek!")) + to_chat(M, SPAN_NOTICE("[icon2html(src, M)] Squeek!")) M << 'sound/effects/mousesqueek.ogg' ..() -/mob/living/simple_animal/mouse/death() +/mob/living/simple_animal/small/mouse/death() layer = ABOVE_LYING_MOB_LAYER if(client) client.time_died_as_mouse = world.time ..() -/mob/living/simple_animal/mouse/MouseDrop(atom/over_object) +/mob/living/simple_animal/small/mouse/MouseDrop(atom/over_object) if(!CAN_PICKUP(usr, src)) return ..() var/mob/living/carbon/human = over_object @@ -120,7 +114,7 @@ else return ..() -/mob/living/simple_animal/mouse/get_scooped(mob/living/carbon/grabber) +/mob/living/simple_animal/small/mouse/get_scooped(mob/living/carbon/grabber) if(stat >= DEAD) return ..() @@ -129,23 +123,23 @@ * Mouse types */ -/mob/living/simple_animal/mouse/white +/mob/living/simple_animal/small/mouse/white body_color = "white" icon_state = "mouse_white" desc = "It's a small laboratory mouse." holder_type = /obj/item/holder/mouse/white -/mob/living/simple_animal/mouse/gray +/mob/living/simple_animal/small/mouse/gray body_color = "gray" icon_state = "mouse_gray" holder_type = /obj/item/holder/mouse/gray -/mob/living/simple_animal/mouse/brown +/mob/living/simple_animal/small/mouse/brown body_color = "brown" icon_state = "mouse_brown" holder_type = /obj/item/holder/mouse/brown -/mob/living/simple_animal/mouse/white/Doc +/mob/living/simple_animal/small/mouse/white/Doc name = "Doc" desc = "Senior mouse researcher of the Almayer. Likes: cheese, experiments, explosions." gender = MALE @@ -155,7 +149,7 @@ holder_type = /obj/item/holder/mouse/white/Doc //TOM IS ALIVE! SQUEEEEEEEE~K :) -/mob/living/simple_animal/mouse/brown/Tom +/mob/living/simple_animal/small/mouse/brown/Tom name = "Tom" desc = "Jerry the cat is not amused." response_help = "pets" diff --git a/code/modules/mob/living/simple_animal/friendly/rat.dm b/code/modules/mob/living/simple_animal/friendly/rat.dm index e2f441f93024..94d009552ddc 100644 --- a/code/modules/mob/living/simple_animal/friendly/rat.dm +++ b/code/modules/mob/living/simple_animal/friendly/rat.dm @@ -1,4 +1,4 @@ -/mob/living/simple_animal/mouse/rat +/mob/living/simple_animal/small/mouse/rat name = "rat" real_name = "rat" desc = "It's a big, disease-ridden rodent." @@ -14,17 +14,17 @@ * Rat types */ -/mob/living/simple_animal/mouse/rat/gray +/mob/living/simple_animal/small/mouse/rat/gray body_color = "gray" icon_state = "rat_gray" holder_type = /obj/item/holder/rat/gray -/mob/living/simple_animal/mouse/rat/brown +/mob/living/simple_animal/small/mouse/rat/brown body_color = "brown" icon_state = "rat_brown" holder_type = /obj/item/holder/rat/brown -/mob/living/simple_animal/mouse/rat/brown/Old_Timmy +/mob/living/simple_animal/small/mouse/rat/brown/Old_Timmy name = "Old Timmy" desc = "An ancient looking rat from the old days of the colony." response_help = "pets" @@ -32,18 +32,18 @@ response_harm = "splats" holder_type = /obj/item/holder/rat/brown/Old_Timmy -/mob/living/simple_animal/mouse/rat/black +/mob/living/simple_animal/small/mouse/rat/black body_color = "black" icon_state = "rat_black" holder_type = /obj/item/holder/rat/black -/mob/living/simple_animal/mouse/rat/white +/mob/living/simple_animal/small/mouse/rat/white body_color = "white" icon_state = "rat_white" desc = "It's a small laboratory rat." holder_type = /obj/item/holder/rat/white -/mob/living/simple_animal/mouse/rat/white/Milky +/mob/living/simple_animal/small/mouse/rat/white/Milky name = "Milky" desc = "An escaped test rat from the Weyland-Yutani Research Facility. Hope it doesn't have some sort of genetically engineered disease or something..." gender = MALE @@ -55,19 +55,19 @@ //Specific Pets for Frozen's Rat Collecting Competition -/mob/living/simple_animal/mouse/rat/pet +/mob/living/simple_animal/small/mouse/rat/pet name = "Pet Rat" desc = "This is someone's pet rat. I wonder what it's doing here." holder_type = /obj/item/holder/rat/pet -/mob/living/simple_animal/mouse/rat/pet/marvin +/mob/living/simple_animal/small/mouse/rat/pet/marvin name = "Marvin" desc = "A sleek well kept rat with a tiny collar around its neck, it must belong to someone. For a rodent it appears remarkably clean and hygenic." body_color = "black" icon_state = "rat_black" holder_type = /obj/item/holder/rat/pet/marvin -/mob/living/simple_animal/mouse/rat/pet/ikit +/mob/living/simple_animal/small/mouse/rat/pet/ikit name = "Ikit" desc = "An albino rat with a tiny collar around its neck, it must belong to someone. Hope it doesn't have some sort of genetically engineered disease or something..." body_color = "white" diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm index 3069dda7bed9..caff41aa9c01 100644 --- a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm +++ b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm @@ -1,4 +1,4 @@ -/mob/living/simple_animal/spiderbot +/mob/living/simple_animal/small/spiderbot min_oxy = 0 max_tox = 0 @@ -39,7 +39,7 @@ mob_size = MOB_SIZE_SMALL speak_emote = list("beeps","clicks","chirps") -/mob/living/simple_animal/spiderbot/attackby(obj/item/O as obj, mob/user as mob) +/mob/living/simple_animal/small/spiderbot/attackby(obj/item/O as obj, mob/user as mob) if(istype(O, /obj/item/device/mmi)) var/obj/item/device/mmi/B = O @@ -71,7 +71,7 @@ user.drop_inv_item_to_loc(O, src) - to_chat(user, SPAN_NOTICE(" You install [O] in [src]!")) + to_chat(user, SPAN_NOTICE("You install [O] in [src]!")) mmi = O transfer_personality(O) update_icon() @@ -91,7 +91,7 @@ for(var/mob/W in viewers(user, null)) W.show_message(text(SPAN_DANGER("[user] has spot-welded some of the damage to [src]!")), SHOW_MESSAGE_VISIBLE) else - to_chat(user, SPAN_NOTICE(" [src] is undamaged!")) + to_chat(user, SPAN_NOTICE("[src] is undamaged!")) else to_chat(user, "Need more welding fuel!") return @@ -106,7 +106,7 @@ id_card = O if(ACCESS_MARINE_RESEARCH in id_card.access) - to_chat(user, SPAN_NOTICE(" You swipe your access card and pop the brain out of [src].")) + to_chat(user, SPAN_NOTICE("You swipe your access card and pop the brain out of [src].")) eject_brain() if(held_item) @@ -132,7 +132,7 @@ if ((M.client && !( M.blinded ))) M.show_message(SPAN_DANGER("[user] gently taps [src] with \the [O]."), SHOW_MESSAGE_VISIBLE) -/mob/living/simple_animal/spiderbot/proc/transfer_personality(obj/item/device/mmi/M as obj) +/mob/living/simple_animal/small/spiderbot/proc/transfer_personality(obj/item/device/mmi/M as obj) src.mind = M.brainmob.mind src.mind.key = M.brainmob.key src.ckey = M.brainmob.ckey @@ -140,7 +140,7 @@ client.change_view(GLOB.world_view_size) src.name = "Spider-bot ([M.brainmob.name])" -/mob/living/simple_animal/spiderbot/proc/explode(cause = "exploding") //When emagged. +/mob/living/simple_animal/small/spiderbot/proc/explode(cause = "exploding") //When emagged. for(var/mob/M as anything in viewers(src, null)) if ((M.client && !( M.blinded ))) M.show_message(SPAN_DANGER("[src] makes an odd warbling noise, fizzles, and explodes."), SHOW_MESSAGE_VISIBLE) @@ -148,7 +148,7 @@ eject_brain() death(cause) -/mob/living/simple_animal/spiderbot/proc/update_icon() +/mob/living/simple_animal/small/spiderbot/proc/update_icon() if(mmi) if(istype(mmi,/obj/item/device/mmi)) icon_state = "spiderbot-chassis-mmi" @@ -157,7 +157,7 @@ icon_state = "spiderbot-chassis" icon_living = "spiderbot-chassis" -/mob/living/simple_animal/spiderbot/proc/eject_brain() +/mob/living/simple_animal/small/spiderbot/proc/eject_brain() if(mmi) var/turf/T = get_turf(loc) if(T) @@ -168,11 +168,11 @@ src.name = "Spider-bot" update_icon() -/mob/living/simple_animal/spiderbot/Destroy() +/mob/living/simple_animal/small/spiderbot/Destroy() eject_brain() . = ..() -/mob/living/simple_animal/spiderbot/New() +/mob/living/simple_animal/small/spiderbot/New() camera = new /obj/structure/machinery/camera(src) camera.c_tag = "Spiderbot-[real_name]" @@ -180,7 +180,7 @@ ..() -/mob/living/simple_animal/spiderbot/death() +/mob/living/simple_animal/small/spiderbot/death() GLOB.alive_mob_list -= src GLOB.dead_mob_list += src @@ -195,7 +195,7 @@ qdel(src) //Cannibalized from the parrot mob. ~Zuhayr -/mob/living/simple_animal/spiderbot/verb/drop_spider_held_item() +/mob/living/simple_animal/small/spiderbot/verb/drop_spider_held_item() set name = "Drop held item" set category = "Spiderbot" set desc = "Drop the item you're holding." @@ -222,7 +222,7 @@ return 1 -/mob/living/simple_animal/spiderbot/verb/get_item() +/mob/living/simple_animal/small/spiderbot/verb/get_item() set name = "Pick up item" set category = "Spiderbot" set desc = "Allows you to take a nearby small item." @@ -254,7 +254,7 @@ to_chat(src, SPAN_DANGER("There is nothing of interest to take.")) return 0 -/mob/living/simple_animal/spiderbot/get_examine_text(mob/user) +/mob/living/simple_animal/small/spiderbot/get_examine_text(mob/user) . = ..() if(held_item) . += "It is carrying \a [held_item] [icon2html(held_item, user)]." diff --git a/code/modules/mob/living/simple_animal/friendly/tomato.dm b/code/modules/mob/living/simple_animal/friendly/tomato.dm index 5aab00cd442e..0cefd82b5a6b 100644 --- a/code/modules/mob/living/simple_animal/friendly/tomato.dm +++ b/code/modules/mob/living/simple_animal/friendly/tomato.dm @@ -1,4 +1,4 @@ -/mob/living/simple_animal/tomato +/mob/living/simple_animal/small/tomato name = "tomato" desc = "It's a horrifyingly enormous beef tomato, and it's packing extra beef!" icon_state = "tomato" diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm index 320ca5d9b190..b2078e8a7d3b 100644 --- a/code/modules/mob/living/simple_animal/hostile/alien.dm +++ b/code/modules/mob/living/simple_animal/hostile/alien.dm @@ -112,7 +112,7 @@ wound_icon_holder.dir = dir wound_icon_holder.icon = icon var/health_threshold = max(ceil((health * 4) / (maxHealth)), 0) //From 0 to 4, in 25% chunks - if(health > HEALTH_THRESHOLD_DEAD) + if(health > health_threshold_dead) if(health_threshold > 3) wound_icon_holder.icon_state = "none" else if(body_position == LYING_DOWN) diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm index 83cb250a7f28..e9a2bd85b3e5 100644 --- a/code/modules/mob/living/simple_animal/hostile/bear.dm +++ b/code/modules/mob/living/simple_animal/hostile/bear.dm @@ -8,8 +8,8 @@ icon_gib = "bear_gib" speak = list("RAWR!","Rawr!","GRR!","Growl!") speak_emote = list("growls", "roars") - emote_hear = list("rawrs","grumbles","grawls") - emote_see = list("stares ferociously", "stomps") + emote_hear = list("rawrs.","roars.","grumbles.","growls.") + emote_see = list("stares ferociously.", "stomps.") speak_chance = 1 turns_per_move = 5 see_in_dark = 6 @@ -79,7 +79,7 @@ src.setDir(get_dir(src,target_mob)) //Keep staring at the mob if(stance_step in list(1,4,7)) //every 3 ticks - var/action = pick( list( "growls at [target_mob]", "stares angrily at [target_mob]", "prepares to attack [target_mob]", "closely watches [target_mob]" ) ) + var/action = pick( list( "growls at [target_mob]", "stares angrily at [target_mob].", "prepares to attack [target_mob].", "closely watches [target_mob]." ) ) if(action) INVOKE_ASYNC(src, PROC_REF(manual_emote), action) if(!found_mob) @@ -92,7 +92,7 @@ if(HOSTILE_STANCE_ATTACKING) if(stance_step >= 20) //attacks for 20 ticks, then it gets tired and needs to rest - INVOKE_ASYNC(src, PROC_REF(manual_emote), "is worn out and needs to rest") + INVOKE_ASYNC(src, PROC_REF(manual_emote), "is worn out and needs to rest.") stance = HOSTILE_STANCE_TIRED stance_step = 0 walk(src, 0) //This stops the bear's walking @@ -120,7 +120,7 @@ /mob/living/simple_animal/hostile/bear/FindTarget() . = ..() if(.) - manual_emote("stares alertly at [.]") + manual_emote("stares alertly at [.].") stance = HOSTILE_STANCE_ALERT /mob/living/simple_animal/hostile/bear/LoseTarget() @@ -130,7 +130,7 @@ var/mob/living/target_mob = target_mob_ref?.resolve() if(!Adjacent(target_mob)) return - manual_emote(pick(list("slashes at [target_mob]", "bites [target_mob]"))) + manual_emote(pick(list("slashes at [target_mob].", "bites [target_mob]."))) var/damage = rand(20,30) @@ -138,10 +138,10 @@ var/mob/living/carbon/human/hooman = target_mob var/dam_zone = pick("chest", "l_hand", "r_hand", "l_leg", "r_leg") var/obj/limb/affecting = hooman.get_limb(rand_zone(dam_zone)) - hooman.apply_damage(damage, BRUTE, affecting, sharp=1, edge=1) + hooman.apply_damage(damage, BRUTE, affecting, sharp=TRUE, edge=TRUE, enviro=TRUE) return hooman else if(isliving(target_mob)) - target_mob.apply_damage(damage, BRUTE) + target_mob.apply_damage(damage, BRUTE, enviro=TRUE) return target_mob diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm index 9a5614a3c8b3..81be9db9ce56 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -12,7 +12,7 @@ icon_living = "guard" icon_dead = "guard_dead" speak_emote = list("chitters") - emote_hear = list("chitters") + emote_hear = list("chitters.") speak_chance = 5 turns_per_move = 5 see_in_dark = 10 @@ -62,10 +62,11 @@ poison_per_bite = 5 move_to_delay = 4 -/mob/living/simple_animal/hostile/giant_spider/initialize_pass_flags(datum/pass_flags_container/PF) +/mob/living/simple_animal/hostile/giant_spider/initialize_pass_flags(datum/pass_flags_container/pass_flags) ..() - if (PF) - PF.flags_pass = PASS_FLAGS_CRAWLER + if (pass_flags) + pass_flags.flags_pass = PASS_FLAGS_CRAWLER + pass_flags.flags_can_pass_all = PASS_OVER_THROW_ITEM /mob/living/simple_animal/hostile/giant_spider/AttackingTarget() ..() diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm index 381068167a40..1f030f05c80b 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm @@ -1,6 +1,6 @@ /mob/living/simple_animal/hostile/retaliate/clown name = "Clown" - desc = "A denizen of clown planet" + desc = "A denizen of clown planet." icon_state = "clown" icon_living = "clown" icon_dead = "clown_dead" diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/giant_lizard.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/giant_lizard.dm index 7fffb4fc3991..4ceebac52a8c 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/giant_lizard.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/giant_lizard.dm @@ -7,7 +7,7 @@ /mob/living/simple_animal/hostile/retaliate/giant_lizard name = "giant lizard" - desc = "A large, wolf-like reptile. Its eyes are keenly focused on yours." + desc = "A large, synapsid-like creature. Its eyes are keenly focused on yours." icon = 'icons/mob/mob_64.dmi' icon_state = "Giant Lizard Running" icon_living = "Giant Lizard Running" @@ -35,7 +35,7 @@ speak_chance = 2 speak_emote = "hisses" emote_hear = list("hisses.", "growls.", "roars.", "bellows.") - emote_see = list("shakes its head.", "wags its tail.", "yawns.") + emote_see = list("shakes its head.", "wags its tail.", "yawns.", "licks its eyeball.") melee_damage_lower = 20 melee_damage_upper = 25 @@ -164,7 +164,7 @@ /mob/living/simple_animal/hostile/retaliate/giant_lizard/initialize_pass_flags(datum/pass_flags_container/pass_flags_container) ..() if(pass_flags_container) - pass_flags_container.flags_pass |= PASS_FLAGS_CRAWLER + pass_flags_container.flags_pass |= PASS_FLAGS_CRAWLER|PASS_OVER_THROW_ITEM //regular pain datum will make the mob die when trying to pounce after taking enough damage. /mob/living/simple_animal/hostile/retaliate/giant_lizard/initialize_pain() @@ -367,7 +367,7 @@ handle_blood_splatter(get_dir(attacker.loc, loc)) return ..() -/mob/living/simple_animal/hostile/retaliate/giant_lizard/apply_damage(damage, damagetype, def_zone, used_weapon, sharp, edge, force) +/mob/living/simple_animal/hostile/retaliate/giant_lizard/apply_damage(damage, damagetype, def_zone, used_weapon, sharp, edge, force, enviro, chemical = FALSE) Retaliate() aggression_value = clamp(aggression_value + 5, 0, 30) . = ..() @@ -573,7 +573,7 @@ //xenos take extra damage if(isxeno(target)) var/extra_damage = rand(melee_damage_lower, melee_damage_upper) * 0.33 - target.apply_damage(extra_damage, BRUTE) + target.apply_damage(extra_damage, BRUTE, enviro=TRUE) if(prob(33)) if(client && !is_retreating) @@ -871,7 +871,7 @@ target.handle_blood_splatter(get_dir(src.loc, target.loc)) if(target.body_position == LYING_DOWN) - target.apply_damage(damage, BRUTE) + target.apply_damage(damage, BRUTE, enviro=TRUE) target.apply_effect(1, DAZE) shake_camera(target, 1, 2) @@ -909,7 +909,7 @@ if(ishuman(pounced_mob) && (pounced_mob.dir in reverse_nearby_direction(dir))) var/mob/living/carbon/human/human = pounced_mob - if(human.check_shields(15, "the pounce")) //Human shield block. + if(human.check_shields("the pounce", get_dir(human, src), attack_type = SHIELD_ATTACK_POUNCE, custom_response = TRUE)) //Human shield block. visible_message(SPAN_DANGER("[src] slams into [human]!")) KnockDown(1) Stun(1) @@ -917,20 +917,13 @@ playsound(human, "bonk", 75, FALSE) //bonk return - if(isyautja(human)) - if(human.check_shields(0, "the pounce", 1)) - visible_message(SPAN_DANGER("[human] blocks the pounce of [src] with the combistick!")) - apply_effect(3, WEAKEN) - throwing = FALSE - playsound(human, "bonk", 75, FALSE) - return - else if(prob(75)) //Body slam. - visible_message(SPAN_DANGER("[human] body slams [src]!")) - KnockDown(3) - Stun(3) - throwing = FALSE - playsound(loc, 'sound/weapons/alien_knockdown.ogg', 25, 1) - return + if(isyautja(human) && prob(75))//Body slam. + visible_message(SPAN_DANGER("[human] body slams [src]!")) + KnockDown(3) + Stun(3) + throwing = FALSE + playsound(loc, 'sound/weapons/alien_knockdown.ogg', 25, 1) + return if(iscolonysynthetic(human) && prob(60)) visible_message(SPAN_DANGER("[human] withstands being pounced and slams down [src]!")) KnockDown(1.5) diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm index cde7702942d3..d44c24d92455 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm @@ -40,7 +40,7 @@ buddy.enemies |= enemies return 0 -/mob/living/simple_animal/hostile/retaliate/apply_damage(damage, damagetype, def_zone, used_weapon, sharp, edge, force) +/mob/living/simple_animal/hostile/retaliate/apply_damage(damage, damagetype, def_zone, used_weapon, sharp, edge, force, enviro, chemical = FALSE) Retaliate() return ..() diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 9633f0f15497..d1ab958a36cf 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -25,7 +25,7 @@ #define PARROT_FLEE 64 //Flying away from its attacker -/mob/living/simple_animal/parrot +/mob/living/simple_animal/small/parrot name = "\improper Parrot" desc = "The parrot squawks, \"It's a Parrot! BAWWK!\"" icon = 'icons/mob/animal.dmi' @@ -34,10 +34,10 @@ icon_dead = "parrot_dead" mob_size = MOB_SIZE_SMALL - speak = list("Hi","Hello!","Cracker?","BAWWWWK george mellons griffing me") - speak_emote = list("squawks","says","yells") - emote_hear = list("squawks","bawks") - emote_see = list("flutters its wings") + speak = list("Hi.","Hello!","Cracker?","Want a snack?", "Want fresh water?","Good bird.","Handsome boy.","Pretty bird.") + speak_emote = list("squawks","says","yells", "calls") + emote_hear = list("squawks.","bawks.","calls.","screams.") + emote_see = list("flutters its wings.", "clacks its beak.", "preens its feathers.", "pins its eyes.") speak_chance = 1//1% (1 in 100) chance every tick; So about once per 150 seconds, assuming an average tick is 1.5s turns_per_move = 5 @@ -68,7 +68,7 @@ var/atom/movable/parrot_interest = null //Parrots will generally sit on their pertch unless something catches their eye. - //These vars store their preffered perch and if they dont have one, what they can use as a perch + //These vars store their preffered perch and if they don't have one, what they can use as a perch var/obj/parrot_perch = null var/obj/desired_perches = list(/obj/structure/computerframe, /obj/structure/displaycase, \ /obj/structure/filingcabinet, /obj/structure/machinery/teleport, \ @@ -80,7 +80,7 @@ //Parrots are kleptomaniacs. This variable ... stores the item a parrot is holding. var/obj/item/held_item = null -/mob/living/simple_animal/parrot/Initialize() +/mob/living/simple_animal/small/parrot/Initialize() . = ..() if(!ears) var/headset = pick( /obj/item/device/radio/headset) @@ -89,25 +89,20 @@ parrot_sleep_dur = parrot_sleep_max //In case someone decides to change the max without changing the duration var add_verb(src, list( - /mob/living/simple_animal/parrot/proc/steal_from_ground, - /mob/living/simple_animal/parrot/proc/steal_from_mob, - /mob/living/simple_animal/parrot/verb/drop_held_item_player, - /mob/living/simple_animal/parrot/proc/perch_player, + /mob/living/simple_animal/small/parrot/proc/steal_from_ground, + /mob/living/simple_animal/small/parrot/proc/steal_from_mob, + /mob/living/simple_animal/small/parrot/verb/drop_held_item_player, + /mob/living/simple_animal/small/parrot/proc/perch_player, )) -/mob/living/simple_animal/parrot/initialize_pass_flags(datum/pass_flags_container/PF) - ..() - if (PF) - PF.flags_pass = PASS_OVER|PASS_FLAGS_CRAWLER - -/mob/living/simple_animal/parrot/death() +/mob/living/simple_animal/small/parrot/death() if(held_item) held_item.forceMove(src.loc) held_item = null walk(src,0) . = ..() -/mob/living/simple_animal/parrot/Topic(href, href_list) +/mob/living/simple_animal/small/parrot/Topic(href, href_list) //Can the usr physically do this? if(usr.is_mob_incapacitated() || !in_range(loc, usr)) @@ -123,9 +118,9 @@ if("ears") if(ears) if(length(available_channels)) - src.say("[pick(available_channels)] BAWWWWWK LEAVE THE HEADSET BAWKKKKK!") + src.say("[pick(available_channels)] RAWWWWWK LEAVE THE HEADSET RAWKKKKK!") else - src.say("BAWWWWWK LEAVE THE HEADSET BAWKKKKK!") + src.say("RAWWWWWK LEAVE THE HEADSET RAWKKKKK!") ears.forceMove(src.loc) ears = null for(var/possible_phrase in speak) @@ -189,7 +184,7 @@ * Attack responces */ //Humans, monkeys, aliens -/mob/living/simple_animal/parrot/attack_hand(mob/living/carbon/M as mob) +/mob/living/simple_animal/small/parrot/attack_hand(mob/living/carbon/M as mob) ..() if(client) return @@ -211,7 +206,7 @@ return //Simple animals -/mob/living/simple_animal/parrot/attack_animal(mob/living/M as mob) +/mob/living/simple_animal/small/parrot/attack_animal(mob/living/M as mob) if(client) return @@ -225,7 +220,7 @@ icon_state = "parrot_fly" //Mobs with objects -/mob/living/simple_animal/parrot/attackby(obj/item/O as obj, mob/user as mob) +/mob/living/simple_animal/small/parrot/attackby(obj/item/O as obj, mob/user as mob) ..() if(!stat && !client && !istype(O, /obj/item/stack/medical)) if(O.force) @@ -239,7 +234,7 @@ return //Bullets -/mob/living/simple_animal/parrot/bullet_act(obj/projectile/Proj) +/mob/living/simple_animal/small/parrot/bullet_act(obj/projectile/Proj) ..() if(!stat && !client) if(parrot_state == PARROT_PERCH) @@ -256,7 +251,7 @@ /* * AI - Not really intelligent, but I'm calling it AI anyway. */ -/mob/living/simple_animal/parrot/Life(delta_time) +/mob/living/simple_animal/small/parrot/Life(delta_time) ..() //Sprite and AI update for when a parrot gets pulled @@ -270,14 +265,14 @@ return //Lets not force players or dead/incap parrots to move if(!isturf(loc) || !(mobility_flags & MOBILITY_MOVE) || buckled) - return //If it can't move, dont let it move. (The buckled check probably isn't necessary thanks to canmove) + return //If it can't move, don't let it move. (The buckled check probably isn't necessary thanks to canmove) //-----SPEECH /* Parrot speech mimickry! Phrases that the parrot hears in mob/living/say() get added to speach_buffer. Every once in a while, the parrot picks one of the lines from the buffer and replaces an element of the 'speech' list. - Then it clears the buffer to make sure they dont magically remember something from hours ago. */ + Then it clears the buffer to make sure they don't magically remember something from hours ago. */ if(length(speech_buffer) && prob(10)) if(length(speak)) speak.Remove(pick(speak)) @@ -324,7 +319,7 @@ newspeak.Add(possible_phrase) - else //If we have no headset or channels to use, dont try to use any! + else //If we have no headset or channels to use, don't try to use any! for(var/possible_phrase in speak) if(copytext(possible_phrase,1,3) in GLOB.department_radio_keys) possible_phrase = "[copytext(possible_phrase,3,length(possible_phrase)+1)]" //crop out the channel prefix @@ -334,12 +329,12 @@ //Search for item to steal parrot_interest = search_for_item() if(parrot_interest) - INVOKE_ASYNC(src, PROC_REF(emote), "looks in [parrot_interest]'s direction and takes flight") + INVOKE_ASYNC(src, PROC_REF(emote), "looks in [parrot_interest]'s direction, pins its eyes, and takes flight.") parrot_state = PARROT_SWOOP|PARROT_STEAL icon_state = "parrot_fly" return -//-----WANDERING - This is basically a 'I dont know what to do yet' state +//-----WANDERING - This is basically a 'I don't know what to do yet' state else if(parrot_state == PARROT_WANDER) //Stop movement, we'll set it later walk(src, 0) @@ -356,7 +351,7 @@ if(AM) if(istype(AM, /obj/item) || isliving(AM)) //If stealable item parrot_interest = AM - INVOKE_ASYNC(src, PROC_REF(emote), "turns and flies towards [parrot_interest]") + INVOKE_ASYNC(src, PROC_REF(emote), "turns and flies towards [parrot_interest].") parrot_state = PARROT_SWOOP|PARROT_STEAL return else //Else it's a perch @@ -410,7 +405,7 @@ //-----RETURNING TO PERCH else if(parrot_state == (PARROT_SWOOP|PARROT_RETURN)) walk(src, 0) - if(!parrot_perch || !isturf(parrot_perch.loc)) //Make sure the perch exists and somehow isnt inside of something else. + if(!parrot_perch || !isturf(parrot_perch.loc)) //Make sure the perch exists and somehow isn't inside of something else. parrot_perch = null parrot_state = PARROT_WANDER return @@ -469,12 +464,12 @@ var/mob/living/carbon/human/H = parrot_interest var/obj/limb/affecting = H.get_limb(rand_zone(pick(parrot_dam_zone))) - H.apply_damage(damage, BRUTE, affecting, sharp=1) - INVOKE_ASYNC(src, PROC_REF(emote), pick("pecks [H]'s [affecting]", "cuts [H]'s [affecting] with its talons")) + H.apply_damage(damage, BRUTE, affecting, sharp=TRUE, enviro=TRUE) + INVOKE_ASYNC(src, PROC_REF(emote), pick("pecks [H]'s [affecting].", "cuts [H]'s [affecting] with its talons.")) else - L.apply_damage(damage, BRUTE) - INVOKE_ASYNC(src, PROC_REF(emote), pick("pecks at [L]", "claws [L]")) + L.apply_damage(damage, BRUTE, enviro=TRUE) + INVOKE_ASYNC(src, PROC_REF(emote), pick("pecks at [L].", "claws [L].")) return //Otherwise, fly towards the mob! @@ -494,7 +489,7 @@ * Procs */ -/mob/living/simple_animal/parrot/movement_delay() +/mob/living/simple_animal/small/parrot/movement_delay() if(client && stat == CONSCIOUS && parrot_state != "parrot_fly") icon_state = "parrot_fly" @@ -503,7 +498,7 @@ move_delay = . -/mob/living/simple_animal/parrot/proc/search_for_item() +/mob/living/simple_animal/small/parrot/proc/search_for_item() for(var/atom/movable/AM in view(src)) //Skip items we already stole or are wearing or are too big if(parrot_perch && AM.loc == parrot_perch.loc || AM.loc == src) @@ -520,7 +515,7 @@ return C return null -/mob/living/simple_animal/parrot/proc/search_for_perch() +/mob/living/simple_animal/small/parrot/proc/search_for_perch() for(var/obj/O in view(src)) for(var/path in desired_perches) if(istype(O, path)) @@ -528,7 +523,7 @@ return null //This proc was made to save on doing two 'in view' loops seperatly -/mob/living/simple_animal/parrot/proc/search_for_perch_and_item() +/mob/living/simple_animal/small/parrot/proc/search_for_perch_and_item() for(var/atom/movable/AM in view(src)) for(var/perch_path in desired_perches) if(istype(AM, perch_path)) @@ -553,7 +548,7 @@ /* * Verbs - These are actually procs, but can be used as verbs by player-controlled parrots. */ -/mob/living/simple_animal/parrot/proc/steal_from_ground() +/mob/living/simple_animal/small/parrot/proc/steal_from_ground() set name = "Steal from ground" set category = "Parrot" set desc = "Grabs a nearby item." @@ -581,7 +576,7 @@ to_chat(src, SPAN_DANGER("There is nothing of interest to take.")) return 0 -/mob/living/simple_animal/parrot/proc/steal_from_mob() +/mob/living/simple_animal/small/parrot/proc/steal_from_mob() set name = "Steal from mob" set category = "Parrot" set desc = "Steals an item right out of a person's hand!" @@ -590,7 +585,7 @@ return -1 if(held_item) - to_chat(src, SPAN_DANGER("You are already holding [held_item]")) + to_chat(src, SPAN_DANGER("You are already holding [held_item].")) return 1 var/obj/item/stolen_item = null @@ -611,7 +606,7 @@ to_chat(src, SPAN_DANGER("There is nothing of interest to take.")) return 0 -/mob/living/simple_animal/parrot/verb/drop_held_item_player() +/mob/living/simple_animal/small/parrot/verb/drop_held_item_player() set name = "Drop held item" set category = "Parrot" set desc = "Drop the item you're holding." @@ -623,7 +618,7 @@ return -/mob/living/simple_animal/parrot/proc/drop_parrot_held_item(drop_gently = 1) +/mob/living/simple_animal/small/parrot/proc/drop_parrot_held_item(drop_gently = 1) set name = "Drop held item" set category = "Parrot" set desc = "Drop the item you're holding." @@ -650,7 +645,7 @@ held_item = null return 1 -/mob/living/simple_animal/parrot/proc/perch_player() +/mob/living/simple_animal/small/parrot/proc/perch_player() set name = "Sit" set category = "Parrot" set desc = "Sit on a nice comfy perch." @@ -671,17 +666,17 @@ /* * Sub-types */ -/mob/living/simple_animal/parrot/Poly +/mob/living/simple_animal/small/parrot/Poly name = "Poly" desc = "Poly the Parrot. An expert on quantum cracker theory." - speak = list("Poly wanna cracker!", ":e Check the singlo, you chucklefucks!",":e Wire the solars, you lazy bums!",":e WHO TOOK THE DAMN HARDSUITS?",":e OH GOD ITS FREE CALL THE SHUTTLE") + speak = list("Poly wanna cracker!", ":e Check the wires, you chucklefucks!",":e Build those cades, you lazy bums!",":e WHO TOOK ALL THE DAMN METAL?",":e OH GOD THE ALIENS ARE HERE, CALL THE ALAMO!") -/mob/living/simple_animal/parrot/Poly/Initialize() +/mob/living/simple_animal/small/parrot/Poly/Initialize() ears = new /obj/item/device/radio/headset(src) available_channels = list(":e") . = ..() -/mob/living/simple_animal/parrot/say(message) +/mob/living/simple_animal/small/parrot/say(message) if(stat) return @@ -715,20 +710,20 @@ ..(message) -/mob/living/simple_animal/parrot/hear_say(message, verb = "says", datum/language/language = null, alt_name = "", italics = 0, mob/speaker = null) +/mob/living/simple_animal/small/parrot/hear_say(message, verb = "says", datum/language/language = null, alt_name = "", italics = 0, mob/speaker = null) if(prob(50)) parrot_hear(message) ..(message,verb,language,alt_name,italics,speaker) -/mob/living/simple_animal/parrot/hear_radio(message, verb="says", datum/language/language=null, part_a, part_b, mob/speaker = null, hard_to_hear = 0, command, vname, no_paygrade) +/mob/living/simple_animal/small/parrot/hear_radio(message, verb="says", datum/language/language=null, part_a, part_b, mob/speaker = null, hard_to_hear = 0, command, vname, no_paygrade) if(prob(50)) parrot_hear("[pick(available_channels)] [message]") ..(message,verb,language,part_a,part_b,speaker,hard_to_hear) -/mob/living/simple_animal/parrot/proc/parrot_hear(message="") +/mob/living/simple_animal/small/parrot/proc/parrot_hear(message="") if(!message || stat) return speech_buffer.Add(message) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index fb7c5f9226a3..1bc468915186 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -14,7 +14,7 @@ melee_damage_upper = 0 attacktext = "attacks" attack_sound = null - //Attacktext is the mob deal 0 damaage. + //Attacktext is the mob deal 0 damage. friendly = "nuzzles" can_crawl = FALSE black_market_value = 25 @@ -38,7 +38,7 @@ universal_speak = FALSE //No, just no. var/meat_amount = 0 var/meat_type - ///Use this to temporarely stop random movement or to if you write special movement code for animals. + ///Use this to temporarily stop random movement or to if you write special movement code for animals. var/stop_automated_movement = 0 ///Does the mob wander around when idle? var/wander = 1 @@ -181,7 +181,7 @@ //Movement if(!client && !stop_automated_movement && wander && !anchored) - if(isturf(loc) && !resting && !buckled && (mobility_flags & MOBILITY_MOVE) && !HAS_TRAIT(src, TRAIT_HAULED)) //This is so it only moves if it's not inside a closet, gentics machine, etc. + if(isturf(loc) && !resting && !buckled && (mobility_flags & MOBILITY_MOVE) && !HAS_TRAIT(src, TRAIT_HAULED)) //This is so it only moves if it's not inside a closet, genetics machine, etc. turns_since_move++ if(turns_since_move >= turns_per_move) if(!(stop_automated_movement_when_pulled && pulledby)) //Soma animals don't move when pulled @@ -324,7 +324,7 @@ M.attack_log += text("\[[time_stamp()]\] attacked [src.name] ([src.ckey])") src.attack_log += text("\[[time_stamp()]\] was attacked by [M.name] ([M.ckey])") var/damage = rand(M.melee_damage_lower, M.melee_damage_upper) - apply_damage(damage, BRUTE) + apply_damage(damage, BRUTE, enviro=TRUE) /mob/living/simple_animal/attack_hand(mob/living/carbon/human/attacking_mob) ..() @@ -369,7 +369,7 @@ /mob/living/simple_animal/can_be_pulled_by(mob/pulling_mob) if(locate(/obj/item/explosive/plastic) in contents) - to_chat(pulling_mob, SPAN_WARNING("You leave \the [src] alone. It's got live explosives on it!")) + to_chat(pulling_mob, SPAN_WARNING("You leave [src] alone. It's got live explosives on it!")) return FALSE return ..() @@ -387,7 +387,7 @@ M.show_message(SPAN_NOTICE("[user] applies [MED] on [src]"), SHOW_MESSAGE_VISIBLE) return else - to_chat(user, SPAN_NOTICE(" this [src] is dead, medical items won't bring it back to life.")) + to_chat(user, SPAN_NOTICE("[src] is dead, medical items won't bring it back to life.")) return if(meat_type && (stat == DEAD)) //if the animal has a meat, and if it is dead. if(istype(O, /obj/item/tool/kitchen/knife) || istype(O, /obj/item/tool/kitchen/knife/butcher)) @@ -407,7 +407,7 @@ move_delay = . -/mob/living/simple_animal/ex_act(severity, direction) +/mob/living/simple_animal/ex_act(severity, direction, datum/cause_data/cause_data, pierce=0, enviro=FALSE) if(severity >= 30) flash_eyes() @@ -416,7 +416,7 @@ gib() return - apply_damage(severity, BRUTE) + apply_damage(severity, BRUTE, enviro=enviro) updatehealth() var/knock_value = min( round( severity*0.1 ,1) ,10) @@ -482,4 +482,21 @@ to_chat(user, SPAN_WARNING("You aren't sure how to inject this animal!")) return FALSE +/mob/living/simple_animal/small + name = "small animal" + +/mob/living/simple_animal/small/initialize_pass_flags(datum/pass_flags_container/pass_flags) + ..() + if(pass_flags) + pass_flags.flags_pass = PASS_MOB_THRU|PASS_FLAGS_CRAWLER + pass_flags.flags_can_pass_all = PASS_ALL|PASS_OVER_THROW_ITEM + +/mob/living/simple_animal/big + name = "big animal" + +/mob/living/simple_animal/big/initialize_pass_flags(datum/pass_flags_container/pass_flags) + ..() + if(pass_flags) + pass_flags.flags_can_pass_all = PASS_OVER_THROW_ITEM + #undef OVERLAY_FIRE_LAYER diff --git a/code/modules/mob/living/simple_animal/slug.dm b/code/modules/mob/living/simple_animal/slug.dm index 3f2ceb57b838..e01e8a579d69 100644 --- a/code/modules/mob/living/simple_animal/slug.dm +++ b/code/modules/mob/living/simple_animal/slug.dm @@ -1,4 +1,4 @@ -/mob/living/simple_animal/alien_slug +/mob/living/simple_animal/small/alien_slug name = "odd slug" desc = "A weird looking slug like creature with tiny limbs." icon = 'icons/mob/animal.dmi' @@ -7,8 +7,8 @@ icon_dead = "slug_dead" speak = list("Blurb.","Blub.","BLURP!") speak_emote = list("blurps") - emote_hear = list("blurps") - emote_see = list("wiggles") + emote_hear = list("blurps.") + emote_see = list("wiggles.") attacktext = "bites" response_help = "pets" response_disarm = "shoos" @@ -18,11 +18,10 @@ see_in_dark = 6 maxHealth = 5 health = 5 - density = FALSE universal_speak = 0 universal_understand = 1 -/mob/living/simple_animal/alien_slug/Life(delta_time) +/mob/living/simple_animal/small/alien_slug/Life(delta_time) . = ..() if(!ckey && stat == CONSCIOUS && prob(0.5)) set_stat(UNCONSCIOUS) @@ -34,13 +33,13 @@ icon_state = "slug_movement" wander = 1 -/mob/living/simple_animal/alien_slug/Initialize() +/mob/living/simple_animal/small/alien_slug/Initialize() . = ..() add_verb(src, list( /mob/living/proc/ventcrawl, /mob/living/proc/hide, )) -/mob/living/simple_animal/alien_slug/start_pulling(atom/movable/AM)//Prevents it from pulling things +/mob/living/simple_animal/small/alien_slug/start_pulling(atom/movable/AM)//Prevents it from pulling things to_chat(src, SPAN_WARNING("You are too small to pull anything.")) return diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index a0894f31aa64..bd62f95bbe92 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -104,7 +104,7 @@ if(HUNTER_CLAN,HUNTER_HUD) I = image('icons/mob/hud/hud_yautja.dmi', src, "") if(HOLOCARD_HUD) - I = image('icons/mob/hud/marine_hud.dmi', src, "") + I = image('icons/mob/hud/human_status.dmi', src, "") I.appearance_flags |= NO_CLIENT_COLOR|KEEP_APART|RESET_COLOR hud_list[hud] = I @@ -209,8 +209,8 @@ var/hear_dist = 7 if(max_distance) hear_dist = max_distance - for(var/mob/M as anything in hearers(hear_dist, src.loc)) - M.show_message(message, SHOW_MESSAGE_AUDIBLE, deaf_message, SHOW_MESSAGE_VISIBLE, message_flags = message_flags) + for(var/mob/current in hearers(hear_dist, loc)) + current.show_message(message, SHOW_MESSAGE_AUDIBLE, deaf_message, SHOW_MESSAGE_VISIBLE, message_flags = message_flags) /atom/proc/ranged_message(message, blind_message, max_distance, message_flags = CHAT_TYPE_OTHER) var/view_dist = 7 @@ -363,14 +363,14 @@ if(client) if(istype(focus, /atom/movable)) client.perspective = EYE_PERSPECTIVE - client.eye = focus + client.set_eye(focus) else if(isturf(loc)) - client.eye = client.mob + client.set_eye(client.mob) client.perspective = MOB_PERSPECTIVE else client.perspective = EYE_PERSPECTIVE - client.eye = loc + client.set_eye(loc) client.mouse_pointer_icon = initial(client.mouse_pointer_icon) @@ -425,10 +425,10 @@ /mob/proc/print_flavor_text() if (flavor_text && flavor_text != "") var/msg = replacetext(flavor_text, "\n", " ") - if(length(msg) <= 40) + if(length(msg) <= 70) return SPAN_NOTICE("[msg]") else - return SPAN_NOTICE("[copytext(msg, 1, 37)]... More...") + return SPAN_NOTICE("[copytext(msg, 1, 67)]... More...") /mob/Topic(href, href_list) . = ..() @@ -621,20 +621,20 @@ note dizziness decrements automatically in the mob's Life() proc. SEND_SIGNAL(src, COMSIG_MOB_ANIMATING) if(client) if(buckled || resting) - client.pixel_x = 0 - client.pixel_y = 0 + client.set_pixel_x(0) + client.set_pixel_y(0) else var/amplitude = dizziness*(sin(dizziness * 0.044 * world.time) + 1) / 70 - client.pixel_x = amplitude * sin(0.008 * dizziness * world.time) - client.pixel_y = amplitude * cos(0.008 * dizziness * world.time) + client.set_pixel_x(amplitude * sin(0.008 * dizziness * world.time)) + client.set_pixel_y(amplitude * cos(0.008 * dizziness * world.time)) if(prob(1)) to_chat(src, "The dizziness is becoming unbearable! It should pass faster if you lie down.") sleep(1) //endwhile - reset the pixel offsets to zero is_dizzy = 0 if(client) - client.pixel_x = 0 - client.pixel_y = 0 + client.set_pixel_x(0) + client.set_pixel_y(0) to_chat(src, "The dizziness has passed, you're starting to feel better.") // jitteriness - copy+paste of dizziness @@ -977,12 +977,14 @@ note dizziness decrements automatically in the mob's Life() proc. end_of_conga = TRUE //Only mobs can continue the cycle. var/area/new_area = get_area(destination) for(var/atom/movable/AM in conga_line) - var/oldLoc + var/atom/oldLoc if(AM.loc) oldLoc = AM.loc AM.loc.Exited(AM,destination) AM.loc = destination AM.loc.Entered(AM,oldLoc) + if(oldLoc.z != destination.z) + SEND_SIGNAL(AM, COMSIG_MOVABLE_Z_CHANGED) var/area/old_area if(oldLoc) old_area = get_area(oldLoc) @@ -1027,26 +1029,26 @@ note dizziness decrements automatically in the mob's Life() proc. //Set the thing unless it's us if(A != src) client.perspective = EYE_PERSPECTIVE - client.eye = A + client.set_eye(A) else - client.eye = client.mob + client.set_eye(client.mob) client.perspective = MOB_PERSPECTIVE else if(isturf(A)) //Set to the turf unless it's our current turf if(A != loc) client.perspective = EYE_PERSPECTIVE - client.eye = A + client.set_eye(A) else - client.eye = client.mob + client.set_eye(client.mob) client.perspective = MOB_PERSPECTIVE else //Reset to common defaults: mob if on turf, otherwise current loc if(isturf(loc)) - client.eye = client.mob + client.set_eye(client.mob) client.perspective = MOB_PERSPECTIVE else client.perspective = EYE_PERSPECTIVE - client.eye = loc + client.set_eye(loc) return TRUE diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 70e9d7a065cd..79af97980999 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -63,7 +63,7 @@ var/paralyzed = 0 //Carbon var/druggy = 0 //Carbon var/confused = 0 //Carbon - var/drowsyness = 0.0//Carbon + var/drowsiness = 0.0//Carbon var/dizziness = 0//Carbon var/jitteriness = 0//Carbon var/floatiness = 0 @@ -333,7 +333,7 @@ return if(!client || !client.admin_holder || !(client.admin_holder.rights & R_MOD)) - to_chat(usr, "This can only be used on people with +MOD permissions") + to_chat(usr, "This can only be used on people with +MOD permissions.") return log_admin("[key_name(usr)] has toggled buildmode on [key_name(src)]") diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 58510cecc1e6..f258e8a0a26c 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -132,70 +132,49 @@ GLOBAL_LIST_INIT(limb_types_by_name, list( return output_message /** - * Summary: proc that parses an html input string and scrambles the non-html string contents. + * Scrambles the non-html contents in the provided message using stars(). * * Arguments: - * * message - an html string value to be parsed and modified. - * - * Return: - * returns the parsed and modified html output with the text content being partially scrambled with asteriks + * * message - The string with potential html content to scramble + * * clear_char_probability - The likelihood a character does not get converted into a * */ -/proc/stars_decode_html(message) - if(!length(message)) - return +/proc/stars_decode_html(message, clear_char_probability=25) + var/message_length = length(message) + if(!message_length) + return "" - // boolean value to know if the current indexed element needs to be scrambled. - var/parsing_message = FALSE + if(clear_char_probability >= 100) + return message - // boolean values to know if we are currently inside a double or single quotation. - var/in_single_quote = FALSE - var/in_double_quote = FALSE + var/regex/code_regex = regex(@#
") paper_text = replacetext(paper_text, "\[/h1\]", "
") @@ -316,7 +325,7 @@ if(i==0) break laststart = i+1 - fields = min(fields+1, MAX_FIELDS) + fields = min(fields+1, PAPER_MAX_FIELDS) //NOTE: The max here will include the auto-created field when hitting a paper with a pen. So it should be [your_desired_number]+1. /obj/item/paper/proc/openhelp(mob/user as mob) @@ -336,6 +345,13 @@ \[sign\] : Inserts a signature of your name in a foolproof way.\[field\] : Inserts an invisible field which lets you start type from there. Useful for forms.
+ \[name\] : Your name, but not in signature font!
+ \[s\] - \[/s\] | strikethrough!
+ \[job\] : Your job noted on your ID.
+ \[rank\] : Your rank/paygrade.
+ \[op\] : The name of the Operation.
+ \[colony\] : The name of the Map.
+ \[ship\] : The name of the main Ship.
\[small\] - \[/small\] : Decreases the size of the text.
\[list\] - \[/list\] : A list.
@@ -431,7 +447,7 @@ info += t // Oh, he wants to edit to the end of the file, let him. updateinfolinks() - show_browser(usr, "[info_links][stamps]", name, name) // Update the window + show_browser(usr, "[info_links][stamps]", name, name, extra_stylesheets=extra_stylesheets, extra_headers=extra_headers) // Update the window update_icon() playsound(src, "paper_writing", 15, TRUE) @@ -466,7 +482,7 @@ if(!p.on) to_chat(user, SPAN_NOTICE("Your pen is not on!")) return - show_browser(user, "[info_links][stamps]", name, name) // Update the window + show_browser(user, "[info_links][stamps]", name, name, width=DEFAULT_PAPER_WIDTH, height=DEFAULT_PAPER_HEIGHT, extra_stylesheets=extra_stylesheets, extra_headers=extra_headers) // Update the window //openhelp(user) return @@ -540,7 +556,7 @@ info = "Hey Garry, I got the boys to move most of the emergency supplies down into the ASRS hold just like ya' asked.
Next time you're around Chinook I'll buy you a beer ok?" /obj/item/paper/Toxin name = "Chemical Information" - info = "Known Onboard Toxins:
\n\tGrade A Semi-Liquid Phoron:
\n\t\tHighly poisonous. You cannot sustain concentrations above 15 units.
\n\t\tA gas mask fails to filter phoron after 50 units.
\n\t\tWill attempt to diffuse like a gas.
\n\t\tFiltered by scrubbers.
\n\t\tThere is a bottled version which is very different
\n\t\t\tfrom the version found in canisters!
\n
\n\t\tWARNING: Highly Flammable. Keep away from heat sources
\n\t\texcept in a enclosed fire area!
\n\t\tWARNING: It is a crime to use this without authorization.
\nKnown Onboard Anti-Toxin:
\n\tAnti-Toxin Type 01P: Works against Grade A Phoron.
\n\t\tBest if injected directly into bloodstream.
\n\t\tA full injection is in every regular Med-Kit.
\n\t\tSpecial toxin Kits hold around 7.
\n
\nKnown Onboard Chemicals (other):
\n\tRejuvenation T#001:
\n\t\tEven 1 unit injected directly into the bloodstream
\n\t\t\twill cure paralysis and sleep phoron.
\n\t\tIf administered to a dying patient it will prevent
\n\t\t\tfurther damage for about units*3 seconds.
\n\t\t\tit will not cure them or allow them to be cured.
\n\t\tIt can be administeredd to a non-dying patient
\n\t\t\tbut the chemicals disappear just as fast.
\n\tSoporific T#054:
\n\t\t5 units wilkl induce precisely 1 minute of sleep.
\n\t\t\tThe effect are cumulative.
\n\t\tWARNING: It is a crime to use this without authorization" + info = "Known Onboard Toxins:
\n\tGrade A Semi-Liquid Phoron:
\n\t\tHighly poisonous. You cannot sustain concentrations above 15 units.
\n\t\tA gas mask fails to filter phoron after 50 units.
\n\t\tWill attempt to diffuse like a gas.
\n\t\tFiltered by scrubbers.
\n\t\tThere is a bottled version which is very different
\n\t\t\tfrom the version found in canisters!
\n
\n\t\tWARNING: Highly Flammable. Keep away from heat sources
\n\t\texcept in a enclosed fire area!
\n\t\tWARNING: It is a crime to use this without authorization.
\nKnown Onboard Anti-Toxin:
\n\tAnti-Toxin Type 01P: Works against Grade A Phoron.
\n\t\tBest if injected directly into bloodstream.
\n\t\tA full injection is in every regular Med-Kit.
\n\t\tSpecial toxin Kits hold around 7.
\n
\nKnown Onboard Chemicals (other):
\n\tRejuvenation T#001:
\n\t\tEven 1 unit injected directly into the bloodstream
\n\t\t\twill cure paralysis and sleep phoron.
\n\t\tIf administered to a dying patient it will prevent
\n\t\t\tfurther damage for about units*3 seconds.
\n\t\t\tit will not cure them or allow them to be cured.
\n\t\tIt can be administered to a non-dying patient
\n\t\t\tbut the chemicals disappear just as fast.
\n\tSoporific T#054:
\n\t\t5 units will induce precisely 1 minute of sleep.
\n\t\t\tThe effect are cumulative.
\n\t\tWARNING: It is a crime to use this without authorization!" /obj/item/paper/courtroom name = "A Crash Course in Legal SOP on SS13" @@ -548,11 +564,11 @@ /obj/item/paper/hydroponics name = "Greetings from Billy Bob" - info = "Hey fellow botanist!
\n
\nI didn't trust the station folk so I left
\na couple of weeks ago. But here's some
\ninstructions on how to operate things here.
\nYou can grow plants and each iteration they become
\nstronger, more potent and have better yield, if you
\nknow which ones to pick. Use your botanist's analyzer
\nfor that. You can turn harvested plants into seeds
\nat the seed extractor, and replant them for better stuff!
\nSometimes if the weed level gets high in the tray
\nmutations into different mushroom or weed species have
\nbeen witnessed. On the rare occassion even weeds mutate!
\n
\nEither way, have fun!
\n
\nBest regards,
\nBilly Bob Johnson.
\n
\nPS.
\nHere's a few tips:
\nIn nettles, potency = damage
\nIn amanitas, potency = deadliness + side effect
\nIn Liberty caps, potency = drug power + effect
\nIn chilis, potency = heat
\nNutrients keep mushrooms alive!
\nWater keeps weeds such as nettles alive!
\nAll other plants need both." + info = "Hey fellow botanist!
\n
\nI didn't trust the station folk so I left
\na couple of weeks ago. But here's some
\ninstructions on how to operate things here.
\nYou can grow plants and each iteration they become
\nstronger, more potent and have better yield, if you
\nknow which ones to pick. Use your botanist's analyzer
\nfor that. You can turn harvested plants into seeds
\nat the seed extractor, and replant them for better stuff!
\nSometimes if the weed level gets high in the tray
\nmutations into different mushroom or weed species have
\nbeen witnessed. On the rare occasion even weeds mutate!
\n
\nEither way, have fun!
\n
\nBest regards,
\nBilly Bob Johnson.
\n
\nPS.
\nHere's a few tips:
\nIn nettles, potency = damage
\nIn amanitas, potency = deadliness + side effect
\nIn Liberty caps, potency = drug power + effect
\nIn chilis, potency = heat
\nNutrients keep mushrooms alive!
\nWater keeps weeds such as nettles alive!
\nAll other plants need both." /obj/item/paper/djstation name = "DJ Listening Outpost" - info = "Welcome new owner!
You have purchased the latest in listening equipment. The telecommunication setup we created is the best in listening to common and private radio fequencies. Here is a step by step guide to start listening in on those saucy radio channels:
- Equip yourself with a multi-tool
- Use the multitool on each machine, that is the broadcaster, receiver and the relay.
- Turn all the machines on, it has already been configured for you to listen on.
- 145.7 - Common Channel
- 144.7 - Private AI Channel
- 135.9 - Security Channel
- 135.7 - Engineering Channel
- 135.5 - Medical Channel
- 135.3 - Command Channel
- 135.1 - Science Channel
- 134.9 - Mining Channel
- 134.7 - Cargo Channel " + info = "Welcome new owner!
- Equip yourself with a multi-tool
- Use the multitool on each machine, that is the broadcaster, receiver and the relay.
- Turn all the machines on, it has already been configured for you to listen on.
- 145.7 - Common Channel
- 144.7 - Private AI Channel
- 135.9 - Security Channel
- 135.7 - Engineering Channel
- 135.5 - Medical Channel
- 135.3 - Command Channel
- 135.1 - Science Channel
- 134.9 - Mining Channel
- 134.7 - Cargo Channel " /obj/item/paper/flag name = "paper flag" @@ -564,7 +580,7 @@ /obj/item/paper/jobs name = "Job Information" - info = "Information on all formal jobs that can be assigned on Space Station 13 can be found on this document.
You have purchased the latest in listening equipment. The telecommunication setup we created is the best in listening to common and private radio frequencies. Here is a step by step guide to start listening in on those saucy radio channels:
\nThe data will be in the following form.
\nGenerally lower ranking positions come first in this list.
\n
\nJob Name general access>lab access-engine access-systems access (atmosphere control)
\n\tJob Description
\nJob Duties (in no particular order)
\nTips (where applicable)
\n
\nResearch Assistant 1>1-0-0
\n\tThis is probably the lowest level position. Anyone who enters the space station after the initial job\nassignment will automatically receive this position. Access with this is restricted. Head of Personnel should\nappropriate the correct level of assistance.
\n1. Assist the researchers.
\n2. Clean up the labs.
\n3. Prepare materials.
\n
\nStaff Assistant 2>0-0-0
\n\tThis position assists the security officer in his duties. The staff assisstants should primarily br\npatrolling the ship waiting until they are needed to maintain ship safety.\n(Addendum: Updated/Elevated Security Protocols admit issuing of low level weapons to security personnel)
\n1. Patrol ship/Guard key areas
\n2. Assist security officer
\n3. Perform other security duties.
\n
\nTechnical Assistant 1>0-0-1
\n\tThis is yet another low level position. The technical assistant helps the engineer and the statian\ntechnician with the upkeep and maintenance of the station. This job is very important because it usually\ngets to be a heavy workload on station technician and these helpers will alleviate that.
\n1. Assist Station technician and Engineers.
\n2. Perform general maintenance of station.
\n3. Prepare materials.
\n
\nMedical Assistant 1>1-0-0
\n\tThis is the fourth position yet it is slightly less common. This position doesn't have much power\noutside of the med bay. Consider this position like a nurse who helps to upkeep medical records and the\nmaterials (filling syringes and checking vitals)
\n1. Assist the medical personnel.
\n2. Update medical files.
\n3. Prepare materials for medical operations.
\n
\nResearch Technician 2>3-0-0
\n\tThis job is primarily a step up from research assistant. These people generally do not get their own lab\nbut are more hands on in the experimentation process. At this level they are permitted to work as consultants to\nthe others formally.
\n1. Inform superiors of research.
\n2. Perform research alongside of official researchers.
\n
\nDetective 3>2-0-0
\n\tThis job is in most cases slightly boring at best. Their sole duty is to\nperform investigations of crine scenes and analysis of the crime scene. This\nalleviates SOME of the burden from the security officer. This person's duty\nis to draw conclusions as to what happened and testify in court. Said person\nalso should stroe the evidence ly.
\n1. Perform crime-scene investigations/draw conclusions.
\n2. Store and catalogue evidence properly.
\n3. Testify to superiors/inquieries on findings.
\n
\nStation Technician 2>0-2-3
\n\tPeople assigned to this position must work to make sure all the systems aboard Space Station 13 are operable.\nThey should primarily work in the computer lab and repairing faulty equipment. They should work with the\natmospheric technician.
\n1. Maintain SS13 systems.
\n2. Repair equipment.
\n
\nAtmospheric Technician 3>0-0-4
\n\tThese people should primarily work in the atmospheric control center and lab. They have the very important\njob of maintaining the delicate atmosphere on SS13.
\n1. Maintain atmosphere on SS13
\n2. Research atmospheres on the space station. (safely please!)
\n
\nEngineer 2>1-3-0
\n\tPeople working as this should generally have detailed knowledge as to how the propulsion systems on SS13\nwork. They are one of the few classes that have unrestricted access to the engine area.
\n1. Upkeep the engine.
\n2. Prevent fires in the engine.
\n3. Maintain a safe orbit.
\n
\nMedical Researcher 2>5-0-0
\n\tThis position may need a little clarification. Their duty is to make sure that all experiments are safe and\nto conduct experiments that may help to improve the station. They will be generally idle until a new laboratory\nis constructed.
\n1. Make sure the station is kept safe.
\n2. Research medical properties of materials studied of Space Station 13.
\n
\nScientist 2>5-0-0
\n\tThese people study the properties, particularly the toxic properties, of materials handled on SS13.\nTechnically they can also be called Phoron Technicians as phoron is the material they routinly handle.
\n1. Research phoron
\n2. Make sure all phoron is properly handled.
\n
\nMedical Doctor (Officer) 2>0-0-0
\n\tPeople working this job should primarily stay in the medical area. They should make sure everyone goes to\nthe medical bay for treatment and examination. Also they should make sure that medical supplies are kept in\norder.
\n1. Heal wounded people.
\n2. Perform examinations of all personnel.
\n3. Moniter usage of medical equipment.
\n
\nSecurity Officer 3>0-0-0
\n\tThese people should attempt to keep the peace inside the station and make sure the station is kept safe. One\nside duty is to assist in repairing the station. They also work like general maintenance personnel. They are not\ngiven a weapon and must use their own resources.
\n(Addendum: Updated/Elevated Security Protocols admit issuing of weapons to security personnel)
\n1. Maintain order.
\n2. Assist others.
\n3. Repair structural problems.
\n
\nHead of Security 4>5-2-2
\n\tPeople assigned as Head of Security should issue orders to the security staff. They should\nalso carefully moderate the usage of all security equipment. All security matters should be reported to this person.
\n1. Oversee security.
\n2. Assign patrol duties.
\n3. Protect the station and staff.
\n
\nHead of Personnel 4>4-2-2
\n\tPeople assigned as head of personnel will find themselves moderating all actions done by personnel. \nAlso they have the ability to assign jobs and access levels.
\n1. Assign duties.
\n2. Moderate personnel.
\n3. Moderate research.
\n
\nCaptain 5>5-5-5 (unrestricted station wide access)
\n\tThis is the highest position youi can aquire on Space Station 13. They are allowed anywhere inside the\nspace station and therefore should protect their ID card. They also have the ability to assign positions\nand access levels. They should not abuse their power.
\n1. Assign all positions on SS13
\n2. Inspect the station for any problems.
\n3. Perform administrative duties.
\n" + info = "Information on all formal jobs that can be assigned on Space Station 13 can be found on this document.
\nThe data will be in the following form.
\nGenerally lower ranking positions come first in this list.
\n
\nJob Name general access>lab access-engine access-systems access (atmosphere control)
\n\tJob Description
\nJob Duties (in no particular order)
\nTips (where applicable)
\n
\nResearch Assistant 1>1-0-0
\n\tThis is probably the lowest level position. Anyone who enters the space station after the initial job\nassignment will automatically receive this position. Access with this is restricted. Head of Personnel should\nappropriate the correct level of assistance.
\n1. Assist the researchers.
\n2. Clean up the labs.
\n3. Prepare materials.
\n
\nStaff Assistant 2>0-0-0
\n\tThis position assists the security officer in his duties. The staff assistants should primarily br\npatrolling the ship waiting until they are needed to maintain ship safety.\n(Addendum: Updated/Elevated Security Protocols admit issuing of low level weapons to security personnel)
\n1. Patrol ship/Guard key areas
\n2. Assist security officer
\n3. Perform other security duties.
\n
\nTechnical Assistant 1>0-0-1
\n\tThis is yet another low level position. The technical assistant helps the engineer and the station\ntechnician with the upkeep and maintenance of the station. This job is very important because it usually\ngets to be a heavy workload on station technician and these helpers will alleviate that.
\n1. Assist Station technician and Engineers.
\n2. Perform general maintenance of station.
\n3. Prepare materials.
\n
\nMedical Assistant 1>1-0-0
\n\tThis is the fourth position yet it is slightly less common. This position doesn't have much power\noutside of the med bay. Consider this position like a nurse who helps to upkeep medical records and the\nmaterials (filling syringes and checking vitals)
\n1. Assist the medical personnel.
\n2. Update medical files.
\n3. Prepare materials for medical operations.
\n
\nResearch Technician 2>3-0-0
\n\tThis job is primarily a step up from research assistant. These people generally do not get their own lab\nbut are more hands on in the experimentation process. At this level they are permitted to work as consultants to\nthe others formally.
\n1. Inform superiors of research.
\n2. Perform research alongside of official researchers.
\n
\nDetective 3>2-0-0
\n\tThis job is in most cases slightly boring at best. Their sole duty is to\nperform investigations of crine scenes and analysis of the crime scene. This\nalleviates SOME of the burden from the security officer. This person's duty\nis to draw conclusions as to what happened and testify in court. Said person\nalso should store the evidence ly.
\n1. Perform crime-scene investigations/draw conclusions.
\n2. Store and catalogue evidence properly.
\n3. Testify to superiors/inquiries on findings.
\n
\nStation Technician 2>0-2-3
\n\tPeople assigned to this position must work to make sure all the systems aboard Space Station 13 are operable.\nThey should primarily work in the computer lab and repairing faulty equipment. They should work with the\natmospheric technician.
\n1. Maintain SS13 systems.
\n2. Repair equipment.
\n
\nAtmospheric Technician 3>0-0-4
\n\tThese people should primarily work in the atmospheric control center and lab. They have the very important\njob of maintaining the delicate atmosphere on SS13.
\n1. Maintain atmosphere on SS13
\n2. Research atmospheres on the space station. (safely please!)
\n
\nEngineer 2>1-3-0
\n\tPeople working as this should generally have detailed knowledge as to how the propulsion systems on SS13\nwork. They are one of the few classes that have unrestricted access to the engine area.
\n1. Upkeep the engine.
\n2. Prevent fires in the engine.
\n3. Maintain a safe orbit.
\n
\nMedical Researcher 2>5-0-0
\n\tThis position may need a little clarification. Their duty is to make sure that all experiments are safe and\nto conduct experiments that may help to improve the station. They will be generally idle until a new laboratory\nis constructed.
\n1. Make sure the station is kept safe.
\n2. Research medical properties of materials studied of Space Station 13.
\n
\nScientist 2>5-0-0
\n\tThese people study the properties, particularly the toxic properties, of materials handled on SS13.\nTechnically they can also be called Phoron Technicians as phoron is the material they routinely handle.
\n1. Research phoron
\n2. Make sure all phoron is properly handled.
\n
\nMedical Doctor (Officer) 2>0-0-0
\n\tPeople working this job should primarily stay in the medical area. They should make sure everyone goes to\nthe medical bay for treatment and examination. Also they should make sure that medical supplies are kept in\norder.
\n1. Heal wounded people.
\n2. Perform examinations of all personnel.
\n3. Monitor usage of medical equipment.
\n
\nSecurity Officer 3>0-0-0
\n\tThese people should attempt to keep the peace inside the station and make sure the station is kept safe. One\nside duty is to assist in repairing the station. They also work like general maintenance personnel. They are not\ngiven a weapon and must use their own resources.
\n(Addendum: Updated/Elevated Security Protocols admit issuing of weapons to security personnel)
\n1. Maintain order.
\n2. Assist others.
\n3. Repair structural problems.
\n
\nHead of Security 4>5-2-2
\n\tPeople assigned as Head of Security should issue orders to the security staff. They should\nalso carefully moderate the usage of all security equipment. All security matters should be reported to this person.
\n1. Oversee security.
\n2. Assign patrol duties.
\n3. Protect the station and staff.
\n
\nHead of Personnel 4>4-2-2
\n\tPeople assigned as head of personnel will find themselves moderating all actions done by personnel. \nAlso they have the ability to assign jobs and access levels.
\n1. Assign duties.
\n2. Moderate personnel.
\n3. Moderate research.
\n
\nCaptain 5>5-5-5 (unrestricted station wide access)
\n\tThis is the highest position you can acquire on Space Station 13. They are allowed anywhere inside the\nspace station and therefore should protect their ID card. They also have the ability to assign positions\nand access levels. They should not abuse their power.
\n1. Assign all positions on SS13
\n2. Inspect the station for any problems.
\n3. Perform administrative duties.
\n" /obj/item/paper/photograph name = "photo" @@ -574,7 +590,7 @@ /obj/item/paper/sop name = "paper- 'Standard Operating Procedure'" - info = "Alert Levels:
\nBlue- Emergency
\n\t1. Caused by fire
\n\t2. Caused by manual interaction
\n\tAction:
\n\t\tClose all fire doors. These can only be opened by reseting the alarm
\nRed- Ejection/Self-Destruct
\n\t1. Caused by module operating computer.
\n\tAction:
\n\t\tAfter the specified time the module will eject completely.
\n
\nEngine Maintenance Instructions:
\n\tShut off ignition systems:
\n\tActivate internal power
\n\tActivate orbital balance matrix
\n\tRemove volatile liquids from area
\n\tWear a fire suit
\n
\n\tAfter
\n\t\tDecontaminate
\n\t\tVisit medical examiner
\n
\nToxin Laboratory Procedure:
\n\tWear a gas mask regardless
\n\tGet an oxygen tank.
\n\tActivate internal atmosphere
\n
\n\tAfter
\n\t\tDecontaminate
\n\t\tVisit medical examiner
\n
\nDisaster Procedure:
\n\tFire:
\n\t\tActivate sector fire alarm.
\n\t\tMove to a safe area.
\n\t\tGet a fire suit
\n\t\tAfter:
\n\t\t\tAssess Damage
\n\t\t\tRepair damages
\n\t\t\tIf needed, Evacuate
\n\tMeteor Shower:
\n\t\tActivate fire alarm
\n\t\tMove to the back of ship
\n\t\tAfter
\n\t\t\tRepair damage
\n\t\t\tIf needed, Evacuate
\n\tAccidental Reentry:
\n\t\tActivate fire alarms in front of ship.
\n\t\tMove volatile matter to a fire proof area!
\n\t\tGet a fire suit.
\n\t\tStay secure until an emergency ship arrives.
\n
\n\t\tIf ship does not arrive-
\n\t\t\tEvacuate to a nearby safe area!" + info = "Alert Levels:
\nBlue- Emergency
\n\t1. Caused by fire
\n\t2. Caused by manual interaction
\n\tAction:
\n\t\tClose all fire doors. These can only be opened by resetting the alarm
\nRed- Ejection/Self-Destruct
\n\t1. Caused by module operating computer.
\n\tAction:
\n\t\tAfter the specified time the module will eject completely.
\n
\nEngine Maintenance Instructions:
\n\tShut off ignition systems:
\n\tActivate internal power
\n\tActivate orbital balance matrix
\n\tRemove volatile liquids from area
\n\tWear a fire suit
\n
\n\tAfter
\n\t\tDecontaminate
\n\t\tVisit medical examiner
\n
\nToxin Laboratory Procedure:
\n\tWear a gas mask regardless
\n\tGet an oxygen tank.
\n\tActivate internal atmosphere
\n
\n\tAfter
\n\t\tDecontaminate
\n\t\tVisit medical examiner
\n
\nDisaster Procedure:
\n\tFire:
\n\t\tActivate sector fire alarm.
\n\t\tMove to a safe area.
\n\t\tGet a fire suit
\n\t\tAfter:
\n\t\t\tAssess Damage
\n\t\t\tRepair damages
\n\t\t\tIf needed, Evacuate
\n\tMeteor Shower:
\n\t\tActivate fire alarm
\n\t\tMove to the back of ship
\n\t\tAfter
\n\t\t\tRepair damage
\n\t\t\tIf needed, Evacuate
\n\tAccidental Reentry:
\n\t\tActivate fire alarms in front of ship.
\n\t\tMove volatile matter to a fire proof area!
\n\t\tGet a fire suit.
\n\t\tStay secure until an emergency ship arrives.
\n
\n\t\tIf ship does not arrive-
\n\t\t\tEvacuate to a nearby safe area!" /obj/item/paper/prison_station/test_log name = "paper- 'Test Log'" @@ -599,7 +615,7 @@ /obj/item/paper/prison_station/inmate_handbook name = "paper= 'Inmate Rights, Privileges and Responsibilities'" - info = "
FIORINA ORBITAL PENITENTIARY
INMATE RIGHTS, PRIVILEGES AND RESPONSIBILITIES
RIGHTS
As per the Corrections Act 2087, you have the right to the following:
1. You have the right to be treated impartially and fairly by all personnel.
\n2. You have the right to be informed of the rules, procedures, and schedules.
\n3. You have the right to freedom of religious affiliation and voluntary religious worship.
\n4. You have the right to health care which includes meals, proper bedding and clothing and a laundry schedule for cleanliness of the same, an opportunity to shower regularly, proper ventilation for warmth and fresh air, a regular exercise period, toilet articles, medical, and dental treatment.
PRIVILEGES
You do NOT have the right to the following; these are privileges granted by the institution, and may be revoked at ANY time for ANY reason:
1. You may be granted the privilege to visitation and correspondence with family members and friends.
\n2. You may be granted the privilege to reading materials for educational purposes and for your own enjoyment.
\n3. You may be granted the privilege to limited personal money to purchase items from the prison store.
RESPONSIBILITIES
Inmates must fufill the following responsibilities:
1. You have the responsibility to know and abide by all rules, procedures, and schedules.
\n2. You have the responsibility to obey any and all commands from personnel.
\n3. You have the responsibility to recognize and respect the rights of other inmates.
\n4. You have the responsibility to not waste food, to follow the laundry and shower schedule, maintain neat and clean living quarters, keep your area free of contraband, and seek medical and dental care as you may need it.
\n5. You have the responsibility to conduct yourself properly during visits, not accept or pass contraband, and not violate the law or institution rules or institution guidelines through your correspondence.
\n6. You have the responsibility to meet your financial obligations including, but not limited to, court imposed assessments, fines, and restitution.
\n7. You have the responsibility to coorporate with the Fiorina Orbital Penitentiary's Medical Research Department in any and all research studies.
FIORINA ORBITAL PENITENTIARY
INMATE RIGHTS, PRIVILEGES AND RESPONSIBILITIES
RIGHTS
As per the Corrections Act 2087, you have the right to the following:
1. You have the right to be treated impartially and fairly by all personnel.
\n2. You have the right to be informed of the rules, procedures, and schedules.
\n3. You have the right to freedom of religious affiliation and voluntary religious worship.
\n4. You have the right to health care which includes meals, proper bedding and clothing and a laundry schedule for cleanliness of the same, an opportunity to shower regularly, proper ventilation for warmth and fresh air, a regular exercise period, toilet articles, medical, and dental treatment.
PRIVILEGES
You do NOT have the right to the following; these are privileges granted by the institution, and may be revoked at ANY time for ANY reason:
1. You may be granted the privilege to visitation and correspondence with family members and friends.
\n2. You may be granted the privilege to reading materials for educational purposes and for your own enjoyment.
\n3. You may be granted the privilege to limited personal money to purchase items from the prison store.
RESPONSIBILITIES
Inmates must fulfill the following responsibilities:
1. You have the responsibility to know and abide by all rules, procedures, and schedules.
\n2. You have the responsibility to obey any and all commands from personnel.
\n3. You have the responsibility to recognize and respect the rights of other inmates.
\n4. You have the responsibility to not waste food, to follow the laundry and shower schedule, maintain neat and clean living quarters, keep your area free of contraband, and seek medical and dental care as you may need it.
\n5. You have the responsibility to conduct yourself properly during visits, not accept or pass contraband, and not violate the law or institution rules or institution guidelines through your correspondence.
\n6. You have the responsibility to meet your financial obligations including, but not limited to, court imposed assessments, fines, and restitution.
\n7. You have the responsibility to corporate with the Fiorina Orbital Penitentiary's Medical Research Department in any and all research studies.
Whenever you unload a cargo container look for any crate with a blue hexagon on it.
Upon finding one, DO NOT OPEN it under ANY circumstances, and keep it away from anyone else. You then bring it to virology, specifically the back of the lobby where there is a hole into the caves.
\nThen, leave it at the nearest crevice to the right and my men will take it. Should there be any backup, just stack it on top.
\nEasy, right? Just moving cargo. If anyone asks what’s in it, it’s just power tools.
\nGood luck, I'll slide you a few blunts of space weed that we have as a tip if you work well.
" + info = "Alright Jeff, I know you still owe me after standing up for you when you got caught with a whole pill bottle of mindbreaker. Remember how I got you out of 15 years in the slammer? \n Anyways, I have a special task for you that you can do to repay me. \nWhenever you unload a cargo container look for any crate with a blue hexagon on it.
Upon finding one, DO NOT OPEN it under ANY circumstances, and keep it away from anyone else. You then bring it to virology, specifically the back of the lobby where there is a hole into the caves.
\nThen, leave it at the nearest crevice to the right and my men will take it. Should there be any backup, just stack it on top.
\nEasy, right? Just moving cargo. If anyone asks what’s in it, it’s just power tools.
\nGood luck, I'll slide you a few blunts of space weed that we have as a tip if you work well.
" color = "grey" /obj/item/paper/bigred/witness @@ -647,7 +663,7 @@ /obj/item/paper/bigred/crazy name = "THEY ARE COMING FOR ME" - info = "Fuck man, I have tried and tried to tell people, from my co-workers and friends to anyone who would listen to me. Each and every single time I have been called crazy.Then recently THEY took notice, and started sending their minions against me, almost everywhere i go outside of the caves, there is constantly a marshal on my ass, stalking me at least 30 feet away. They KNOW and they want me silenced or dead.
\n Then one day the head of security himself, Jim FUCKING Hamilton instructed me to stop \" spreading rumors \" or face consequences.No, I will not follow what a mere puppet wants me to do, a lap dog being controlled by THEM!
\n \n There is some hope, however. There is word going around of a mutiny at my workplace. The miners will rise up and forcibly take control of the administration, and their leader has agreed with me to investigate lambda and expose it once and for all!.However, I can’t just leave them exposed with their twisted secrets uncovered. They’re too dangerous to be left alive and they are going to find some way to escape justice. When the mutiny happens, I will shoot my way through the security to find the thermobaric explosives that were mistakenly sent here, transport them amidst the chaos to the secret lab, and save the colony and ALL of humanity by obliterating it.
" + info = "Fuck man, I have tried and tried to tell people, from my co-workers and friends to anyone who would listen to me. Each and every single time I have been called crazy.Then recently THEY took notice, and started sending their minions against me, almost everywhere i go outside of the caves, there is constantly a marshal on my ass, stalking me at least 30 feet away. They KNOW and they want me silenced or dead.
\n Then one day the head of security himself, Jim FUCKING Hamilton instructed me to stop \" spreading rumors \" or face consequences.No, I will not follow what a mere puppet wants me to do, a lap dog being controlled by THEM!
\n \n There is some hope, however. There is word going around of a mutiny at my workplace. The miners will rise up and forcibly take control of the administration, and their leader has agreed with me to investigate lambda and expose it once and for all!.However, I can’t just leave them exposed with their twisted secrets uncovered. They’re too dangerous to be left alive and they are going to find some way to escape justice. When the mutiny happens, I will shoot my way through the security to find the thermobaric explosives that were mistakenly sent here, transport them amidst the chaos to the secret lab, and save the colony and ALL of humanity by obliterating it.
" color = "green" /obj/item/paper/bigred/final @@ -672,13 +688,13 @@ /obj/item/paper/soro/clf name = "TOP SECRET: FOR CELL LEAD ONLY" - info = "Your request for extraction has been recieved. We have no assets in the region available. Await further instruction." + info = "Your request for extraction has been received. We have no assets in the region available. Await further instruction." /obj/item/paper/bigred/upp/Initialize(mapload, photo_list) . = ..() var/datum/asset/asset = get_asset_datum(/datum/asset/simple/paper) - info = "["logo_upp.png"]])
Union Of Progressive People's Fourth Fleet
No.52
Order of Military Officer of the UPP
Kolonel
Commander of MV-35
Date: 2182
The actions of the hostile Weyland-Yutani corporation on the fringes of the Neroid sector have grown increasingly intolerable. However, evidence suggesting they are researching into the creation and deployment of some form of biological weapons program represent an unacceptable risk to the security of UPP interests in this sector. The risk of these items falling into UA/USCM hands is unacceptable.
Orders for the Boris squad of the 173rd Airborne Recon are as follows. Initiate airborne reconnaissance of WY colony Oxley's Buttle, Trijent Dam, location on planet Raijin (UA Code: LV-670). Ascertain veracity of onsight biological weapons program. If positive confirmation of the weapons program is identified, authorization for rapid assault and recovery is granted. Avoid all contact with UA/USCM military forces, abort missions if UA/USCM forces are encountered.
Name and Rank: Kolonel
FOR SANCTIONED USE ONLY" + info = "
Union Of Progressive People's Fourth Fleet
No.52
Order of Military Officer of the UPP
Kolonel
Commander of MV-35
Date: 2182
The actions of the hostile Weyland-Yutani corporation on the fringes of the Neroid sector have grown increasingly intolerable. However, evidence suggesting they are researching into the creation and deployment of some form of biological weapons program represent an unacceptable risk to the security of UPP interests in this sector. The risk of these items falling into UA/USCM hands is unacceptable.
Orders for the Boris squad of the 173rd Airborne Recon are as follows. Initiate airborne reconnaissance of WY colony Oxley's Buttle, Trijent Dam, location on planet Raijin (UA Code: LV-670). Ascertain veracity of on site biological weapons program. If positive confirmation of the weapons program is identified, authorization for rapid assault and recovery is granted. Avoid all contact with UA/USCM military forces, abort missions if UA/USCM forces are encountered.
Name and Rank: Kolonel
FOR SANCTIONED USE ONLY" /obj/item/paper/crumpled name = "paper scrap" @@ -701,6 +717,7 @@ var/datum/asset/asset = get_asset_datum(/datum/asset/simple/paper) info = "
["logo_wy.png"]])
\n" + icon_state = initial(icon_state) /obj/item/paper/uscm icon_state = "paper_uscm" @@ -710,6 +727,7 @@ var/datum/asset/asset = get_asset_datum(/datum/asset/simple/paper) info = "
["logo_uscm.png"]])
\n" + icon_state = initial(icon_state) /obj/item/paper/research_notes icon_state = "paper_wy_words" @@ -787,7 +805,7 @@ if(CHECK_BITFIELD(reaction_generated?.reaction_type, CHEM_REACTION_BUBBLING)) txt += "\n
Aggressive foaming
\n - The reaction causes bubbling and foam to build up rapidly and shoot out of the beaker. Biological Suit gives complete protection.
" else if(CHECK_BITFIELD(reaction_generated?.reaction_type, CHEM_REACTION_GLOWING)) - txt += "\n
Luminesence.
\n - The reaction produces light, power of the light is dictated by the amount mixed.
" + txt += "\n
Luminescence.
\n - The reaction produces light, power of the light is dictated by the amount mixed.
" else if(CHECK_BITFIELD(reaction_generated?.reaction_type, CHEM_REACTION_SMOKING)) txt += "\n
Fuming
\n - The reaction produces heavy fumes from contents of the beaker. Work under a fume hood, wear a gas mask, or simply put an airtight seal over the beaker.
" else if(CHECK_BITFIELD(reaction_generated?.reaction_type, CHEM_REACTION_FIRE)) @@ -798,6 +816,7 @@ txt += "
Inert
- The reaction has no indicators.
" txt += "
The following properties have been discovered during tests:
[chemical_to_generate.description]\n" txt += "
Overdoses at: [chemical_to_generate.overdose] units
\n" + txt += "
Critically Overdoses at: [chemical_to_generate.overdose_critical] units
\n" icon_state = "paper_wy_full_report" else txt += "
\nTesting for chemical properties is currently pending.
\n" @@ -905,7 +924,7 @@ picked_property = pick(PROPERTY_LEGENDARY_LIST) hint = GLOB.combining_properties[picked_property] if(length(hint) < LEGENDARY_COMBINE_PROPERTIES) - return INITIALIZE_HINT_QDEL //shouldnt happen, will happen. + return INITIALIZE_HINT_QDEL //shouldn't happen, will happen. /obj/item/paper/research_notes/grant @@ -937,7 +956,7 @@ if(CHECK_BITFIELD(reaction_generated?.reaction_type, CHEM_REACTION_BUBBLING)) info += "\n
Aggressive foaming
\n - The reaction causes bubbling and foam to build up rapidly and shoot out of the beaker. Biological Suit gives complete protection.
" else if(CHECK_BITFIELD(reaction_generated?.reaction_type, CHEM_REACTION_GLOWING)) - info += "\n
Luminesence.
\n - The reaction produces light, power of the light is dictated by the amount mixed.
" + info += "\n
Luminescence.
\n - The reaction produces light, power of the light is dictated by the amount mixed.
" else if(CHECK_BITFIELD(reaction_generated?.reaction_type, CHEM_REACTION_SMOKING)) info += "\n
Fuming
\n - The reaction produces heavy fumes from contents of the beaker. Work under a fume hood, wear a gas mask, or simply put an airtight seal over the beaker.
" else if(CHECK_BITFIELD(reaction_generated?.reaction_type, CHEM_REACTION_FIRE)) @@ -948,6 +967,7 @@ info += "
Inert
- The reaction has no indicators.
" info += "[S.description]\n" info += "
Overdoses at: [S.overdose] units\n" + info += "
Critically Overdoses at: [S.overdose_critical] units\n" info += "
Standard duration multiplier of [REAGENTS_METABOLISM/S.custom_metabolism]x
\n" completed = TRUE icon_state = "paper_wy_full_report" @@ -964,7 +984,7 @@ if(CHECK_BITFIELD(reaction_generated?.reaction_type, CHEM_REACTION_BUBBLING)) info += "\n
Aggressive foaming
\n - The reaction causes bubbling and foam to build up rapidly and shoot out of the beaker. Biological Suit gives complete protection.
" else if(CHECK_BITFIELD(reaction_generated?.reaction_type, CHEM_REACTION_GLOWING)) - info += "\n
Luminesence.
\n - The reaction produces light, power of the light is dictated by the amount mixed.
" + info += "\n
Luminescence.
\n - The reaction produces light, power of the light is dictated by the amount mixed.
" else if(CHECK_BITFIELD(reaction_generated?.reaction_type, CHEM_REACTION_SMOKING)) info += "\n
Fuming
\n - The reaction produces heavy fumes from contents of the beaker. Work under a fume hood, wear a gas mask, or simply put an airtight seal over the beaker.
" else if(CHECK_BITFIELD(reaction_generated?.reaction_type, CHEM_REACTION_FIRE)) @@ -975,6 +995,7 @@ info += "
Inert
- The reaction has no indicators.
" info += "[S.description]\n" info += "
Overdoses at: [S.overdose] units\n" + info += "
Critically Overdoses at: [S.overdose_critical] units\n" info += "
Standard duration multiplier: [REAGENTS_METABOLISM/S.custom_metabolism]x
\n" completed = TRUE icon_state = "paper_wy_full_report" @@ -1167,13 +1188,11 @@ info = parsepencode(template, null, null, FALSE) update_icon() -#undef MAX_FIELDS - /obj/item/paper/colonial_grunts icon = 'icons/obj/items/paper.dmi' icon_state = "paper_stack_words" name = "Colonial Space Grunts" - desc = "A tabletop game based around the USCM, easy to get into, simple to play, and most inportantly fun for the whole squad." + desc = "A tabletop game based around the USCM, easy to get into, simple to play, and most importantly fun for the whole squad." /obj/item/paper/colonial_grunts/Initialize(mapload, photo_list) ..() @@ -1202,3 +1221,13 @@ var/datum/asset/asset = get_asset_datum(/datum/asset/simple/paper) info = replacetext(info, "%%WYLOGO%%", asset.get_url_mappings()["logo_wy.png"]) + +/obj/item/paper/captain_brief + name = "Classified Operations Briefing" + desc = "A classified document from USCM high-command about the colony the ship is responding to." + icon_state = "paper_uscm_words" + + // important documents should not be turned into hats + flags_equip_slot = FALSE + flags_armor_protection = FALSE + diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index 4ad6fc4185d5..3fe3ef96a9f0 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -111,7 +111,7 @@ dat+= "[stars(P.info)][P.stamps]" else dat+= "[P.info][P.stamps]" - show_browser(human_user, dat, P.name, name) + show_browser(human_user, dat, P.name, name, width=DEFAULT_PAPER_WIDTH, height=DEFAULT_PAPER_HEIGHT, extra_stylesheets=P.extra_stylesheets, extra_headers=P.extra_headers) P.add_fingerprint(usr) else if(istype(src[page], /obj/item/photo)) var/obj/item/photo/P = src[page] diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index df421e8424cb..fe2f0145e8c0 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -22,6 +22,12 @@ ///the flick state to use when inserting paper into the machine var/animate_state = "bigscanner1" +/obj/structure/machinery/photocopier/Initialize() + . = ..() + if(istype(src, /obj/structure/machinery/photocopier/wyphotocopier)) + AddElement(/datum/element/corp_label/wy) + else + AddElement(/datum/element/corp_label/seegson) /obj/structure/machinery/photocopier/attack_remote(mob/user as mob) return attack_hand(user) @@ -83,7 +89,6 @@ W.forceMove(p) p.amount++ j++ - p.amount-- p.forceMove(src.loc) p.update_icon() p.icon_state = "paper_words" @@ -178,7 +183,7 @@ return /obj/structure/machinery/photocopier/proc/copy(obj/item/paper/original) - var/obj/item/paper/copy = new /obj/item/paper (loc) + var/obj/item/paper/copy = new /obj/item/paper(loc) if(toner > 10) //lots of toner, make it dark copy.info = "" else //no toner? shitty copies for you! @@ -188,10 +193,15 @@ copied = replacetext(copied, "" - copy.name = original.name // -- Doohl + copy.name = original.name + " (Copy)" copy.fields = original.fields copy.stamps = original.stamps copy.stamped = original.stamped + if(original.extra_headers) + LAZYOR(copy.extra_headers, original.extra_headers) + LAZYADD(copy.extra_headers, "") + if(original.extra_stylesheets) + LAZYOR(copy.extra_stylesheets, original.extra_stylesheets) copy.ico = original.ico copy.offset_x = original.offset_x copy.offset_y = original.offset_y @@ -260,7 +270,6 @@ maxcopies = 30 animate_state = "bigscannerpro1" - /// The actual toner cartridge used in photcopiers /obj/item/device/toner name = "toner cartridge" diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 0319e2b91a32..c72e13e78c82 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -140,10 +140,17 @@ var/pictures_max = 10 var/pictures_left = 10 var/size = 7 + var/cooldown = 0 + var/static/list/possible_focus = list(1, 3, 5, 7) + +/obj/item/device/camera/unique_action(mob/user) + change_size(user) /obj/item/device/camera/get_examine_text(mob/user) . = ..() - . += "It has [pictures_left] photos left." + . += SPAN_NOTICE("It has [pictures_left] photos left.") + . += SPAN_NOTICE("It is currently set to take [size]x[size] photos. Press Unique Action to change the focus.") + /obj/item/device/camera/attack_self(mob/user) //wielding capabilities . = ..() @@ -156,14 +163,16 @@ ..() unwield(user) -/obj/item/device/camera/verb/change_size() - set name = "Set Photo Focus" - set src in usr - set category = "Object" - var/nsize = tgui_input_list(usr, "Photo Size","Pick a size of resulting photo.", list(1,3,5,7)) - if(nsize) - size = nsize - to_chat(usr, SPAN_NOTICE("Camera will now take [size]x[size] photos.")) +/obj/item/device/camera/proc/change_size(mob/user) + var/current_focus = possible_focus.Find(size) + if(!current_focus) // just in case lol + size = possible_focus[1] + else + var/next_focus = (current_focus % possible_focus.len) + 1 + size = possible_focus[next_focus] + + to_chat(user, SPAN_NOTICE("[src] will now take [size]x[size] photos.")) + playsound(loc, 'sound/weapons/handling/safety_toggle.ogg', 25, 1, 6) /obj/item/device/camera/attack(mob/living/carbon/human/M, mob/user) return @@ -280,6 +289,9 @@ return mob_detail /obj/item/device/camera/afterattack(atom/target as mob|obj|turf|area, mob/user as mob, flag) + if(world.time < cooldown) + to_chat(user, SPAN_WARNING("[src] is still processing the last photo, hold your horses!")) + return if(pictures_left <= 0) to_chat(user, SPAN_WARNING("There isn't enough film in the [src] to take a photo.")) return @@ -289,6 +301,7 @@ playsound(loc, pick('sound/items/polaroid1.ogg', 'sound/items/polaroid2.ogg'), 15, 1) pictures_left-- to_chat(user, SPAN_NOTICE("[pictures_left] photos left.")) + cooldown = world.time + 3 SECONDS // an addtimer for a cooldown is kinda overkill dont you think addtimer(CALLBACK(src, PROC_REF(captureimage), target, user, flag), 1 SECONDS) @@ -344,10 +357,17 @@ /obj/item/device/camera/oldcamera name = "Old Camera" - desc = "An old, slightly beat-up digital camera, with a cheap photo printer taped on. It's a nice shade of blue." + desc = "An old, slightly beat-up retro-esque polaroid camera, it's antiquated enough to be marked as a collectors item, probably. It's a nice shade of blue." icon_state = "oldcamera" + w_class = SIZE_TINY + pictures_max = 0 // think disposable camera pictures_left = 30 +/obj/item/device/camera/oldcamera/attackby(obj/item/film, mob/user) + if(istype(film, /obj/item/device/camera_film)) + to_chat(user, SPAN_NOTICE("Try as you might, but you can't seem to open up the [src] to insert some film, oh well.")) + return + /obj/item/device/broadcasting name = "Broadcasting Camera" desc = "Actively document everything you see, from the mundanity of shipside to the brutal battlefields below." @@ -389,6 +409,11 @@ flags_atom |= (USES_HEARING|USES_SEEING) handle_move() SEND_SIGNAL(src, COMSIG_BROADCAST_GO_LIVE) + + var/turf/user_turf = get_turf(user) + if(is_ground_level(user_turf.z)) + SScmtv.change_observed_mob(user, set_showtime = INFINITY) + RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(handle_move)) to_chat(user, SPAN_NOTICE("[src] begins to buzz softly as you go live.")) update_icon() @@ -397,6 +422,10 @@ active = FALSE flags_atom &= ~(USES_HEARING|USES_SEEING) linked_cam.status = FALSE + + if(SScmtv.current_perspective == user) + SScmtv.reset_perspective("Broadcasting ended as turned off.") + UnregisterSignal(src, COMSIG_MOVABLE_MOVED) to_chat(user, SPAN_NOTICE("[src] goes silent as the broadcast stops.")) update_icon() @@ -412,10 +441,17 @@ . = ..() linked_cam.view_range = 4 + if(active && SScmtv.current_perspective == user) + SScmtv.reset_perspective("Broadcasting ended as dropped.") + /obj/item/device/broadcasting/pickup(mob/user, silent) . = ..() linked_cam.view_range = 7 + var/turf/user_turf = get_turf(user) + if(active && is_ground_level(user_turf.z)) + SScmtv.change_observed_mob(user, set_showtime = INFINITY) + /obj/item/device/broadcasting/attack_self(mob/user) . = ..() if(active) diff --git a/code/modules/paperwork/prefab_papers.dm b/code/modules/paperwork/prefab_papers.dm index e902989e97fb..03c2570997a6 100644 --- a/code/modules/paperwork/prefab_papers.dm +++ b/code/modules/paperwork/prefab_papers.dm @@ -131,6 +131,7 @@ GLOBAL_REFERENCE_LIST_INDEXED(prefab_papers, /obj/item/paper/prefab, document_ti /obj/item/paper/prefab/carbon/military_police name = "Blank MP Document" document_category = PAPER_CATEGORY_MP + icon_state = "paper_uscm_words" /obj/item/paper/prefab/carbon/military_police/ops_report document_title = "PR201 - Operations Report" @@ -157,6 +158,7 @@ GLOBAL_REFERENCE_LIST_INDEXED(prefab_papers, /obj/item/paper/prefab, document_ti /obj/item/paper/prefab/provost name = "Blank Provost Document" document_category = PAPER_CATEGORY_PROVOST + icon_state = "paper_uscm_words" /obj/item/paper/prefab/provost/standard document_title = "PR202 - Provost Missive" @@ -179,6 +181,7 @@ GLOBAL_REFERENCE_LIST_INDEXED(prefab_papers, /obj/item/paper/prefab, document_ti /obj/item/paper/prefab/uscm name = "Blank USCM Document" document_category = PAPER_CATEGORY_USCM + icon_state = "paper_uscm_words" /obj/item/paper/prefab/uscm/ops_report document_title = "UAM421 - Operations Report" @@ -189,6 +192,7 @@ GLOBAL_REFERENCE_LIST_INDEXED(prefab_papers, /obj/item/paper/prefab, document_ti /obj/item/paper/prefab/uscm_highcom name = "Blank USCMHC Document" document_category = PAPER_CATEGORY_USCM_HC + icon_state = "paper_uscm_words" /obj/item/paper/prefab/uscm_highcom/arrest_warrant document_title = "UAM211 - Arrest Warrant" @@ -207,6 +211,7 @@ GLOBAL_REFERENCE_LIST_INDEXED(prefab_papers, /obj/item/paper/prefab, document_ti /obj/item/paper/prefab/liaison name = "Blank WY Document" document_category = PAPER_CATEGORY_LIAISON + icon_state = "paper_wy_words" /obj/item/paper/prefab/liaison/ops_report document_title = "WY435 - Local Operations Report" @@ -237,6 +242,7 @@ GLOBAL_REFERENCE_LIST_INDEXED(prefab_papers, /obj/item/paper/prefab, document_ti /obj/item/paper/prefab/wey_yu name = "Blank WYC Document" document_category = PAPER_CATEGORY_WEYYU_HC + icon_state = "paper_wy_words" /obj/item/paper/prefab/wey_yu/standard document_title = "WY101 - Directorate Communication" diff --git a/code/modules/paperwork/punch_card.dm b/code/modules/paperwork/punch_card.dm new file mode 100644 index 000000000000..d8669cf0d2d7 --- /dev/null +++ b/code/modules/paperwork/punch_card.dm @@ -0,0 +1,241 @@ +// ----- Encryption Punch Cards ----- + +/obj/item/paper/punch_card + name = "\improper Weyland-Yutani punch card" + desc = "A stiff piece of paper starting to yellow with a bunch of numbers on it." + icon_state = "punchcard" + extra_stylesheets = list("punchcard"="html/browser/punchcard.css") + /// The asset in /datum/asset/simple/paper for the punch card visuals corresponding to the company that produced it + var/punch_card_asset = "wy_punch_card.png" + /// The punched out numbers on this card, though if null can be used for restocking + var/list/data + /// The base type of this punch_card for printers to know what type is loaded even when handling subtypes + var/base_type = /obj/item/paper/punch_card + +/obj/item/paper/punch_card/hyperdyne + name = "\improper Hyperdyne punch card" + punch_card_asset = "hd_punch_card.png" + icon_state = "punchcard_hyperdyne" + base_type = /obj/item/paper/punch_card/hyperdyne + +/obj/item/paper/punch_card/Initialize(mapload, photo_list) + . = ..() + + var/datum/asset/asset = get_asset_datum(/datum/asset/simple/paper) + extra_headers = list("") + info = "
\
+ [punch_card_asset]])
\
+ \
+
\
+
"
+
+ calculate_fields()
+ punch_data(data)
+
+/**
+ * Sets data and updates info to actually punch the card (doesn't unpunch a card).
+ *
+ * Arguments:
+ * * new_data - The new data to set (negative values or values larger than encoding will be ignored)
+ * * encoding - How large the data value could be (16 aka hex for example will use two rows since they accomodate up to 20)
+ */
+/obj/item/paper/punch_card/proc/punch_data(list/new_data, encoding=10)
+ if(encoding <= 0 || encoding > 800)
+ CRASH("Invalid encoding passed to punch_data!")
+
+ if(new_data)
+ data = new_data.Copy()
+ else
+ // No data so not doing anything (nor do we unpunch)
+ data = new_data
+ updateinfolinks()
+ return
+
+ var/interval = ceil(encoding / 10)
+ var/max_value = interval * 10
+ for(var/data_index in 1 to length(data))
+ var/current = data[data_index]
+ if(!islist(current))
+ punch_data_item(interval, max_value, current, data_index)
+ else
+ for(var/i in 1 to length(current))
+ punch_data_item(interval, max_value, current[i], data_index)
+
+ updateinfolinks()
+
+/// Internal proc for punch_data()
+/obj/item/paper/punch_card/proc/punch_data_item(interval, max_value, data_value, data_index)
+ if(data_value <= 0 || data_value > max_value)
+ return
+ var/row_index = (data_index - 1) * interval + ceil(data_value / 10)
+ var/col_index = ((data_value - 1) % 10) + 1 // 1 indexed byond makes the magic of modulo annoying
+ var/query = "class='punchslot cell-[row_index]-[col_index]'"
+ var/position = findtext(info, query)
+ if(position) // There's only going to be one possible match so don't try to replace more than 1
+ info = replacetext(info, query, "class='punchslot punched cell-[row_index]-[col_index]'", position, position + length(query))
+
+/obj/item/paper/punch_card/updateinfolinks()
+ info_links = info
+ for(var/i=1, i<=min(fields, PAPER_MAX_FIELDS), i++)
+ addtofield(i, "write", links=TRUE)
+ // No field at bottom
+
+/obj/item/paper/punch_card/update_icon()
+ return
+
+/obj/item/paper/punch_card/clearpaper()
+ return
+
+/// Adds to first field some instructions
+/obj/item/paper/punch_card/proc/add_instructions()
+ if(fields)
+ addtofield(1, "1. Decode current stream for rolling encryption challenge token.| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
| \ + |
2. Decipher challenge token.
3. Encode new challenge token with offset.") + +/obj/item/paper/punch_card/instructional/Initialize(mapload, photo_list) + . = ..() + add_instructions() + +/obj/item/paper/punch_card/hyperdyne/instructional/Initialize(mapload, photo_list) + . = ..() + add_instructions() + +/// Sets data with random data with 1 punch per row (doesn't perform punch_data()) +/obj/item/paper/punch_card/proc/prefill() + data = list() + for(var/i in 1 to 80) + data += rand(0, 10) + +/obj/item/paper/punch_card/prefilled/Initialize(mapload, photo_list) + prefill() + return ..() + +/obj/item/paper/punch_card/hyperdyne/prefilled/Initialize(mapload, photo_list) + prefill() + return ..() + +/// Resets data with random data with 1 punch per row (doesn't perform punch_data()) +/obj/item/paper/punch_card/proc/randomfill() + data = list() + for(var/i in 1 to 80) + var/list/current = list() + for(var/j in 1 to 10) + if(prob(50)) + current += j + data += list(current) + +/obj/item/paper/punch_card/randomfilled/Initialize(mapload, photo_list) + randomfill() + return ..() + +/obj/item/paper/punch_card/hyperdyne/randomfilled/Initialize(mapload, photo_list) + randomfill() + return ..() + + +// ----- Encryption Punch Card Spawners ----- + +/obj/effect/spawner/punch_cards/Initialize(mapload, ...) + . = ..() + + // Choose alternative variants based on map + var/blank = /obj/item/paper/punch_card + var/prefilled = /obj/item/paper/punch_card/prefilled + var/randomfilled = /obj/item/paper/punch_card/randomfilled + switch(SSmapping.configs[GROUND_MAP].map_name) + if(MAP_SOROKYNE_STRATA) + blank = /obj/item/paper/punch_card/hyperdyne + prefilled = /obj/item/paper/punch_card/hyperdyne/prefilled + randomfilled = /obj/item/paper/punch_card/hyperdyne/randomfilled + + // One blank + new blank(loc) + + // And an extra thats either blank or filled + if(prob(50)) // 50-50 for filled or not + new blank(loc) + else if(prob(50)) // Filled: 50-50 one value per row or just completely random + new prefilled(loc) + else + new randomfilled(loc) + + return INITIALIZE_HINT_QDEL diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 48edb6823f45..2a5798918dcd 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -1,23 +1,27 @@ #define APC_WIRE_MAIN_POWER 1 #define APC_WIRE_IDSCAN 2 -GLOBAL_LIST_INIT(apc_wire_descriptions, list( - APC_WIRE_MAIN_POWER = "Main power", - APC_WIRE_IDSCAN = "ID scanner" - )) +GLOBAL_LIST_INIT(apc_wire_descriptions, flatten_numeric_alist(alist( + APC_WIRE_MAIN_POWER = "Main power", + APC_WIRE_IDSCAN = "ID scanner", + ))) #define APC_COVER_CLOSED 0 #define APC_COVER_OPEN 1 #define APC_COVER_REMOVED 2 // APC charging status: -/// The APC is not charging. #define APC_NOT_CHARGING 0 -/// The APC is charging. #define APC_CHARGING 1 -/// The APC is fully charged. #define APC_FULLY_CHARGED 2 +// APC main status: +#define APC_MAIN_FAULTED 0 +#define APC_MAIN_NO_EXTERNAL 1 +#define APC_MAIN_LOW_EXTERNAL 2 +#define APC_MAIN_EXTERNAL 3 +#define APC_MAIN_LOCAL 4 + //update_state #define UPSTATE_CELL_IN 1 #define UPSTATE_OPENED1 2 @@ -46,6 +50,7 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( #define APC_UPDATE_ICON_COOLDOWN 100 //10 seconds +#define MAXIMUM_GIVEN_POWER_TO_LOCAL_APC 20000 //20,000W ~ one pacman at maximum output //The Area Power Controller (APC), formerly Power Distribution Unit (PDU) //One per area, needs wire conection to power network @@ -93,6 +98,9 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( var/lastused_environ = 0 var/lastused_oneoff = 0 var/lastused_total = 0 + var/lastused_total_actual = 0 + var/lastgenerated_total = 0 + var/lastgenerated_total_surplus = 0 var/main_status = 0 var/wiresexposed = 0 @@ -129,6 +137,8 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( appearance_flags = TILE_BOUND + var/list/connected_power_sources = list() //list with all powersources that may power this APC + /obj/structure/machinery/power/apc/Initialize(mapload, ndir, building=0) . = ..() @@ -172,6 +182,9 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( area.power_environ = 0 area.power_change() + for(var/obj/structure/machinery/power/power_generator/power_system in connected_power_sources) + power_system.apc_in_area = null + if(terminal) terminal.master = null terminal = null @@ -186,10 +199,10 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( ui = SStgui.try_update_ui(user, src, ui) if(!ui) if(!opened && wiresexposed) - ui = new(user, src, "Wires", "[name] Wires") + ui = new(user, src, "Wires", "[capitalize(name)] Wires") ui.open() else - ui = new(user, src, "Apc", name) + ui = new(user, src, "Apc", capitalize(name)) ui.open() /obj/structure/machinery/power/apc/ui_status(mob/user) @@ -212,7 +225,11 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( "powerCellStatus" = cell ? cell.percent() : null, "chargeMode" = chargemode, "chargingStatus" = charging, - "totalLoad" = display_power(lastused_total), + "totalLoad" = display_power(lastused_total_actual), + "totalLoadDemanded" = display_power(lastused_total), + "totalGenerated" = display_power(lastgenerated_total), + "totalGeneratedSurplus" = display_power(lastgenerated_total_surplus), + "generatorCount" = length(connected_power_sources), "coverLocked" = coverlocked, "siliconUser" = FALSE, @@ -258,20 +275,20 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( "cut" = isWireCut(wire), ))) data["wires"] = payload - data["proper_name"] = name + data["proper_name"] = capitalize(name) return data -/obj/structure/machinery/power/apc/ui_act(action, params) +/obj/structure/machinery/power/apc/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() - if(. || !can_use(usr, 1)) + if(. || !can_use(ui.user, 1)) return var/target_wire = params["wire"] if(locked && !target_wire) //wire cutting etc does not require the apc to be unlocked - to_chat(usr, SPAN_WARNING("\The [src] is locked! Unlock it by swiping an ID card or dogtag.")) + to_chat(ui.user, SPAN_WARNING("\The [src] is locked! Unlock it by swiping an ID card or dogtag.")) return - add_fingerprint(usr) + add_fingerprint(ui.user) switch(action) if("lock") locked = !locked @@ -281,7 +298,7 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( coverlocked = !coverlocked . = TRUE if("breaker") - toggle_breaker(usr) + toggle_breaker(ui.user) . = TRUE if("charge") chargemode = !chargemode @@ -308,28 +325,28 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( . = TRUE CHECK_TICK if("overload") - if(isRemoteControlling(usr) && !aidisabled) + if(isRemoteControlling(ui.user) && !aidisabled) overload_lighting() . = TRUE if("cut") - var/obj/item/held_item = usr.get_held_item() + var/obj/item/held_item = ui.user.get_held_item() if (!held_item || !HAS_TRAIT(held_item, TRAIT_TOOL_WIRECUTTERS)) - to_chat(usr, SPAN_WARNING("You need wirecutters!")) + to_chat(ui.user, SPAN_WARNING("You need wirecutters!")) return TRUE if(isWireCut(target_wire)) - mend(target_wire, usr) + mend(target_wire, ui.user) else playsound(src.loc, 'sound/items/Wirecutter.ogg', 25, 1) - cut(target_wire, usr) + cut(target_wire, ui.user) . = TRUE if("pulse") - var/obj/item/held_item = usr.get_held_item() + var/obj/item/held_item = ui.user.get_held_item() if (!held_item || !HAS_TRAIT(held_item, TRAIT_TOOL_MULTITOOL)) - to_chat(usr, SPAN_WARNING("You need a multitool!")) + to_chat(ui.user, SPAN_WARNING("You need a multitool!")) return TRUE playsound(src.loc, 'sound/effects/zzzt.ogg', 25, 1) - pulse(target_wire, usr) + pulse(target_wire, ui.user) . = TRUE return TRUE @@ -339,7 +356,7 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( msg_admin_niche("[user] turned [operating ? "on" : "off"] \the [src] in [AREACOORD(src)] [ADMIN_JMP(loc)].") update_icon() -// the very fact that i have to override this screams to me that apcs shouldnt be under machinery - spookydonut +// the very fact that i have to override this screams to me that apcs shouldn't be under machinery - spookydonut /obj/structure/machinery/power/apc/power_change() update_icon() return @@ -347,7 +364,7 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( /obj/structure/machinery/power/apc/proc/make_terminal() //Create a terminal object at the same position as original turf loc //Wires will attach to this - terminal = new/obj/structure/machinery/power/terminal(src.loc) + terminal = new/obj/structure/terminal(loc) terminal.setDir(dir) terminal.master = src @@ -514,9 +531,9 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( if(stat & MAINT) update_state |= UPSTATE_MAINT if(opened) - if(opened == 1) + if(opened == APC_COVER_OPEN) update_state |= UPSTATE_OPENED1 - if(opened == 2) + else if(opened == APC_COVER_REMOVED) update_state |= UPSTATE_OPENED2 else if(wiresexposed) update_state |= UPSTATE_WIREEXP @@ -530,14 +547,15 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( if(locked) update_overlay |= APC_UPOVERLAY_LOCKED - if(!charging) - update_overlay |= APC_UPOVERLAY_CHARGEING0 - else if(charging == APC_CHARGING) - update_overlay |= APC_UPOVERLAY_CHARGEING1 - else if(charging == APC_FULLY_CHARGED) - update_overlay |= APC_UPOVERLAY_CHARGEING2 + switch(charging) + if(APC_NOT_CHARGING) + update_overlay |= APC_UPOVERLAY_CHARGEING0 + if(APC_CHARGING) + update_overlay |= APC_UPOVERLAY_CHARGEING1 + if(APC_FULLY_CHARGED) + update_overlay |= APC_UPOVERLAY_CHARGEING2 - if (!equipment) + if(!equipment) update_overlay |= APC_UPOVERLAY_EQUIPMENT0 else if(equipment == 1) update_overlay |= APC_UPOVERLAY_EQUIPMENT1 @@ -577,15 +595,17 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( updating_icon = 0 //Attack with an item - open/close cover, insert cell, or (un)lock interface -/obj/structure/machinery/power/apc/attackby(obj/item/W, mob/user) - +/obj/structure/machinery/power/apc/attackby(obj/item/attacking_item, mob/living/user, list/mods) if(isRemoteControlling(user) && get_dist(src, user) > 1) return attack_hand(user) + + if(user.action_busy) + return + add_fingerprint(user) - if(HAS_TRAIT(W, TRAIT_TOOL_CROWBAR) && opened) + + if(HAS_TRAIT(attacking_item, TRAIT_TOOL_CROWBAR) && opened) if(has_electronics == 1) - if(user.action_busy) - return if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You have no idea how to deconstruct [src].")) return @@ -610,16 +630,16 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( else if(opened != APC_COVER_REMOVED) //Cover isn't removed opened = APC_COVER_CLOSED update_icon() - else if(HAS_TRAIT(W, TRAIT_TOOL_CROWBAR) && !(stat & BROKEN)) + else if(HAS_TRAIT(attacking_item, TRAIT_TOOL_CROWBAR) && !(stat & BROKEN)) if(coverlocked && !(stat & MAINT)) to_chat(user, SPAN_WARNING("The cover is locked and cannot be opened.")) return else opened = APC_COVER_OPEN update_icon() - else if(istype(W, /obj/item/cell) && opened) //Trying to put a cell inside + else if(istype(attacking_item, /obj/item/cell) && opened) //Trying to put a cell inside if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) - to_chat(user, SPAN_WARNING("You have no idea how to fit [W] into [src].")) + to_chat(user, SPAN_WARNING("You have no idea how to fit [attacking_item] into [src].")) return if(cell) to_chat(user, SPAN_WARNING("There is a power cell already installed.")) @@ -628,16 +648,16 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( if(stat & MAINT) to_chat(user, SPAN_WARNING("There is no connector for your power cell.")) return - if(user.drop_inv_item_to_loc(W, src)) - cell = W - user.visible_message(SPAN_NOTICE("[user] inserts [W] into [src]!"), - SPAN_NOTICE("You insert [W] into [src]!")) + if(user.drop_inv_item_to_loc(attacking_item, src)) + cell = attacking_item + user.visible_message(SPAN_NOTICE("[user] inserts [attacking_item] into [src]!"), + SPAN_NOTICE("You insert [attacking_item] into [src]!")) chargecount = 0 update_icon() - else if(HAS_TRAIT(W, TRAIT_TOOL_SCREWDRIVER)) //Haxing + else if(HAS_TRAIT(attacking_item, TRAIT_TOOL_SCREWDRIVER)) //Haxing if(opened) if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) - to_chat(user, SPAN_WARNING("\The [src]'s wiring confuses you.")) + to_chat(user, SPAN_WARNING("[src]'s wiring confuses you.")) return if(cell) to_chat(user, SPAN_WARNING("Close the APC first.")) //Less hints more mystery! @@ -664,14 +684,14 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( beenhit = wiresexposed ? XENO_HITS_TO_EXPOSE_WIRES_MIN : 0 user.visible_message(SPAN_NOTICE("[user] [wiresexposed ? "exposes" : "unexposes"] [src]'s wiring."), SPAN_NOTICE("You [wiresexposed ? "expose" : "unexpose"] [src]'s wiring.")) - playsound(src.loc, 'sound/items/Screwdriver.ogg', 25, 1) + playsound(loc, 'sound/items/Screwdriver.ogg', 25, 1) update_icon() if(SStgui.close_uis(src)) //if you had UIs open before from this APC... tgui_interact(user) //then close them and open up the new ones (wires/panel) - else if(istype(W, /obj/item/card/id)) //Trying to unlock the interface with an ID card + else if(istype(attacking_item, /obj/item/card/id)) //Trying to unlock the interface with an ID card if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) - to_chat(user, SPAN_WARNING("You're not sure where to swipe \the [W] on [src].")) + to_chat(user, SPAN_WARNING("You're not sure where to swipe [attacking_item] on [src].")) return if(opened) to_chat(user, SPAN_WARNING("You must close the cover to swipe an ID card.")) @@ -687,48 +707,48 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( update_icon() else to_chat(user, SPAN_WARNING("Access denied.")) - else if(iswire(W) && !terminal && opened && has_electronics != 2) + else if(iswire(attacking_item) && !terminal && opened && has_electronics != 2) if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You have no idea what to do with [src].")) return if(loc:intact_tile) to_chat(user, SPAN_WARNING("You must remove the floor plating in front of the APC first.")) return - var/obj/item/stack/cable_coil/C = W - if(C.get_amount() < 10) + var/obj/item/stack/cable_coil/coil = attacking_item + if(coil.get_amount() < 10) to_chat(user, SPAN_WARNING("You need more wires.")) return user.visible_message(SPAN_NOTICE("[user] starts wiring [src]'s frame."), SPAN_NOTICE("You start wiring [src]'s frame.")) - playsound(src.loc, 'sound/items/Deconstruct.ogg', 25, 1) + playsound(loc, 'sound/items/Deconstruct.ogg', 25, 1) if(do_after(user, 20 * user.get_skill_duration_multiplier(SKILL_ENGINEER), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD) && !terminal && opened && has_electronics != 2) - var/turf/T = get_turf(src) - var/obj/structure/cable/N = T.get_cable_node() - if(prob(50) && electrocute_mob(usr, N, N)) + var/turf/turf = get_turf(src) + var/obj/structure/cable/cable = turf.get_cable_node() + if(prob(50) && electrocute_mob(usr, cable, cable)) var/datum/effect_system/spark_spread/spark = new /datum/effect_system/spark_spread spark.set_up(5, 1, src) spark.start() return - if(C.use(10)) + if(coil.use(10)) user.visible_message(SPAN_NOTICE("[user] wires [src]'s frame."), SPAN_NOTICE("You wire [src]'s frame.")) make_terminal() - terminal.connect_to_network() - else if(HAS_TRAIT(W, TRAIT_TOOL_WIRECUTTERS) && terminal && opened && has_electronics != 2) + connect_to_network() + else if(HAS_TRAIT(attacking_item, TRAIT_TOOL_WIRECUTTERS) && terminal && opened && has_electronics != 2) if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) - to_chat(user, SPAN_WARNING("You have no idea what to do with [W].")) + to_chat(user, SPAN_WARNING("You have no idea what to do with [attacking_item].")) return if(loc:intact_tile) to_chat(user, SPAN_WARNING("You must remove the floor plating in front of the APC first.")) return user.visible_message(SPAN_NOTICE("[user] starts removing [src]'s wiring and terminal."), SPAN_NOTICE("You start removing [src]'s wiring and terminal.")) - playsound(src.loc, 'sound/items/Deconstruct.ogg', 25, 1) - if(do_after(user, 50 * user.get_skill_duration_multiplier(SKILL_ENGINEER), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) + playsound(loc, 'sound/items/Deconstruct.ogg', 25, 1) + if(do_after(user, 50 * user.get_skill_duration_multiplier(SKILL_ENGINEER), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src)) if(!terminal) - to_chat(user, SPAN_WARNING("\The [src] lacks a terminal to remove.")) + to_chat(user, SPAN_WARNING("[src] lacks a terminal to remove.")) return - if (prob(50) && electrocute_mob(user, terminal.powernet, terminal)) + if (prob(50) && electrocute_mob(user, powernet, terminal)) var/datum/effect_system/spark_spread/spark = new /datum/effect_system/spark_spread spark.set_up(5, 1, src) spark.start() @@ -738,47 +758,47 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( SPAN_NOTICE("You remove [src]'s wiring and terminal.")) qdel(terminal) terminal = null - else if(istype(W, /obj/item/circuitboard/apc) && opened && has_electronics == 0 && !(stat & BROKEN)) + else if(istype(attacking_item, /obj/item/circuitboard/apc) && opened && has_electronics == 0 && !(stat & BROKEN)) if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) - to_chat(user, SPAN_WARNING("You have no idea what to do with [W].")) + to_chat(user, SPAN_WARNING("You have no idea what to do with [attacking_item].")) return user.visible_message(SPAN_NOTICE("[user] starts inserting the power control board into [src]."), SPAN_NOTICE("You start inserting the power control board into [src].")) - playsound(src.loc, 'sound/items/Deconstruct.ogg', 25, 1) + playsound(loc, 'sound/items/Deconstruct.ogg', 25, 1) if(do_after(user, 15, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) has_electronics = 1 user.visible_message(SPAN_NOTICE("[user] inserts the power control board into [src]."), SPAN_NOTICE("You insert the power control board into [src].")) - qdel(W) - else if(istype(W, /obj/item/circuitboard/apc) && opened && has_electronics == 0 && (stat & BROKEN)) + qdel(attacking_item) + else if(istype(attacking_item, /obj/item/circuitboard/apc) && opened && has_electronics == 0 && (stat & BROKEN)) if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) - to_chat(user, SPAN_WARNING("You have no idea what to do with [W].")) + to_chat(user, SPAN_WARNING("You have no idea what to do with [attacking_item].")) return to_chat(user, SPAN_WARNING("You cannot put the board inside, the frame is damaged.")) return - else if(iswelder(W) && opened && has_electronics == 0 && !terminal) - if(!HAS_TRAIT(W, TRAIT_TOOL_BLOWTORCH)) + else if(iswelder(attacking_item) && opened && has_electronics == 0 && !terminal) + if(!HAS_TRAIT(attacking_item, TRAIT_TOOL_BLOWTORCH)) to_chat(user, SPAN_WARNING("You need a stronger blowtorch!")) return if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) - to_chat(user, SPAN_WARNING("You have no idea what to do with [W].")) + to_chat(user, SPAN_WARNING("You have no idea what to do with [attacking_item].")) return - var/obj/item/tool/weldingtool/WT = W - if(WT.get_fuel() < 3) + var/obj/item/tool/weldingtool/torch = attacking_item + if(torch.get_fuel() < 3) to_chat(user, SPAN_WARNING("You need more welding fuel to complete this task.")) return user.visible_message(SPAN_NOTICE("[user] starts welding [src]'s frame."), SPAN_NOTICE("You start welding [src]'s frame.")) - playsound(src.loc, 'sound/items/Welder.ogg', 25, 1) - if(do_after(user, 50 * user.get_skill_duration_multiplier(SKILL_ENGINEER), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) - if(!src || !WT.remove_fuel(3, user)) + playsound(loc, 'sound/items/Welder.ogg', 25, 1) + if(do_after(user, 50 * user.get_skill_duration_multiplier(SKILL_ENGINEER), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src)) + if(QDELETED(src) || !torch.remove_fuel(3, user)) return user.visible_message(SPAN_NOTICE("[user] welds [src]'s frame apart."), SPAN_NOTICE("You weld [src]'s frame apart.")) deconstruct() return - else if(istype(W, /obj/item/frame/apc) && opened && (stat & BROKEN)) + else if(istype(attacking_item, /obj/item/frame/apc) && opened && (stat & BROKEN)) if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) - to_chat(user, SPAN_WARNING("You have no idea what to do with [W].")) + to_chat(user, SPAN_WARNING("You have no idea what to do with [attacking_item].")) return if(has_electronics) to_chat(user, SPAN_WARNING("You cannot repair this APC until you remove the electronics still inside.")) @@ -789,29 +809,29 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( user.visible_message(SPAN_NOTICE("[user] replaces [src]'s damaged frontal panel with a new one."), SPAN_NOTICE("You replace [src]'s damaged frontal panel with a new one.")) user.count_niche_stat(STATISTICS_NICHE_REPAIR_APC) - qdel(W) + qdel(attacking_item) beenhit = 0 stat &= ~BROKEN - if(opened == 2) + if(opened == APC_COVER_REMOVED) opened = APC_COVER_OPEN update_icon() else - if(((stat & BROKEN)) && !opened && W.force >= 5) + if(((stat & BROKEN)) && !opened && attacking_item.force >= 5) opened = APC_COVER_REMOVED - user.visible_message(SPAN_WARNING("[user] knocks down [src]'s cover with [W]!"), - SPAN_WARNING("You knock down [src]'s cover with [W]!")) + user.visible_message(SPAN_WARNING("[user] knocks down [src]'s cover with [attacking_item]!"), + SPAN_WARNING("You knock down [src]'s cover with [attacking_item]!")) update_icon() else if(isRemoteControlling(user)) return attack_hand(user) - if(!opened && wiresexposed && (HAS_TRAIT(W, TRAIT_TOOL_MULTITOOL) || HAS_TRAIT(W, TRAIT_TOOL_WIRECUTTERS))) + if(!opened && wiresexposed && (HAS_TRAIT(attacking_item, TRAIT_TOOL_MULTITOOL) || HAS_TRAIT(attacking_item, TRAIT_TOOL_WIRECUTTERS))) return attack_hand(user) - user.visible_message(SPAN_DANGER("[user] hits [src] with \the [W]!"), - SPAN_DANGER("You hit [src] with \the [W]!")) + user.visible_message(SPAN_DANGER("[user] hits [src] with [attacking_item]!"), + SPAN_DANGER("You hit [src] with [attacking_item]!")) /obj/structure/machinery/power/apc/deconstruct(disassembled = TRUE) if(disassembled) - if((stat & BROKEN) || opened == 2) + if((stat & BROKEN) || opened == APC_COVER_REMOVED) new /obj/item/stack/sheet/metal(loc) else new /obj/item/frame/apc(loc) @@ -875,7 +895,7 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( else if(grabber.species.can_shred(grabber)) var/allcut = TRUE - for(var/wire = 1; wire < length(get_wire_descriptions()); wire++) + for(var/wire = 1; wire < length(GLOB.apc_wire_descriptions); wire++) if(!isWireCut(wire)) allcut = FALSE break @@ -886,7 +906,7 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( SPAN_WARNING("You slash [src]!")) playsound(src.loc, 'sound/weapons/slash.ogg', 25, 1) if(wiresexposed) - for(var/wire = 1; wire < length(get_wire_descriptions()); wire++) + for(var/wire = 1; wire < length(GLOB.apc_wire_descriptions); wire++) cut(wire, user) update_icon() visible_message(SPAN_WARNING("[src]'s wires are shredded!")) @@ -930,12 +950,6 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( else area.update_power_channels(FALSE, FALSE, FALSE) -/obj/structure/machinery/power/apc/proc/get_wire_descriptions() - return list( - APC_WIRE_MAIN_POWER = "Main power", - APC_WIRE_IDSCAN = "ID scanner" - ) - /obj/structure/machinery/power/apc/proc/isWireCut(wire) var/wireFlag = getWireFlag(wire) return !(apcwires & wireFlag) @@ -1057,43 +1071,28 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( spark.start() visible_message(SPAN_WARNING("[src] suddenly lets out a blast of smoke and some sparks!")) -/obj/structure/machinery/power/apc/surplus() - if(terminal) - return terminal.surplus() - else - return 0 - -/obj/structure/machinery/power/apc/proc/last_surplus() - if(terminal && terminal.powernet) - return terminal.powernet.last_surplus() - else - return 0 - //Returns 1 if the APC should attempt to charge /obj/structure/machinery/power/apc/proc/attempt_charging() return (chargemode && charging == APC_CHARGING && operating) -/obj/structure/machinery/power/apc/add_load(amount) - if(terminal && terminal.powernet) - return terminal.powernet.draw_power(amount) - return 0 - -/obj/structure/machinery/power/apc/avail() - if(terminal) - return terminal.avail() - else - return 0 - /obj/structure/machinery/power/apc/process() if(stat & (BROKEN|MAINT)) return if(!area.requires_power) return + lastused_total_actual = 0 lastused_light = area.usage(POWER_CHANNEL_LIGHT) + if(lighting && operating) + lastused_total_actual += lastused_light lastused_equip = area.usage(POWER_CHANNEL_EQUIP) + if(equipment && operating) + lastused_total_actual += lastused_equip lastused_environ = area.usage(POWER_CHANNEL_ENVIRON) + if(environ && operating) + lastused_total_actual += lastused_environ lastused_oneoff = area.usage(POWER_CHANNEL_ONEOFF, TRUE) //getting the one-off power usage and resetting it to 0 for the next processing tick + lastused_total_actual += lastused_oneoff lastused_total = lastused_light + lastused_equip + lastused_environ + lastused_oneoff //store states to update icon if any change @@ -1106,8 +1105,8 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( var/power_excess = 0 var/perapc = 0 - if(terminal && terminal.powernet) - perapc = terminal.powernet.perapc + if(powernet) + perapc = powernet.perapc if(debug) log_debug( "Status: [main_status] - Excess: [excess] - Last Equip: [lastused_equip] - Last Light: [lastused_light]") @@ -1116,21 +1115,46 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( var/cell_maxcharge = cell.maxcharge //Calculate how much power the APC will try to get from the grid. - var/target_draw = lastused_total + var/target_draw = lastused_total_actual + if(attempt_charging()) target_draw += min((cell_maxcharge - cell.charge), (cell_maxcharge * CHARGELEVEL))/CELLRATE target_draw = min(target_draw, perapc) //Limit power draw by perapc //Try to draw power from the grid var/power_drawn = 0 + + //Try to draw from local grid + var/got_power_from_local_grid = FALSE + lastgenerated_total = 0 + lastgenerated_total_surplus = 0 + if(length(connected_power_sources) > 0) + for(var/obj/structure/machinery/power/power_generator/generator in connected_power_sources) + if(generator.current_area != current_area) + generator.apc_in_area = null + LAZYREMOVE(connected_power_sources, generator) + continue + if(generator.is_on) + lastgenerated_total += (generator.power_gen_percent / 100) * generator.power_gen + + if(lastgenerated_total > 0) + power_drawn = min(lastgenerated_total, max(target_draw, MAXIMUM_GIVEN_POWER_TO_LOCAL_APC)) + target_draw = max(target_draw - power_drawn, 0) + lastgenerated_total_surplus = lastgenerated_total - power_drawn + add_avail(lastgenerated_total_surplus) + + got_power_from_local_grid = target_draw <= 0 + if(chargemode && operating) + charging = APC_CHARGING + + //Try to draw from powernet if(avail()) - power_drawn = add_load(target_draw) //Get some power from the powernet + power_drawn += add_load(target_draw) //Get some power from the powernet //Figure out how much power is left over after meeting demand power_excess = power_drawn - lastused_total if(power_excess < 0) //Couldn't get enough power from the grid, we will need to take from the power cell. - charging = APC_NOT_CHARGING var/required_power = -power_excess @@ -1147,11 +1171,14 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( //Set external power status if(!power_drawn) - main_status = 0 + main_status = APC_MAIN_NO_EXTERNAL else if(power_excess < 0) - main_status = 1 + main_status = APC_MAIN_LOW_EXTERNAL else - main_status = 2 + main_status = APC_MAIN_EXTERNAL + + if(got_power_from_local_grid) + main_status = APC_MAIN_LOCAL //Set channels depending on how much charge we have left // Allow the APC to operate as normal if the cell can charge @@ -1195,32 +1222,40 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( //Now trickle-charge the cell if(attempt_charging()) if(power_excess > 0) //Check to make sure we have enough to charge - cell.give(power_excess * CELLRATE) //Actually recharge the cell + var/surplus = floor(max(power_excess - cell.give(power_excess * CELLRATE) / CELLRATE, 0)) //Actually recharge the cell + if(got_power_from_local_grid) + add_avail(surplus) + lastgenerated_total_surplus += surplus else charging = APC_NOT_CHARGING //Stop charging chargecount = 0 + else if(power_excess > 0 && got_power_from_local_grid) + add_avail(power_excess) + lastgenerated_total_surplus += power_excess //Show cell as fully charged if so - if(cell.charge >= cell_maxcharge) + if(cell.percent() >= 98) charging = APC_FULLY_CHARGED //If we have excess power for long enough, think about re-enable charging. if(chargemode) if(!charging) //last_surplus() overestimates the amount of power available for charging, but it's equivalent to what APCs were doing before. - if(last_surplus() * CELLRATE >= cell_maxcharge * CHARGELEVEL) + if(powernet?.last_surplus() * CELLRATE >= cell_maxcharge * CHARGELEVEL) chargecount++ else chargecount = 0 - charging = APC_NOT_CHARGING if(chargecount >= 10) chargecount = 0 - charging = 1 + charging = APC_CHARGING else //Chargemode off charging = APC_NOT_CHARGING chargecount = 0 + if(!operating) + charging = APC_NOT_CHARGING + chargecount = 0 else //No cell, switch everything off charging = APC_NOT_CHARGING @@ -1230,6 +1265,10 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( environ = autoset(environ, 0) area.poweralert(0, src) autoflag = 0 + if(shorted) + main_status = APC_MAIN_FAULTED + else + main_status = APC_MAIN_NO_EXTERNAL //Update icon & area power if anything changed @@ -1243,7 +1282,6 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( //on 0 = off, 1 = auto-on, 2 = auto-off /proc/autoset(val, on) - if(on == 0) //Turn things off if(val == 2) //If on, return off return 0 @@ -1320,7 +1358,7 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( /obj/structure/machinery/power/apc/wires_cut/Initialize(mapload, ndir, building) . = ..() wiresexposed = TRUE - for(var/wire = 1; wire < length(get_wire_descriptions()); wire++) + for(var/wire = 1; wire < length(GLOB.apc_wire_descriptions); wire++) cut(wire) update_icon() beenhit = 4 @@ -1331,7 +1369,7 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( /obj/structure/machinery/power/apc/fully_broken/Initialize(mapload, ndir, building) . = ..() wiresexposed = TRUE - for(var/wire = 1; wire < length(get_wire_descriptions()); wire++) + for(var/wire = 1; wire < length(GLOB.apc_wire_descriptions); wire++) cut(wire) beenhit = 4 set_broken() @@ -1511,4 +1549,44 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( pixel_x = -30 dir = 8 +#undef APC_COVER_CLOSED +#undef APC_COVER_OPEN +#undef APC_COVER_REMOVED + +#undef APC_NOT_CHARGING +#undef APC_CHARGING +#undef APC_FULLY_CHARGED + +#undef APC_MAIN_FAULTED +#undef APC_MAIN_NO_EXTERNAL +#undef APC_MAIN_LOW_EXTERNAL +#undef APC_MAIN_EXTERNAL +#undef APC_MAIN_LOCAL + +#undef UPSTATE_CELL_IN +#undef UPSTATE_OPENED1 +#undef UPSTATE_OPENED2 +#undef UPSTATE_MAINT +#undef UPSTATE_BROKE +#undef UPSTATE_BLUESCREEN +#undef UPSTATE_WIREEXP +#undef UPSTATE_ALLGOOD + +#undef APC_UPOVERLAY_CHARGEING0 +#undef APC_UPOVERLAY_CHARGEING1 +#undef APC_UPOVERLAY_CHARGEING2 +#undef APC_UPOVERLAY_EQUIPMENT0 +#undef APC_UPOVERLAY_EQUIPMENT1 +#undef APC_UPOVERLAY_EQUIPMENT2 +#undef APC_UPOVERLAY_LIGHTING0 +#undef APC_UPOVERLAY_LIGHTING1 +#undef APC_UPOVERLAY_LIGHTING2 +#undef APC_UPOVERLAY_ENVIRON0 +#undef APC_UPOVERLAY_ENVIRON1 +#undef APC_UPOVERLAY_ENVIRON2 +#undef APC_UPOVERLAY_LOCKED +#undef APC_UPOVERLAY_OPERATING + #undef APC_UPDATE_ICON_COOLDOWN + +#undef MAXIMUM_GIVEN_POWER_TO_LOCAL_APC diff --git a/code/modules/power/batteryrack.dm b/code/modules/power/batteryrack.dm index 86cc3199d1e1..5d149db2ecf2 100644 --- a/code/modules/power/batteryrack.dm +++ b/code/modules/power/batteryrack.dm @@ -5,7 +5,7 @@ /obj/structure/machinery/power/smes/batteryrack name = "Substation PSU"//"power cell rack PSU" desc = "A rack of power cells working as a PSU." - charge = 0 //you dont really want to make a potato PSU which already is overloaded + charge = 0 //you don't really want to make a potato PSU which already is overloaded outputting = 0 input_level = 0 output_level = 0 @@ -185,7 +185,7 @@ return if (overcharge_percent >= 140) if (prob(1)) - empulse(src.loc, 1, 2, 0) + empulse(loc, 1, 2) if ((2.4e6+1) to 3.6e6) if (overcharge_percent >= 115) if (prob(7)) @@ -194,10 +194,10 @@ return if (overcharge_percent >= 130) if (prob(1)) - empulse(src.loc, 1, 3, 0) + empulse(loc, 1, 3) if (overcharge_percent >= 150) if (prob(1)) - explosion(src.loc, 0, 0, 1, 3) + explosion(loc, 0, 0, 1, 3) if ((3.6e6+1) to INFINITY) if (overcharge_percent >= 115) if (prob(8)) @@ -206,10 +206,10 @@ return if (overcharge_percent >= 125) if (prob(2)) - empulse(src.loc, 4, 10, 1) + empulse(loc, 4, 10) if (overcharge_percent >= 140) if (prob(1)) - explosion(src.loc, 0, 1, 2, 4) + explosion(loc, 0, 1, 2, 4) else //how the hell was this proc called for negative charge charge = 0 @@ -226,7 +226,7 @@ var/last_overcharge = overcharge_percent if(terminal) - var/excess = terminal.surplus() + var/excess = surplus() if(inputting) if(excess >= 0) // if there's power available, try to charge diff --git a/code/modules/power/breaker_box.dm b/code/modules/power/breaker_box.dm index f351f2e04507..b8af0cc992ea 100644 --- a/code/modules/power/breaker_box.dm +++ b/code/modules/power/breaker_box.dm @@ -31,7 +31,7 @@ if(on) . += SPAN_XENOWARNING("It seems to be online.") else - . += SPAN_DANGER("It seems to be offline") + . += SPAN_DANGER("It seems to be offline.") /obj/structure/machinery/power/breakerbox/attack_remote(mob/user) if(busy) @@ -39,10 +39,10 @@ return busy = TRUE - to_chat(user, SPAN_XENOWARNING(" Updating power settings...")) + to_chat(user, SPAN_XENOWARNING("Updating power settings...")) if(do_after(user, 50, INTERRUPT_NO_NEEDHAND, BUSY_ICON_GENERIC)) //5s for AI as AIs can manipulate electronics much faster. set_state(!on) - to_chat(user, SPAN_XENOWARNING(" Update Completed. New setting:[on ? "on": "off"]")) + to_chat(user, SPAN_XENOWARNING("Update Completed. New setting:[on ? "on": "off"]")) busy = FALSE diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 4ebcbb71128e..debe4c7410e1 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -29,7 +29,7 @@ anchored =1 var/datum/powernet/powernet name = "power cable" - desc = "A flexible superconducting cable for heavy-duty power transfer" + desc = "A flexible superconducting cable for heavy-duty power transfer." icon = 'icons/obj/pipes/power_cond_white.dmi' icon_state = "0-1" var/d1 = 0 diff --git a/code/modules/power/cable_heavyduty.dm b/code/modules/power/cable_heavyduty.dm index f05c069993a3..0d467f6165a9 100644 --- a/code/modules/power/cable_heavyduty.dm +++ b/code/modules/power/cable_heavyduty.dm @@ -16,10 +16,10 @@ return if(HAS_TRAIT(W, TRAIT_TOOL_WIRECUTTERS)) - to_chat(usr, SPAN_NOTICE(" These cables are too tough to be cut with those [W.name].")) + to_chat(usr, SPAN_NOTICE("These cables are too tough to be cut with those [W.name].")) return else if(istype(W, /obj/item/stack/cable_coil)) - to_chat(usr, SPAN_NOTICE(" You will need heavier cables to connect to these.")) + to_chat(usr, SPAN_NOTICE("You will need heavier cables to connect to these.")) return else ..() diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 6ae157621b83..9d7ddd1e0fc2 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -124,6 +124,10 @@ maxcharge = 500 matter = list("metal" = 700, "glass" = 40) +/obj/item/cell/crap/Initialize() + . = ..() + AddElement(/datum/element/corp_label/wy) + /obj/item/cell/crap/empty charge = 0 diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 9803f23fcd9a..c9fae6f0e4ba 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -142,12 +142,12 @@ use_power = USE_POWER_IDLE idle_power_usage = 2 active_power_usage = 20 - power_channel = POWER_CHANNEL_LIGHT //Lights are calc'd via area so they dont need to be in the machine list + power_channel = POWER_CHANNEL_LIGHT //Lights are calc'd via area so they don't need to be in the machine list light_system = STATIC_LIGHT light_color = LIGHT_COLOR_TUNGSTEN var/on = 0 // 1 if on, 0 if off var/on_gs = 0 - var/brightness = 6 // luminosity when on, also used in power calculation + var/brightness = 8 // luminosity when on, also used in power calculation var/status = LIGHT_OK // LIGHT_OK, _EMPTY, _BURNED or _BROKEN var/flickering = 0 var/light_type = /obj/item/light_bulb/tube // the type of light item @@ -168,6 +168,9 @@ /obj/structure/machinery/light/containment/attack_alien(mob/living/carbon/xenomorph/M) return +/obj/structure/machinery/light/containment/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + return TAILSTAB_COOLDOWN_NONE + /obj/structure/machinery/light/blue icon_state = "btube1" base_state = "btube" @@ -178,6 +181,7 @@ icon_state = "rtube1" base_state = "rtube" desc = "A lighting fixture. Its glass covering is a bright, fluorescent red." + brightness = 4 // the smaller bulb light fixture @@ -273,11 +277,9 @@ . = ..() switch(fitting) if("tube") - brightness = 8 if(prob(2)) broken(1) if("bulb") - brightness = 4 if(prob(5)) broken(1) @@ -642,11 +644,12 @@ sleep(1) qdel(src) -/obj/structure/machinery/light/handle_tail_stab(mob/living/carbon/xenomorph/stabbing_xeno) +/obj/structure/machinery/light/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) if(is_broken()) - to_chat(stabbing_xeno, SPAN_WARNING("\The [src] is already broken!")) + to_chat(xeno, SPAN_WARNING("[src] is already broken!")) return - stabbing_xeno.visible_message(SPAN_DANGER("\The [stabbing_xeno] smashes \the [src] with its tail!"), SPAN_DANGER("You smash \the [src] with your tail!"), null, 5) + xeno.visible_message(SPAN_DANGER("[xeno] smashes [src] with its tail!"), SPAN_DANGER("We smash [src] with our tail!"), null, 5) + xeno.tail_stab_animation(src, blunt_stab) broken() //Smashola! return TAILSTAB_COOLDOWN_VERY_LOW @@ -782,7 +785,7 @@ use_power = USE_POWER_ACTIVE idle_power_usage = 2 active_power_usage = 20 - power_channel = POWER_CHANNEL_LIGHT //Lights are calc'd via area so they dont need to be in the machine list + power_channel = POWER_CHANNEL_LIGHT //Lights are calc'd via area so they don't need to be in the machine list unslashable = TRUE unacidable = TRUE light_color = LIGHT_COLOR_FLARE diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 1c6bf589e4d3..16b7ed50e152 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -23,16 +23,16 @@ var/lastgen -/obj/structure/machinery/power/port_gen/process() +/obj/structure/machinery/power/power_generator/port_gen/process() ideally we're looking to generate 5000 -/obj/structure/machinery/power/port_gen/attackby(obj/item/W, mob/user) +/obj/structure/machinery/power/power_generator/port_gen/attackby(obj/item/W, mob/user) tank [un]loading stuff -/obj/structure/machinery/power/port_gen/attack_hand(mob/user) +/obj/structure/machinery/power/power_generator/port_gen/attack_hand(mob/user) turn on/off -/obj/structure/machinery/power/port_gen/get_examine_text(mob/user) +/obj/structure/machinery/power/power_generator/port_gen/get_examine_text(mob/user) display floor(lastgen) and phorontank amount */ @@ -41,7 +41,7 @@ display floor(lastgen) and phorontank amount //Baseline portable generator. Has all the default handling. Not intended to be used on it's own (since it generates unlimited power). -/obj/structure/machinery/power/port_gen +/obj/structure/machinery/power/power_generator/port_gen name = "Placeholder Generator" //seriously, don't use this. It can't be anchored without VV magic. desc = "A portable generator for emergency backup power." icon = 'icons/obj/structures/machinery/power.dmi' @@ -51,37 +51,30 @@ display floor(lastgen) and phorontank amount // directwired = 0 use_power = USE_POWER_NONE unslashable = FALSE + power_gen = 5000 + power_gen_percent = 100 + is_on = FALSE - var/active = 0 - var/power_gen = 5000 var/open = 0 var/recent_fault = 0 - var/power_output = 1 - power_machine = TRUE - -/obj/structure/machinery/power/port_gen/proc/HasFuel() //Placeholder for fuel check. - return 1 - -/obj/structure/machinery/power/port_gen/proc/UseFuel() //Placeholder for fuel use. - return - -/obj/structure/machinery/power/port_gen/proc/DropFuel() - return + var/datum/looping_sound/generator/soundloop -/obj/structure/machinery/power/port_gen/proc/handleInactive() - return +/obj/structure/machinery/power/power_generator/port_gen/Initialize() + . = ..() + soundloop = new(src) -/obj/structure/machinery/power/port_gen/power_change() - return +/obj/structure/machinery/power/power_generator/port_gen/Destroy() + QDEL_NULL(soundloop) + return ..() -/obj/structure/machinery/power/port_gen/process() - if(active && HasFuel() && !crit_fail && anchored && powernet) - add_avail(power_gen * power_output) +/obj/structure/machinery/power/power_generator/port_gen/process() + if(is_on && HasFuel() && !crit_fail && anchored && powernet) + add_avail(power_gen * power_gen_percent / 100) UseFuel() src.updateDialog() else - active = 0 + is_on = 0 stop_processing() icon_state = initial(icon_state) handleInactive() @@ -89,21 +82,32 @@ display floor(lastgen) and phorontank amount /obj/structure/machinery/power/powered() return 1 //doesn't require an external power source -/obj/structure/machinery/power/port_gen/attack_hand(mob/user as mob) +/obj/structure/machinery/power/power_generator/port_gen/attack_hand(mob/user as mob) if(..()) return if(!anchored) return -/obj/structure/machinery/power/port_gen/get_examine_text(mob/user) +/obj/structure/machinery/power/power_generator/port_gen/proc/TogglePower() + if(is_on) + is_on = FALSE + stop_processing() + icon_state = initial(icon_state) + soundloop.stop() + else if(HasFuel()) + is_on = TRUE + start_processing() + soundloop.start() + +/obj/structure/machinery/power/power_generator/port_gen/get_examine_text(mob/user) . = ..() - if(active) + if(is_on) . += SPAN_NOTICE("The generator is on.") else . += SPAN_NOTICE("The generator is off.") -/obj/structure/machinery/power/port_gen/attack_alien(mob/living/carbon/xenomorph/attacking_xeno) - if(!active && !anchored) +/obj/structure/machinery/power/power_generator/port_gen/attack_alien(mob/living/carbon/xenomorph/attacking_xeno) + if(!is_on && !anchored) return ..() if(attacking_xeno.mob_size < MOB_SIZE_XENO) @@ -114,8 +118,8 @@ display floor(lastgen) and phorontank amount attacking_xeno.visible_message(SPAN_DANGER("[attacking_xeno] slashes [src]!"), SPAN_DANGER("You slash [src]!")) playsound(attacking_xeno, pick('sound/effects/metalhit.ogg', 'sound/weapons/alien_claw_metal1.ogg', 'sound/weapons/alien_claw_metal2.ogg', 'sound/weapons/alien_claw_metal3.ogg'), 25, 1) - if(active) - active = FALSE + if(is_on) + is_on = FALSE stop_processing() icon_state = initial(icon_state) visible_message(SPAN_NOTICE("[src] sputters to a stop!")) @@ -126,8 +130,11 @@ display floor(lastgen) and phorontank amount visible_message(SPAN_NOTICE("[src]'s bolts are dislodged!")) return XENO_NONCOMBAT_ACTION +/obj/structure/machinery/power/power_generator/port_gen/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + return TAILSTAB_COOLDOWN_NONE + //A power generator that runs on solid plasma sheets. -/obj/structure/machinery/power/port_gen/pacman +/obj/structure/machinery/power/power_generator/port_gen/pacman name = "P.A.C.M.A.N.-type Portable Generator" var/sheets = 0 var/max_sheets = 100 @@ -138,7 +145,7 @@ display floor(lastgen) and phorontank amount var/time_per_sheet = 70 var/heat = 0 -/obj/structure/machinery/power/port_gen/pacman/Initialize() +/obj/structure/machinery/power/power_generator/port_gen/pacman/Initialize() . = ..() if(anchored) connect_to_network() @@ -154,11 +161,11 @@ display floor(lastgen) and phorontank amount sheet_name = sheet.name RefreshParts() -/obj/structure/machinery/power/port_gen/pacman/Destroy() +/obj/structure/machinery/power/power_generator/port_gen/pacman/Destroy() DropFuel() . = ..() -/obj/structure/machinery/power/port_gen/pacman/RefreshParts() +/obj/structure/machinery/power/power_generator/port_gen/pacman/RefreshParts() var/temp_rating = 0 var/temp_reliability = 0 for(var/obj/item/stock_parts/SP in component_parts) @@ -171,17 +178,17 @@ display floor(lastgen) and phorontank amount reliability = min(floor(temp_reliability / 4), 100) power_gen = floor(initial(power_gen) * (max(2, temp_rating) / 2)) -/obj/structure/machinery/power/port_gen/pacman/get_examine_text(mob/user) +/obj/structure/machinery/power/power_generator/port_gen/pacman/get_examine_text(mob/user) . = ..() . += SPAN_NOTICE(" The generator has [sheets] units of [sheet_name] fuel left, producing [power_gen] per cycle.") if(crit_fail) . += SPAN_DANGER("The generator seems to have broken down.") -/obj/structure/machinery/power/port_gen/pacman/HasFuel() - if(sheets >= 1 / (time_per_sheet / power_output) - sheet_left) +/obj/structure/machinery/power/power_generator/port_gen/pacman/HasFuel() + if(power_gen_percent != 0 && sheets >= 1 / (time_per_sheet / (power_gen_percent / 100)) - sheet_left) return 1 return 0 -/obj/structure/machinery/power/port_gen/pacman/DropFuel() +/obj/structure/machinery/power/power_generator/port_gen/pacman/DropFuel() if(sheets) var/fail_safe = 0 while(sheets > 0 && fail_safe < 100) @@ -191,8 +198,12 @@ display floor(lastgen) and phorontank amount S.amount = amount sheets -= amount -/obj/structure/machinery/power/port_gen/pacman/UseFuel() - var/needed_sheets = 1 / (time_per_sheet / power_output) +/obj/structure/machinery/power/power_generator/port_gen/pacman/UseFuel() + if(power_gen_percent == 0) // 0 division is a bad thing (no) + is_on = FALSE + return + + var/needed_sheets = 1 / (time_per_sheet / (power_gen_percent / 100)) var/temp = min(needed_sheets, sheet_left) needed_sheets -= temp sheet_left -= temp @@ -202,12 +213,12 @@ display floor(lastgen) and phorontank amount sheet_left = 1 - needed_sheets sheets-- - var/lower_limit = 56 + power_output * 10 - var/upper_limit = 76 + power_output * 10 + var/lower_limit = 56 + (power_gen_percent / 100) * 10 + var/upper_limit = 76 + (power_gen_percent / 100) * 10 var/bias = 0 - if (power_output > 4) + if ((power_gen_percent / 100) > 4) upper_limit = 400 - bias = power_output * 3 + bias = (power_gen_percent / 100) * 3 if (heat < lower_limit) heat += 3 else @@ -222,37 +233,36 @@ display floor(lastgen) and phorontank amount qdel(src) return -/obj/structure/machinery/power/port_gen/pacman/handleInactive() - +/obj/structure/machinery/power/power_generator/port_gen/pacman/handleInactive() if (heat > 0) heat = max(heat - 2, 0) src.updateDialog() -/obj/structure/machinery/power/port_gen/pacman/proc/overheat() +/obj/structure/machinery/power/power_generator/port_gen/pacman/proc/overheat() explosion(src.loc, 2, 5, 2, -1) -/obj/structure/machinery/power/port_gen/pacman/attackby(obj/item/O as obj, mob/user as mob) +/obj/structure/machinery/power/power_generator/port_gen/pacman/attackby(obj/item/O as obj, mob/user as mob) if(istype(O, sheet_path)) var/obj/item/stack/addstack = O var/amount = min((max_sheets - sheets), addstack.amount) if(amount < 1) - to_chat(user, SPAN_NOTICE(" The [src.name] is full!")) + to_chat(user, SPAN_NOTICE("The [src.name] is full!")) return - to_chat(user, SPAN_NOTICE(" You add [amount] sheets to the [src.name].")) + to_chat(user, SPAN_NOTICE("You add [amount] sheets to the [src.name].")) sheets += amount addstack.use(amount) updateUsrDialog() return - else if(!active) + else if(!is_on) if(HAS_TRAIT(O, TRAIT_TOOL_WRENCH)) if(!anchored) connect_to_network() - to_chat(user, SPAN_NOTICE(" You secure the generator to the floor.")) + to_chat(user, SPAN_NOTICE("You secure the generator to the floor.")) else disconnect_from_network() - to_chat(user, SPAN_NOTICE(" You unsecure the generator from the floor.")) + to_chat(user, SPAN_NOTICE("You unsecure the generator from the floor.")) playsound(src.loc, 'sound/items/Deconstruct.ogg', 25, 1) anchored = !anchored @@ -261,9 +271,9 @@ display floor(lastgen) and phorontank amount open = !open playsound(src.loc, 'sound/items/Screwdriver.ogg', 25, 1) if(open) - to_chat(user, SPAN_NOTICE(" You open the access panel.")) + to_chat(user, SPAN_NOTICE("You open the access panel.")) else - to_chat(user, SPAN_NOTICE(" You close the access panel.")) + to_chat(user, SPAN_NOTICE("You close the access panel.")) else if(HAS_TRAIT(O, TRAIT_TOOL_CROWBAR) && open) var/obj/structure/machinery/constructable_frame/new_frame = new /obj/structure/machinery/constructable_frame(src.loc) for(var/obj/item/I in component_parts) @@ -284,78 +294,68 @@ display floor(lastgen) and phorontank amount new_frame.update_icon() qdel(src) -/obj/structure/machinery/power/port_gen/pacman/attack_hand(mob/user as mob) +/obj/structure/machinery/power/power_generator/port_gen/pacman/attack_hand(mob/user as mob) ..() if (!anchored) return - interact(user) + tgui_interact(user) + +/obj/structure/machinery/power/power_generator/port_gen/pacman/attack_remote(mob/user as mob) + tgui_interact(user) + +/obj/structure/machinery/power/power_generator/port_gen/pacman/tgui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "port_gen", name) + ui.open() + +/obj/structure/machinery/power/power_generator/port_gen/pacman/ui_data() + var/data = list( + "is_on" = is_on, + "sheet_name" = capitalize(sheet_name), + "sheets" = sheets, + "stack_percent" = round(sheet_left * 100, 0.1), + + "anchored" = anchored, + "connected" = (powernet == null ? 0 : 1), + "ready_to_boot" = anchored && HasFuel(), + "power_generated" = display_power(power_gen), + "power_output" = display_power(power_gen * (power_gen_percent / 100)), + "power_available" = (powernet == null ? 0 : display_power(avail())), + "heat" = heat + ) + . = data + +/obj/structure/machinery/power/power_generator/port_gen/pacman/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() -/obj/structure/machinery/power/port_gen/pacman/attack_remote(mob/user as mob) - interact(user) + if(.) + return + switch(action) + if("toggle_power") + TogglePower() + . = TRUE -/obj/structure/machinery/power/port_gen/pacman/interact(mob/user) - if (get_dist(src, user) > 1 ) - if (!isRemoteControlling(user)) - user.unset_interaction() - close_browser(user, "port_gen") - return + if("eject") + if(!is_on) + DropFuel() + . = TRUE - user.set_interaction(src) + if("lower_power") + if (power_gen_percent > 100) + power_gen_percent -= 100 + . = TRUE - var/dat = text("[name]
") - if (active) - dat += text("Generator: On
") - else - dat += text("Generator: Off
") - dat += text("[capitalize(sheet_name)]: [sheets] - Eject
") - var/stack_percent = round(sheet_left * 100, 1) - dat += text("Current stack: [stack_percent]%
") - dat += text("Power output: - [power_gen * power_output] +
") - dat += text("Power current: [(powernet == null ? "Unconnected" : "[avail()]")]
") - dat += text("Heat: [heat]
") - dat += "
Close" - user << browse("[dat]", "window=port_gen") - onclose(user, "port_gen") - -/obj/structure/machinery/power/port_gen/pacman/Topic(href, href_list) - if(..()) - return + if("higher_power") + if (power_gen_percent < 400) + power_gen_percent += 100 + . = TRUE - src.add_fingerprint(usr) - if(href_list["action"]) - if(href_list["action"] == "enable") - if(!active && HasFuel() && !crit_fail) - active = 1 - start_processing() - icon_state = "portgen1" - src.updateUsrDialog() - if(href_list["action"] == "disable") - if (active) - active = 0 - stop_processing() - icon_state = "portgen0" - src.updateUsrDialog() - if(href_list["action"] == "eject") - if(!active) - DropFuel() - src.updateUsrDialog() - if(href_list["action"] == "lower_power") - if (power_output > 1) - power_output-- - src.updateUsrDialog() - if (href_list["action"] == "higher_power") - if (power_output < 4) - power_output++ - src.updateUsrDialog() - if (href_list["action"] == "close") - close_browser(usr, "port_gen") - usr.unset_interaction() - -/obj/structure/machinery/power/port_gen/pacman/inoperable(additional_flags) +/obj/structure/machinery/power/power_generator/port_gen/pacman/inoperable(additional_flags) return (stat & (BROKEN|additional_flags)) //Removes NOPOWER check since its a goddam generator and doesn't need power -/obj/structure/machinery/power/port_gen/pacman/super +/obj/structure/machinery/power/power_generator/port_gen/pacman/super name = "S.U.P.E.R.P.A.C.M.A.N.-type Portable Generator" icon_state = "portgen1" sheet_path = /obj/item/stack/sheet/mineral/uranium @@ -363,10 +363,10 @@ display floor(lastgen) and phorontank amount time_per_sheet = 120 board_path = /obj/item/circuitboard/machine/pacman/super -/obj/structure/machinery/power/port_gen/pacman/super/overheat() +/obj/structure/machinery/power/power_generator/port_gen/pacman/super/overheat() explosion(src.loc, 3, 3, 3, -1) -/obj/structure/machinery/power/port_gen/pacman/mrs +/obj/structure/machinery/power/power_generator/port_gen/pacman/mrs name = "M.R.S.P.A.C.M.A.N.-type Portable Generator" icon_state = "portgen2" sheet_path = /obj/item/stack/sheet/mineral/tritium @@ -374,5 +374,5 @@ display floor(lastgen) and phorontank amount time_per_sheet = 150 board_path = /obj/item/circuitboard/machine/pacman/mrs -/obj/structure/machinery/power/port_gen/pacman/mrs/overheat() +/obj/structure/machinery/power/power_generator/port_gen/pacman/mrs/overheat() explosion(src.loc, 4, 4, 4, -1) diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm index c8fa6e2abf95..41873961ffd9 100644 --- a/code/modules/power/power.dm +++ b/code/modules/power/power.dm @@ -7,7 +7,7 @@ var/datum/powernet/powernet = null /// Reference to a power terminal, used to connect SMES and APCs to the grid. - var/obj/structure/machinery/power/terminal/terminal = null + var/obj/structure/terminal/terminal = null var/directwired = 1 // by default, power machines are connected by a cable in a neighbouring turf // if set to 0, requires a 0-X cable on this turf @@ -15,6 +15,8 @@ idle_power_usage = 0 active_power_usage = 0 + var/area/current_area = null + /obj/structure/machinery/power/Destroy() disconnect_from_network() . = ..() @@ -63,19 +65,25 @@ // increment the power usage stats for an area -/obj/structure/machinery/proc/use_power(amount, chan = POWER_CHANNEL_ONEOFF, autocalled = 0) // defaults to one-off power charge, not constant power change - var/area/A = get_area(src) // make sure it's in an area - if(!A || !isarea(A)) - return - A.use_power(amount, chan) - if(!autocalled) - log_power_update_request(A, src) - return 1 +/obj/structure/machinery/proc/use_power(amount, chan = POWER_CHANNEL_ONEOFF) // defaults to one-off power charge, not constant power change + SHOULD_CALL_PARENT(TRUE) + var/area/current_area = get_area(src) // make sure it's in an area + if(!isarea(current_area)) + return FALSE + + current_area.use_power(amount, chan) + + log_power_update_request(current_area, src, amount, chan) + + return TRUE //The master_area optional argument can be used to save on a lot of processing if the master area is already known. This is mainly intended for when this proc is called by the master controller. /obj/structure/machinery/proc/power_change(area/master_area = null) // called whenever the power settings of the containing area change // by default, check equipment channel & set flag // can override if needed + if(QDELETED(src)) + return + var/has_power if (master_area) has_power = master_area.powered(power_channel) @@ -256,10 +264,11 @@ powernet = null // Then find any cables on our location - var/area/A = get_area(src) - if(!A) + current_area = get_area(src) + if(!current_area) return 0 - var/datum/powernet/PN = GLOB.powernets_by_name[A.powernet_name] + var/datum/powernet/PN = GLOB.powernets_by_name[current_area.powernet_name] + if(!PN) return 0 powernet = PN @@ -329,8 +338,8 @@ else if(istype(power_source,/obj/structure/machinery/power/apc)) var/obj/structure/machinery/power/apc/apc = power_source cell = apc.cell - if (apc.terminal) - PN = apc.terminal.powernet + if (apc.powernet) + PN = apc.powernet else if (!power_source) return 0 else @@ -366,3 +375,59 @@ else if (istype(power_source, /obj/item/cell)) cell.use(drained_energy*CELLRATE) //convert to units of charge. return drained_energy + + + +/obj/structure/machinery/power/power_generator + name = "power generator" + desc = "A machine that generates power." + power_machine = TRUE + + //5,000W is our power output + var/power_gen = 5000 + var/obj/structure/machinery/power/apc/apc_in_area = null //apc to power + ///% of power produced + var/power_gen_percent = 0 + +/obj/structure/machinery/power/power_generator/connect_to_network() + . = ..() + if(!anchored || !current_area) + return . + + apc_in_area = current_area.get_apc() + if(apc_in_area && LAZYFIND(apc_in_area.connected_power_sources, src) == 0) + LAZYADD(apc_in_area.connected_power_sources, src) + +/obj/structure/machinery/power/power_generator/disconnect_from_network() + . = ..() + if(apc_in_area) + LAZYREMOVE(apc_in_area.connected_power_sources, src) + apc_in_area = null + +/obj/structure/machinery/power/power_generator/add_avail(amount) + if(apc_in_area) + if(apc_in_area.current_area != current_area) + LAZYREMOVE(apc_in_area.connected_power_sources, src) + apc_in_area = null + else if(current_area.requires_power) + return // In the off chance somehow theres an APC where power isn't required it wouldn't handle gens + else + apc_in_area = current_area.get_apc() + if(apc_in_area) + if(LAZYFIND(apc_in_area.connected_power_sources, src) == 0) + LAZYADD(apc_in_area.connected_power_sources, src) + return + + ..(amount) + +/obj/structure/machinery/power/power_generator/proc/HasFuel() //Placeholder for fuel check. + return 1 + +/obj/structure/machinery/power/power_generator/proc/UseFuel() //Placeholder for fuel use. + return + +/obj/structure/machinery/power/power_generator/proc/DropFuel() + return + +/obj/structure/machinery/power/power_generator/proc/handleInactive() + return diff --git a/code/modules/power/power_monitor.dm b/code/modules/power/power_monitor.dm index e8992014d6b3..0cbe75e0b75e 100644 --- a/code/modules/power/power_monitor.dm +++ b/code/modules/power/power_monitor.dm @@ -14,6 +14,11 @@ idle_power_usage = 300 active_power_usage = 300 +/obj/structure/machinery/power/monitor/Initialize(mapload, ...) + . = ..() + if(!mapload) + connect_to_network() + /obj/structure/machinery/power/monitor/attack_remote(mob/user) add_fingerprint(user) @@ -29,51 +34,54 @@ interact(user) /obj/structure/machinery/power/monitor/interact(mob/user) - if ( (get_dist(src, user) > 1 ) || (inoperable()) ) if (!isRemoteControlling(user)) user.unset_interaction() close_browser(user, "powcomp") return - user.set_interaction(src) - var/t = "" - t += "
Refresh" - t += "
Close" + var/data = "" + data += "
Refresh " + data += "Close
" if(!powernet) - t += SPAN_DANGER("No connection") + data += SPAN_DANGER("No connection.") else + data += "
" + data += "Total power: [display_power(powernet.avail)]" - t += "
" + data += "Approx load: [display_power(ceil(powernet.viewload))]
" - var/list/L = list() - for(var/obj/structure/machinery/power/terminal/term in powernet.nodes) - if(istype(term.master, /obj/structure/machinery/power/apc)) - var/obj/structure/machinery/power/apc/A = term.master - L += A - - t += "Total power: [powernet.avail] W" - t += "
Total load: [num2text(powernet.viewload,10)] W
" - - t += "" + data += "" - if(length(L) > 0) - var/total_demand = 0 - t += "Area Eqp./Lgt./Env. Load Cell
" + data += "" + data += " Area Eqp. Lgt. Env. Load Cell " - var/list/S = list(" Off","AOff"," On", " AOn") - var/list/chg = list("N","C","F") + var/total_demand = 0 + var/total_actual_usage = 0 + var/list/status = list(" Off","AOff"," On ", " AOn") + var/list/charge_status = list("N","C","F") - for(var/obj/structure/machinery/power/apc/A in L) + for(var/obj/structure/machinery/power/apc/current_apc in powernet.nodes) + data += " " + data += " " + total_demand += current_apc.lastused_total + total_actual_usage += current_apc.lastused_total_actual - t += copytext(add_tspace("\The [A.area]", 30), 1, 30) - t += " [S[A.equipment+1]] [S[A.lighting+1]] [S[A.environ+1]] [add_lspace(A.lastused_total, 6)] [A.cell ? "[add_lspace(floor(A.cell.percent()), 3)]% [chg[A.charging+1]]" : " N/C"][copytext(add_tspace("[current_apc.area]", 30), 1, 30)] " + data += "[status[current_apc.equipment + 1]] " + data += "[status[current_apc.lighting + 1]] " + data += "[status[current_apc.environ + 1]] " + data += "[add_lspace(current_apc.lastused_total, 6)]W " + data += "[current_apc.cell ? "[add_lspace(floor(current_apc.cell.percent()), 3)]% [charge_status[current_apc.charging+1]]" : " N/C"] " + data += "
" - total_demand += A.lastused_total + data += "
" + data += "Total usage (demand): [display_power(total_actual_usage)] ([display_power(total_demand)])
" + data += "
Total demand: [total_demand] W
" -/obj/item/attachable/attached_gun/flamer_nozzle/activate_attachment(obj/item/weapon/gun/G, mob/living/user, turn_off) +/obj/item/attachable/attached_gun/flamer_nozzle/activate_attachment(obj/item/weapon/gun/firearm, mob/living/user, turn_off) . = ..() - attach_icon = "flamer_nozzle_a_[G.active_attachable == src ? 0 : 1]" - G.update_icon() + attach_icon = "flamer_nozzle_a_[firearm.active_attachable == src ? 0 : 1]" + firearm.update_icon() + for(var/datum/action/item_action as anything in firearm.actions) + item_action.update_button_icon() /obj/item/attachable/attached_gun/flamer_nozzle/fire_attachment(atom/target, obj/item/weapon/gun/gun, mob/living/user) . = ..() @@ -3501,6 +3884,24 @@ Defined in conflicts.dm of the #defines folder. scatter_unwielded_mod = -SCATTER_AMOUNT_TIER_9 accuracy_unwielded_mod = HIT_ACCURACY_MULT_TIER_1 +/obj/item/attachable/lasersight/micro + name = "micro laser module" + desc = "A compact, high-precision laser sight engineered exclusively for the M10 Auto Pistol. Offers exceptional accuracy gains by interfacing directly with the weapon's internal targeting systems." + desc_lore = "An advanced derivative of the AN/PEQ-42 line, the '42M' variant was precision-tuned by Kessler Optics for use with the M10 Auto Pistol. Its microcontroller syncs with the pistol's fire-control unit for superior point-of-aim fidelity and scatter compensation. Rare, expensive, and typically reserved for elite units or covert applications." + icon = 'icons/obj/items/weapons/guns/attachments/under.dmi' + icon_state = "lasersight_micro" + attach_icon = "lasersight_micro_a" + slot = "under" + pixel_shift_x = 17 + pixel_shift_y = 17 + +/obj/item/attachable/lasersight/micro/New() + ..() + accuracy_mod = HIT_ACCURACY_MULT_TIER_1 + movement_onehanded_acc_penalty_mod = -MOVEMENT_ACCURACY_PENALTY_MULT_TIER_5 + scatter_mod = -SCATTER_AMOUNT_TIER_10 + scatter_unwielded_mod = -SCATTER_AMOUNT_TIER_9 + accuracy_unwielded_mod = HIT_ACCURACY_MULT_TIER_1 /obj/item/attachable/bipod name = "bipod" @@ -3512,7 +3913,7 @@ Defined in conflicts.dm of the #defines folder. size_mod = 2 melee_mod = -10 flags_attach_features = ATTACH_REMOVABLE|ATTACH_ACTIVATION - attachment_action_type = /datum/action/item_action/toggle + attachment_action_type = /datum/action/item_action/toggle/bipod var/initial_mob_dir = NORTH // the dir the mob faces the moment it deploys the bipod var/bipod_deployed = FALSE /// If this should anchor the user while in use @@ -3547,6 +3948,7 @@ Defined in conflicts.dm of the #defines folder. RegisterSignal(gun, COMSIG_ITEM_DROPPED, PROC_REF(handle_drop)) /obj/item/attachable/bipod/Detach(mob/user, obj/item/weapon/gun/detaching_gun) + ..() UnregisterSignal(detaching_gun, COMSIG_ITEM_DROPPED) //clear out anything related to full auto switching @@ -3560,7 +3962,6 @@ Defined in conflicts.dm of the #defines folder. if(bipod_deployed) undeploy_bipod(detaching_gun, user) - ..() /obj/item/attachable/bipod/update_icon() if(bipod_deployed) @@ -3596,7 +3997,7 @@ Defined in conflicts.dm of the #defines folder. scatter_mod = SCATTER_AMOUNT_TIER_9 recoil_mod = RECOIL_AMOUNT_TIER_5 burst_scatter_mod = 0 - delay_mod = FIRE_DELAY_TIER_12 + delay_mod = FIRE_DELAY_TIER_11 //if we are no longer on full auto, don't bother switching back to the old firemode if(full_auto_switch && gun.gun_firemode == GUN_FIREMODE_AUTOMATIC && gun.gun_firemode != old_firemode) gun.do_toggle_firemode(user, null, old_firemode) @@ -3711,9 +4112,9 @@ Defined in conflicts.dm of the #defines folder. playsound(owner, 'sound/weapons/handling/gun_burst_toggle.ogg', 15, 1) if(attached_bipod.full_auto_switch) - button.icon_state = "template_on" + action_icon_state = "full_auto_switch_off" else - button.icon_state = "template" + action_icon_state = "full_auto_switch" button.overlays.Cut() button.overlays += image('icons/mob/hud/actions.dmi', button, action_icon_state) @@ -3779,7 +4180,7 @@ Defined in conflicts.dm of the #defines folder. desc = "A set of rugged telescopic poles to keep a weapon stabilized during firing." icon_state = "bipod_m41ae2" attach_icon = "bipod_m41ae2_a" - heavy_bipod = TRUE + heavy_bipod = FALSE camo_bipod = TRUE // this bipod has a camo skin /obj/item/attachable/bipod/m41ae2/Initialize(mapload, ...) diff --git a/code/modules/projectiles/gun_helpers.dm b/code/modules/projectiles/gun_helpers.dm index 9a9bdc71a4aa..1481f3e0d80a 100644 --- a/code/modules/projectiles/gun_helpers.dm +++ b/code/modules/projectiles/gun_helpers.dm @@ -297,37 +297,81 @@ DEFINES in setup.dm, referenced here. if(!user.Adjacent(dropping)) return var/obj/item/ammo_magazine/magazine = dropping + var/obj/item/ammo_magazine/handful/bullet = dropping if(!istype(user) || user.is_mob_incapacitated(TRUE)) return if(src != user.r_hand && src != user.l_hand) to_chat(user, SPAN_WARNING("[src] must be in your hand to do that.")) return if(magazine.loc != user && !istype(magazine.loc, /obj/item/storage)) - return - if(flags_gun_features & GUN_INTERNAL_MAG) - to_chat(user, SPAN_WARNING("Can't do tactical reloads with [src].")) + to_chat(user, SPAN_WARNING("[dropping] must be carried to do that.")) return //no tactical reload for the untrained. if(user.skills.get_skill_level(SKILL_FIREARMS) == 0) to_chat(user, SPAN_WARNING("You don't know how to do tactical reloads.")) return - if(istype(src, magazine.gun_type) || (magazine.type in src.accepted_ammo)) + // unconventional tac reloads, yes, you can reload with one hand if you know what youre doing irl + if(flags_gun_features & GUN_INTERNAL_MAG) + unconventional_reload(user, magazine) + return + + // actual tactical reloads + var/tac_reload_time = 15 + if(istype(src, magazine.gun_type) || (magazine.type in accepted_ammo)) + + if(istype(bullet, /obj/item/ammo_magazine/handful) && in_chamber) + to_chat(user, SPAN_WARNING("You can't tactically reload with [bullet] without clearing the [src]'s chamber!")) + return + if(current_mag) unload(user, FALSE, TRUE) to_chat(user, SPAN_NOTICE("You start a tactical reload.")) + var/old_mag_loc = magazine.loc - var/tac_reload_time = 15 if(user.skills) tac_reload_time = max(15 - 5*user.skills.get_skill_level(SKILL_FIREARMS), 5) - if(do_after(user,tac_reload_time, (INTERRUPT_ALL & (~INTERRUPT_MOVED)) , BUSY_ICON_FRIENDLY) && magazine.loc == old_mag_loc && !current_mag) - if(isstorage(magazine.loc)) - var/obj/item/storage/master_storage = magazine.loc - master_storage.remove_from_storage(magazine) - reload(user, magazine) + if(!do_after(user, tac_reload_time, (INTERRUPT_ALL & (~INTERRUPT_MOVED)) , BUSY_ICON_FRIENDLY)) + return + if(magazine.loc != old_mag_loc || current_mag) + return + + if(isstorage(magazine.loc)) + var/obj/item/storage/master_storage = magazine.loc + master_storage.remove_from_storage(magazine) + reload(user, magazine) + else + to_chat(user, SPAN_WARNING("The [magazine] doesn't fit in the [src]!")) + return else ..() +/obj/item/weapon/gun/proc/unconventional_reload(mob/user, obj/item/ammo_magazine/magazine) + if(magazine.caliber != caliber) + to_chat(user, SPAN_WARNING("This doesn't match the [src]'s caliber!")) + return + if(current_mag && current_mag.current_rounds >= current_mag.max_rounds) + to_chat(user, SPAN_WARNING("[src] is already at its maximum capacity!")) + return + + var/tac_reload_time = 2 + + to_chat(user, SPAN_NOTICE("You get on one knee and start an unconventional reload.")) + var/interrupted = FALSE + while(current_mag && current_mag.current_rounds < current_mag.max_rounds && magazine && magazine.current_rounds > 0) + var/old_ammo_loc = magazine.loc + if(!do_after(user, tac_reload_time, INTERRUPT_ALL, BUSY_ICON_FRIENDLY)) + interrupted = TRUE + break + if(QDELETED(magazine) || magazine.loc != old_ammo_loc || !current_mag || current_mag.current_rounds >= current_mag.max_rounds) + interrupted = TRUE + break + reload(user, magazine) + + if(!interrupted) + to_chat(user, SPAN_NOTICE("You finish reloading.")) + else + to_chat(user, SPAN_NOTICE("Your reload was interrupted!")) //---------------------------------------------------------- // \\ @@ -336,9 +380,6 @@ DEFINES in setup.dm, referenced here. // \\ //---------------------------------------------------------- -/obj/item/weapon/proc/unique_action(mob/user) //moved this up a path to make macroing for other weapons easier -spookydonut - return - /obj/item/weapon/gun/proc/check_inactive_hand(mob/user) if(user) var/obj/item/weapon/gun/in_hand = user.get_inactive_hand() @@ -392,7 +433,10 @@ DEFINES in setup.dm, referenced here. user.visible_message(SPAN_NOTICE("[user] begins attaching [attachment] to [src]."), SPAN_NOTICE("You begin attaching [attachment] to [src]."), null, 4) - if(do_after(user, 1.5 SECONDS, INTERRUPT_ALL, BUSY_ICON_FRIENDLY, numticks = 2)) + var/attach_delay = 1.5 SECONDS + if(istype(attachment, /obj/item/attachable/bayonet)) + attach_delay = 0.3 SECONDS + if(do_after(user, attach_delay, INTERRUPT_ALL, BUSY_ICON_FRIENDLY, numticks = 2)) if(attachment && attachment.loc) user.visible_message(SPAN_NOTICE("[user] attaches [attachment] to [src]."), SPAN_NOTICE("You attach [attachment] to [src]."), null, 4) @@ -676,7 +720,10 @@ DEFINES in setup.dm, referenced here. usr.visible_message(SPAN_NOTICE("[usr] begins stripping [attachment] from [src]."), SPAN_NOTICE("You begin stripping [attachment] from [src]."), null, 4) - if(!do_after(usr, 1.5 SECONDS, INTERRUPT_ALL, BUSY_ICON_FRIENDLY)) + var/detach_delay = 1.5 SECONDS + if(istype(attachment, /obj/item/attachable/bayonet)) + detach_delay = 0.3 SECONDS + if(!do_after(usr, detach_delay, INTERRUPT_ALL, BUSY_ICON_FRIENDLY)) return if(!(attachment == attachments[attachment.slot])) @@ -763,6 +810,7 @@ DEFINES in setup.dm, referenced here. else gun_firemode = gun_firemode_list[1] + SEND_SIGNAL(src, COMSIG_GUN_FIRE_MODE_TOGGLE, gun_firemode) /obj/item/weapon/gun/verb/use_toggle_burst() set category = "Weapons" @@ -807,22 +855,6 @@ DEFINES in setup.dm, referenced here. unload(user, FALSE, drop_to_ground) //We want to drop the mag on the ground. -/obj/item/weapon/gun/verb/use_unique_action() - set category = "Weapons" - set name = "Unique Action" - set desc = "Use anything unique your firearm is capable of. Includes pumping a shotgun or spinning a revolver. If you have an active attachment, this will activate on the attachment instead." - set src = usr.contents - - var/obj/item/weapon/gun/active_firearm = get_active_firearm(usr) - if(!active_firearm) - return - if(active_firearm.active_attachable) - src = active_firearm.active_attachable - else - src = active_firearm - - unique_action(usr) - /obj/item/weapon/gun/verb/toggle_gun_safety() set category = "Weapons" set name = "Toggle Gun Safety" @@ -907,7 +939,7 @@ DEFINES in setup.dm, referenced here. /obj/item/weapon/gun/verb/toggle_auto_eject_verb() set category = "Weapons" set name = "Toggle Auto Eject" - set desc = "Enable/Disable the gun's magazine ejection system" + set desc = "Enable/Disable the gun's magazine ejection system." set src = usr.contents var/obj/item/weapon/gun/active_firearm = get_active_firearm(usr) diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index 228906a4f31e..70a931f9f665 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -135,6 +135,10 @@ has_charge_meter = FALSE charge_icon = "+rxfm5_empty" +/obj/item/weapon/gun/energy/rxfm5_eva/Initialize() + . = ..() + AddElement(/datum/element/corp_label/wy) + /obj/item/weapon/gun/energy/rxfm5_eva/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 0, "muzzle_y" = 0,"rail_x" = 12, "rail_y" = 21, "under_x" = 16, "under_y" = 10, "stock_x" = 0, "stock_y" = 0) @@ -172,7 +176,7 @@ /obj/item/weapon/gun/energy/laser_top name = "'LAZ-TOP'" - desc = "The 'LAZ-TOP', aka the Laser Anode something something"//finish this later + desc = "The 'LAZ-TOP', aka the Laser Anode something something."//finish this later /obj/item/weapon/gun/energy/laz_uzi name = "laser UZI" @@ -215,7 +219,7 @@ // Lots of bits for it so splitting off an area /obj/item/weapon/gun/energy/taser name = "disabler gun" - desc = "An advanced stun device capable of firing balls of ionized electricity. Used for nonlethal takedowns. " + desc = "An advanced stun device capable of firing balls of ionized electricity. Used for nonlethal takedowns." icon = 'icons/obj/items/weapons/guns/guns_by_faction/USCM/energy_weapons.dmi' icon_state = "taser" item_state = "taser" diff --git a/code/modules/projectiles/guns/flamer/flamer.dm b/code/modules/projectiles/guns/flamer/flamer.dm index b70ccc0c1a4f..af1041306f56 100644 --- a/code/modules/projectiles/guns/flamer/flamer.dm +++ b/code/modules/projectiles/guns/flamer/flamer.dm @@ -301,7 +301,7 @@ return var/source_turf = get_turf(user) - var/smoke_range = 5 // the max range the smoke will travel + var/smoke_range = 4 // the max range the smoke will travel var/distance = 0 // the distance traveled var/use_multiplier = 3 // if you want to increase the ammount of units drained from the tank var/units_in_smoke = 35 // the smoke overlaps a little so this much is probably already good @@ -416,6 +416,10 @@ name = "\improper M240A1 incinerator unit" desc = "M240A1 incinerator unit has proven to be one of the most effective weapons at clearing out soft-targets. This is a weapon to be feared and respected as it is quite deadly." +/obj/item/weapon/gun/flamer/m240/Initialize() + . = ..() + AddElement(/datum/element/corp_label/wy) + /obj/item/weapon/gun/flamer/m240/underextinguisher starting_attachment_types = list(/obj/item/attachable/attached_gun/extinguisher) @@ -541,6 +545,29 @@ . = ..() set_fire_delay(FIRE_DELAY_TIER_7) +GLOBAL_LIST_EMPTY(flamer_particles) +/particles/flamer_fire + icon = 'icons/effects/particles/fire.dmi' + icon_state = "bonfire" + width = 100 + height = 100 + count = 200 + spawning = 5 + lifespan = 0.6 SECONDS + fade = 0.8 SECONDS + grow = -0.01 + velocity = list(0, 0) + position = generator("box", list(-16, -16), list(16, 16), NORMAL_RAND) + drift = generator("vector", list(0, -0.2), list(0, 0.2)) + gravity = list(0, 0.95) + scale = generator("vector", list(0.3, 0.3), list(1,1), NORMAL_RAND) + rotation = 30 + spin = generator("num", -20, 20) + +/particles/flamer_fire/New(set_color) + ..() + color = set_color + /obj/flamer_fire name = "fire" desc = "Ouch!" @@ -596,7 +623,11 @@ flame_icon = R.burn_sprite set_light(l_color = R.burncolor) - + if(R.fire_penetrating) + var/new_burncolor = color_matrix_multiply(color_matrix_rotate_x(5), color_hex2color_matrix(R.burncolor)) + if(!GLOB.flamer_particles[new_burncolor]) + GLOB.flamer_particles[new_burncolor] = new /particles/flamer_fire(new_burncolor) + particles = GLOB.flamer_particles[new_burncolor] tied_reagent = new R.type() // Can't get deleted this way tied_reagent.make_alike(R) @@ -649,6 +680,9 @@ var/turf/open/scorch_turf_target = loc if(scorch_turf_target.scorchable) scorch_turf_target.scorch(burnlevel) + var/obj/effect/decal/cleanable/liquid_fuel/liquid = LAZYACCESS(scorch_turf_target.cleanables, CLEANABLE_IGNITABLE) + if(liquid && istype(liquid)) + INVOKE_NEXT_TICK(liquid, TYPE_PROC_REF(/obj/effect/decal/cleanable/liquid_fuel, ignite)) if (istype(loc, /turf/open/auto_turf/snow)) var/turf/open/auto_turf/snow/S = loc @@ -983,6 +1017,10 @@ attachable_allowed = null +/obj/item/weapon/gun/flamer/flammenwerfer3/Initialize() + . = ..() + AddElement(/datum/element/corp_label/wy) + /obj/item/weapon/gun/flamer/flammenwerfer3/get_fire_sound() var/list/fire_sounds = list( 'sound/weapons/wy_flamethrower1.ogg', diff --git a/code/modules/projectiles/guns/lever_action.dm b/code/modules/projectiles/guns/lever_action.dm index 68aca247308a..45046a424a62 100644 --- a/code/modules/projectiles/guns/lever_action.dm +++ b/code/modules/projectiles/guns/lever_action.dm @@ -294,7 +294,7 @@ their unique feature is that a direct hit will buff your damage and firerate /obj/item/weapon/gun/lever_action/r4t name = "R4T lever-action rifle" - desc = "This lever-action was designed for small scout operations in harsh environments such as the jungle or particularly windy deserts, as such its internal mechanisms are simple yet robust." + desc = "This lever-action was designed for exotic hunting and small scout operations in harsh environments such as the jungle or particularly windy deserts, as such its internal mechanisms are simple yet robust." icon_state = "r4t" item_state = "r4t" flags_equip_slot = SLOT_BACK @@ -321,6 +321,7 @@ their unique feature is that a direct hit will buff your damage and firerate /obj/item/attachable/magnetic_harness, /obj/item/attachable/scope/mini, /obj/item/attachable/gyro, // Under + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/lasersight, /obj/item/attachable/magnetic_harness/lever_sling, /obj/item/attachable/stock/r4t, // Stock @@ -330,6 +331,10 @@ their unique feature is that a direct hit will buff your damage and firerate flags_gun_lever_action = MOVES_WHEN_LEVERING|DANGEROUS_TO_ONEHAND_LEVER civilian_usable_override = TRUE +/obj/item/weapon/gun/lever_action/r4t/Initialize() + . = ..() + AddElement(/datum/element/corp_label/henjin_garcia) + /obj/item/weapon/gun/lever_action/r4t/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 19, "rail_x" = 11, "rail_y" = 21, "under_x" = 24, "under_y" = 16, "stock_x" = 15, "stock_y" = 14) @@ -344,7 +349,7 @@ their unique feature is that a direct hit will buff your damage and firerate /obj/item/weapon/gun/lever_action/xm88 name = "\improper XM88 heavy rifle" desc = "An experimental man-portable anti-material rifle chambered in .458 SOCOM. It must be manually chambered for every shot.\nIt has a special property - when you obtain multiple direct hits in a row, its armor penetration and damage will increase." - desc_lore = "Originally developed by ARMAT Battlefield Systems for the government of the state of Greater Brazil for use in the Favela Wars (2161 - Ongoing) against mechanized infantry. The platform features an onboard computerized targeting system, sensor array, and an electronic autoloader; these features work in tandem to reduce and render inert armor on the users target with successive hits. The Almayer was issued a small amount of XM88s while preparing for Operation Swamp Hopper with the USS Nan-Shan." + desc_lore = "Originally developed by Armat Battlefield Systems for the government of the state of Greater Brazil for use in the Favela Wars (2161 - Ongoing) against mechanized infantry. The platform features an onboard computerized targeting system, sensor array, and an electronic autoloader; these features work in tandem to reduce and render inert armor on the users target with successive hits. The Almayer was issued a small amount of XM88s while preparing for Operation Swamp Hopper with the USS Nan-Shan." icon = 'icons/obj/items/weapons/guns/guns_by_faction/USCM/marksman_rifles.dmi' // overridden with camos anyways icon_state = "boomslang" item_state = "boomslang" @@ -379,10 +384,15 @@ their unique feature is that a direct hit will buff your damage and firerate /obj/item/attachable/magnetic_harness, /obj/item/attachable/scope/mini/xm88, /obj/item/attachable/gyro, // Under + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/lasersight, /obj/item/attachable/stock/xm88, // Stock ) +/obj/item/weapon/gun/lever_action/xm88/Initialize() + . = ..() + AddElement(/datum/element/corp_label/armat) + /obj/item/weapon/gun/lever_action/xm88/set_gun_config_values() ..() set_fire_delay(FIRE_DELAY_TIER_2) diff --git a/code/modules/projectiles/guns/misc.dm b/code/modules/projectiles/guns/misc.dm index 905c5225caa4..b49fdaceec93 100644 --- a/code/modules/projectiles/guns/misc.dm +++ b/code/modules/projectiles/guns/misc.dm @@ -204,8 +204,6 @@ ) var/cover_open = FALSE //if the gun's feed-cover is open or not. - - /obj/item/weapon/gun/pkp/handle_starting_attachment() ..() @@ -224,6 +222,7 @@ /obj/item/weapon/gun/pkp/Initialize(mapload, spawn_empty) . = ..() + AddElement(/datum/element/corp_label/norcomm) if(current_mag && current_mag.current_rounds > 0) load_into_chamber() diff --git a/code/modules/projectiles/guns/pistols.dm b/code/modules/projectiles/guns/pistols.dm index 473a52c4c0e4..81b62d33937a 100644 --- a/code/modules/projectiles/guns/pistols.dm +++ b/code/modules/projectiles/guns/pistols.dm @@ -23,9 +23,12 @@ firesound_volume = 25 attachable_allowed = list( /obj/item/attachable/suppressor, + /obj/item/attachable/suppressor/sleek, /obj/item/attachable/reddot, + /obj/item/attachable/reddot/small, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/compensator, /obj/item/attachable/lasersight, /obj/item/attachable/extended_barrel, @@ -61,9 +64,12 @@ flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_ONE_HAND_WIELDED|GUN_AMMO_COUNTER attachable_allowed = list( /obj/item/attachable/suppressor, + /obj/item/attachable/suppressor/sleek, /obj/item/attachable/reddot, + /obj/item/attachable/reddot/small, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/compensator, /obj/item/attachable/lasersight, /obj/item/attachable/extended_barrel, @@ -71,10 +77,13 @@ /obj/item/attachable/burstfire_assembly, ) +/obj/item/weapon/gun/pistol/m4a3/Initialize() + . = ..() + AddElement(/datum/element/corp_label/armat) + /obj/item/weapon/gun/pistol/m4a3/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 28, "muzzle_y" = 20,"rail_x" = 10, "rail_y" = 21, "under_x" = 21, "under_y" = 17, "stock_x" = 21, "stock_y" = 17) - /obj/item/weapon/gun/pistol/m4a3/set_gun_config_values() ..() set_fire_delay(FIRE_DELAY_TIER_12) @@ -125,18 +134,19 @@ /obj/item/weapon/gun/pistol/m1911 name = "\improper M1911 service pistol" - desc = "A timeless classic since the first World War. Once standard issue for the USCM, now back order only. Chambered in .45 ACP. Unfortunately, due to the progression of IFF technology, M1911 .45 ACP is NOT compatible with the SU-6." + desc = "A timeless classic since the first World War, produced in limited amount by Armat Battlefield Systems after their aquisison of Colt's Manufacturing Company. Once standard issue for the USCM, now back order only. Chambered in .45 ACP." icon = 'icons/obj/items/weapons/guns/guns_by_faction/USCM/pistols.dmi' icon_state = "m4a345" item_state = "m4a3" - current_mag = /obj/item/ammo_magazine/pistol/m1911 +/obj/item/weapon/gun/pistol/m1911/Initialize() + . = ..() + AddElement(/datum/element/corp_label/armat) /obj/item/weapon/gun/pistol/m1911/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 28, "muzzle_y" = 20,"rail_x" = 10, "rail_y" = 22, "under_x" = 21, "under_y" = 17, "stock_x" = 21, "stock_y" = 17) - /obj/item/weapon/gun/pistol/m1911/set_gun_config_values() ..() set_fire_delay(FIRE_DELAY_TIER_11) @@ -147,7 +157,6 @@ scatter_unwielded = SCATTER_AMOUNT_TIER_6 damage_mult = BASE_BULLET_DAMAGE_MULT + BULLET_DAMAGE_MULT_TIER_5 - /obj/item/weapon/gun/pistol/m1911/socom name = "\improper M48A4 service pistol" desc = "A timeless classic since the first World War, the M1911A1 has limited use with the USCM, and is often used as a sidearm by non-governmental bodies due to its reliability. This is a modernized version with an ammo counter and a polymer grip, designated M48A4. Chambered in .45 ACP." @@ -174,7 +183,6 @@ icon_state = "m1911c" item_state = "m4a3" flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_ONE_HAND_WIELDED|GUN_AMMO_COUNTER - current_mag = /obj/item/ammo_magazine/pistol/m1911/highimpact /obj/item/weapon/gun/pistol/m1911/custom/set_gun_config_values() @@ -190,6 +198,10 @@ /obj/item/weapon/gun/pistol/m1911/custom/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 29, "muzzle_y" = 20, "rail_x" = 10, "rail_y" = 22, "under_x" = 21, "under_y" = 15, "stock_x" = 21, "stock_y" = 17) +/obj/item/weapon/gun/pistol/m1911/custom/unique_action(mob/user) + if(fire_into_air(user)) + return ..() + //------------------------------------------------------- //Beretta 92FS, the gun McClane carries around in Die Hard. Very similar to the service pistol, all around. @@ -243,8 +255,10 @@ attachable_allowed = list( /obj/item/attachable/reddot, + /obj/item/attachable/reddot/small, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/extended_barrel, /obj/item/attachable/heavy_barrel, /obj/item/attachable/lasersight, @@ -315,11 +329,17 @@ flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_ONE_HAND_WIELDED|GUN_AMMO_COUNTER attachable_allowed = list( /obj/item/attachable/suppressor, + /obj/item/attachable/suppressor/sleek, /obj/item/attachable/reddot, + /obj/item/attachable/reddot/small, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, ) +/obj/item/weapon/gun/pistol/np92/Initialize() + . = ..() + AddElement(/datum/element/corp_label/norcomm) + /obj/item/weapon/gun/pistol/np92/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 27, "muzzle_y" = 20,"rail_x" = 13, "rail_y" = 22, "under_x" = 21, "under_y" = 18, "stock_x" = 21, "stock_y" = 18) @@ -344,6 +364,7 @@ flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_ONE_HAND_WIELDED|GUN_AMMO_COUNTER attachable_allowed = list( /obj/item/attachable/reddot, + /obj/item/attachable/reddot/small, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, ) @@ -366,12 +387,19 @@ flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_ONE_HAND_WIELDED|GUN_AMMO_COUNTER attachable_allowed = list( /obj/item/attachable/reddot, + /obj/item/attachable/reddot/small, /obj/item/attachable/reflex, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/flashlight, /obj/item/attachable/lasersight, /obj/item/attachable/suppressor, + /obj/item/attachable/suppressor/sleek, ) +/obj/item/weapon/gun/pistol/t73/Initialize() + . = ..() + AddElement(/datum/element/corp_label/norcomm) + /obj/item/weapon/gun/pistol/t73/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 28, "muzzle_y" = 20,"rail_x" = 13, "rail_y" = 22, "under_x" = 22, "under_y" = 15, "stock_x" = 21, "stock_y" = 18) @@ -400,9 +428,11 @@ attachable_allowed = list( /obj/item/attachable/reddot, + /obj/item/attachable/reddot/small, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, /obj/item/attachable/suppressor, + /obj/item/attachable/suppressor/sleek, /obj/item/attachable/heavy_barrel, ) @@ -467,9 +497,13 @@ /obj/item/attachable/reddot, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/lasersight, ) +/obj/item/weapon/gun/pistol/holdout/Initialize() + . = ..() + AddElement(/datum/element/corp_label/spearhead) /obj/item/weapon/gun/pistol/holdout/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 25, "muzzle_y" = 20,"rail_x" = 6, "rail_y" = 20, "under_x" = 20, "under_y" = 17, "stock_x" = 22, "stock_y" = 17) @@ -515,6 +549,7 @@ attachable_allowed = list( /obj/item/attachable/reddot, /obj/item/attachable/reflex, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/flashlight, /obj/item/attachable/suppressor, /obj/item/attachable/extended_barrel, @@ -522,6 +557,10 @@ /obj/item/attachable/compensator, ) +/obj/item/weapon/gun/pistol/action/Initialize() + . = ..() + AddElement(/datum/element/corp_label/spearhead) + /obj/item/weapon/gun/pistol/action/set_gun_config_values() ..() set_fire_delay(FIRE_DELAY_TIER_11) @@ -550,6 +589,8 @@ force = 5 attachable_allowed = list( /obj/item/attachable/suppressor, + /obj/item/attachable/suppressor/sleek, + /obj/item/attachable/flashlight/under_barrel, // not like it matters lol /obj/item/attachable/flashlight, ) @@ -583,6 +624,7 @@ force = 15 attachable_allowed = list( /obj/item/attachable/suppressor, // Barrel + /obj/item/attachable/suppressor/sleek, /obj/item/attachable/bayonet, /obj/item/attachable/bayonet/upp_replica, /obj/item/attachable/bayonet/upp, @@ -600,6 +642,7 @@ /obj/item/attachable/heavy_barrel, /obj/item/attachable/compensator, /obj/item/attachable/reddot, // Rail + /obj/item/attachable/reddot/small, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, /obj/item/attachable/magnetic_harness, @@ -608,6 +651,7 @@ /obj/item/attachable/gyro, // Under /obj/item/attachable/lasersight, /obj/item/attachable/burstfire_assembly, + /obj/item/attachable/flashlight/under_barrel, ) /// This weapon needs to be manually racked every time a new magazine is loaded. I tried and failed to touch gun shitcode so this will do. var/manually_slided = FALSE @@ -615,6 +659,7 @@ /obj/item/weapon/gun/pistol/highpower/Initialize(mapload, spawn_empty) . = ..() manually_slided = TRUE + AddElement(/datum/element/corp_label/henjin_garcia) /obj/item/weapon/gun/pistol/highpower/Fire(atom/target, mob/living/user, params, reflex = 0, dual_wield) if(!manually_slided) @@ -674,6 +719,8 @@ starting_attachment_types = list(/obj/item/attachable/suppressor, /obj/item/attachable/lasersight, /obj/item/attachable/reflex) flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_ONE_HAND_WIELDED|GUN_AMMO_COUNTER + + //------------------------------------------------------- //mod88 based off VP70 - Counterpart to M1911, offers burst and capacity ine exchange of low accuracy and damage. @@ -692,12 +739,15 @@ flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_ONE_HAND_WIELDED|GUN_AMMO_COUNTER attachable_allowed = list( /obj/item/attachable/suppressor, + /obj/item/attachable/suppressor/sleek, /obj/item/attachable/extended_barrel, /obj/item/attachable/heavy_barrel, /obj/item/attachable/compensator, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/reflex, /obj/item/attachable/reddot, + /obj/item/attachable/reddot/small, /obj/item/attachable/burstfire_assembly, /obj/item/attachable/lasersight, /obj/item/attachable/flashlight/grip, @@ -705,10 +755,13 @@ /obj/item/attachable/stock/mod88, ) +/obj/item/weapon/gun/pistol/mod88/Initialize() + . = ..() + AddElement(/datum/element/corp_label/wy) + /obj/item/weapon/gun/pistol/mod88/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 27, "muzzle_y" = 21,"rail_x" = 8, "rail_y" = 22, "under_x" = 21, "under_y" = 18, "stock_x" = 18, "stock_y" = 15) - /obj/item/weapon/gun/pistol/mod88/set_gun_config_values() ..() set_fire_delay(FIRE_DELAY_TIER_11) @@ -753,14 +806,19 @@ attachable_allowed = list( /obj/item/attachable/flashlight, /obj/item/attachable/reflex, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/reddot, + /obj/item/attachable/reddot/small, /obj/item/attachable/lasersight, ) +/obj/item/weapon/gun/pistol/es4/Initialize() + . = ..() + AddElement(/datum/element/corp_label/wy) + /obj/item/weapon/gun/pistol/es4/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 27, "muzzle_y" = 21, "rail_x" = 10, "rail_y" = 22, "under_x" = 25, "under_y" = 18, "stock_x" = 18, "stock_y" = 15) - /obj/item/weapon/gun/pistol/es4/set_gun_config_values() ..() fire_delay = FIRE_DELAY_TIER_11 @@ -788,15 +846,22 @@ flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_ONE_HAND_WIELDED|GUN_AMMO_COUNTER attachable_allowed = list( /obj/item/attachable/suppressor, + /obj/item/attachable/suppressor/sleek, /obj/item/attachable/reddot, + /obj/item/attachable/reddot/small, /obj/item/attachable/reflex, - /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight, // look its kinda strange why you would list these as allowed when the vp-78 has an integrated flashlight, but flashlight attachment code does have a warning for this so yknow whatever really + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/compensator, /obj/item/attachable/flashlight/laser_light_combo, /obj/item/attachable/extended_barrel, /obj/item/attachable/heavy_barrel, ) +/obj/item/weapon/gun/pistol/vp78/Initialize() + . = ..() + AddElement(/datum/element/corp_label/wy) + /obj/item/weapon/gun/pistol/vp78/handle_starting_attachment() ..() var/obj/item/attachable/flashlight/laser_light_combo/VP = new(src) @@ -808,7 +873,6 @@ /obj/item/weapon/gun/pistol/vp78/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 29, "muzzle_y" = 22,"rail_x" = 10, "rail_y" = 23, "under_x" = 20, "under_y" = 17, "stock_x" = 18, "stock_y" = 14) - /obj/item/weapon/gun/pistol/vp78/set_gun_config_values() ..() set_fire_delay(FIRE_DELAY_TIER_7) @@ -826,6 +890,48 @@ /obj/item/weapon/gun/pistol/vp78/whiteout starting_attachment_types = list(/obj/item/attachable/heavy_barrel, /obj/item/attachable/reflex) +/obj/item/weapon/gun/pistol/vp78m6 + name = "\improper VP78M6 pistol" + desc = "The VP78M6, often called the 'Mod Six', or just 'Sixes', are enhanced variants of the VP78 combat pistol. Smoother trigger assemblies, formed grips, longer shrouded barrels. These M6's have been modified to have special counterweights in the receivers and under the barrels to resist muzzle climb, allowing for much better handling, so much better, in fact, that holding just one doesn't feel right." + icon = 'icons/obj/items/weapons/guns/guns_by_faction/USCM/pistols.dmi' + icon_state = "vp78m6" + item_state = "vp78m6" + + fire_sound = 'sound/weapons/gun_vp78m6_fire.ogg' // yes we are normalized bro -8db :D + reload_sound = 'sound/weapons/gun_vp78_reload.ogg' + unload_sound = 'sound/weapons/gun_vp78_unload.ogg' + current_mag = /obj/item/ammo_magazine/pistol/vp78 + force = 8 + flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_ONE_HAND_WIELDED|GUN_AMMO_COUNTER + attachable_allowed = list( + /obj/item/attachable/suppressor, + /obj/item/attachable/suppressor/sleek, + /obj/item/attachable/reddot, + /obj/item/attachable/reddot/small, + /obj/item/attachable/reflex, + /obj/item/attachable/flashlight, + /obj/item/attachable/lasersight, + /obj/item/attachable/compensator, + /obj/item/attachable/extended_barrel, + ) + +/obj/item/weapon/gun/pistol/vp78m6/set_gun_attachment_offsets() + attachable_offset = list("muzzle_x" = 29, "muzzle_y" = 22,"rail_x" = 10, "rail_y" = 23, "under_x" = 20, "under_y" = 17, "stock_x" = 18, "stock_y" = 14) + +/obj/item/weapon/gun/pistol/vp78m6/set_gun_config_values() + ..() + set_fire_delay(FIRE_DELAY_TIER_7) + set_burst_amount(BURST_AMOUNT_TIER_3) + set_burst_delay(FIRE_DELAY_TIER_11) + accuracy_mult = BASE_ACCURACY_MULT + accuracy_mult_unwielded = BASE_ACCURACY_MULT + scatter = SCATTER_AMOUNT_TIER_6 + burst_scatter_mult = SCATTER_AMOUNT_TIER_6 + scatter_unwielded = SCATTER_AMOUNT_TIER_2 + damage_mult = BASE_BULLET_DAMAGE_MULT + recoil = RECOIL_AMOUNT_TIER_5 + recoil_unwielded = RECOIL_AMOUNT_TIER_5 + //------------------------------------------------------- /* @@ -949,14 +1055,17 @@ It is a modified Beretta 93R, and can fire three-round burst or single fire. Whe flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_ONE_HAND_WIELDED attachable_allowed = list( /obj/item/attachable/reddot, //Rail + /obj/item/attachable/reddot/small, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, /obj/item/attachable/suppressor, //Muzzle + /obj/item/attachable/suppressor/sleek, /obj/item/attachable/compensator, /obj/item/attachable/extended_barrel, /obj/item/attachable/heavy_barrel, /obj/item/attachable/lasersight, //Underbarrel /obj/item/attachable/burstfire_assembly, + /obj/item/attachable/flashlight/under_barrel, ) start_semiauto = FALSE start_automatic = TRUE @@ -988,41 +1097,52 @@ Unlike other pistols, it can be equipped with limited mods (small muzzle, underb icon_state = "m10" item_state = "m10" attachable_allowed = list( - /obj/item/attachable/reddot, //Rail + /obj/item/attachable/reddot, + /obj/item/attachable/reddot/small, //Rail /obj/item/attachable/reflex, /obj/item/attachable/flashlight, /obj/item/attachable/magnetic_harness, /obj/item/attachable/suppressor, //Muzzle - /obj/item/attachable/compensator, + /obj/item/attachable/suppressor/sleek, + /obj/item/attachable/compensator/m10, // Special M10 compensator + /obj/item/attachable/compensator/m10/spiked, // Special M10 compensator - Melee version /obj/item/attachable/extended_barrel, + /obj/item/attachable/extended_barrel/vented, /obj/item/attachable/heavy_barrel, - /obj/item/attachable/lasersight, //Underbarrel + /obj/item/attachable/stock/pistol/collapsible, //Stock + /obj/item/attachable/stock/m10_solid, + /obj/item/attachable/lasersight/micro, //Underbarrel + /obj/item/attachable/flashlight/under_barrel, ) flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_ONE_HAND_WIELDED|GUN_AMMO_COUNTER start_automatic = TRUE map_specific_decoration = TRUE - fire_sound = 'sound/weapons/gun_m10_auto_pistol.ogg' - reload_sound = 'sound/weapons/handling/smg_reload.ogg' - unload_sound = 'sound/weapons/handling/smg_unload.ogg' + fire_sound = null + fire_sounds = list('sound/weapons/gun_m10_auto_pistol.ogg', 'sound/weapons/gun_m10_auto_pistol2.ogg') + reload_sound = 'sound/weapons/handling/gun_m10_auto_pistol_reload.ogg' + unload_sound = 'sound/weapons/handling/gun_m10_auto_pistol_unload.ogg' current_mag = /obj/item/ammo_magazine/pistol/m10 +/obj/item/weapon/gun/pistol/m10/Initialize() + . = ..() + AddElement(/datum/element/corp_label/armat) + /obj/item/weapon/gun/pistol/m10/set_gun_attachment_offsets() - attachable_offset = list("muzzle_x" = 26, "muzzle_y" = 19,"rail_x" = 11, "rail_y" = 20, "under_x" = 21, "under_y" = 16, "stock_x" = 18, "stock_y" = 14) + attachable_offset = list("muzzle_x" = 25, "muzzle_y" = 19,"rail_x" = 11, "rail_y" = 21, "under_x" = 18, "under_y" = 15, "stock_x" = 25, "stock_y" = 17) /obj/item/weapon/gun/pistol/m10/set_gun_config_values() ..() set_burst_amount(0) - fa_scatter_peak = FULL_AUTO_SCATTER_PEAK_TIER_5 - fa_max_scatter = SCATTER_AMOUNT_TIER_3 set_fire_delay(FIRE_DELAY_TIER_12) + fa_scatter_peak = FULL_AUTO_SCATTER_PEAK_TIER_4 + fa_max_scatter = SCATTER_AMOUNT_TIER_7 accuracy_mult = BASE_ACCURACY_MULT - accuracy_mult_unwielded = BASE_ACCURACY_MULT - scatter = SCATTER_AMOUNT_TIER_4 - scatter_unwielded = SCATTER_AMOUNT_TIER_3 - damage_mult = BASE_BULLET_DAMAGE_MULT - BULLET_DAMAGE_MULT_TIER_7 - recoil = RECOIL_AMOUNT_TIER_5 - recoil_unwielded = RECOIL_AMOUNT_TIER_4 + accuracy_mult_unwielded = BASE_ACCURACY_MULT - HIT_ACCURACY_MULT_TIER_4 + scatter = SCATTER_AMOUNT_TIER_5 + scatter_unwielded = SCATTER_AMOUNT_TIER_4 + recoil_unwielded = RECOIL_AMOUNT_TIER_5 + damage_mult = BASE_BULLET_DAMAGE_MULT - BULLET_DAMAGE_MULT_TIER_5 //------------------------------------------------------- /* @@ -1044,9 +1164,12 @@ L54 service pistol flags_gun_features = GUN_CAN_POINTBLANK|GUN_ONE_HAND_WIELDED attachable_allowed = list( /obj/item/attachable/suppressor, + /obj/item/attachable/suppressor/sleek, /obj/item/attachable/reddot, + /obj/item/attachable/reddot/small, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/compensator, /obj/item/attachable/lasersight, /obj/item/attachable/extended_barrel, @@ -1076,8 +1199,10 @@ L54 service pistol current_mag = /obj/item/ammo_magazine/pistol/l54_custom attachable_allowed = list( /obj/item/attachable/reddot, + /obj/item/attachable/reddot/small, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/lasersight, /obj/item/attachable/burstfire_assembly, ) diff --git a/code/modules/projectiles/guns/revolvers.dm b/code/modules/projectiles/guns/revolvers.dm index 9b0b05a054e5..42034d07006d 100644 --- a/code/modules/projectiles/guns/revolvers.dm +++ b/code/modules/projectiles/guns/revolvers.dm @@ -34,6 +34,7 @@ var/trick_delay = 4 SECONDS var/recent_trick //So they're not spamming tricks. var/russian_roulette = 0 //God help you if you do this. + var/trickster_gun = FALSE //If true, allows gun spinning. /obj/item/weapon/gun/revolver/Initialize(mapload, spawn_empty) . = ..() @@ -58,9 +59,12 @@ var/message = "[current_mag.chamber_closed? "It's closed.": "It's open with [current_mag.current_rounds] round\s loaded."]" . += message + if(trickster_gun) + . += SPAN_NOTICE("You feel like tricks with it can be done easily.") + /obj/item/weapon/gun/revolver/display_ammo(mob/user) // revolvers don't *really* have a chamber, at least in a way that matters for ammo displaying if(flags_gun_features & GUN_AMMO_COUNTER && !(flags_gun_features & GUN_BURST_FIRING) && current_mag) - to_chat(user, SPAN_DANGER("[current_mag.current_rounds] / [current_mag.max_rounds] ROUNDS REMAINING")) + to_chat(user, SPAN_DANGER("[current_mag.current_rounds] / [current_mag.max_rounds] ROUNDS REMAINING.")) /obj/item/weapon/gun/revolver/proc/rotate_cylinder(mob/user) //Cylinder moves backward. if(current_mag) @@ -73,6 +77,14 @@ playsound(user, cocked_sound, 25, 1) russian_roulette = TRUE //Sets to play RR. Resets when the gun is emptied. +/obj/item/weapon/gun/revolver/proc/perform_tricks(mob/user) + var/result = revolver_trick(user) + if(result) + to_chat(user, SPAN_NOTICE("Your badass trick inspires you. Your next few shots will be focused!")) + accuracy_mult = BASE_ACCURACY_MULT * 2 + accuracy_mult_unwielded = BASE_ACCURACY_MULT * 2 + addtimer(CALLBACK(src, PROC_REF(recalculate_attachment_bonuses)), 3 SECONDS) + /obj/item/weapon/gun/revolver/proc/replace_cylinder(number_to_replace) if(current_mag) current_mag.chamber_contents = list() @@ -200,9 +212,23 @@ current_mag.current_rounds++ return TRUE -// FLUFF +// FLUFF kinda +/obj/item/weapon/gun/revolver/proc/close_chamber(mob/user) + if(current_mag && !current_mag.chamber_closed) + current_mag.chamber_closed = TRUE + to_chat(user, SPAN_NOTICE("You close the cylinder of [src].")) + playsound(user, chamber_close_sound, 25, 1) + update_icon() + /obj/item/weapon/gun/revolver/unique_action(mob/user) - spin_cylinder(user) + if(current_mag && !current_mag.chamber_closed) + close_chamber(user) + return + if(trickster_gun && user.a_intent == INTENT_DISARM) + perform_tricks(user) + return + else + spin_cylinder(user) /obj/item/weapon/gun/revolver/proc/revolver_basic_spin(mob/living/carbon/human/user, direction = 1, obj/item/weapon/gun/revolver/double) set waitfor = 0 @@ -327,10 +353,13 @@ /obj/item/attachable/bayonet/rmc_replica, /obj/item/attachable/bayonet/rmc, /obj/item/attachable/reddot, + /obj/item/attachable/reddot/small, /obj/item/attachable/reflex, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/flashlight, /obj/item/attachable/heavy_barrel, /obj/item/attachable/extended_barrel, + /obj/item/attachable/extended_barrel/vented, /obj/item/attachable/compensator, /obj/item/attachable/stock/revolver, /obj/item/attachable/scope, @@ -340,8 +369,12 @@ ) var/folded = FALSE // Used for the stock attachment, to check if we can shoot or not +/obj/item/weapon/gun/revolver/m44/Initialize() + . = ..() + AddElement(/datum/element/corp_label/armat) + /obj/item/weapon/gun/revolver/m44/set_gun_attachment_offsets() - attachable_offset = list("muzzle_x" = 29, "muzzle_y" = 21,"rail_x" = 12, "rail_y" = 23, "under_x" = 21, "under_y" = 16, "stock_x" = 16, "stock_y" = 20) + attachable_offset = list("muzzle_x" = 29, "muzzle_y" = 21, "rail_x" = 12, "rail_y" = 23, "under_x" = 21, "under_y" = 16, "stock_x" = 16, "stock_y" = 20) /obj/item/weapon/gun/revolver/m44/set_gun_config_values() ..() @@ -393,6 +426,7 @@ attachable_allowed = list( /obj/item/attachable/flashlight, /obj/item/attachable/lasersight, + /obj/item/attachable/flashlight/under_barrel, ) item_icons = list( @@ -403,7 +437,7 @@ ) /obj/item/weapon/gun/revolver/m44/custom/pkd_special/set_gun_attachment_offsets() - attachable_offset = list("muzzle_x" = 29, "muzzle_y" = 22,"rail_x" = 11, "rail_y" = 25, "under_x" = 20, "under_y" = 18, "stock_x" = 20, "stock_y" = 18) + attachable_offset = list("muzzle_x" = 29, "muzzle_y" = 22, "rail_x" = 11, "rail_y" = 25, "under_x" = 20, "under_y" = 18, "stock_x" = 20, "stock_y" = 18) /obj/item/weapon/gun/revolver/m44/custom/pkd_special/set_gun_config_values() ..() @@ -413,14 +447,16 @@ /obj/item/weapon/gun/revolver/m44/custom/pkd_special/k2049 name = "\improper M2049 Blaster" - desc = "In service since 2049, the LAPD 2049 .44 special has been used to retire more replicants than there are colonists in the American Corridor. The top mounted picatinny rail allows this revised version to mount a wide variety of optics for the aspiring detective. Although replicants aren't permitted past the outer core systems, this piece occasionally finds its way to the rim in the hand of defects, collectors, and thieves." + desc = "In service since 2049, the LAPD 2049 .44 special has been used to retire more replicants than there are colonists in the American Corridor. The top mounted attachment rail allows this revised version to mount a wide variety of optics for the aspiring detective. Although replicants aren't permitted past the outer core systems, this piece occasionally finds its way to the rim in the hand of defects, collectors, and thieves." icon_state = "lapd_2049" item_state = "m4a3c" //placeholder attachable_allowed = list( /obj/item/attachable/flashlight, /obj/item/attachable/lasersight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/reddot, + /obj/item/attachable/reddot/small, /obj/item/attachable/reflex, /obj/item/attachable/scope, /obj/item/attachable/scope/mini, @@ -428,7 +464,7 @@ ) /obj/item/weapon/gun/revolver/m44/custom/pkd_special/k2049/set_gun_attachment_offsets() - attachable_offset = list("muzzle_x" = 29, "muzzle_y" = 22,"rail_x" = 11, "rail_y" = 25, "under_x" = 20, "under_y" = 18, "stock_x" = 20, "stock_y" = 18) + attachable_offset = list("muzzle_x" = 29, "muzzle_y" = 22, "rail_x" = 11, "rail_y" = 25, "under_x" = 20, "under_y" = 18, "stock_x" = 20, "stock_y" = 18) /obj/item/weapon/gun/revolver/m44/custom/pkd_special/l_series name = "\improper PKL 'Double' Blaster" @@ -439,10 +475,11 @@ attachable_allowed = list( /obj/item/attachable/flashlight, /obj/item/attachable/lasersight, + /obj/item/attachable/flashlight/under_barrel, ) /obj/item/weapon/gun/revolver/m44/custom/pkd_special/l_series/set_gun_attachment_offsets() - attachable_offset = list("muzzle_x" = 29, "muzzle_y" = 22,"rail_x" = 11, "rail_y" = 25, "under_x" = 20, "under_y" = 18, "stock_x" = 20, "stock_y" = 18) + attachable_offset = list("muzzle_x" = 29, "muzzle_y" = 22, "rail_x" = 11, "rail_y" = 25, "under_x" = 20, "under_y" = 18, "stock_x" = 20, "stock_y" = 18) /obj/item/weapon/gun/revolver/m44/custom/pkd_special/l_series/set_gun_config_values() ..() @@ -493,7 +530,7 @@ icon_state = "zhnk72" item_state = "zhnk72" - fire_sound = "gun_pkd" //sounds stolen from bladerunner revolvers bc they arent used and sound awesome + fire_sound = "gun_pkd" //sounds stolen from bladerunner revolvers bc they aren't used and sound awesome fire_rattle = 'sound/weapons/gun_pkd_fire01_rattle.ogg' reload_sound = 'sound/weapons/handling/pkd_speed_load.ogg' cocked_sound = 'sound/weapons/handling/pkd_cock.wav' @@ -504,6 +541,7 @@ force = 8 attachable_allowed = list( /obj/item/attachable/reddot, // Rail + /obj/item/attachable/reddot/small, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, /obj/item/attachable/scope, @@ -512,11 +550,17 @@ /obj/item/attachable/bayonet/upp, /obj/item/attachable/heavy_barrel, /obj/item/attachable/extended_barrel, + /obj/item/attachable/extended_barrel/vented, /obj/item/attachable/lasersight, // Underbarrel + /obj/item/attachable/flashlight/under_barrel, ) +/obj/item/weapon/gun/revolver/upp/Initialize() + . = ..() + AddElement(/datum/element/corp_label/norcomm) + /obj/item/weapon/gun/revolver/upp/set_gun_attachment_offsets() - attachable_offset = list("muzzle_x" = 28, "muzzle_y" = 21,"rail_x" = 14, "rail_y" = 23, "under_x" = 19, "under_y" = 17, "stock_x" = 24, "stock_y" = 19) + attachable_offset = list("muzzle_x" = 28, "muzzle_y" = 21, "rail_x" = 14, "rail_y" = 23, "under_x" = 19, "under_y" = 17, "stock_x" = 24, "stock_y" = 19) /obj/item/weapon/gun/revolver/upp/set_gun_config_values() ..() @@ -548,14 +592,11 @@ fire_sound = 'sound/weapons/gun_44mag2.ogg' current_mag = /obj/item/ammo_magazine/internal/revolver/small force = 6 - flags_gun_features = GUN_ANTIQUE|GUN_ONE_HAND_WIELDED|GUN_CAN_POINTBLANK + flags_gun_features = GUN_ANTIQUE|GUN_ONE_HAND_WIELDED|GUN_CAN_POINTBLANK|GUN_INTERNAL_MAG + trickster_gun = TRUE /obj/item/weapon/gun/revolver/small/set_gun_attachment_offsets() - attachable_offset = list("muzzle_x" = 30, "muzzle_y" = 19,"rail_x" = 12, "rail_y" = 21, "under_x" = 20, "under_y" = 15, "stock_x" = 20, "stock_y" = 15) - -/obj/item/weapon/gun/revolver/small/get_examine_text(mob/user) - . = ..() - . += SPAN_NOTICE("You feel like tricks with it can be done easily.") + attachable_offset = list("muzzle_x" = 30, "muzzle_y" = 19, "rail_x" = 12, "rail_y" = 21, "under_x" = 20, "under_y" = 15, "stock_x" = 20, "stock_y" = 15) /obj/item/weapon/gun/revolver/small/set_gun_config_values() ..() @@ -567,14 +608,6 @@ recoil = 0 recoil_unwielded = 0 -/obj/item/weapon/gun/revolver/small/unique_action(mob/user) - var/result = revolver_trick(user) - if(result) - to_chat(user, SPAN_NOTICE("Your badass trick inspires you. Your next few shots will be focused!")) - accuracy_mult = BASE_ACCURACY_MULT * 2 - accuracy_mult_unwielded = BASE_ACCURACY_MULT * 2 - addtimer(CALLBACK(src, PROC_REF(recalculate_attachment_bonuses)), 3 SECONDS) - /obj/item/weapon/gun/revolver/small/black name = "\improper S&W .38 model 37 Custom revolver" desc = "A Custom, lean .38 made by Smith & Wesson. A timeless classic, from antiquity to the future. This specific model, with its sleek black body and custom ivory grips, is known to be wildly inaccurate, yet extremely lethal." @@ -582,11 +615,11 @@ item_state = "black_sw357" //------------------------------------------------------- -//BURST REVOLVER //Mateba is pretty well known. The cylinder folds up instead of to the side. +//BURST REVOLVER //Mateba(Unica) is pretty well known. The cylinder folds up instead of to the side. /obj/item/weapon/mateba_key - name = "mateba barrel key" - desc = "Used to swap the barrels of a mateba revolver." + name = "Unica barrel key" + desc = "Used to swap the barrels of a unica revolver." icon = 'icons/obj/items/tools.dmi' icon_state = "matebakey" flags_atom = FPRINT|QUICK_DRAWABLE|CONDUCT @@ -598,8 +631,13 @@ attack_verb = list("stabbed") /obj/item/weapon/gun/revolver/mateba - name = "\improper Mateba autorevolver" - desc = "The Mateba is a powerful, fast-firing revolver that uses its own recoil to rotate the cylinders. It fires heavy .454 rounds." + name = "\improper Spearhead Unica 6 autorevolver" + desc = "The Spearhead Unica is a powerful, fast-firing revolver that uses its own recoil to rotate the cylinders. It fires heavy .454 rounds." + desc_lore = "Originally an Italian design, during the middle 21st century, Mateba company had many severe financial issues as well as violation of local firearm laws. \ + After numerous court cases, they went bankrupt and few years later, Spearhead Armaments acquired the rights to the Mateba designs, and re-introduced the Unica 6 as the 'Spearhead Unica', \ + as well as many other Mateba revolvers. The new design featured a few changes, like rechambered variation for .454 rounds, attachment rail and other attachments support, but overall, design intentionally remained the same, \ + due to the iconic status in pop culture and high demand for the authentic piece. The gun is produced in limited numbers and is considered a luxury firearm, often seen in the hands of high-ranking officers, mercenaries and wealthy collectors, \ + usually comes with authentic wooden grips, engravings, or gold plating finish." icon = 'icons/obj/items/weapons/guns/guns_by_faction/USCM/revolvers.dmi' icon_state = "mateba" item_state = "mateba" @@ -609,8 +647,10 @@ force = 15 attachable_allowed = list( /obj/item/attachable/reddot, + /obj/item/attachable/reddot/small, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/heavy_barrel, /obj/item/attachable/compensator, /obj/item/attachable/mateba, @@ -624,6 +664,10 @@ var/is_locked = TRUE var/can_change_barrel = TRUE +/obj/item/weapon/gun/revolver/mateba/Initialize() + . = ..() + AddElement(/datum/element/corp_label/spearhead) + /obj/item/weapon/gun/revolver/mateba/attackby(obj/item/I, mob/user) if(istype(I, /obj/item/weapon/mateba_key) && can_change_barrel) if(attachments["special"]) @@ -676,16 +720,21 @@ /obj/item/weapon/gun/revolver/mateba/pmc current_mag = /obj/item/ammo_magazine/internal/revolver/mateba/ap +/obj/item/weapon/gun/revolver/mateba/impact + current_mag = /obj/item/ammo_magazine/internal/revolver/mateba/impact + /obj/item/weapon/gun/revolver/mateba/general - name = "\improper golden Mateba autorevolver custom" - desc = "Boasting a gold-plated frame and grips made of a critically-endangered rosewood tree, this heavily-customized Mateba revolver's pretentious design rivals only the power of its wielder. Fit for a king. Or a general." + name = "\improper golden Spearhead Unica-6 autorevolver custom" + desc = "Boasting a gold-plated frame and grips made of a critically-endangered rosewood tree, this heavily-customized Unica 6 autorevolver's pretentious design rivals only the power of its wielder. Fit for a king. Or a general." icon_state = "amateba" item_state = "amateba" current_mag = /obj/item/ammo_magazine/internal/revolver/mateba/impact attachable_allowed = list( /obj/item/attachable/reddot, + /obj/item/attachable/reddot/small, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/heavy_barrel, /obj/item/attachable/compensator, /obj/item/attachable/mateba/gold, @@ -703,7 +752,7 @@ /obj/item/weapon/gun/revolver/mateba/general/santa name = "\improper Festeba" - desc = "The Mateba used by SANTA himself. Rumoured to be loaded with explosive ammunition." + desc = "The Unica used by SANTA himself. Rumoured to be loaded with explosive ammunition." icon_state = "amateba" item_state = "amateba" current_mag = /obj/item/ammo_magazine/internal/revolver/mateba/explosive @@ -713,15 +762,15 @@ starting_attachment_types = list(/obj/item/attachable/heavy_barrel) /obj/item/weapon/gun/revolver/mateba/engraved - name = "\improper engraved Mateba autorevolver" - desc = "With a matte black chassis, ebony wooden grips, and gold-trimmed cylinder, this statement of a Mateba is as much a work of art as it is a bringer of death." + name = "\improper engraved Spearhead Unica 6 autorevolver" + desc = "With a matte black chassis, ebony wooden grips, and gold-trimmed cylinder, this statement of a Unica is as much a work of art as it is a bringer of death." icon_state = "aamateba" item_state = "aamateba" current_mag = /obj/item/ammo_magazine/internal/revolver/mateba/impact /obj/item/weapon/gun/revolver/mateba/silver - name = "\improper polished Mateba autorevolver" - desc = "The .454 Mateba 6 Unica autorevolver is a semi-automatic handcannon that uses its own recoil to rotate the cylinders. Extremely rare, prohibitively costly, and unyieldingly powerful, it's found in the hands of a select few high-ranking USCM officials. Stylish, sophisticated, and above all, extremely deadly. This one is finished in a beautiful polished silver." + name = "\improper silver Spearhead Unica 6 autorevolver" + desc = "The .454 Spearhead Unica 6 autorevolver is a semi-automatic handcannon that uses its own recoil to rotate the cylinders. Extremely rare, prohibitively costly, and unyieldingly powerful, it's found in the hands of a select few high-ranking USCM officials. Stylish, sophisticated, and above all, extremely deadly. This one is finished in a beautiful polished silver." icon_state = "smateba" item_state = "smateba" current_mag = /obj/item/ammo_magazine/internal/revolver/mateba/impact @@ -729,6 +778,7 @@ /obj/item/attachable/reddot, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/heavy_barrel, /obj/item/attachable/compensator, /obj/item/attachable/mateba/silver, @@ -738,28 +788,50 @@ starting_attachment_types = list(/obj/item/attachable/mateba/silver) +/obj/item/weapon/gun/revolver/mateba/golden + name = "\improper golden Spearhead Unica 6 autorevolver" + desc = "The .454 Spearhead Unica 6 autorevolver is a semi-automatic handcannon that uses its own recoil to rotate the cylinders. Extremely rare, prohibitively costly, and unyieldingly powerful, it's found in the hands of a select few high-ranking USCM officials. Stylish, sophisticated, and above all, extremely deadly. This one is finished in a beautiful polished silver." + icon_state = "amateba" + item_state = "amateba" + current_mag = /obj/item/ammo_magazine/internal/revolver/mateba/impact + attachable_allowed = list( + /obj/item/attachable/reddot, + /obj/item/attachable/reflex, + /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, + /obj/item/attachable/heavy_barrel, + /obj/item/attachable/compensator, + /obj/item/attachable/mateba/gold, + /obj/item/attachable/mateba/long/gold, + /obj/item/attachable/mateba/short/gold, + ) + + starting_attachment_types = list(/obj/item/attachable/mateba/gold) + /obj/item/weapon/gun/revolver/mateba/engraved/tactical current_mag = /obj/item/ammo_magazine/internal/revolver/mateba starting_attachment_types = list(/obj/item/attachable/mateba, /obj/item/attachable/compensator, /obj/item/attachable/reflex) /obj/item/weapon/gun/revolver/mateba/cmateba - name = "\improper Mateba autorevolver custom" - desc = "The .454 Mateba 6 Unica autorevolver is a semi-automatic handcannon that uses its own recoil to rotate the cylinders. Extremely rare, prohibitively costly, and unyieldingly powerful, it's found in the hands of a select few high-ranking USCM officials. Stylish, sophisticated, and above all, extremely deadly." + name = "custom Spearhead Unica 6 autorevolver" + desc = "The .454 Spearhead Unica 6 autorevolver is a semi-automatic handcannon that uses its own recoil to rotate the cylinders. Extremely rare, prohibitively costly, and unyieldingly powerful, it's found in the hands of a select few high-ranking USCM officials. Stylish, sophisticated, and above all, extremely deadly." icon_state = "cmateba" item_state = "cmateba" current_mag = /obj/item/ammo_magazine/internal/revolver/mateba/impact map_specific_decoration = TRUE /obj/item/weapon/gun/revolver/mateba/special - name = "\improper Mateba autorevolver special" - desc = "An old, heavily modified version of the Mateba Autorevolver. It sports a smooth wooden grip, and a much larger barrel to it's unmodified counterpart. It's clear that this weapon has been cared for over a long period of time." + name = "special Spearhead Unica 6 autorevolver" + desc = "An old, heavily modified version of the Spearhead Unica 6 autorevolver. It sports a smooth wooden grip, and a much larger barrel to it's unmodified counterpart. It's clear that this weapon has been cared for over a long period of time." icon_state = "cmateba_special" item_state = "cmateba_special" current_mag = /obj/item/ammo_magazine/internal/revolver/mateba/impact attachable_allowed = list( /obj/item/attachable/reddot, + /obj/item/attachable/reddot/small, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/heavy_barrel, /obj/item/attachable/compensator, ) @@ -771,13 +843,59 @@ accuracy_mult = BASE_ACCURACY_MULT + HIT_ACCURACY_MULT_TIER_4 /obj/item/weapon/gun/revolver/mateba/special/set_gun_attachment_offsets() - attachable_offset = list("muzzle_x" = 30, "muzzle_y" = 23,"rail_x" = 9, "rail_y" = 24, "under_x" = 19, "under_y" = 17, "stock_x" = 19, "stock_y" = 17, "special_x" = 23, "special_y" = 22) + attachable_offset = list("muzzle_x" = 30, "muzzle_y" = 23, "rail_x" = 9, "rail_y" = 25, "under_x" = 19, "under_y" = 17, "stock_x" = 19, "stock_y" = 17, "special_x" = 23, "special_y" = 22) + +/obj/item/weapon/gun/revolver/mateba/mtr6m + name = "\improper Spearhead 2006M autorevolver" + desc = "The Spearhead 2006M is a powerful, fast-firing revolver that uses its own recoil to rotate the cylinders. It fires heavy .454 rounds. It is compatible with more commonly found Unica 6 speedloaders." + desc_lore = "Originally an Italian design, during the middle 21st century, Mateba company had many severe financial issues as well as violation of local firearm laws. \ + After numerous court cases, they went bankrupt and few years later, Spearhead Armaments acquired the rights to the Mateba designs, and re-introduced the 2006M as the 'Spearhead 2006M', \ + as well as many other Mateba revolvers. The new design featured a few changes, like rechambered variation for .454 rounds, attachment rail and other attachments support, but overall, design intentionally remained the same, \ + due to the iconic status in pop culture and high demand for the authentic piece. The gun is produced in limited numbers and is considered a luxury firearm, often seen in the hands of high-ranking officers, mercenaries and wealthy collectors, \ + usually comes with authentic wooden grips, engravings, or gold plating finish." + icon_state = "mateba_2006m" + item_state = "mateba_2006m" + current_mag = /obj/item/ammo_magazine/internal/revolver/mateba/impact + fire_sound = 'sound/weapons/gun_mateba_2006m.ogg' + chamber_close_sound = 'sound/weapons/gun_mateba_2006m_close_chamber.ogg' + unload_sound = 'sound/weapons/gun_mateba_2006m_open_chamber.ogg' + reload_sound = 'sound/weapons/gun_mateba_2006m_load.ogg' + attachable_allowed = list( + /obj/item/attachable/reddot, + /obj/item/attachable/reddot/small, + /obj/item/attachable/reflex, + /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, + /obj/item/attachable/heavy_barrel, + /obj/item/attachable/compensator, + ) + starting_attachment_types = list() + can_change_barrel = FALSE + trickster_gun = TRUE + +/obj/item/weapon/gun/revolver/mateba/mtr6m/set_gun_attachment_offsets() + attachable_offset = list("muzzle_x" = 29, "muzzle_y" = 23, "rail_x" = 19, "rail_y" = 23, "under_x" = 19, "under_y" = 17, "stock_x" = 19, "stock_y" = 17, "special_x" = 23, "special_y" = 22) + +/obj/item/weapon/gun/revolver/mateba/mtr6m/golden + name = "\improper golden Spearhead 2006M autorevolver" + icon_state = "gmateba_2006m" + item_state = "gmateba_2006m" + +/obj/item/weapon/gun/revolver/mateba/mtr6m/golden/black_handle + icon_state = "bgmateba_2006m" + item_state = "bgmateba_2006m" + +/obj/item/weapon/gun/revolver/mateba/mtr6m/silver + name = "\improper silver Spearhead 2006M autorevolver" + icon_state = "smateba_2006m" + item_state = "smateba_2006m" + //------------------------------------------------------- //MARSHALS REVOLVER //Spearhead exists in Alien cannon. /obj/item/weapon/gun/revolver/cmb - name = "\improper CMB Spearhead autorevolver" + name = "\improper Spearhead Autorevolver" desc = "An automatic revolver chambered in .357, often loaded with hollowpoint on spaceships to prevent hull damage. Commonly issued to Colonial Marshals." icon = 'icons/obj/items/weapons/guns/guns_by_faction/colony/revolvers.dmi' icon_state = "spearhead" @@ -790,17 +908,25 @@ force = 12 attachable_allowed = list( /obj/item/attachable/suppressor, // Muzzle + /obj/item/attachable/suppressor/sleek, /obj/item/attachable/extended_barrel, + /obj/item/attachable/extended_barrel/vented, /obj/item/attachable/heavy_barrel, /obj/item/attachable/compensator, /obj/item/attachable/reddot, // Rail + /obj/item/attachable/reddot/small, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, /obj/item/attachable/scope/mini, /obj/item/attachable/gyro, // Under /obj/item/attachable/lasersight, + /obj/item/attachable/flashlight/under_barrel, ) +/obj/item/weapon/gun/revolver/cmb/Initialize(mapload) + . = ..() + AddElement(/datum/element/corp_label/spearhead) + /obj/item/weapon/gun/revolver/cmb/click_empty(mob/user) if(user) to_chat(user, SPAN_WARNING("*click*")) @@ -838,18 +964,7 @@ icon_state = "black_spearhead" item_state = "black_spearhead" current_mag = /obj/item/ammo_magazine/internal/revolver/cmb - -/obj/item/weapon/gun/revolver/cmb/custom/get_examine_text(mob/user) - . = ..() - . += SPAN_NOTICE("You feel like tricks with it can be done easily.") - -/obj/item/weapon/gun/revolver/cmb/custom/unique_action(mob/user) - var/result = revolver_trick(user) - if(result) - to_chat(user, SPAN_NOTICE("Your badass trick inspires you. Your next few shots will be focused!")) - accuracy_mult = BASE_ACCURACY_MULT * 2 - accuracy_mult_unwielded = BASE_ACCURACY_MULT * 2 - addtimer(CALLBACK(src, PROC_REF(recalculate_attachment_bonuses)), 3 SECONDS) + trickster_gun = TRUE /obj/item/weapon/gun/revolver/cmb/custom/tactical starting_attachment_types = list(/obj/item/attachable/extended_barrel, /obj/item/attachable/lasersight, /obj/item/attachable/reflex) diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm index 3f42d06dd0f8..debe0e0e78a4 100644 --- a/code/modules/projectiles/guns/rifles.dm +++ b/code/modules/projectiles/guns/rifles.dm @@ -75,8 +75,10 @@ /obj/item/attachable/lasersight, /obj/item/attachable/gyro, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/bipod, /obj/item/attachable/extended_barrel, + /obj/item/attachable/extended_barrel/vented, /obj/item/attachable/heavy_barrel, /obj/item/attachable/magnetic_harness, /obj/item/attachable/stock/rifle, @@ -98,6 +100,12 @@ /obj/item/weapon/gun/rifle/m41a/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 32, "muzzle_y" = 18,"rail_x" = 12, "rail_y" = 23, "under_x" = 24, "under_y" = 13, "stock_x" = 24, "stock_y" = 13) +/obj/item/weapon/gun/rifle/m41a/Initialize(mapload, ...) + . = ..() + if(istype(src, /obj/item/weapon/gun/rifle/m41a/corporate) || istype(src, /obj/item/weapon/gun/rifle/m41a/elite)) + AddElement(/datum/element/corp_label/wy) + else + AddElement(/datum/element/corp_label/armat) /obj/item/weapon/gun/rifle/m41a/set_gun_config_values() ..() @@ -160,8 +168,10 @@ /obj/item/attachable/reddot, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/bipod, /obj/item/attachable/extended_barrel, + /obj/item/attachable/extended_barrel/vented, /obj/item/attachable/attached_gun/flamer, /obj/item/attachable/attached_gun/flamer/advanced, /obj/item/attachable/attached_gun/grenade, @@ -188,6 +198,7 @@ /obj/item/weapon/gun/rifle/nsg23/Initialize(mapload, spawn_empty) . = ..() update_icon() + AddElement(/datum/element/corp_label/wy) /obj/item/weapon/gun/rifle/nsg23/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 37, "muzzle_y" = 16, "rail_x" = 12,"rail_y" = 22, "under_x" = 26, "under_y" = 10, "stock_x" = 5, "stock_y" = 17) @@ -258,6 +269,7 @@ /obj/item/attachable/attached_gun/shotgun, /obj/item/attachable/lasersight, /obj/item/attachable/attached_gun/flamer/advanced, + /obj/item/attachable/flashlight/under_barrel, ) random_spawn_muzzle = list( /obj/item/attachable/suppressor, @@ -451,9 +463,12 @@ starting_attachment_types = list(/obj/item/attachable/attached_gun/grenade/mk1, /obj/item/attachable/stock/rifle/collapsible) start_automatic = TRUE -/obj/item/weapon/gun/rifle/m41aMK1/set_gun_attachment_offsets() - attachable_offset = list("muzzle_x" = 32, "muzzle_y" = 18,"rail_x" = 12, "rail_y" = 23, "under_x" = 23, "under_y" = 13, "stock_x" = 24, "stock_y" = 14) +/obj/item/weapon/gun/rifle/m41aMK1/Initialize() + . = ..() + AddElement(/datum/element/corp_label/armat) +/obj/item/weapon/gun/rifle/m41aMK1/set_gun_attachment_offsets() + attachable_offset = list("muzzle_x" = 32, "muzzle_y" = 18, "rail_x" = 12, "rail_y" = 23, "under_x" = 23, "under_y" = 13, "stock_x" = 24, "stock_y" = 14) /obj/item/weapon/gun/rifle/m41aMK1/set_gun_config_values() ..() @@ -476,12 +491,12 @@ current_mag = /obj/item/ammo_magazine/rifle/m41aMK1/ap /obj/item/weapon/gun/rifle/m41aMK1/anchorpoint - desc = "A classic M41 MK1 Pulse Rifle painted in a fresh coat of the classic Humbrol 170 camoflauge. This one appears to be used by the Colonial Marine contingent aboard Anchorpoint Station, and is equipped with an underbarrel shotgun. Uses 10x24mm caseless ammunition." + desc = "A classic M41 MK1 Pulse Rifle painted in a fresh coat of the classic Humbrol 170 camouflage. This one appears to be used by the Colonial Marine contingent aboard Anchorpoint Station, and is equipped with an underbarrel shotgun. Uses 10x24mm caseless ammunition." starting_attachment_types = list(/obj/item/attachable/stock/rifle/collapsible, /obj/item/attachable/attached_gun/shotgun) current_mag = /obj/item/ammo_magazine/rifle/m41aMK1/ap /obj/item/weapon/gun/rifle/m41aMK1/anchorpoint/gl - desc = "A classic M41 MK1 Pulse Rifle painted in a fresh coat of the classic Humbrol 170 camoflauge. This one appears to be used by the Colonial Marine contingent aboard Anchorpoint Station, and is equipped with an underbarrel grenade launcher. Uses 10x24mm caseless ammunition." + desc = "A classic M41 MK1 Pulse Rifle painted in a fresh coat of the classic Humbrol 170 camouflage. This one appears to be used by the Colonial Marine contingent aboard Anchorpoint Station, and is equipped with an underbarrel grenade launcher. Uses 10x24mm caseless ammunition." starting_attachment_types = list(/obj/item/attachable/stock/rifle/collapsible, /obj/item/attachable/attached_gun/grenade/mk1) //---------------------------------------------- @@ -532,7 +547,9 @@ /obj/item/attachable/reddot, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/extended_barrel, + /obj/item/attachable/extended_barrel/vented, /obj/item/attachable/scope/mini, /obj/item/attachable/verticalgrip, /obj/item/attachable/angledgrip, @@ -557,6 +574,7 @@ /obj/item/weapon/gun/rifle/m46c/Initialize(mapload, ...) LAZYADD(actions_types, /datum/action/item_action/m46c/toggle_lethal_mode) . = ..() + AddElement(/datum/element/corp_label/armat) if(iff_enabled) LAZYADD(traits_to_give, list( BULLET_TRAIT_ENTRY_ID("iff", /datum/element/bullet_trait_iff) @@ -734,8 +752,10 @@ /obj/item/attachable/reflex, /obj/item/attachable/gyro, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/bipod, /obj/item/attachable/extended_barrel, + /obj/item/attachable/extended_barrel/vented, /obj/item/attachable/compensator, /obj/item/attachable/burstfire_assembly, /obj/item/attachable/magnetic_harness, @@ -828,8 +848,10 @@ /obj/item/attachable/angledgrip, /obj/item/attachable/lasersight, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/bipod, /obj/item/attachable/extended_barrel, + /obj/item/attachable/extended_barrel/vented, /obj/item/attachable/heavy_barrel, /obj/item/attachable/magnetic_harness, /obj/item/attachable/attached_gun/grenade, @@ -897,6 +919,7 @@ /obj/item/attachable/reddot, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/magnetic_harness, /obj/item/attachable/scope/slavic, ) @@ -907,7 +930,7 @@ /obj/item/attachable/scope/slavic, /obj/item/attachable/magnetic_harness, ) - random_spawn_under = list() //prevents equiping invalid attachments from base + random_spawn_under = list() //prevents equipping invalid attachments from base random_spawn_muzzle = list() flags_gun_features = GUN_CAN_POINTBLANK|GUN_WIELDED_FIRING_ONLY @@ -973,8 +996,10 @@ /obj/item/attachable/flashlight/grip, /obj/item/attachable/gyro, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/bipod, /obj/item/attachable/extended_barrel, + /obj/item/attachable/extended_barrel/vented, /obj/item/attachable/compensator, /obj/item/attachable/burstfire_assembly, /obj/item/attachable/attached_gun/grenade, @@ -1054,8 +1079,10 @@ /obj/item/attachable/flashlight/grip, /obj/item/attachable/gyro, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/bipod, /obj/item/attachable/extended_barrel, + /obj/item/attachable/extended_barrel/vented, /obj/item/attachable/compensator, /obj/item/attachable/burstfire_assembly, /obj/item/attachable/attached_gun/grenade, @@ -1087,7 +1114,7 @@ /obj/item/weapon/gun/rifle/m16/grenadier name = "\improper M16 grenadier rifle" - desc = "An old, reliable design first adopted by the U.S. military in the 1960s. Something like this belongs in a museum of war history. It is chambered in 5.56x45mm. This one has an irremovable M203 grenade launcher attached to it, holds one propriatary 40mm shell at a time, it lacks modern IFF systems and will impact the first target it hits; introduce your little friend." + desc = "An old, reliable design first adopted by the U.S. military in the 1960s. Something like this belongs in a museum of war history. It is chambered in 5.56x45mm. This one has an irremovable M203 grenade launcher attached to it, holds one proprietary 40mm shell at a time, it lacks modern IFF systems and will impact the first target it hits; introduce your little friend." icon_state = "m16g" item_state = "m16" fire_sound = 'sound/weapons/gun_m16.ogg' @@ -1116,6 +1143,7 @@ /obj/item/attachable/reflex, /obj/item/attachable/flashlight, /obj/item/attachable/extended_barrel, + /obj/item/attachable/extended_barrel/vented, /obj/item/attachable/compensator, /obj/item/attachable/attached_gun/grenade/m203, ) @@ -1146,7 +1174,7 @@ /obj/item/weapon/gun/rifle/xm177 name = "\improper XM177E2 carbine" - desc = "An old design, essentially a shortened M16A1 with a collapsable stock. It is chambered in 5.56x45mm. The short length inhibits the attachment of most underbarrel attachments, and the barrel moderator prohibits the attachment of all muzzle devices." + desc = "An old design, essentially a shortened M16A1 with a collapsible stock. It is chambered in 5.56x45mm. The short length inhibits the attachment of most underbarrel attachments, and the barrel moderator prohibits the attachment of all muzzle devices." desc_lore = "A carbine similar to the M16A1, with a collapsible stock and a distinct flash suppressor. A stamp on the receiver reads: 'COLT AR-15 - PROPERTY OF U.S. GOVT - XM177E2 - CAL 5.56MM' \nA design originating from the Vietnam War, the XM177, also known as the Colt Commando or GAU-5/A, was an improvement on the CAR-15 Model 607, fixing multiple issues found with the limited service of the Model 607 with Special Forces. The XM177 saw primary use with Army Special Forces and Navy Seals operating as commandos. \nHow this got here is a mystery." icon = 'icons/obj/items/weapons/guns/guns_by_faction/colony/assault_rifles.dmi' icon_state = "xm177" @@ -1183,6 +1211,7 @@ random_spawn_under = list( /obj/item/attachable/verticalgrip, /obj/item/attachable/lasersight, + /obj/item/attachable/flashlight/under_barrel, ) starting_attachment_types = list(/obj/item/attachable/stock/xm177) @@ -1216,6 +1245,7 @@ /obj/item/attachable/scope/mini, /obj/item/attachable/verticalgrip, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/lasersight, /obj/item/attachable/stock/xm177, /obj/item/attachable/stock/xm177/car15a3, @@ -1240,7 +1270,7 @@ /obj/item/weapon/gun/rifle/ar10 name = "\improper AR10 rifle" desc = "An earlier version of the more widespread M16 rifle. Considered to be the father of the 20th century rifle. How one of these ended up here is a mystery of its own. It is chambered in 7.62x51mm." - desc_lore = "The AR10 was initially manufactured by the Armalite corporation (bought by Weyland-Yutani in 2002) in the 1950s. It was the first production rifle to incorporate many new and innovative features, such as a gas operated bolt and carrier system. Only 10,000 were ever produced, and the only national entities to use them were Portugal and Sudan. Since the end of the 20th century, these rifles - alongside the far more common M16 and AR15 - have floated around the less civillised areas of space, littering jungles and colony floors with their uncommon cased ammunition - a rarity since the introduction of pulse munitions. This rifle has the word \"Salazar\" engraved on its side." + desc_lore = "The AR10 was initially manufactured by the Armalite corporation (bought by Weyland-Yutani in 2002) in the 1950s. It was the first production rifle to incorporate many new and innovative features, such as a gas operated bolt and carrier system. Only 10,000 were ever produced, and the only national entities to use them were Portugal and Sudan. Since the end of the 20th century, these rifles - alongside the far more common M16 and AR15 - have floated around the less civilized areas of space, littering jungles and colony floors with their uncommon cased ammunition - a rarity since the introduction of pulse munitions. This rifle has the word \"Salazar\" engraved on its side." icon = 'icons/obj/items/weapons/guns/guns_by_faction/colony/assault_rifles.dmi' icon_state = "ar10" item_state = "ar10" @@ -1272,8 +1302,10 @@ /obj/item/attachable/angledgrip, /obj/item/attachable/flashlight/grip, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/bipod, /obj/item/attachable/extended_barrel, + /obj/item/attachable/extended_barrel/vented, /obj/item/attachable/compensator, ) random_spawn_chance = 10 @@ -1346,7 +1378,7 @@ /obj/item/weapon/gun/rifle/m16/grenadier/dutch name = "\improper Dutch's Grenadier M16A1" - desc = "A modified M16 employed by Dutch's Dozen mercenaries. It has 'CLOAKER KILLER' printed on a label on the side. It is chambered in 5.56x45mm. This one has an irremovable M203 grenade launcher attached to it, holds one propriatary 40mm shell at a time, it lacks modern IFF systems and will impact the first target it hits; introduce your little friend." + desc = "A modified M16 employed by Dutch's Dozen mercenaries. It has 'CLOAKER KILLER' printed on a label on the side. It is chambered in 5.56x45mm. This one has an irremovable M203 grenade launcher attached to it, holds one proprietary 40mm shell at a time, it lacks modern IFF systems and will impact the first target it hits; introduce your little friend." current_mag = /obj/item/ammo_magazine/rifle/m16/ap starting_attachment_types = list(/obj/item/attachable/scope/mini, /obj/item/attachable/bayonet) @@ -1407,8 +1439,10 @@ /obj/item/attachable/angledgrip, /obj/item/attachable/flashlight/grip, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/bipod, /obj/item/attachable/heavy_barrel, + /obj/item/attachable/extended_barrel/vented, /obj/item/attachable/compensator, /obj/item/attachable/burstfire_assembly, /obj/item/attachable/magnetic_harness, @@ -1427,6 +1461,10 @@ gun_category = GUN_CATEGORY_HEAVY start_automatic = TRUE +/obj/item/weapon/gun/rifle/lmg/Initialize() + . = ..() + AddElement(/datum/element/corp_label/armat) + /obj/item/weapon/gun/rifle/lmg/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 34, "muzzle_y" = 19, "rail_x" = 12, "rail_y" = 23, "under_x" = 27, "under_y" = 13, "stock_x" = 14, "stock_y" = 15) @@ -1495,8 +1533,10 @@ /obj/item/attachable/bayonet/rmc_replica, /obj/item/attachable/bayonet/rmc, /obj/item/attachable/extended_barrel, + /obj/item/attachable/extended_barrel/vented, /obj/item/attachable/heavy_barrel, /obj/item/attachable/verticalgrip, // Underbarrel + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/flashlight/grip, /obj/item/attachable/lasersight, /obj/item/attachable/burstfire_assembly, @@ -1509,6 +1549,10 @@ flags_equip_slot = SLOT_BACK start_automatic = TRUE +/obj/item/weapon/gun/rifle/type71/Initialize() + . = ..() + AddElement(/datum/element/corp_label/norcomm) + /obj/item/weapon/gun/rifle/type71/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 39, "muzzle_y" = 17, "rail_x" = 16, "rail_y" = 23, "under_x" = 26, "under_y" = 13, "stock_x" = 11, "stock_y" = 13) @@ -1580,7 +1624,7 @@ /obj/item/weapon/gun/rifle/type71/flamer name = "\improper Type 71-F pulse rifle" - desc = " This appears to be a less common variant of the Type 71 with an integrated flamethrower that seems especially powerful." + desc = "This appears to be a less common variant of the Type 71 with an integrated flamethrower that seems especially powerful." attachable_allowed = list( /obj/item/attachable/flashlight, // Rail /obj/item/attachable/magnetic_harness, @@ -1603,6 +1647,7 @@ /obj/item/attachable/bayonet/rmc_replica, /obj/item/attachable/bayonet/rmc, /obj/item/attachable/extended_barrel, + /obj/item/attachable/extended_barrel/vented, /obj/item/attachable/heavy_barrel, ) @@ -1662,8 +1707,10 @@ /obj/item/attachable/bayonet/rmc_replica, /obj/item/attachable/bayonet/rmc, /obj/item/attachable/extended_barrel, + /obj/item/attachable/extended_barrel/vented, /obj/item/attachable/heavy_barrel, /obj/item/attachable/verticalgrip, // Underbarrel + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/burstfire_assembly, /obj/item/attachable/attached_gun/extinguisher, ) @@ -1776,8 +1823,10 @@ /obj/item/attachable/lasersight, /obj/item/attachable/gyro, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/bipod, /obj/item/attachable/extended_barrel, + /obj/item/attachable/extended_barrel/vented, /obj/item/attachable/heavy_barrel, /obj/item/attachable/magnetic_harness, /obj/item/attachable/stock/rifle/collapsible/ak4047, @@ -1798,6 +1847,10 @@ pixel_x = -6 hud_offset = -6 +/obj/item/weapon/gun/rifle/ak4047/Initialize() + . = ..() + AddElement(/datum/element/corp_label/norcomm) + /obj/item/weapon/gun/rifle/ak4047/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 38, "muzzle_y" = 18,"rail_x" = 20, "rail_y" = 23, "under_x" = 24, "under_y" = 13, "stock_x" = 11, "stock_y" = 13, "special_x" = 33, "special_y" = 17) @@ -1824,7 +1877,7 @@ /obj/item/weapon/gun/rifle/m4ra name = "\improper M4RA battle rifle" - desc = "The M4RA battle rifle is a designated marksman rifle in service with the USCM. Sporting a bullpup configuration, the M4RA battle rifle is perfect for reconnaissance and fire support teams.\nTakes *only* non-high-velocity M4RA magazines." + desc = "The Armat Battlefield Systems M4RA battle rifle is a designated marksman rifle in service with the USCM. Sporting a bullpup configuration, the M4RA battle rifle is perfect for reconnaissance and fire support teams.\nTakes *only* non-high-velocity M4RA magazines." icon_state = "m4ra" item_state = "m4ra" icon = 'icons/obj/items/weapons/guns/guns_by_faction/USCM/marksman_rifles.dmi' @@ -1860,7 +1913,9 @@ /obj/item/attachable/reddot, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/extended_barrel, + /obj/item/attachable/extended_barrel/vented, /obj/item/attachable/magnetic_harness, /obj/item/attachable/bipod, /obj/item/attachable/verticalgrip, @@ -1871,8 +1926,11 @@ /obj/item/attachable/alt_iff_scope, /obj/item/attachable/flashlight/grip, /obj/item/attachable/attached_gun/extinguisher, + /obj/item/attachable/attached_gun/flare_launcher, ) + starting_attachment_types = list(/obj/item/attachable/attached_gun/flare_launcher) + flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER wield_delay = WIELD_DELAY_VERY_FAST aim_slowdown = SLOWDOWN_ADS_QUICK @@ -1880,6 +1938,10 @@ pixel_x = -5 hud_offset = -5 +/obj/item/weapon/gun/rifle/m4ra/Initialize() + . = ..() + AddElement(/datum/element/corp_label/armat) + /obj/item/weapon/gun/rifle/m4ra/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 43, "muzzle_y" = 17,"rail_x" = 22, "rail_y" = 21, "under_x" = 30, "under_y" = 13, "stock_x" = 24, "stock_y" = 13, "special_x" = 37, "special_y" = 16) @@ -1910,7 +1972,7 @@ /obj/item/weapon/gun/rifle/l42a name = "\improper L42A battle rifle" - desc = "The L42A Battle Rifle, found commonly around the frontiers of the Galaxy. It's commonly used by colonists for self defense, as well as many colonial militias, whomever they serve due to it's rugged reliability and ease of use without much training. This rifle was put up for adoption by the USCM and tested for a time, but ultimately lost to the M4RA already in service." + desc = "The Armat Battlefield Systems L42A Battle Rifle, found commonly around the frontiers of the Galaxy. It's commonly used by colonists for self defense, as well as many colonial militias, whomever they serve due to it's rugged reliability and ease of use without much training. This rifle was put up for adoption by the USCM and tested for a time, but ultimately lost to the M4RA already in service." icon = 'icons/obj/items/weapons/guns/guns_by_faction/USCM/marksman_rifles.dmi' item_icons = list( WEAR_BACK = 'icons/mob/humans/onmob/clothing/back/guns_by_type/marksman_rifles.dmi', @@ -1943,7 +2005,9 @@ /obj/item/attachable/reddot, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/extended_barrel, + /obj/item/attachable/extended_barrel/vented, /obj/item/attachable/magnetic_harness, /obj/item/attachable/stock/carbine, /obj/item/attachable/stock/carbine/wood, @@ -1961,6 +2025,10 @@ starting_attachment_types = list(/obj/item/attachable/stock/carbine) map_specific_decoration = TRUE +/obj/item/weapon/gun/rifle/l42a/Initialize() + . = ..() + AddElement(/datum/element/corp_label/armat) + /obj/item/weapon/gun/rifle/l42a/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 32, "muzzle_y" = 19,"rail_x" = 12, "rail_y" = 20, "under_x" = 18, "under_y" = 15, "stock_x" = 22, "stock_y" = 10) @@ -2121,6 +2189,7 @@ /obj/item/attachable/reflex, /obj/item/attachable/flashlight, /obj/item/attachable/extended_barrel, + /obj/item/attachable/extended_barrel/vented, /obj/item/attachable/heavy_barrel, /obj/item/attachable/magnetic_harness, ) @@ -2128,10 +2197,13 @@ map_specific_decoration = FALSE aim_slowdown = SLOWDOWN_ADS_QUICK +/obj/item/weapon/gun/rifle/rmc_f90/Initialize() + . = ..() + AddElement(/datum/element/corp_label/wy) + /obj/item/weapon/gun/rifle/rmc_f90/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 16,"rail_x" = 15, "rail_y" = 21, "under_x" = 24, "under_y" = 13, "stock_x" = 24, "stock_y" = 13) - /obj/item/weapon/gun/rifle/rmc_f90/set_gun_config_values() ..() fire_delay = FIRE_DELAY_TIER_11 @@ -2155,6 +2227,7 @@ /obj/item/attachable/reddot, /obj/item/attachable/reflex, /obj/item/attachable/extended_barrel, + /obj/item/attachable/extended_barrel/vented, ) /obj/item/weapon/gun/rifle/rmc_f90/a_grip/handle_starting_attachment() @@ -2234,7 +2307,7 @@ /obj/item/weapon/gun/rifle/l23 name = "\improper L23 assault rifle" - desc = "A rare sight, this rifle is seen most commonly in the hands of Three World Empire RMCs. Compared to the M41A MK2, it has noticeably improved handling and vastly improved performance. This one is painted in RMC's purple-blue camouflage" + desc = "A rare sight, this rifle is seen most commonly in the hands of Three World Empire RMCs. Compared to the M41A MK2, it has noticeably improved handling and vastly improved performance. This one is painted in RMC's purple-blue camouflage." icon = 'icons/obj/items/weapons/guns/guns_by_faction/TWE/assault_rifles.dmi' icon_state = "l23" item_state = "l23" @@ -2256,8 +2329,10 @@ /obj/item/attachable/reddot, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/bipod, /obj/item/attachable/extended_barrel, + /obj/item/attachable/extended_barrel/vented, /obj/item/attachable/attached_gun/flamer, /obj/item/attachable/attached_gun/flamer/advanced, /obj/item/attachable/attached_gun/grenade, @@ -2293,6 +2368,7 @@ /obj/item/weapon/gun/rifle/l23/Initialize(mapload, spawn_empty) . = ..() update_icon() + AddElement(/datum/element/corp_label/wy) /obj/item/weapon/gun/rifle/l23/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 37, "muzzle_y" = 16, "rail_x" = 14, "rail_y" = 21, "under_x" = 26, "under_y" = 10, "stock_x" = 5, "stock_y" = 17) @@ -2316,7 +2392,7 @@ //***************************************************************// /obj/item/weapon/gun/rifle/l23/breacher // One-handed UBS rifle name = "\improper L23-B assault rifle" - desc = "A rare sight, this rifle is seen most commonly in the hands of Three World Empire RMCs. This particular model was modified to facilitate RMC operations in tight quarters, allowing for it to be fired one-handed. This however crippled its stopping power due to a shorter barrel needed to make it compact. Burst fire still kicks like a mule. Compared to the M41A MK2, it has noticeably improved handling and vastly improved performance. This one is painted in RMC's purple-blue camouflage" + desc = "A rare sight, this rifle is seen most commonly in the hands of Three World Empire RMCs. This particular model was modified to facilitate RMC operations in tight quarters, allowing for it to be fired one-handed. This however crippled its stopping power due to a shorter barrel needed to make it compact. Burst fire still kicks like a mule. Compared to the M41A MK2, it has noticeably improved handling and vastly improved performance. This one is painted in RMC's purple-blue camouflage." icon = 'icons/obj/items/weapons/guns/guns_by_faction/TWE/assault_rifles.dmi' icon_state = "l23" item_state = "l23" @@ -2410,7 +2486,9 @@ /obj/item/attachable/reddot, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/extended_barrel, + /obj/item/attachable/extended_barrel/vented, /obj/item/attachable/magnetic_harness, /obj/item/attachable/bipod, /obj/item/attachable/lasersight, @@ -2450,7 +2528,7 @@ /obj/item/weapon/gun/rifle/l64a3/marksman name = "\improper L64A3 battle rifle" - desc = "A lightweight designated marksman rifle developed by Howatomo Precision Machining for the Royal Marines and Imperial Armed Space Forces. Reliable and deadly." + desc = "A lightweight designated marksman rifle developed by Howatomo Precision Machining for the Royal Marines and Imperial Armed Space Forces. Reliable and deadly." current_mag = /obj/item/ammo_magazine/rifle/l64/ap @@ -2523,6 +2601,7 @@ /obj/item/attachable/gyro, /obj/item/attachable/flashlight/grip, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/magnetic_harness, /obj/item/attachable/stock/xm51, ) @@ -2558,6 +2637,7 @@ . = ..() pump_delay = FIRE_DELAY_TIER_8*3 additional_fire_group_delay += pump_delay + AddElement(/datum/element/corp_label/armat) /obj/item/weapon/gun/rifle/xm51/set_bullet_traits() LAZYADD(traits_to_give, list( diff --git a/code/modules/projectiles/guns/shotguns.dm b/code/modules/projectiles/guns/shotguns.dm index edf26fdd797d..d79effd11615 100644 --- a/code/modules/projectiles/guns/shotguns.dm +++ b/code/modules/projectiles/guns/shotguns.dm @@ -78,7 +78,7 @@ can cause issues with ammo types getting mixed up during the burst. playsound(user, reload_sound, 25, TRUE) if(flags_gun_features & GUN_AMMO_COUNTER) var/chambered = in_chamber ? TRUE : FALSE - to_chat(user, SPAN_DANGER("[current_mag.current_rounds][chambered ? "+1" : ""] / [current_mag.max_rounds] ROUNDS REMAINING")) + to_chat(user, SPAN_DANGER("[current_mag.current_rounds][chambered ? "+1" : ""] / [current_mag.max_rounds] ROUNDS REMAINING.")) return TRUE /obj/item/weapon/gun/shotgun/proc/empty_chamber(mob/user, silent = FALSE, only_chamber = FALSE) @@ -93,7 +93,7 @@ can cause issues with ammo types getting mixed up during the burst. if(flags_gun_features & GUN_AMMO_COUNTER && user) var/chambered = in_chamber ? TRUE : FALSE //useless, but for consistency if(!silent) - to_chat(user, SPAN_DANGER("[current_mag.current_rounds][chambered ? "+1" : ""] / [current_mag.max_rounds] ROUNDS REMAINING")) + to_chat(user, SPAN_DANGER("[current_mag.current_rounds][chambered ? "+1" : ""] / [current_mag.max_rounds] ROUNDS REMAINING.")) else if(user && !silent) to_chat(user, SPAN_WARNING("[src] is already empty.")) @@ -252,7 +252,7 @@ can cause issues with ammo types getting mixed up during the burst. /obj/item/weapon/gun/shotgun/es7 name = "\improper ES-7 Supernova Electrostatic Shockgun" desc = "An archaic electrostatic 20ga shotgun design based on old Earth designs, albeit modernized for its time period. Being a dual-mode system, it is capable of firing semi-auto and pump-action modes, although this particular model is strictly semi-auto only. It can only accept X21 slugs." - desc_lore = "Despite receiving very little upgrades over its service period both within the Weyland Corporation and later the Weyland-Yutani Corporation, it remains popular with mercenaries and security firms because it was designed with security and law enforcement use in mind. " + desc_lore = "Despite receiving very little upgrades over its service period both within the Weyland Corporation and later the Weyland-Yutani Corporation, it remains popular with mercenaries and security firms because it was designed with security and law enforcement use in mind." icon_state = "es7" item_state = "es7" icon = 'icons/obj/items/weapons/guns/guns_by_faction/WY/shotguns.dmi' @@ -272,6 +272,7 @@ can cause issues with ammo types getting mixed up during the burst. /obj/item/attachable/reddot, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/extended_barrel, /obj/item/attachable/compensator, /obj/item/attachable/magnetic_harness, @@ -338,6 +339,7 @@ can cause issues with ammo types getting mixed up during the burst. /obj/item/attachable/reddot, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/extended_barrel, /obj/item/attachable/compensator, /obj/item/attachable/magnetic_harness, @@ -347,6 +349,7 @@ can cause issues with ammo types getting mixed up during the burst. /obj/item/weapon/gun/shotgun/combat/Initialize(mapload, spawn_empty) . = ..() + AddElement(/datum/element/corp_label/wy) if(current_mag && current_mag.current_rounds > 0) load_into_chamber() @@ -467,6 +470,7 @@ can cause issues with ammo types getting mixed up during the burst. /obj/item/attachable/heavy_barrel, /obj/item/attachable/bayonet/upp, /obj/item/attachable/verticalgrip, // Underbarrel + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/flashlight/grip, /obj/item/attachable/attached_gun/extinguisher, /obj/item/attachable/burstfire_assembly, @@ -478,6 +482,10 @@ can cause issues with ammo types getting mixed up during the burst. gauge = "8g" starting_attachment_types = list(/obj/item/attachable/stock/type23) +/obj/item/weapon/gun/shotgun/type23/Initialize() + . = ..() + AddElement(/datum/element/corp_label/norcomm) + /obj/item/weapon/gun/shotgun/type23/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 19,"rail_x" = 13, "rail_y" = 21, "under_x" = 24, "under_y" = 15, "stock_x" = -1, "stock_y" = 17) @@ -558,6 +566,7 @@ can cause issues with ammo types getting mixed up during the burst. /obj/item/attachable/flashlight, /obj/item/attachable/magnetic_harness, /obj/item/attachable/verticalgrip, //Underbarrel + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/stock/type23, //Stock ) flags_gun_features = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_INTERNAL_MAG @@ -615,6 +624,13 @@ can cause issues with ammo types getting mixed up during the burst. civilian_usable_override = TRUE // Come on. It's THE survivor shotgun. additional_fire_group_delay = 1.5 SECONDS +/obj/item/weapon/gun/shotgun/double/Initialize() + . = ..() + if(istype(src, /obj/item/weapon/gun/shotgun/double/mou53)) + AddElement(/datum/element/corp_label/henjin_garcia) + else + AddElement(/datum/element/corp_label/spearhead) + /obj/item/weapon/gun/shotgun/double/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 32, "muzzle_y" = 19,"rail_x" = 11, "rail_y" = 20, "under_x" = 15, "under_y" = 14, "stock_x" = 13, "stock_y" = 14) @@ -853,7 +869,7 @@ can cause issues with ammo types getting mixed up during the burst. /obj/item/weapon/gun/shotgun/double/mou53 name = "\improper MOU53 break action shotgun" - desc = "A limited production Kerchner MOU53 triple break action classic. Respectable damage output at medium ranges, while the ARMAT M37 is the king of CQC, the Kerchner MOU53 is what hits the broadside of that barn. This specific model cannot safely fire buckshot shells." + desc = "A limited production Henjin-Garcia MOU53 triple break action classic. Respectable damage output at medium ranges, while the Armat M37 is the king of CQC, the Henjin-Garcia MOU53 is what hits the broadside of that barn. This specific model cannot safely fire buckshot shells." icon_state = "mou" item_state = "mou" icon = 'icons/obj/items/weapons/guns/guns_by_faction/USCM/shotguns.dmi' @@ -882,6 +898,7 @@ can cause issues with ammo types getting mixed up during the burst. /obj/item/attachable/magnetic_harness, /obj/item/attachable/scope/mini, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/verticalgrip, /obj/item/attachable/angledgrip, /obj/item/attachable/flashlight/grip, @@ -899,7 +916,6 @@ can cause issues with ammo types getting mixed up during the burst. /obj/item/weapon/gun/shotgun/double/mou53/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 18,"rail_x" = 11, "rail_y" = 21, "under_x" = 17, "under_y" = 15, "stock_x" = 10, "stock_y" = 9) //Weird stock values, make sure any new stock matches the old sprite placement in the .dmi - /obj/item/weapon/gun/shotgun/double/mou53/set_gun_config_values() ..() set_burst_amount(BURST_AMOUNT_TIER_1) @@ -1221,6 +1237,7 @@ can cause issues with ammo types getting mixed up during the burst. /obj/item/attachable/flashlight/grip, /obj/item/attachable/gyro, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/extended_barrel, /obj/item/attachable/heavy_barrel, /obj/item/attachable/compensator, @@ -1236,6 +1253,10 @@ can cause issues with ammo types getting mixed up during the burst. pump_delay = FIRE_DELAY_TIER_5*2 additional_fire_group_delay += pump_delay + if(istype(src, /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb)) + AddElement(/datum/element/corp_label/henjin_garcia) + else + AddElement(/datum/element/corp_label/armat) /obj/item/weapon/gun/shotgun/pump/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 32, "muzzle_y" = 19,"rail_x" = 10, "rail_y" = 20, "under_x" = 20, "under_y" = 14, "stock_x" = 20, "stock_y" = 14) @@ -1344,6 +1365,7 @@ can cause issues with ammo types getting mixed up during the burst. /obj/item/attachable/flashlight/grip, /obj/item/attachable/gyro, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/extended_barrel, /obj/item/attachable/heavy_barrel, /obj/item/attachable/compensator, @@ -1456,10 +1478,10 @@ can cause issues with ammo types getting mixed up during the burst. if(holder_gun.chamber_swap) to_chat(owner, SPAN_NOTICE("[icon2html(holder_gun, owner)] You will start swapping the chambered shell with the other tube. Your current tube must be underloaded or it will forcefully eject the shell out of the chamber.")) - button.icon_state = "template_on" + action_icon_state = "chamber_swap_off" else to_chat(owner, SPAN_NOTICE("[icon2html(holder_gun, owner)] You will stop swapping the chambered shell with the other tube.")) - button.icon_state = "template" + action_icon_state = "chamber_swap" button.overlays.Cut() button.overlays += image('icons/mob/hud/actions.dmi', button, action_icon_state) @@ -1468,7 +1490,7 @@ can cause issues with ammo types getting mixed up during the burst. /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb name = "\improper HG 37-12 pump shotgun" - desc = "A eight-round pump action shotgun with four-round capacity dual internal tube magazines allowing for quick reloading and highly accurate fire. Used exclusively by Colonial Marshals. You can switch the active internal magazine by toggling the shotgun tube." + desc = "A Henjin-Garcia Armaments Company eight-round pump action shotgun with four-round capacity dual internal tube magazines allowing for quick reloading and highly accurate fire. You can switch the active internal magazine by toggling the shotgun tube." icon = 'icons/obj/items/weapons/guns/guns_by_faction/colony/shotguns.dmi' icon_state = "hg3712" item_state = "hg3712" @@ -1479,6 +1501,7 @@ can cause issues with ammo types getting mixed up during the burst. /obj/item/attachable/reflex, /obj/item/attachable/gyro, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/compensator, /obj/item/attachable/magnetic_harness, /obj/item/attachable/attached_gun/extinguisher, diff --git a/code/modules/projectiles/guns/smartgun.dm b/code/modules/projectiles/guns/smartgun.dm index 65f84fa59ab0..f96f6a8be6f2 100644 --- a/code/modules/projectiles/guns/smartgun.dm +++ b/code/modules/projectiles/guns/smartgun.dm @@ -136,6 +136,10 @@ QDEL_NULL(battery) . = ..() +/obj/item/weapon/gun/smartgun/cock(mob/user) + to_chat(user, SPAN_WARNING("You can't manually unload a smartgun's chamber!")) + return + /obj/item/weapon/gun/smartgun/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 16,"rail_x" = 17, "rail_y" = 18, "under_x" = 22, "under_y" = 14, "stock_x" = 22, "stock_y" = 14) @@ -263,24 +267,24 @@ /datum/action/item_action/smartgun/toggle_motion_detector/New(Target, obj/item/holder) . = ..() name = "Toggle Motion Detector" - action_icon_state = "motion_detector" button.name = name - button.overlays.Cut() - button.overlays += image('icons/mob/hud/actions.dmi', button, action_icon_state) /datum/action/item_action/smartgun/toggle_motion_detector/action_activate() . = ..() var/obj/item/weapon/gun/smartgun/G = holder_item G.toggle_motion_detector(usr) -/datum/action/item_action/smartgun/toggle_motion_detector/proc/update_icon() +/datum/action/item_action/smartgun/toggle_motion_detector/update_button_icon() if(!holder_item) return var/obj/item/weapon/gun/smartgun/G = holder_item if(G.motion_detector) - button.icon_state = "template_on" + action_icon_state = "motion_detector_off" else - button.icon_state = "template" + action_icon_state = "motion_detector" + button.overlays.Cut() + button.overlays += image('icons/mob/hud/actions.dmi', button, action_icon_state) + /datum/action/item_action/smartgun/toggle_auto_fire/New(Target, obj/item/holder) . = ..() @@ -300,15 +304,17 @@ return var/obj/item/weapon/gun/smartgun/G = holder_item if(G.auto_fire) - button.icon_state = "template_on" + action_icon_state = "autofire_off" else - button.icon_state = "template" + action_icon_state = "autofire" + button.overlays.Cut() + button.overlays += image('icons/mob/hud/actions.dmi', button, action_icon_state) /datum/action/item_action/smartgun/toggle_aim_assist/New(Target, obj/item/holder) . = ..() name = "Toggle Aim Assist" - action_icon_state = "aimassist" + update_icon() button.name = name button.overlays.Cut() button.overlays += image('icons/mob/hud/actions.dmi', button, action_icon_state) @@ -323,9 +329,9 @@ return var/obj/item/weapon/gun/smartgun/smortgun = holder_item if(smortgun.aim_assist) - button.icon_state = "template_on" + action_icon_state = "aimassist" else - button.icon_state = "template" + action_icon_state = "aimassist_off" /datum/action/item_action/smartgun/toggle_accuracy_improvement/New(Target, obj/item/holder) . = ..() @@ -340,9 +346,11 @@ var/obj/item/weapon/gun/smartgun/G = holder_item G.toggle_accuracy_improvement(usr) if(G.accuracy_improvement) - button.icon_state = "template_on" + action_icon_state = "accuracy_improvement_off" else - button.icon_state = "template" + action_icon_state = "accuracy_improvement" + button.overlays.Cut() + button.overlays += image('icons/mob/hud/actions.dmi', button, action_icon_state) /datum/action/item_action/smartgun/toggle_recoil_compensation/New(Target, obj/item/holder) . = ..() @@ -357,9 +365,11 @@ var/obj/item/weapon/gun/smartgun/G = holder_item G.toggle_recoil_compensation(usr) if(G.recoil_compensation) - button.icon_state = "template_on" + action_icon_state = "recoil_compensation_off" else - button.icon_state = "template" + action_icon_state = "recoil_compensation" + button.overlays.Cut() + button.overlays += image ('icons/mob/hud/actions.dmi', button, action_icon_state) /datum/action/item_action/smartgun/toggle_frontline_mode/New(Target, obj/item/holder) . = ..() @@ -789,7 +799,7 @@ playsound(loc,'sound/machines/click.ogg', 25, 1) motion_detector = !motion_detector var/datum/action/item_action/smartgun/toggle_motion_detector/TMD = locate(/datum/action/item_action/smartgun/toggle_motion_detector) in actions - TMD.update_icon() + TMD.update_button_icon() motion_detector() /obj/item/weapon/gun/smartgun/proc/motion_detector() @@ -960,6 +970,7 @@ /obj/item/weapon/gun/smartgun/l56a2/Initialize(mapload, ...) . = ..() toggle_aim_assist(null, TRUE) + AddElement(/datum/element/corp_label/wy) /obj/item/weapon/gun/smartgun/l56a2/elite name = "\improper L56A2D 'Dirty' smartgun" @@ -1079,7 +1090,7 @@ to_chat(user, SPAN_GREEN("You successfully unjam \the [src]!")) playsound(src, 'sound/weapons/handling/gun_jam_rack_success.ogg', 50, FALSE) jammed = FALSE - cock_cooldown += 1 SECONDS //so they dont accidentally cock a bullet away + cock_cooldown += 1 SECONDS //so they don't accidentally cock a bullet away balloon_alert(user, "*unjammed!*") else to_chat(user, SPAN_NOTICE("You start wildly racking the bolt back and forth attempting to unjam \the [src]!")) @@ -1156,6 +1167,10 @@ item_state = "la56" gun_faction = FACTION_TWE +/obj/item/weapon/gun/smartgun/rmc/Initialize() + . = ..() + AddElement(/datum/element/corp_label/wy) + /obj/item/weapon/gun/smartgun/upp name = "\improper RFVS37 smartgun" desc = "The actual firearm in the 2-piece RFVS37 Smartgun System. This experimental variant is used by the Union of Progressive Peoples units." @@ -1168,6 +1183,10 @@ mouse_pointer = 'icons/effects/mouse_pointer/upp_smartgun_mouse.dmi' gun_faction = FACTION_UPP +/obj/item/weapon/gun/smartgun/upp/Initialize() + . = ..() + AddElement(/datum/element/corp_label/norcomm) + // Solar devils SG, frontline mode only /obj/item/weapon/gun/smartgun/pve diff --git a/code/modules/projectiles/guns/smgs.dm b/code/modules/projectiles/guns/smgs.dm index 27f89e81b1d4..780f7256309f 100644 --- a/code/modules/projectiles/guns/smgs.dm +++ b/code/modules/projectiles/guns/smgs.dm @@ -20,9 +20,12 @@ wield_delay = WIELD_DELAY_VERY_FAST attachable_allowed = list( /obj/item/attachable/suppressor, + /obj/item/attachable/suppressor/sleek, /obj/item/attachable/reddot, + /obj/item/attachable/reddot/small, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/magnetic_harness, ) @@ -56,7 +59,9 @@ current_mag = /obj/item/ammo_magazine/smg/m39 attachable_allowed = list( /obj/item/attachable/suppressor, + /obj/item/attachable/suppressor/sleek, /obj/item/attachable/reddot, + /obj/item/attachable/reddot/small, /obj/item/attachable/reflex, /obj/item/attachable/angledgrip, /obj/item/attachable/verticalgrip, @@ -67,7 +72,9 @@ /obj/item/attachable/compensator, /obj/item/attachable/lasersight, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/extended_barrel, + /obj/item/attachable/extended_barrel/vented, /obj/item/attachable/bayonet, /obj/item/attachable/bayonet/upp, /obj/item/attachable/bayonet/co2, @@ -94,6 +101,13 @@ starting_attachment_types = list(/obj/item/attachable/stock/smg/collapsible) map_specific_decoration = TRUE +/obj/item/weapon/gun/smg/m39/Initialize() + . = ..() + if(istype(src, /obj/item/weapon/gun/smg/m39/corporate) || istype(src, /obj/item/weapon/gun/smg/m39/elite)) + AddElement(/datum/element/corp_label/wy) + else + AddElement(/datum/element/corp_label/armat) + /obj/item/weapon/gun/smg/m39/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 30, "muzzle_y" = 20,"rail_x" = 14, "rail_y" = 22, "under_x" = 21, "under_y" = 16, "stock_x" = 24, "stock_y" = 15) @@ -131,6 +145,7 @@ random_spawn_chance = 100 random_spawn_rail = list( /obj/item/attachable/reddot, + /obj/item/attachable/reddot/small, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, /obj/item/attachable/magnetic_harness, @@ -138,6 +153,7 @@ random_spawn_under = list( /obj/item/attachable/angledgrip, /obj/item/attachable/lasersight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/flashlight/grip, ) random_spawn_muzzle = list( @@ -146,7 +162,6 @@ /obj/item/attachable/extended_barrel, ) - /obj/item/weapon/gun/smg/m39/elite/set_gun_config_values() ..() set_fire_delay(FIRE_DELAY_TIER_SMG) @@ -207,6 +222,7 @@ current_mag = /obj/item/ammo_magazine/smg/mp5 attachable_allowed = list( /obj/item/attachable/suppressor, // Barrel + /obj/item/attachable/suppressor/sleek, /obj/item/attachable/bayonet, /obj/item/attachable/bayonet/upp, /obj/item/attachable/bayonet/co2, @@ -222,14 +238,17 @@ /obj/item/attachable/bayonet/rmc, /obj/item/attachable/bayonet/co2, /obj/item/attachable/extended_barrel, + /obj/item/attachable/extended_barrel/vented, /obj/item/attachable/heavy_barrel, /obj/item/attachable/compensator, /obj/item/attachable/reddot, // Rail + /obj/item/attachable/reddot/small, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, /obj/item/attachable/magnetic_harness, /obj/item/attachable/scope/mini, /obj/item/attachable/lasersight, // Under + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/gyro, /obj/item/attachable/bipod, /obj/item/attachable/burstfire_assembly, @@ -269,6 +288,7 @@ item_state = "mp5_alt" attachable_allowed = list( /obj/item/attachable/suppressor, // Barrel + /obj/item/attachable/suppressor/sleek, /obj/item/attachable/bayonet, /obj/item/attachable/bayonet/upp, /obj/item/attachable/bayonet/co2, @@ -284,14 +304,17 @@ /obj/item/attachable/bayonet/rmc, /obj/item/attachable/bayonet/co2, /obj/item/attachable/extended_barrel, + /obj/item/attachable/extended_barrel/vented, /obj/item/attachable/heavy_barrel, /obj/item/attachable/compensator, /obj/item/attachable/reddot, // Rail + /obj/item/attachable/reddot/small, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, /obj/item/attachable/magnetic_harness, /obj/item/attachable/scope/mini, /obj/item/attachable/lasersight, // Under + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/gyro, /obj/item/attachable/bipod, /obj/item/attachable/verticalgrip, @@ -318,6 +341,7 @@ random_spawn_chance = 100 random_spawn_rail = list( /obj/item/attachable/reddot, + /obj/item/attachable/reddot/small, /obj/item/attachable/reflex, ) @@ -345,6 +369,7 @@ current_mag = /obj/item/ammo_magazine/smg/mp27 attachable_allowed = list( /obj/item/attachable/suppressor, // Barrel + /obj/item/attachable/suppressor/sleek, /obj/item/attachable/bayonet, /obj/item/attachable/bayonet/upp, /obj/item/attachable/bayonet/co2, @@ -360,14 +385,17 @@ /obj/item/attachable/bayonet/rmc, /obj/item/attachable/bayonet/co2, /obj/item/attachable/extended_barrel, + /obj/item/attachable/extended_barrel/vented, /obj/item/attachable/heavy_barrel, /obj/item/attachable/compensator, /obj/item/attachable/reddot, // Rail + /obj/item/attachable/reddot/small, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, /obj/item/attachable/magnetic_harness, /obj/item/attachable/scope/mini, /obj/item/attachable/lasersight, // Under + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/gyro, /obj/item/attachable/bipod, /obj/item/attachable/burstfire_assembly, @@ -460,7 +488,7 @@ to_chat(user, SPAN_GREEN("You successfully unjam \the [src]!")) playsound(src, 'sound/weapons/handling/gun_jam_rack_success.ogg', 50, FALSE) jammed = FALSE - cock_cooldown += 1 SECONDS //so they dont accidentally cock a bullet away + cock_cooldown += 1 SECONDS //so they don't accidentally cock a bullet away balloon_alert(user, "*unjammed!*") else to_chat(user, SPAN_NOTICE("You start wildly racking the bolt back and forth attempting to unjam \the [src]!")) @@ -509,16 +537,24 @@ flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER attachable_allowed = list( /obj/item/attachable/suppressor, + /obj/item/attachable/suppressor/sleek, /obj/item/attachable/reddot, + /obj/item/attachable/reddot/small, /obj/item/attachable/reflex, /obj/item/attachable/flashlight/grip, /obj/item/attachable/verticalgrip, /obj/item/attachable/lasersight, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/extended_barrel, + /obj/item/attachable/extended_barrel/vented, /obj/item/attachable/magnetic_harness, ) +/obj/item/weapon/gun/smg/pps43/Initialize() + . = ..() + AddElement(/datum/element/corp_label/norcomm) + /obj/item/weapon/gun/smg/pps43/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 32, "muzzle_y" = 20, "rail_x" = 10, "rail_y" = 21, "under_x" = 25, "under_y" = 17, "stock_x" = 26, "stock_y" = 15) @@ -554,6 +590,10 @@ wield_delay = WIELD_DELAY_MIN aim_slowdown = SLOWDOWN_ADS_QUICK_MINUS +/obj/item/weapon/gun/smg/bizon/Initialize() + . = ..() + AddElement(/datum/element/corp_label/hyperdyne) + /obj/item/weapon/gun/smg/bizon/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 20,"rail_x" = 18, "rail_y" = 23, "under_x" = 26, "under_y" = 15, "stock_x" = 26, "stock_y" = 15) @@ -593,10 +633,13 @@ attachable_allowed = list( /obj/item/attachable/suppressor, // Barrel + /obj/item/attachable/suppressor/sleek, /obj/item/attachable/extended_barrel, + /obj/item/attachable/extended_barrel/vented, /obj/item/attachable/heavy_barrel, /obj/item/attachable/compensator, /obj/item/attachable/reddot, // Rail + /obj/item/attachable/reddot/small, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, /obj/item/attachable/scope/mini, @@ -647,15 +690,19 @@ attachable_allowed = list( /obj/item/attachable/suppressor, // Barrel + /obj/item/attachable/suppressor/sleek, /obj/item/attachable/extended_barrel, + /obj/item/attachable/extended_barrel/vented, /obj/item/attachable/heavy_barrel, /obj/item/attachable/compensator, /obj/item/attachable/reddot, // Rail + /obj/item/attachable/reddot/small, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, /obj/item/attachable/scope/mini, /obj/item/attachable/lasersight, // Under /obj/item/attachable/burstfire_assembly, + /obj/item/attachable/flashlight/under_barrel, ) wield_delay = WIELD_DELAY_MIN aim_slowdown = SLOWDOWN_ADS_QUICK @@ -702,7 +749,7 @@ to_chat(user, SPAN_GREEN("You successfully unjam \the [src]!")) playsound(src, 'sound/weapons/handling/gun_jam_rack_success.ogg', 35, TRUE) jammed = FALSE - cock_cooldown += 1 SECONDS //so they dont accidentally cock a bullet away + cock_cooldown += 1 SECONDS //so they don't accidentally cock a bullet away balloon_alert(user, "*unjammed!*") else to_chat(user, SPAN_NOTICE("You start wildly racking the bolt back and forth attempting to unjam \the [src]!")) @@ -730,6 +777,7 @@ /obj/item/attachable/compensator, /obj/item/attachable/lasersight, /obj/item/attachable/extended_barrel, + /obj/item/attachable/extended_barrel/vented, /obj/item/attachable/heavy_barrel, ) random_spawn_chance = 65 @@ -777,14 +825,20 @@ random_spawn_chance = 100 random_spawn_rail = list( /obj/item/attachable/reddot, + /obj/item/attachable/reddot/small, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, /obj/item/attachable/magnetic_harness, ) random_spawn_under = list( /obj/item/attachable/lasersight, + /obj/item/attachable/flashlight/under_barrel, ) +/obj/item/weapon/gun/smg/fp9000/pmc/Initialize() + . = ..() + AddElement(/datum/element/corp_label/wy) + /obj/item/weapon/gun/smg/fp9000/pmc/set_gun_config_values() ..() damage_mult = BASE_BULLET_DAMAGE_MULT + BULLET_DAMAGE_MULT_TIER_4 @@ -831,6 +885,10 @@ var/repair_sound = 'sound/weapons/nailgun_repair_long.ogg' var/material_per_repair = 1 +/obj/item/weapon/gun/smg/nailgun/Initialize() + . = ..() + AddElement(/datum/element/corp_label/alphatech) + /obj/item/weapon/gun/smg/nailgun/set_gun_config_values() ..() set_fire_delay(FIRE_DELAY_TIER_11) @@ -874,7 +932,7 @@ /obj/item/weapon/gun/smg/p90 name = "\improper FN P90 submachinegun" - desc = "The FN P90 submachine gun. An archaic design, but still widely used by corporate and mercenary groups, sometimes seen in the hands of civilian populations. This weapon only accepts 5.7×28mm rounds." + desc = "The FN P90 submachine gun. An archaic design, but still widely used by corporate and mercenary groups, sometimes seen in the hands of civilian populations. This weapon only accepts 5.7x28mm rounds." icon = 'icons/obj/items/weapons/guns/guns_by_faction/colony/smgs.dmi' icon_state = "p90" item_state = "p90" @@ -883,11 +941,15 @@ current_mag = /obj/item/ammo_magazine/smg/p90 attachable_allowed = list( /obj/item/attachable/suppressor, // Barrel + /obj/item/attachable/suppressor/sleek, /obj/item/attachable/extended_barrel, + /obj/item/attachable/extended_barrel/vented, /obj/item/attachable/heavy_barrel, /obj/item/attachable/compensator, /obj/item/attachable/reddot, // Rail + /obj/item/attachable/reddot/small, /obj/item/attachable/reflex, + /obj/item/attachable/flashlight, /obj/item/attachable/magnetic_harness, /obj/item/attachable/scope/mini, ) @@ -911,45 +973,11 @@ recoil_unwielded = RECOIL_AMOUNT_TIER_5 fa_max_scatter = SCATTER_AMOUNT_TIER_10 + 0.5 -//------------------------------------------------------- - -//P90, a classic SMG (TWE version). - /obj/item/weapon/gun/smg/p90/twe name = "\improper FN-TWE P90 submachinegun" - desc = "A variation of the FN P90 submachine gun. Used by mercenaries and royal marines commandos. This weapon only accepts 5.7×28mm rounds." + desc = "A variation of the FN P90 submachine gun. Used by mercenaries and royal marines commandos. This weapon only accepts 5.7x28mm rounds." icon = 'icons/obj/items/weapons/guns/guns_by_faction/TWE/smgs.dmi' icon_state = "p90_twe" item_state = "p90_twe" - fire_sound = 'sound/weapons/p90.ogg' - current_mag = /obj/item/ammo_magazine/smg/p90/twe - attachable_allowed = list( - /obj/item/attachable/suppressor, // Barrel - /obj/item/attachable/extended_barrel, - /obj/item/attachable/heavy_barrel, - /obj/item/attachable/compensator, - /obj/item/attachable/reddot, // Rail - /obj/item/attachable/reflex, - /obj/item/attachable/magnetic_harness, - /obj/item/attachable/scope/mini, - ) - - flags_gun_features = GUN_CAN_POINTBLANK|GUN_ANTIQUE - -/obj/item/weapon/gun/smg/p90/twe/set_gun_attachment_offsets() - attachable_offset = list("muzzle_x" = 32, "muzzle_y" = 17,"rail_x" = 22, "rail_y" = 24, "under_x" = 23, "under_y" = 15, "stock_x" = 28, "stock_y" = 17) - -/obj/item/weapon/gun/smg/p90/twe/set_gun_config_values() - ..() - fire_delay = FIRE_DELAY_TIER_12 - burst_delay = FIRE_DELAY_TIER_12 - burst_amount = BURST_AMOUNT_TIER_3 - accuracy_mult = BASE_ACCURACY_MULT - accuracy_mult_unwielded = BASE_ACCURACY_MULT + HIT_ACCURACY_MULT_TIER_2 - scatter = SCATTER_AMOUNT_TIER_4 - burst_scatter_mult = SCATTER_AMOUNT_TIER_7 - scatter_unwielded = SCATTER_AMOUNT_TIER_3 - damage_mult = BASE_BULLET_DAMAGE_MULT + BULLET_DAMAGE_MULT_TIER_4 - recoil_unwielded = RECOIL_AMOUNT_TIER_5 - fa_max_scatter = SCATTER_AMOUNT_TIER_10 + 0.5 + current_mag = /obj/item/ammo_magazine/smg/p90/ap diff --git a/code/modules/projectiles/guns/souto.dm b/code/modules/projectiles/guns/souto.dm index 34607c81b020..9f4134daaf9d 100644 --- a/code/modules/projectiles/guns/souto.dm +++ b/code/modules/projectiles/guns/souto.dm @@ -17,6 +17,10 @@ start_automatic = TRUE autofire_slow_mult = 0.8 //Fires FASTER when in Full Auto, that is the power of Souta +/obj/item/weapon/gun/souto/Initialize() + . = ..() + AddElement(/datum/element/corp_label/souta) + /obj/item/weapon/gun/souto/set_gun_config_values() . = ..() accuracy_mult = BASE_ACCURACY_MULT + 2*HIT_ACCURACY_MULT_TIER_10 diff --git a/code/modules/projectiles/guns/specialist/launcher/grenade_launcher.dm b/code/modules/projectiles/guns/specialist/launcher/grenade_launcher.dm index 6e633e3110f7..77fcf0010b00 100644 --- a/code/modules/projectiles/guns/specialist/launcher/grenade_launcher.dm +++ b/code/modules/projectiles/guns/specialist/launcher/grenade_launcher.dm @@ -282,6 +282,10 @@ internal_slots = 6 direct_draw = FALSE +/obj/item/weapon/gun/launcher/grenade/m92/Initialize() + . = ..() + AddElement(/datum/element/corp_label/armat) + /obj/item/weapon/gun/launcher/grenade/m92/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 18,"rail_x" = 14, "rail_y" = 22, "under_x" = 19, "under_y" = 14, "stock_x" = 19, "stock_y" = 14) @@ -385,6 +389,10 @@ /obj/item/attachable/reflex, ) +/obj/item/weapon/gun/launcher/grenade/m81/m85a1/Initialize() + . = ..() + AddElement(/datum/element/corp_label/armat) + /obj/item/weapon/gun/launcher/grenade/m81/m85a1/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 18, "rail_x" = 18, "rail_y" = 21, "under_x" = 19, "under_y" = 14, "stock_x" = 14, "stock_y" = 14) diff --git a/code/modules/projectiles/guns/specialist/launcher/launcher.dm b/code/modules/projectiles/guns/specialist/launcher/launcher.dm index 017972194d80..ec64d5b19e96 100644 --- a/code/modules/projectiles/guns/specialist/launcher/launcher.dm +++ b/code/modules/projectiles/guns/specialist/launcher/launcher.dm @@ -39,7 +39,7 @@ cylinder.storage_flags ^= STORAGE_USING_DRAWING_METHOD if(preload && !spawn_empty) for(var/i = 1 to cylinder.storage_slots) - new preload(cylinder) + new preload(cylinder) update_icon() /obj/item/weapon/gun/launcher/Destroy(force) diff --git a/code/modules/projectiles/guns/specialist/launcher/rocket_launcher.dm b/code/modules/projectiles/guns/specialist/launcher/rocket_launcher.dm index 73f4175a023d..5b6f22628521 100644 --- a/code/modules/projectiles/guns/specialist/launcher/rocket_launcher.dm +++ b/code/modules/projectiles/guns/specialist/launcher/rocket_launcher.dm @@ -3,7 +3,7 @@ /obj/item/weapon/gun/launcher/rocket name = "\improper common rocket launcher ancestor" - desc = "You should not be seeing this" + desc = "You should not be seeing this." icon = 'icons/obj/items/weapons/guns/guns_by_faction/USCM/rocket_launchers.dmi' icon_state = "m5" item_state = "m5" @@ -225,6 +225,10 @@ auto_retrieval_slot = WEAR_J_STORE attachable_allowed = list() +/obj/item/weapon/gun/launcher/rocket/m5/Initialize() + . = ..() + AddElement(/datum/element/corp_label/armat) + /obj/item/weapon/gun/launcher/rocket/m5/Fire(atom/target, mob/living/user, params, reflex, dual_wield) . = ..() update_icon() @@ -274,6 +278,10 @@ flags_gun_features = GUN_WIELDED_FIRING_ONLY flags_item = TWOHANDED +/obj/item/weapon/gun/launcher/rocket/anti_tank/Initialize() + . = ..() + AddElement(/datum/element/corp_label/armat) + /obj/item/weapon/gun/launcher/rocket/anti_tank/set_bullet_traits() . = ..() LAZYADD(traits_to_give, list( @@ -282,7 +290,7 @@ /obj/item/weapon/gun/launcher/rocket/anti_tank/disposable //single shot and disposable name = "\improper M83A2 SADAR" - desc = "The M83A2 SADAR is a lightweight one-shot anti-armor weapon capable of engaging enemy vehicles at ranges up to 1,000m. Fully disposable, the rocket's launcher is discarded after firing. When stowed (unique-action), the SADAR system consists of a watertight carbon-fiber composite blast tube, inside of which is an aluminum launch tube containing the missile. The weapon is fired by pushing a charge button on the trigger grip. It is sighted and fired from the shoulder." + desc = "The M83A2 SADAR is a lightweight one-shot anti-armor weapon capable of engaging enemy vehicles at ranges up to 1,000m. Fully disposable, the rocket's launcher is discarded after firing. When stowed (unique-action), the SADAR system consists of a watertight carbon-fiber composite blast tube, inside of which is an aluminum launch tube containing the missile. The weapon is fired by pushing a charge button on the trigger grip. It is sighted and fired from the shoulder." var/fired = FALSE can_be_reloaded = FALSE @@ -388,6 +396,10 @@ flags_item = TWOHANDED|NO_CRYO_STORE +/obj/item/weapon/gun/launcher/rocket/upp/Initialize() + . = ..() + AddElement(/datum/element/corp_label/norcomm) + /obj/item/weapon/gun/launcher/rocket/upp/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 18,"rail_x" = 6, "rail_y" = 19, "under_x" = 19, "under_y" = 14, "stock_x" = -6, "stock_y" = 16, "special_x" = 37, "special_y" = 16) @@ -420,7 +432,7 @@ /obj/item/weapon/gun/launcher/rocket/brute name = "\improper M6H-BRUTE launcher system" - desc = " Breaching Rocket Unit for Tactical Entry, or BRUTE, is a shoulder-mounted, man-portable launcher system designed to give combat technicians rapid structure defeating capabilities at reasonable range. The launcher fits a fore-mounted laser guidance module that steers the 90mm shaped-charge rockets towards a fortified position. Try not to drool on it." + desc = "Breaching Rocket Unit for Tactical Entry, or BRUTE, is a shoulder-mounted, man-portable launcher system designed to give combat technicians rapid structure defeating capabilities at reasonable range. The launcher fits a fore-mounted laser guidance module that steers the 90mm shaped-charge rockets towards a fortified position. Try not to drool on it." icon = 'icons/obj/items/weapons/guns/guns_by_faction/USCM/rocket_launchers.dmi' item_icons = list( WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/weapons/guns/rocket_launchers_lefthand.dmi', @@ -434,10 +446,13 @@ var/f_aiming_time = 4 SECONDS var/aiming = FALSE +/obj/item/weapon/gun/launcher/rocket/brute/Initialize() + . = ..() + AddElement(/datum/element/corp_label/armat) + /obj/item/weapon/gun/launcher/rocket/brute/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 18,"rail_x" = 8, "rail_y" = 17, "under_x" = 19, "under_y" = 14, "stock_x" = 19, "stock_y" = 14) - /obj/item/weapon/gun/launcher/rocket/brute/set_bullet_traits() LAZYADD(traits_to_give, list( BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_iff) diff --git a/code/modules/projectiles/guns/specialist/scout.dm b/code/modules/projectiles/guns/specialist/scout.dm index 14af6ec26ef4..43eb26fbd4a6 100644 --- a/code/modules/projectiles/guns/specialist/scout.dm +++ b/code/modules/projectiles/guns/specialist/scout.dm @@ -60,6 +60,7 @@ /obj/item/attachable/reddot, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, + /obj/item/attachable/flashlight/under_barrel, /obj/item/attachable/extended_barrel, /obj/item/attachable/magnetic_harness, /obj/item/attachable/bipod, diff --git a/code/modules/projectiles/guns/specialist/sharp.dm b/code/modules/projectiles/guns/specialist/sharp.dm index 8297c1c88161..2ec3a04d2e56 100644 --- a/code/modules/projectiles/guns/specialist/sharp.dm +++ b/code/modules/projectiles/guns/specialist/sharp.dm @@ -27,9 +27,18 @@ var/explosion_delay_sharp = TRUE +/obj/item/weapon/gun/rifle/sharp/Initialize() + . = ..() + AddElement(/datum/element/corp_label/armat) + /obj/item/weapon/gun/rifle/sharp/get_examine_text(mob/user) . = ..() - . += SPAN_INFO("Switching firemodes will toggle the explosion delay timer between 1 second and 5 seconds") + . += SPAN_INFO("Switching firemodes will toggle the explosion delay timer between 1 second and 5 seconds.") + +/obj/item/weapon/gun/rifle/sharp/set_bullet_traits() + LAZYADD(traits_to_give, list( + BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_iff) + )) /obj/item/weapon/gun/rifle/sharp/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 32, "muzzle_y" = 17,"rail_x" = 12, "rail_y" = 22, "under_x" = 23, "under_y" = 13, "stock_x" = 24, "stock_y" = 13) @@ -72,7 +81,7 @@ explosion_delay_sharp = !explosion_delay_sharp playsound(user, 'sound/weapons/handling/gun_burst_toggle.ogg', 15, 1) to_chat(user, SPAN_NOTICE("[icon2html(src, user)] You [explosion_delay_sharp ? SPAN_BOLD("enable") : SPAN_BOLD("disable")] [src]'s delayed fire mode. Explosive ammo will blow up in [explosion_delay_sharp ? SPAN_BOLD("5 seconds") : SPAN_BOLD("2.5 seconds")].")) - user.balloon_alert(user, "explosive ammo will blow up in [explosion_delay_sharp ? SPAN_BOLD("5 seconds") : SPAN_BOLD("2.5 seconds")].") + user.balloon_alert(user, "explosion delay [explosion_delay_sharp ? "5 seconds" : "2.5 seconds"].") diff --git a/code/modules/projectiles/guns/specialist/sniper.dm b/code/modules/projectiles/guns/specialist/sniper.dm index 807006ece8ec..cd0c2fb4c604 100644 --- a/code/modules/projectiles/guns/specialist/sniper.dm +++ b/code/modules/projectiles/guns/specialist/sniper.dm @@ -242,12 +242,20 @@ blocked = TRUE break - for(var/obj/effect/particle_effect/smoke/S in T) + for(var/obj/effect/particle_effect/smoke/smoke in T) + if(!smoke.obscuring) + continue blocked = TRUE break return blocked - +/obj/item/weapon/gun/rifle/sniper/equipped(mob/living/user, slot) + . = ..() + //Toggle Aimed Shot on equip in hands. Skips back and armour slot equips + if(slot == WEAR_R_HAND || slot == WEAR_L_HAND) + var /datum/action/toggling_action = locate(/datum/action/item_action/specialist/aimed_shot) in user.actions + if(toggling_action) + toggling_action.action_activate() // Snipers may enable or disable their laser tracker at will. /datum/action/item_action/specialist/toggle_laser @@ -330,11 +338,36 @@ attachable_allowed = list(/obj/item/attachable/bipod) flags_gun_features = GUN_AUTO_EJECTOR|GUN_SPECIALIST|GUN_WIELDED_FIRING_ONLY|GUN_AMMO_COUNTER map_specific_decoration = TRUE + inhand_x_dimension = 64 flags_item = TWOHANDED|NO_CRYO_STORE pixel_x = -6 hud_offset = -6 +/obj/item/weapon/gun/rifle/sniper/M42A/Initialize(mapload, spawn_empty) + . = ..() + select_gamemode_skin() + AddElement(/datum/element/corp_label/armat) + +/obj/item/weapon/gun/rifle/sniper/M42A/select_gamemode_skin(expected_type, list/override_icon_state, list/override_protection) + . = ..() + switch(SSmapping.configs[GROUND_MAP].camouflage_type) + if("jungle") + item_icons[WEAR_L_HAND] = 'icons/obj/items/weapons/guns/guns_by_map/jungle/guns_lefthand_x64.dmi' + item_icons[WEAR_R_HAND] = 'icons/obj/items/weapons/guns/guns_by_map/jungle/guns_righthand_x64.dmi' + if("classic") + item_icons[WEAR_L_HAND] = 'icons/obj/items/weapons/guns/guns_by_map/classic/guns_lefthand_x64.dmi' + item_icons[WEAR_R_HAND] = 'icons/obj/items/weapons/guns/guns_by_map/classic/guns_righthand_x64.dmi' + if("desert") + item_icons[WEAR_L_HAND] = 'icons/obj/items/weapons/guns/guns_by_map/desert/guns_lefthand_x64.dmi' + item_icons[WEAR_R_HAND] = 'icons/obj/items/weapons/guns/guns_by_map/desert/guns_righthand_x64.dmi' + if("snow") + item_icons[WEAR_L_HAND] = 'icons/obj/items/weapons/guns/guns_by_map/snow/guns_lefthand_x64.dmi' + item_icons[WEAR_R_HAND] = 'icons/obj/items/weapons/guns/guns_by_map/snow/guns_righthand_x64.dmi' + if("urban") + item_icons[WEAR_L_HAND] = 'icons/obj/items/weapons/guns/guns_by_map/urban/guns_lefthand_x64.dmi' + item_icons[WEAR_R_HAND] = 'icons/obj/items/weapons/guns/guns_by_map/urban/guns_righthand_x64.dmi' + /obj/item/weapon/gun/rifle/sniper/M42A/verb/toggle_scope_zoom_level() set name = "Toggle Scope Zoom Level" set category = "Weapons" @@ -394,6 +427,10 @@ pixel_x = -4 hud_offset = -4 +/obj/item/weapon/gun/rifle/sniper/XM43E1/Initialize() + . = ..() + AddElement(/datum/element/corp_label/armat) + /obj/item/weapon/gun/rifle/sniper/XM43E1/handle_starting_attachment() ..() var/obj/item/attachable/scope/variable_zoom/S = new(src) @@ -457,6 +494,11 @@ sniper_beam_type = /obj/effect/ebeam/laser/intense sniper_beam_icon = "laser_beam_intense" sniper_lockon_icon = "sniper_lockon_intense" + has_aimed_shot = FALSE + +/obj/item/weapon/gun/rifle/sniper/elite/Initialize() + . = ..() + AddElement(/datum/element/corp_label/wy) /obj/item/weapon/gun/rifle/sniper/elite/handle_starting_attachment() ..() diff --git a/code/modules/projectiles/magazines/flamer.dm b/code/modules/projectiles/magazines/flamer.dm index ec2f96c934e6..dd53e9e51b58 100644 --- a/code/modules/projectiles/magazines/flamer.dm +++ b/code/modules/projectiles/magazines/flamer.dm @@ -18,6 +18,7 @@ gun_type = /obj/item/weapon/gun/flamer/m240 caliber = "UT-Napthal Fuel" //Ultra Thick Napthal Fuel, from the lore book. var/custom = FALSE //accepts custom fuels if true + var/specialist = FALSE //for specialist fuels var/flamer_chem = "utnapthal" flags_magazine = AMMUNITION_HIDE_AMMO @@ -81,7 +82,7 @@ /obj/item/ammo_magazine/flamer_tank/afterattack(obj/target, mob/user , flag) //refuel at fueltanks when we run out of ammo. if(get_dist(user,target) > 1) return ..() - if(!istype(target, /obj/structure/reagent_dispensers/fueltank) && !istype(target, /obj/item/tool/weldpack) && !istype(target, /obj/item/storage/backpack/marine/engineerpack)) + if(!istype(target, /obj/structure/reagent_dispensers/tank/fuel) && !istype(target, /obj/item/tool/weldpack) && !istype(target, /obj/item/storage/backpack/marine/engineerpack) && !istype(target, /obj/item/ammo_magazine/flamer_tank)) return ..() if(!target.reagents || length(target.reagents.reagent_list) < 1) @@ -101,6 +102,10 @@ to_chat(user, SPAN_WARNING("[src] cannot accept custom fuels!")) return + if(to_add.flags & REAGENT_TYPE_SPECIALIST && !specialist) + to_chat(user, SPAN_WARNING("[src] cannot accept specialist fuels!")) + return + if(!to_add.intensityfire && to_add.id != "stablefoam" && !istype(src, /obj/item/ammo_magazine/flamer_tank/smoke)) to_chat(user, SPAN_WARNING("This chemical is not potent enough to be used in a flamethrower!")) return @@ -146,13 +151,13 @@ for(var/datum/reagent/R in reagents.reagent_list) . += SPAN_NOTICE(" [R.volume] units of [R.name].") else - . += SPAN_NOTICE("Nothing.") + . += SPAN_NOTICE(" Nothing.") // This is gellie fuel. Green Flames. /obj/item/ammo_magazine/flamer_tank/gellied name = "M240 incinerator tank (B-Gel)" desc = "A fuel tank full of specialized Ultra Thick Napthal Fuel type B-Gel, a gelled variant of napalm that is easily extinguished, but shoots further and lingers for longer. Handle with exceptional care." - desc_lore = "Unlike its liquid contemporaries, this gelled variant of napalm is easily extinguished, but shoots far and lingers on the ground in a viscous mess. The gel reacts violently with inorganic materials to break them down, forming an extremely sticky crytallized goo." + desc_lore = "Unlike its liquid contemporaries, this gelled variant of napalm is easily extinguished, but shoots far and lingers on the ground in a viscous mess. The gel reacts violently with inorganic materials to break them down, forming an extremely sticky crystallized goo." caliber = "Napalm Gel" flamer_chem = "napalmgel" max_rounds = 200 @@ -183,12 +188,12 @@ if(!set_pressure) to_chat(usr, SPAN_WARNING("You can't find that setting on the regulator!")) else - to_chat(usr, SPAN_NOTICE("You set the pressure regulator to [set_pressure] U/t")) + to_chat(usr, SPAN_NOTICE("You set the pressure regulator to [set_pressure] U/t.")) fuel_pressure = set_pressure /obj/item/ammo_magazine/flamer_tank/custom/get_examine_text(mob/user) . = ..() - . += SPAN_NOTICE("The pressure regulator is set to: [src.fuel_pressure] U/t") + . += SPAN_NOTICE("The pressure regulator is set to: [src.fuel_pressure] U/t.") // Pyro regular flamer tank just bigger than the base flamer tank. /obj/item/ammo_magazine/flamer_tank/large @@ -198,6 +203,7 @@ item_state = "flametank_large" max_rounds = 250 gun_type = /obj/item/weapon/gun/flamer/m240/spec + specialist = TRUE max_intensity = 80 max_range = 5 diff --git a/code/modules/projectiles/magazines/pistols.dm b/code/modules/projectiles/magazines/pistols.dm index 252600da1a47..eeba664aab9e 100644 --- a/code/modules/projectiles/magazines/pistols.dm +++ b/code/modules/projectiles/magazines/pistols.dm @@ -152,7 +152,10 @@ icon = 'icons/obj/items/weapons/guns/ammo_by_faction/WY/pistols.dmi' icon_state = "vp78" max_rounds = 18 - gun_type = /obj/item/weapon/gun/pistol/vp78 + gun_type = list( + /obj/item/weapon/gun/pistol/vp78, + /obj/item/weapon/gun/pistol/vp78m6, + ) ammo_band_icon = "+vp78_band" ammo_band_icon_empty = "+vp78_band_e" @@ -422,10 +425,10 @@ Unlike other pistols, it can be equipped with limited mods (small muzzle, magazi */ /obj/item/ammo_magazine/pistol/m10 - name = "\improper M10 HV magazine (10x20mm)" + name = "\improper M10 HV magazine (10x20mm-APC)" desc = "A compact 40-round high-velocity magazine, designed for rapid reloads and reliable performance in close-quarters combat." - default_ammo = /datum/ammo/bullet/smg/m39 - caliber = "10x20mm" + default_ammo = /datum/ammo/bullet/pistol/m10 + caliber = "10x20mm-APC" icon = 'icons/obj/items/weapons/guns/ammo_by_faction/USCM/pistols.dmi' icon_state = "m10" bonus_overlay = "m10_overlay" @@ -434,23 +437,55 @@ Unlike other pistols, it can be equipped with limited mods (small muzzle, magazi gun_type = /obj/item/weapon/gun/pistol/m10 /obj/item/ammo_magazine/pistol/m10/extended - name = "\improper M10 HV extended magazine (10x20mm)" - desc = "An extended 10x20mm 78-round high-velocity magazine, offering additional firepower for sustained engagements without significantly increasing reload time." - default_ammo = /datum/ammo/bullet/smg/m39 - caliber = "10x20mm" + name = "\improper M10 HV extended magazine (10x20mm-APC)" + desc = "An extended 62-round high-velocity magazine, offering additional firepower for sustained engagements without significantly increasing reload time." + default_ammo = /datum/ammo/bullet/pistol/m10 + caliber = "10x20mm-APC" icon_state = "m10_ext" bonus_overlay = "m10_ex_overlay" - max_rounds = 78 + max_rounds = 62 gun_type = /obj/item/weapon/gun/pistol/m10 /obj/item/ammo_magazine/pistol/m10/drum - name = "\improper M10 HV drum magazine (10x20mm)" - desc = "A super-extended 10x20mm 92-round drum magazine designed for prolonged firefights, delivering maximum ammunition capacity at the cost of a longer reload." - default_ammo = /datum/ammo/bullet/smg/m39 - caliber = "10x20mm" + name = "\improper M10 HV drum magazine (10x20mm-APC)" + desc = "A super-extended 84-round drum magazine designed for prolonged firefights, delivering maximum ammunition capacity at the cost of a longer reload." + default_ammo = /datum/ammo/bullet/pistol/m10 + caliber = "10x20mm-APC" icon_state = "m10_drum" bonus_overlay = "m10_drum_overlay" - max_rounds = 92 + max_rounds = 84 + gun_type = /obj/item/weapon/gun/pistol/m10 + +/obj/item/ammo_magazine/pistol/m10/ap + name = "\improper M10 AP magazine (10x20mm-APC)" + desc = "A 40-round magazine loaded with armor-piercing rounds. Designed to punch through body armor and light cover, though with reduced muzzle velocity compared to standard HV loads." + default_ammo = /datum/ammo/bullet/pistol/m10/ap + caliber = "10x20mm-APC" + icon = 'icons/obj/items/weapons/guns/ammo_by_faction/USCM/pistols.dmi' + icon_state = "m10_ap" + bonus_overlay = "m10_ap_overlay" + bonus_overlay_icon = 'icons/obj/items/weapons/guns/guns_by_faction/USCM/pistols.dmi' + max_rounds = 40 + gun_type = /obj/item/weapon/gun/pistol/m10 + +/obj/item/ammo_magazine/pistol/m10/ap/extended + name = "\improper M10 AP extended magazine (10x20mm-APC)" + desc = "A 62-round extended magazine loaded with armor-piercing rounds. Designed to punch through body armor and light cover, though with reduced muzzle velocity compared to standard HV loads." + default_ammo = /datum/ammo/bullet/pistol/m10/ap + caliber = "10x20mm-APC" + icon_state = "m10_ap_ext" + bonus_overlay = "m10_ap_ex_overlay" + max_rounds = 62 + gun_type = /obj/item/weapon/gun/pistol/m10 + +/obj/item/ammo_magazine/pistol/m10/ap/drum + name = "\improper M10 AP drum magazine (10x20mm-APC)" + desc = "A super-extended 84-round drum loaded with armor-piercing rounds. Designed to punch through body armor and light cover, though with reduced muzzle velocity compared to standard HV loads." + default_ammo = /datum/ammo/bullet/pistol/m10/ap + caliber = "10x20mm-APC" + icon_state = "m10_ap_drum" + bonus_overlay = "m10_ap_drum_overlay" + max_rounds = 84 gun_type = /obj/item/weapon/gun/pistol/m10 //------------------------------------------------------- diff --git a/code/modules/projectiles/magazines/revolvers.dm b/code/modules/projectiles/magazines/revolvers.dm index 77c0a7b6d40a..c33f58a88bbe 100644 --- a/code/modules/projectiles/magazines/revolvers.dm +++ b/code/modules/projectiles/magazines/revolvers.dm @@ -36,13 +36,13 @@ /obj/item/ammo_magazine/revolver/incendiary name = "\improper M44 incendiary speed loader (.44)" - desc = "a 7-round .44 revolver speed loader containing incendiary bullets." + desc = "A 7-round .44 revolver speed loader containing incendiary bullets." default_ammo = /datum/ammo/bullet/revolver/incendiary ammo_band_color = REVOLVER_TIP_COLOR_INCENDIARY /obj/item/ammo_magazine/revolver/marksman/toxin name = "\improper M44 toxic speed loader (.44)" - desc = "a 7-round .44 revolver speed loader containing toxin bullets." + desc = "A 7-round .44 revolver speed loader containing toxin bullets." default_ammo = /datum/ammo/bullet/revolver/marksman/toxin ammo_band_color = REVOLVER_TIP_COLOR_TOXIN @@ -80,7 +80,7 @@ /obj/item/ammo_magazine/revolver/small name = "\improper S&W speed loader (.38)" - desc = "a 6-round .38 revolver speed loader." + desc = "A 6-round .38 revolver speed loader." default_ammo = /datum/ammo/bullet/revolver/small caliber = ".38" icon = 'icons/obj/items/weapons/guns/ammo_by_faction/colony/revolvers.dmi' @@ -109,8 +109,8 @@ */ /obj/item/ammo_magazine/revolver/mateba - name = "\improper Mateba speed loader (.454)" - desc = "A formidable 6-round .454 speedloader, made exclusively for the Mateba autorevolver. Packs a devastating punch. This standard-variant is optimized for anti-armor." + name = "\improper Unica 6 speed loader (.454)" + desc = "A formidable 6-round .454 speedloader, made exclusively for the Spearhead Unica 6 autorevolver. Packs a devastating punch. This standard-variant is optimized for anti-armor." default_ammo = /datum/ammo/bullet/revolver/mateba caliber = ".454" icon_state = "mateba" @@ -118,20 +118,20 @@ gun_type = /obj/item/weapon/gun/revolver/mateba /obj/item/ammo_magazine/revolver/mateba/highimpact - name = "\improper High Impact Mateba speed loader (.454)" - desc = "A formidable 6-round .454 speedloader, made exclusively for the Mateba autorevolver. Packs a devastating punch. This high impact variant is optimized for anti-personnel. Don't point at anything you don't want to destroy." + name = "\improper High Impact Unica 6 speed loader (.454)" + desc = "A formidable 6-round .454 speedloader, made exclusively for the Spearhead Unica 6 autorevolver. Packs a devastating punch. This high impact variant is optimized for anti-personnel. Don't point at anything you don't want to destroy." default_ammo = /datum/ammo/bullet/revolver/mateba/highimpact ammo_band_color = REVOLVER_TIP_COLOR_HIGH_IMPACT /obj/item/ammo_magazine/revolver/mateba/highimpact/ap - name = "\improper High Impact Armor-Piercing Mateba speed loader (.454)" - desc = "A formidable 6-round .454 speedloader, made exclusively for the Mateba autorevolver. Packs a devastating punch. This armor-piercing variant is optimized against armored targets at the cost of lower overall damage. Don't point at anything you don't want to destroy." + name = "\improper High Impact Armor-Piercing Unica 6 speed loader (.454)" + desc = "A formidable 6-round .454 speedloader, made exclusively for the Spearhead Unica 6 autorevolver. Packs a devastating punch. This armor-piercing variant is optimized against armored targets at the cost of lower overall damage. Don't point at anything you don't want to destroy." default_ammo = /datum/ammo/bullet/revolver/mateba/highimpact/ap ammo_band_color = REVOLVER_TIP_COLOR_HIAP /obj/item/ammo_magazine/revolver/mateba/highimpact/explosive - name = "\improper Mateba explosive speed loader (.454)" - desc = "A formidable 6-round .454 speedloader, made exclusively for the Mateba autorevolver. There's an impact charge built into the bullet tip. Firing this at anything will result in a powerful explosion. Use with EXTREME caution." + name = "\improper Unica 6 explosive speed loader (.454)" + desc = "A formidable 6-round .454 speedloader, made exclusively for the Spearhead Unica 6 autorevolver. There's an impact charge built into the bullet tip. Firing this at anything will result in a powerful explosion. Use with EXTREME caution." default_ammo = /datum/ammo/bullet/revolver/mateba/highimpact/explosive ammo_band_color = REVOLVER_TIP_COLOR_EXPLOSIVE @@ -196,7 +196,7 @@ gun_type = /obj/item/weapon/gun/revolver/small //------------------------------------------------------- -//BURST REVOLVER //Mateba is pretty well known. The cylinder folds up instead of to the side. +//BURST REVOLVER //Mateba(Unica) is pretty well known. The cylinder folds up instead of to the side. /obj/item/ammo_magazine/internal/revolver/mateba default_ammo = /datum/ammo/bullet/revolver diff --git a/code/modules/projectiles/magazines/rifles.dm b/code/modules/projectiles/magazines/rifles.dm index a4507c958283..57387e68ced4 100644 --- a/code/modules/projectiles/magazines/rifles.dm +++ b/code/modules/projectiles/magazines/rifles.dm @@ -527,7 +527,7 @@ ammo_band_color = AMMO_BAND_COLOR_HEAP /obj/item/ammo_magazine/rifle/nsg23/incendiary - name = "\improper NSG 23 incindiary magazine (10x24mm)" + name = "\improper NSG 23 incendiary magazine (10x24mm)" desc = "A white phosphorus-tipped incendiary NSG 23 assault rifle magazine." default_ammo = /datum/ammo/bullet/rifle/incendiary ammo_band_color = AMMO_BAND_COLOR_INCENDIARY @@ -647,7 +647,7 @@ ammo_band_color = AMMO_BAND_COLOR_HEAP /obj/item/ammo_magazine/rifle/l23/incendiary - name = "\improper L23 incindiary magazine (8.88x51mm)" + name = "\improper L23 incendiary magazine (8.88x51mm)" desc = "A white phosphorus-tipped incendiary 8.88x51mm L23 assault rifle magazine." default_ammo = /datum/ammo/bullet/rifle/l23/incendiary ammo_band_color = AMMO_BAND_COLOR_INCENDIARY @@ -666,7 +666,7 @@ /obj/item/ammo_magazine/rifle/l64 name = "\improper L64A3 squash-head magazine (8.88x51mm Caseless)" - desc = "A magazine of L10A7 squash-head match-grade 8.88x51mm ammo. " + desc = "A magazine of L10A7 squash-head match-grade 8.88x51mm ammo." caliber = "8.88x51mm" icon = 'icons/obj/items/weapons/guns/ammo_by_faction/TWE/marksman_rifles.dmi' icon_state = "l64" diff --git a/code/modules/projectiles/magazines/shotguns.dm b/code/modules/projectiles/magazines/shotguns.dm index 1095ef964c71..f433820b08a3 100644 --- a/code/modules/projectiles/magazines/shotguns.dm +++ b/code/modules/projectiles/magazines/shotguns.dm @@ -32,6 +32,7 @@ GLOBAL_LIST_INIT(shotgun_boxes_12g, list( flags_magazine = AMMUNITION_REFILLABLE|AMMUNITION_HANDFUL_BOX handful_state = "slug_shell" transfer_handful_amount = 5 + description_ammo = "shells" /obj/item/ammo_magazine/shotgun/attack_self(mob/user) if(current_rounds == 0) diff --git a/code/modules/projectiles/magazines/smgs.dm b/code/modules/projectiles/magazines/smgs.dm index 550ac48676d8..fb70149d9c12 100644 --- a/code/modules/projectiles/magazines/smgs.dm +++ b/code/modules/projectiles/magazines/smgs.dm @@ -271,25 +271,23 @@ //P90, a classic SMG. /obj/item/ammo_magazine/smg/p90 - name = "\improper FN P90 magazine (5.7×28mm)" - desc = "A 5.7×28mm magazine for the FN P90." + name = "\improper FN P90 magazine (5.7x28mm)" + desc = "A 5.7x28mm magazine for the FN P90." default_ammo = /datum/ammo/bullet/smg/p90 - caliber = "5.7×28mm" + caliber = "5.7x28mm" icon = 'icons/obj/items/weapons/guns/ammo_by_faction/colony/smgs.dmi' icon_state = "p90" + bonus_overlay_icon = 'icons/obj/items/weapons/guns/guns_by_faction/colony/smgs.dmi' + bonus_overlay = "p90_mag_overlay" w_class = SIZE_MEDIUM gun_type = /obj/item/weapon/gun/smg/p90 max_rounds = 50 -//------------------------------------------------------- -//P90, a classic SMG.(TWE version) -/obj/item/ammo_magazine/smg/p90/twe - name = "\improper FN P90 AP magazine (5.7×28mm)" - desc = "An armor-piercing 5.7×28mm magazine for the FN P90." - default_ammo = /datum/ammo/bullet/smg/p90/twe_ap - caliber = "5.7×28mm" +/obj/item/ammo_magazine/smg/p90/ap + name = "\improper FN P90 AP magazine (5.7x28mm)" + desc = "An armor-piercing 5.7x28mm magazine for the FN P90." + default_ammo = /datum/ammo/bullet/smg/p90/ap icon = 'icons/obj/items/weapons/guns/ammo_by_faction/TWE/smgs.dmi' - icon_state = "p90_twe" - w_class = SIZE_MEDIUM - gun_type = /obj/item/weapon/gun/smg/p90/twe - max_rounds = 50 + icon_state = "p90_ap" + bonus_overlay_icon = 'icons/obj/items/weapons/guns/guns_by_faction/colony/smgs.dmi' + bonus_overlay = "p90_ap_overlay" diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 79c7fa08bc34..db1fa69de519 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -16,6 +16,7 @@ alpha = 0 // We want this thing to be transparent when it drops on a turf because it will be on the user's turf. We then want to make it opaque as it travels. layer = FLY_LAYER animate_movement = NO_STEPS //disables gliding because it fights against what animate() is doing + blocks_emissive = EMISSIVE_BLOCK_GENERIC var/datum/ammo/ammo //The ammo data which holds most of the actual info. @@ -258,6 +259,14 @@ SSprojectiles.queue_projectile(src) /obj/projectile/proc/update_angle(turf/source_turf, turf/aim_turf) + var/datum/turf_reservation/reservation = SSmapping.used_turfs[loc] + if(reservation && (reservation.is_below(source_turf, aim_turf))) + source_turf = SSmapping.get_turf_above(source_turf) + else + if(reservation && (reservation.is_below(aim_turf, source_turf))) + aim_turf = SSmapping.get_turf_above(aim_turf) + + p_x = clamp(p_x, -16, 16) p_y = clamp(p_y, -16, 16) @@ -940,7 +949,7 @@ . = TRUE bullet_message(P, damaging = damage) if(damage) - apply_damage(damage, P.ammo.damage_type, P.def_zone, 0, 0, P) + apply_damage(damage, P.ammo.damage_type, P.def_zone, 0, 0, P, enviro=P.ammo.damage_enviro) P.play_hit_effect(src) SEND_SIGNAL(P, COMSIG_BULLET_ACT_LIVING, src, damage, damage) @@ -973,8 +982,8 @@ apply_stamina_damage(P.ammo.stamina_damage, P.def_zone, ARMOR_ENERGY) // Stamina damage is energy //Shields - if( !(ammo_flags & AMMO_ROCKET) ) //No, you can't block rockets. - if(prob(75) && check_shields(damage * 0.65, "[P]") ) // Lower chance to block bullets + if(!(ammo_flags & AMMO_ROCKET)) //No, you can't block rockets. + if(check_shields("[P]", get_dir(src, P.firer), attack_type = SHIELD_ATTACK_PROJECTILE)) // Lower chance to block bullets P.ammo.on_shield_block(src) bullet_ping(P) return @@ -1032,7 +1041,7 @@ handle_blood_splatter(splatter_dir) . = TRUE - apply_damage(damage_result, P.ammo.damage_type, P.def_zone, firer = P.firer) + apply_damage(damage_result, P.ammo.damage_type, P.def_zone, firer=P.firer, enviro=P.ammo.damage_enviro) if(P.ammo.shrapnel_chance > 0 && prob(P.ammo.shrapnel_chance + floor(damage / 10))) if(ammo_flags & AMMO_SPECIAL_EMBED) @@ -1071,7 +1080,7 @@ var/ammo_flags = P.ammo.flags_ammo_behavior | P.projectile_override_flags - if((ammo_flags & AMMO_FLAME) && (caste.fire_immunity & (FIRE_IMMUNITY_NO_IGNITE|FIRE_IMMUNITY_NO_DAMAGE))) + if((ammo_flags & AMMO_FLAME) && (fire_immunity & (FIRE_IMMUNITY_NO_IGNITE || FIRE_IMMUNITY_NO_DAMAGE || FIRE_IMMUNITY_COMPLETE))) to_chat(src, SPAN_AVOIDHARM("You shrug off the glob of flame.")) bullet_message(P, damaging = FALSE) return @@ -1104,6 +1113,7 @@ "armor_integrity" = armor_integrity, "direction" = P.dir, "armour_type" = GLOB.xeno_ranged, + "enviro" = P.ammo.damage_enviro, ) SEND_SIGNAL(src, COMSIG_XENO_PRE_CALCULATE_ARMOURED_DAMAGE_PROJECTILE, damagedata) damage_result = armor_damage_reduction(GLOB.xeno_ranged, damagedata["damage"], @@ -1131,7 +1141,7 @@ //only apply the blood splatter if we do damage handle_blood_splatter(get_dir(P.starting, loc)) - apply_damage(damage_result,P.ammo.damage_type, P.def_zone) //Deal the damage. + apply_damage(damage_result,P.ammo.damage_type, P.def_zone, enviro=P.ammo.damage_enviro) //Deal the damage. if(length(xeno_shields)) P.play_shielded_hit_effect(src) else diff --git a/code/modules/reagents/Chemistry-Generator.dm b/code/modules/reagents/Chemistry-Generator.dm index 1494242e388e..691af1546d29 100644 --- a/code/modules/reagents/Chemistry-Generator.dm +++ b/code/modules/reagents/Chemistry-Generator.dm @@ -38,31 +38,34 @@ var/failed_attempts = 0 //safety for if a recipe can not be found //pick components - for(var/i = 1, i <= 3, i++) + var/desired_amount_of_chems = rand(3, max(min(gen_tier*2, 4),3)) + var/list/cache_reagents_to_add = required_reagents_to_add + for(var/i = 1, i <= desired_amount_of_chems, i++) if(i >= 2) //only the first component should have a modifier higher than 1 modifier = 1 if(complexity) add_component(my_modifier = modifier, class = complexity[i]) - else if (required_reagents_to_add) - for(var/chemical_iteration in required_reagents_to_add) + else if (cache_reagents_to_add) + for(var/chemical_iteration in cache_reagents_to_add) if(i == 1) add_component(chemical_iteration, modifier) else add_component(chemical_iteration, 1) - LAZYREMOVE(required_reagents_to_add, chemical_iteration) + LAZYREMOVE(cache_reagents_to_add, chemical_iteration) continue else add_component(null, modifier) //make sure the final recipe is not already being used. If it is, start over. - if(i == 3 && (check_duplicate() || check_reaction_uses_all_default_medical())) + if(i == desired_amount_of_chems && (check_duplicate() || check_reaction_uses_all_default_medical())) required_reagents = list() if(failed_attempts > 10) return FALSE i = 0 + cache_reagents_to_add = required_reagents_to_add failed_attempts++ //pick catalyst - if(prob(40) || gen_tier >= 4)//chance of requiring a catalyst + if(prob(20) && gen_tier >= 2)//chance of requiring a catalyst add_component(null,5,TRUE) var/list/indicator_list= list( "CHEM_REACTION_CALM" = CHEM_REACTION_CALM, @@ -112,7 +115,7 @@ else chem_id = pick(GLOB.chemical_gen_classes_list["C4"]) if(3) - if(roll<=70) + if(roll<=80) chem_id = pick(GLOB.chemical_gen_classes_list[pick("C1", "C2")]) else chem_id = pick(GLOB.chemical_gen_classes_list["H1"]) @@ -189,6 +192,8 @@ if(!no_properties) var/gen_value var/properties_buff = rand(3, 4) + if(gen_tier == 2) + properties_buff -= 2 ///do we have a rare property in a low quality paper. In which case every other property will be negative. var/specific_property = "none" for(var/i in 1 to gen_tier+properties_buff) @@ -211,10 +216,19 @@ //OD ratios overdose = 5 - for(var/i=1;i<=rand(max(gen_tier*2, 4),9);i++) //We add 5 units to the overdose per cycle, min 30u, max 60u + var/overdose_multiplier = 2 + if(gen_tier == 1) + overdose_multiplier = rand(gen_tier, overdose_multiplier) //10-15 + if(gen_tier == 2) + overdose_multiplier = 6 + overdose_multiplier = rand(gen_tier+2, overdose_multiplier) //25 - 35 + else if(gen_tier >= 3) + overdose_multiplier = 9 + overdose_multiplier = rand(gen_tier+3, overdose_multiplier) //35 - 45 + for(var/i = 1; i<=overdose_multiplier; i++) //We add 5 units to the overdose per cycle, min 10u, max 40u - depending on the gen tier. overdose += 5 overdose_critical = overdose + 5 - for(var/i=1;i<=rand(1,5);i++) //overdose_critical is min 5u, to max 30u + normal overdose + for(var/i = 1; i<=rand(1,3); i++) //overdose_critical is min 5u, to max 30u + normal overdose if(prob(20 + 2*gen_tier)) overdose_critical += 5 diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index 812092fea5dc..e761c00acd5b 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -252,11 +252,11 @@ continue else if(current.original_id == reagent.original_id || current.id == reagent.original_id) //Merge into the original - var/volume_factor = clamp((max(current.overdose - reagent.overdose, 5) / 5)-1, 1, 3) - if(max(current.overdose, 5)/5 < 3) + var/volume_factor = clamp((max(abs(current.overdose - reagent.overdose), 5) / 5), 1, 3) + if(max(current.overdose, 5)/5 < 2) volume_factor = 1 reagent_list -= reagent - current.volume += floor(reagent.volume / volume_factor) + add_reagent(current.id, floor(reagent.volume / volume_factor)) var/list/seen = viewers(4, get_turf(my_atom)) for(var/mob/seen_mob in seen) if(volume_factor == 1) @@ -282,7 +282,7 @@ total_matching_reagents++ multipliers += floor(get_reagent_amount(required_reagent) / reaction.required_reagents[required_reagent]) for(var/catalyst in reaction.required_catalysts) - if(catalyst == "silver" && istype(my_atom, /obj/item/reagent_container/glass/beaker/silver)) + if(catalyst == "silver" && istype(my_atom, /obj/item/reagent_container/glass/beaker/catalyst/silver)) total_matching_catalysts++ continue if(!has_reagent(catalyst, reaction.required_catalysts[catalyst])) @@ -307,7 +307,7 @@ var/created_volume = reaction.result_amount*multiplier if(reaction.result) - multiplier = max(multiplier, 1) //this shouldnt happen ... + multiplier = max(multiplier, 1) //this shouldn't happen ... set_data(reaction.result, preserved_data) if(CHECK_BITFIELD(reaction.reaction_type, CHEM_REACTION_CALM) && !CHECK_BITFIELD(reaction.reaction_type, CHEM_REACTION_ENDOTHERMIC)) //mix the chemicals if(endothermic_reaction_occuring) @@ -751,7 +751,7 @@ shards += floor(reagent.volume) else if(reagent.id == "phoron" && reagent.volume >= EXPLOSION_PHORON_THRESHOLD) shard_type = /datum/ammo/bullet/shrapnel/incendiary - else if(reagent.id == "sulphuric acid" && reagent.volume >= EXPLOSION_ACID_THRESHOLD) + else if(reagent.id == "pacid" && reagent.volume >= EXPLOSION_ACID_THRESHOLD) shard_type = /datum/ammo/bullet/shrapnel/hornet_rounds else if(reagent.id == "neurotoxinplasma" && reagent.volume >= EXPLOSION_NEURO_THRESHOLD) shard_type = /datum/ammo/bullet/shrapnel/neuro diff --git a/code/modules/reagents/Chemistry-Readme.dm b/code/modules/reagents/Chemistry-Readme.dm index 9de491fbfe2b..9491e2b5bdf3 100644 --- a/code/modules/reagents/Chemistry-Readme.dm +++ b/code/modules/reagents/Chemistry-Readme.dm @@ -41,7 +41,7 @@ About the Holder: metabolize(mob/M) This proc is called by the mobs life proc. It simply calls on_mob_life for - all contained reagents. You shouldnt have to use this one directly. + all contained reagents. You shouldn't have to use this one directly. handle_reactions() This proc check all recipes and, on a match, uses them. @@ -72,7 +72,7 @@ About the Holder: proc. The method var is used for reaction on mobs. It simply tells us if the mob TOUCHed the reagent or if it INGESTed the reagent. Since the volume can be checked in a reagents proc, you might want to - use the volume_modifier var to modifiy the passed value without actually + use the volume_modifier var to modify the passed value without actually changing the volume of the reagents. If you're not sure if you need to use this the answer is very most likely 'No'. You'll want to use this proc whenever an atom first comes in @@ -81,7 +81,7 @@ About the Holder: add_reagent(reagent, amount, data) Attempts to add X of the matching reagent to the holder. - You wont use this much. Mostly in new procs for pre-filled + You won't use this much. Mostly in new procs for pre-filled objects. remove_reagent(reagent, amount) @@ -121,14 +121,14 @@ About Reagents: rejuvs over water to ... iron. Each reagent also has a few procs - i'll explain those below. reaction_mob(mob/M, method=TOUCH) - This is called by the holder's reation proc. + This is called by the holder's reaction proc. This version is only called when the reagent reacts with a mob. The method var can be either TOUCH or INGEST. You'll want to put stuff like acid-facemelting in here. reaction_obj(obj/O) - This is called by the holder's reation proc. + This is called by the holder's reaction proc. This version is called when the reagents reacts with an object. You'll want to put stuff like object melting in here ... or something. i dunno. @@ -142,7 +142,7 @@ About Reagents: on_mob_life(mob/M) This proc is called everytime the mobs life proc executes. This is the place where you put damage for toxins , - drowsyness for sleep toxins etc etc. + drowsiness for sleep toxins etc etc. You'll want to call the parents proc by using ..() . If you don't, the chemical will stay in the mob forever - unless you write your own piece of code to slowly remove it. @@ -197,14 +197,14 @@ About Recipes: required_reagents This is a list of ids of the required reagents. Each id also needs an associated value that gives us the minimum required amount - of that reagent. The handle_reaction proc can detect mutiples of the same recipes + of that reagent. The handle_reaction proc can detect multiples of the same recipes so for most cases you want to set the required amount to 1. required_catalysts (Added May 2011) This is a list of the ids of the required catalysts. Functionally similar to required_reagents, it is a list of reagents that are required for the reaction. However, unlike required_reagents, catalysts are NOT consumed. - They mearly have to be present in the container. + They merely have to be present in the container. result_amount This is the amount of the resulting reagent this recipe will produce. diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 7b929772af81..ea9ac9bf00a7 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -202,6 +202,8 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent()) var/overdose_message = "[istype(src, /datum/reagent/generated) ? "custom chemical" : initial(name)] overdose" M.last_damage_data = create_cause_data(overdose_message, last_source_mob?.resolve()) + process_non_property_effects(M, mods, delta_time) + if(mods[REAGENT_PURGE]) holder.remove_all_type(/datum/reagent,mods[REAGENT_PURGE] * delta_time) @@ -380,3 +382,6 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent()) if(holder && holder.my_atom && ishuman(holder.my_atom)) var/mob/living/carbon/human/H = holder.my_atom H.pain.reset_pain_reduction() + +/datum/reagent/proc/process_non_property_effects(mob/living/M, list/mods, delta_time) + return diff --git a/code/modules/reagents/chemical_research/Chemical-Research.dm b/code/modules/reagents/chemical_research/Chemical-Research.dm index 2756a2f14510..cbdf605a12b4 100644 --- a/code/modules/reagents/chemical_research/Chemical-Research.dm +++ b/code/modules/reagents/chemical_research/Chemical-Research.dm @@ -158,7 +158,7 @@ GLOBAL_DATUM_INIT(chemical_data, /datum/chemical_data, new) contract_chems = list() for(var/i in 1 to RESEARCH_CONTRACT_CHEM_AMOUNT) var/datum/reagent/generated/contract_chemical = new /datum/reagent/generated - contract_chemical.id = "contract-chem-[i]"// we dont actually create the recipe for it or give it a proper id, frankly that would be too much pain to remove when we reroll them + contract_chemical.id = "contract-chem-[i]"// we don't actually create the recipe for it or give it a proper id, frankly that would be too much pain to remove when we reroll them contract_chemical.generate_name() contract_chemical.gen_tier = rand(1,3) //easy, hard and medium contract_chemical.generate_stats() diff --git a/code/modules/reagents/chemistry_machinery/acid_harness.dm b/code/modules/reagents/chemistry_machinery/acid_harness.dm index c82775eee251..a181217ea9e2 100644 --- a/code/modules/reagents/chemistry_machinery/acid_harness.dm +++ b/code/modules/reagents/chemistry_machinery/acid_harness.dm @@ -37,6 +37,10 @@ #define ACID_VITALS_EMERGENCY 32 #define ACID_VITALS_DEAD 64 +#define ACID_CONTAINER_MAXIMUM_VOLUME 60 + +#define ACID_DEFAULT_SCAN_INTERVAL 15 SECONDS + /obj/item/storage/internal/accessory/black_vest/acid_harness storage_slots = 2 can_hold = list( @@ -44,12 +48,20 @@ /obj/item/cell, ) +/obj/item/storage/internal/accessory/black_vest/acid_harness/can_be_inserted(obj/item/object_to_insert, mob/living/user, stop_messages = FALSE) + if(istype(object_to_insert, /obj/item/reagent_container/glass/beaker)) + var/obj/item/reagent_container/glass/beaker/beaker_check = object_to_insert + if(!beaker_check.reagents || beaker_check.reagents.maximum_volume > ACID_CONTAINER_MAXIMUM_VOLUME) + to_chat(user, SPAN_WARNING("[object_to_insert] is too large for [src].")) + return + . = ..() + /obj/item/clothing/accessory/storage/black_vest/acid_harness name = "A.C.I.D. Harness" desc = "Automated Chemical Integrated Delivery Harness, or really just a franken webbing made by a researcher with poor tailoring skills. Can be configured with a multitool." icon_state = "vest_acid_black" hold = /obj/item/storage/internal/accessory/black_vest/acid_harness - var/obj/item/reagent_container/glass/beaker/vial/vial + var/obj/item/reagent_container/glass/beaker/beaker var/obj/item/cell/battery var/obj/structure/machinery/acid_core/acid_core @@ -70,7 +82,7 @@ . = ..() /obj/item/clothing/accessory/storage/black_vest/acid_harness/Destroy() - QDEL_NULL(vial) + QDEL_NULL(beaker) QDEL_NULL(battery) QDEL_NULL(acid_core) . = ..() @@ -159,42 +171,52 @@ . = ..() if(.) return - - switch(action) - if("set_inject_amount") - var/inject = floor(text2num(params["value"])) - if(inject < 1) - inject = 1 - acid_core.inject_amount = inject - . = TRUE - if("set_inject_damage_threshold") - acid_core.inject_damage_threshold = floor(text2num(params["value"])) - . = TRUE - if("inject_logic") - if(acid_core.inject_logic == ACID_LOGIC_OR) - acid_core.inject_logic = ACID_LOGIC_AND - else - acid_core.inject_logic = ACID_LOGIC_OR - . = TRUE - if("configurate") - var/flag_value = params["config_value"] - switch(params["config_type"]) - if("Damage") - if(acid_core.inject_damage_types & flag_value) - acid_core.inject_damage_types &= ~flag_value - else - acid_core.inject_damage_types |= flag_value - if("Conditions") - if(acid_core.inject_conditions & flag_value) - acid_core.inject_conditions &= ~flag_value - else - acid_core.inject_conditions |= flag_value - if("Vitals") - if(acid_core.inject_vitals & flag_value) - acid_core.inject_vitals &= ~flag_value + var/mob/living/carbon/human/human_wearer + if(ishuman(loc)) + human_wearer = loc //In hand + else if(ishuman(loc.loc)) + human_wearer = loc.loc //On uniform I hope. + if(human_wearer) + var/obj/item/right_hand = human_wearer.get_active_hand() + var/obj/item/left_hand = human_wearer.get_inactive_hand() + if((left_hand && HAS_TRAIT(left_hand, TRAIT_TOOL_MULTITOOL)) || (right_hand && HAS_TRAIT(right_hand, TRAIT_TOOL_MULTITOOL))) + switch(action) + if("set_inject_amount") + var/inject = floor(text2num(params["value"])) + if(inject < 1) + inject = 1 + acid_core.inject_amount = inject + . = TRUE + if("set_inject_damage_threshold") + acid_core.inject_damage_threshold = floor(text2num(params["value"])) + . = TRUE + if("inject_logic") + if(acid_core.inject_logic == ACID_LOGIC_OR) + acid_core.inject_logic = ACID_LOGIC_AND else - acid_core.inject_vitals |= flag_value - . = TRUE + acid_core.inject_logic = ACID_LOGIC_OR + . = TRUE + if("configurate") + var/flag_value = params["config_value"] + switch(params["config_type"]) + if("Damage") + if(acid_core.inject_damage_types & flag_value) + acid_core.inject_damage_types &= ~flag_value + else + acid_core.inject_damage_types |= flag_value + if("Conditions") + if(acid_core.inject_conditions & flag_value) + acid_core.inject_conditions &= ~flag_value + else + acid_core.inject_conditions |= flag_value + if("Vitals") + if(acid_core.inject_vitals & flag_value) + acid_core.inject_vitals &= ~flag_value + else + acid_core.inject_vitals |= flag_value + . = TRUE + else + to_chat(human_wearer, SPAN_WARNING("You need a multi-tool to modify these configurations.")) /obj/structure/machinery/acid_core name = "A.C.I.D. CORE" @@ -219,6 +241,9 @@ var/battery_level = FALSE var/rechecking = FALSE + var/scan_interval = ACID_DEFAULT_SCAN_INTERVAL + var/last_scan_time + /obj/structure/machinery/acid_core/Initialize(mapload, ...) ..() return INITIALIZE_HINT_LATELOAD @@ -238,7 +263,7 @@ return text += SPAN_NOTICE("Welcome, to the Automated Chemical Integrated Delivery harness.") if(1) - text += SPAN_NOTICE("Core systems, initialized.") + text += SPAN_NOTICE("Standby for Main Systems initialization...") if(2) text += SPAN_NOTICE("Communication interface, online.") playsound_client(user.client, 'sound/handling/toggle_nv1.ogg', null, ITEM_EQUIP_VOLUME) @@ -246,10 +271,10 @@ text += SPAN_NOTICE("Vital signs monitoring, activated.") playsound_client(user.client, 'sound/items/detector_turn_on.ogg', null, ITEM_EQUIP_VOLUME) if(4) - text += SPAN_NOTICE("Automated medical systems, engaged.") + text += SPAN_NOTICE("Automated medical systems engaged.") playsound_client(user.client, 'sound/items/healthanalyzer.ogg', null, ITEM_EQUIP_VOLUME) if(5) - text += SPAN_NOTICE("Bootup sequence finalized. Have a very healthy operation.") + text += SPAN_NOTICE("Bootup sequence completed. Have a very healthy operation.") else return to_chat(user, text) @@ -266,13 +291,13 @@ if(ACID_VITALS_NOMINAL) text += SPAN_NOTICE("Vital signs nominal.") if(ACID_VITALS_DROPPING) - text += SPAN_WARNING("Vital signs dropping. Medical attention is adviced.") + text += SPAN_WARNING("Vital signs dropping. Medical attention is advised.") if(ACID_VITALS_LOW) text += SPAN_WARNING("Vital signs low. Seek medical attention.") if(ACID_VITALS_CRITICAL) - text += SPAN_DANGER("Warning: Vitals signs critical. Seek medical attention immediately.") + text += SPAN_DANGER("Warning: Vitals signs critical. Seek immediate medical attention.") if(ACID_VITALS_EMERGENCY) - text += SPAN_HIGHDANGER("EMERGENCY. USER. DEATH. IMMINENT.") + text += SPAN_HIGHDANGER("EMERGENCY! USER. DEATH. IMMINENT.") else switch(voiceline) if(ACID_SCAN_CONDITION_BLEEDING) @@ -300,7 +325,9 @@ if(boot_status < 6) addtimer(CALLBACK(src, PROC_REF(boot_sequence), boot_status), 2 SECONDS) return - scan() + if(world.time > last_scan_time + scan_interval) + last_scan_time = world.time + scan() /obj/structure/machinery/acid_core/proc/check_user() if(acid_harness.loc && acid_harness.loc.loc && ishuman(acid_harness.loc.loc)) @@ -311,10 +338,10 @@ /obj/structure/machinery/acid_core/proc/check_inventory() acid_harness.battery = null - acid_harness.vial = null + acid_harness.beaker = null for(var/item in acid_harness.hold.contents) - if(istype(item, /obj/item/reagent_container/glass/beaker/vial)) - acid_harness.vial = item + if(istype(item, /obj/item/reagent_container/glass/beaker)) + acid_harness.beaker = item else if(istype(item, /obj/item/cell)) acid_harness.battery = item if(acid_harness.battery) @@ -325,12 +352,9 @@ battery.charge = max(battery.charge - 10, 0) var/charge = battery.charge / battery.maxcharge * 100 if(charge + 20 < battery_level || charge > battery_level) - battery_level = charge + battery_level = round(charge, 1.1) voice("Energy is at, [charge]%.") -/obj/structure/machinery/acid_core/proc/recheck_conditions() - rechecking = TRUE - /obj/structure/machinery/acid_core/proc/scan() var/damage_scan = FALSE var/condition_scan = FALSE @@ -446,7 +470,7 @@ if(inject_conditions & ACID_SCAN_CONDITION_CONCUSSION && (HAS_TRAIT(src, TRAIT_KNOCKEDOUT) || HAS_TRAIT(src, TRAIT_FLOORED))) condition_scan |= ACID_SCAN_CONDITION_CONCUSSION - if(inject_conditions & ACID_SCAN_CONDITION_INTOXICATION && (HAS_TRAIT(src, TRAIT_DAZED) || user.slowed || user.confused || user.drowsyness || user.dizziness || user.druggy)) + if(inject_conditions & ACID_SCAN_CONDITION_INTOXICATION && (HAS_TRAIT(src, TRAIT_DAZED) || user.slowed || user.confused || user.drowsiness || user.dizziness || user.druggy)) condition_scan |= ACID_SCAN_CONDITION_INTOXICATION //Compare @@ -470,17 +494,20 @@ inject() /obj/structure/machinery/acid_core/proc/inject() - if(!acid_harness.vial || !acid_harness.vial.reagents) - voice("Warning: Medicinal capsule missing.") + if(!acid_harness.beaker || !acid_harness.beaker.reagents) + voice("Warning: Medicinal container missing.") return - for(var/datum/reagent/R in acid_harness.vial.reagents.reagent_list) - if(user.reagents.get_reagent_amount(R.id) + inject_amount > R.overdose) //Don't overdose our boi + for(var/datum/reagent/R in acid_harness.beaker.reagents.reagent_list) + var/amount_in_inject = (acid_harness.beaker.reagents.get_reagent_amount(R.id) / acid_harness.beaker.reagents.total_volume) * inject_amount + if(R.overdose && (user.reagents.get_reagent_amount(R.id) + amount_in_inject) > R.overdose) //Don't overdose our boi voice("Notice: Injection trigger cancelled to avoid overdose.") - addtimer(CALLBACK(src, PROC_REF(recheck_conditions)), 20 SECONDS * inject_amount) + scan_interval = ACID_DEFAULT_SCAN_INTERVAL + ((ACID_DEFAULT_SCAN_INTERVAL*0.2) * inject_amount) //Add 20% of scan time per reagent unit ontop of normal scan time for a bigger period inbetween + rechecking = TRUE return - if(acid_harness.vial.reagents.trans_to(user, inject_amount)) + if(acid_harness.beaker.reagents.trans_to(user, inject_amount)) playsound_client(user.client, 'sound/items/hypospray.ogg', null, ITEM_EQUIP_VOLUME) - voice("Medicine administered. [acid_harness.vial.reagents.total_volume] units remaining.") - addtimer(CALLBACK(src, PROC_REF(recheck_conditions)), 20 SECONDS * inject_amount) - if(!acid_harness.vial.reagents.total_volume) - voice("Warning: Medicinal capsule is empty, resupply required.") + voice("Medicine administered. [acid_harness.beaker.reagents.total_volume] units remaining.") + scan_interval = ACID_DEFAULT_SCAN_INTERVAL + ((ACID_DEFAULT_SCAN_INTERVAL*0.15) * inject_amount) + rechecking = TRUE + if(!acid_harness.beaker.reagents.total_volume) + voice("Warning: Medicinal container is empty, resupply required.") diff --git a/code/modules/reagents/chemistry_machinery/centrifuge.dm b/code/modules/reagents/chemistry_machinery/centrifuge.dm index 676de65dc972..76c1a0c60818 100644 --- a/code/modules/reagents/chemistry_machinery/centrifuge.dm +++ b/code/modules/reagents/chemistry_machinery/centrifuge.dm @@ -108,7 +108,7 @@ /obj/structure/machinery/centrifuge/tgui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) - ui = new(user, src, "Centrifuge", "[src.name]") + ui = new(user, src, "Centrifuge", "[capitalize(name)]") ui.open() /obj/structure/machinery/centrifuge/ui_state(mob/user) diff --git a/code/modules/reagents/chemistry_machinery/chem_dispenser.dm b/code/modules/reagents/chemistry_machinery/chem_dispenser.dm index 940d4dec2160..527538abbfaa 100644 --- a/code/modules/reagents/chemistry_machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry_machinery/chem_dispenser.dm @@ -20,10 +20,11 @@ var/network = "Ground" var/amount = 30 var/accept_beaker_only = TRUE - var/pressurized_only = FALSE var/obj/item/reagent_container/beaker = null var/ui_check = 0 - var/static/list/possible_transfer_amounts = list(5,10,20,30,40) + var/static/list/possible_transfer_amounts = list(5,10,15,20,30,40,60) + /// List of typepaths for reagent containers that a chem dispenser will accept; all containers allowed if empty. + var/list/whitelisted_containers = list() var/list/dispensable_reagents = list( "hydrogen", "lithium", @@ -58,18 +59,18 @@ /obj/structure/machinery/chem_dispenser/research network = "Research" -/obj/structure/machinery/chem_dispenser/process() - if(!chem_storage) - chem_storage = GLOB.chemical_data.connect_chem_storage(network) /obj/structure/machinery/chem_dispenser/Initialize() - . = ..() + ..() dispensable_reagents = sortList(dispensable_reagents) - start_processing() + return INITIALIZE_HINT_LATELOAD + +/obj/structure/machinery/chem_dispenser/LateInitialize() + chem_storage = GLOB.chemical_data.connect_chem_storage(network) /obj/structure/machinery/chem_dispenser/Destroy() - if(!chem_storage) - chem_storage = GLOB.chemical_data.disconnect_chem_storage(network) + GLOB.chemical_data.disconnect_chem_storage(network) + chem_storage = null return ..() /obj/structure/machinery/chem_dispenser/ex_act(severity) @@ -212,10 +213,12 @@ /obj/structure/machinery/chem_dispenser/attackby(obj/item/reagent_container/attacking_object, mob/user) if(istype(attacking_object, /obj/item/reagent_container/glass) || istype(attacking_object, /obj/item/reagent_container/food)) if(accept_beaker_only && istype(attacking_object,/obj/item/reagent_container/food)) - to_chat(user, SPAN_NOTICE("This machine only accepts beakers")) + to_chat(user, SPAN_NOTICE("This machine only accepts beakers.")) return - if(pressurized_only && !istype(attacking_object, /obj/item/reagent_container/glass/pressurized_canister)) - to_chat(user, SPAN_NOTICE("This machine only accepts pressurized canisters")) + //If the dispenser has a whitelist with stuff in it, and the attacking object ain't in there, don't accept it. + if(length(whitelisted_containers) && !(attacking_object.type in whitelisted_containers)) + //Currently this is only used for pressurized disepnsers + to_chat(user, SPAN_WARNING("This machine doesn't accept that container.")) return if(user.drop_inv_item_to_loc(attacking_object, src)) var/obj/item/old_beaker = beaker @@ -279,7 +282,10 @@ ui_title = "Chem Dispenser 4000" req_skill_level = SKILL_MEDICAL_MEDIC accept_beaker_only = FALSE - pressurized_only = TRUE + whitelisted_containers = list( + /obj/item/reagent_container/glass/pressurized_canister, + /obj/item/reagent_container/glass/minitank //MS-11 Smart Refill Tank + ) dispensable_reagents = list( "bicaridine", "kelotane", @@ -335,6 +341,7 @@ "grapejuice", "lemonjuice", "banana", + "chocolatesyrup", ) hacked_reagents = list( "milk", diff --git a/code/modules/reagents/chemistry_machinery/chem_master.dm b/code/modules/reagents/chemistry_machinery/chem_master.dm index 8d68fa90a842..a295ad0ccd7b 100644 --- a/code/modules/reagents/chemistry_machinery/chem_master.dm +++ b/code/modules/reagents/chemistry_machinery/chem_master.dm @@ -15,10 +15,12 @@ var/obj/item/reagent_container/beaker = null var/list/loaded_pill_bottles = list() var/list/loaded_pill_bottles_to_fill = list() + var/list/presets = list() var/mode = 0 var/condi = 0 var/useramount = 30 // Last used amount var/pillamount = 16 + var/bottle_autoselect = FALSE //Toggle for whether extra new bottles are added to to_fill list var/bottlesprite = "1" //yes, strings var/pillsprite = "1" var/client/has_sprites = list() @@ -63,34 +65,76 @@ icon_state = (beaker?"[base_state]1":"[base_state]0") -/obj/structure/machinery/chem_master/attackby(obj/item/inputed_item, mob/living/user) - if(istype(inputed_item, /obj/item/reagent_container/glass)) +/obj/structure/machinery/chem_master/attackby(obj/item/inputted_item, mob/living/user) + if(istype(inputted_item, /obj/item/reagent_container/glass)) var/obj/item/old_beaker = beaker - beaker = inputed_item - user.drop_inv_item_to_loc(inputed_item, src) + beaker = inputted_item + user.drop_inv_item_to_loc(inputted_item, src) if(old_beaker) - to_chat(user, SPAN_NOTICE("You swap out \the [old_beaker] for \the [inputed_item].")) + to_chat(user, SPAN_NOTICE("You swap out \the [old_beaker] for \the [inputted_item].")) user.put_in_hands(old_beaker) else - to_chat(user, SPAN_NOTICE("You add the beaker to the machine!")) + to_chat(user, SPAN_NOTICE("You add \the [inputted_item] to the machine!")) SStgui.update_uis(src) update_icon() + return + + if(!pill_maker) + return - else if(istype(inputed_item, /obj/item/storage/pill_bottle) && pill_maker) - var/obj/item/storage/pill_bottle/bottle = inputed_item + if(istype(inputted_item, /obj/item/storage/pill_bottle)) + var/obj/item/storage/pill_bottle/bottle = inputted_item if(length(loaded_pill_bottles) >= max_bottles_count) - to_chat(user, SPAN_WARNING("Machine is fully loaded by pill bottles.")) + to_chat(user, SPAN_WARNING("[src] is fully loaded with pill bottles.")) return - loaded_pill_bottles += bottle - if (length(loaded_pill_bottles) == 1 || length(loaded_pill_bottles_to_fill) == 0) - loaded_pill_bottles_to_fill += bottle + add_pill_bottle(bottle) user.drop_inv_item_to_loc(bottle, src) to_chat(user, SPAN_NOTICE("You add the pill bottle into the dispenser slot!")) SStgui.update_uis(src) - return + return + + if(istype(inputted_item, /obj/item/storage/box/pillbottles)) + + var/obj/item/storage/box/pillbottles/box = inputted_item + + if(length(loaded_pill_bottles) >= max_bottles_count) + to_chat(user, SPAN_WARNING("[src] is fully loaded with pill bottles.")) + return + + if(length(box.contents) <= 0) + to_chat(user, SPAN_WARNING("\The [box] is empty and cannot be unloaded into [src].")) + return + + user.visible_message(SPAN_NOTICE("[user] starts to empty \the [box] into [src]..."), + SPAN_NOTICE("You start to empty \the [box] into [src]...")) + var/waiting_time = min(length(box.contents), max_bottles_count - length(loaded_pill_bottles)) * box.time_to_empty + + if(!do_after(user, waiting_time, INTERRUPT_NO_NEEDHAND|BEHAVIOR_IMMOBILE, BUSY_ICON_FRIENDLY, src)) + user.visible_message(SPAN_NOTICE("[user] stops trying to empty \the [box] into [src]."), + SPAN_WARNING("You get distracted and stop trying to empty \the [box] into [src].")) + return + + playsound(user.loc, box.use_sound, 25, TRUE, 3) + + for(var/obj/item/storage/pill_bottle/bottle in box.contents) + if(length(loaded_pill_bottles) >= max_bottles_count) + to_chat(user, SPAN_WARNING("[src] is fully loaded with pill bottles.")) + return + add_pill_bottle(bottle) + box.forced_item_removal(bottle) + + SStgui.update_uis(src) + +/obj/structure/machinery/chem_master/proc/add_pill_bottle(obj/item/storage/pill_bottle/bottle) + + loaded_pill_bottles += bottle + + if (length(loaded_pill_bottles) == 1 || length(loaded_pill_bottles_to_fill) == 0 || bottle_autoselect) + loaded_pill_bottles_to_fill += bottle + /obj/structure/machinery/chem_master/proc/transfer_chemicals(obj/dest, obj/source, amount, reagent_id) if(istype(source)) @@ -108,11 +152,15 @@ /obj/structure/machinery/chem_master/ui_data(mob/user) . = ..() + if(user?.client?.prefs) + var/list/presets = user.client.prefs.get_all_chem_presets() + .["presets"] = presets .["is_connected"] = !!connected .["mode"] = mode .["pillsprite"] = pillsprite .["bottlesprite"] = bottlesprite + .["bottle_autoselect"] = bottle_autoselect .["pill_bottles"] = list() if(length(loaded_pill_bottles) > 0) @@ -180,6 +228,198 @@ return switch(action) + if("set_quick_access") + if(!user.client?.prefs) + return TRUE + + var/preset_name = params["name"] + if(!preset_name) + return TRUE + + var/list/preset_data = user.client.prefs.get_chem_preset(preset_name) + if(!preset_data) + return TRUE + + var/slot = params["slot"] + if(slot == null) + // Store label before removing from quick access + var/stored_label = preset_data["quick_access_label"] + + preset_data -= "quick_access_slot" + preset_data -= "quick_access_label" + + // Store the label in a separate key so it persists + if(stored_label) + preset_data["stored_quick_access_label"] = stored_label + else + preset_data["quick_access_slot"] = slot + + // Restore previous label if it exists + if(!preset_data["quick_access_label"]) + if(preset_data["stored_quick_access_label"]) + preset_data["quick_access_label"] = preset_data["stored_quick_access_label"] + preset_data -= "stored_quick_access_label" + else if(preset_data["bottle_label"]) // Use bottle label if no stored label + preset_data["quick_access_label"] = preset_data["bottle_label"] + + user.client.prefs.save_chem_preset(preset_name, preset_data) + return TRUE + + if("set_quick_access_label") + if(!user.client?.prefs) + return TRUE + + var/preset_name = params["name"] + if(!preset_name) + return TRUE + + var/list/preset_data = user.client.prefs.get_chem_preset(preset_name) + if(!preset_data || preset_data["quick_access_slot"] == null) + return TRUE + + var/label = copytext(reject_bad_text(params["label"] || ""), 1, 4) + preset_data["quick_access_label"] = label + user.client.prefs.save_chem_preset(preset_name, preset_data) + return TRUE + + if("apply_preset") + if(!user.client?.prefs) + return TRUE + + var/preset_name = params["name"] + if(!preset_name) + return TRUE + + var/list/preset_data = user.client.prefs.get_chem_preset(preset_name) + if(!preset_data) + return TRUE + + // Apply preset to selected bottles + if(preset_data["bottle_color"] && length(loaded_pill_bottles_to_fill) > 0) + var/picked_color = preset_data["bottle_color"] + for(var/obj/item/storage/pill_bottle/bottle in loaded_pill_bottles_to_fill) + if(picked_color && (picked_color in bottle.possible_colors)) + bottle.icon_state = bottle.base_icon + bottle.possible_colors[picked_color] + + if(preset_data["bottle_label"] && length(loaded_pill_bottles_to_fill) > 0) + var/label = copytext(preset_data["bottle_label"], 1, 4) + var/use_full_name = preset_data["use_preset_name_as_label"] ? TRUE : FALSE + + for(var/obj/item/storage/pill_bottle/bottle in loaded_pill_bottles_to_fill) + // If we're using the preset name as a full label, we handle it differently + if(use_full_name) + // First set the short maptext label for the icon display + bottle.maptext_label = label + bottle.update_icon() + + // Then use the full preset name with the label component + bottle.AddComponent(/datum/component/label, preset_name) + else + // Standard label behavior + bottle.AddComponent(/datum/component/label, label) + if(length(label) < 4) + bottle.maptext_label = label + bottle.update_icon() + + if(preset_data["pill_color"]) + pillsprite = preset_data["pill_color"] + + return TRUE + + if("save_preset") + if(!user.client?.prefs) + return TRUE + var/preset_name = trim(params["name"]) + if(!preset_name || !length(preset_name)) + return TRUE + preset_name = copytext(reject_bad_text(preset_name), 1, MAX_PRESET_NAME_LEN) + var/original_name = params["original_name"] // Original name for editing + var/list/preset_data = list( + "bottle_color" = params["bottle_color"], + "bottle_label" = copytext(reject_bad_text(params["bottle_label"] || ""), 1, 4), + "pill_color" = params["pill_color"], + "use_preset_name_as_label" = params["use_preset_name_as_label"] + ) + + // Add quick access data if provided + if(params["quick_access_slot"] != null) + preset_data["quick_access_slot"] = params["quick_access_slot"] + + if(params["quick_access_label"]) + preset_data["quick_access_label"] = copytext(reject_bad_text(params["quick_access_label"]), 1, 4) + + // Get current presets to determine order + var/list/current_presets = user.client.prefs.get_all_chem_presets() + var/max_order = 0 + + // Find the highest order number + for(var/name in current_presets) + var/list/preset = current_presets[name] + if(preset["order"] > max_order) + max_order = preset["order"] + + // If editing, keep the original order and quick access data + if(original_name && current_presets[original_name]) + preset_data["order"] = current_presets[original_name]["order"] + + // Preserve quick access data when renaming + if(current_presets[original_name]["quick_access_slot"] != null && params["quick_access_slot"] == null) + preset_data["quick_access_slot"] = current_presets[original_name]["quick_access_slot"] + if(current_presets[original_name]["quick_access_label"]) + preset_data["quick_access_label"] = current_presets[original_name]["quick_access_label"] + + if(original_name != preset_name) + user.client.prefs.delete_chem_preset(original_name) + else + preset_data["order"] = max_order + 1 + + user.client.prefs.save_chem_preset(preset_name, preset_data) + // Force UI refresh + SStgui.update_uis(src) + return TRUE + + if("delete_preset") + if(!user.client?.prefs) + return TRUE + + var/preset_name = params["name"] + user.client.prefs.delete_chem_preset(preset_name) + return TRUE + + if("reorder_preset") + if(!user.client?.prefs) + return TRUE + + var/preset_name = params["name"] + var/direction = params["direction"] // "up" or "down" + var/list/current_presets = user.client.prefs.get_all_chem_presets() + + if(!current_presets[preset_name]) + return TRUE + + // Get current position + var/current_pos = current_presets[preset_name]["order"] + var/target_pos = direction == "up" ? current_pos - 1 : current_pos + 1 + + // Find preset at target position + var/target_name = null + for(var/name in current_presets) + if(current_presets[name]["order"] == target_pos) + target_name = name + break + + if(!target_name) + return TRUE + + // Swap positions + current_presets[preset_name]["order"] = target_pos + current_presets[target_name]["order"] = current_pos + + // Save changes + user.client.prefs.save_chem_preset(preset_name, current_presets[preset_name]) + user.client.prefs.save_chem_preset(target_name, current_presets[target_name]) + return TRUE + if("eject_pill") var/bottle_index = params["bottleIndex"] + 1; if(length(loaded_pill_bottles) == 0 || bottle_index > length(loaded_pill_bottles)) @@ -326,15 +566,15 @@ for(var/obj/item/storage/pill_bottle/bottle in loaded_pill_bottles_to_fill) var/obj/item/storage/pill_bottle/main_bottle = loaded_pill_bottles_to_fill[1] var/datum/component/label/label_component_on_main_bottle = main_bottle.GetComponent(/datum/component/label) - var/datum/component/label/label_component_on_inputed_bottle = bottle.GetComponent(/datum/component/label) + var/datum/component/label/label_component_on_inputted_bottle = bottle.GetComponent(/datum/component/label) - if(label_component_on_main_bottle != label_component_on_inputed_bottle) + if(label_component_on_main_bottle != label_component_on_inputted_bottle) bottle.AddComponent(/datum/component/label, label_component_on_main_bottle.label_name) if(length(main_bottle.maptext_label) < 4) bottle.maptext_label = main_bottle.maptext_label bottle.update_icon() - else if(label_component_on_inputed_bottle != label_component_on_main_bottle) - qdel(label_component_on_inputed_bottle) + else if(label_component_on_inputted_bottle != label_component_on_main_bottle) + qdel(label_component_on_inputted_bottle) bottle.icon_state = main_bottle.icon_state for(var/iterator in 1 to to_create) var/obj/item/reagent_container/pill/creating_pill = new(loc) @@ -444,6 +684,7 @@ if("connect") connect_smartfridge() return TRUE + if("check_pill_bottle") if(params["bottleIndex"] + 1 > length(loaded_pill_bottles)) return FALSE @@ -451,7 +692,18 @@ loaded_pill_bottles_to_fill += loaded_pill_bottles[params["bottleIndex"] + 1] else if (LAZYFIND(loaded_pill_bottles_to_fill, loaded_pill_bottles[params["bottleIndex"] + 1]) != 0) loaded_pill_bottles_to_fill -= loaded_pill_bottles[params["bottleIndex"] + 1] + return TRUE + if("select_all_bottles") + if(params["value"]) + loaded_pill_bottles_to_fill = LAZYCOPY(loaded_pill_bottles) + else + loaded_pill_bottles_to_fill = list() + return TRUE + + if("bottle_autoselect_toggle") + bottle_autoselect = !bottle_autoselect + return TRUE /obj/structure/machinery/chem_master/attack_hand(mob/living/user) if(stat & BROKEN) @@ -491,3 +743,7 @@ /obj/structure/machinery/chem_master/vial vial_maker = TRUE + +/proc/cmp_preset_order(a, b) + var/list/presets = usr.client.prefs.get_all_chem_presets() + return presets[a]["order"] - presets[b]["order"] diff --git a/code/modules/reagents/chemistry_machinery/chem_simulator.dm b/code/modules/reagents/chemistry_machinery/chem_simulator.dm index 084bf7da40a6..e58a51c4d3e8 100644 --- a/code/modules/reagents/chemistry_machinery/chem_simulator.dm +++ b/code/modules/reagents/chemistry_machinery/chem_simulator.dm @@ -48,6 +48,7 @@ LAZYINITLIST(simulations) LAZYINITLIST(property_costs) LAZYINITLIST(recipe_targets) + AddElement(/datum/element/corp_label/wy) /obj/structure/machinery/chem_simulator/power_change() ..() @@ -325,7 +326,7 @@ continue switch(mode) if(MODE_AMPLIFY) - property_costs[P.name] = max(min(P.level - 1, PROPERTY_COST_MAX), 1) + property_costs[P.name] = max(min(P.level + P.value - 1, PROPERTY_COST_MAX), 1) if(MODE_SUPPRESS) property_costs[P.name] = 2 if(MODE_RELATE) @@ -335,12 +336,12 @@ else if(reference_property.rarity < PROPERTY_RARE) property_costs[P.name] = P.level else - property_costs[P.name] = P.level * PROPERTY_MULTIPLIER_RARE + property_costs[P.name] = (P.level * PROPERTY_MULTIPLIER_RARE) + P.value else - property_costs[P.name] = P.level * 1 - if(only_positive) + property_costs[P.name] = P.level + P.value + if(!only_positive) for(var/P in property_costs) - property_costs[P] = property_costs[P] + 1 + property_costs[P] = max(property_costs[P] - 2, 1) GLOB.chemical_data.has_new_properties = FALSE /obj/structure/machinery/chem_simulator/proc/calculate_new_od_level() @@ -365,7 +366,7 @@ for(var/i = 0 to 5) //5 attempts at modifying the recipe before elevating recipe length if(LAZYLEN(R.required_reagents) > 2) LAZYREMOVE(R.required_reagents, pick(R.required_reagents)) - var/new_component_id = R.add_component(tier = max(min(target.data.chemclass, CHEM_CLASS_COMMON), target.data.gen_tier, 1)) + var/new_component_id = R.add_component(tier = max(target.data.gen_tier-1, 1)) var/datum/reagent/new_component = GLOB.chemical_reagents_list[new_component_id] //Make sure we don't have an identical reaction and that the component is identified if(R.check_duplicate() || R.check_reaction_uses_all_default_medical() || new_component.chemclass >= CHEM_CLASS_SPECIAL) diff --git a/code/modules/reagents/chemistry_machinery/chem_storage.dm b/code/modules/reagents/chemistry_machinery/chem_storage.dm index a5196147febe..c3a7a0989a1a 100644 --- a/code/modules/reagents/chemistry_machinery/chem_storage.dm +++ b/code/modules/reagents/chemistry_machinery/chem_storage.dm @@ -13,6 +13,10 @@ var/recharge_rate = 10 var/energy = 50 var/max_energy = 100 + // dynamic chemical supply variables + var/base_recharge_rate = 10 + var/base_max_energy = 100 + var/dynamic_storage = FALSE unslashable = TRUE unacidable = TRUE @@ -20,6 +24,7 @@ /obj/structure/machinery/chem_storage/medbay name = "Chemical Storage System (Medbay)" network = "Medbay" + dynamic_storage = TRUE /obj/structure/machinery/chem_storage/research name = "Chemical Storage System (Research)" @@ -38,6 +43,15 @@ GLOB.chemical_data.remove_chem_storage(src) return ..() +/// Scales the energy capacity and charge rates for chemical dispensers using the dynamic_storage var +/// multiplier works by dividing total marine pop by 50 +/obj/structure/machinery/chem_storage/proc/calculate_dynamic_storage(multiplier) + if(!dynamic_storage) + return + recharge_rate |= floor(base_recharge_rate * multiplier) + max_energy |= floor(base_max_energy * multiplier) + energy = max_energy + /obj/structure/machinery/chem_storage/get_examine_text(mob/user) . = ..() if(in_range(user, src) || istype(user, /mob/dead/observer)) diff --git a/code/modules/reagents/chemistry_machinery/reagent_grinder.dm b/code/modules/reagents/chemistry_machinery/reagent_grinder.dm index bed01f671cb1..aac122779d07 100644 --- a/code/modules/reagents/chemistry_machinery/reagent_grinder.dm +++ b/code/modules/reagents/chemistry_machinery/reagent_grinder.dm @@ -11,7 +11,7 @@ var/inuse = 0 var/grind_duration = 6 SECONDS // 6 seconds var/obj/item/reagent_container/beaker = null - var/limit = 10 + var/limit = 16 var/tether_range = 8 var/obj/structure/machinery/smartfridge/chemistry/linked_storage //Where we send bottle chemicals var/list/blend_items = list ( @@ -30,7 +30,7 @@ /obj/item/reagent_container/food/snacks/grown/ricestalk = list("rice" = -5), /obj/item/reagent_container/food/snacks/grown/cherries = list("cherryjelly" = 0), /obj/item/reagent_container/food/snacks/grown/plastellium = list("plasticide" = 5), - + /obj/item/reagent_container/food/snacks/chocolatebar = list("chocolatesyrup" = 0), //All types that you can put into the grinder to transfer the reagents to the beaker. !Put all recipes above this.! /obj/item/reagent_container/pill = list(), @@ -53,7 +53,6 @@ /obj/item/reagent_container/food/snacks/watermelonslice = list("watermelonjuice" = 0), /obj/item/reagent_container/food/snacks/grown/grapes = list("grapejuice" = 0), /obj/item/reagent_container/food/snacks/grown/poisonberries = list("poisonberryjuice" = 0), - ) @@ -93,7 +92,7 @@ to_chat(user, SPAN_WARNING("The machine cannot hold anymore items.")) return TRUE if (istype(O, /obj/item/research_upgrades/grinderspeed)) - if(limit == 10) + if(limit == 16) grind_duration = 3 SECONDS limit = 25 to_chat(user, SPAN_NOTICE("You insert [O] into [src]")) @@ -440,7 +439,7 @@ /obj/structure/machinery/reagentgrinder/industrial name = "Industrial Grinder" - desc = "a heavy-duty variant of the all-in-one grinder meant for grinding large amounts of industrial material. Not food safe." + desc = "A heavy-duty variant of the all-in-one grinder meant for grinding large amounts of industrial material. Not food safe." icon_state = "industry1" limit = 30 blend_items = list ( diff --git a/code/modules/reagents/chemistry_machinery/xenomorph_analyzer.dm b/code/modules/reagents/chemistry_machinery/xenomorph_analyzer.dm index 6804ce9ed529..6805d7383b4a 100644 --- a/code/modules/reagents/chemistry_machinery/xenomorph_analyzer.dm +++ b/code/modules/reagents/chemistry_machinery/xenomorph_analyzer.dm @@ -57,7 +57,7 @@ return if(!user.drop_inv_item_to_loc(attacked_item, src)) return - to_chat(user, SPAN_NOTICE("You place the organ in the machine")) + to_chat(user, SPAN_NOTICE("You place the organ in the machine.")) organ = attacked_item icon_state = "xeno_analyzer_organ_on" caste_of_organ = organ.caste_origin @@ -65,7 +65,7 @@ if(istype(attacked_item, /obj/item/clothing/accessory/health/research_plate)) var/obj/item/clothing/accessory/health/research_plate/plate = attacked_item if(plate.recyclable_value == 0 && !plate.can_recycle(user)) - to_chat(user, SPAN_WARNING("You cannot recycle this type of plate")) + to_chat(user, SPAN_WARNING("You cannot recycle this type of plate.")) return if(!do_after(user, 3 SECONDS, INTERRUPT_ALL, BUSY_ICON_GENERIC)) to_chat(user, SPAN_WARNING("You were interupted!")) diff --git a/code/modules/reagents/chemistry_properties/prop_negative.dm b/code/modules/reagents/chemistry_properties/prop_negative.dm index 76ea22303892..70acc6d9b425 100644 --- a/code/modules/reagents/chemistry_properties/prop_negative.dm +++ b/code/modules/reagents/chemistry_properties/prop_negative.dm @@ -49,15 +49,6 @@ /datum/chem_property/negative/toxic/process_critical(mob/living/M, potency = 1) M.apply_damage(potency * POTENCY_MULTIPLIER_VHIGH, TOX) -/datum/chem_property/negative/toxic/reaction_obj(obj/O, volume, potency = 1) - if(istype(O,/obj/effect/alien/weeds/)) - var/obj/effect/alien/weeds/alien_weeds = O - alien_weeds.take_damage(25 * potency) // Kills alien weeds on touch - return - if(istype(O,/obj/effect/glowshroom)) - qdel(O) - return - /datum/chem_property/negative/toxic/reaction_mob(mob/living/M, method=TOUCH, volume, potency = 1) if(!iscarbon(M)) return @@ -131,8 +122,7 @@ var/mob/living/carbon/human/H = M var/obj/limb/affecting = H.get_limb("head") if(affecting) - if(affecting.take_damage(4, 2)) - H.UpdateDamageIcon() + affecting.take_damage(4, 2) if(prob(meltprob)) if(H.pain.feels_pain) H.emote("scream") @@ -195,33 +185,33 @@ if(processing_tray.pestlevel > 0) processing_tray.pestlevel += -1*(potency*2)*volume -/datum/chem_property/negative/paining - name = PROPERTY_PAINING - code = "PNG" +/datum/chem_property/negative/neuropathic + name = PROPERTY_NEUROPATHIC + code = "NPT" description = "Activates the somatosensory system causing neuropathic pain all over the body. Unlike nociceptive pain, this is not caused to any tissue damage and is solely perceptive." rarity = PROPERTY_UNCOMMON category = PROPERTY_TYPE_STIMULANT value = -1 -/datum/chem_property/negative/paining/on_delete(mob/living/M) +/datum/chem_property/negative/neuropathic/on_delete(mob/living/M) ..() M.pain.recalculate_pain() -/datum/chem_property/negative/paining/process(mob/living/M, potency = 1, delta_time) +/datum/chem_property/negative/neuropathic/process(mob/living/M, potency = 1, delta_time) if(!(..())) return - M.pain.apply_pain(PROPERTY_PAINING_PAIN * potency) + M.pain.apply_pain(PROPERTY_NEUROPATHIC_PAIN * potency) -/datum/chem_property/negative/paining/process_overdose(mob/living/M, potency = 1, delta_time) +/datum/chem_property/negative/neuropathic/process_overdose(mob/living/M, potency = 1, delta_time) if(!(..())) return - M.pain.apply_pain(PROPERTY_PAINING_PAIN_OD * potency) + M.pain.apply_pain(PROPERTY_NEUROPATHIC_PAIN_OD * potency) M.take_limb_damage(0.5 * potency * delta_time) -/datum/chem_property/negative/paining/process_critical(mob/living/M, potency = 1) +/datum/chem_property/negative/neuropathic/process_critical(mob/living/M, potency = 1) M.take_limb_damage(POTENCY_MULTIPLIER_MEDIUM * potency) /datum/chem_property/negative/hemolytic @@ -242,7 +232,7 @@ return var/mob/living/carbon/C = M C.blood_volume = max(C.blood_volume - 4 * potency * delta_time, 0) - M.drowsyness = min(M.drowsyness + 0.5 * potency * delta_time, 15 * potency) + M.drowsiness = min(M.drowsiness + 0.5 * potency * delta_time, 15 * potency) M.reagent_move_delay_modifier += potency M.recalculate_move_delay = TRUE if(prob(5 * delta_time)) @@ -252,9 +242,9 @@ M.apply_damage(POTENCY_MULTIPLIER_VHIGH * potency, OXY) /datum/chem_property/negative/hemorrhaging - name = PROPERTY_HEMORRAGING + name = PROPERTY_HEMORRHAGING code = "HMR" - description = "Ruptures endothelial cells making up bloodvessels, causing blood to escape from the circulatory system. Persistant mutagen to plants." + description = "Ruptures endothelial cells making up blood vessels, causing blood to escape from the circulatory system. Persistent mutagen to plants." rarity = PROPERTY_UNCOMMON value = 1 cost_penalty = FALSE @@ -393,7 +383,7 @@ /datum/chem_property/negative/nephrotoxic/process_critical(mob/living/M, potency = 1) M.apply_damage(POTENCY_MULTIPLIER_VHIGH * potency, TOX) -//Applies mutation cancel onto hydrotray plants, prevents tolerance adjustment, parasitic and carnivorus +//Applies mutation cancel onto hydrotray plants, prevents tolerance adjustment, parasitic and carnivorous /datum/chem_property/negative/nephrotoxic/reaction_hydro_tray(obj/structure/machinery/portable_atmospherics/hydroponics/processing_tray, potency, volume) . = ..() if(!processing_tray.seed) @@ -466,8 +456,8 @@ return if (processing_tray.mutation_controller["Potency"] > potency*-2) processing_tray.mutation_controller["Potency"] = potency*-2 - if (processing_tray.mutation_controller["Bioluminecence"] > potency*-2) - processing_tray.mutation_controller["Bioluminecence"] = potency*-2 + if (processing_tray.mutation_controller["Bioluminescence"] > potency*-2) + processing_tray.mutation_controller["Bioluminescence"] = potency*-2 if (processing_tray.mutation_controller["Flowers"] > potency*-2) processing_tray.mutation_controller["Flowers"] = potency*-2 @@ -516,7 +506,7 @@ M.apply_damage(POTENCY_MULTIPLIER_HIGH * potency, BRAIN) M.jitteriness = min(M.jitteriness + potency, POTENCY_MULTIPLIER_HIGH * potency) if(prob(50)) - M.drowsyness = min(M.drowsyness + potency, POTENCY_MULTIPLIER_HIGH * potency) + M.drowsiness = min(M.drowsiness + potency, POTENCY_MULTIPLIER_HIGH * potency) if(prob(10)) M.emote("drool") @@ -637,5 +627,5 @@ . = ..() reacting_mob.adjust_fire_stacks(max(reacting_mob.fire_stacks, potency * 30)) - reacting_mob.IgniteMob(TRUE) - to_chat(reacting_mob, SPAN_DANGER("It burns! It burns worse than you could ever have imagined!")) + if(reacting_mob.IgniteMob() == IGNITE_IGNITED) + to_chat(reacting_mob, SPAN_DANGER("It burns! It burns worse than you could ever have imagined!")) diff --git a/code/modules/reagents/chemistry_properties/prop_neutral.dm b/code/modules/reagents/chemistry_properties/prop_neutral.dm index 277a32d2d5e8..9fec0dca6e8b 100644 --- a/code/modules/reagents/chemistry_properties/prop_neutral.dm +++ b/code/modules/reagents/chemistry_properties/prop_neutral.dm @@ -54,7 +54,7 @@ processing_tray.seed = processing_tray.seed.diverge() processing_tray.seed.potency += rand(1,potency*2) processing_tray.seed.nutrient_consumption += 0.3*(potency*2) - c_turf.visible_message(SPAN_NOTICE("\The [processing_tray.seed.display_name] rustles as its branches bow")) + c_turf.visible_message(SPAN_NOTICE("\The [processing_tray.seed.display_name] rustles as its branches bow.")) processing_tray.potency_counter = 0 /datum/chem_property/neutral/nutritious @@ -106,7 +106,7 @@ M.overeatduration = 0 if(M.reagents.remove_all_type(/datum/reagent/ethanol, potency, 0, 1)) //Ketosis causes rapid metabolization of alcohols M.confused = min(M.confused + potency,10*potency) - M.drowsyness = min(M.drowsyness + potency,15*potency) + M.drowsiness = min(M.drowsiness + potency,15*potency) /datum/chem_property/neutral/ketogenic/process_overdose(mob/living/M, potency = 1, delta_time) M.nutrition = max(M.nutrition - 5 * potency * delta_time, 0) @@ -163,7 +163,7 @@ return mob.dizziness = min(mob.dizziness + POTENCY_MULTIPLIER_VVLOW * potency * delta_time, POTENCY_MULTIPLIER_VHIGH * potency) - mob.drowsyness = min(mob.drowsyness + POTENCY_MULTIPLIER_LOW * potency * delta_time, POTENCY_MULTIPLIER_VHIGH * potency) + mob.drowsiness = min(mob.drowsiness + POTENCY_MULTIPLIER_LOW * potency * delta_time, POTENCY_MULTIPLIER_VHIGH * potency) if(prob(50 * delta_time) || potency >= 5) mob.confused = min(mob.confused + POTENCY_MULTIPLIER_LOW * potency * delta_time, POTENCY_MULTIPLIER_VHIGH * potency) @@ -174,7 +174,7 @@ mob.apply_damage(POTENCY_MULTIPLIER_LOW * potency * delta_time, OXY) mob.dizziness = min(mob.dizziness + POTENCY_MULTIPLIER_VLOW * potency * delta_time, POTENCY_MULTIPLIER_HIGHEXTREMEINTER * potency) - mob.drowsyness = min(mob.drowsyness + potency * delta_time, POTENCY_MULTIPLIER_HIGHEXTREMEINTER * potency) + mob.drowsiness = min(mob.drowsiness + potency * delta_time, POTENCY_MULTIPLIER_HIGHEXTREMEINTER * potency) if(prob(POTENCY_MULTIPLIER_MEDIUM * delta_time)) mob.sleeping = min(mob.sleeping + POTENCY_MULTIPLIER_LOW * potency * delta_time, POTENCY_MULTIPLIER_HIGHEXTREMEINTER * potency) @@ -193,7 +193,7 @@ mob.confused = min(mob.confused + POTENCY_MULTIPLIER_MEDIUM * potency * delta_time, POTENCY_MULTIPLIER_EXTREME * potency) mob.dizziness = min(mob.dizziness + POTENCY_MULTIPLIER_LOW * potency * delta_time, POTENCY_MULTIPLIER_EXTREME * potency) - mob.drowsyness = min(mob.drowsyness + POTENCY_MULTIPLIER_MEDIUM * potency * delta_time, POTENCY_MULTIPLIER_EXTREME * potency) + mob.drowsiness = min(mob.drowsiness + POTENCY_MULTIPLIER_MEDIUM * potency * delta_time, POTENCY_MULTIPLIER_EXTREME * potency) mob.slurring = min(mob.slurring + potency * delta_time, POTENCY_MULTIPLIER_EXTREME * potency) if(prob(POTENCY_MULTIPLIER_VHIGH * potency * delta_time)) @@ -234,26 +234,26 @@ M.apply_damage(0.5 * potency * delta_time, BRAIN) M.apply_effect(20, PARALYZE) -/datum/chem_property/neutral/relaxing - name = PROPERTY_RELAXING - code = "RLX" - description = "Has a sedative effect on neuromuscular junctions depressing the force of muscle contractions. High concentrations can cause respiratory failure and cardiac arrest." +/datum/chem_property/neutral/antispasmodic + name = PROPERTY_ANTISPASMODIC + code = "ASP" + description = "Relaxes smooth muscles and treats muscle spasms by blocking the neurotransmitter acetylcholine. High concentrations can cause respiratory failure and cardiac arrest." rarity = PROPERTY_COMMON category = PROPERTY_TYPE_STIMULANT -/datum/chem_property/neutral/relaxing/process(mob/living/M, potency = 1, delta_time) +/datum/chem_property/neutral/antispasmodic/process(mob/living/M, potency = 1, delta_time) M.reagent_move_delay_modifier += potency if(prob(5 * delta_time)) M.emote("yawn") M.recalculate_move_delay = TRUE -/datum/chem_property/neutral/relaxing/process_overdose(mob/living/M, potency = 1, delta_time) +/datum/chem_property/neutral/antispasmodic/process_overdose(mob/living/M, potency = 1, delta_time) //heart beats slower M.reagent_move_delay_modifier += POTENCY_MULTIPLIER_MEDIUM * potency if(prob(10)) to_chat(M, SPAN_WARNING("You feel incredibly weak!")) -/datum/chem_property/neutral/relaxing/process_critical(mob/living/M, potency = 1, delta_time) +/datum/chem_property/neutral/antispasmodic/process_critical(mob/living/M, potency = 1, delta_time) //heart stops beating, lungs stop working if(prob(7.5 * potency * delta_time)) M.apply_effect(potency, PARALYZE) @@ -330,21 +330,21 @@ /datum/chem_property/neutral/hypothermic/process_overdose(mob/living/M, potency = 1) M.bodytemperature = max(0, M.bodytemperature - POTENCY_MULTIPLIER_VHIGH * potency) - M.drowsyness = max(M.drowsyness, 30) + M.drowsiness = max(M.drowsiness, 30) /datum/chem_property/neutral/hypothermic/process_critical(mob/living/M, potency = 1, delta_time) M.apply_effect(20, PARALYZE) -/datum/chem_property/neutral/balding - name = PROPERTY_BALDING - code = "BLD" - description = "Damages the hair follicles in the skin causing extreme alopecia, also refered to as baldness." +/datum/chem_property/neutral/atrichogenic + name = PROPERTY_ATRICHOGENIC + code = "ATR" + description = "Damages the hair follicles in the skin to disrupt the hair growth cycle, causing extreme alopecia, also referred to as baldness." rarity = PROPERTY_UNCOMMON category = PROPERTY_TYPE_IRRITANT value = 0 max_level = 2 -/datum/chem_property/neutral/balding/process(mob/living/M, potency = 1, delta_time) +/datum/chem_property/neutral/atrichogenic/process(mob/living/M, potency = 1, delta_time) if(ishuman(M)) var/mob/living/carbon/human/H = M if((H.h_style != "Bald" || H.f_style != "Shaved")) @@ -353,21 +353,21 @@ H.f_style = "Shaved" H.update_hair() -/datum/chem_property/neutral/balding/process_overdose(mob/living/M, potency = 1) +/datum/chem_property/neutral/atrichogenic/process_overdose(mob/living/M, potency = 1) M.adjustCloneLoss(POTENCY_MULTIPLIER_LOW * potency) -/datum/chem_property/neutral/balding/process_critical(mob/living/M, potency = 1, delta_time) +/datum/chem_property/neutral/atrichogenic/process_critical(mob/living/M, potency = 1, delta_time) M.adjustCloneLoss(0.5 * potency * delta_time) -/datum/chem_property/neutral/fluffing - name = PROPERTY_FLUFFING - code = "FLF" - description = "Accelerates cell division in the hair follicles resulting in random and excessive hairgrowth. Found to increase yeilds in plants." +/datum/chem_property/neutral/trichogenic + name = PROPERTY_TRICHOGENIC + code = "TRI" + description = "Accelerates cell division in the hair follicles resulting in random and excessive hair growth. Found to increase yields in plants." rarity = PROPERTY_UNCOMMON category = PROPERTY_TYPE_IRRITANT value = 0 -/datum/chem_property/neutral/fluffing/process(mob/living/M, potency = 1, delta_time) +/datum/chem_property/neutral/trichogenic/process(mob/living/M, potency = 1, delta_time) if(prob(2.5 * potency * delta_time) && ishuman(M)) var/mob/living/carbon/human/H = M H.h_style = "Bald" @@ -378,16 +378,16 @@ H.update_hair() to_chat(M, SPAN_NOTICE("Your head feels different...")) -/datum/chem_property/neutral/fluffing/process_overdose(mob/living/M, potency = 1, delta_time) +/datum/chem_property/neutral/trichogenic/process_overdose(mob/living/M, potency = 1, delta_time) if(prob(2.5 * potency * delta_time)) to_chat(M, SPAN_WARNING("You feel itchy all over!")) M.take_limb_damage(potency) //Hair growing inside your body -/datum/chem_property/neutral/fluffing/process_critical(mob/living/M, potency = 1, delta_time) +/datum/chem_property/neutral/trichogenic/process_critical(mob/living/M, potency = 1, delta_time) to_chat(M, SPAN_WARNING("You feel like something is penetrating your skull!")) M.apply_damage(0.5 * potency * delta_time, BRAIN) //Hair growing into brain -/datum/chem_property/neutral/fluffing/reaction_hydro_tray(obj/structure/machinery/portable_atmospherics/hydroponics/processing_tray, potency, volume) +/datum/chem_property/neutral/trichogenic/reaction_hydro_tray(obj/structure/machinery/portable_atmospherics/hydroponics/processing_tray, potency, volume) . = ..() if(!processing_tray.seed) return @@ -503,7 +503,7 @@ /datum/chem_property/neutral/antihallucinogenic name = PROPERTY_ANTIHALLUCINOGENIC code = "AHL" - description = "Stabilizes perseptive abnormalities such as hallucinations caused by mindbreaker toxin." + description = "Stabilizes perceptive abnormalities such as hallucinations caused by mindbreaker toxin." rarity = PROPERTY_COMMON category = PROPERTY_TYPE_STIMULANT value = 1 @@ -542,14 +542,14 @@ return processing_tray.metabolism_adjust += clamp(20*potency, 0, 130) -/datum/chem_property/neutral/sedative - name = PROPERTY_SEDATIVE - code = "SDT" +/datum/chem_property/neutral/hypnotic + name = PROPERTY_HYPNOTIC + code = "HYP" description = "Causes the body to release melatonin resulting in increased sleepiness." rarity = PROPERTY_COMMON category = PROPERTY_TYPE_STIMULANT -/datum/chem_property/neutral/sedative/process(mob/living/M, potency = 1, delta_time) +/datum/chem_property/neutral/hypnotic/process(mob/living/M, potency = 1, delta_time) if(M.confused < 25 && M.sleeping < 20) M.confused += POTENCY_MULTIPLIER_MEDIUM * potency if(M.confused > 25) @@ -558,10 +558,10 @@ else if(prob(25)) M.emote("yawn") -/datum/chem_property/neutral/sedative/process_overdose(mob/living/M, potency = 1, delta_time) +/datum/chem_property/neutral/hypnotic/process_overdose(mob/living/M, potency = 1, delta_time) M.adjust_effect(0.5 * potency * delta_time, PARALYZE) -/datum/chem_property/neutral/sedative/process_critical(mob/living/M, potency = 1) +/datum/chem_property/neutral/hypnotic/process_critical(mob/living/M, potency = 1) M.apply_damage(POTENCY_MULTIPLIER_VHIGH * potency, OXY) /datum/chem_property/neutral/hyperthrottling @@ -662,7 +662,7 @@ M.apply_effect(20, PARALYZE) /datum/chem_property/neutral/thermostabilizing/process_critical(mob/living/M, potency = 1, delta_time) - M.drowsyness = max(M.drowsyness, 30) + M.drowsiness = max(M.drowsiness, 30) /datum/chem_property/neutral/focusing name = PROPERTY_FOCUSING @@ -677,7 +677,7 @@ M.stuttering = max(M.stuttering - POTENCY_MULTIPLIER_MEDIUM * potency, 0) M.confused = max(M.confused - POTENCY_MULTIPLIER_MEDIUM * potency, 0) M.ReduceEyeBlur(POTENCY_MULTIPLIER_MEDIUM * potency) - M.drowsyness = max(M.drowsyness - POTENCY_MULTIPLIER_MEDIUM * potency, 0) + M.drowsiness = max(M.drowsiness - POTENCY_MULTIPLIER_MEDIUM * potency, 0) M.dizziness = max(M.dizziness - POTENCY_MULTIPLIER_MEDIUM * potency, 0) M.jitteriness = max(M.jitteriness - POTENCY_MULTIPLIER_MEDIUM * potency, 0) if(potency >= POTENCY_MAX_TIER_1) @@ -703,11 +703,11 @@ /datum/chem_property/neutral/transformative/process(mob/living/M, potency = 1, delta_time) var/true_heal = heal_amount * potency * delta_time if(M.getBruteLoss()) - M.apply_damage(-true_heal, BRUTE) - M.apply_damage(true_heal * 0.1, TOX) + M.apply_damage(-true_heal, BRUTE, chemical=TRUE) + M.apply_damage(true_heal * 0.1, TOX, chemical=TRUE) if(M.getFireLoss()) - M.apply_damage(-true_heal, BURN) - M.apply_damage(true_heal * 0.1, TOX) + M.apply_damage(-true_heal, BURN, chemical=TRUE) + M.apply_damage(true_heal * 0.1, TOX, chemical=TRUE) /datum/chem_property/neutral/transformative/process_overdose(mob/living/M, potency = 1) M.apply_damage(heal_amount * (potency * POTENCY_MULTIPLIER_LOW), TOX) diff --git a/code/modules/reagents/chemistry_properties/prop_positive.dm b/code/modules/reagents/chemistry_properties/prop_positive.dm index 91486d26bf49..0720bbf51420 100644 --- a/code/modules/reagents/chemistry_properties/prop_positive.dm +++ b/code/modules/reagents/chemistry_properties/prop_positive.dm @@ -19,7 +19,7 @@ M.apply_internal_damage(0.5 * potency * delta_time, "eyes") /datum/chem_property/positive/antitoxic/process_critical(mob/living/M, potency = 1, delta_time) - M.drowsyness = max(M.drowsyness, 30) + M.drowsiness = max(M.drowsiness, 30) /datum/chem_property/positive/antitoxic/reaction_hydro_tray(obj/structure/machinery/portable_atmospherics/hydroponics/processing_tray, potency, volume) . = ..() @@ -37,9 +37,9 @@ value = 2 /datum/chem_property/positive/anticorrosive/process(mob/living/M, potency = 1) - M.heal_limb_damage(0, potency) + M.heal_limb_damage(0, potency, chemical = TRUE) if(potency > CREATE_MAX_TIER_1) - M.heal_limb_damage(0, potency * POTENCY_MULTIPLIER_LOW) + M.heal_limb_damage(0, potency * POTENCY_MULTIPLIER_LOW, chemical = TRUE) /datum/chem_property/positive/anticorrosive/process_overdose(mob/living/M, potency = 1, delta_time) M.apply_damages(0.5 * potency * delta_time, 0, 0.5 * potency * delta_time) //Mixed brute/tox damage @@ -197,7 +197,7 @@ name = PROPERTY_NERVESTIMULATING code = "NST" description = "Increases neuron communication speed across synapses resulting in improved reaction time, awareness and muscular control. Excessive muscular control loss causes the reagent to bind to nociceptors more aggressively than usual." - rarity = PROPERTY_RARE + rarity = PROPERTY_DISABLED category = PROPERTY_TYPE_STIMULANT value = 4 @@ -209,7 +209,7 @@ M.stuttering = max(M.stuttering - POTENCY_MULTIPLIER_MEDIUM * potency, 0) M.confused = max(M.confused - POTENCY_MULTIPLIER_MEDIUM * potency, 0) M.ReduceEyeBlur(POTENCY_MULTIPLIER_MEDIUM * potency) - M.drowsyness = max(M.drowsyness - POTENCY_MULTIPLIER_MEDIUM * potency, 0) + M.drowsiness = max(M.drowsiness - POTENCY_MULTIPLIER_MEDIUM * potency, 0) M.dizziness = max(M.dizziness - POTENCY_MULTIPLIER_MEDIUM * potency, 0) M.jitteriness = max(M.jitteriness - POTENCY_MULTIPLIER_MEDIUM * potency, 0) @@ -336,7 +336,7 @@ /datum/chem_property/positive/nephropeutic/process_critical(mob/living/M, potency = 1, delta_time) M.apply_damage(2.5 * potency * delta_time, TOX) -//Applies mutation enable onto hydrotray plants, enables tolerance adjustment, parasitic and carnivorus +//Applies mutation enable onto hydrotray plants, enables tolerance adjustment, parasitic and carnivorous /datum/chem_property/positive/nephropeutic/reaction_hydro_tray(obj/structure/machinery/portable_atmospherics/hydroponics/processing_tray, potency, volume) . = ..() if(!processing_tray.seed) @@ -410,8 +410,8 @@ return if (processing_tray.mutation_controller["Potency"] < 1) processing_tray.mutation_controller["Potency"] = 1 - if(processing_tray.mutation_controller["Bioluminecence"] < 1) - processing_tray.mutation_controller["Bioluminecence"] = 1 + if(processing_tray.mutation_controller["Bioluminescence"] < 1) + processing_tray.mutation_controller["Bioluminescence"] = 1 if (processing_tray.mutation_controller["Flowers"] < 1) processing_tray.mutation_controller["Flowers"] = 1 @@ -523,7 +523,7 @@ /datum/chem_property/positive/fluxing name = PROPERTY_FLUXING code = "FLX" - description = "Liquifies large crystalline and metallic structures under bodytemperature in the body and allows it to migrate to and be excreted through the skin." + description = "Liquefies large crystalline and metallic structures the body and allows them to migrate to and be excreted through the skin." rarity = PROPERTY_UNCOMMON category = PROPERTY_TYPE_REACTANT @@ -558,8 +558,8 @@ /datum/chem_property/positive/neurocryogenic/process(mob/living/M, potency = 1, delta_time) if(prob(10 * delta_time)) to_chat(M, SPAN_WARNING("You feel like you have the worst brain freeze ever!")) - M.apply_effect(20, PARALYZE) - M.apply_effect(20, STUN) + M.KnockDown(20) + M.Stun(20) /datum/chem_property/positive/neurocryogenic/process_overdose(mob/living/M, potency = 1, delta_time) M.bodytemperature = max(BODYTEMP_CRYO_LIQUID_THRESHOLD, M.bodytemperature - 2.5 * potency * delta_time) @@ -595,12 +595,15 @@ if(embryo.counter > 0) embryo.counter = embryo.counter - (potency * delta_time) current_human.take_limb_damage(0, POTENCY_MULTIPLIER_MEDIUMLOW*potency) + if(prob(potency * 5)) //Higher chance of notice with higher potency makes sense + to_chat(current_human, SPAN_NOTICE("You feel something inside you squirming in agitation!")) //Inform the marine their embryo is dying else embryo.stage-- if(embryo.stage <= 0)//if we reach this point, the embryo dies and the occupant takes a nasty amount of acid damage - qdel(embryo) + embryo.forceMove(current_human.loc) //forces the embryo out of the container that is the human host and onto the ground current_human.take_limb_damage(0,rand(20,40)) current_human.vomit() + to_chat(current_human, SPAN_NOTICE("You throw up several bits of wormlike matter!")) //Embryo is dead else embryo.counter = embryo.per_stage_hugged_time - (potency * delta_time) @@ -707,7 +710,7 @@ return if(revivetimerid) - if(dead.health <= HEALTH_THRESHOLD_DEAD) //If the mob got damaged to below the threshold while the timer was ticking then we reset + if(dead.health <= dead.health_threshold_dead) //If the mob got damaged to below the threshold while the timer was ticking then we reset deltimer(revivetimerid) revivetimerid = null return @@ -718,7 +721,7 @@ property.trigger(affected_mob) affected_mob.reagents.remove_reagent(electrogenetic_reagent.id, 1) break - if(dead.health > HEALTH_THRESHOLD_DEAD) + if(dead.health > dead.health_threshold_dead) revivetimerid = addtimer(CALLBACK(dead, TYPE_PROC_REF(/mob/living/carbon/human, handle_revive)), 5 SECONDS, TIMER_STOPPABLE) if(!COOLDOWN_FINISHED(src, revive_notif)) return @@ -729,7 +732,7 @@ if(ghost?.client) playsound_client(ghost.client, 'sound/effects/adminhelp_new.ogg') to_chat(ghost, SPAN_BOLDNOTICE("Your heart is struggling to pump! There is a chance you might get up!(Verbs -> Ghost -> Re-enter corpse, or click here!)")) - else if ((potency >= 1) && dead.health <= HEALTH_THRESHOLD_DEAD) //heals on all level above 1. This is however, minimal. + else if ((potency >= 1) && dead.health <= dead.health_threshold_dead) //heals on all level above 1. This is however, minimal. to_chat(dead, SPAN_NOTICE("You feel a faint spark in your chest.")) dead.apply_damage(-potency * POTENCY_MULTIPLIER_VLOW, BRUTE) dead.apply_damage(-potency * POTENCY_MULTIPLIER_VLOW, BURN) @@ -874,14 +877,17 @@ code = "FUL" description = "The chemical can be burned as a fuel, expanding the burn time of a chemical fire. However, this also slightly lowers heat intensity." rarity = PROPERTY_COMMON - value = 1 + value = 2 intensity_per_level = -3 - duration_per_level = 8 + duration_per_level = 7 intensitymod_per_level = -0.1 durationmod_per_level = 0.2 radiusmod_per_level = 0.01 +/datum/chem_property/positive/fire/fueling/can_cause_harm() + return TRUE + /datum/chem_property/positive/fire/fueling/reaction_mob(mob/M, method = TOUCH, volume, potency = 1) var/mob/living/L = M if(istype(L) && method == TOUCH)//makes you more flammable if sprayed/splashed on you @@ -890,20 +896,14 @@ /datum/chem_property/positive/fire/fueling/reaction_turf(turf/T, volume, potency = 1) new /obj/effect/decal/cleanable/liquid_fuel(T, volume) -/datum/chem_property/positive/fire/fueling/reaction_obj(obj/O, volume, potency) - var/turf/the_turf = get_turf(O) //tries to splash fuel on object's turf - if(!the_turf) - return - new /obj/effect/decal/cleanable/liquid_fuel(the_turf, volume) - /datum/chem_property/positive/fire/oxidizing name = PROPERTY_OXIDIZING code = "OXI" description = "The chemical is oxidizing, increasing the intensity of chemical fires. However, the fuel is also burned slightly faster because of it." rarity = PROPERTY_COMMON - value = 1 - intensity_per_level = 8 - duration_per_level = -3 + value = 2 + intensity_per_level = 7 + duration_per_level = -4 intensitymod_per_level = 0.2 durationmod_per_level = -0.1 @@ -916,7 +916,7 @@ if(istype(L) && method == TOUCH)//Oxidizing 6+ makes a fire, otherwise it just adjusts fire stacks L.adjust_fire_stacks(max(L.fire_stacks, volume * potency)) if(potency > /datum/chem_property/positive/fire/oxidizing::ignite_threshold) - L.IgniteMob(TRUE) + L.IgniteMob() /datum/chem_property/positive/fire/oxidizing/can_cause_harm() . = ..() @@ -929,7 +929,7 @@ code = "FLW" description = "The chemical is the opposite of viscous, and it tends to spill everywhere. This could probably be used to expand the radius of a chemical fire." rarity = PROPERTY_COMMON - value = 1 + value = 2 range_per_level = 2 intensitymod_per_level = -0.05 @@ -1104,11 +1104,11 @@ /datum/chem_property/positive/cardiostabilizing/process_overdose(mob/living/M, potency = 1, delta_time) M.make_jittery(5) //Overdose causes a spasm - M.apply_effect(20, PARALYZE) + M.KnockDown(20) + M.Stun(20) /datum/chem_property/positive/cardiostabilizing/process_critical(mob/living/M, potency = 1, delta_time) - M.drowsyness = max(M.drowsyness, 20) - if(!ishuman(M)) //Critical overdose causes total blackout and heart damage. Too much stimulant + if(!ishuman(M)) //Critical overdose causes heart damage. Too much stimulant return M.apply_internal_damage(0.25 * delta_time, "heart") if(prob(5 * delta_time)) diff --git a/code/modules/reagents/chemistry_properties/prop_special.dm b/code/modules/reagents/chemistry_properties/prop_special.dm index 4ce324d79933..ca40a7d8c013 100644 --- a/code/modules/reagents/chemistry_properties/prop_special.dm +++ b/code/modules/reagents/chemistry_properties/prop_special.dm @@ -2,13 +2,14 @@ rarity = PROPERTY_DISABLED category = PROPERTY_TYPE_ANOMALOUS value = 8 -//IF YOU ADD A NEW LEGENADRY INTENDED FOR RESEARCH NORMAL LOOP, MAKE SURE TO ADD TO LEGENDARY PROPERTY LIST DEFINE +//IF YOU ADD A NEW LEGENDARY INTENDED FOR RESEARCH NORMAL LOOP, MAKE SURE TO ADD TO LEGENDARY PROPERTY LIST DEFINE /datum/chem_property/special/boosting name = PROPERTY_BOOSTING code = "BST" description = "Boosts the potency of all other properties in this chemical when inside the body by 0.5 levels for every level that this property has." rarity = PROPERTY_LEGENDARY category = PROPERTY_TYPE_METABOLITE + value = 5 /datum/chem_property/special/boosting/pre_process(mob/living/M) return list(REAGENT_BOOST = level * 0.5) @@ -16,14 +17,15 @@ /datum/chem_property/special/optimized name = PROPERTY_OPTIMIZED code = "OPM" - description = "Chemical molecule is structured diffrently, resulting in more efficient and easy synthesis process." + description = "Chemical molecule is structured differently, resulting in more efficient and easy synthesis process." rarity = PROPERTY_LEGENDARY category = PROPERTY_TYPE_METABOLITE + value = 3 /datum/chem_property/special/optimized/update_reagent() var/datum/chemical_reaction/reaction_chem = GLOB.chemical_reactions_list[holder.id] if(reaction_chem) - reaction_chem.result_amount = 2 + reaction_chem.result_amount = 3 . = ..() /datum/chem_property/special/hypergenetic @@ -32,6 +34,7 @@ description = "Regenerates all types of cell membranes mending damage in all organs and limbs." rarity = PROPERTY_LEGENDARY category = PROPERTY_TYPE_MEDICINE + value = 2 /datum/chem_property/special/hypergenetic/process(mob/living/M, potency = 1) M.heal_limb_damage(potency) @@ -107,6 +110,7 @@ rarity = PROPERTY_LEGENDARY category = PROPERTY_TYPE_METABOLITE max_level = 1 + value = 6 /datum/chem_property/special/regulating/reset_reagent() holder.flags = initial(holder.flags) @@ -164,7 +168,7 @@ if((E.flags_embryo & FLAG_EMBRYO_PREDATOR) && E.hivenumber == GLOB.hive_datum[level]) return - E.visible_message(SPAN_DANGER("\the [E] rapidly mutates")) + E.visible_message(SPAN_DANGER("\the [E] rapidly mutates.")) playsound(E, 'sound/effects/attackblob.ogg', 25, TRUE) @@ -289,7 +293,7 @@ M.set_effect(0, PARALYZE) M.silent = 0 M.dizziness = 0 - M.drowsyness = 0 + M.drowsiness = 0 M.stuttering = 0 M.confused = 0 M.sleeping = 0 diff --git a/code/modules/reagents/chemistry_reactions/food_drink.dm b/code/modules/reagents/chemistry_reactions/food_drink.dm index bc84069d0b16..fdb98d74d835 100644 --- a/code/modules/reagents/chemistry_reactions/food_drink.dm +++ b/code/modules/reagents/chemistry_reactions/food_drink.dm @@ -801,6 +801,13 @@ required_reagents = list("orangejuice" = 2, "cola" = 1) result_amount = 2 +/datum/chemical_reaction/chocolate_milk + name = "Chocolate Milk" + id = "chocolate_milk" + result = "chocolate_milk" + required_reagents = list("chocolatesyrup" = 1, "milk" = 4) + result_amount = 5 + /datum/chemical_reaction/milkshake name = "Milkshake" id = "milkshake" @@ -808,6 +815,13 @@ required_reagents = list("cream" = 1, "ice" = 2, "milk" = 2) result_amount = 5 +/datum/chemical_reaction/milkshake/chocolate + name = "Chocolate Milkshake" + id = "chocolate_milkshake" + result = "chocolate_milkshake" + required_reagents = list("cream" = 1, "ice" = 2, "chocolate_milk" = 2) + result_amount = 5 + /datum/chemical_reaction/rewriter name = "Rewriter" id = "rewriter" diff --git a/code/modules/reagents/chemistry_reactions/other.dm b/code/modules/reagents/chemistry_reactions/other.dm index 7b6cbbc298c4..4e5bf21b02dc 100644 --- a/code/modules/reagents/chemistry_reactions/other.dm +++ b/code/modules/reagents/chemistry_reactions/other.dm @@ -38,10 +38,11 @@ /datum/chemical_reaction/emp_pulse/on_reaction(datum/reagents/holder, created_volume) . = ..() - var/location = get_turf(holder.my_atom) + var/turf/location = get_turf(holder.my_atom) // 100 created volume = 4 heavy range & 7 light range. A few tiles smaller than traitor EMP grandes. // 200 created volume = 8 heavy range & 14 light range. 4 tiles larger than traitor EMP grenades. - empulse(location, floor(created_volume / 24), floor(created_volume / 14), 1) + var/mob/causer = GLOB.ckey_to_occupied_mob[ckey(holder.my_atom.fingerprintslast)] + empulse(location, floor(created_volume / 24), floor(created_volume / 14), causer) holder.clear_reagents() diff --git a/code/modules/reagents/chemistry_reagents/alcohol.dm b/code/modules/reagents/chemistry_reagents/alcohol.dm index 1d984acbb368..095414ac71ad 100644 --- a/code/modules/reagents/chemistry_reagents/alcohol.dm +++ b/code/modules/reagents/chemistry_reagents/alcohol.dm @@ -60,7 +60,7 @@ * Sets only reagent ethanol to CHEM_CLASS_COMMON allowing for Turing machine to dispense it * * Sets ethanol to CHEM_CLASS_COMMON inheriting everything from /datum/reagent/ethanol. - * seems wonky to do double naming but cant have turing be super booze disp + * seems wonky to do double naming but can't have turing be super booze disp */ /datum/reagent/ethanol/ethanol chemclass = CHEM_CLASS_BASIC diff --git a/code/modules/reagents/chemistry_reagents/drink.dm b/code/modules/reagents/chemistry_reagents/drink.dm index c8183f1d0f72..13cc6ed17f29 100644 --- a/code/modules/reagents/chemistry_reagents/drink.dm +++ b/code/modules/reagents/chemistry_reagents/drink.dm @@ -26,7 +26,7 @@ if(adj_dizzy) M.dizziness = max(0,M.dizziness + adj_dizzy * delta_time) if(adj_drowsy) - M.drowsyness = max(0,M.drowsyness + adj_drowsy * delta_time) + M.drowsiness = max(0,M.drowsiness + adj_drowsy * delta_time) if(adj_sleepy) M.sleeping = max(0,M.sleeping + adj_sleepy * delta_time) @@ -35,7 +35,7 @@ adj_temp = 0 -//FRIUT JUICE// +//FRUIT JUICE// /datum/reagent/drink/orangejuice name = "Orange juice" @@ -180,7 +180,7 @@ /datum/reagent/drink/milk/coconut name = "Coconut Milk" id = "coconutmilk" - description = "A very light, half opague milk from coconuts, barely has any taste on its own." + description = "A very light, half opaque milk from coconuts, barely has any taste on its own." color = "#DFDFC7" // rgb: 223, 223, 199 chemclass = CHEM_CLASS_NONE flags = REAGENT_NO_GENERATION @@ -197,11 +197,25 @@ description = "A rich, sweet, non-alcoholic beverage traditionally consumed around Christmastime." color = "#DFD7AF" // rgb: 223, 215, 175 +/datum/reagent/drink/milk/chocolate + name = "Chocolate Milk" + id = "chocolate_milk" + description = "Nectar of the gods and nectar of the cow. Fucking delicious." + color = "#AD8F70" // rgb: 123, 63, 0 + /datum/reagent/drink/cold/milkshake name = "Milkshake" description = "Glorious brainfreezing mixture." id = "milkshake" - color = "#AEE5E4" // rgb" 174, 229, 228 + color = "#AEE5E4" // rgb: 174, 229, 228 + adj_temp = -2 + target_temp = T0C + +/datum/reagent/drink/cold/milkshake/chocolate + name = "Chocolate Milkshake" + description = "Glorious brainfreezing mixture in classic chocolate flavor." + id = "chocolate_milkshake" + color = "#AF9B86" // rgb: 175, 155, 134 adj_temp = -2 target_temp = T0C @@ -223,7 +237,7 @@ /datum/reagent/drink/souto name = "Souto Classic" id = "souto_classic" - description = "A tangerine flavored soda that's canned in Havana" + description = "A tangerine flavored soda that's canned in Havana." color = "#802b00" adj_drowsy = -10 chemclass = CHEM_CLASS_RARE @@ -231,37 +245,37 @@ /datum/reagent/drink/souto/cherry name = "Cherry Souto" id = "souto_cherry" - description = "A cherry flavored soda that's canned in Havanna" + description = "A cherry flavored soda that's canned in Havana." color = COLOR_MAROON /datum/reagent/drink/souto/lime name = "Lime Souto" id = "souto_lime" - description = "A lime flavored soda that's canned in Havanna" + description = "A lime flavored soda that's canned in Havana." color = "#878F00" /datum/reagent/drink/souto/grape name = "Grape Souto" id = "souto_grape" - description = "A grape flavored soda that's canned in Havanna" + description = "A grape flavored soda that's canned in Havana." color = "#421C52" /datum/reagent/drink/souto/blueraspberry name = "Blue Raspberry Souto" id = "souto_blueraspberry" - description = "A blue fruit flavored soda that's canned in Havana" + description = "A blue fruit flavored soda that's canned in Havana." color = "#005B96" /datum/reagent/drink/souto/peach name = "Peach Souto" id = "souto_peach" - description = "A peach flavored soda with flecks of peach pit floating inside that's canned in Havana" + description = "A peach flavored soda with flecks of peach pit floating inside that's canned in Havana." color = "#FFE5B4" /datum/reagent/drink/souto/cranberry name = "Cranberry Souto" id = "souto_cranberry" - description = "A cranberry flavored soda that's canned in Havana" + description = "A cranberry flavored soda that's canned in Havana." color = "#950714" /datum/reagent/drink/souto/vanilla @@ -322,7 +336,7 @@ M.make_jittery(20) M.druggy = max(M.druggy, 30) M.dizziness +=5 - M.drowsyness = 0 + M.drowsiness = 0 /datum/reagent/drink/cold/spacemountainwind name = "Mountain Wind" @@ -526,6 +540,12 @@ id = "lemonade" color = COLOR_YELLOW +/datum/reagent/drink/chocolate + name = "Chocolate Syrup" + description = "Nectar of the gods." + id = "chocolatesyrup" + color = "#7B3F00" // rgb: 123, 163, 0 + //*****************************************************************************************************/ //***************************************Remove When Safe**********************************************/ //*****************************************************************************************************/ @@ -679,7 +699,7 @@ color = "#FF8CFF" // rgb: 255, 140, 255 overdose = REAGENTS_OVERDOSE overdose_critical = REAGENTS_OVERDOSE_CRITICAL - properties = list(PROPERTY_NEOGENETIC = 0.5, PROPERTY_ANTICORROSIVE = 0.5, PROPERTY_ANTITOXIC = 0.5, PROPERTY_OXYGENATING = 0.5, PROPERTY_RELAXING = 1) + properties = list(PROPERTY_NEOGENETIC = 0.5, PROPERTY_ANTICORROSIVE = 0.5, PROPERTY_ANTITOXIC = 0.5, PROPERTY_OXYGENATING = 0.5, PROPERTY_ANTISPASMODIC = 1) adj_dizzy = -3 chemclass = CHEM_CLASS_RARE diff --git a/code/modules/reagents/chemistry_reagents/food.dm b/code/modules/reagents/chemistry_reagents/food.dm index 903257131723..bd31668d72ff 100644 --- a/code/modules/reagents/chemistry_reagents/food.dm +++ b/code/modules/reagents/chemistry_reagents/food.dm @@ -25,7 +25,19 @@ processing_tray.yield_mod += 0.1*volume processing_tray.nutrilevel += 1*volume - +/datum/reagent/nutriment/process_non_property_effects(mob/living/M, list/mods, delta_time) + var/first_collective_volume = 0 + for(var/datum/reagent/nutriment/nutri in M.reagents.reagent_list) + first_collective_volume += nutri.volume + if(first_collective_volume >= HIGH_REAGENTS_OVERDOSE) + var/second_collective_volume = 0 + for(var/datum/reagent/nutriment/nutri in M.reagents.reagent_list) + holder.remove_reagent(nutri.id, max(first_collective_volume / 10, 5) * delta_time, TRUE) + second_collective_volume += nutri.volume + var/mob/living/carbon/human/subject = M + if(ishuman(M) && subject.lastpuke == FALSE && second_collective_volume >= HIGH_REAGENTS_OVERDOSE) + subject.Superslow(20) + subject.vomit() /datum/reagent/nutriment/egg name = "Egg" @@ -214,7 +226,7 @@ /datum/reagent/frostoil name = "Frost Oil" id = "frostoil" - description = "A special oil that noticably chills the body. Extracted from Ice Peppers." + description = "A special oil that noticeably chills the body. Extracted from Ice Peppers." reagent_state = LIQUID color = "#B31008" // rgb: 139, 166, 233 chemclass = CHEM_CLASS_RARE @@ -238,29 +250,27 @@ reagent_state = LIQUID color = "#badb9e" // rgb: 139, 166, 233 chemclass = CHEM_CLASS_HYDRO - properties = list(PROPERTY_ANTIPARASITIC = 0.5) + properties = list(PROPERTY_ANTIPARASITIC = 1.5) -/datum/reagent/psoralen //cabbage, doesnt make sense but eh +/datum/reagent/psoralen //cabbage, doesn't make sense but eh name = "Psoralen" id = "psoralen" - description = "Naturally occuring carcinogenic, used commonly as mutagen for DNA research." + description = "Naturally occurring carcinogenic, used commonly as mutagen for DNA research." reagent_state = LIQUID color = "#c9ca75" // rgb: 139, 166, 233 - chemclass = CHEM_CLASS_HYDRO properties = list(PROPERTY_CARCINOGENIC = 6) /datum/reagent/coniine //carrot name = "Coniine" id = "coniine" - description = "Potent neurotoxic chemical commonly used as a murder weapon, death is caused by respiration failure and paralysis" + description = "Potent toxic chemical causing loss of consciousness and respiratory failure in matter of seconds, although it was studied for a long time, it could have some undocumented use." reagent_state = LIQUID overdose = LOW_REAGENTS_OVERDOSE overdose_critical = LOW_REAGENTS_OVERDOSE_CRITICAL color = "#8f947b" // rgb: 139, 166, 233 chemclass = CHEM_CLASS_HYDRO - properties = list(PROPERTY_SEDATIVE = 5) - + properties = list(PROPERTY_HYPNOTIC = 7, PROPERTY_HYPOXEMIC = 6, PROPERTY_EXCRETING = 2, PROPERTY_HEPATOPEUTIC = 2) /datum/reagent/zygacine name = "Zygacine" id = "zygacine" @@ -281,12 +291,12 @@ overdose_critical = LOWM_REAGENTS_OVERDOSE_CRITICAL color = "#9ec265" // rgb: 139, 166, 233 chemclass = CHEM_CLASS_HYDRO - properties = list(PROPERTY_CARDIOPEUTIC = 3, PROPERTY_FLUFFING = 1) + properties = list(PROPERTY_CARDIOPEUTIC = 3, PROPERTY_TRICHOGENIC = 1) /datum/reagent/urishiol name = "Urishiol" id = "urishiol" - description = "Potent skin and tissue irratant causing burns which lasts weeks after the contact is made, commonly encountered in plants like Poision Ivy, Poison Oak, and simular" + description = "Potent skin and tissue irritant causing burns which lasts weeks after the contact is made, commonly encountered in plants like Poison Ivy, Poison Oak, and similar toxicodendrons." overdose = LOW_REAGENTS_OVERDOSE overdose_critical = LOW_REAGENTS_OVERDOSE_CRITICAL custom_metabolism = AMOUNT_PER_TIME(15, 20 MINUTES) @@ -333,7 +343,7 @@ /datum/reagent/coco name = "Coco Powder" id = "coco" - description = "The cocoa bean or simply cocoa, which is also called the cacao bean or cacao, is the dried and fully fermented seed of Theobroma cacao, from which cocoa solids and cocoa butter can be extracted. " + description = "The cocoa bean or simply cocoa, which is also called the cacao bean or cacao, is the dried and fully fermented seed of Theobroma cacao, from which cocoa solids and cocoa butter can be extracted." reagent_state = SOLID nutriment_factor = 5 * REAGENTS_METABOLISM color = "#302000" // rgb: 48, 32, 0 @@ -394,7 +404,7 @@ /datum/reagent/enzyme name = "Universal Enzyme" id = "enzyme" - description = "A universal enzyme used in the preperation of certain chemicals and foods." + description = "A universal enzyme used in the preparation of certain chemicals and foods." reagent_state = LIQUID color = "#365E30" // rgb: 54, 94, 48 overdose = REAGENTS_OVERDOSE diff --git a/code/modules/reagents/chemistry_reagents/medical.dm b/code/modules/reagents/chemistry_reagents/medical.dm index 758d87eb7287..47a6853f8aa1 100644 --- a/code/modules/reagents/chemistry_reagents/medical.dm +++ b/code/modules/reagents/chemistry_reagents/medical.dm @@ -6,9 +6,9 @@ /datum/reagent/medical/inaprovaline name = "Inaprovaline" id = "inaprovaline" - description = "Inaprovaline is a synaptic stimulant and cardiostimulant. Commonly used to stabilize patients. If the lungs are functional, inaprovaline will allow respiration while under cardiac arrest. Slows down bleeding and acts as a weak painkiller. Overdosing may cause severe damage to cardiac tissue." + description = "Inaprovaline is a weak synaptic stimulant and cardiostimulant used to stabilize patients under cardiac arrest by allowing respiration when the lungs are functional. Though the body can tolerate unusually high doses of the medication, as a cardiostimulant, the side effects of overdosing at include involuntary body jerks, limb seizures, and collapsing. Critical overdoses damage cardiac tissue." reagent_state = LIQUID - color = "#dcbaf0" // rgb: 200, 165, 220 + color = "#e688b7" // rgb: 230, 136, 183 //changed to differentiate from Tramadol in autoinjectors and bottles overdose = HIGH_REAGENTS_OVERDOSE overdose_critical = HIGH_REAGENTS_OVERDOSE_CRITICAL chemclass = CHEM_CLASS_COMMON @@ -17,9 +17,9 @@ /datum/reagent/medical/ryetalyn name = "Ryetalyn" id = "ryetalyn" - description = "Ryetalyn repairs genetic defects, mutations and abnormalities through a catalytic process. Used to treat genetic eye and vision problems. Overdosing on ryetalyn is very toxic and can impair sense of balance." + description = "Ryetalyn repairs genetic and ocular defects, mutations, and abnormalities through a catalytic process. Side effects of ryetalyn overdoses include confusion and toxin damage. Critical overdoses cause paralysis and damage to DNA strands." reagent_state = SOLID - color = "#C8A5DC" // rgb: 200, 165, 220 + color = "#E4D2EE" // rgb: 228, 210, 238 overdose = REAGENTS_OVERDOSE overdose_critical = REAGENTS_OVERDOSE_CRITICAL chemclass = CHEM_CLASS_UNCOMMON @@ -28,9 +28,9 @@ /datum/reagent/medical/paracetamol name = "Paracetamol" id = "paracetamol" - description = "Also known as Tylenol, this is a moderate long lasting painkiller that has been commonly available since 1950. Paracetamol is capable of both analgesic and antipyretic activity but no anti-inflammatory action. Overdosing on paracetamol is toxic, may induce hallucinations, and cause acute liver failure." + description = "Also known as Tylenol, this is a moderate long lasting painkiller that has been commonly available since 1950. Paracetamol is capable of both analgesic and antipyretic activity but no anti-inflammatory action. Overdosing on paracetamol is toxic, may induce hallucinations, and cause acute liver failure. Side effects of Paracetamol overdoses include: Opiate Receptor Deficiency, hallucinations, and toxin damage. Critical overdoses become neurotoxic, hepatotoxic, and cause extreme difficulties in breathing." reagent_state = LIQUID - color = "#C855DC" + color = "#C855DC" // rgb: 200, 85, 220 custom_metabolism = AMOUNT_PER_TIME(15, 10 MINUTES) // Lasts 10 minutes for 15 units overdose = HIGH_REAGENTS_OVERDOSE overdose_critical = HIGH_REAGENTS_OVERDOSE_CRITICAL @@ -40,22 +40,22 @@ /datum/reagent/medical/tramadol name = "Tramadol" id = "tramadol" - description = "Tramadol is a centrally acting analgesic and is considered to be a relatively safe. The analgesic potency is claimed to be about one tenth that of morphine. It is used to treat both acute and chronic pain of moderate to (moderately) severe intensity. Tramadol is generally considered as a medicinal drug with a low potential for dependence relative to morphine. Overdosing on tramadol is highly toxic." + description = "Tramadol is a centrally acting analgesic. The analgesic potency is claimed to be about one-tenth that of morphine. It is used to treat both acute and chronic pain of moderate to (moderately) severe intensity. Tramadol is generally considered a medicinal drug with a low potential for dependence relative to morphine. Side effects of Tramadol overdoses include: Opiate Receptor Deficiency, hallucinations, and toxin damage. Critical overdoses become neurotoxic, hepatotoxic, and cause extreme difficulties in breathing." reagent_state = LIQUID - color = "#d7c7e0" + color = "#d7c7e0" // rgb: 215, 199, 224 custom_metabolism = AMOUNT_PER_TIME(15, 10 MINUTES) // Lasts 10 minutes for 15 units overdose = REAGENTS_OVERDOSE overdose_critical = REAGENTS_OVERDOSE_CRITICAL chemclass = CHEM_CLASS_COMMON properties = list(PROPERTY_PAINKILLING = 2.5) -//Changed to Common so turing will dispense. definition of common chem class "Chemicals which recipe is commonly known and made". Oxycodone is such being avaliable from med dispenser +//Changed to Common so turing will dispense. definition of common chem class "Chemicals which recipe is commonly known and made". Oxycodone is such being available from med dispenser /datum/reagent/medical/oxycodone name = "Oxycodone" id = "oxycodone" - description = "Oxycodone is an opioid agonist with addiction potential similar to that of morphine. It is approved for the treatment of patients with moderate to severe pain who are expected to need continuous opioids for an extended period of time. Overdosing on oxycodone can cause hallucinations, brain damage and be highly toxic." + description = "Oxycodone is an opioid agonist with addiction potential similar to that of morphine. It is approved for the treatment of patients with moderate to severe pain who are expected to need continuous opioids for an extended period of time. Side effects of oxycodone overdoses include: Opiate Receptor Deficiency, hallucinations, and toxin damage. Critical overdoses become neurotoxic, hepatotoxic, and cause extreme difficulties in breathing." reagent_state = LIQUID - color = "#1cc282" + color = "#1cc282" // rgb: 28, 194, 130 custom_metabolism = AMOUNT_PER_TIME(15, 5 MINUTES) // Lasts 5 minutes for 15 units overdose = MED_REAGENTS_OVERDOSE overdose_critical = MED_REAGENTS_OVERDOSE_CRITICAL @@ -67,15 +67,15 @@ id = "sterilizine" description = "A sterilizer used to clean wounds in preparation for surgery. Its use has mostly been outclassed to the cheaper alternative of space cleaner." reagent_state = LIQUID - color = "#b8d2f5" // rgb: 200, 165, 220 + color = "#b8d2f5" // rgb: 184, 210, 245 chemclass = CHEM_CLASS_UNCOMMON /datum/reagent/medical/leporazine name = "Leporazine" id = "leporazine" - description = "A drug used to treat hypothermia and hyperthermia. Stabilizes patient body temperture. Prevents the use of cryogenics. Overdosing on leporazine can cause extreme drowsyness." + description = "A drug used to treat hypothermia and hyperthermia. Stabilizes patient body temperature. Prevents the use of cryogenics. Overdoses cause drowsiness and paralysis." reagent_state = LIQUID - color = "#a03919" // rgb: 200, 165, 220 + color = "#a03919" // rgb: 160, 57, 25 overdose = REAGENTS_OVERDOSE overdose_critical = REAGENTS_OVERDOSE_CRITICAL chemclass = CHEM_CLASS_UNCOMMON @@ -84,9 +84,9 @@ /datum/reagent/medical/kelotane name = "Kelotane" id = "kelotane" - description = "Common medicine used to treat burns, caustic and corrosive trauma. Overdosing on kelotane can cause internal tissue damage." + description = "Kelotane is a common anticorrosive drug used to treat corrosive and caustic burn trauma. Overdoses are ironically caustic and toxic, damaging skin and muscle tissues." reagent_state = LIQUID - color = "#d8b343" + color = "#d8b343" // rgb: 216, 179, 67 overdose = REAGENTS_OVERDOSE overdose_critical = REAGENTS_OVERDOSE_CRITICAL chemclass = CHEM_CLASS_COMMON @@ -95,9 +95,9 @@ /datum/reagent/medical/dermaline name = "Dermaline" id = "dermaline" - description = "Advanced medicine used to treat severe burn trauma. Enables the body to restore even the direst heat-damaged tissue. Overdosing on dermaline can cause severe internal tissue damage." + description = "Dermaline is a more potent anticorrosive drug used to treat severe burn trauma. It enables the body to restore damaged tissue even after accruing fourth-degree burns, down to the bone. Overdoses are ironically caustic and toxic, damaging skin and muscle tissues." reagent_state = LIQUID - color = "#e2972e" + color = "#e2972e" // 226, 151, 46 overdose = LOWH_REAGENTS_OVERDOSE overdose_critical = LOWH_REAGENTS_OVERDOSE_CRITICAL chemclass = CHEM_CLASS_UNCOMMON @@ -106,9 +106,9 @@ /datum/reagent/medical/dexalin name = "Dexalin" id = "dexalin" - description = "Dexalin is used in the treatment of oxygen deprivation by feeding oxygen to red blood cells directly inside the bloodstream. Used as an antidote to lexorin poisoning." + description = "Dexalin is used in the treatment of oxygen deprivation by feeding oxygen to red blood cells directly inside the bloodstream. Overdoses are toxic and can severely damage skin and muscle tissues." reagent_state = LIQUID - color = "#1f28a7" + color = "#1f28a7" // rgb: 31, 40, 167 overdose = REAGENTS_OVERDOSE overdose_critical = REAGENTS_OVERDOSE_CRITICAL chemclass = CHEM_CLASS_COMMON @@ -117,9 +117,9 @@ /datum/reagent/medical/dexalinp name = "Dexalin Plus" id = "dexalinp" - description = "Dexalin Plus is an upgraded form of Dexalin with added iron and carbon to quicken the rate which oxygen binds to the hemoglobin in red blood cells." + description = "Dexalin Plus is an upgraded form of Dexalin with added iron and carbon to expedite the rate at which oxygen binds to the hemoglobin in red blood cells. One unit can immediately and completely cleanse the body of excessive carbon dioxide. However, overdoses are toxic and can severely damage skin and muscle tissues." reagent_state = LIQUID - color = "#293fff" + color = "#4d5cdb" // rgb: 77, 92, 219 overdose = LOWH_REAGENTS_OVERDOSE overdose_critical = LOWH_REAGENTS_OVERDOSE_CRITICAL chemclass = CHEM_CLASS_UNCOMMON @@ -128,9 +128,9 @@ /datum/reagent/medical/tricordrazine name = "Tricordrazine" id = "tricordrazine" - description = "Tricordrazine is a highly potent stimulant, originally derived from cordrazine. Can be used to treat a wide range of injuries." + description = "Tricordrazine is a highly potent stimulant, originally derived from cordrazine. It is a wide-spectrum medication that treats all types of skin and muscle damage, replenishes the body with oxygen, and neutralizes toxins. It is extremely toxic when overdosing, however, causing widespread toxin, tissue, and organ damage." reagent_state = LIQUID - color = "#d87f2b" + color = "#d87f2b" // rgb: 216, 127, 43 overdose = REAGENTS_OVERDOSE overdose_critical = REAGENTS_OVERDOSE_CRITICAL chemclass = CHEM_CLASS_UNCOMMON @@ -139,9 +139,9 @@ /datum/reagent/medical/anti_toxin name = "Dylovene" id = "anti_toxin" - description = "General use anti-toxin, that neutralizes most toxins in the bloodstream. Commonly used in many advanced chemicals. Can be used as a mild anti-hallucinogen and to reduce tiredness." + description = "General-use antitoxin that neutralizes most toxins in the bloodstream. Commonly used in many advanced chemicals. It can be used as a mild anti-hallucinogen and to reduce tiredness. A patient overdosing on dylovene will not accumulate toxins, but they will be drowsy and accrue ocular damage." reagent_state = LIQUID - color = "#3fc92a" + color = "#3EA72A" // rgb: 62, 167, 42 changed to be slightly darker to differentiate from oxycodone autoinjectors overdose = REAGENTS_OVERDOSE overdose_critical = REAGENTS_OVERDOSE_CRITICAL chemclass = CHEM_CLASS_COMMON @@ -152,7 +152,7 @@ id = "adminordrazine" description = "A magical substance created by gods to dissolve extreme amounts of salt." reagent_state = LIQUID - color = "#dae63b" // rgb: 200, 165, 220 + color = "#dae63b" // rgb: 218, 230, 59 properties = list(PROPERTY_OMNIPOTENT = 2) flags = REAGENT_TYPE_MEDICAL @@ -161,7 +161,7 @@ id = "thwei" description = "A strange, alien liquid." reagent_state = LIQUID - color = "#41c498" // rgb: 200, 165, 220 + color = "#41c498" // rgb: 65, 196, 152 chemclass = CHEM_CLASS_SPECIAL objective_value = OBJECTIVE_HIGH_VALUE properties = list( @@ -185,7 +185,7 @@ id = "neuraline" description = "A chemical cocktail tailored to enhance or dampen specific neural processes." reagent_state = LIQUID - color = "#a244d8" // rgb: 200, 165, 220 + color = "#a244d8" // rgb: 162, 68, 216 custom_metabolism = AMOUNT_PER_TIME(1, 5 SECONDS) overdose = 2 overdose_critical = 3 @@ -196,9 +196,9 @@ /datum/reagent/medical/arithrazine name = "Arithrazine" id = "arithrazine" - description = "A stabilized variant of dylovene. Its toxin-cleansing properties are weakened and there are harmful side effects, but it does not react with other compounds to create toxin." + description = "A stabilized variant of dylovene with the side effect of damaging skin and muscle tissue as it cleanses the body of toxins. Its toxin-cleansing properties are weakened, but it does not react with other compounds to create toxins. The body has a low tolerance to this medication, with side effects after an overdose including drowsiness and eye damage." reagent_state = LIQUID - color = "#3c8529" // rgb: 200, 165, 220 + color = "#3c8529" // rgb: 60, 133, 41 custom_metabolism = AMOUNT_PER_TIME(1, 40 SECONDS) overdose = REAGENTS_OVERDOSE/2 overdose_critical = REAGENTS_OVERDOSE_CRITICAL/2 @@ -208,9 +208,9 @@ /datum/reagent/medical/russianred name = "Russian Red" id = "russianred" - description = "An emergency radiation treatment. The list of potential side effects include retinal damage and unconsciousness." + description = "An emergency radiation treatment. The list of potential side effects includes retinal damage and unconsciousness." reagent_state = LIQUID - color = "#ce2727" // rgb: 200, 165, 220 + color = "#ce2727" // rgb: 206, 39, 39 custom_metabolism = AMOUNT_PER_TIME(1, 2 SECONDS) overdose = MED_REAGENTS_OVERDOSE overdose_critical = MED_REAGENTS_OVERDOSE_CRITICAL @@ -219,9 +219,9 @@ /datum/reagent/medical/alkysine name = "Alkysine" id = "alkysine" - description = "Alkysine is a drug used to lessen and heal the damage to neurological tissue after a catastrophic injury. Small amounts can repair extensive brain trauma. Functions as a very weak painkiller. Overdosing on alkysine is extremely toxic." + description = "Alkysine is a drug used to lessen and heal the damage to neurological tissue after a catastrophic injury. Alkysine is toxic upon overdosing, and critical overdoses are neurotoxic and sever the connection between nerve endings in the spine, causing paralysis in the limbs." reagent_state = LIQUID - color = "#e9d191" + color = "#e9d191" // rgb: 233, 209, 145 custom_metabolism = AMOUNT_PER_TIME(1, 40 SECONDS) overdose = REAGENTS_OVERDOSE overdose_critical = REAGENTS_OVERDOSE_CRITICAL @@ -231,7 +231,7 @@ /datum/reagent/medical/imidazoline name = "Imidazoline" id = "imidazoline" - description = "Used for treating non-genetic eye trauma. Generally prescribed as treatment for most cases of eye trauma instead of performing a surgical operation." + description = "Used for treating non-genetic eye trauma. Generally prescribed as treatment for most cases of eye trauma instead of performing a surgical operation. Imidazoline is toxic during an overdose, and is neurotoxic at critical overdosing." reagent_state = LIQUID color = "#C8A5DC" // rgb: 200, 165, 220 overdose = REAGENTS_OVERDOSE @@ -242,21 +242,21 @@ /datum/reagent/medical/peridaxon name = "Peridaxon" id = "peridaxon" - description = "Prevents symptoms caused by damaged internal organs while in the bloodstream, but does not fix the organ damage. Recommended for patients awaiting internal organ surgery. Overdosing on peridaxon will cause internal tissue damage." + description = "Prevents symptoms caused by damaged internal organs while in the bloodstream, but does not fix the organ damage. Recommended for patients awaiting internal organ surgery. Overdosing on peridaxon at damages external tissues, and critical overdoses ironically damage internal organs." reagent_state = LIQUID - color = "#403142" + color = "#403142" // rgb: 64, 49, 66 overdose = LOWH_REAGENTS_OVERDOSE overdose_critical = LOWH_REAGENTS_OVERDOSE_CRITICAL custom_metabolism = AMOUNT_PER_TIME(1, 40 SECONDS) chemclass = CHEM_CLASS_COMMON properties = list(PROPERTY_ORGANSTABILIZE = 4) -/datum/reagent/medical/bicaridine // yes it cures IB, it's located in some other part of wound code for whatever reason +/datum/reagent/medical/bicaridine // no, it no longer cures IB while overdosing. name = "Bicaridine" id = "bicaridine" - description = "Bicaridine is an analgesic medication and can be used to treat severe external blunt trauma and to stabilize patients. Overdosing on Bicaridine will cause caustic burns and toxins." + description = "Bicaridine is an analgesic medication and can be used to treat severe external blunt trauma and to stabilize patients. Overdosing on Bicaridine will cause caustic burns and it is toxic with critical overdoses." reagent_state = LIQUID - color = "#e7554a" + color = "#e7554a" // rgb: 231, 85, 74 overdose = REAGENTS_OVERDOSE overdose_critical = REAGENTS_OVERDOSE_CRITICAL chemclass = CHEM_CLASS_COMMON @@ -265,9 +265,9 @@ /datum/reagent/medical/meralyne name = "Meralyne" id = "meralyne" - description = "Advanced analgesic medication used to treat extremely severe blunt trauma. Allows the body to quickly repair damaged tissue. Overdosing on Meralyne can cause severe corrosion to cell membranes." + description = "Advanced analgesic medication used to treat extremely severe blunt trauma. Allows the body to quickly repair damaged tissue. Overdosing on Meralyne will cause severe corrosion to cell membranes and is toxic at critical overdoses." reagent_state = LIQUID - color = "#b40000" + color = "#b40000" // rgb: 180, 0, 0 overdose = LOWH_REAGENTS_OVERDOSE overdose_critical = LOWH_REAGENTS_OVERDOSE_CRITICAL chemclass = CHEM_CLASS_UNCOMMON @@ -276,9 +276,9 @@ /datum/reagent/medical/adrenaline name = "Epinephrine" id = "adrenaline" - description = "A natural muscle and heart stimulant. Useful for restarting the heart. Overdosing may stress the heart and cause tissue damage." + description = "Known commonly as the natural muscle and heart stimulant 'adrenaline,' low doses of this medication help restart the heart after defibrillation. It also acts as a mild painkiller. Overdosing on epinephrine will stress the heart and cause tissue damage." reagent_state = LIQUID - color = "FFE703" // Yellow-ish + color = "#FFF0B9" // rgb: 255, 240, 185 overdose = LOWM_REAGENTS_OVERDOSE overdose_critical = LOWM_REAGENTS_OVERDOSE_CRITICAL custom_metabolism = AMOUNT_PER_TIME(1, 5 SECONDS) @@ -289,9 +289,9 @@ /datum/reagent/medical/ultrazine name = "Ultrazine" id = "ultrazine" - description = "A highly-potent, long-lasting combination CNS and muscle stimulant. Extremely addictive." + description = "A highly-potent, long-lasting combination CNS and muscle stimulant. Extremely addictive. Overdosing on Ultrazine is cardiotoxic and will cause heart damage." reagent_state = LIQUID - color = "#ffec43" // rgb: 200, 165, 220 + color = "#ffe043" // rgb: 255, 224, 67 custom_metabolism = 0.0167 //5 units will last approximately 10 minutes overdose = LOWM_REAGENTS_OVERDOSE overdose_critical = LOWM_REAGENTS_OVERDOSE_CRITICAL @@ -304,7 +304,7 @@ id = "antag_stimulant" description = "A highly-potent, long-lasting combination CNS and muscle stimulant." reagent_state = LIQUID - color = "#00ffff" // rgb: 200, 165, 220 + color = "#2bd4d4" // rgb: 43, 212, 212 custom_metabolism = AMOUNT_PER_TIME(1, 40 SECONDS) // 4x longer overdose = LOWH_REAGENTS_OVERDOSE overdose_critical = LOWH_REAGENTS_OVERDOSE_CRITICAL @@ -315,9 +315,9 @@ /datum/reagent/medical/cryoxadone name = "Cryoxadone" id = "cryoxadone" - description = "Industrial grade cryogenic medicine. Treats most types of tissue damage. Its main limitation is that the patient's body temperature must be under 170K to metabolise correctly." + description = "Industrial grade cryogenic medicine. Treats most types of tissue damage. Its main limitation is that the patient's body temperature must be under 170K to metabolize correctly." reagent_state = LIQUID - color = "#4acaca" // rgb: 200, 165, 220 + color = "#4acaca" // rgb: 74, 202, 202 chemclass = CHEM_CLASS_UNCOMMON properties = list(PROPERTY_CRYOMETABOLIZING = 2, PROPERTY_NEOGENETIC = 1, PROPERTY_ANTICORROSIVE = 1, PROPERTY_ANTITOXIC = 1, PROPERTY_ANTICARCINOGENIC = 1) @@ -334,16 +334,16 @@ /datum/reagent/medical/clonexadone name = "Clonexadone" id = "clonexadone" - description = "Advanced cryogenic medicine made from cryoxadone. Treats most types of tissue damage. Requires temperatures below 170K to to metabolise correctly." + description = "Advanced cryogenic medicine made from cryoxadone. Treats most types of tissue damage. Requires temperatures below 170K to metabolize correctly." reagent_state = LIQUID - color = "#51b4db" // rgb: 200, 165, 220 + color = "#51b4db" // rgb: 81, 180, 219 chemclass = CHEM_CLASS_UNCOMMON properties = list(PROPERTY_CRYOMETABOLIZING = 6, PROPERTY_NEOGENETIC = 3, PROPERTY_ANTICORROSIVE = 3, PROPERTY_ANTITOXIC = 3, PROPERTY_ANTICARCINOGENIC = 3) /datum/reagent/medical/rezadone name = "Rezadone" id = "rezadone" - description = "A powder derived from fish toxin, this substance can effectively treat genetic damage in humanoids. Excessive consumption may cause disastrous side effects." + description = "A powder derived from fish toxin, this substance can effectively treat genetic damage in humanoids. Causes toxin damage. Excessive consumption may cause disastrous side effects." reagent_state = SOLID color = "#669900" // rgb: 102, 153, 0 overdose = REAGENTS_OVERDOSE @@ -355,7 +355,7 @@ id = "spaceacillin" description = "General use theta-lactam antibiotic. Prevents and cures mundane infections." reagent_state = LIQUID - color = "#9749c4" // rgb: 200, 165, 220 + color = "#9749c4" // rgb: 151, 73, 196 custom_metabolism = AMOUNT_PER_TIME(1, 200 SECONDS) overdose = REAGENTS_OVERDOSE overdose_critical = REAGENTS_OVERDOSE_CRITICAL @@ -364,7 +364,7 @@ /datum/reagent/medical/ethylredoxrazine // FUCK YOU, ALCOHOL name = "Ethylredoxrazine" id = "ethylredoxrazine" - description = "Neutralizes the effects of alcohol in the blood stream, by oxidizing it into water molecules. However, it does not stop immediate intoxication. Ethylredoxrazine being a powerful oxidizer, it becomes toxic in high doses." + description = "Neutralizes the effects of alcohol in the bloodstream, by oxidizing it into water molecules. However, it does not stop immediate intoxication. Ethylredoxrazine, ironically, becomes toxic upon overdosing." reagent_state = SOLID color = "#605048" // rgb: 96, 80, 72 overdose = REAGENTS_OVERDOSE @@ -376,7 +376,7 @@ /datum/reagent/medical/antidepressant/methylphenidate name = "Methylphenidate" id = "methylphenidate" - description = "A commonly prescribed psychostimulant that increases activity of the central nervous system. Often used to treat attention deficit hyperactivity disorder (ADHD) and narcolepsy. This drug improves performance primarily in the executive function in the prefrontal cortex (reasoning, inhibiting behaviors, organizing, problem solving, planning ect.)" + description = "A commonly prescribed psychostimulant that increases activity of the central nervous system. Often used to treat attention deficit hyperactivity disorder (ADHD) and narcolepsy. This drug improves performance primarily in the executive function in the prefrontal cortex (reasoning, inhibiting behaviors, organizing, problem solving, planning, etc.)" reagent_state = LIQUID color = "#C8A5DC" custom_metabolism = AMOUNT_PER_TIME(1, 200 SECONDS) @@ -387,7 +387,7 @@ /datum/reagent/medical/antidepressant/citalopram name = "Citalopram" id = "citalopram" - description = "Citalopram is a drug used to treat depression, obsessive-compulsive disorder and panic disorder. It is considered safe for consumption and has been commonly available since 1998." + description = "Citalopram is a drug used to treat depression, obsessive-compulsive disorder, and panic disorder. It is considered safe for consumption and has been commonly available since 1998." reagent_state = LIQUID color = "#C8A5DC" custom_metabolism = AMOUNT_PER_TIME(1, 200 SECONDS) @@ -398,7 +398,7 @@ /datum/reagent/medical/antidepressant/paroxetine name = "Paroxetine" id = "paroxetine" - description = "Very powerful antidepressant used to treat: major depressive disorder (MDD), obsessive-compulsive disorder (OCD), social anxiety disorder (SAD), panic disorder, posttraumatic stress disorder (PTSD), generalized anxiety disorder (GAD) and prenmenstrual dysphoric disorder (PMDD). Prolonged use may have side effects." + description = "Very powerful antidepressant used to treat major depressive disorder (MDD), obsessive-compulsive disorder (OCD), social anxiety disorder (SAD), panic disorder, posttraumatic stress disorder (PTSD), generalized anxiety disorder (GAD) and premenstrual dysphoric disorder (PMDD). Prolonged use may have side effects." reagent_state = LIQUID color = "#C8A5DC" custom_metabolism = AMOUNT_PER_TIME(1, 200 SECONDS) @@ -411,17 +411,18 @@ id = "antiZed" description = "An experimental drug that destroys the zombie virus in living humans and prevents regeneration for those who have already turned." reagent_state = LIQUID - color = "#C8A5DC" + color = "#41D4FB" custom_metabolism = AMOUNT_PER_TIME(1, 200 SECONDS) data = 0 properties = list(PROPERTY_CURING = 2) /datum/reagent/medical/host_stabilizer - name = "Embryo secretion" + name = "Xenomorph embryotic secretion" id = "host_stabilizer" - description = "An unknown substance secreted by an embryo." + description = "A strange and unknown concoction of hormones and chemicals that xenomorph embryos secrete as they grow inside hosts to stabilize them." reagent_state = LIQUID color = BLOOD_COLOR_XENO chemclass = CHEM_CLASS_NONE properties = list(PROPERTY_CRITICALSTABILIZE = 1, PROPERTY_CROSSMETABOLIZING = 2) flags = REAGENT_TYPE_MEDICAL | REAGENT_NO_GENERATION + diff --git a/code/modules/reagents/chemistry_reagents/other.dm b/code/modules/reagents/chemistry_reagents/other.dm index e33fc459bfa0..a04ed039ec5d 100644 --- a/code/modules/reagents/chemistry_reagents/other.dm +++ b/code/modules/reagents/chemistry_reagents/other.dm @@ -207,7 +207,7 @@ /datum/reagent/sleen name = "Sleen" id = "sleen" - description = " A favorite of marine medics, it is an illicit mixture of name brand lime soda and oxycodone, known for it's distinct red hue. Overdosing can cause hallucinations, loss of coordination, seizures, brain damage, respiratory failure, and death." + description = " A favorite of marine medics, it is an illicit mixture of name brand lime soda and oxycodone, known for its distinct red hue. Overdosing can cause hallucinations, loss of coordination, seizures, brain damage, respiratory failure, and death." reagent_state = LIQUID color = "#C21D24" // rgb: 194, 29, 36 overdose = MED_REAGENTS_OVERDOSE @@ -228,7 +228,7 @@ /datum/reagent/oxygen name = "Oxygen" id = "oxygen" - description = "Chemical element of atomic number 8. It is an oxidizing agent that forms oxides with most elements and many other compounds. Dioxygen is used in cellular respiration and is nessesary to sustain organic life." + description = "Chemical element of atomic number 8. It is an oxidizing agent that forms oxides with most elements and many other compounds. Dioxygen is used in cellular respiration and is necessary to sustain organic life." reagent_state = GAS color = COLOR_GRAY chemfiresupp = TRUE @@ -243,7 +243,7 @@ /datum/reagent/copper name = "Copper" id = "copper" - description = "Chemical element of atomic number 29. A solfe malleable red metal with high thermal and electrical conductivity." + description = "Chemical element of atomic number 29. A soft, red malleable metal with high thermal and electrical conductivity." color = "#6E3B08" // rgb: 110, 59, 8 chemfiresupp = TRUE burncolor = "#78be5a" @@ -370,7 +370,7 @@ /datum/reagent/phosphorus name = "Phosphorus" id = "phosphorus" - description = "Chemical element of atomic number 15. A highly reactive element, that is essential for life as a component of DNA, RNA and ATP. White phospherous is used in many types of tracer and incendiary munitions due to its smoke production and high flammability." + description = "Chemical element of atomic number 15. A highly reactive element, that is essential for life as a component of DNA, RNA and ATP. White phosphorus is used in many types of tracer and incendiary munitions due to its smoke production and high flammability." reagent_state = SOLID color = "#832828" // rgb: 131, 40, 40 chemfiresupp = TRUE @@ -463,7 +463,7 @@ id = "iron" description = "Chemical element of atomic number 26. Has a broad range of uses in multiple industries particularly in engineering and construction. Iron is an important component of hemoglobin, the substance in red blood cells that carries oxygen. Overdosing on iron is extremely toxic." reagent_state = SOLID - color = "#C8A5DC" // rgb: 200, 165, 220 + color = "#a19d94" // rgb: 161, 157, 148 overdose = REAGENTS_OVERDOSE overdose_critical = REAGENTS_OVERDOSE_CRITICAL chemclass = CHEM_CLASS_BASIC @@ -610,7 +610,7 @@ overdose = REAGENTS_OVERDOSE overdose_critical = REAGENTS_OVERDOSE_CRITICAL chemclass = CHEM_CLASS_UNCOMMON - properties = list(PROPERTY_NEUROTOXIC = 2, PROPERTY_RELAXING = 1) + properties = list(PROPERTY_NEUROTOXIC = 2, PROPERTY_ANTISPASMODIC = 1) //*****************************************************************************************************/ @@ -653,7 +653,7 @@ /datum/reagent/foaming_agent// Metal foaming agent. This is lithium hydride. Add other recipes (e.g. LiH + H2O -> LiOH + H2) eventually. name = "Foaming agent" id = "foaming_agent" - description = "An agent that yields metallic foam when mixed with light metal and a strong acid." + description = "An agent that yeilds metallic foam when mixed with light metal and a strong acid." reagent_state = SOLID color = "#664B63" // rgb: 102, 75, 99 chemclass = CHEM_CLASS_UNCOMMON @@ -820,6 +820,18 @@ PROPERTY_RADIUS = 5, ) +// Weaker liquid fuel +/datum/reagent/napalm/weak + name = "Napthal Fuel" + id = "napthal" + description = "Known as Napthal Fuel, a combustible liquid chemical." + burncolor = "#EE6515" + properties = list( + PROPERTY_INTENSITY = BURN_LEVEL_TIER_2, + PROPERTY_DURATION = BURN_TIME_TIER_2, + PROPERTY_RADIUS = 5, + ) + // This is gellie fuel. Green Flames. /datum/reagent/napalm/gel name = "Napalm B-Gel" @@ -844,6 +856,7 @@ color = "#00b8ff" burncolor = "#00b8ff" burn_sprite = "blue" + flags = REAGENT_TYPE_SPECIALIST properties = list( PROPERTY_INTENSITY = BURN_LEVEL_TIER_7, PROPERTY_DURATION = BURN_TIME_TIER_4, @@ -859,6 +872,7 @@ color = COLOR_GREEN burncolor = COLOR_GREEN burn_sprite = "green" + flags = REAGENT_TYPE_SPECIALIST properties = list( PROPERTY_INTENSITY = BURN_LEVEL_TIER_2, PROPERTY_DURATION = BURN_TIME_TIER_5, @@ -918,7 +932,7 @@ chemfiresupp = TRUE burncolor = "#ff9300" chemclass = CHEM_CLASS_UNCOMMON - properties = list(PROPERTY_CORROSIVE = 8, PROPERTY_TOXIC = 6, PROPERTY_OXIDIZING = 9, PROPERTY_IGNITING = 1) + properties = list(PROPERTY_CORROSIVE = 6, PROPERTY_TOXIC = 6, PROPERTY_OXIDIZING = 9, PROPERTY_IGNITING = 1) /datum/reagent/methane name = "Methane" @@ -1027,7 +1041,7 @@ overdose_critical = REAGENTS_OVERDOSE_CRITICAL chemclass = CHEM_CLASS_SPECIAL objective_value = OBJECTIVE_EXTREME_VALUE - properties = list(PROPERTY_HALLUCINOGENIC = 8, PROPERTY_NERVESTIMULATING = 3) + properties = list(PROPERTY_HALLUCINOGENIC = 8, PROPERTY_NERVESTIMULATING = 2) /datum/reagent/plasma/chitin name = "Chitin Plasma" @@ -1049,7 +1063,7 @@ overdose_critical = REAGENTS_OVERDOSE_CRITICAL chemclass = CHEM_CLASS_SPECIAL objective_value = OBJECTIVE_EXTREME_VALUE - properties = list(PROPERTY_PAINING = 2, PROPERTY_MUSCLESTIMULATING = 6) + properties = list(PROPERTY_NEUROPATHIC = 2, PROPERTY_MUSCLESTIMULATING = 6) /datum/reagent/plasma/egg name = "Egg Plasma" diff --git a/code/modules/reagents/chemistry_reagents/stims.dm b/code/modules/reagents/chemistry_reagents/stims.dm index fbea4334cdd1..5b8526c1ec84 100644 --- a/code/modules/reagents/chemistry_reagents/stims.dm +++ b/code/modules/reagents/chemistry_reagents/stims.dm @@ -34,7 +34,7 @@ name = "Speed Stimulant" id = "speed_stimulant" description = "A highly experimental performance enhancement stimulant. It is not addictive." - color = "#ffff00" + color = "#d4d42b" //rgb: 212, 212, 43 properties = list( PROPERTY_MUSCLESTIMULATING = 40, PROPERTY_PAINKILLING = 3, @@ -44,7 +44,7 @@ name = "Brain Stimulant" id = "brain_stimulant" description = "A highly experimental CNS stimulant." - color = "#a800ff" + color = "#7b23a9" //rgb: 123, 35, 169 properties = list( PROPERTY_NERVESTIMULATING = 30, PROPERTY_PAINKILLING = 6, @@ -61,7 +61,7 @@ Increases the durability of skin and bones as well as nullifying any pain.\ Pain is impossible to feel whilst this drug is in your system.\ During the metabolism of this drug, dysfunctional organs will work normally."} - color = "#00ffa8" + color = "#219f74" //rgb: 33, 159, 116 properties = list( PROPERTY_NERVESTIMULATING = 2, PROPERTY_MUSCLESTIMULATING = 2, diff --git a/code/modules/reagents/chemistry_reagents/toxin.dm b/code/modules/reagents/chemistry_reagents/toxin.dm index ccd7ce30059b..e76ad31db16f 100644 --- a/code/modules/reagents/chemistry_reagents/toxin.dm +++ b/code/modules/reagents/chemistry_reagents/toxin.dm @@ -80,7 +80,7 @@ color = "#CF3600" // rgb: 207, 54, 0 custom_metabolism = AMOUNT_PER_TIME(1, 5 SECONDS) chemclass = CHEM_CLASS_HYDRO - properties = list(PROPERTY_HYPOXEMIC = 4, PROPERTY_SEDATIVE = 1) + properties = list(PROPERTY_HYPOXEMIC = 4, PROPERTY_HYPNOTIC = 1) /datum/reagent/toxin/minttoxin name = "Mint Toxin" @@ -226,7 +226,7 @@ overdose = REAGENTS_OVERDOSE overdose_critical = REAGENTS_OVERDOSE_CRITICAL chemclass = CHEM_CLASS_COMMON - properties = list(PROPERTY_SEDATIVE = 2, PROPERTY_PAINKILLING = 5) + properties = list(PROPERTY_HYPNOTIC = 2, PROPERTY_PAINKILLING = 5) flags = REAGENT_SCANNABLE /datum/reagent/toxin/chloralhydrate @@ -239,7 +239,7 @@ overdose = REAGENTS_OVERDOSE/2 overdose_critical = REAGENTS_OVERDOSE_CRITICAL/2 chemclass = CHEM_CLASS_UNCOMMON - properties = list(PROPERTY_SEDATIVE = 6, PROPERTY_TOXIC = 1) + properties = list(PROPERTY_HYPNOTIC = 6, PROPERTY_TOXIC = 1) /datum/reagent/toxin/potassium_chloride name = "Potassium Chloride" @@ -253,7 +253,7 @@ burncolormod = 5 overdose = 30 chemclass = CHEM_CLASS_UNCOMMON - properties = list(PROPERTY_HYPOXEMIC = 2, PROPERTY_RELAXING = 4) + properties = list(PROPERTY_HYPOXEMIC = 2, PROPERTY_ANTISPASMODIC = 4) /datum/reagent/toxin/potassium_chlorophoride name = "Potassium Chlorophoride" @@ -263,7 +263,7 @@ color = COLOR_WHITE overdose = 20 chemclass = CHEM_CLASS_UNCOMMON - properties = list(PROPERTY_RELAXING = 8, PROPERTY_HYPOXEMIC = 4, PROPERTY_TOXIC = 2) + properties = list(PROPERTY_ANTISPASMODIC = 8, PROPERTY_HYPOXEMIC = 4, PROPERTY_TOXIC = 2) /datum/reagent/toxin/potassium_phorosulfate name = "Potassium Phorosulfate" @@ -273,7 +273,7 @@ color = COLOR_WHITE overdose = 10 chemclass = CHEM_CLASS_RARE - properties = list(PROPERTY_RELAXING = 10, PROPERTY_HYPOXEMIC = 4, PROPERTY_BIOCIDIC = 5) + properties = list(PROPERTY_ANTISPASMODIC = 10, PROPERTY_HYPOXEMIC = 4, PROPERTY_BIOCIDIC = 5) /datum/reagent/toxin/beer2 //disguised as normal beer for use by emagged brobots @@ -352,7 +352,7 @@ id = "phenol_formaldehyde" description = "Phenol-Formaldehyde Resin is a common molding polymer used in production of many small parts. It has great stress capacity and proven itself over many decades." reagent_state = SOLID - chemclass = CHEM_CLASS_RARE + chemclass = CHEM_CLASS_HYDRO color = "#909648" properties = list(PROPERTY_TOXIC = 3) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 1bf20aba3235..691d8005db85 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -235,7 +235,7 @@ ///Leave the disposal /obj/structure/machinery/disposal/proc/go_out(mob/living/user) if(user.client) - user.client.eye = user.client.mob + user.client.set_eye(user.client.mob) user.client.perspective = MOB_PERSPECTIVE user.forceMove(loc) user.apply_effect(2, STUN) @@ -257,7 +257,7 @@ /obj/structure/machinery/disposal/tgui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) - ui = new(user, src, "Disposals", "[src.name]") + ui = new(user, src, "Disposals", "[capitalize(name)]") ui.open() /obj/structure/machinery/disposal/ui_data(mob/user) @@ -466,7 +466,6 @@ var/active = 0 //True if the holder is moving, otherwise inactive dir = 0 var/count = 2048 //Can travel 2048 steps before going inactive (in case of loops) - var/has_fat_guy = 0 //True if contains a fat person var/destinationTag = "" //Changes if contains a delivery container var/tomail = 0 //Changes if contains wrapped package var/hasmob = 0 //If it contains a mob @@ -528,12 +527,6 @@ for(var/mob/living/H in src) H.take_overall_damage(20, 0, "Blunt Trauma") //Horribly maim any living creature jumping down disposals. c'est la vie - if(has_fat_guy && prob(2)) //Chance of becoming stuck per segment if contains a fat guy - active = 0 - //Find the fat guys - for(var/mob/living/carbon/human/H in src) - - break sleep(1) //Was 1 var/obj/structure/disposalpipe/curr = loc if(!curr && loc) @@ -572,10 +565,8 @@ if(ismob(AM)) var/mob/M = AM if(M.client) //If a client mob, update eye to follow this holder - M.client.eye = src + M.client.set_eye(src) - if(other.has_fat_guy) - has_fat_guy = 1 qdel(other) /obj/structure/disposalholder/proc/settag(new_tag) @@ -1461,7 +1452,7 @@ /mob/pipe_eject(direction) if(client) client.perspective = MOB_PERSPECTIVE - client.eye = src + client.set_eye(src) /obj/effect/decal/cleanable/blood/gibs/pipe_eject(direction) var/list/dirs diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 392f6ae0b014..eb6d4ad147f4 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -43,7 +43,7 @@ if("Title") var/str = trim(strip_html(input(usr,"Label text?","Set label",""))) if(!str || !length(str)) - to_chat(usr, SPAN_WARNING(" Invalid text.")) + to_chat(usr, SPAN_WARNING("Invalid text.")) return user.visible_message("\The [user] titles \the [src] with \a [W], marking down: \"[str]\"", SPAN_NOTICE("You title \the [src]: \"[str]\""), @@ -101,7 +101,7 @@ . = ..() if(get_dist(src, user) <= 4) if(sortTag) - . += SPAN_NOTICE("It is labeled \"[sortTag]\"") + . += SPAN_NOTICE("There's a sorting tag with the destination set to \"[sortTag]\"") if(examtext) . += SPAN_NOTICE("It has a note attached which reads, \"[examtext]\"") @@ -150,7 +150,7 @@ if("Title") var/str = trim(strip_html(input(usr,"Label text?","Set label",""))) if(!str || !length(str)) - to_chat(usr, SPAN_WARNING(" Invalid text.")) + to_chat(usr, SPAN_WARNING("Invalid text.")) return user.visible_message("\The [user] titles \the [src] with \a [W], marking down: \"[str]\"", SPAN_NOTICE("You title \the [src]: \"[str]\""), @@ -206,7 +206,7 @@ . = ..() if(get_dist(src, user) <= 4) if(sortTag) - . += SPAN_NOTICE("It is labeled \"[sortTag]\"") + . += SPAN_NOTICE("There's a sorting tag with the destination set to \"[sortTag]\"") if(examtext) . += SPAN_NOTICE("It has a note attached which reads, \"[examtext]\"") @@ -314,7 +314,7 @@ else if(amount < 3) to_chat(user, SPAN_WARNING("You need more paper.")) else - to_chat(user, SPAN_NOTICE(" The object you are trying to wrap is unsuitable for the sorting machinery!")) + to_chat(user, SPAN_NOTICE("The object you are trying to wrap is unsuitable for the sorting machinery!")) if (amount <= 0) new /obj/item/trash/c_tube( loc ) qdel(src) @@ -343,19 +343,19 @@ var/dat = "
TagMaster 2.3
| [GLOB.tagger_locations[i]] | " + for(var/i in 1 to length(GLOB.tagger_locations)) + var/encoded_tag = html_encode(GLOB.tagger_locations[i]) + dat += "[encoded_tag] | " if (i%4==0) dat += "
Current Selection: [currTag ? currTag : "None"]" - - user << browse(dat, "window=destTagScreen;size=450x350") + show_browser(user, dat, "Whiskey Outpost Destination Tagger") onclose(user, "destTagScreen") /obj/item/device/destTagger/attack_self(mob/user) - ..() + . = ..() openwindow(user) /obj/item/device/destTagger/Topic(href, href_list) diff --git a/code/modules/round_recording/debug_verbs.dm b/code/modules/round_recording/debug_verbs.dm index 7ee3d770c527..b51f7ba88c9c 100644 --- a/code/modules/round_recording/debug_verbs.dm +++ b/code/modules/round_recording/debug_verbs.dm @@ -7,6 +7,6 @@ var/datum/round_recorder/recorder = SSround_recording.recorder if(isnull(recorder)) - to_chat(src, "The round recorder datum is either not initialized yet or it was deleted") + to_chat(src, "The round recorder datum is either not initialized yet or it was deleted.") debug_variables(recorder) diff --git a/code/modules/security_levels/keycard_authentication.dm b/code/modules/security_levels/keycard_authentication.dm index 714a7bf1c833..37eff270cea7 100644 --- a/code/modules/security_levels/keycard_authentication.dm +++ b/code/modules/security_levels/keycard_authentication.dm @@ -21,7 +21,7 @@ idle_power_usage = 2 active_power_usage = 6 power_channel = POWER_CHANNEL_ENVIRON - // so that folks dont constantly spam their ID, and play an 'id rejected' noise over and over + // so that folks don't constantly spam their ID, and play an 'id rejected' noise over and over COOLDOWN_DECLARE(id_scan_cooldown) /obj/structure/machinery/keycard_auth/attack_remote(mob/user as mob) @@ -43,7 +43,7 @@ else if(screen == 2) event_triggered_by = usr if((event == "toggle_ob_safety") && !(ACCESS_MARINE_SENIOR in ID.access)) // need to be senior CIC staff to toggle ob safety - balloon_alert_to_viewers("Error! Insufficient clearence!") + balloon_alert_to_viewers("insufficient clearance!") playsound(loc, 'sound/items/defib_failed.ogg') COOLDOWN_START(src, id_scan_cooldown, 1 SECONDS) return @@ -221,7 +221,7 @@ GLOBAL_VAR_INIT(ob_cannon_safety, FALSE) event_source.confirmed = 1 event_source.event_confirmed_by = usr else - visible_message(SPAN_NOTICE("[src] states: ONLY ONE UNIQUE CODE DISK DETECTED")) + visible_message(SPAN_NOTICE("[src] states: ONLY ONE UNIQUE CODE DISK DETECTED.")) else if(screen == 2) event_triggered_by = usr @@ -277,7 +277,7 @@ GLOBAL_VAR_INIT(ob_cannon_safety, FALSE) if(istype(SSticker.mode, /datum/game_mode/colonialmarines)) var/datum/game_mode/colonialmarines/gCM = SSticker.mode if(gCM.round_status_flags & ROUNDSTATUS_PODDOORS_OPEN) - visible_message(SPAN_NOTICE("[src] states: LOCKDOWN ALREADY LIFTED")) + visible_message(SPAN_NOTICE("[src] states: LOCKDOWN ALREADY LIFTED.")) return gCM.round_status_flags |= ROUNDSTATUS_PODDOORS_OPEN // So we don't spam the message twice @@ -307,7 +307,7 @@ GLOBAL_VAR_INIT(ob_cannon_safety, FALSE) if(istype(SSticker.mode, /datum/game_mode/colonialmarines)) var/datum/game_mode/colonialmarines/gCM = SSticker.mode if(gCM.round_status_flags & ROUNDSTATUS_PODDOORS_OPEN) - visible_message(SPAN_NOTICE("[src] states: LOCKDOWN ALREADY LIFTED")) + visible_message(SPAN_NOTICE("[src] states: LOCKDOWN ALREADY LIFTED.")) return gCM.round_status_flags |= ROUNDSTATUS_PODDOORS_OPEN // So we don't spam the message twice timed_countdown(3 MINUTES) diff --git a/code/modules/shuttle/computer.dm b/code/modules/shuttle/computer.dm index a34819e4aa6c..1878a565747a 100644 --- a/code/modules/shuttle/computer.dm +++ b/code/modules/shuttle/computer.dm @@ -189,7 +189,7 @@ ui = SStgui.try_update_ui(user, src, ui) if (!ui) - ui = new(user, src, "NavigationShuttle", "[ert.name] Navigation Computer") + ui = new(user, src, "NavigationShuttle", "[capitalize(ert.name)] Navigation Computer") ui.open() @@ -488,3 +488,6 @@ return XENO_NO_DELAY_ACTION else return ..() + +/obj/structure/machinery/computer/shuttle/lifeboat/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + return TAILSTAB_COOLDOWN_NONE diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm index 4e8b04a03a90..283714576973 100644 --- a/code/modules/shuttle/computers/dropship_computer.dm +++ b/code/modules/shuttle/computers/dropship_computer.dm @@ -104,7 +104,7 @@ ui = SStgui.try_update_ui(user, src, ui) if (!ui) var/obj/docking_port/mobile/shuttle = SSshuttle.getShuttle(shuttleId) - var/name = shuttle?.name + var/name = capitalize(shuttle?.name) if(can_change_shuttle) name = "Remote" ui = new(user, src, "DropshipFlightControl", "[name] Flight Computer") @@ -316,6 +316,7 @@ xeno_message(SPAN_XENOANNOUNCE("The doors of the metal bird have been overridden! Rejoice!"), 3, xeno.hivenumber) message_admins("[key_name(xeno)] has locked the dropship '[dropship]'", xeno.x, xeno.y, xeno.z) notify_ghosts(header = "Dropship Locked", message = "[xeno] has locked [dropship]!", source = xeno, action = NOTIFY_ORBIT) + SScmtv.spectate_event("Dropship Locked", src) return if(dropship_control_lost) @@ -335,6 +336,9 @@ hijack(xeno) return +/obj/structure/machinery/computer/shuttle/dropship/flight/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + return TAILSTAB_COOLDOWN_NONE + /obj/structure/machinery/computer/shuttle/dropship/flight/update_icon() . = ..() if(icon_state == "console") // someday, replace this with a better check @@ -356,6 +360,7 @@ return var/datum/dropship_hijack/almayer/hijack = new() + SShijack.call_shuttle() dropship.hijack = hijack hijack.shuttle = dropship hijack.target_crash_site(result) @@ -376,7 +381,7 @@ xeno_message(SPAN_XENOANNOUNCE("The Queen has commanded the metal bird to depart for the metal hive in the sky! Rejoice!"), 3, hivenumber) xeno_message(SPAN_XENOANNOUNCE("The hive swells with power! You will now steadily gain pooled larva over time."), 2, hivenumber) var/datum/hive_status/hive = GLOB.hive_datum[hivenumber] - hive.abandon_on_hijack() + addtimer(CALLBACK(hive, TYPE_PROC_REF(/datum/hive_status, abandon_on_hijack)), DROPSHIP_WARMUP_TIME, TIMER_UNIQUE) var/original_evilution = hive.evolution_bonus hive.override_evilution(XENO_HIJACK_EVILUTION_BUFF, TRUE) if(hive.living_xeno_queen) @@ -395,9 +400,14 @@ colonial_marines.add_current_round_status_to_end_results("Hijack") /obj/structure/machinery/computer/shuttle/dropship/flight/proc/hijack_general_quarters() + var/datum/ares_datacore/datacore = GLOB.ares_datacore if(GLOB.security_level < SEC_LEVEL_RED) set_security_level(SEC_LEVEL_RED, no_sound = TRUE, announce = FALSE) + if(!COOLDOWN_FINISHED(datacore, ares_quarters_cooldown)) + return FALSE + COOLDOWN_START(datacore, ares_quarters_cooldown, 10 MINUTES) shipwide_ai_announcement("ATTENTION! GENERAL QUARTERS. ALL HANDS, MAN YOUR BATTLESTATIONS.", MAIN_AI_SYSTEM, 'sound/effects/GQfullcall.ogg') + return TRUE /obj/structure/machinery/computer/shuttle/dropship/flight/proc/remove_door_lock() if(door_control_cooldown) diff --git a/code/modules/shuttle/computers/escape_pod_computer.dm b/code/modules/shuttle/computers/escape_pod_computer.dm index 4914efebc37f..cdc4fc08adb9 100644 --- a/code/modules/shuttle/computers/escape_pod_computer.dm +++ b/code/modules/shuttle/computers/escape_pod_computer.dm @@ -30,7 +30,7 @@ /obj/structure/machinery/computer/shuttle/escape_pod_panel/tgui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) - ui = new(user, src, "EscapePodConsole", "[src.name]") + ui = new(user, src, "EscapePodConsole", "[capitalize(name)]") ui.open() /obj/structure/machinery/computer/shuttle/escape_pod_panel/ui_state(mob/user) @@ -216,6 +216,9 @@ being_forced = !being_forced return XENO_NO_DELAY_ACTION +/obj/structure/machinery/cryopod/evacuation/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + return TAILSTAB_COOLDOWN_NONE + /obj/structure/machinery/cryopod/evacuation/proc/move_mob_inside(mob/M) if(occupant) to_chat(M, SPAN_WARNING("The cryogenic pod is already in use. You will need to find another.")) @@ -230,11 +233,15 @@ /obj/structure/machinery/door/airlock/evacuation name = "\improper Evacuation Airlock" - icon = 'icons/obj/structures/doors/pod_doors.dmi' + icon = 'icons/obj/structures/doors/escapepoddoor_yellow.dmi' unslashable = TRUE unacidable = TRUE var/obj/docking_port/mobile/crashable/escape_shuttle/linked_shuttle var/start_locked = TRUE + opacity = FALSE + glass = TRUE + open_layer = ABOVE_MOB_LAYER + closed_layer = ABOVE_MOB_LAYER /obj/structure/machinery/door/airlock/evacuation/Initialize() . = ..() diff --git a/code/modules/shuttle/computers/trijent_elevator_control.dm b/code/modules/shuttle/computers/trijent_elevator_control.dm index fbda2f01f1bd..bf2cc5768bd7 100644 --- a/code/modules/shuttle/computers/trijent_elevator_control.dm +++ b/code/modules/shuttle/computers/trijent_elevator_control.dm @@ -1,6 +1,6 @@ /obj/structure/machinery/computer/shuttle/elevator_controller/elevator_call name = "\improper Elevator Call" - desc = "Control panel for the elevator" + desc = "Control panel for the elevator." shuttleId = MOBILE_TRIJENT_ELEVATOR is_call = TRUE var/dockId @@ -29,7 +29,7 @@ /obj/structure/machinery/computer/shuttle/elevator_controller name = "\improper Elevator Panel" - desc = "Control panel for the elevator" + desc = "Control panel for the elevator." icon = 'icons/obj/structures/machinery/computer.dmi' icon_state = "elevator_screen" diff --git a/code/modules/shuttle/dropship_hijack.dm b/code/modules/shuttle/dropship_hijack.dm index 73150f5bfc08..02e305d39bab 100644 --- a/code/modules/shuttle/dropship_hijack.dm +++ b/code/modules/shuttle/dropship_hijack.dm @@ -80,7 +80,7 @@ target_ship_section = ship_section var/turf/target = get_crashsite_turf(ship_section) if(!target) - to_chat(usr, SPAN_WARNING("No area available")) + to_chat(usr, SPAN_WARNING("No area available.")) return var/obj/docking_port/stationary/marine_dropship/crash_site/target_site = new() @@ -145,6 +145,7 @@ marine_announcement("DROPSHIP ON COLLISION COURSE. CRASH IMMINENT." , "EMERGENCY", 'sound/AI/dropship_emergency.ogg', logging = ARES_LOG_SECURITY) notify_ghosts(header = "Dropship Collision", message = "The dropship is about to impact [get_area_name(crash_site)]!", source = crash_site, extra_large = TRUE) + SScmtv.spectate_event("Dropship Impact", crash_site, 40 SECONDS) final_announcement = TRUE playsound_area(get_area(crash_site), 'sound/effects/engine_landing.ogg', 100) diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm index bd0ea60c5f7a..b91abcd44c3a 100644 --- a/code/modules/shuttle/on_move.dm +++ b/code/modules/shuttle/on_move.dm @@ -23,44 +23,46 @@ All ShuttleMove procs go here // var/shuttle_dir = shuttle.dir for(var/i in contents) var/atom/movable/thing = i - SEND_SIGNAL(thing, COMSIG_MOVABLE_SHUTTLE_CRUSH, shuttle) - if(ismob(thing)) - if(isliving(thing)) - var/mob/living/M = thing -// if(M.status_flags & INCORPOREAL) -// continue // Ghost things don't splat - if(M.buckled) - M.buckled.unbuckle()//M, TRUE) - if(M.pulledby) - M.pulledby.stop_pulling() - M.stop_pulling() - M.visible_message(SPAN_WARNING("[shuttle] slams into [M]!")) - M.gib() - - else //non-living mobs shouldn't be affected by shuttles, which is why this is an else - if(thing.anchored) - // Ordered by most likely: - if(istype(thing, /obj/structure/machinery/landinglight)) - continue - if(istype(thing, /obj/docking_port)) - continue - if(istype(thing, /obj/structure/machinery/camera)) - continue - if(istype(thing, /obj/structure/machinery/floodlight/landing/floor)) - continue - - // SSshuttle also removes these in remove_ripples, but its timing is weird - if(!istype(thing, /obj/effect)) - log_debug("[shuttle] deleted an anchored [thing]") - - qdel(thing) + shuttleCrushThing(thing, shuttle) + +/turf/proc/shuttleCrushThing(atom/movable/thing, obj/docking_port/mobile/shuttle) + SEND_SIGNAL(thing, COMSIG_MOVABLE_SHUTTLE_CRUSH, shuttle) + if(ismob(thing)) + if(isliving(thing)) + var/mob/living/living_thing = thing + if(living_thing.buckled) + living_thing.buckled.unbuckle() + if(living_thing.pulledby) + living_thing.pulledby.stop_pulling() + living_thing.stop_pulling() + living_thing.visible_message(SPAN_WARNING("[shuttle] slams into [living_thing]!")) + living_thing.gib() + + else //non-living mobs shouldn't be affected by shuttles, which is why this is an else + if(thing.anchored) + // Ordered by most likely: + if(istype(thing, /obj/structure/machinery/landinglight)) + return + if(istype(thing, /obj/docking_port)) + return + if(istype(thing, /obj/structure/machinery/camera)) + return + if(istype(thing, /obj/structure/machinery/floodlight/landing/floor)) + return + + // SSshuttle also removes these in remove_ripples, but its timing is weird + if(!istype(thing, /obj/effect)) + log_debug("[shuttle] deleted an anchored [thing]") + + qdel(thing) + // Called on the old turf to move the turf data /turf/proc/onShuttleMove(turf/newT, list/movement_force, move_dir) if(newT == src) // In case of in place shuttle rotation shenanigans. return //Destination turf changes - //Baseturfs is definitely a list or this proc wouldnt be called + //Baseturfs is definitely a list or this proc wouldn't be called var/shuttle_boundary = baseturfs.Find(/turf/baseturf_skipover/shuttle) if(!shuttle_boundary) CRASH("A turf queued to move via shuttle somehow had no skipover in baseturfs. [src]([type]):[loc]") @@ -190,7 +192,7 @@ All ShuttleMove procs go here var/turf/T = loc hide(T.intact_tile) -/obj/structure/machinery/power/terminal/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation) +/obj/structure/terminal/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation) . = ..() var/turf/T = src.loc if(level==1) diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 4a990ea7d1ae..014912fa88ab 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -720,7 +720,7 @@ var/mob/dead/observer/obs = mob.ghostize(FALSE) if(obs) obs.timeofdeath = world.time - obs.client?.player_details.larva_queue_time = max(obs.client.player_details.larva_queue_time, world.time) + obs.client?.player_details.larva_pool_time = max(obs.client.player_details.larva_pool_time, world.time) mob.moveToNullspace() // Now that mobs are stowed, delete the shuttle diff --git a/code/modules/shuttle/shuttles/crashable/crashable.dm b/code/modules/shuttle/shuttles/crashable/crashable.dm index 5b8b46028201..9c549b872102 100644 --- a/code/modules/shuttle/shuttles/crashable/crashable.dm +++ b/code/modules/shuttle/shuttles/crashable/crashable.dm @@ -99,7 +99,7 @@ /obj/docking_port/mobile/crashable/proc/check_crash_point(obj/docking_port/stationary/crashable/checked_crashable_port) for(var/turf/found_turf as anything in checked_crashable_port.return_turfs()) var/area/found_area = get_area(found_turf) - if(found_area.flags_area & AREA_NOTUNNEL) + if(found_area.flags_area & AREA_NOBURROW) return FALSE if(!found_area.can_build_special) diff --git a/code/modules/shuttle/shuttles/dropship.dm b/code/modules/shuttle/shuttles/dropship.dm index 6359220c6473..4d3fc3ca3b7b 100644 --- a/code/modules/shuttle/shuttles/dropship.dm +++ b/code/modules/shuttle/shuttles/dropship.dm @@ -339,7 +339,10 @@ . = ..() arriving_shuttle.set_mode(SHUTTLE_CRASHED) for(var/mob/living/carbon/affected_mob in (GLOB.alive_human_list + GLOB.living_xeno_list)) //knock down mobs - if(affected_mob.z != z) + if(!is_mainship_level(affected_mob.z)) + continue + if(affected_mob && HAS_TRAIT_FROM(affected_mob, TRAIT_UNDENSE, WALL_HIDING_TRAIT)) + to_chat(affected_mob, SPAN_WARNING("You brace yourself against the impact!")) continue if(affected_mob.buckled) to_chat(affected_mob, SPAN_WARNING("You are jolted against [affected_mob.buckled]!")) diff --git a/code/modules/shuttles/marine_ferry.dm b/code/modules/shuttles/marine_ferry.dm index 4ed9ce2a66f9..c4e4d4127960 100644 --- a/code/modules/shuttles/marine_ferry.dm +++ b/code/modules/shuttles/marine_ferry.dm @@ -363,7 +363,7 @@ break if(!istype(T_src) || !istype(T_int) || !istype(T_trg)) - message_admins(SPAN_WARNING("Error with shuttles: Reference turfs not correctly instantiated. Code: MSD04.\n WARNING: DROPSHIP LAUNCH WILL FAIL")) + message_admins(SPAN_WARNING("Error with shuttles: Reference turfs not correctly instantiated. Code: MSD04.\n WARNING: DROPSHIP LAUNCH WILL FAIL.")) SSoldshuttle.shuttle_controller.locs_crash[target_section] -= T_trg @@ -531,7 +531,7 @@ sleep(100) moving_status = SHUTTLE_CRASHED - if(SSticker.mode) + if(SSticker.mode && !SSticker.mode.is_in_endgame) SSticker.mode.is_in_endgame = TRUE SSticker.mode.force_end_at = world.time + 15000 // 25 mins if(istype(SSticker.mode, /datum/game_mode/colonialmarines)) @@ -555,7 +555,7 @@ //Switch the landmarks so we can do this again if(!istype(T_src) || !istype(T_trg)) - message_admins(SPAN_WARNING("Error with shuttles: Ref turfs are null. Code: MSD15.\n WARNING: DROPSHIPS MAY NO LONGER BE OPERABLE")) + message_admins(SPAN_WARNING("Error with shuttles: Ref turfs are null. Code: MSD15.\n WARNING: DROPSHIPS MAY NO LONGER BE OPERABLE.")) return FALSE locs_dock -= T_src diff --git a/code/modules/shuttles/shuttle_supply.dm b/code/modules/shuttles/shuttle_supply.dm index e95165dfcbc1..47b19bbcebf7 100644 --- a/code/modules/shuttles/shuttle_supply.dm +++ b/code/modules/shuttles/shuttle_supply.dm @@ -146,7 +146,7 @@ for(var/turf/vis_turf in elevator_animation.vis_contents) for(var/atom/movable/vis_content in vis_turf.contents) - vis_content.blocks_emissive = FALSE + vis_content.blocks_emissive = EMISSIVE_BLOCK_NONE vis_content.update_emissive_block() //If we are at the away_area then we are just pretending to move, otherwise actually do the move diff --git a/code/modules/sorokyne/sorokyne_hot_water.dm b/code/modules/sorokyne/sorokyne_hot_water.dm index 9b3bfa6ade56..cf98d586e159 100644 --- a/code/modules/sorokyne/sorokyne_hot_water.dm +++ b/code/modules/sorokyne/sorokyne_hot_water.dm @@ -27,5 +27,5 @@ if(!ishuman(affected_mob)) return - affected_mob.AddComponent(/datum/component/damage_over_time, /obj/effect/blocker/sorokyne_hot_water, dam_amount, dam_type, target_temp, temp_delta, synth_dmg_mult=0, pred_dmg_mult=0) + affected_mob.AddComponent(/datum/component/damage_over_time, /obj/effect/blocker/sorokyne_hot_water, dam_amount, dam_type, target_temp, temp_delta, synth_dmg_mult=0, pred_dmg_mult=0, enviro=TRUE) diff --git a/code/modules/surgery/eschar.dm b/code/modules/surgery/eschar.dm new file mode 100644 index 000000000000..b44bce599d8e --- /dev/null +++ b/code/modules/surgery/eschar.dm @@ -0,0 +1,121 @@ +/datum/surgery/eschar_mend + name = "Eschar Removal Surgery" + possible_locs = ALL_LIMBS + invasiveness = list(SURGERY_DEPTH_SHALLOW) + required_surgery_skill = SKILL_SURGERY_NOVICE + pain_reduction_required = PAIN_REDUCTION_HEAVY + steps = list( + /datum/surgery_step/separate_eschar, + /datum/surgery_step/graft_exposed_flesh, + ) + +/datum/surgery/eschar_mend/can_start(mob/user, mob/living/carbon/patient, obj/limb/L, obj/item/tool) + return L.status & LIMB_ESCHAR + +/datum/surgery_step/separate_eschar + name = "Remove the Eschar" + desc = "remove the eschar" + tools = SURGERY_TOOLS_INCISION + time = 2 SECONDS + preop_sound = 'sound/surgery/scalpel1.ogg' + success_sound = 'sound/surgery/scalpel2.ogg' + failure_sound = 'sound/surgery/organ2.ogg' + +/datum/surgery_step/separate_eschar/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/eschar_mend/surgery) + user.affected_message(target, + SPAN_NOTICE("You begin to separate the hardened, crusted flesh from [target]'s [surgery.affected_limb.display_name] with [tool]."), + SPAN_NOTICE("[user] begins to separate the hardened, crusted flesh from your [surgery.affected_limb.display_name] with [tool]."), + SPAN_NOTICE("[user] begins to separate the hardened, crusted flesh from [target]'s [surgery.affected_limb.display_name] with [tool].")) + + target.custom_pain("[user] is carving your skin up like you're a crispy roast turkey! It hurts!", 1) + log_interact(user, target, "[key_name(user)] begins to separate the hardened, crusted flesh from [key_name(target)]'s [surgery.affected_limb.display_name] with [tool].") + +/datum/surgery_step/separate_eschar/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/eschar_mend/surgery) + user.affected_message(target, + SPAN_NOTICE("You have removed the eschar from [target]'s [surgery.affected_limb.display_name] and exposed the pink and healthy tissue beneath it."), + SPAN_NOTICE("[user] has removed the eschar from your [surgery.affected_limb.display_name] and exposed the pink and healthy tissue beneath it."), + SPAN_NOTICE("[user] has removed the eschar from [target]'s [surgery.affected_limb.display_name] and exposed the pink and healthy tissue beneath it.")) + + to_chat(target, SPAN_NOTICE("The air feels cold around the exposed skin on your [surgery.affected_limb.display_name].")) + log_interact(user, target, "[key_name(user)] has removed the eschar from [key_name(target)]'s [surgery.affected_limb.display_name] with [tool], starting [surgery].") + +/datum/surgery_step/separate_eschar/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/eschar_mend/surgery) + user.affected_message(target, + SPAN_WARNING("Your hand slips, slicing [target]'s [surgery.affected_limb.display_name] with [tool]!"), + SPAN_WARNING("[user]'s hand slips, slicing your [surgery.affected_limb.display_name] with [tool]!"), + SPAN_WARNING("[user]'s hand slips, slicing [target]'s [surgery.affected_limb.display_name] with [tool]!")) + + log_interact(user, target, "[key_name(user)] failed to remove the eschar from [key_name(target)]'s [surgery.affected_limb.display_name] with [tool], aborting [surgery].") + target.apply_damage(10, BRUTE, target_zone) + return FALSE + +/datum/surgery_step/graft_exposed_flesh + name = "Apply a Graft" + desc = "graft and seal the exposed flesh" + tools = list( + /obj/item/stack/medical/advanced/ointment = SURGERY_TOOL_MULT_IDEAL, + /obj/item/tool/surgery/synthgraft = SURGERY_TOOL_MULT_IDEAL, + /obj/item/stack/medical/advanced/ointment/predator = SURGERY_TOOL_MULT_SUBSTITUTE, + /obj/item/stack/medical/ointment = SURGERY_TOOL_MULT_AWFUL, + ) + time = 3 SECONDS + preop_sound = 'sound/handling/clothingrustle1.ogg' + success_sound = 'sound/handling/bandage.ogg' + failure_sound = 'sound/surgery/organ2.ogg' + var/use_stack = 1 //uses one stack of burn heal stuff. + +/datum/surgery_step/graft_exposed_flesh/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/eschar_mend/surgery) + var/toolname + + switch(tool_type) + if(/obj/item/stack/medical/ointment) + toolname = "some ointment" + if(/obj/item/stack/medical/advanced/ointment) + toolname = "a regenerative membrane" + if(/obj/item/tool/surgery/synthgraft) + toolname = "the synthgraft" + else + toolname = "the poultice" + + user.affected_message(target, + SPAN_NOTICE("You begin to apply and seal a graft over the exposed skin on [target]'s [surgery.affected_limb.display_name] with [toolname]."), + SPAN_NOTICE("[user] begins to apply and seal a graft over the exposed skin on your [surgery.affected_limb.display_name] with [toolname]."), + SPAN_NOTICE("[user] begins to apply and seal a graft over the exposed skin on [target]'s [surgery.affected_limb.display_name] with [toolname].")) + + target.custom_pain("Your exposed skin feels tender as [user] presses on it! Ouch!", 1) + log_interact(user, target, "[key_name(user)] begins to apply and seal a graft over the exposed skin on [key_name(target)]'s [surgery.affected_limb.display_name] with [tool].") + +/datum/surgery_step/graft_exposed_flesh/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/eschar_mend/surgery) + if(istype(tool, /obj/item/stack/medical)) //uses 1 stack of ointment/burnpack but not synthgraft, very important. + var/obj/item/stack/medical/packs = tool + packs.use(use_stack) //use 1 stack, please. + + user.affected_message(target, + SPAN_NOTICE("You sealed a skin graft over the exposed skin on [target]'s [surgery.affected_limb.display_name]."), + SPAN_NOTICE("[user] sealed a skin graft over the exposed skin on your [surgery.affected_limb.display_name]."), + SPAN_NOTICE("[user] sealed a skin graft over the exposed skin on [target]'s [surgery.affected_limb.display_name].")) + + to_chat(target, SPAN_NOTICE("Your skin is covered and safe. You feel better.")) + log_interact(user, target, "[key_name(user)] sealed a skin graft over the exposed skin on [key_name(target)]'s [surgery.affected_limb.display_name] with [tool], ending [surgery].") + surgery.affected_limb.status &= ~LIMB_ESCHAR + surgery.affected_limb.heal_damage(0, surgery.affected_limb.burn_healing_threshold) + target.pain.recalculate_pain() + return + +/datum/surgery_step/graft_exposed_flesh/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/eschar_mend/surgery) + if(tool_type == /obj/item/stack/medical/ointment) + user.affected_message(target, + SPAN_WARNING("Your hand slips, smearing [tool] over the exposed flesh on [target]'s [surgery.affected_limb.display_name]!"), + SPAN_WARNING("[user]'s hand slips, smearing [tool] over the exposed flesh on your [surgery.affected_limb.display_name]!"), + SPAN_WARNING("[user]'s hand slips, smearing [tool] over the exposed flesh on [target]'s [surgery.affected_limb.display_name]!")) + else + user.affected_message(target, + SPAN_WARNING("Your hand slips, bruising the exposed flesh on [target]'s [surgery.affected_limb.display_name] with [tool]!"), + SPAN_WARNING("[user]'s hand slips, bruising the exposed flesh on your [surgery.affected_limb.display_name] with [tool]!"), + SPAN_WARNING("[user]'s hand slips, bruising the exposed flesh on [target]'s [surgery.affected_limb.display_name] with [tool]!")) + + log_interact(user, target, "[key_name(user)] failed to seal a graph over the exposed flesh on [key_name(target)]'s [surgery.affected_limb.display_name] with [tool].") + target.apply_damage(10, BRUTE, target_zone) + return FALSE + + diff --git a/code/modules/surgery/eye.dm b/code/modules/surgery/eye.dm index b9efb0371ee3..678a9b949a3f 100644 --- a/code/modules/surgery/eye.dm +++ b/code/modules/surgery/eye.dm @@ -9,10 +9,11 @@ possible_locs = list("eyes") invasiveness = list(SURGERY_DEPTH_SURFACE) required_surgery_skill = SKILL_SURGERY_TRAINED - pain_reduction_required = PAIN_REDUCTION_LIGHT //Eye doesn't have pain receptors. + pain_reduction_required = PAIN_REDUCTION_FULL //Eyes DO have pain receptors... Almost more than any other organ. Ever been poked in the eye? Shit hurts. steps = list( - /datum/surgery_step/separate_cornea, - /datum/surgery_step/lift_eyes, + /datum/surgery_step/separate_corneas, + /datum/surgery_step/lift_corneas, + /datum/surgery_step/open_eyes, /datum/surgery_step/mend_eyes, /datum/surgery_step/cauterize/eyes, ) @@ -26,42 +27,48 @@ /datum/surgery/eye_repair/can_start(mob/user, mob/living/carbon/human/patient, obj/limb/L, obj/item/tool) var/datum/internal_organ/eyes/E = patient.internal_organs_by_name["eyes"] - return E && E.damage > 0 && E.robotic != ORGAN_ROBOT + return E.robotic != ORGAN_ROBOT && (patient.sdisabilities & DISABILITY_BLIND || patient.disabilities & NEARSIGHTED || E.damage > 0) //------------------------------------ -/datum/surgery_step/separate_cornea +/datum/surgery_step/separate_corneas name = "Separate Corneas" desc = "separate the corneas" tools = SURGERY_TOOLS_INCISION time = 2 SECONDS -/datum/surgery_step/separate_cornea/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/surgery) + preop_sound = 'sound/surgery/scalpel1.ogg' + success_sound = 'sound/surgery/scalpel2.ogg' + failure_sound = 'sound/surgery/organ2.ogg' + +/datum/surgery_step/separate_corneas/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/surgery) user.affected_message(target, - SPAN_NOTICE("You start to separate the corneas of [target]'s eyes with \the [tool]."), - SPAN_NOTICE("[user] starts to separate the corneas of your eyes with \the [tool]."), - SPAN_NOTICE("[user] starts to separate the corneas of [target]'s eyes with \the [tool].")) + SPAN_NOTICE("You start to separate the corneas of [target]'s eyes with [tool]."), + SPAN_NOTICE("[user] starts to separate the corneas of your eyes with [tool]."), + SPAN_NOTICE("[user] starts to separate the corneas of [target]'s eyes with [tool].")) - log_interact(user, target, "[key_name(user)] started to separate the cornea on [key_name(target)]'s eyes with \the [tool].") + target.custom_pain("You feel a searing, piercing pain in your eyeballs as your corneas are being sliced open!",1) + log_interact(user, target, "[key_name(user)] started to separate the corneas on [key_name(target)]'s eyes with [tool].") -/datum/surgery_step/separate_cornea/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/surgery) +/datum/surgery_step/separate_corneas/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/surgery) user.affected_message(target, SPAN_NOTICE("You have separated [target]'s corneas."), SPAN_NOTICE("[user] has separated your corneas."), SPAN_NOTICE("[user] has separated [target]'s corneas.")) - log_interact(user, target, "[key_name(user)] separated the cornea on [key_name(target)]'s eyes with \the [tool], starting [surgery].") + log_interact(user, target, "[key_name(user)] separated the corneas on [key_name(target)]'s eyes with [tool], starting [surgery].") + to_chat(target, SPAN_WARNING("Everything goes blurry.")) target.incision_depths[target_zone] = SURGERY_DEPTH_SHALLOW - target.disabilities |= NEARSIGHTED // code\#define\mobs.dm + target.disabilities |= NEARSIGHTED // My corneas! I can't see! -/datum/surgery_step/separate_cornea/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/eye_repair/surgery) +/datum/surgery_step/separate_corneas/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/eye_repair/surgery) user.affected_message(target, - SPAN_WARNING("Your hand slips, slicing [target]'s eyes with \the [tool]!"), - SPAN_WARNING("[user]'s hand slips, slicing your eyes with \the [tool]!"), - SPAN_WARNING("[user]'s hand slips, slicing [target]'s eyes with \the [tool]!")) + SPAN_WARNING("Your hand slips, slicing [target]'s eyes with [tool]!"), + SPAN_WARNING("[user]'s hand slips, slicing your eyes with [tool]!"), + SPAN_WARNING("[user]'s hand slips, slicing [target]'s eyes with [tool]!")) - log_interact(user, target, "[key_name(user)] failed to separate the cornea on [key_name(target)]'s eyes with \the [tool], aborting [surgery].") + log_interact(user, target, "[key_name(user)] failed to separate the corneas on [key_name(target)]'s eyes with [tool], aborting [surgery].") target.apply_damage(10, BRUTE, target_zone) surgery.target_eyes.take_damage(5, FALSE) @@ -69,35 +76,40 @@ //------------------------------------ -/datum/surgery_step/lift_eyes - name = "Lift Corneas" - desc = "lift the corneas" - tools = SURGERY_TOOLS_PRY_DELICATE +/datum/surgery_step/lift_corneas + name = "Lift Corneas and Move Lenses" + desc = "lift the corneas and move the lenses" + tools = SURGERY_TOOLS_PINCH time = 2 SECONDS -/datum/surgery_step/lift_eyes/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/surgery) + preop_sound = 'sound/surgery/hemostat1.ogg' + success_sound = 'sound/surgery/hemostat1.ogg' + failure_sound = 'sound/surgery/organ1.ogg' + +/datum/surgery_step/lift_corneas/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/surgery) user.affected_message(target, - SPAN_NOTICE("You begin lifting the corneas from [target]'s eyes with \the [tool]."), - SPAN_NOTICE("[user] begins to lift the corneas from your eyes with \the [tool]."), - SPAN_NOTICE("[user] begins to lift the corneas from [target]'s eyes with \the [tool].")) + SPAN_NOTICE("You begin lifting the corneas and moving the lenses out of the way from [target]'s eyes with [tool]."), + SPAN_NOTICE("[user] begins lifting the corneas and moving the lenses out of the way from your eyes with [tool]."), + SPAN_NOTICE("[user] begins lifting the corneas and moving the lenses out of the way from [target]'s eyes with [tool].")) - log_interact(user, target, "[key_name(user)] started to lift the cornea from [key_name(target)]'s eyes with \the [tool].") + target.custom_pain("You feel pressure and pulling on the surface of your eyes!",1) + log_interact(user, target, "[key_name(user)] started lifting the corneas and moving the lenses out of the way from [key_name(target)]'s eyes with [tool].") -/datum/surgery_step/lift_eyes/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/surgery) +/datum/surgery_step/lift_corneas/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/surgery) user.affected_message(target, - SPAN_NOTICE("You finish lifting [target]'s corneas."), - SPAN_NOTICE("[user] has lifted your corneas."), - SPAN_NOTICE("[user] has lifted [target]'s corneas.")) + SPAN_NOTICE("You finish lifting [target]'s corneas and moving the lenses."), + SPAN_NOTICE("[user] has lifted your corneas and moving the lenses."), + SPAN_NOTICE("[user] has lifted [target]'s corneas and moving the lenses.")) - log_interact(user, target, "[key_name(user)] lifted the cornea from [key_name(target)]'s eyes with \the [tool].") + log_interact(user, target, "[key_name(user)] lifted the corneas and lenses away from [key_name(target)]'s eyes with [tool].") -/datum/surgery_step/lift_eyes/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/eye_repair/surgery) +/datum/surgery_step/lift_corneas/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/eye_repair/surgery) user.affected_message(target, - SPAN_WARNING("Your hand slips, damaging [target]'s eyes with \the [tool]!"), - SPAN_WARNING("[user]'s hand slips, damaging your eyes with \the [tool]!"), - SPAN_WARNING("[user]'s hand slips, damaging [target]'s eyes with \the [tool]!")) + SPAN_WARNING("Your hand slips, damaging [target]'s eyes with [tool]!"), + SPAN_WARNING("[user]'s hand slips, damaging your eyes with [tool]!"), + SPAN_WARNING("[user]'s hand slips, damaging [target]'s eyes with [tool]!")) - log_interact(user, target, "[key_name(user)] failed to lift the cornea from [key_name(target)]'s eyes with \the [tool].") + log_interact(user, target, "[key_name(user)] failed to lift the corneas and lenses away from [key_name(target)]'s eyes with [tool].") target.apply_damage(10, BRUTE, target_zone) surgery.target_eyes.take_damage(5, FALSE) @@ -105,35 +117,97 @@ //------------------------------------ -/datum/surgery_step/mend_eyes - name = "Mend Ocular Nerves" - desc = "mend the eyes" - tools = SURGERY_TOOLS_PINCH +/datum/surgery_step/open_eyes + name = "Open Eyes" + desc = "open the eyeballs" + tools = SURGERY_TOOLS_PRY_DELICATE time = 4 SECONDS -/datum/surgery_step/mend_eyes/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/surgery) + preop_sound = 'sound/surgery/retractor1.ogg' + success_sound = 'sound/surgery/retractor2.ogg' + failure_sound = 'sound/surgery/organ1.ogg' + +/datum/surgery_step/open_eyes/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/surgery) user.affected_message(target, - SPAN_NOTICE("You begin mending the nerves and lenses in [target]'s eyes with \the [tool]."), - SPAN_NOTICE("[user] begins to mend the nerves and lenses in your eyes with \the [tool]."), - SPAN_NOTICE("[user] begins to mend the nerves and lenses in [target]'s eyes with \the [tool].")) + SPAN_NOTICE("You begin to gently and carefully open [target]'s eyeballs with [tool] to expose the retinas, optic nerves, and blood vessels."), + SPAN_NOTICE("[user] begins to gently and carefully open your eyeballs with [tool] to expose the retinas, optic nerves, and blood vessels."), + SPAN_NOTICE("[user] begins to gently and carefully open [target]'s eyeballs with [tool] to retinas, optic nerves, and blood vessels.")) - log_interact(user, target, "[key_name(user)] started to mend the nerves and lenses in [key_name(target)]'s eyes with \the [tool].") + target.custom_pain("The pressure inside your eyeballs is immense as [user] holds them open!",1) + log_interact(user, target, "[key_name(user)] began to open [key_name(target)]'s eyeballs with [tool].") -/datum/surgery_step/mend_eyes/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/surgery) +/datum/surgery_step/open_eyes/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/surgery) user.affected_message(target, - SPAN_NOTICE("You mend the nerves and lenses in [target]'s eyes."), - SPAN_NOTICE("[user] mends the nerves and lenses in your eyes."), - SPAN_NOTICE("[user] mends the nerves and lenses in [target]'s eyes.")) + SPAN_NOTICE("You open [target]'s eyeballs."), + SPAN_NOTICE("[user] opens your eyeballs."), + SPAN_NOTICE("[user] opens [target]'s eyeballs.")) - log_interact(user, target, "[key_name(user)] mended the nerves and lenses in [key_name(target)]'s eyes with \the [tool].") + log_interact(user, target, "[key_name(user)] opened [key_name(target)]'s eyeballs with [tool].") + +/datum/surgery_step/open_eyes/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/eye_repair/surgery) + user.affected_message(target, + SPAN_WARNING("Your hand slips, damaging [target]'s eyes with [tool]!"), + SPAN_WARNING("[user]'s hand slips, damaging your eyes with [tool]!"), + SPAN_WARNING("[user]'s hand slips, damaging [target]'s eyes with [tool]!")) + + log_interact(user, target, "[key_name(user)] failed to open [key_name(target)]'s eyes with [tool].") + + target.apply_damage(10, BRUTE, target_zone, sharp = 1) + surgery.target_eyes.take_damage(5, FALSE) + return FALSE + +//------------------------------------ + +/datum/surgery_step/mend_eyes + name = "Mend the Eyes" + desc = "mend the damage inside the eyeballs" + tools = SURGERY_TOOLS_MEND_BLOODVESSEL + time = 5 SECONDS + + preop_sound = 'sound/handling/clothingrustle1.ogg' + success_sound = 'sound/surgery/organ2.ogg' + failure_sound = 'sound/surgery/organ1.ogg' + +/datum/surgery_step/mend_eyes/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/surgery) + user.affected_message(target, + SPAN_NOTICE("You begin to repair the damage done to [target]'s eyeballs with [tool]."), + SPAN_NOTICE("[user] begins to repair the damage done to your eyeballs with [tool]."), + SPAN_NOTICE("[user] begins to repair the damage done to [target]'s eyeballs with [tool].")) + + target.custom_pain("[tool] moving around in your eyeballs feels bizarre and painful!",1) + log_interact(user, target, "[key_name(user)] begins to mend the damage to [key_name(target)]'s eyeballs with [tool].") + +/datum/surgery_step/mend_eyes/success(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool, tool_type, datum/surgery/surgery) + var/datum/internal_organ/eyes/E = target.internal_organs_by_name["eyes"] + if(target.sdisabilities & DISABILITY_BLIND) + user.affected_message(target, + SPAN_NOTICE("You finish laying [target]'s detached retinas back into place and mending the damaged optic nerves that caused total blindness."), + SPAN_WARNING("[user] finishes laying your detached retinas back into place and mending the damaged optic nerves that caused total blindness."), + SPAN_WARNING("[user] finishes laying [target]'s detached retinas back into place and mending the damaged optic nerves that caused total blindness.")) + if(target.disabilities & NEARSIGHTED) + user.affected_message(target, + SPAN_NOTICE("You finish reshaping [target]'s corneas so they can focus light accurately again."), + SPAN_NOTICE("[user] finishes reshaping your corneas so they can focus light accurately again."), + SPAN_WARNING("[user] finishes reshaping [target]'s corneas so they can focus light accurately again.")) + if(E && E.damage > 0) + user.affected_message(target, + SPAN_NOTICE("You finish mending the damaged blood vessels within and the surface damage outside of [target]'s eyes."), + SPAN_NOTICE("[user] finishes mending the damaged blood vessels within and the surface damage outside of your eyes."), + SPAN_NOTICE("[user] finishes mending the damaged blood vessels within and the surface damage outside of [target]'s eyes.")) + user.affected_message(target, + SPAN_NOTICE("You finish mending the damage in [target]'s eyes."), + SPAN_NOTICE("[user] finishes mending the damage in your eyes."), + SPAN_NOTICE("[user] finishes mending the damage in [target]'s eyes.")) + + log_interact(user, target, "[key_name(user)] mended the damage inside [key_name(target)]'s eyes with [tool].") /datum/surgery_step/mend_eyes/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/eye_repair/surgery) user.affected_message(target, - SPAN_WARNING("Your hand slips, damaging [target]'s eyes with \the [tool]!"), - SPAN_WARNING("[user]'s hand slips, damaging your eyes with \the [tool]!"), - SPAN_WARNING("[user]'s hand slips, damaging [target]'s eyes with \the [tool]!")) + SPAN_WARNING("Your hand slips, damaging [target]'s eyeballs with [tool]!"), + SPAN_WARNING("[user]'s hand slips, damaging your eyeballs with [tool]!"), + SPAN_WARNING("[user]'s hand slips, damaging [target]'s eyeballs with [tool]!")) - log_interact(user, target, "[key_name(user)] failed to mend the nerves and lenses in [key_name(target)]'s eyes with \the [tool].") + log_interact(user, target, "[key_name(user)] failed to mend the damage inside [key_name(target)]'s eyes with [tool].") target.apply_damage(10, BRUTE, target_zone, sharp = 1) surgery.target_eyes.take_damage(5, FALSE) @@ -143,26 +217,27 @@ /datum/surgery_step/cauterize/eyes name = "Cauterize Eye Incisions" - desc = "cauterize the incisions" + desc = "reattach the corneas and lenses and close the eyeballs" time = 3 SECONDS /datum/surgery_step/cauterize/eyes/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/surgery) user.affected_message(target, - SPAN_NOTICE("You begin to reattach [target]'s corneas with \the [tool]."), - SPAN_NOTICE("[user] begins to reattach your corneas with \the [tool]."), - SPAN_NOTICE("[user] begins to reattach [target]'s corneas with \the [tool].")) - - log_interact(user, target, "[key_name(user)] began to cauterize the incision around [key_name(target)]'s eyes with \the [tool].") + SPAN_NOTICE("You begin to reattach [target]'s corneas and lenses and close \his eyeballs with [tool]."), + SPAN_NOTICE("[user] begins to reattach your corneas and lenses and close your eyeballs with [tool]."), + SPAN_NOTICE("[user] begins to reattach [target]'s corneas and lenses and close \his eyeballs with [tool].")) + target.custom_pain("Your eyes burn!",1) + log_interact(user, target, "[key_name(user)] began to cauterize the incision around [key_name(target)]'s eyes with [tool].") /datum/surgery_step/cauterize/eyes/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/eye_repair/surgery) user.affected_message(target, - SPAN_NOTICE("You reattach [target]'s corneas."), - SPAN_NOTICE("[user] reattaches your corneas."), - SPAN_NOTICE("[user] reattaches [target]'s corneas.")) + SPAN_NOTICE("You reattach [target]'s corneas and lenses and close \his eyeballs."), + SPAN_NOTICE("[user] reattaches your corneas and lenses and closes your eyeballs."), + SPAN_NOTICE("[user] reattaches [target]'s corneas and lenses and closes \his eyeballs.")) - log_interact(user, target, "[key_name(user)] cauterized the incision around [key_name(target)]'s eyes with \the [tool], ending [surgery].") + log_interact(user, target, "[key_name(user)] cauterized the incision around [key_name(target)]'s eyes with [tool], ending [surgery].") + to_chat(target, SPAN_NOTICE("The pain in your eyeballs is gone and you can see again!")) target.incision_depths[target_zone] = SURGERY_DEPTH_SURFACE target.disabilities &= ~NEARSIGHTED target.sdisabilities &= ~DISABILITY_BLIND @@ -172,11 +247,11 @@ /datum/surgery_step/cauterize/eyes/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/eye_repair/surgery) user.affected_message(target, - SPAN_WARNING("Your hand slips, searing [target]'s eyes with \the [tool]!"), - SPAN_WARNING("[user]'s hand slips, searing your eyes with \the [tool]!"), - SPAN_WARNING("[user]'s hand slips, searing [target]'s eyes with \the [tool]!")) + SPAN_WARNING("Your hand slips, searing [target]'s eyes with [tool]!"), + SPAN_WARNING("[user]'s hand slips, searing your eyes with [tool]!"), + SPAN_WARNING("[user]'s hand slips, searing [target]'s eyes with [tool]!")) - log_interact(user, target, "[key_name(user)] failed to cauterize the incision around [key_name(target)]'s eyes with \the [tool].") + log_interact(user, target, "[key_name(user)] failed to cauterize the incision around [key_name(target)]'s eyes with [tool].") target.apply_damage(15, BURN, target_zone) surgery.target_eyes.take_damage(10, FALSE) diff --git a/code/modules/surgery/generic.dm b/code/modules/surgery/generic.dm index d3da42cf713b..bd04a56c91ad 100644 --- a/code/modules/surgery/generic.dm +++ b/code/modules/surgery/generic.dm @@ -58,6 +58,13 @@ SPAN_NOTICE("[user] has constructed a prepared incision in [target]'s [surgery.affected_limb.display_name].")) surgery.status += 2 //IMS completes all steps. + + switch(target_zone) //forces application of overlays + if("chest") + target.overlays += image('icons/mob/humans/dam_human.dmi', "chest_surgery_closed") + if("head") + target.overlays += image('icons/mob/humans/dam_human.dmi', "skull_surgery_closed") + else if(tool_type == /obj/item/tool/surgery/scalpel/laser && prob(las_scalpel.bloodlessprob)) user.affected_message(target, SPAN_NOTICE("You finish making a bloodless incision on [target]'s [surgery.affected_limb.display_name] with \the [tool]."), @@ -704,7 +711,7 @@ If fiddling with, uncomment /mob/living/attackby surgery code also. It's pointle steps = list(/datum/surgery_step/test_incision) pain_reduction_required = NONE //Xenos cannot process painkillers. requires_bodypart = FALSE //Xenos have no limbs. - target_mobtypes = list(/mob/living/carbon/xenomorph, /mob/living/simple_animal/cat/Jones) + target_mobtypes = list(/mob/living/carbon/xenomorph, /mob/living/simple_animal/small/cat/Jones) lying_required = FALSE /datum/surgery_step/test_incision @@ -748,7 +755,7 @@ If fiddling with, uncomment /mob/living/attackby surgery code also. It's pointle priority = SURGERY_PRIORITY_HIGH possible_locs = list("chest") required_surgery_skill = SKILL_SURGERY_TRAINED - target_mobtypes = list(/mob/living/simple_animal/cat/Jones) + target_mobtypes = list(/mob/living/simple_animal/small/cat/Jones) steps = list(/datum/surgery_step/mend_test_organ_step) pain_reduction_required = NONE //Xenos cannot process painkillers. requires_bodypart = FALSE //Xenos have no limbs. @@ -808,7 +815,7 @@ If fiddling with, uncomment /mob/living/attackby surgery code also. It's pointle self_operable = TRUE pain_reduction_required = NONE //Xenos cannot process painkillers. requires_bodypart = FALSE //Xenos have no limbs. - target_mobtypes = list(/mob/living/carbon/xenomorph, /mob/living/simple_animal/cat/Jones) + target_mobtypes = list(/mob/living/carbon/xenomorph, /mob/living/simple_animal/small/cat/Jones) lying_required = FALSE //------------------------------------ diff --git a/code/modules/surgery/mcomp_tendwounds.dm b/code/modules/surgery/mcomp_tendwounds.dm index 0339713d3620..d5b1f5d710ea 100644 --- a/code/modules/surgery/mcomp_tendwounds.dm +++ b/code/modules/surgery/mcomp_tendwounds.dm @@ -173,6 +173,10 @@ target.heal_overall_damage(125,125) //makes sure that all damage is healed target.SetSlow(0 SECONDS) target.SetSuperslow(0 SECONDS) + if(ishuman(target)) + var/mob/living/carbon/human/target_humanoid = target + for(var/obj/limb/limb in target_humanoid.limbs) + limb.status &= ~(LIMB_THIRD_DEGREE_BURNS|LIMB_ESCHAR) if(user == target) user.visible_message(SPAN_NOTICE("[user] finshes closing the treated wounds on their body with [tool]."), diff --git a/code/modules/surgery/surgery_steps.dm b/code/modules/surgery/surgery_steps.dm index 804538acda9e..48767aac2a2e 100644 --- a/code/modules/surgery/surgery_steps.dm +++ b/code/modules/surgery/surgery_steps.dm @@ -220,9 +220,10 @@ affected_limb, or location vars. Also, in that case there may be a wait between msg_admin_niche("[user] failed a [surgery] step on [target] because of [failure_penalties] failure possibility penalties ([surgery_failure_chance]%)") else //Help intent. - if(do_after(user, step_duration, INTERRUPT_ALL|INTERRUPT_DIFF_INTENT, BUSY_ICON_FRIENDLY,target,INTERRUPT_MOVED,BUSY_ICON_MEDICAL)) + if(do_after(user, step_duration, INTERRUPT_ALL|INTERRUPT_DIFF_INTENT, BUSY_ICON_FRIENDLY, target, INTERRUPT_MOVED, BUSY_ICON_MEDICAL)) success(user, target, target_zone, tool, tool_type, surgery) - SEND_SIGNAL(user, COMSIG_HUMAN_SURGERY_STEP_SUCCESS, target, surgery, tool) + if(surgery_limb) + SEND_SIGNAL(surgery_limb, COMSIG_LIMB_SURGERY_STEP_SUCCESS, user, surgery, tool) advance = TRUE play_success_sound(user, target, target_zone, tool, surgery) if(repeat_step && repeat_step_criteria(user, target, target_zone, tool, tool_type, surgery)) @@ -275,8 +276,8 @@ affected_limb, or location vars. Also, in that case there may be a wait between /**This is used for failed-step narration and relevant failure changes, often damage etc. If it returns TRUE, the step succeeds anyway. tool_type may be a typepath or simply '1'. Note that a first step done on help-intent doesn't call failure(), it just ends harmlessly.**/ /datum/surgery_step/proc/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/surgery) - user.visible_message(SPAN_NOTICE("[user] fails to finish the surgery"), - SPAN_NOTICE("You fail to finish the surgery")) + user.visible_message(SPAN_NOTICE("[user] fails to finish the surgery."), + SPAN_NOTICE("You fail to finish the surgery.")) return FALSE /// Plays the failure sound diff --git a/code/modules/surgery/xeno.dm b/code/modules/surgery/xeno.dm index ede489c28c61..972e50c860ad 100644 --- a/code/modules/surgery/xeno.dm +++ b/code/modules/surgery/xeno.dm @@ -55,7 +55,7 @@ user.visible_message( SPAN_NOTICE("[user] recklessly starts to [pick("smash", "crack", "break")] the [target.caste_type]'s carapace apart with [tool] as acidic blood begins to burst through the corpse's seams!"), SPAN_NOTICE("You recklessly start to [pick("smash", "crack", "break")] the [target.caste_type]'s carapace apart using [tool] as acidic blood begins to burst through the corpse's seams!")) - //we dont really need a log interact since we're working with dead bodies... I hope + //we don't really need a log interact since we're working with dead bodies... I hope /datum/surgery_step/xenomorph/cut_exoskeleton/success(mob/living/carbon/human/user, mob/living/carbon/xenomorph/target, target_zone, obj/item/tool, tool_type, datum/surgery/surgery) if(tool_type == /obj/item/tool/surgery/circular_saw) diff --git a/code/modules/teleporters/teleporter_admin_verbs.dm b/code/modules/teleporters/teleporter_admin_verbs.dm index 61f21fdb34ee..acb5165db9db 100644 --- a/code/modules/teleporters/teleporter_admin_verbs.dm +++ b/code/modules/teleporters/teleporter_admin_verbs.dm @@ -1,6 +1,6 @@ /client/proc/force_teleporter() set name = "Force Teleporter" - set desc = "Force a teleporter to teleport" + set desc = "Force a teleporter to teleport." set category = "Admin.Game" var/list/datum/teleporter/available_teleporters = GLOB.teleporters diff --git a/code/modules/teleporters/teleporter_console.dm b/code/modules/teleporters/teleporter_console.dm index f1d3a74b902e..cd205a71eba4 100644 --- a/code/modules/teleporters/teleporter_console.dm +++ b/code/modules/teleporters/teleporter_console.dm @@ -35,6 +35,9 @@ attack_hand(X) return XENO_ATTACK_ACTION +/obj/structure/machinery/computer/teleporter_console/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + return TAILSTAB_COOLDOWN_NONE + // Try to find and add a teleporter from the globals. /obj/structure/machinery/computer/teleporter_console/proc/attempt_teleporter_link() if(linked_teleporter) // Maybe should debug log this because it's indicative of bad logic, but I'll leave it out for the sake of (potential) spam diff --git a/code/modules/teleporters/teleporter_landmarks.dm b/code/modules/teleporters/teleporter_landmarks.dm index fe0ab4648903..a7b5030c18d3 100644 --- a/code/modules/teleporters/teleporter_landmarks.dm +++ b/code/modules/teleporters/teleporter_landmarks.dm @@ -8,7 +8,7 @@ // How these work: // Loaded into lists by location_id when the landmark SS calls them /obj/effect/landmark/teleporter_loc - desc = "The reference landmark for teleporters" + desc = "The reference landmark for teleporters." icon = 'icons/old_stuff/mark.dmi' icon_state = "spawn_shuttle" diff --git a/code/modules/tents/deployed_tents.dm b/code/modules/tents/deployed_tents.dm index 43999849362f..0165e1dbf778 100644 --- a/code/modules/tents/deployed_tents.dm +++ b/code/modules/tents/deployed_tents.dm @@ -15,7 +15,8 @@ var/y_dim = 4 /// How much cold protection to add to entering humans - Full body clothing means complete (1) protection - var/cold_protection_factor = 0.4 + /// Insulated enough to protect armorless patients in the medical tent + var/cold_protection_factor = 0.7 /// Roof display icon_state or null to disable var/roof_state @@ -54,9 +55,17 @@ SIGNAL_HANDLER if(!ismob(subject)) return + var/mob/subject_mob = subject + + RegisterSignal(subject_mob, list(COMSIG_MOVABLE_TURF_ENTERED, COMSIG_GHOST_MOVED), PROC_REF(mob_moved), override = TRUE) // Must override because we can't know if mob was already inside tent without keeping an awful ref list subject_mob.RegisterSignal(src, COMSIG_PARENT_QDELETING, TYPE_PROC_REF(/mob, tent_deletion_clean_up), override = TRUE) + + if(istype(subject_mob, /mob/hologram)) + var/mob/hologram/hologram_mob = subject_mob + subject_mob = hologram_mob.linked_mob + var/atom/movable/screen/plane_master/roof/roof_plane = subject_mob.hud_used.plane_masters["[ROOF_PLANE]"] roof_plane?.invisibility = INVISIBILITY_MAXIMUM if(ishuman(subject)) @@ -68,12 +77,18 @@ /obj/structure/tent/proc/mob_moved(mob/subject, turf/target_turf) SIGNAL_HANDLER + if(!(target_turf in locs)) // Exited the tent mob_exited_tent(subject) /obj/structure/tent/proc/mob_exited_tent(mob/subject) UnregisterSignal(subject, list(COMSIG_MOVABLE_TURF_ENTERED, COMSIG_GHOST_MOVED, COMSIG_HUMAN_COLD_PROTECTION_APPLY_MODIFIERS)) subject.UnregisterSignal(src, COMSIG_PARENT_QDELETING) + + if(istype(subject, /mob/hologram)) + var/mob/hologram/hologram_mob = subject + subject = hologram_mob.linked_mob + var/atom/movable/screen/plane_master/roof/roof_plane = subject.hud_used.plane_masters["[ROOF_PLANE]"] roof_plane?.invisibility = 0 @@ -98,6 +113,21 @@ return XENO_ATTACK_ACTION +/obj/structure/tent/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + if(unslashable || health <= 0) + return TAILSTAB_COOLDOWN_NONE + playsound(src, 'sound/items/paper_ripped.ogg', 25, 1) + health -= xeno.melee_damage_upper + if(health <= 0) + xeno.visible_message(SPAN_DANGER("[xeno] collapses [src] with its tail!"), + SPAN_DANGER("We collapse [src] with our tail!"), null, 5, CHAT_TYPE_XENO_COMBAT) + qdel(src) + else + xeno.visible_message(SPAN_DANGER("[xeno] strikes [src] with its tail!"), + SPAN_DANGER("We strike [src] with our tail!"), null, 5, CHAT_TYPE_XENO_COMBAT) + xeno.tail_stab_animation(src, blunt_stab) + return TAILSTAB_COOLDOWN_NORMAL + /obj/structure/tent/attackby(obj/item/item, mob/user) var/obj/item/tool/shovel/shovel = item if(!istype(shovel) || shovel.folded || user.action_busy) diff --git a/code/modules/tents/folded_tents.dm b/code/modules/tents/folded_tents.dm index a25fe898bba7..97aac11183f8 100644 --- a/code/modules/tents/folded_tents.dm +++ b/code/modules/tents/folded_tents.dm @@ -16,7 +16,7 @@ /obj/item/folded_tent/Initialize(mapload, ...) . = ..() - if(template_preset == "abstract") //So spawning an abstract tent wont fail create and destroy + if(template_preset == "abstract") //So spawning an abstract tent won't fail create and destroy return set_template(SSmapping.tent_type_templates[template_preset]) if(!template) diff --git a/code/modules/tgs/v3210/api.dm b/code/modules/tgs/v3210/api.dm index 666201a32256..24f0e53421a2 100644 --- a/code/modules/tgs/v3210/api.dm +++ b/code/modules/tgs/v3210/api.dm @@ -37,7 +37,7 @@ var/originmastercommit var/commit var/list/cached_custom_tgs_chat_commands - var/warned_revison = FALSE + var/warned_revision = FALSE var/warned_custom_commands = FALSE /datum/tgs_api/v3210/ApiVersion() @@ -177,10 +177,10 @@ . += tm /datum/tgs_api/v3210/Revision() - if(!warned_revison) + if(!warned_revision) var/datum/tgs_version/api_version = ApiVersion() TGS_WARNING_LOG("Use of TgsRevision on [api_version.deprefixed_parameter] origin_commit only points to master!") - warned_revison = TRUE + warned_revision = TRUE var/datum/tgs_revision_information/ri = new ri.commit = commit ri.origin_commit = originmastercommit diff --git a/code/modules/tgui/states/computer.dm b/code/modules/tgui/states/computer.dm new file mode 100644 index 000000000000..683113edee46 --- /dev/null +++ b/code/modules/tgui/states/computer.dm @@ -0,0 +1,26 @@ +/** + * tgui state: powered_machinery_state + * + * Checks that the machinery is operable, user isn't incapacitated, and that their loc is a turf + */ +GLOBAL_DATUM_INIT(powered_machinery_state, /datum/ui_state/powered_machinery_state, new) + +/datum/ui_state/powered_machinery_state + var/turf_check = FALSE + +/datum/ui_state/powered_machinery_state/New(loc, no_turfs = FALSE) + ..() + turf_check = no_turfs + +/datum/ui_state/powered_machinery_state/can_use_topic(src_object, mob/user) + . = UI_CLOSE + if(user.stat != CONSCIOUS) + return UI_CLOSE + var/dist = get_dist(src_object, user) + if(user.is_mob_incapacitated(TRUE) || (turf_check && !isturf(user.loc)) || (dist > 1)) + return UI_CLOSE + // We're just assuming we're properly being called on machinery + var/obj/structure/machinery/src_machinery = src_object + if(src_machinery.inoperable()) + return UI_CLOSE + return UI_INTERACTIVE diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm index 0de42787091f..2ea88f9c8907 100644 --- a/code/modules/tgui/tgui.dm +++ b/code/modules/tgui/tgui.dm @@ -120,6 +120,17 @@ )) else window.send_message("ping") + send_assets() + window.send_message("update", get_payload( + with_data = TRUE, + with_static_data = TRUE)) + if(mouse_hooked) + window.set_mouse_macro() + SStgui.on_open(src) + + return TRUE + +/datum/tgui/proc/send_assets() var/flush_queue = window.send_asset(get_asset_datum( /datum/asset/simple/namespaced/fontawesome)) flush_queue |= window.send_asset(get_asset_datum( @@ -130,14 +141,6 @@ flush_queue |= window.send_asset(asset) if (flush_queue) user.client.browse_queue_flush() - window.send_message("update", get_payload( - with_data = TRUE, - with_static_data = TRUE)) - if(mouse_hooked) - window.set_mouse_macro() - SStgui.on_open(src) - - return TRUE /** * public diff --git a/code/modules/tgui_panel/tgui_panel.dm b/code/modules/tgui_panel/tgui_panel.dm index 3124149b6a07..3fba19c63d0e 100644 --- a/code/modules/tgui_panel/tgui_panel.dm +++ b/code/modules/tgui_panel/tgui_panel.dm @@ -12,6 +12,8 @@ var/datum/tgui_window/window var/broken = FALSE var/initialized_at + /// Each client notifies on protected playback, so this prevents spamming admins. + var/static/admins_warned = FALSE /datum/tgui_panel/New(client/client, id) src.client = client @@ -90,12 +92,28 @@ // if(type == "audio/setAdminMusicVolume") // client.admin_music_volume = payload["volume"] // return TRUE + + + if(type == "audio/protected") + if(!admins_warned) + message_admins(SPAN_NOTICE("Audio returned a protected playback error, likely due to being copyrighted.")) + admins_warned = TRUE + addtimer(VARSET_CALLBACK(src, admins_warned, FALSE), 10 SECONDS) + return TRUE + if(type == "telemetry") analyze_telemetry(payload) return TRUE if(type == "act/ping_relays") ping_relays() return TRUE + if(type == "refresh_keywords") + var/datum/highlight_keywords_payload/highlight_keywords_payload = new(usr) + usr.client.tgui_panel.window.send_message( + "settings/updateHighlightKeywords", + highlight_keywords_payload.to_list() + ) + return TRUE /** * public diff --git a/code/modules/tooltip/tooltip.dm b/code/modules/tooltip/tooltip.dm index e668196d383a..adf4739122b0 100644 --- a/code/modules/tooltip/tooltip.dm +++ b/code/modules/tooltip/tooltip.dm @@ -109,14 +109,14 @@ Notes: //Open a tooltip for user, at a location based on params //Theme is a CSS class in tooltip.html, by default this wrapper chooses a CSS class based on the user's UI_style (Midnight, Plasmafire, Retro, etc) //Includes sanity.checks -/proc/openToolTip(mob/user = null, atom/movable/tip_src = null, params = null,title = "",content = "",theme = "") +/proc/openToolTip(mob/user = null, atom/movable/tip_src = null, params = null,title = "",content = "",theme = "", special="") if(istype(user)) if(user.client && user.client.tooltips) if(!theme && user.client.prefs && user.client.prefs.UI_style) theme = lowertext(user.client.prefs.UI_style) if(!theme) theme = "default" - user.client.tooltips.show(tip_src, params,title,content,theme) + user.client.tooltips.show(tip_src, params, title, content, theme, special) //Arbitrarily close a user's tooltip diff --git a/code/modules/tooltip/tooltip.html b/code/modules/tooltip/tooltip.html index 33c7468a81f3..e43c718d7002 100644 --- a/code/modules/tooltip/tooltip.html +++ b/code/modules/tooltip/tooltip.html @@ -113,7 +113,7 @@ //alert(tooltip.params+' | '+tooltip.clientView+' | '+tooltip.text+' | '+tooltip.theme); //DEBUG //Some reset stuff to avoid fringe issues with sizing - window.location = 'byond://winset?id='+tooltip.control+';anchor1=0,0;size=999x999'; + // window.location = 'byond://winset?id='+tooltip.control+';anchor1=0,0;size=999x999'; //Get the real icon size according to the client view //FYI, this bit is even more borrowed from goon, our widescreen broke tooltips so I took a look at how they do it @@ -201,10 +201,6 @@ } } - //Handle special cases (for fuck sake) - if (tooltip.special !== 'none') { - //Put yo special cases here - } //Clamp values left = (left < 0 ? 0 : (left > tilesShownX ? tilesShownX : left)); @@ -238,6 +234,12 @@ posY = (posY - docHeight) - realIconSizeY - tooltip.padding; } + + //Handle special cases (for fuck sake) + if (tooltip.special == 'offset_left') { + posX -= 128; + } + //Actually size, move and show the tooltip box window.location = 'byond://winset?id='+tooltip.control+';size='+docWidth+'x'+docHeight+';pos='+posX+','+posY+';is-visible=true'; diff --git a/code/modules/trigger.dm b/code/modules/trigger.dm index 69453c71ea06..cc4497ba8892 100644 --- a/code/modules/trigger.dm +++ b/code/modules/trigger.dm @@ -3,9 +3,9 @@ var/once = 1 /obj/effect/step_trigger/message/memorial - message = "Please stand silently for a moment of reflection and respect. " + message = "Please stand silently for a moment of reflection and respect." once = 0 - + /obj/effect/step_trigger/message/Trigger(mob/M) if(!istype(M) || !M) return diff --git a/code/modules/unit_tests/areas_unpowered.dm b/code/modules/unit_tests/areas_unpowered.dm index c3157021de6b..bff391b4ab9e 100644 --- a/code/modules/unit_tests/areas_unpowered.dm +++ b/code/modules/unit_tests/areas_unpowered.dm @@ -53,6 +53,8 @@ var/obj/structure/machinery/power/apc/cur_apc = found_apcs[1] var/apc_notes = "APC loc: ([cur_apc.x],[cur_apc.y]) [cur_apc.loc?.type]" TEST_FAIL("[cur_area] ([cur_area.type]) has an APC with an inaccessible terminal!\n\t[apc_notes]") + if(cur_area.used_equip < 0 || cur_area.used_light < 0 || cur_area.used_environ < 0 || cur_area.used_oneoff < 0) + TEST_FAIL("[cur_area] ([cur_area.type]) has [cur_area.used_equip] Eqp, [cur_area.used_light] Lgt, [cur_area.used_environ] Env, [cur_area.used_oneoff] OneOff power used!") continue // Pass if(apc_count > 1) var/apc_notes = "APC locs: " diff --git a/code/modules/unit_tests/check_runtimes.dm b/code/modules/unit_tests/check_runtimes.dm index 23d497375846..b9bf329c48b9 100644 --- a/code/modules/unit_tests/check_runtimes.dm +++ b/code/modules/unit_tests/check_runtimes.dm @@ -1,5 +1,5 @@ /datum/unit_test/check_runtimes - priority = TEST_LONGER + priority = TEST_CHECK_RUNTIMES ///Regex patterns if we must satisfy checks with runtimes present var/list/whitelisted_regex = list() diff --git a/code/modules/unit_tests/create_and_destroy.dm b/code/modules/unit_tests/create_and_destroy.dm index 463c72f0bdf0..7efbc3016ffa 100644 --- a/code/modules/unit_tests/create_and_destroy.dm +++ b/code/modules/unit_tests/create_and_destroy.dm @@ -151,3 +151,14 @@ GLOBAL_VAR_INIT(running_create_and_destroy, FALSE) //This shouldn't be needed, but let's be polite SSgarbage.collection_timeout[GC_QUEUE_CHECK] = GC_CHECK_QUEUE SSgarbage.collection_timeout[GC_QUEUE_HARDDELETE] = GC_DEL_QUEUE + +/datum/unit_test/create_and_destroy/Destroy() + . = ..() + //Ensure the entire space is the correct turf again + var/original_turf_type = run_loc_floor_bottom_left.type + var/original_baseturfs = islist(run_loc_floor_bottom_left.baseturfs) ? run_loc_floor_bottom_left.baseturfs.Copy() : run_loc_floor_bottom_left.baseturfs + var/width = run_loc_floor_top_right.x - run_loc_floor_bottom_left.x + 1 + var/height = run_loc_floor_top_right.y - run_loc_floor_bottom_left.y + 1 + for(var/turf/turf as anything in CORNER_BLOCK(run_loc_floor_bottom_left, width, height)) + debug_log("C&D: Changing [turf] - [turf.type] at [turf.x],[turf.y] back to [original_turf_type]") + turf.ChangeTurf(original_turf_type, original_baseturfs) diff --git a/code/modules/unit_tests/unit_test.dm b/code/modules/unit_tests/unit_test.dm index fd855384715e..ae6a16704e78 100644 --- a/code/modules/unit_tests/unit_test.dm +++ b/code/modules/unit_tests/unit_test.dm @@ -62,8 +62,8 @@ GLOBAL_VAR_INIT(focused_test, focused_test()) run_loc_floor_bottom_left = get_turf(locate(/obj/effect/landmark/unit_test_bottom_left) in GLOB.landmarks_list) run_loc_floor_top_right = get_turf(locate(/obj/effect/landmark/unit_test_top_right) in GLOB.landmarks_list) - TEST_ASSERT(isfloorturf(run_loc_floor_bottom_left), "run_loc_floor_bottom_left was not a floor ([run_loc_floor_bottom_left])") - TEST_ASSERT(isfloorturf(run_loc_floor_top_right), "run_loc_floor_top_right was not a floor ([run_loc_floor_top_right])") + TEST_ASSERT(isfloorturf(run_loc_floor_bottom_left), "run_loc_floor_bottom_left was not a floor ([run_loc_floor_bottom_left] - [run_loc_floor_bottom_left?.type])") + TEST_ASSERT(isfloorturf(run_loc_floor_top_right), "run_loc_floor_top_right was not a floor ([run_loc_floor_top_right] - [run_loc_floor_top_right?.type])") /datum/unit_test/Destroy() QDEL_LIST(allocated) @@ -186,7 +186,7 @@ GLOBAL_VAR_INIT(focused_test, focused_test()) var/message = log_entry.Join("\n") log_test(message) - var/test_output_desc = "[test_path] [duration / 10]s" + var/test_output_desc = "[test_path] [duration / 10]s." if (test.succeeded) log_world("[TEST_OUTPUT_GREEN("PASS")] [test_output_desc]") diff --git a/code/modules/vehicles/apc/apc.dm b/code/modules/vehicles/apc/apc.dm index a99b3815f01b..dfda21731f7c 100644 --- a/code/modules/vehicles/apc/apc.dm +++ b/code/modules/vehicles/apc/apc.dm @@ -76,13 +76,7 @@ GLOBAL_LIST_EMPTY(command_apc_list) move_turn_momentum_loss_factor = 0.8 vehicle_ram_multiplier = VEHICLE_TRAMPLE_DAMAGE_APC_REDUCTION - -/obj/vehicle/multitile/apc/Initialize() - . = ..() - - var/turf/gotten_turf = get_turf(src) - if(gotten_turf && gotten_turf.z) - SSminimaps.add_marker(src, gotten_turf.z, MINIMAP_FLAG_USCM, "apc", 'icons/ui_icons/map_blips_large.dmi') + minimap_icon_state = "apc" /obj/vehicle/multitile/apc/load_role_reserved_slots() var/datum/role_reserved_slots/RRS = new diff --git a/code/modules/vehicles/arc/arc.dm b/code/modules/vehicles/arc/arc.dm index 7c5a313af4c0..f93fb7232443 100644 --- a/code/modules/vehicles/arc/arc.dm +++ b/code/modules/vehicles/arc/arc.dm @@ -65,6 +65,7 @@ move_turn_momentum_loss_factor = 0.8 vehicle_ram_multiplier = VEHICLE_TRAMPLE_DAMAGE_APC_REDUCTION + minimap_icon_state = "arc" /// If the ARC has its antenna up, making it unable to move but enabling the turret and sensor wallhack var/antenna_deployed = FALSE @@ -77,11 +78,6 @@ /obj/vehicle/multitile/arc/Initialize() . = ..() - - var/turf/gotten_turf = get_turf(src) - if(gotten_turf?.z) - SSminimaps.add_marker(src, gotten_turf.z, MINIMAP_FLAG_USCM, "arc", 'icons/ui_icons/map_blips_large.dmi') - RegisterSignal(src, COMSIG_ARC_ANTENNA_TOGGLED, PROC_REF(on_antenna_toggle)) /obj/vehicle/multitile/arc/crew_mousedown(datum/source, atom/object, turf/location, control, params) diff --git a/code/modules/vehicles/hardpoints/armor/armor.dm b/code/modules/vehicles/hardpoints/armor/armor.dm index a7d8afb853f4..e60bb7b7063a 100644 --- a/code/modules/vehicles/hardpoints/armor/armor.dm +++ b/code/modules/vehicles/hardpoints/armor/armor.dm @@ -1,6 +1,6 @@ /obj/item/hardpoint/armor name = "armor hardpoint" - desc = "primary armor source" + desc = "Primary armor source." slot = HDPT_ARMOR hdpt_layer = HDPT_LAYER_ARMOR diff --git a/code/modules/vehicles/hardpoints/armor/ballistic.dm b/code/modules/vehicles/hardpoints/armor/ballistic.dm index 55f0f6bc4e6b..f090ca0c3377 100644 --- a/code/modules/vehicles/hardpoints/armor/ballistic.dm +++ b/code/modules/vehicles/hardpoints/armor/ballistic.dm @@ -1,6 +1,6 @@ /obj/item/hardpoint/armor/ballistic name = "\improper Ballistic Armor" - desc = "Protects the vehicle from high-penetration weapons" + desc = "Protects the vehicle from high-penetration weapons." icon_state = "ballistic_armor" disp_icon = "tank" diff --git a/code/modules/vehicles/hardpoints/armor/caustic.dm b/code/modules/vehicles/hardpoints/armor/caustic.dm index ac97d3da25f9..9eb754bb172e 100644 --- a/code/modules/vehicles/hardpoints/armor/caustic.dm +++ b/code/modules/vehicles/hardpoints/armor/caustic.dm @@ -1,6 +1,6 @@ /obj/item/hardpoint/armor/caustic name = "\improper Caustic Armor" - desc = "Protects vehicles from most types of acid" + desc = "Protects vehicles from most types of acid." icon_state = "caustic_armor" disp_icon = "tank" diff --git a/code/modules/vehicles/hardpoints/armor/concussive.dm b/code/modules/vehicles/hardpoints/armor/concussive.dm index 6da39b9c4173..c3ce5b5646f9 100644 --- a/code/modules/vehicles/hardpoints/armor/concussive.dm +++ b/code/modules/vehicles/hardpoints/armor/concussive.dm @@ -1,6 +1,6 @@ /obj/item/hardpoint/armor/concussive name = "\improper Concussive Armor" - desc = "Protects the vehicle from high-impact weapons" + desc = "Protects the vehicle from high-impact weapons." icon_state = "concussive_armor" disp_icon = "tank" diff --git a/code/modules/vehicles/hardpoints/armor/paladin.dm b/code/modules/vehicles/hardpoints/armor/paladin.dm index fb131d47151e..a351ca95b24b 100644 --- a/code/modules/vehicles/hardpoints/armor/paladin.dm +++ b/code/modules/vehicles/hardpoints/armor/paladin.dm @@ -1,6 +1,6 @@ /obj/item/hardpoint/armor/paladin name = "\improper Paladin Armor" - desc = "Protects the vehicle from large incoming explosive projectiles" + desc = "Protects the vehicle from large incoming explosive projectiles." icon_state = "paladin_armor" disp_icon = "tank" diff --git a/code/modules/vehicles/hardpoints/hardpoint_ammo/ltb_ammo.dm b/code/modules/vehicles/hardpoints/hardpoint_ammo/ltb_ammo.dm index 09a3336866ec..ee6de433eb36 100644 --- a/code/modules/vehicles/hardpoints/hardpoint_ammo/ltb_ammo.dm +++ b/code/modules/vehicles/hardpoints/hardpoint_ammo/ltb_ammo.dm @@ -1,6 +1,6 @@ /obj/item/ammo_magazine/hardpoint/ltb_cannon name = "LTB Cannon Magazine" - desc = "A primary armament cannon magazine" + desc = "A primary armament cannon magazine." caliber = "86mm" //Making this unique on purpose icon = 'icons/obj/items/weapons/guns/ammo_by_faction/USCM/vehicles.dmi' icon_state = "ltbcannon_4" diff --git a/code/modules/vehicles/hardpoints/hardpoint_ammo/tow_ammo.dm b/code/modules/vehicles/hardpoints/hardpoint_ammo/tow_ammo.dm index 4e509211c6f6..362929d90c89 100644 --- a/code/modules/vehicles/hardpoints/hardpoint_ammo/tow_ammo.dm +++ b/code/modules/vehicles/hardpoints/hardpoint_ammo/tow_ammo.dm @@ -1,7 +1,7 @@ /obj/item/ammo_magazine/hardpoint/towlauncher name = "TOW Launcher Magazine" icon = 'icons/obj/items/weapons/guns/ammo_by_faction/event.dmi' - desc = "A secondary armament rocket magazine" + desc = "A secondary armament rocket magazine." caliber = "rocket" //correlates to any rocket mags icon_state = "quad_rocket" w_class = SIZE_LARGE diff --git a/code/modules/vehicles/hardpoints/holder/holder.dm b/code/modules/vehicles/hardpoints/holder/holder.dm index 948142383cca..a1797cb68b8b 100644 --- a/code/modules/vehicles/hardpoints/holder/holder.dm +++ b/code/modules/vehicles/hardpoints/holder/holder.dm @@ -1,6 +1,6 @@ /obj/item/hardpoint/holder name = "holder hardpoint" - desc = "Holder for other hardpoints" + desc = "Holder for other hardpoints." // List of types of hardpoints that this hardpoint can hold var/list/accepted_hardpoints diff --git a/code/modules/vehicles/hardpoints/holder/tank_turret.dm b/code/modules/vehicles/hardpoints/holder/tank_turret.dm index 5be6a03863f2..edb119cc1327 100644 --- a/code/modules/vehicles/hardpoints/holder/tank_turret.dm +++ b/code/modules/vehicles/hardpoints/holder/tank_turret.dm @@ -177,17 +177,17 @@ switch(dir) if(NORTH) - user.client.pixel_x = 0 - user.client.pixel_y = AM.view_tile_offset * 32 + user.client.set_pixel_x(0) + user.client.set_pixel_y(AM.view_tile_offset * 32) if(SOUTH) - user.client.pixel_x = 0 - user.client.pixel_y = -1 * AM.view_tile_offset * 32 + user.client.set_pixel_x(0) + user.client.set_pixel_y(-1 * AM.view_tile_offset * 32) if(EAST) - user.client.pixel_x = AM.view_tile_offset * 32 - user.client.pixel_y = 0 + user.client.set_pixel_x(AM.view_tile_offset * 32) + user.client.set_pixel_y(0) if(WEST) - user.client.pixel_x = -1 * AM.view_tile_offset * 32 - user.client.pixel_y = 0 + user.client.set_pixel_x(-1 * AM.view_tile_offset * 32) + user.client.set_pixel_y(0) /obj/item/hardpoint/holder/tank_turret/try_fire(atom/target, mob/living/user, params) var/turf/L diff --git a/code/modules/vehicles/hardpoints/primary/arc_sentry.dm b/code/modules/vehicles/hardpoints/primary/arc_sentry.dm index 30efdbcfd0e9..2ff6ac280993 100644 --- a/code/modules/vehicles/hardpoints/primary/arc_sentry.dm +++ b/code/modules/vehicles/hardpoints/primary/arc_sentry.dm @@ -150,7 +150,9 @@ blocked = TRUE break - if(locate(/obj/effect/particle_effect/smoke) in tile) + for( var/obj/effect/particle_effect/smoke/smoke in tile) + if(!smoke.obscuring) + continue blocked = TRUE break diff --git a/code/modules/vehicles/hardpoints/primary/ltb.dm b/code/modules/vehicles/hardpoints/primary/ltb.dm index 7ccbc18a2853..6c818f30b8d2 100644 --- a/code/modules/vehicles/hardpoints/primary/ltb.dm +++ b/code/modules/vehicles/hardpoints/primary/ltb.dm @@ -1,6 +1,6 @@ /obj/item/hardpoint/primary/cannon name = "\improper LTB Cannon" - desc = "A primary cannon for tanks that shoots explosive rounds" + desc = "A primary cannon for tanks that shoots explosive rounds." icon_state = "ltb_cannon" disp_icon = "tank" diff --git a/code/modules/vehicles/hardpoints/primary/primary.dm b/code/modules/vehicles/hardpoints/primary/primary.dm index d6be1c37a4db..7e826217acc6 100644 --- a/code/modules/vehicles/hardpoints/primary/primary.dm +++ b/code/modules/vehicles/hardpoints/primary/primary.dm @@ -1,6 +1,6 @@ /obj/item/hardpoint/primary name = "primary hardpoint" - desc = "Main big gun" + desc = "Main big gun." slot = HDPT_PRIMARY diff --git a/code/modules/vehicles/hardpoints/secondary/secondary.dm b/code/modules/vehicles/hardpoints/secondary/secondary.dm index 6c5b7f54aeca..366c7fcfa9fb 100644 --- a/code/modules/vehicles/hardpoints/secondary/secondary.dm +++ b/code/modules/vehicles/hardpoints/secondary/secondary.dm @@ -1,6 +1,6 @@ /obj/item/hardpoint/secondary name = "secondary hardpoint" - desc = "Smaller support gun" + desc = "Smaller support gun." slot = HDPT_SECONDARY diff --git a/code/modules/vehicles/hardpoints/special/special.dm b/code/modules/vehicles/hardpoints/special/special.dm index 561ab27d0938..04da57067e65 100644 --- a/code/modules/vehicles/hardpoints/special/special.dm +++ b/code/modules/vehicles/hardpoints/special/special.dm @@ -1,6 +1,6 @@ /obj/item/hardpoint/special name = "special hardpoint" - desc = "Special pre-installed module with unique behaviour" + desc = "Special pre-installed module with unique behaviour." slot = HDPT_SPECIAL hdpt_layer = HDPT_LAYER_WHEELS diff --git a/code/modules/vehicles/hardpoints/support/artillery.dm b/code/modules/vehicles/hardpoints/support/artillery.dm index 7ab2fd151fe9..758f6b828cb3 100644 --- a/code/modules/vehicles/hardpoints/support/artillery.dm +++ b/code/modules/vehicles/hardpoints/support/artillery.dm @@ -20,8 +20,8 @@ if(is_active) user.client.change_view(8, owner) - user.client.pixel_x = 0 - user.client.pixel_y = 0 + user.client.set_pixel_x(0) + user.client.set_pixel_y(0) is_active = FALSE return @@ -35,17 +35,17 @@ switch(holder.dir) if(NORTH) - user.client.pixel_x = 0 - user.client.pixel_y = view_tile_offset * 32 + user.client.set_pixel_x(0) + user.client.set_pixel_y(view_tile_offset * 32) if(SOUTH) - user.client.pixel_x = 0 - user.client.pixel_y = -1 * view_tile_offset * 32 + user.client.set_pixel_x(0) + user.client.set_pixel_y(-1 * view_tile_offset * 32) if(EAST) - user.client.pixel_x = view_tile_offset * 32 - user.client.pixel_y = 0 + user.client.set_pixel_x(view_tile_offset * 32) + user.client.set_pixel_y(0) if(WEST) - user.client.pixel_x = -1 * view_tile_offset * 32 - user.client.pixel_y = 0 + user.client.set_pixel_x(-1 * view_tile_offset * 32) + user.client.set_pixel_y(0) /obj/item/hardpoint/support/artillery_module/deactivate() if(!is_active) @@ -59,8 +59,8 @@ if(!user.client) continue user.client.change_view(GLOB.world_view_size, owner) - user.client.pixel_x = 0 - user.client.pixel_y = 0 + user.client.set_pixel_x(0) + user.client.set_pixel_y(0) is_active = FALSE /obj/item/hardpoint/support/artillery_module/try_fire(target, user, params) diff --git a/code/modules/vehicles/hardpoints/support/iwsa.dm b/code/modules/vehicles/hardpoints/support/iwsa.dm index 97fee4e0551a..27eeb3a2ccb5 100644 --- a/code/modules/vehicles/hardpoints/support/iwsa.dm +++ b/code/modules/vehicles/hardpoints/support/iwsa.dm @@ -1,6 +1,6 @@ /obj/item/hardpoint/support/weapons_sensor name = "\improper Integrated Weapons Sensor Array" - desc = "Improves the accuracy and fire rate of all onboard weapons" + desc = "Improves the accuracy and fire rate of all onboard weapons." icon_state = "warray" disp_icon = "tank" diff --git a/code/modules/vehicles/hardpoints/support/overdrive.dm b/code/modules/vehicles/hardpoints/support/overdrive.dm index 4daa2fddad0a..5b482261077a 100644 --- a/code/modules/vehicles/hardpoints/support/overdrive.dm +++ b/code/modules/vehicles/hardpoints/support/overdrive.dm @@ -1,6 +1,6 @@ /obj/item/hardpoint/support/overdrive_enhancer name = "\improper Overdrive Enhancer" - desc = "Increases the movement speed of the vehicle it's attached to" + desc = "Increases the movement speed of the vehicle it's attached to." icon_state = "odrive_enhancer" disp_icon = "tank" diff --git a/code/modules/vehicles/hardpoints/support/support.dm b/code/modules/vehicles/hardpoints/support/support.dm index 444a06fd7910..18e4acae04d3 100644 --- a/code/modules/vehicles/hardpoints/support/support.dm +++ b/code/modules/vehicles/hardpoints/support/support.dm @@ -1,6 +1,6 @@ /obj/item/hardpoint/support name = "support hardpoint" - desc = "Support module, providing passive buffs and active abilities" + desc = "Support module, providing passive buffs and active abilities." slot = HDPT_SUPPORT hdpt_layer = HDPT_LAYER_SUPPORT diff --git a/code/modules/vehicles/hardpoints/wheels/locomotion.dm b/code/modules/vehicles/hardpoints/wheels/locomotion.dm index a0e57c3e97d4..c6090c7641cb 100644 --- a/code/modules/vehicles/hardpoints/wheels/locomotion.dm +++ b/code/modules/vehicles/hardpoints/wheels/locomotion.dm @@ -1,6 +1,6 @@ /obj/item/hardpoint/locomotion name = "locomotive aid hardpoint" - desc = "i help the vehicle move :)" + desc = "I help the vehicle move :)" gender = PLURAL // it's always wheels or treads damage_multiplier = 0.15 diff --git a/code/modules/vehicles/hardpoints/wheels/van_wheels.dm b/code/modules/vehicles/hardpoints/wheels/van_wheels.dm index b4b981ca1d5b..f2dce92c84b3 100644 --- a/code/modules/vehicles/hardpoints/wheels/van_wheels.dm +++ b/code/modules/vehicles/hardpoints/wheels/van_wheels.dm @@ -1,6 +1,6 @@ /obj/item/hardpoint/locomotion/van_wheels name = "vehicle wheels" - desc = "Integral to the movement of the van" + desc = "Integral to the movement of the van." icon = 'icons/obj/vehicles/hardpoints/van.dmi' icon_state = "tires" diff --git a/code/modules/vehicles/interior/areas.dm b/code/modules/vehicles/interior/areas.dm index 4a784c863fd5..84eba94d6860 100644 --- a/code/modules/vehicles/interior/areas.dm +++ b/code/modules/vehicles/interior/areas.dm @@ -5,7 +5,7 @@ icon = 'icons/turf/areas_interiors.dmi' icon_state = "interior" base_lighting_alpha = 255 - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOBURROW ambience_exterior = 'sound/ambience/vehicle_interior1.ogg' sound_environment = SOUND_ENVIRONMENT_ROOM diff --git a/code/modules/vehicles/interior/interactable/seats.dm b/code/modules/vehicles/interior/interactable/seats.dm index 7ab4419f2107..7048aa44ccc3 100644 --- a/code/modules/vehicles/interior/interactable/seats.dm +++ b/code/modules/vehicles/interior/interactable/seats.dm @@ -44,8 +44,8 @@ vehicle.set_seated_mob(seat, null) if(M.client) M.client.change_view(GLOB.world_view_size, vehicle) - M.client.pixel_x = 0 - M.client.pixel_y = 0 + M.client.set_pixel_x(0) + M.client.set_pixel_y(0) M.reset_view() else if(M.stat == DEAD) @@ -123,15 +123,24 @@ /obj/structure/bed/chair/comfy/vehicle/attackby(obj/item/W, mob/living/user) return -/obj/structure/bed/chair/comfy/vehicle/attack_alien(mob/living/carbon/xenomorph/X, dam_bonus) - - if(X.is_mob_incapacitated() || !Adjacent(X)) +/obj/structure/bed/chair/comfy/vehicle/attack_alien(mob/living/carbon/xenomorph/user) + if(user.is_mob_incapacitated() || !Adjacent(user)) return if(buckled_mob) - manual_unbuckle(X) + manual_unbuckle(user) return +/obj/structure/bed/chair/comfy/vehicle/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + if(!buckled_mob) + return TAILSTAB_COOLDOWN_NONE + manual_unbuckle(xeno) + playsound(src, 'sound/effects/metalhit.ogg', 25, 1) + xeno.visible_message(SPAN_DANGER("[xeno] smacks [src] with its tail!"), + SPAN_DANGER("We smack [src] with our tail!"), null, 5, CHAT_TYPE_XENO_COMBAT) + xeno.tail_stab_animation(src, blunt_stab) + return TAILSTAB_COOLDOWN_LOW + //custom vehicle seats for armored vehicles //spawners located in interior_landmarks @@ -181,8 +190,8 @@ vehicle.set_seated_mob(seat, null) if(M.client) M.client.change_view(GLOB.world_view_size, vehicle) - M.client.pixel_x = 0 - M.client.pixel_y = 0 + M.client.set_pixel_x(0) + M.client.set_pixel_y(0) else if(M.stat != CONSCIOUS) unbuckle() @@ -261,8 +270,8 @@ vehicle.set_seated_mob(seat, null) if(M.client) M.client.change_view(GLOB.world_view_size, vehicle) - M.client.pixel_x = 0 - M.client.pixel_y = 0 + M.client.set_pixel_x(0) + M.client.set_pixel_y(0) M.reset_view() else if(M.stat == DEAD) @@ -405,6 +414,18 @@ else deconstruct(FALSE) +/obj/structure/bed/chair/vehicle/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + if(unslashable) + return TAILSTAB_COOLDOWN_NONE + playsound(src, 'sound/effects/metalhit.ogg', 25, 1) + xeno.visible_message(SPAN_DANGER("[xeno] smashes [src] with its tail!"), + SPAN_DANGER("We smash [src] with our tail!"), null, 5, CHAT_TYPE_XENO_COMBAT) + if(!broken) + break_seat() + else + deconstruct(FALSE) + xeno.tail_stab_animation(src, blunt_stab) + return TAILSTAB_COOLDOWN_NORMAL /obj/structure/bed/chair/vehicle/attackby(obj/item/W, mob/living/user) if((iswelder(W) && broken)) diff --git a/code/modules/vehicles/interior/interactable/vendors.dm b/code/modules/vehicles/interior/interactable/vendors.dm index 347986af3b5a..da92070d9763 100644 --- a/code/modules/vehicles/interior/interactable/vendors.dm +++ b/code/modules/vehicles/interior/interactable/vendors.dm @@ -41,16 +41,20 @@ chem_refill = list( /obj/item/reagent_container/hypospray/autoinjector/bicaridine, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, - /obj/item/reagent_container/hypospray/autoinjector/adrenaline,, + /obj/item/reagent_container/hypospray/autoinjector/antitoxin, + /obj/item/reagent_container/hypospray/autoinjector/adrenaline, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, /obj/item/reagent_container/hypospray/autoinjector/kelotane, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, + /obj/item/reagent_container/hypospray/autoinjector/peridaxon, /obj/item/reagent_container/hypospray/autoinjector/tramadol, /obj/item/reagent_container/hypospray/autoinjector/tricord, + /obj/item/reagent_container/hypospray/autoinjector/skillless, /obj/item/reagent_container/hypospray/autoinjector/skillless/tramadol, /obj/item/reagent_container/hypospray/autoinjector/bicaridine/skillless, + /obj/item/reagent_container/hypospray/autoinjector/antitoxin/skillless, /obj/item/reagent_container/hypospray/autoinjector/kelotane/skillless, /obj/item/reagent_container/hypospray/autoinjector/tramadol/skillless, /obj/item/reagent_container/hypospray/autoinjector/tricord/skillless, @@ -67,13 +71,15 @@ list("AUTOINJECTORS", -1, null, null), list("Autoinjector (Bicaridine)", floor(scale * 3), /obj/item/reagent_container/hypospray/autoinjector/bicaridine, VENDOR_ITEM_REGULAR), + list("Autoinjector (Dylovene)", floor(scale * 3), /obj/item/reagent_container/hypospray/autoinjector/antitoxin, VENDOR_ITEM_REGULAR), list("Autoinjector (Dexalin+)", floor(scale * 3), /obj/item/reagent_container/hypospray/autoinjector/dexalinp, VENDOR_ITEM_REGULAR), list("Autoinjector (Epinephrine)", floor(scale * 3), /obj/item/reagent_container/hypospray/autoinjector/adrenaline, VENDOR_ITEM_REGULAR), list("Autoinjector (Inaprovaline)", floor(scale * 3), /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, VENDOR_ITEM_REGULAR), list("Autoinjector (Kelotane)", floor(scale * 3), /obj/item/reagent_container/hypospray/autoinjector/kelotane, VENDOR_ITEM_REGULAR), list("Autoinjector (Oxycodone)", floor(scale * 3), /obj/item/reagent_container/hypospray/autoinjector/oxycodone, VENDOR_ITEM_REGULAR), + list("Autoinjector (Peridaxon)", floor(scale * 3), /obj/item/reagent_container/hypospray/autoinjector/peridaxon, VENDOR_ITEM_REGULAR), list("Autoinjector (Tramadol)", floor(scale * 3), /obj/item/reagent_container/hypospray/autoinjector/tramadol, VENDOR_ITEM_REGULAR), - list("Autoinjector (Tricord)", floor(scale * 3), /obj/item/reagent_container/hypospray/autoinjector/tricord, VENDOR_ITEM_REGULAR), + list("Autoinjector (Tricordrazine)", floor(scale * 3), /obj/item/reagent_container/hypospray/autoinjector/tricord, VENDOR_ITEM_REGULAR), list("MEDICAL UTILITIES", -1, null, null), list("Surgical Line", floor(scale * 2), /obj/item/tool/surgery/surgical_line, VENDOR_ITEM_REGULAR), @@ -117,7 +123,7 @@ hackable = FALSE density = FALSE - vend_flags = VEND_CLUTTER_PROTECTION | VEND_LIMITED_INVENTORY | VEND_TO_HAND | VEND_LOAD_AMMO_BOXES + vend_flags = VEND_CLUTTER_PROTECTION | VEND_LIMITED_INVENTORY | VEND_TO_HAND | VEND_LOAD_AMMO_BOXES | VEND_UNIFORM_AUTOEQUIP // autoequip i guess since you can pack this thing with armor /obj/structure/machinery/cm_vending/sorted/vehicle_supply/vend_fail() return diff --git a/code/modules/vehicles/interior/interior.dm b/code/modules/vehicles/interior/interior.dm index 6aaeb6439176..15447028853c 100644 --- a/code/modules/vehicles/interior/interior.dm +++ b/code/modules/vehicles/interior/interior.dm @@ -202,6 +202,8 @@ var/mob/living/M if(ismob(A)) M = A + for(var/datum/action/minimap/user_map in M.actions) + user_map.override_locator(exterior) else var/mobs_amount = 0 for(M in A) @@ -298,6 +300,11 @@ to_chat(A, SPAN_WARNING("Something is blocking the exit!")) return FALSE + var/mob/living/mob + if(ismob(A)) + mob = A + for(var/datum/action/minimap/user_map in mob.actions) + user_map.clear_locator_override() A.forceMove(get_turf(exit_turf)) update_passenger_count() return TRUE @@ -335,3 +342,18 @@ for(var/turf/T as anything in block(bounds[1], bounds[2])) for(var/obj/effect/landmark/interior/L in T) L.on_load(src) + +/datum/interior/proc/drop_human_bodies(turf/drop_turf) + if((passengers_taken_slots == 0) && (revivable_dead_taken_slots == 0)) + return // no one of interest inside + + var/count = 0 + + for(var/mob/living/L as anything in get_passengers()) + if(L.stat == DEAD) + L.forceMove(drop_turf) // Drop the bodies on the floor + count += 1 + + if(count > 0) + exterior.visible_message(SPAN_NOTICE("The sudden jolt throws \the [count == 1 ? "body" : "bodies"] out of \the [exterior]")) + update_passenger_count() diff --git a/code/modules/vehicles/interior/interior_landmarks.dm b/code/modules/vehicles/interior/interior_landmarks.dm index b996bcd65650..b57defea5f4b 100644 --- a/code/modules/vehicles/interior/interior_landmarks.dm +++ b/code/modules/vehicles/interior/interior_landmarks.dm @@ -240,7 +240,7 @@ Phone.pixel_x = pixel_x Phone.pixel_y = pixel_y Phone.phone_category = "Vehicles" - Phone.phone_id = replacetext(Phone.phone_id, "\improper", "") // this has to be done because phone IDs need to be the same as their display name (\improper doesn't display, obviously) + Phone.phone_id = I.map_template.name qdel(src) diff --git a/code/modules/vehicles/multitile/multitile.dm b/code/modules/vehicles/multitile/multitile.dm index 398983035837..59cf25cf84d8 100644 --- a/code/modules/vehicles/multitile/multitile.dm +++ b/code/modules/vehicles/multitile/multitile.dm @@ -167,6 +167,10 @@ icon_state = "cargo_engine" var/move_on_turn = FALSE + ///Minimap flags to use for this vehicle + var/minimap_flags = MINIMAP_FLAG_USCM + ///Minimap iconstate to use for this vehicle + var/minimap_icon_state /obj/vehicle/multitile/Initialize() . = ..() @@ -188,6 +192,7 @@ healthcheck() update_icon() + update_minimap_icon() GLOB.all_multi_vehicles += src @@ -375,7 +380,7 @@ H.deactivate() H.remove_buff(src) else - all_broken = 0 //if something exists but isnt broken + all_broken = 0 //if something exists but isn't broken if(all_broken) toggle_cameras_status() @@ -384,6 +389,7 @@ //vehicle is dead, no more lights if(health <= 0 && lighting_holder.light_range) lighting_holder.set_light_on(FALSE) + update_minimap_icon() else if(!lighting_holder.light) lighting_holder.set_light_on(TRUE) @@ -459,3 +465,13 @@ SIGNAL_HANDLER forceMove(get_turf(mover)) + +///Updates the vehicles minimap icon +/obj/vehicle/multitile/proc/update_minimap_icon(modules_broken) + if(!minimap_icon_state) + return + SSminimaps.remove_marker(src) + minimap_icon_state = initial(minimap_icon_state) + if(health <= 0 || modules_broken) + minimap_icon_state += "_wreck" + SSminimaps.add_marker(src, minimap_flags, image('icons/ui_icons/map_blips_large.dmi', null, minimap_icon_state, HIGH_FLOAT_LAYER)) diff --git a/code/modules/vehicles/multitile/multitile_bump.dm b/code/modules/vehicles/multitile/multitile_bump.dm index 495b353edc38..d24b9cb15f7e 100644 --- a/code/modules/vehicles/multitile/multitile_bump.dm +++ b/code/modules/vehicles/multitile/multitile_bump.dm @@ -133,7 +133,7 @@ qdel(src) return TRUE -/obj/structure/reagent_dispensers/fueltank/handle_vehicle_bump(obj/vehicle/multitile/V) +/obj/structure/reagent_dispensers/tank/fuel/handle_vehicle_bump(obj/vehicle/multitile/V) reagents.source_mob = V.seats[VEHICLE_DRIVER] if(reagents.handle_volatiles()) if(V.seats[VEHICLE_DRIVER]) diff --git a/code/modules/vehicles/multitile/multitile_hardpoints.dm b/code/modules/vehicles/multitile/multitile_hardpoints.dm index 4654b669cc82..d40749aedcf5 100644 --- a/code/modules/vehicles/multitile/multitile_hardpoints.dm +++ b/code/modules/vehicles/multitile/multitile_hardpoints.dm @@ -50,6 +50,7 @@ //What to do if all ofthe installed modules have been broken /obj/vehicle/multitile/proc/handle_all_modules_broken() + update_minimap_icon(TRUE) return /obj/vehicle/multitile/proc/deactivate_all_hardpoints() @@ -219,6 +220,7 @@ HP.on_install(src) HP.rotate(turning_angle(HP.dir, dir)) + update_minimap_icon() update_icon() //General proc for taking off hardpoints diff --git a/code/modules/vehicles/multitile/multitile_interaction.dm b/code/modules/vehicles/multitile/multitile_interaction.dm index d90a7435652e..28fc90ea9ecb 100644 --- a/code/modules/vehicles/multitile/multitile_interaction.dm +++ b/code/modules/vehicles/multitile/multitile_interaction.dm @@ -197,6 +197,7 @@ health = min(health + max_hp/100 * (5 / amount_fixed_adjustment), max_hp) if(!lighting_holder.light) + update_minimap_icon() lighting_holder.set_light_on(TRUE) if(WT) @@ -214,7 +215,7 @@ lighting_holder.set_light_range(vehicle_light_range) toggle_cameras_status(TRUE) update_icon() - user.visible_message(SPAN_NOTICE("[user] finishes [repair_message] on \the [src]."), SPAN_NOTICE("You finish [repair_message] on \the [src]. Hull integrity is at [SPAN_HELPFUL(100.0*health/max_hp)]%. ")) + user.visible_message(SPAN_NOTICE("[user] finishes [repair_message] on \the [src]."), SPAN_NOTICE("You finish [repair_message] on \the [src]. Hull integrity is at [SPAN_HELPFUL(100.0*health/max_hp)]%.")) return //Special case for entering the vehicle without using the verb @@ -261,7 +262,7 @@ if(X.caste == XENO_CASTE_RAVAGER || X.caste == XENO_CASTE_QUEEN) damage_mult = 2 - //Frenzy auras stack in a way, then the raw value is multipled by two to get the additive modifier + //Frenzy auras stack in a way, then the raw value is multiplied by two to get the additive modifier if(X.frenzy_aura > 0) damage += (X.frenzy_aura * FRENZY_DAMAGE_MULTIPLIER) @@ -505,7 +506,7 @@ currently_dragged = G.grabbed_thing if(currently_dragged != dragged_atom) - to_chat(user, SPAN_WARNING("You stop fiting [dragged_atom] inside \the [src]!")) + to_chat(user, SPAN_WARNING("You stop fitting [dragged_atom] inside \the [src]!")) return var/success = interior.enter(dragged_atom, entrance_used) diff --git a/code/modules/vehicles/multitile/multitile_movement.dm b/code/modules/vehicles/multitile/multitile_movement.dm index f38ddb10327a..b4faf7f5ba9a 100644 --- a/code/modules/vehicles/multitile/multitile_movement.dm +++ b/code/modules/vehicles/multitile/multitile_movement.dm @@ -81,6 +81,9 @@ last_move_dir = direction + if(force && (health <= 0)) // Broken and forced movement (currently only xenos) + interior.drop_human_bodies(old_turf) + return TRUE // Rotates the vehicle by deg degrees if possible diff --git a/code/modules/vehicles/multitile/multitile_verbs.dm b/code/modules/vehicles/multitile/multitile_verbs.dm index f9d786c87d7a..df53803f9f78 100644 --- a/code/modules/vehicles/multitile/multitile_verbs.dm +++ b/code/modules/vehicles/multitile/multitile_verbs.dm @@ -131,7 +131,7 @@ /obj/vehicle/multitile/tgui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) - ui = new(user, src, "VehicleStatus", "[name]") + ui = new(user, src, "VehicleStatus", "[capitalize(name)]") ui.open() /obj/vehicle/multitile/ui_data(mob/user) diff --git a/code/modules/vehicles/powerloader.dm b/code/modules/vehicles/powerloader.dm index 09b44b63a280..6912c5c2b1bd 100644 --- a/code/modules/vehicles/powerloader.dm +++ b/code/modules/vehicles/powerloader.dm @@ -362,6 +362,25 @@ return XENO_NONCOMBAT_ACTION +/obj/structure/powerloader_wreckage/handle_tail_stab(mob/living/carbon/xenomorph/xeno, blunt_stab) + if(unslashable || health <= 0) + return TAILSTAB_COOLDOWN_NONE + if(xeno.mob_size < MOB_SIZE_XENO) + to_chat(xeno, SPAN_XENOWARNING("You're too small to do any significant damage to this vehicle!")) + return XENO_NO_DELAY_ACTION + playsound(src, 'sound/effects/metalhit.ogg', 25, 1) + var/damage = (xeno.melee_vehicle_damage + rand(-5,5)) + health -= damage + if(health <= 0) + xeno.visible_message(SPAN_DANGER("[xeno] destroys [src] with its tail!"), + SPAN_DANGER("We destroy [src] with our tail!"), null, 5, CHAT_TYPE_XENO_COMBAT) + deconstruct(FALSE) + else + xeno.visible_message(SPAN_DANGER("[xeno] strikes [src] with its tail!"), + SPAN_DANGER("We strike [src] with our tail!"), null, 5, CHAT_TYPE_XENO_COMBAT) + xeno.tail_stab_animation(src, blunt_stab) + return TAILSTAB_COOLDOWN_NORMAL + /obj/structure/powerloader_wreckage/jd name = "\improper John Deere 4300 Power Loader wreckage" icon_state = "wreck_jd" diff --git a/code/modules/vehicles/souto_mobile.dm b/code/modules/vehicles/souto_mobile.dm index 48fd545b5576..4daa522f2927 100644 --- a/code/modules/vehicles/souto_mobile.dm +++ b/code/modules/vehicles/souto_mobile.dm @@ -10,6 +10,7 @@ . = ..() var/image/I = new(icon = 'icons/obj/vehicles/vehicles.dmi', icon_state = "soutomobile_overlay", layer = ABOVE_MOB_LAYER) //over mobs overlays += I + AddElement(/datum/element/corp_label/souta) /obj/vehicle/souto/manual_unbuckle(mob/user) if(buckled_mob && buckled_mob != user) diff --git a/code/modules/vehicles/tank/tank.dm b/code/modules/vehicles/tank/tank.dm index 981c37c4ba50..322d87aecac3 100644 --- a/code/modules/vehicles/tank/tank.dm +++ b/code/modules/vehicles/tank/tank.dm @@ -74,6 +74,7 @@ ) explosive_resistance = 400 + minimap_icon_state = "tank" /obj/vehicle/multitile/tank/initialize_cameras(change_tag = FALSE) if(!camera) diff --git a/code/modules/vehicles/train.dm b/code/modules/vehicles/train.dm index 3e6a2f087b99..dab12ebf1ca9 100644 --- a/code/modules/vehicles/train.dm +++ b/code/modules/vehicles/train.dm @@ -121,7 +121,7 @@ setDir(lead.dir) if(user && display_to_chat) - to_chat(user, SPAN_NOTICE(" You hitch [src] to [T].")) + to_chat(user, SPAN_NOTICE("You hitch [src] to [T].")) update_stats() @@ -140,7 +140,7 @@ lead.update_stats() if(display_to_chat) - to_chat(user, SPAN_NOTICE(" You unhitch [src] from [lead].")) + to_chat(user, SPAN_NOTICE("You unhitch [src] from [lead].")) lead = null update_stats() diff --git a/colonialmarines.dme b/colonialmarines.dme index 3716b90d072e..d90db21f9d4c 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -21,6 +21,7 @@ #include "code\stylesheet.dm" #include "code\__DEFINES\__game.dm" #include "code\__DEFINES\__rust_g.dm" +#include "code\__DEFINES\__rust_g_redis-pubsub.dm" #include "code\__DEFINES\__spacemandmm.dm" #include "code\__DEFINES\_bitfields.dm" #include "code\__DEFINES\_click.dm" @@ -67,8 +68,10 @@ #include "code\__DEFINES\guns.dm" #include "code\__DEFINES\hijack.dm" #include "code\__DEFINES\html.dm" +#include "code\__DEFINES\html_assistant.dm" #include "code\__DEFINES\hud.dm" #include "code\__DEFINES\human.dm" +#include "code\__DEFINES\ipcheck.dm" #include "code\__DEFINES\job.dm" #include "code\__DEFINES\keybinding.dm" #include "code\__DEFINES\language.dm" @@ -270,6 +273,7 @@ #include "code\controllers\subsystem\autofire.dm" #include "code\controllers\subsystem\cellauto.dm" #include "code\controllers\subsystem\chat.dm" +#include "code\controllers\subsystem\cmtv.dm" #include "code\controllers\subsystem\communications.dm" #include "code\controllers\subsystem\dcs.dm" #include "code\controllers\subsystem\decorator.dm" @@ -286,6 +290,7 @@ #include "code\controllers\subsystem\influxstats.dm" #include "code\controllers\subsystem\input.dm" #include "code\controllers\subsystem\interior.dm" +#include "code\controllers\subsystem\ipcheck.dm" #include "code\controllers\subsystem\item_cleanup.dm" #include "code\controllers\subsystem\lighting.dm" #include "code\controllers\subsystem\machinery.dm" @@ -353,6 +358,7 @@ #include "code\datums\callback.dm" #include "code\datums\changelog.dm" #include "code\datums\chat_payload.dm" +#include "code\datums\cmtv_commands.dm" #include "code\datums\combat_personalized.dm" #include "code\datums\computerfiles.dm" #include "code\datums\crew_manifest.dm" @@ -365,6 +371,7 @@ #include "code\datums\event_info_text.dm" #include "code\datums\fluff_emails.dm" #include "code\datums\global_variables.dm" +#include "code\datums\highlight_keywords_payload.dm" #include "code\datums\http.dm" #include "code\datums\internet_media.dm" #include "code\datums\lazy_template.dm" @@ -381,6 +388,7 @@ #include "code\datums\research_upgrade_datum.dm" #include "code\datums\shuttles.dm" #include "code\datums\soundOutput.dm" +#include "code\datums\tacmap_viewer.dm" #include "code\datums\tgs_event_handler.dm" #include "code\datums\vehicles.dm" #include "code\datums\weakrefs.dm" @@ -443,6 +451,7 @@ #include "code\datums\components\shimmy_around.dm" #include "code\datums\components\speed_modifier.dm" #include "code\datums\components\status_effect_component.dm" +#include "code\datums\components\tacmap.dm" #include "code\datums\components\temporary_mute.dm" #include "code\datums\components\toxin_buildup.dm" #include "code\datums\components\tutorial_status.dm" @@ -450,6 +459,9 @@ #include "code\datums\components\weed_food.dm" #include "code\datums\components\autofire\_automated_fire.dm" #include "code\datums\components\autofire\autofire.dm" +#include "code\datums\components\riding\riding.dm" +#include "code\datums\components\riding\riding_mob.dm" +#include "code\datums\components\riding\riding_vehicle.dm" #include "code\datums\components\xeno\hivemind_interference.dm" #include "code\datums\components\xeno\shield_slash.dm" #include "code\datums\components\xeno\xeno_daze.dm" @@ -517,8 +529,10 @@ #include "code\datums\elements\bloody_feet.dm" #include "code\datums\elements\drop_retrieval.dm" #include "code\datums\elements\light_blocking.dm" +#include "code\datums\elements\manufacturer_logos.dm" #include "code\datums\elements\mouth_drop_item.dm" #include "code\datums\elements\poor_eyesight_correction.dm" +#include "code\datums\elements\riding.dm" #include "code\datums\elements\strippable.dm" #include "code\datums\elements\suturing.dm" #include "code\datums\elements\yautja_tracked_item.dm" @@ -581,8 +595,6 @@ #include "code\datums\emergency_calls\pred_hunt\hunting_calls.dm" #include "code\datums\entities\chemical_information.dm" #include "code\datums\entities\clans.dm" -#include "code\datums\entities\discord_identifier.dm" -#include "code\datums\entities\discord_link.dm" #include "code\datums\entities\login_triplets.dm" #include "code\datums\entities\map_votes.dm" #include "code\datums\entities\mc_controller.dm" @@ -596,6 +608,7 @@ #include "code\datums\entities\player_sticky_ban.dm" #include "code\datums\entities\player_times.dm" #include "code\datums\entities\ticket.dm" +#include "code\datums\entities\twitch_link.dm" #include "code\datums\entities\logs\player_times_log.dm" #include "code\datums\factions\clf.dm" #include "code\datums\factions\cmb.dm" @@ -621,6 +634,7 @@ #include "code\datums\keybinding\carbon.dm" #include "code\datums\keybinding\client.dm" #include "code\datums\keybinding\communication.dm" +#include "code\datums\keybinding\custom.dm" #include "code\datums\keybinding\emote.dm" #include "code\datums\keybinding\human.dm" #include "code\datums\keybinding\human_combat.dm" @@ -667,6 +681,7 @@ #include "code\datums\paygrades\factions\uscm\provost.dm" #include "code\datums\paygrades\factions\wy\commando.dm" #include "code\datums\paygrades\factions\wy\pmc.dm" +#include "code\datums\paygrades\factions\wy\security.dm" #include "code\datums\paygrades\factions\wy\wy.dm" #include "code\datums\redis\redis_message.dm" #include "code\datums\redis\callbacks\_redis_callback.dm" @@ -717,6 +732,7 @@ #include "code\datums\statistics\random_facts\kills_fact.dm" #include "code\datums\statistics\random_facts\random_fact.dm" #include "code\datums\statistics\random_facts\revives_fact.dm" +#include "code\datums\statistics\random_facts\steps_fact.dm" #include "code\datums\status_effects\_status_effect.dm" #include "code\datums\status_effects\_status_effect_helpers.dm" #include "code\datums\status_effects\grouped_effect.dm" @@ -869,6 +885,7 @@ #include "code\game\jobs\job\antag\xeno\queen.dm" #include "code\game\jobs\job\antag\xeno\xenomorph.dm" #include "code\game\jobs\job\civilians\civilian.dm" +#include "code\game\jobs\job\civilians\other\corp_sec.dm" #include "code\game\jobs\job\civilians\other\liaison.dm" #include "code\game\jobs\job\civilians\other\mess_seargent.dm" #include "code\game\jobs\job\civilians\other\reporter.dm" @@ -925,6 +942,7 @@ #include "code\game\machinery\cell_charger.dm" #include "code\game\machinery\cloning.dm" #include "code\game\machinery\colony_floodlights.dm" +#include "code\game\machinery\communications_encryption.dm" #include "code\game\machinery\constructable_frame.dm" #include "code\game\machinery\cryo.dm" #include "code\game\machinery\cryopod.dm" @@ -1082,6 +1100,7 @@ #include "code\game\machinery\vending\vendor_types\crew\combat_correspondent.dm" #include "code\game\machinery\vending\vendor_types\crew\commanding_officer.dm" #include "code\game\machinery\vending\vendor_types\crew\corporate_liaison.dm" +#include "code\game\machinery\vending\vendor_types\crew\corporate_security.dm" #include "code\game\machinery\vending\vendor_types\crew\engineering.dm" #include "code\game\machinery\vending\vendor_types\crew\k9_synth.dm" #include "code\game\machinery\vending\vendor_types\crew\medical.dm" @@ -1246,6 +1265,7 @@ #include "code\game\objects\items\devices\radio\headset.dm" #include "code\game\objects\items\devices\radio\intercom.dm" #include "code\game\objects\items\devices\radio\listening_bugs.dm" +#include "code\game\objects\items\devices\radio\motion_sensor.dm" #include "code\game\objects\items\devices\radio\radio.dm" #include "code\game\objects\items\explosives\explosive.dm" #include "code\game\objects\items\explosives\mine.dm" @@ -1463,6 +1483,8 @@ #include "code\game\objects\structures\crates_lockers\closets\secure\scientist.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\secure_closets.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\security.dm" +#include "code\game\objects\structures\crates_lockers\closets\secure\emergency\emergency_closets.dm" +#include "code\game\objects\structures\crates_lockers\closets\secure\emergency\medical.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\guncabinet\guncabinet.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\guncabinet\level_blue.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\guncabinet\level_red.dm" @@ -1511,7 +1533,6 @@ #include "code\game\turfs\walls\wall_icon.dm" #include "code\game\turfs\walls\wall_types.dm" #include "code\game\turfs\walls\walls.dm" -#include "code\game\verbs\discord.dm" #include "code\game\verbs\ooc.dm" #include "code\game\verbs\preferences.dm" #include "code\game\verbs\records.dm" @@ -1628,6 +1649,7 @@ #include "code\modules\asset_cache\assets\lobby.dm" #include "code\modules\asset_cache\assets\medals.dm" #include "code\modules\asset_cache\assets\sevastopol.dm" +#include "code\modules\asset_cache\assets\stack_receipts.dm" #include "code\modules\asset_cache\assets\tgfont.dm" #include "code\modules\asset_cache\assets\tgui.dm" #include "code\modules\asset_cache\assets\vending.dm" @@ -1665,6 +1687,7 @@ #include "code\modules\client\client_defines.dm" #include "code\modules\client\client_procs.dm" #include "code\modules\client\country_flags.dm" +#include "code\modules\client\flavor_text_editor.dm" #include "code\modules\client\hair_picker.dm" #include "code\modules\client\loadout_picker.dm" #include "code\modules\client\player_details.dm" @@ -1799,7 +1822,6 @@ #include "code\modules\cm_preds\yaut_machines.dm" #include "code\modules\cm_preds\yaut_mask.dm" #include "code\modules\cm_preds\yaut_procs.dm" -#include "code\modules\cm_preds\yaut_shield.dm" #include "code\modules\cm_preds\yaut_weapons.dm" #include "code\modules\cm_tech\hologram.dm" #include "code\modules\cm_tech\research_memories.dm" @@ -1919,6 +1941,7 @@ #include "code\modules\gear_presets\uscm_medical.dm" #include "code\modules\gear_presets\uscm_police.dm" #include "code\modules\gear_presets\uscm_ship.dm" +#include "code\modules\gear_presets\uscm_synths.dm" #include "code\modules\gear_presets\whiteout.dm" #include "code\modules\gear_presets\wo.dm" #include "code\modules\gear_presets\wy.dm" @@ -2025,6 +2048,7 @@ #include "code\modules\mob\camera\imaginary_friend.dm" #include "code\modules\mob\dead\death.dm" #include "code\modules\mob\dead\observer\actions.dm" +#include "code\modules\mob\dead\observer\event_spawning.dm" #include "code\modules\mob\dead\observer\logout.dm" #include "code\modules\mob\dead\observer\observer.dm" #include "code\modules\mob\dead\observer\orbit.dm" @@ -2073,6 +2097,7 @@ #include "code\modules\mob\living\carbon\human\human_dummy.dm" #include "code\modules\mob\living\carbon\human\human_helpers.dm" #include "code\modules\mob\living\carbon\human\human_movement.dm" +#include "code\modules\mob\living\carbon\human\human_shields.dm" #include "code\modules\mob\living\carbon\human\human_stripping.dm" #include "code\modules\mob\living\carbon\human\inventory.dm" #include "code\modules\mob\living\carbon\human\life.dm" @@ -2169,6 +2194,8 @@ #include "code\modules\mob\living\carbon\xenomorph\abilities\crusher\crusher_macros.dm" #include "code\modules\mob\living\carbon\xenomorph\abilities\defender\defender_abilities.dm" #include "code\modules\mob\living\carbon\xenomorph\abilities\defender\defender_macros.dm" +#include "code\modules\mob\living\carbon\xenomorph\abilities\despoiler\despoiler_abilities.dm" +#include "code\modules\mob\living\carbon\xenomorph\abilities\despoiler\despoiler_macros.dm" #include "code\modules\mob\living\carbon\xenomorph\abilities\facehugger\facehugger_abilities.dm" #include "code\modules\mob\living\carbon\xenomorph\abilities\facehugger\facehugger_powers.dm" #include "code\modules\mob\living\carbon\xenomorph\abilities\hellhound\hellhound_abilities.dm" @@ -2205,6 +2232,7 @@ #include "code\modules\mob\living\carbon\xenomorph\castes\caste_datum.dm" #include "code\modules\mob\living\carbon\xenomorph\castes\Crusher.dm" #include "code\modules\mob\living\carbon\xenomorph\castes\Defender.dm" +#include "code\modules\mob\living\carbon\xenomorph\castes\Despoiler.dm" #include "code\modules\mob\living\carbon\xenomorph\castes\Drone.dm" #include "code\modules\mob\living\carbon\xenomorph\castes\Facehugger.dm" #include "code\modules\mob\living\carbon\xenomorph\castes\Hellhound.dm" @@ -2333,6 +2361,7 @@ #include "code\modules\paperwork\photocopier.dm" #include "code\modules\paperwork\photography.dm" #include "code\modules\paperwork\prefab_papers.dm" +#include "code\modules\paperwork\punch_card.dm" #include "code\modules\paperwork\prefab_papers\uacqs.dm" #include "code\modules\paperwork\prefab_papers\provost\high_command\arrest_warrant.dm" #include "code\modules\paperwork\prefab_papers\provost\high_command\custody_transfer.dm" @@ -2490,6 +2519,7 @@ #include "code\modules\surgery\bones.dm" #include "code\modules\surgery\brainrepair.dm" #include "code\modules\surgery\chestburster.dm" +#include "code\modules\surgery\eschar.dm" #include "code\modules\surgery\eye.dm" #include "code\modules\surgery\generic.dm" #include "code\modules\surgery\headreattach.dm" @@ -2529,6 +2559,7 @@ #include "code\modules\tgui\tgui_window.dm" #include "code\modules\tgui\states\admin.dm" #include "code\modules\tgui\states\always.dm" +#include "code\modules\tgui\states\computer.dm" #include "code\modules\tgui\states\conscious.dm" #include "code\modules\tgui\states\contained.dm" #include "code\modules\tgui\states\debug.dm" diff --git a/config/example/config.txt b/config/example/config.txt index 27980e917e3e..501e33c4fafc 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -265,3 +265,12 @@ CLIENT_ERROR_VERSION 514 #GITHUB_APP_API #REPO_NAME cmss13 #ORG cmss13-devs + +# Which CIDs will not be considered for stickybans. This is the default CID that Wine spits out, +# and for the purpose of not default banning all Linux players, we'll just ignore it. +# People can spoof this CID and ignore that element of stickybans forever, but they can equally +# just keep generating new ones. Kind of doesn't matter. +IGNORED_CIDS 4055623708 + +## Extra line of info to append to showrevinfo verb +# CODE_MODIFICATIONS_MESSAGE Additional code modifications available at https://google.com. diff --git a/config/example/game_options.txt b/config/example/game_options.txt index 2936f8a2a676..4cd6e44ec1e6 100644 --- a/config/example/game_options.txt +++ b/config/example/game_options.txt @@ -3,12 +3,6 @@ ## level of health at which a mob goes into continual shock (soft crit) HEALTH_THRESHOLD_SOFTCRIT 0 -## level of health at which a mob becomes unconscious (crit) -HEALTH_THRESHOLD_CRIT -50 - -## level of health at which a mob becomes dead -HEALTH_THRESHOLD_DEAD -100 - ## Determines whether bones can be broken through excessive damage to the organ ## 0 means bones can't break, 1 means they can BONES_CAN_BREAK 1 @@ -52,6 +46,25 @@ METROID_DELAY 0 ANIMAL_DELAY 0 +### Announcement Garbling ### +## The rate of comms clarity percent decay per fire of SSradio (30 SECONDS) +ANNOUNCEMENT_CLARITY_DECAY 2.5 + +## The grace period in deciseconds given to solve encryption challenges (before they decay) +ANNOUNCEMENT_CHALLENGE_GRACE 600 + +## String challenges that should all be similar in length. +## Any non-alpha character will be treated as a -. Any longer than the first will be trimmed. +ANNOUNCEMENT_CHALLENGES WEYLAND +ANNOUNCEMENT_CHALLENGES -YUTANI + +## The minimum clarity percent for overwatch and announcements if transmitted to a z without coms +ANNOUNCEMENT_MIN_CLARITY 45 + +## The maximum clarity percent for overwatch and announcements if transmitted to a z without coms +ANNOUNCEMENT_MAX_CLARITY 95 + + ### Miscellaneous ### ## Config options which, of course, don't fit into previous categories. @@ -60,4 +73,5 @@ ANIMAL_DELAY 0 #USE_LOYALTY_IMPLANTS ## Block nuclear device invocation until more marines than this percentage are alive. (0-100) -nuclear_lock_marines_percentage 0 +NUCLEAR_LOCK_MARINES_PERCENTAGE 0 + diff --git a/dependencies.sh b/dependencies.sh index ba8b471a99ba..ed058f1d2c08 100644 --- a/dependencies.sh +++ b/dependencies.sh @@ -8,11 +8,14 @@ export BYOND_MAJOR=516 export BYOND_MINOR=1661 #rust_g git tag -export RUST_G_VERSION=3.3.0 +export RUST_G_VERSION=4.2.0 #node version export NODE_VERSION_LTS=22.14.0 +# Bun version +export BUN_VERSION=1.3.5 + # SpacemanDMM git tag export SPACEMAN_DMM_VERSION=suite-1.11 diff --git a/html/browser/punchcard.css b/html/browser/punchcard.css new file mode 100644 index 000000000000..d554aa566cac --- /dev/null +++ b/html/browser/punchcard.css @@ -0,0 +1,47 @@ +:root { + --bg-color: #272727; +} + +body.paper { + background-color: var(--bg-color); +} + +div.punchcard-container { + position: relative; +} + +table.punchcard { + position: absolute; + left: 40px; + top: 45px; + border-spacing: 8px; + table-layout: fixed; + width: max-content; +} + +tr.punchcard { + height: 8.8px; +} + +td.punchspacer { + width: 5.5px; +} + +td.punchslot { + width: 25px; +} + +td.punched { + background-color: var(--bg-color); + background-repeat: no-repeat; + background-size: 100% 100%; +} + +td.punchmargin { + width: 60px; + max-width: 60px; + overflow: clip; + vertical-align: top; + writing-mode: vertical-rl; + text-orientation: mixed; +} diff --git a/html/changelog.css b/html/changelog.css index faac51ddf1ee..8ca2c8609661 100644 --- a/html/changelog.css +++ b/html/changelog.css @@ -15,17 +15,19 @@ a img {border:none;} .tweak {background-image:url(wrench-screwdriver.png)} .soundadd {background-image:url(music-plus.png)} .sounddel {background-image:url(music-minus.png)} +.soundtweak {background-image:url(wrench-screwdriver.png)} .rscdel {background-image:url(cross-circle.png)} .rscadd {background-image:url(tick-circle.png)} .imageadd {background-image:url(image-plus.png)} .imagedel {background-image:url(image-minus.png)} +.imagetweak {background-image:url(wrench-screwdriver.png)} .spellcheck {background-image:url(spell-check.png)} .experiment {background-image:url(burn-exclamation.png)} .tgs {background-image:url(tg-notif.png)} .sansserif {font-family:Tahoma,sans-serif;font-size:18px;} .commit {margin-bottom:20px;font-size:105%;font-weight:normal;} .changes {list-style:none;margin:5px 0;padding:0 0 0 25px;font-size:1.2em;font-family: Tahoma,sans-serif;} -.date {margin:10px 0;color:#6666cc;border-bottom:2px solid #6666cc;width:60%;padding:2px 0;font-size:1.5em;font-weight:bold;} +.date {margin:10px 0;color:#6666cc;border-bottom:2px solid #6666cc;width:60%;padding:2px 0;font-size:1.5em;font-weight:bold;} .author {padding-left:10px;margin:0;font-weight:bold;font-size:1.35em;} .drop {cursor:pointer;border:1px solid #999;display:inline;font-size:1.35em;padding:1px 20px 1px 5px;line-height:16px;} .hidden {display:none;} @@ -34,4 +36,4 @@ a img {border:none;} .indrop img {margin-right:5px;vertical-align:middle;} .closed {background:url(chevron-expand.png) right center no-repeat;} .open {background:url(chevron.png) right center no-repeat;} -.lic {font-size:13.5px;} \ No newline at end of file +.lic {font-size:13.5px;} diff --git a/html/changelogs/archive/2025-09.yml b/html/changelogs/archive/2025-09.yml index bbee0cc1250e..102ea61fea2b 100644 --- a/html/changelogs/archive/2025-09.yml +++ b/html/changelogs/archive/2025-09.yml @@ -101,3 +101,285 @@ - imageadd: M56D got inhands for the gun itself and the gun mount FloranOtten: - rscdel: You can no longer throw people upstairs. +2025-09-12: + FloranOtten: + - bugfix: z level throw restriction only applies to human throwing. + zzzmike: + - balance: neurocryogenic+cardiostabilizing knocks down and stuns rather than knocks + out +2025-09-13: + BasilHerb: + - rscadd: Added a minimum floor for most fun facts. + - rscadd: Re-introduces the 'calories burned' fun fact. + Red-byte3D: + - bugfix: Spit overlays no longer get added on when you chose an ability after you + die or are knocked down + cuberound: + - bugfix: marines hauled by xeno no longer take fall damage + - balance: prevents huggers from hugging across z levels + - balance: pounces are one tile shorter when going up a z level + - bugfix: fixes being unable to pounce/throw stuff up a z level when next to an + edge + - bugfix: fixes majority of issues with looking up not being updated on movement, + report any remaining issues + - bugfix: crossing z level ends looking up correctly +2025-09-14: + TheGamerdk: + - balance: High impact M1911 bullets cause knockback on-par with Mateba and Deagle. + cuberound: + - bugfix: BRUTE no longer messes up looking down +2025-09-15: + DoguhanOzgurAkca: + - maptweak: Sorokyne LZ2 weedkiller is bigger now + Drathek: + - bugfix: Fixed runtimes caused by playable huggers hugging + FebrezeNinja: + - bugfix: ARC phone now shows up as "ARC" in the Vehicles phone list. + zzzmike: + - bugfix: warden headset added to warden vendor +2025-09-16: + Kashargul: + - code_imp: replaces yarn with bun +2025-09-17: + Joe Lampost: + - rscadd: Updates the messages sent for the hunting ground and youngblood ERTs +2025-09-18: + HaultyAnonie: + - bugfix: Fixed clocks outputting "the" twice on examine. +2025-09-19: + cuberound: + - bugfix: extra (shotgun) projectiles are fired on the same z level as the main + shot +2025-09-21: + Drathek: + - bugfix: Fix some busted browse calls displaying as text instead of html + - bugfix: Fixed medical laptop UI crashing when someone has been gibbed + - code_imp: Added a lint for optimization of range, orange, hearers, and ohearers + HaultyAnonie: + - bugfix: Fixed a typo in RMC shield's description. + Nanu: + - maptweak: Almayer internals has more temphull walls now to hinder the evil dwarfs + from turning it into swiss cheese before hijack occurs. + Puckaboo2: + - imageadd: All variants of undershirts now camo-conform to all maps + - imageadd: All variants of undershirts, bras, and underwear now come in black + - rscdel: You can no longer choose an underwear camo color that does not match the + current map. + Steelpoint, dimdimich1996: + - rscadd: Adds a new set of UPP cargo vendor and table sprites to the game. Sprite + credit to dimdimich1996. + - mapadd: Adds the new UPP cargo vendors and tables to the SSV Rostock, the UPP + ship. + - maptweak: Tweaked some personal vendor offsets on the SSV Rostock. This should + fix some minor issues such as the Political Officer having to climb a table + to exit their quarters. + - maptweak: Adds a wall mounted telephone to the UPP requisition department. + halander1: + - code_imp: Modified APS trait to give span_notices when processing telling you + it is doing something. Also gives a notice when you finally kill the larva + - code_imp: Modifies the handling of stasis bags to check for an APS chem and notifies + the player of the incompatibility with lore compatible text. + realforest2001: + - bugfix: Fixed unintended access to Landing Zone, Laser Targets and WY cameras. + - bugfix: Fixes a runtime with candles updating icons. + - qol: Repathed the squadhud icon file into separate faction files. + zzzmike: + - rscdel: Removes anti-capitalist vendor slogan from USCM vendor + - qol: hivemind collapse warning now includes the time remaining when there's less + than a minute left + - bugfix: general quarters spam is now prevented (except if admins do it) + - qol: If general quarters is on cooldown, you'll now set red alert (if it wasn't + set already) by attempting to call general quarters. + - admin: logging for general quarters and red alert is now separate +2025-09-22: + BirdLover88: + - rscadd: Extract data when occupying a mob and set highlight keywords + - ui: Add keyword menu to chat highlight menu + DarkLordCabbage: + - rscadd: Adds the ability to fill the MS-11 Smart Refill Tank in the pressurized + chemical dispensers + Drathek, KornFlaks, ihatethisengine: + - bugfix: Forbid slashing/harming setting now works + - refactor: Hive permissions are now flags + - qol: Hive permission toggles are now accessible in Manage the Hive for the queen + and the input selectors now preselect the current hive setting + - code_imp: Cleaned up various single variable usage and autodoc comments + - admin: Hives can have permission toggles locked (which prevents queens from changing + them and prevents reversion on queen death) + Red-byte3D: + - rscadd: Added a new Fortification Boon that allows xenomorphs to boost their structures. + - rscadd: Pylons, Plasma trees recovery nodes and xenomorph resin walls (not doors) + will now regenerate their health when under the effects of the "Fortification + Boon" + - rscadd: Plasma tree and recovery nodes have increased recovery while under the + effects of "Fortification Boon" + - rscadd: Egg morphers now generate huggers at 30 seconds per hugger while boosted. + Zenith: + - rscadd: Added Kutjevo LZ1 insert. + - rscadd: Added small Soro insert. + - maptweak: Added Kutjevo south facility extension, opening up a route into the + caves with flanking potential for both Marines and Xenos. + - imageadd: Adds bodybag pile sprites & large stain decals. + benrobey: + - bugfix: fixed groundside xenos not getting correctly set to forsaken hive after + hijack + jupyterkat: + - rscadd: lights now get dimmer across zlevels + - refactor: optimized lights + realforest2001: + - rscadd: Added Radio-Alert Motion Sensors. They will be available to MPs, WY, + CLF, UPP, TWE and CIA. + - rscadd: They are activated by a security tuner (no skills required) and disabled + the same way. Radio/Access can be changed with an ID card if you have access + already. + - rscadd: Added an internal camera console to the Intranet Console. + - rscadd: Added a WY camera subtype. + - bugfix: Fixes WY Director access to the Intranet Console. + - rscadd: Added Document Printer. +2025-09-23: + Venuska1117: + - bugfix: Fruit balloon alert now only trigger after consuming fruit, instead for + every not related Destroy() proc call. + Zenith, cuberound, dimdimich1996: + - rscadd: Added new fences fence types & fence doors. + - imageadd: Replaced existing fence sprites & added new fence types with doors. + - soundadd: Added new fence hit sounds & fence door opening sounds. + - maptweak: Added new fence types to LV & Soro. + - maptweak: Soro map tweaks to comms areas, cleaned them up to accommodate new fence + types. +2025-09-24: + Git-Nivrak: + - qol: Queen eye can now look into tents + - bugfix: Fixes lighting sometimes appearing as blocky instead of fancy lighting + Googles-Hands: + - maptweak: Added lockdown doors to remapped areas of the Hangar that lacked them. + stanalbatross: + - balance: direction locking no longer slows down humans. Xenos etc unaffected. +2025-09-26: + BertStein: + - rscadd: Added a preset system for ChemMaster. + - ui: Added a "Select All/Deselect All" button for ChemMaster. + - bugfix: Fixed delay between selecting a pill bottle in ChemMaster and the UI responding. + DarkLordCabbage: + - qol: locks the cargo tech job behind 10 hours of any human roles. + Drathek: + - balance: Ovipositor is now required 3 minutes into a round instead of 5 minutes + - balance: Queen temporary maturity now ends upon entry into a tunnel + - balance: Queen temporary maturity now only extends if damage taken is 5 or more + and is not considered environmental (e.g. dmg from electrocution, weather, water, + turrets, map deployed mine explosions, animals, barbed wire) + - ui: Added evolution progress requirement to hive status (much like the stat panel + to indicate when a queen or ovipositor is needed) + - code_imp: Added more autodoc comments and reworked several timer based defines + for xeno hives + - code_imp: Mines now set weak_cause in cause_data (though often not applicable + because they qdel) + - balance: Some crates are no longer riggable + - balance: Xenos can break open crates even if normally unopenable (e.g. secure + crates) + - balance: Rigged crate electrocution now has a 3s cooldown + - bugfix: Rigging crate overlays now applies when wired (not necessarily with an + electropack) and is properly retained when opened + - bugfix: Fixed edge cases where a rigged crate opening would electrocute usr even + if they weren't physically touching it + - code_imp: Various code cleanup including user arguments for open and breakopen + - bugfix: 'Fixed aggressive forsaken handling reverting some changes in a recent + pr: Now abandon on hijack occurs when the shuttle actually launches, and facehugger + masks on a person (e.g. hugging someone) will be converted' + - spellcheck: Fixed a typo in forsaken handling + - code_imp: Cleaned up some old forsaken handling code + - qol: Larva queue is now known as larva pool and its position message is cached + immediately for status panel if xeno candidacy is set + - ui: Tweaked some messaging/labels for xeno special role candidacy + - code_imp: Renamed larva queue variables and comments to pool and rearranged some + larva pool functionality + - rscdel: Removed the special role known as agent + - admin: Late joining as xeno from menu as a mod now immediately sets larva protection + false + Ediblebomb: + - rscadd: Adds Non-Binary as gender option in character creation and random generation + - ui: 'Adds a body presentation button to the PredPicker:tm:' + FloranOtten: + - bugfix: stasis bags and crates now properly destroy their contents when being + crushed by shuttles + - refactor: shuttle crush code is now a dedicated function + - refactor: migrates closet destruction to use deconstruct() instead of qdel() where + applicable + Git-Nivrak: + - bugfix: MP honor guard no longer shows up on the occupations preferences list + Sergeys: + - bugfix: The analyzer no longer forgets about surgery in the head. + - qol: Pill box can transfer its contents to the Chemmaster + - qol: Pill box can collect pill bottles from the floor + TheGamerdk: + - balance: Oxiding and Igniting now respects ignition immunity + - balance: CLF3 now does less burn damage, and doesn't strip xeno armor + cuberound: + - rscadd: Roofs that stuff can not stay on for multiz mapping + - rscadd: motion detector detects pings on higer and lower z level, uses arrows + to show their location + - bugfix: fences no longer connect to electric fences + - rscadd: Smokes spread up and down a z level + realforest2001: + - rscadd: Changed some ERT messages to be more related to what they are. + - rscadd: Added MP Honor Guard HUD and title pamphlet. + - rscadd: Added Visiting Lt Colonel and Colonel presets. + - rscdel: Removed an unused proc. + - bugfix: Fixed an error with ARES WY IFF + - rscadd: The USS Almayer Research Department are now civilians again. They do not + answer to the CL. + stanalbatross: + - qol: simplified, reduced the length of, and in some cases removed unnecessary + balloon alerts. +2025-09-27: + Drathek: + - bugfix: duration2text and duration2text_sec now support times greater than a day + or hour respectively + - code_imp: GLOB.timezoneoffset now experimentally uses world.timezone instead of + a time2text result + - code_imp: Adding a duplicate instanced component in COMPONENT_DUPE_UNIQUE_PASSARGS + mode will now qdel the new component + Sergeys: + - qol: Stack receipt list now supports entering a custom amount of produced items. + - ui: Added icons for construction objects. + - ui: DmIcon no longer displays the previously rendered image instead of the setted + image. + - ui: NumberInput can now be made focusable via Tab using a new variable. + - ui: Glass construction now using proper UI instead of custom. + - qol: Power sources now prioritize supplying their local APC before sending power + to the powernet. + - code_imp: Power sources now inherit from the power_generator + realforest2001: + - code_imp: Changed each xeno hive name into a define. + - rscadd: Added restriction variables on what factions each Xeno hive can ally with. +2025-09-28: + byondsucks: + - bugfix: All CLF survs now spawn with bayonets. +2025-09-29: + Drathek: + - bugfix: Orbit menu should no longer be finding null named mobs to crash on (also + has fallback behavior to name them as Unknown) + - bugfix: 'New players (or atleast one that has never saved preferences before) + now have their preferences sanitized immediately: For example this makes it + so fax responder names are randomized to begin with' + - bugfix: A few equipment presents (cmb, contractor, and royal marine) now will + have different hair colors + - code_imp: Various code standardization related to names and gender + - admin: Aghost observers are now hidden in Orbit menu + - spellcheck: Fixed a typo of clearence and reworked various balloon alerts to satisfy + new lints + - code_imp: Expanded balloon alert testing and changed the as anything optimization + check from o?range and o?hearers to o?range and o?view + - bugfix: Ctrl clicking a xeno now can give a timer how long until the afk xeno + can be taken over if its within the next 30s + - admin: Ctrl clicking a xeno no longer gives a message just because they're aghosted + sippykot: + - balance: added IFF to P9 SHARP +2025-09-30: + Killfish: + - balance: Eating too much Nutriment will make you sick and slow you down until + you barf. Current threshold is 60u. + Red-byte3D: + - bugfix: RMC Marksman now spawns with the proper ammo + - bugfix: Xenomorphs now properly unhaul people they're carrying on death, hopefully + no more people going to space afterwards diff --git a/html/changelogs/archive/2025-10.yml b/html/changelogs/archive/2025-10.yml new file mode 100644 index 000000000000..f6136536561a --- /dev/null +++ b/html/changelogs/archive/2025-10.yml @@ -0,0 +1,372 @@ +2025-10-02: + FishyFlaps2024: + - qol: Added purple-crt style sheet and imported it with other crt color style sheets + - qol: Added purple as OW console color option + Red-byte3D: + - bugfix: Specialists now properly get updated on the manifest + - balance: Pred hunting traps now require TRAIT_YAUTJA_TECH + Teragen: + - rscadd: Marine Command Helmet variant with Basic Med Optic + - rscadd: Gave Chief Engineer actual armored insulated gloves in their deploy kit. + - qol: Removed the two extra boots the Chief Engineer got + - qol: Gave the basic Command variant to RO and CE + - balance: Gave Chief Engineer a level in vehicles +2025-10-03: + PoltavskaPraca: + - qol: adds a little feedback text when you save your character prefs and it's successful + Sergeys: + - ui: Added search box to construction UI +2025-10-06: + BKryth: + - balance: lowers required neurotoxin plasma to turn shrapnel type of custom explosives + from 30 to 10 + - bugfix: replaces the chemical required to turn shrapnel into hornet shrapnel from + sulphuric acid into polytrinic acid due to recipe conflicts +2025-10-07: + Detective-Google: + - bugfix: CE's no longer can vend infinite essentials kits. + matttheficus: + - bugfix: Clicking on paper with a pen now opens it at the same size as reading + it. + - rscadd: Added [s][/s], [name], [rank], [job], [op], [ship], and [colony] macros. + - ui: increased the size of the default paper popup window and makes it a define. +2025-10-09: + matttheficus: + - rscadd: added M1911C ammo to the CO vendor. + - balance: gave the M1911C a 1 second knockdown, up from 0.2 seconds. + - bugfix: added the "fire in the air" ability to the M1911C to match all other CO + guns. +2025-10-10: + Blundir: + - bugfix: removed unintended uranium drums from pmc sg + Zenith: + - rscadd: Added new M10 gun-case kit. + - rscadd: Added a few new M10-specific attachments, spiked CQB compensator/regular + one, solid & foldable stock, micro laser. + - rscadd: Added AP variants of all existing M10 magazine types. + - rscadd: Added two new universal attachments usable by pistols and SMGs, a compact + suppressor and the S5 Micro Dot Sight. + - rscadd: Added "extended-compensator" universal attachment for multiple gun types. + - balance: Increased the M10's base damage, improved accuracy, and reduced bullet + spread to make it more viable. + - soundadd: Added new firing sounds for the M10 and custom suppressor sounds. + - imageadd: Updated M10 belt sprites to change based on map type. +2025-10-11: + Zenith: + - rscadd: Added each appropriate UPP/Hyperdyne aligned Synth presets to Soro + - rscadd: Minor tweaks to Soro survivor presets. + - bugfix: Changed the WY Synth reset key to Hyperdyne on Soro + cuberound, harry: + - rscadd: adds upper level mirroring to wall behind stairs +2025-10-12: + Googles-Hands: + - maptweak: A blackbox and colony information recorder have been added to New Varadero +2025-10-13: + Drathek: + - balance: Pulling something that also is pulling something is significantly slower + - balance: Pushing something that is pulling something will inherit their pull delay + unless already pulling + - code_imp: Cleaned up atom/moveable/Collided +2025-10-14: + Blundir: + - bugfix: fixed some color oddities on scout cloak and some sprite inconsistencies + on sadar helmet + - bugfix: fixed worn/inhand pixel dimensions backend + - imageadd: sniper armor on classic camo maps (fiorina, 522) now looks similar to + the one on urban maps (hybrisa) + - imageadd: sniper rifle back sprite is now also a suit storage one now (suit storage + one didn't exist) + - imageadd: sniper rifle inhands sprite now look better and aren't cut out + Googles-Hands: + - balance: Exchanged the CIC headset for the operations Commander for a senior command + headset + Sergeys: + - bugfix: fixed the construction cancel after closing UI. + TheGamerdk: + - bugfix: Fixed a way to bypass the binocular blocker in the overwatch console +2025-10-15: + Drathek: + - bugfix: Fix autoclimb potentially being performed when already autoclimbing or + manually climbing a railing + Lukas-Seltz: + - code_imp: Changed the defines of Chain of Command + - code_imp: Added a check for doctors in to the list for Chain Of Command announcement + - bugfix: Fixes the Intel Officers to use the proper way of doing the check and + not checking via squad + rattybag: + - rscadd: add medical keys to marine preps +2025-10-16: + Drathek: + - balance: Xenomorph tackles now cannot stun longer than 20s. + - balance: Hauling now ends any stun/knockdown on the hauled mob (Not hugger paralyze) + - rscadd: Xenomorph tackle sfx has a higher pitch if the new duration was altered + because of the 20s limit (otherwise does not vary now) + - balance: Hybrisa hydrants can now be flamed and acid sprayed around and hybrisa + poles can now be acid sprayed around (already was allowing fire around) + - bugfix: Fix predator bracer self-destruct not checking incapacitated or hauled + states (doesn't care about hauled for deactivation) + - ui: Predator bracer self-destruct now uses tgui_alert and tgui_alerts no longer + ignore whitespace like the new line character + Git-Nivrak: + - rscadd: New tacmap + - rscadd: opening tacmap can now be set to a hotkey, default is 5. + - rscadd: you can now use scrollwheel/shift scrollwheel to move the tacmap drawing + around + - rscadd: added a new verb View Tacmap(s) available in ghost/alien/IC tab for observers/xenos/marines + which allows you to see the latest drawing of the tacmap + - rscadd: Queen can now edit the tacmap from manage the hive ability + Nihisohel: + - code_imp: Adds backend functionality of unique-action for all items + Steelpoint: + - maptweak: The loot inside the west dropship on Chances Claim has been partially + distributed to the east dropship. Furthermore, the east dropship is now accessible + via C4 instead of needing to be opened from the west dropship. + - maptweak: Additional resin nodes and sticky resin tiles have been placed near + the reactor core entrance. To slightly deter early game intruders. + cuberound: + - bugfix: fixes floating tile bug with stair look up + neeshacark: + - qol: facehuggers are now able to be worn in the helmet garb slot + ori-disillusion-mirnov: + - bugfix: chaplain survivor bible is no longer overfilled + rattybag: + - qol: add modifier keys to ladders for fast throwing and climbing + - refactor: consolidated ladder climbing and item throwing logic into shared helper + functions + - code_imp: Persist transfer amount when refilling chem bottles + realforest2001: + - bugfix: Fixes WJ IFF regarding ARES + - bugfix: The various types of freezer/fridges all now count for the nuke protection. + zzzmike: + - spellcheck: hijack fuel announcement now uses % instead of percent, rather than + both +2025-10-17: + MrsTonedOne, ZephyrTFA, optimumtact, harryob: + - server: added ipintel backend + hry-gh: + - bugfix: fixes bad shadows under windows + kiVts: + - bugfix: copy mode in buildmode is working correctly. + ori-disillusion-mirnov: + - maptweak: removed access restriction on houndmaster's quarters, removed old hellhound + spawners, added sleeping hellhounds in the hellhound cells + - rscdel: old hellhound callers are gone + - rscadd: new sleeping hellhounds replace them, you can click on them to wake them + up. + - bugfix: fixes misplaced bed roll on pred ship +2025-10-18: + CeUvi: + - imageadd: new helmetgarb sprites for M1A1 ballistic goggles + DawsonKeyes: + - rscadd: New pred plasma rifle sprites + - rscadd: You can now wear the hunting bow quiver on your back slot + - bugfix: Hunting bow quiver sprites fixed + Drathek: + - code_imp: Added 3 new maplints for identical barricades, pipes, and disposals + - maptweak: Made minor tweaks to 11 maps and 3 inserts to accommodate new lints + Nemesis1337: + - rscadd: ammo box for ap p90 magazines + - qol: rail flashlights can now be attached to p90 + - bugfix: ap magazines can now be used with regular p90 + - imageadd: added p90 magazine sprite overlays and new sprites for ammo boxes + Red-byte3D: + - imageadd: Better sprites for special cursor sprites + VictorJob: + - imageadd: New Sprites for m82f + realforest2001: + - bugfix: Fixed non-functional on-mob sprites for the blue and black leather satchels. +2025-10-19: + Zenith: + - imageadd: sprite replacements of the basketball hoop, LV-big tree & drone fabricator. + halander1: + - rscadd: New pay levels for researchers and W-Y comms + - bugfix: Low pay of researchers +2025-10-20: + Unknownity: + - bugfix: Fixed clan bracers being able to be put inside pockets. + cuberound: + - rscadd: Tacmap stair indicators for multiz + kiVts: + - admin: basic buildmode should be more friendlier now. +2025-10-22: + matttheficus: + - bugfix: Pred Cloaks now retain their custom colors when turned to accessories + and back. + ori-disillusion-mirnov: + - bugfix: predators can no longer join the hunt a second time +2025-10-23: + Blundir: + - rscadd: preds, humans and xenos now have different hide button icons + - imageadd: almost all of the action button icons were remade + - imageadd: action icons for humans now have new semi transparent sprites + - bugfix: walkman having incorrect icons + - bugfix: transfer liquid action button having incorrect and misleading name + - rscadd: added manufacturer logos in object descriptions + - rscadd: renames Mateba autorevolver into Spearhead Unica 6 autorevoler + - imageadd: added welding shield sprite back to the Seegson welder (it has protection + mechanically, but not visually) + - imageadd: returned + - spellcheck: fixed a oddities in company namings + - spellcheck: renamed Seegson welder, it had USCM lore welder name for some reason +2025-10-24: + GoodWheatley: + - bugfix: The CO gear vendor can now vend most attachments again +2025-10-25: + Drathek: + - code_imp: Manufacturer logos are now only sent to the examiner mob instead of + all viewers + - balance: LZ turrets (spaceborne) can no longer be driven past or destroyed by + vehicles + FishyFlaps2024: + - rscadd: Makes the xeno grab stun shorter if the xeno is stealthed + PoltavskaPraca: + - qol: detached attachies are put in hand, faster bayonet attach/detach + - balance: bayonet and subtypes now take 3 ticks to detach/attach + Yachuk: + - qol: reloading M240 flamethrower tanks one by one + armsdealer9876: + - balance: Reduce airburst grenade point cost for consistency amongst roles + cuberound: + - bugfix: no slowdown water no longer speeds up xenos + ihatethisengine: + - balance: hive with a king is no longer allowed to have alliances + ori-disillusion-mirnov: + - bugfix: pacman generators now stay one color, and charge APCs based on enabled + powernets, instead of assuming all powernets are on + - ui: pacman ui is now TGUI, from TGstation + - soundadd: new sounds for pacman generators running, also from TGstation +2025-10-26: + LC4492: + - imageadd: Updates on_mobs for most feet items +2025-10-27: + ori-disillusion-mirnov: + - spellcheck: removed outdated wording in a comment, no player facing changes +2025-10-28: + Drathek: + - bugfix: Launching a dropship without a primary LZ selected will now force that + dropship's destination to be the primary LZ if possible + - bugfix: Fixes LZ selection not supporting maps that might only have 1 LZ and changes + the automatic LZ selection from 25 mins world time to 15 mins round time + Nihisohel: + - qol: Leadership big texts are now toggleable into three differing modes + - refactor: Leadership text styles are no longer hardcoded to faction.dm files, + instead given to those with leadership skill + - refactor: Removed spoken_order embolden asterisks for redundancy. + - rscadd: Humans can now brace for shuttle impact by leaning on walls. + Thwomper: + - balance: Removed additional BRUTE rockets from ComTech vendor. + troytroy400: + - rscadd: Field doctors now have medical records access. +2025-10-29: + Blundir: + - bugfix: fixed emote icon being huge + Detective-Google: + - rscadd: There's a new indicator that shows whether there's a Multi-Z space above + you to look up at. + Puckaboo2: + - rscadd: Added Pharmaceutical Physician as a doctor job variant with a wardrobe + and matching scrubs, caps, and lab coats. + - rscadd: Added chemistry pouches to vending machines. + - rscadd: Added tons more scrub and cap colors, and short and long lab coats. + - mapadd: Added morgue and pharmphys wardrobe, added a bunch more equipment to the + medical locker. + - mapadd: Added a box of empty blood bags in Field Doctor storage so field doctors + can stuff their O- blood bags in a more convenient area. + - mapadd: Reassigned two area tiles. + - spellcheck: Made some small spellchecks here and there. + - mapadd: Moved some things around to make medbay's debilitation ward prettier. + - bugfix: Medical lockers no longer share the same contents as wardrobes. They offer + pouches, now. Also adds a CMO radio in the CMO locker. + - bugfix: Deleted a duplicate no smoking decal in Medbay. + - bugfix: Scientist's coat should now properly display if it's been opened while + lying on the ground. + - bugfix: Surgical scrubs and surgical caps will now tell you what color they are + in their names. + - bugfix: Synths can now put on surgical caps. + - imageadd: Complete redesign of surgical caps, lab coats, and cmo outfits, and + re-shaded webbings and some lab coats. Also redesigned some box decals. + - code_imp: 'The color of scrubs and caps associated with roles has those roles + in their names. Example: Green Surgical Scrubs are now Surgeon''s Surgical Scrubs.' + - rscadd: Adds Oxycodone canister pouches to vends. + - qol: You can now tell which kind of pressurized reagent pouch you have by looking + at its name. + - qol: You can now tell which chemicals and how much of them are in pressurized + reagent pouches and canisters via a fill indicator. + - qol: There are more unit transfer options for glass containers, bottles, and beakers. + - bugfix: Some Corpsman and Medbay pouch colors were swapped for consistency between + departments. + - code_imp: Adds fill indicator to pressurized reagent pouches and vends. + - imageadd: Adds overlays for pouches and canisters, updated canister sprites + byondsucks: + - rscadd: Youngbloods now have access to chain gauntlets. + dawsonkeyes: + - bugfix: hunting bow quiver back onmobs update properly + - bugfix: pred weapons now visually show up on you when stored in the suit slot + jupyterkat: + - rscadd: The lighting inside maintenance sections of the USS Almayer is now darker. + - bugfix: The USS Almayer's medical bay should receive less red light bleeding from + the maintenance deck above it. + ori-disillusion-mirnov: + - bugfix: labels appear on injectors when automatically vended into a container +2025-10-30: + Blundir: + - imageadd: resprites hugger sprite on human face + Drathek: + - bugfix: Colony floodlight switches (includes electric fence switches) can now + share machines (support for duplicate switches) but toggling one on will untoggle + the other(s) + - bugfix: Colony floodlight switches now correctly initialize their machines if + nightmare inserts changed them + - bugfix: Colony floodlights now only draw power if not broken (and on) + - bugfix: Colony floodlights now properly handle switch spamming + GoodWheatley: + - rscadd: The CO uniform vendor now has the officer cap, service jacket, and a few + pairs of gloves + Puckaboo2: + - rscadd: Adds dylovene and peridaxon autoinjectors to vends and first aid kits. + - qol: Chemicals, when scanned, now have more detailed descriptions and OD limits. + - qol: Adds some maptext labels, descriptions, and names to some autoinjectors + - bugfix: fixes autoinjector overlays, fixed the contents of oxygen kits to have + pill bottles instead of pills. + - code_imp: Changed the way autoinjectors display their overlays to correctly display + their reagents' hex colors. + - imageadd: Adds overlays for autoinjectors. + - rscadd: Adds reagent-colored fill icons for droppers and industrial droppers. + - rscadd: Adds oxycodone pill bottles. + - rscadd: Adds icon states on pill packets that change depending on how many pills + are left. + - qol: Adds descriptions to Wey-Med-dispensed pill bottles. + - qol: All reagent fill sprites have universal shading. + - bugfix: Adds missing fill icon states for silver beakers and cryostasis beakers. + - code_imp: Tweaks some names and adds some descriptions to some items. + - imageadd: Adds proper fill icon states for droppers, industrial droppers, silver + beakers, and cryostasis beakers. + - qol: Adds a fill indicator on reagent tanks that fills every 20%. + - qol: Added a dispensing and filling indicator to reagent tanks that changes from + green to orange. + - qol: 'Adds the following transfer amounts to tanks: 15, 25, 80, 120, 150, and + 240.' + - bugfix: Added missing overlays to Yautja tanks. + - imageadd: Restock carts now have proper icons with fill overlays that add and + remove a little box every 5 units of supplies. + - code_imp: Repaths reagent tanks for consistency. +2025-10-31: + Jesters-Ballad: + - balance: Dough costs adjusted, burger buns buffed significantly + Killfish: + - balance: Huggers purge 30u of stims upon hugging someone. + - balance: Being nested while infected and below stage 4 purges 2u of stims per + tick. + Lagomorphica: + - bugfix: peridaxon autoinjector no longer overdoses you + NHC: + - rscadd: replaced the pilot helmet in the PO and DCC vendor with a version that + has no pilot visor pre-installed. + - rscadd: adds binoculars and some other minor items to the pilot vendors. + - rscadd: adds the tactical pilot officer flight suit and its armor as a free option + to the PO uniform vendor. + - qol: sorts PO and DCC clothing vendor subcategories. + forest2001, lagomorphica: + - rscadd: Adds Synthetic Specialisation presets. + neeshacark: + - spellcheck: fixed a typo in vendors for high-cut labcoats diff --git a/html/changelogs/archive/2025-11.yml b/html/changelogs/archive/2025-11.yml new file mode 100644 index 000000000000..9a4f10680a90 --- /dev/null +++ b/html/changelogs/archive/2025-11.yml @@ -0,0 +1,350 @@ +2025-11-01: + FebrezeNinja: + - bugfix: Fixes an instance of medical item duping + Puckaboo2: + - bugfix: Removed an autoinjector fill overlay on Thwei. + realforest2001: + - rscadd: Moved the preference for using playtime perks to settings tab instead + of xenos tab. + - code_imp: Added backend functionality for SDTimeAward community award to function + without being in the staff list. + - admin: Added a preference for staff to decide if they use their own playtime for + ranks or not. + - bugfix: Fixes an inverted check on who can hear ship announcements such as hijack. +2025-11-02: + Blundir: + - imageadd: voice level action buttons sprites improved a bit + Drathek: + - bugfix: Fixed bracing for impact preventing hijack + - bugfix: Fixed mobs only on the same Z as the crashing shuttle being affected by + the crash + Labeo0: + - qol: auto-toggle "Aimed Shot"/"Spot Target" with sniper rifle/spotter designator + in hands + Nihisohel: + - qol: Abovehead emotes can now appear for deaf people. + Puckaboo2: + - bugfix: Oxycodone pills are now 10u instead of 15u + - bugfix: Oxycodone pill bottles now have a lock on them. + - bugfix: Oxycodone pill bottles can be found in pill bottle loot spawners. + - bugfix: Dexalin Plus's chemical color has been updated to CM-SS13 standards. + - bugfix: Ultrazine autoinjectors have fill indicators. + - bugfix: Stim chemical colors have been updated to CM-SS13 standards. + - bugfix: Field Doctors and Nurses can now view and print medical records + - imageadd: added fill indicators for stimpack-type autoinjectors for future reference. + byondsucks: + - bugfix: The solaris PMC CO surv now has his proper skills. + halander1: + - qol: Players now have the option to take pills directly from bottles for certain + pouches. + jupyterkat: + - rscadd: humans now block emissives + - bugfix: fixed emissives + - refactor: made some emissives code faster + matttheficus: + - balance: you can no longer get IB or Organ Damage while on the Hunting Preserve + as a FACTION_LIST_HUNTED + realforest2001: + - bugfix: Fixed missing rank for Generalised synth. + - rscadd: Added MP Synth option, again. + zzzmike: + - spellcheck: fixed a spelling mistake +2025-11-03: + Nihisohel: + - bugfix: Flamer tanks can refill from other flamer tanks again + Nomoresolvalou, Crowford: + - ui: bracer style selector added to yautja preferences + - bugfix: retro caster can now be selected in yautja preferences + - bugfix: bracer lock/unlock verb now correctly displays a to_chat, and plays a + sound + - imageadd: added new bracer sprites + - imageadd: replaced old bracer sprite with new retro sprite. +2025-11-04: + Zenith: + - bugfix: fixed the clf kutjevo insert by reverting it back to the correct version. +2025-11-05: + Blundir: + - rscadd: 'contraband weapons box in hangar now has: R4T rifle, db shotgun, L54 + pistol , NP92 pistol' + - rscdel: L42A been removed from pool due to huge surplus of it in maints + PhantornRU: + - balance: 'Hivelord Whisperer build cooldown: 2.5 => 1.5' + - balance: 'Hivelord Whisperer building penalty has been reduced: 8 => 2' +2025-11-06: + Blundir: + - rscadd: 'Spearhead 2006M new CO gun, can perform revolver tricks and has a unique + sound set, comes in normal variant and three council variants: gold, gold with + black handle, silver' + - rscadd: golden Unica, golden Deagle returned as an option for CO council sidearm + selection + - rscadd: standard non camo comforting Unica been added to normal CO sidearm selection + - imageadd: slightly changed palette of a golden Deagle and sligtly improved inhands + and inbelt sprites of it + - code_imp: moves revolver tricks to a core revolver code, revolver tricks are now + given by a simple var + - code_imp: fixed some oddities in CO sidearm code for WO and FORECON + Drathek: + - spellcheck: Most TGUI interfaces will not have a uncapitalized name in the title + now + Puckaboo2: + - bugfix: Filled Thewi is shiny, again. + - code_imp: Forces Thwei to use a different overlay system than regular autoinjectors. + - bugfix: Iron is no longer pink. + jupyterkat: + - bugfix: emissions are bright again +2025-11-08: + Comka: + - ui: "Added `flexWrap: \u2018wrap\u2019` for tabs in the phone interface. Now they\ + \ should fit in the window" + Drathek: + - balance: Xeno tailstab can be used cross-z if it is an adjacent z at the cost + of 1 distance (effectively means you need to be visually adjacent to something + cross z assuming the tailstab distance is 2) + - balance: Most obj/structures have similar behavior if attacked with a tailstab + like attacking with claws + Killfish: + - rscadd: Adds Tool Drop Pouch, the cooler engineering-themed sibling of Tool Webbing, + and makes it an option at vendors that provide the Tool Webbing. + - imageadd: Adds sprites for aforementioned Tool Drop Pouch. + Puckaboo2: + - spellcheck: Adds apostrophes to contractions where there are none. + Red-byte3D: + - bugfix: Healing / Plasma recovery nodes now properly add overlays to the effected + xenomorphs + Steelpoint: + - maptweak: The windows overlooking the emergency response team landing docks on + the USS Almayer are now hull windows. This will protect the shuttle and its + occupants from being fired on through the roof of the shuttle. + carlarctg: + - spellcheck: fix a typo in warrior slash healing + jupyterkat: + - bugfix: fixed character setup preview being black + rattybag: + - ui: Added quick mode to dropship weapons console + realforest2001: + - rscadd: Added event mob spawn landmarks, and a ghost verb to spawn as them. + - rscadd: You can only spawn as an event mob once per round, unless an admin overrides + this. + - admin: Admins have freedom to setup these landmarks either in a map insert or + on-the-fly depending on which type is used. They're fairly customisable and + will allow for overrides of a few features on the preset such as title and paygrade. + - rscadd: Added categories to Select Equipment. + - code_imp: Cleaned up backend duplication. + - bugfix: Fixes spec token boxes not working +2025-11-09: + Detective-Google: + - code_imp: tweaks a comment to be documented better. +2025-11-10: + Ediblebomb: + - spellcheck: Removes a mention of most penal battalions supposedly coming from + New Argentina from a prop sign, also fixes a misspelling of populations on said + sign. + jupyterkat: + - bugfix: fixed character preview hairs always being black +2025-11-12: + Puckaboo2: + - spellcheck: Renames some chemical properties to sound more scientifi. Balding, + Fluffing, Paining, Relaxing, and Sedating have been changed to Atrichogenic, + Trichogenic, Neuropathic, Antispasmodic, and Hypnotic, with their codes being + ATR. TRI, NPT, ASP. And HYP. +2025-11-13: + Drathek: + - bugfix: Fixed various material exploits when deconstructing walls, reinforced + floors, computer frames, airlocks, tcoms, closets, fences, tables, windoors, + window frames, desk bell, apcs, power monitors, and SMES + - code_imp: Cleaned up and reworked some logic in various attackby procs that handle + deconstruction + - rscadd: APC breakers can now stop idle power draw + - bugfix: Fixed hopefully all cases where areas would demand negative amounts of + power + - bugfix: Fixed a possibility of power generators adding double power to the grid + - bugfix: Fixed disabling charging not offering power put aside for charging back + to the grid + - bugfix: APCs no longer display charging when main breaker is off + - bugfix: Predator ship is now its own powenet + - bugfix: Power monitor computer now will connect to powernet on construction + - bugfix: Nightmare inserts that change area now perform Exited and Entered for + the area + - ui: Added power generation information and whether the APC is shorted to APC panel + - ui: Polished the legacy power monitor interface (ought to be TGUIfied before long) + - soundadd: Repairing generators now make soundeffects at the start of the do_after + too + - code_imp: Added additional unit testing for areas and APCs with negative power + - code_imp: Cleaned up defines in APC file +2025-11-14: + MistChristmas: + - bugfix: Rangefinder non-TGUI mode includes Z level info + Nihisohel: + - rscadd: You can now tactically reload with shotguns and revolvers, looping until + the magazine is filled or interrupted. + - qol: You can close a revolvers cylinder with the unique action. Provided it is + open. + - qol: You can now insert bullet handfuls back into the chamber, provided it is + empty. + - qol: Cocking the bullet now tries to put it to your hand, if empty. + Zenith: + - bugfix: fixed vehicle back door sprites & CLF van door pathing. Now you can click + the full tile. +2025-11-16: + Drathek: + - balance: Command announcements and overwatch are now garbled if coms are down + (applies to ghosts too based on their position). The garble strength depends + on message length (<= 20 good, 120+ bad) without signature and in the case of + announcements the duration between them (30s bad <-> 3min+ good). Whichever + variable is better wins. + - bugfix: Fixed some logic for marine announcements not handling people in cryopods + - bugfix: Fixed some logic for stars_decode_html (xeno paper viewing) + - bugfix: Fixed remind objectives in overwatch not working + - rscadd: Ghosts now have a preference to force full clarity for announcements + - config: Added config for garbling settings (see game_options.txt example) and + log_garble flag + Nihisohel: + - balance: Focus mode now buffs both camera recoil and scatter alongside the accuracy + of a firearm. + hry-gh: + - server: added the ability to configure a ckey that will be automatically moved + to observe the most interesting players + - server: added additional world/Topic endpoints to interface with CMTV + - server: added the ability to link your Twitch account to the game +2025-11-17: + Blundir: + - bugfix: fixed Unica 2006 and Unica 6 classic having normal ammo in them instead + of impact like other CO guns + - imageadd: changes snow camo spec head rag sprite to be like other camo ones + Nihisohel: + - bugfix: Properly adds the smaller mop bucket to the autholathe + - balance: Janitorial buckets are now considered large items, volume reduced from + 500u to 300u + - balance: High-cap beaker medilathe costs are increased from 10000 to 30000, volume + increased from 300u to 500u + - balance: OT has had their buckets replaced with high-cap beakers and OT and research + gets one extra high-cap beakers within their respective offices + Steelpoint: + - maptweak: The ERT docking ports on the USS Almayer have been remapped to appear + more thematic. + - maptweak: The windows overlooking the emergency response team landing docks on + the USS Almayer are now hull windows. This will protect the shuttle and its + occupants from being fired on through the roof of the shuttle + armsdealer9876: + - spellcheck: Set pose now says They are instead of They is + - code_imp: Added 2 new var's for human/examin.dm +2025-11-18: + Detective-Google: + - bugfix: IASF survs no longer have almayer command radio. +2025-11-19: + Nihisohel: + - qol: Squad prep vendors can now vend to hand again, following preferences, while + also allowing equipment to be auto equipped, if possible. + - qol: Surplus clothing vendors now have the auto-equip flag + Nihisohel, Mistchristmas for TGUI: + - rscadd: FTLs are automatically assigned to their own fireteams, and can now assign + their own members + - qol: Being assigned to a fireteam will now automatically change your headset tracking + to the FTL + - qol: The SL and aSL headsets now default to the LZ, instead of themselves. QOL, + I guess. + - bugfix: Adds Intel SL tracker to Foxtrot Leads headset + - balance: SLs now get Leadership 2, FTLs get Leadership 1, and aSLs no longer get + leadership training on promotion. + - balance: Some marine roles have had their leadership nerfed or stripped away from + them. + - balance: Additionally, some other character skill presets have had their leadership + skills rebalanced + - balance: Adds a fourth leadership level, and rebalances a couple of the buffs + to compensate, among other niche changes + - spellcheck: Removes the indents on periods from the voice cycling text + - code_imp: Removes the redundant access check on headsets, doesn't actually do + anything currently besides be a pain in the ass +2025-11-20: + Labeo0: + - code_imp: Can now reload UBF with welding fuel from m240 tank + Nihisohel: + - bugfix: The .38 revolver can now tactically reload properly. + realforest2001: + - rscadd: Added more helmet and backpack options to Synthetic loadout. +2025-11-22: + Drathek: + - bugfix: Ghost ears now can hear whispers (but should ignore radio whispers when + using ghost radio) + - bugfix: Radio transmissions that failed (for a Z with no coms) now are sent to + observers with ghost ears + - bugfix: Messages from clientless mobs are now ignored even when using ghost ears + unless its nearby + - balance: Tacmap updates are a global cooldown per faction once again + - bugfix: Fixed health scans performing new scans just by changing holocard or minimal + hud mode + - qol: Healthscan now autoupdates for ghosts + - bugfix: Fixed list compiler errors introduced in 516.1670 + - code_imp: Added glob options for alist + - code_imp: Improve autodoc research disk logic + - code_imp: override_precedes_definition is now an error because the proc redefinition + would otherwise do nothing + - rscadd: Join as xeno button can now take over non-ssd afk xenos and now only lists + xenos soon to be available in 30s rather than 60s + - bugfix: Added a few more checks to join as xeno to ensure neither dead nor deleted + xenos are offered + - bugfix: The "has ghosted and their body is up for grabs!" event is no longer sent + for taking over a xeno (now only when they actually ghost) + Git-Nivrak: + - bugfix: You can no longer see tiles you shouldn't be able to see while looking + up + - bugfix: You can no longer look up while zoomed or zoom while looking up +2025-11-23: + Puckaboo2: + - bugfix: Thwei goes back to its normal sprite after use. +2025-11-25: + BasilHerb: + - code_imp: upped the average number of calories burnt + - code_imp: upped the minimum hurdle for calories burnt fun fact + Detective-Google: + - rscdel: removed an aesthetically clashing helmet from the synth loadout screen. + Googles-Hands: + - maptweak: The Goons, Bodyguards and WY-Inspection now arrive in a company shuttle. + - maptweak: The MARSOC base is now USCM instead of WY. + Kashargul: + - bugfix: init order for chem dispensers, round spawned dispensers now should directly + get their storage + Unknownity: + - rscadd: The observer xeno infection icon now changes colors depending on the hive + of the embryo. + Zenith, dimdimich1996: + - imageadd: added three new pod door style sprites. + - maptweak: tweaked the various maps with the escape pod doors - added new escape + pod doors to them and minor floor tile changes. + byondsucks: + - balance: The robust snowsuit now has very light slowdown which also gives resist + againts sent neuro + carlarctg: + - qol: You can now uproot and replant weed nodes after a short delay, by spreading + weeds above one. + kalazus: + - bugfix: Prevents xenos from moving bodies in broken vehicles by dropping them. + revelation-8468: + - balance: Reduces the loadout cost of fullbody paint to 3, in line with the skull + paint. +2025-11-29: + realforest2001: + - code_imp: Changed how human hand-held blocking is handled. + - code_imp: Items that can be used as shields have a base percentage chance of being + used, reduced by factors such as if they need to be wielded (and aren't) or + not. + - balance: Most entities that act as shields for humans are now directional only, + and cannot block things that are not in a roughly 75 degree arc of where the + holder is facing. (Facing NORTH blocks from NORTH-WEST, NORTH and NORTH-EAST). + - balance: Machetes and other long blades have a 15% base chance of blocking melee + attacks, but cannot block ranged attacks. + - balance: Xeno pounces can only be blocked by a small number of large weapons. +2025-11-30: + Drathek: + - bugfix: Fixed an edgecase where quadtree results would fail because a qdeleted + mob was in the tree + SpypigDev: + - balance: applied marine population scales to medbay chem dispenser storage and + output + liltiptop: + - balance: A.C.I.D. harnesses now use small glass beakers (60u) instead of Vials + (30u) + - spellcheck: Fixed a small typo, went through the whole A.C.I.D. startup to make + sure it sounded like the H.E.V. suit + - code_imp: Changed A.C.I.D. harnesses to detect glass beakers instead of vials + - the code was very much just a swap from vials to beakers diff --git a/html/changelogs/archive/2025-12.yml b/html/changelogs/archive/2025-12.yml new file mode 100644 index 000000000000..da7f85f18e1a --- /dev/null +++ b/html/changelogs/archive/2025-12.yml @@ -0,0 +1,398 @@ +2025-12-01: + Puckaboo2: + - bugfix: Certain fill icon states have been modified to look proportionally filled + compared to the next step up. + - bugfix: Bottle lids aren't so high up on the bottle sprite. + - refactor: Beakers (currently only silver) that act as a catalyst for reagents + during chemical reactions have their own path instead. + - imagedel: Removed unnecessary icon states. +2025-12-02: + Blundir: + - rscdel: factional patches are commented out in char prefs, CLF patch is removed + (none of this affects marines) + Detective-Google: + - bugfix: character previews for non-human jobs work again. + Drathek: + - bugfix: Multi-Z stairs remain usable after an explosion + Googles-Hands: + - bugfix: The Chem-Goons and Bodyguards now spawn properly. + Puckaboo2: + - bugfix: Fixes a path in one of the previous PR's update scripts. +2025-12-03: + Comxy: + - qol: Medical Physical Status can now be changed to better reflect the status of + a marine. + Cuberound, datimesmog, PuckaBoo2: + - rscadd: New wound type eschar, similar to broken bone but caused by burn damage + - rscadd: surgery for fixing eschar (medic possible) Scalpel, hemo, retractor, + scalpel then burnkit and close + - balance: limb with eschar behaves the same as splinted limb + - balance: eschar gives 10 pain + - balance: burn damage can not remove splints + - balance: chemicals stop healing untreated burns (with ointment or kit) on 5 damage + on each limb + cuberound: + - bugfix: king jump works cross z levels + - bugfix: king jump no longer tramples marines in path + larentoun: + - bugfix: Fixed Marine Sorting in Orbit. Now it first sorts by rank, then by name. + matttheficus: + - rscadd: FTLs now get a free RTO Bag. + realforest2001: + - rscadd: Added the ability for XOs to award ribbons. + - rscadd: Rebranded some medals (legacy kept for tracking purposes). + - admin: Added admin ability to award USCM Medal of Honor and WY Corporate Service + Medal. + - imageadd: Added sprites for half-way medals (bronze-silver, silver-gold etc.). + - imageadd: Added sprites for Purple Heart, star medals and WY medals from dimdim. + - imageadd: Added onmob sprites for all above. + zzzmike: + - bugfix: HG MP shows in correct category on manifest, and cryopod item storage + supports HG +2025-12-04: + Detective-Google: + - bugfix: mp hgs no longer spawnable + hry-gh: + - server: server operators can now configure a list of CIDs that will not be considered + for stickybans +2025-12-05: + NessiePendragon: + - rscadd: Changes Twitch subscribers' OOC chat color, and removes their ability + to change their own OOC color. +2025-12-06: + kalazus: + - refactor: static light system optimization. +2025-12-07: + Detective-Google: + - admin: button to manually select the acting commander. + Drathek: + - rscadd: Added EMP pulse messages to synths + - code_imp: Cleaned up explosion logging and empulse code + - admin: Explosions from things like SHARP and detrimental EMPs are now entered + into a mob's attack logs + - admin: FF logs for explosions now can jump to the causing mob rather than where + the mob was + PGrayCS: + - qol: Added 'You hear a click as the phone goes dead' notification when someone + hangs up the phone on you + Puckaboo2: + - bugfix: Using the IMS on the head or chest now applies their open incision overlays. + Red-byte3D: + - bugfix: Legcuffs switch your intent back to run when your legcuff gets automatically + removed + cuberound: + - balance: allows medkit pouch to hold scalpel, hemostat, and retractor + larentoun: + - bugfix: Mutated Queen is now not recoloring. + - bugfix: Recolored Xenomorph morphed to Mutated Xenomorph will now reset their + color to none. + - bugfix: Delimbing now requires to have total limb damage to be maxed out instead + of all limb damage to be brute. It still requires brute attack for a chance + to delimb. +2025-12-09: + Git-Nivrak: + - bugfix: Fixed an attachment exploit +2025-12-10: + Cuberound; Zenith: + - rscadd: U2 flare launcher only for m4ra (scout m4ra can not use it) + - balance: U2 flare launcher only fits on m4ra, flares from U2 do not ignite mobs, + do not have IFF but can be used with scope + DangerRevolution: + - balance: The PDT Tracker's (BattleBuddy Kit) uses has been raised from 8 uses + to 14. + Drathek: + - qol: Xenos get a warning in chat (and evolve sfx) when they are inactive and soon + to be eligible to be taken over by ghosts + - bugfix: Facehuggers/Lessers are no longer listed as inactive xenos to take over + because it didn't work anymore anyways + - code_imp: Cleaned up some ctrl+click behavior namely with xeno takeover and repossessing + corpse is now a tgui_alert + Drathek, ori: + - rscadd: added a new hive type used in the hunting grounds + - balance: you can no longer evolve to drone or drone evolutions in the hunting + grounds + Harrysno, Spypig23: + - rscadd: CO roundstart lore-faxes + Nihisohel: + - bugfix: Facehuggers no longer has a diet of ray bans and cigarettes, they will + no longer eat your glasses or cigarettes on your face slot + - balance: Two chefs can now spawn at anytime, regardless of scaling + - code_imp: Most Job.dm comments are now autodoc'd for convenience + Puckaboo2: + - rscadd: Gives the laser scalpel variants, FixOVein, and IMS lore. + - rscadd: Gives some surgical tools more descriptions upon attacking. + - rscadd: Adds attacking sounds to surgical tools. + - rscadd: The PICT System is now true to its name; it can finally cauterize incisions. + Not well, mind you, but it tries its best! + - balance: bone setter, PICT, and IMS have a force of 15 and an attack speed of + 6. + - balance: bone saw and drill have a force of 25 and an attack speed of 9. + - imageadd: Updated surgical tool sprites; makes IMS glow blue instead of orange + when active, and the advanced laser scalpel had its animation tweaked. + - imageadd: Buffed and polished Yautja surgical tools so now they're shiny and have + a uniform color palette. + - qol: Updates surgical tools to have accurate and detailed descriptions. + - bugfix: Adds a description to bone setter and adds descriptions to tools that + did not have any. + - bugfix: Bone gel visual fill indicators are now more accurate. Centers some inventory + sprites. + - spellcheck: Fixes some typos and grammatical errors, removes instances of \the + - rscadd: Adds black surgical vests to the game. No, really, they DIDN'T exist. + I'm not sure why. + - mapadd: Adds chemistry books to the chem lab, receptionist desk, and break room. + - mapadd: Adds a black surgical vest to Field Doctor's room. + - mapadd: Adds medical, surgery, and chemistry books to Field Doctor's locker. + - mapadd: Added an extra large beaker to the chemistry supplies locker, as a treat. + - mapadd: Adds surgical beds to medbay storage. + - imageadd: Re-sprited the medical, chemistry, and surgery books. + cuberound, blundir, datimesmog, fridge, zenith: + - rscadd: New t3 xeno Despoiler evolves from spitter + - rscadd: New third stage of lingering acid on humans, extends duration to 80 seconds + (first teir is 20 second 40) and reduces mob BIO and BRUTE armor by 15 + - rscadd: Despoiler spit, 5 sec cooldown 35 damage applies acid effect and can upgrade + it to level 2, splatters t1 lingering acid on adjacent mobs + - rscadd: Decomposing enzymes, activate gas around Despoiler, 18 second total cooldown, + lasts for 6 seconds upgrades lingering acid to level 2 and drains chemicals + - rscadd: Despoiler empowered slashes, apply lingering effect and can upgrade it + up to stage 3 + - rscadd: Despoiler finishing tailstab with 2 second windup, deals 15 extra burn + damage per level of lingering acid on target with 10 extra ap per level + - balance: Despoiler slash gives t1 lingering acid + - balance: Xeno acid blood hits mob that they are standing on +2025-12-12: + Nomoresolvalou: + - rscadd: Added the yautja shield bracer attachment + - balance: shields will no longer lower after blocking an attack + - balance: yautja clan shield now has directional block. block chance reduced by + 50% on attacks from the side, and attacks cannot be blocked from behind. + - balance: yautja clan shield raised block chance buffed to 40% (was 30%) + - balance: yautja clan shield lowered block chance buffed to 20% (was 15%) + - imageadd: Added sprite for yautja shield attachment (sprites by Crowford) +2025-12-13: + Drathek Blundir: + - rscadd: Added rolling encryption Caesar cipher minigame to maintain comms clarity + without a comms tower. + - rscadd: Added punch card papers which can be used to copy values for the minigame + that can also be written on, bundled, faxed that actually visually display the + punched data. Using blank punch cards on one of the computer restocks 5 punch + cards. Some can be randomly found with intel loot. + - balance: Comms clarity now degrades over time (only matters if comms are down) + but can be reset back to near full clarity using the cipher minigame. + - qol: Fax windows now open with the same dimensions as papers (larger). + - bugfix: USCM and WY paper item icons are now properly set on Initialize. + - bugfix: The photocopier now sets the correct amount of papers when copying a bundle. + - bugfix: The objectives_controller no longer adds items to object contents twice. + - ui: 'Added 3 interfaces: Decoder computer, Cipher computer, and Encoder computer.' + - code_imp: Papers and faxes now support adding additional stylesheets and header + data (used to accommodate punch cards and give them flavor of a white background + when faxed). + - refactor: Reworked stars_decode_html to use a regex and is much faster at parsing. + - imageadd: Added punch card assets including two background and two logos used + (WY and Hyperdyne). + - maptweak: Changed 3 of the computers in CIC and placed a few blank punch cards + on the table next to them. + - config: Various configs changed to accommodate this, namely that challenge words + can be configured for the minigame. The first word determines the length of + all. + Labeo0: + - qol: Allow .458 ammo transfer from small to big ammo box. + - balance: Allow storing .458 ammo box on back slot. + - code_imp: moved .458 ammo box code to different file + PGrayCS: + - bugfix: "Fixed UPP spawn names displaying with question marks due to special characters\ + \ (e.g., '\u017Divka' appearing as '?Ivka')" + Puckaboo2: + - spellcheck: Adds periods to ends of descriptions. + - spellcheck: Capitalizes sentences at the beginning of descriptions. + - balance: Reagent grinders can now hold 16 items, up from 10. + larentoun: + - bugfix: Mutated King is now visible. + - bugfix: Mutated Lesser Drone, Drone, Facehugger, Burrower, Sentinel, Spitter, + Lurker and Queen had their icons re-centered. + - bugfix: Mutated Facehugger items now use Mutated icons. +2025-12-14: + Blundir: + - bugfix: fixed some cases of double manufacturer logo being applied + Nihisohel: + - bugfix: Flamers can now fire past some corners again + Puckaboo2: + - rscadd: Adds 'soundtweak', and 'icontweak' in the changelog. + - code_imp: Alphabetizes changelog flags. + Venuska1117: + - balance: Abduction ability can now be casted at same tile with cade, flipped table + and glass window panes, as long as it doesn't face praetorian ability casting + direction. + - balance: Abduction ability can now be casted through smoke, such as boiler smoke, + explosion smoke, and other related smoke effects. + - balance: 'Abduction ability can now be casted through small obstacles such as: + window frames, small long crates, normal long crates, platform edges, disposal + units (bins), hydro trays (plant trays), janitor cart, trash cans (hybrisia) + line nexter (hybrisia).' + - bugfix: Abduction ability can no longer be casted through multitile vehicles. + - bugfix: 'Abduction ability can no longer be casted through glass windows panes. + + /:cl' + carlarctg: + - rscadd: Adds a verb for restoring your ghost to your base character, Restore Ghost + Character, next to Re-Enter Corpse in the status panel. + - code_imp: Split the ghostize appearance proc + realforest2001: + - balance: Yautja masks now fall off at different rates if human or in crit. + - bugfix: The 15% chance max for Yautja mask fall off is now functional. +2025-12-15: + Detective-Google: + - bugfix: hostile hives can no longer replant each others' weed nodes. + Puckaboo2: + - spellcheck: Adds periods to most to_chats and SPANs. + - rscadd: Animals have more varied emotes and sounds, changed some descriptions. + - rscadd: Adds better descriptions of eating if you're starving. + - bugfix: Removed outdated Bay code Poly lines and made them more CM-appropriate. + - rscadd: Adds some reagent transfer options. + - rscdel: All 100u, 150u, and 200u reagent transfer options were nuked, while some + 25u, 50u, and 80u options were nuked. + - balance: Limits set reagent transfer options to no more than 10 options per list. + Many options were added; some were nuked. + - balance: Adds 15 and 60 unit Dispense and Beaker options for the Chemical Dispenser + and its derivatives. + - balance: Adds 15 and 20 unit options for the ChemMaster 3000 and its derivatives. + - bugfix: Bluespace beakers can dump their entire contents of 500 instead of 300 + max. + - ui: Increased the size of the Chemmaster 3000 window to 600x600 from 550x600 to + fit the new buttons without distorting text too much. +2025-12-16: + Drathek: + - bugfix: Fix Restore Ghost Character verb causing ghosts to be visible to living + players + SpypigDev: + - bugfix: CO lore faxes no longer use invisible ink +2025-12-17: + MistChristmas: + - bugfix: Bipods don't erroneously buff the gun after first undeploy. Bipods don't + apply forever slow. + - bugfix: Using akimbo simultaneous fire and then switching to alternate fire doesn't + break shooting. + - qol: Akimbo defaults to simultaneous fire if you use automatic weapons for autofire. + - qol: Tracker no longer needs empty active hand to be accessed with a normal left + click, but needs intent other than harm if something is in hands + - qol: Give Obj Confirmation box now has Yes listed as the highlighted Option on + the right. A few other similar confirmation boxes got this treatment. Including + some Admin Verbs. + - bugfix: Acid Harness no longer accepts larger beakers than normal, + needs a multi + tool to change configurations, + doesn't protect against reagents that actually + have no OD limit + - balance: Acid Harness no longer scans so frequently, instead scans every 15 Seconds + further modified for successful injection(+15% per U) or OD Warning(+20% per + U) + cuberound: + - bugfix: tacmap multiz stair icons (unused) get displayed correctly +2025-12-19: + Puckaboo2: + - rscadd: Adds inhand sprites for the new chemistry, medical, and surgery books. + - bugfix: Chemistry book is no longer purple inhand. + - rscadd: Adds chocolate milk, and chocolate milkshakes. + - rscadd: Grind chocolate bars to make chocolate syrup. + - rscadd: Adds Chocolate Syrup to soda fountains. + - rscadd: Adds chocolate syrup to some fridges. + - imageadd: Adds a WY-brand chocolate syrup bottle filled with chocolate syrup, + adds chocolate milk glass and chocolate milkshake glass + - code_imp: Renames 'chocolate' to 'chocolatesyrup' and renames 'glass of chocolate' + to 'glass of chocolate syrup' + itus2k: + - rscadd: added a few lines to Rank_pins.dm, mostly ones to make them use the new + sprites. + - rscadd: A army section to rank_pins.dm, to make it easier to change and add stuff + for that faction once it's implemented. + - imageadd: Added a few icons to the Ranks.dmi + - imageadd: Added a few icons to the Onmob ranks.dmi + - imageadd: Added a few icons to the Inventory ranks.dmi +2025-12-23: + Drathek: + - rscadd: Added ignition and evaporation to liquid fuel spills (its duration might + be reduced if there is little fuel present and it only does greenfire damage); + also randomized its spread and marked it as harmful (checked for synths and + extinguishers) + - balance: Removed the weed removal aspect of the toxic property (since now toxic + welding fuel is ignitable) + - balance: Spray bottles volume reduced from 250->150 but default amount per transfer + reduced from 10->5 (25 uses->30 uses; 10 is no longer an option) + - balance: Water backpack sprayer volume reduced from 500->250 (100 uses->50 uses) + - balance: Spray bottles use delay increased from 0.5/0.25 seconds->1.5 seconds + - balance: Water backpack sprayer delay increased from 0 seconds->3.5 seconds + - balance: Chem smoke now spreads 4x less reagents and smoke flamer range was reduced + from 5 to 4 + - rscdel: Removed antiweed grenades and loadouts (replaced a survivor loadout with + a fuel filled watertank instead) + - bugfix: Fixed some potential ways for sprayers to be used to spray harmful substances + by synths + - bugfix: Fixed liquid fuel stacking extra amounts depending on the quantity of + objects in the turf + - refactor: Refactored logic for chem sprayer and synth foam backpack sprayer +2025-12-25: + Drathek: + - code_imp: rust_g updated from 3.3.0 to 4.2.0 + Kashargul: + - code_imp: update tgui dependencies + - code_imp: Update tgui dependencies again + - ui: Updated some stylesheets to meet new SASS expectations +2025-12-30: + Drathek: + - spellcheck: Redacted a lorebook + - rscadd: Static comms are available to more gamemodes including extended + - code_imp: static_comms_amount variable on a gamemode is now per individual tower + vs pairs of towers + Itus: + - imageadd: 5 new two handed sprites to the MP27, Skorpion, SU6, KT42 and Auto9 + Labeo0: + - bugfix: meson scanner vision effect is now removed when it's unequipped + Nihisohel: + - rscadd: Adds an underbarrel flashlight mount, switch to it via unique-action on + the rail light + - balance: Rail lights and by extension, the underbarrel rail light, has their light + modifier buffed by a single point + - balance: Most non-combatant marine roles start with a headset now. + - balance: Rebalance the cost of the researcher spare headset in the CMO vendors + - balance: CMPs are now able to buy spare MP headsets in their personal vendors + - rscdel: Most spare headset choices are removed; you may still find spares in certain + places, such as the MP lockers, or CIC Armory Lockers. + - code_imp: Cleans up the paths of the headsets, made them all subtypes of command + headsets, cleans up redundant variables + - qol: Arguably QOL, but departmental headsets now default to their department frequency + - rscadd: Pilots can now track the LZ with their headset + - rscdel: CE tracking options has been gutted, they have no need to track anything + but the LZ for building, anyhow + Puckaboo2: + - soundtweak: Renamed files where 'acquired' was misspelled. + - spellcheck: The word 'acquired' is no longer misspelled anywhere. + - spellcheck: All instances of 'simultaneously' have been spellchecked. + - spellcheck: Spellchecks modified files. + - spellcheck: Fixed a typo. + - bugfix: Spec kits cannot be acided. + - bugfix: The portable composite barricade no longer shrinks when damaged on the + west state. + - bugfix: Xeno spit overlays no longer linger on dead/fallen/ghost xenomorphs + - bugfix: Youngbloods can no longer spawn with bad eyesight. + - bugfix: Floodlight switches cannot be destroyed by explosions. + - bugfix: Fixes inconsistencies with bottle fills. + - bugfix: Fixes blinking line on surgical drill. + - bugfix: Removes two blue pixels from Fix-O-Vein. + - qol: If you drop a pill in a beaker that is full or nearly full, it will overflow + and you will know how much of your pill you lost. + - imagetweak: Adjusts glass bottle fills again. + - ui: Increases the window height for modifying skills in a skillset from 550 to + 600 so the entire list can be accessed without the need for scrolling. + - spellcheck: Spellchecks the word 'initial'. + - spellcheck: All instances of 'drowsiness' have been spellchecked. + - spellcheck: If 'Civilian' was misspelled anywhere, now it isn't. + - imagetweak: Respelled 'background_civillian' to 'background_civilian'. + carlarctg: + - code_imp: Tail stabbing objects now does the mob-stab animation + - imageadd: Added a new sprite for tail slam that shows its blunt, because i don't + know. + realforest2001: + - bugfix: Fixes facehuggers bypassing hug resistant masks. + zzzmike: + - bugfix: Larva that chestburst onto a tile that already has fire on it will no + longer ignite +2025-12-31: + DangerRevolution: + - spellcheck: Fixed several duplicate "the" with Mortar interactions diff --git a/html/changelogs/archive/2026-01.yml b/html/changelogs/archive/2026-01.yml new file mode 100644 index 000000000000..2d44e514e6da --- /dev/null +++ b/html/changelogs/archive/2026-01.yml @@ -0,0 +1,408 @@ +2026-01-01: + MistChristmas: + - bugfix: Ghosts no longer able to move items out of open inventories when orbiting + Nihisohel: + - rscadd: Adds spare almayer general keys to requisitions for non-marines such as + survivors + - bugfix: Fixes intel headsets losing their almayer general comms when their intel + key is removed + - code_imp: Repaths all instances of encryptionkey/public to encryptionkey/almayer + for less confusion +2026-01-03: + Doc12693420: + - bugfix: UPP Serzhant survivors can now use their QYJ-42 + Git-Nivrak: + - bugfix: You can no longer pounce up a zlevel into places which would get you stuck + - bugfix: You can no longer pounce over indestructible obstacles (e.g fog) + Puckaboo2: + - bugfix: All steps in eye surgeries now have sounds. + - bugfix: If the patient is blind or nearsighted and has 0 eye damage, you can still + initiate eye surgery. A patient now needs to either have eye damage or be blind/nearsighted + to need surgery. + - qol: Makes eye surgery steps more descriptive. + - qol: If you cured blindness or nearsightedness, you get extra flavor text and + a pat on the back (from Puck) + - balance: Changes eye surgery steps. It's now Scalpel, Hemostat, Retractor, FixoVein, + Cautery. Pretend you're doing internal bleeding on the eyes and you will be + fine. + - balance: Eye surgery now requires Oxycodone instead of getting away with inaprovaline. + Eyes have some of the greatest concentrations of nociceptive nerves in the human + body and must be fully numbed for LASIK or to be be completely anesthetized + in real life for an operation to commence. +2026-01-04: + Puckaboo2: + - bugfix: Xeno spit overlays should return to their original function. +2026-01-07: + Puckaboo2: + - bugfix: Autodoc now properly does the new eye surgery steps. + - rscdel: Removed Spitter Frenzy's macro. Replaced it with Charge Spit. + - bugfix: Spitter Frenzy should not show up in Spitter's Alien sidebar. + - bugfix: Charge Spit should appear in Spitter's Alien sidebar. + - bugfix: The FIX ME icon state no longer appears on the cycle helmet HUD button + if you're toggling the Squad Optic. + Unknownity Wei: + - rscadd: Added two new factions the PMCs and Historical/Miscallenous prey to the + Hunting Grounds pool. + - rscadd: Despoiler has been added to Hunting Grounds xenomorph T3 pool. + - rscadd: CLF Specialist has been added to the Hunting Grounds CLF pool. + - bugfix: Fixes USCM Smartgunner being hungry in the Hunting Grounds. + - bugfix: Fixes objectives not appearing for certain ERTs. + - bugfix: Fixes the super top hat appearing incorrectly on the mob. + Venuska1117: + - bugfix: Abduct can no longer can pass through wall griders. +2026-01-08: + Drathek: + - server: Map DB stats now save correctly + Killfish: + - refactor: Refactored Xeno Fire Immunity Code + Nihisohel: + - qol: You can now walk over small simple mobs (E.G. Rats) rather than swapping + positions with them + - balance: Reasonably small mobs (E.G Corgi Puppies, Larva, Facehuggers) now require + sprite clicking to be hit by throwing weapons + - code_imp: Adds a few simple mob parents, allows small simple_mob types to vent + crawl + Puckaboo2: + - bugfix: Fixes Data Detector's action button icon from displaying FIX ME when toggled. + - bugfix: Fixes Data Detector's action button icon not switching when clicking the + data detector in-hand. + - bugfix: Pharmaceutical Physician is now medical green on the crew monitor. +2026-01-11: + FourkhanDaKhan: + - balance: Nervestimulating (anti-stun) is disabled in natural generation. + - balance: It can still be obtained from pheromone plasma on 5X clearance. + - balance: Scientist and corporate survivors no longer grant research points by + swiping their IDs. + Thwomper, Nivrak: + - rscadd: Adds roof/sky Z-Level to all ground maps. +2026-01-12: + Puckaboo2: + - bugfix: Removes the random chance that Hunted Freelancers only spawn with beanbags + with their Type-23. + Xander3359: + - qol: Switching hands unwields. + aquariofury: + - balance: Players can no longer fire weapons while looking up or down ladders +2026-01-14: + Drathek: + - bugfix: SDQL can search for closets, cables, and vehicles +2026-01-16: + MistChristmas: + - bugfix: Nettles and Death nettles can be picked up when you have gloves on +2026-01-17: + Drathek: + - bugfix: SHARP operator pick is now stat tracked + - bugfix: Fixed an interaction loop for HMG/M2C with ladders + - bugfix: Fixed ladders not always unregistering a signal + - bugfix: Fixed a way for SSinactivity to runtime + Git-Nivrak: + - bugfix: Fixes HPR being able to fire 360 degrees while bipoded without undeploying + - refactor: Refactored reg_in_areas_in_z logic to address overtime issues + MistChristmas: + - bugfix: Inventory hotkeys don't let you use them if your lying down, restrained + or nested. + - bugfix: Acid Harness no longer warns of erroneous ODs when you have more than + one reagent + - bugfix: Round-Start nested corpses no longer block projectiles like bullets. + - bugfix: Coffee Machine no longer generates a magical cup when you brew coffee + with your hands full. + - ui: Tweaks to make the L and R in strip menu not move. + Nihisohel: + - balance: The spare senior command headset is now incapable of broadcasting a live + tacmap, you know who you are giving it away to grunts. + - code_imp: The CO tablet closet now spawns its contents upon initialization, rather + than mapped in + - bugfix: SEAs get their MP radio channel back. + Puckaboo2: + - balance: Hunting Ground marines no longer start with a full belly, but normal + belly. + - bugfix: Hunting Ground Smartgunners no longer start with an empty belly. + - code_imp: Fixes some spacing errors. + - spellcheck: Spellchecks some stuff. + Xander3359: + - qol: Clicking on something with a roller bed will buckle directly on the bed once + it's deployed + aquariofury: + - bugfix: Prevents things with ITEM_ABSTRACT from being put into linen bins + larentoun: + - bugfix: Chestbursting mutated larva will now have mutated icon. + realforest2001: + - admin: Xeno slashes against mobs now log their location. + zzzmike: + - admin: added logging in attack log for when people open stasis bags to grief the + hugged people inside + - qol: stasis bags now check for the open/close cooldown when opening the bag instead + of closing it. + - bugfix: message about opening a bag only appears when opening a stasis bag with + a mob inside +2026-01-18: + Drathek: + - rscdel: Removed the depreciated discord link verb and various discord link/certify + code + - config: Added optional CODE_MODIFICATIONS_MESSAGE config for the Show Server Revision + verb +2026-01-19: + realforest2001: + - rscadd: Cryoing as a predator will now open the slot again. +2026-01-20: + BOBAMA, Drathek: + - rscadd: New thematic gun spawners for mappers + - balance: Current gun spawners no longer spawn absurd quantities of rocket launchers + or Type19s + - bugfix: gun spawners now spawn ammo for shotguns and GLs + - bugfix: minor GC issue with mutliz stairs and build_blocker + - mapadd: Trijent Z levels + - mapadd: A lot of new nightmare inserts to Trijent + - maptweak: Original Trijent Z is now more detailed + Bibby0110: + - bugfix: CIC tablet now closes when you die/fall unconscious + Puckaboo2: + - code_imp: Adds a global hijack signal for coding and signalling goodness. + - rscadd: Adds emergency medical wall lockers with surgical vests, surgical beds, + and portable dialysis machines. The lockers cannot be unlocked; they open on + their own only during hijack. + - imageadd: Adds sprites to the new lockers. + - maptweak: Adds the emergency surgical wall lockers to the medical bay in the clothing + vending room. + Syndro101: + - bugfix: fixed issues outlined in issue 5966 with semiotics, lights and cameras + - maptweak: tweaked ship lights, cameras and semiotics + frans feiffer (sprite for tan saddle), ori: + - rscadd: added event-only runner saddles + - code_imp: buckling is now /atom/movable/ instead of /obj/ and moves the move and + forcemove procs of obj to just be part of the procs in movement.dm + - imageadd: added sprites for runner saddles + hry-gh: + - rscadd: added the ability to configure custom keybinds in your keybind settings, + these can be use to define up to 20 say/me/picksay keybinds to say whatever + you want + kiVts: + - balance: Tweaked OD for contracts to make intermediate more appealing. + - balance: Intermediates have much less properties on average + - balance: Value of a property is now accounted for in the price of a operation + - balance: Intermediate and hard level can now have more than 3 chemicals in the + recipe, made hard chemicals slightly harder to come by. + - balance: Made Optimized slightly better, changed Coniine chemical properties, + buffed paining by 10x, made Thymol effects slightly better. + - balance: having any negative in the chemical gives you a discount of 2 credits. + - bugfix: Contract recipe generation should account for when recipes don't pass + the occupied recipe check. + - bugfix: Transmute volume decrease fix, reagent overflow small fix. +2026-01-21: + AnCopper: + - qol: Added a "Copy Coordinates" button to the Laser Designator/Binoculars UI + Bibby0110: + - bugfix: Restore ghost appearance now changes your chat name + Ediblebomb: + - maptweak: Walkways in the RMC ERT map now line up with the RMC ERT shuttle's doors. + FebrezeNinja: + - qol: ChemMaster toggle to allow pill bottle auto-selection + Nihisohel: + - bugfix: You will no longer be able to use the offhand 'item' as a deadly weapon. + - bugfix: Items will no longer be inaccessible when attempting to place an item + on a limbless slot in the TGUI strip panel + - rscadd: Adds the old disposable camera as a 3 point loadout purchase, go out and + do some Frank West larp I guess + - balance: Changed the size of the old disposable camera from small to tiny. + - bugfix: Adds a delay to picture taking as to not lag the server + - qol: Pressing Unique-action on polaroid cameras will now switch its focus. + - rscdel: Removed the change focus verb for redundancy. + Nihisohel, EldritchSack for the sprites: + - rscadd: Whistles are now automatically used when an order is being given + - rscadd: Additionally, adds a trench whistle, capable of further enhancing leadership + orders at the cost of longer cooldown, slowing you down momentarily, and audibly + revealing your location + - balance: Changed the normal whistle cooldown from 10 seconds to 5 seconds, putting + my trust in everyone not to spam this shit + - balance: These trench whistles are only available to SLs, COs, and XOs, and remains + a vendor choice for the FTLs and SOs + PoltavskaPraca: + - bugfix: fixed wrong window break message + Puckaboo2: + - rscadd: You can pour the contents of pill bottles into glass reagent containers. + - spellcheck: Fixes some spelling and grammar errors. + - refactor: Refactors pill bottle dumping into the ChemMaster. + Sergeys: + - bugfix: fixed that some items cannot be crafted at low amount of crafting resources. + aquariofury: + - soundadd: adds two pain sfx that were already in the game files + ori-disillusion-mirnov: + - bugfix: you cant buckle xenos +2026-01-22: + Bibby0110: + - balance: Adds a 10 minute cooldown per-xeno for becoming the "last-stand" xenomorph + and getting a full-heal + DarkLordCabbage: + - balance: increased insulation of tents from 0.4 to 0.7 (enough to stop armorless + people from taking cold damage while inside) + Drathek: + - balance: Direct fire can no longer occur during a fire mission + - bugfix: Fixed some dropship weapon error messages + - ui: Polished various aspects of the dropship weapon panel + JackieEstegado: + - balance: Fractures can no longer be gained without taking brute damage or burns/eschar + without burn damage. + - bugfix: Fixed a case where one could have severe burns that could not be treated. + MistChristmas: + - spellcheck: Fixed some examine instances not accounting for gender/obscured face. + - maptweak: Removed a computer place ontop of the decryption computers. Removed + a duplicate Field Doctor Locker. Restored the Privacy button in the ORs. + Puckaboo2: + - bugfix: Unlit matches, cigs, and closed lighters no longer say they burn your + target. + cuberound: + - bugfix: fixes multiz connecting for lazy loaded maps + ori-disillusion-mirnov: + - rscadd: added a falling shell effect for OBs and mortars + realforest2001: + - rscadd: Added the Weyland-Yutani Corporate Bodyguard, the personal protector of + the on-board Liaison. + - rscadd: Added an armor suit and cap for the bodyguard. + - rscadd: Added a WY Security radio channel for use by Bodyguards and Sec Goons. + Also added motion sensors for this channel. + - rscadd: Added a WY Public radio channel for shared use. Allows division of Corporate + secure comms and a more generalised radio channel. + - rscdel: Removed WY encryption keys from WY radios, as they have the channel by + default already. + - rscadd: Added Weyland Yutani security paygrades, and applies them to the relevant + presets. + - maptweak: Mapping contributed by Syndro101 and LCMS1 + - maptweak: Re-mapped the Corporate Liaison's Office to fit the Bodyguard. The original + office room is now the entryway with the security desk. + zzzmike: + - bugfix: hijack timer will not reset if second dropship is hijacked +2026-01-23: + FourkhanDaKhan: + - rscadd: Re-adds the tacmap popup window. + Killfish: + - rscadd: Added Hive Stat Modifiers, allowing increases or decreases to certain + stats of all Xenos in a specific Hive. + - balance: Xenos belonging to the Forsaken Hive have increased stats pertaining + to combat. Be afraid of them. + - rscdel: Removed a few long-unused relics from the Xenomorph Maturation era. + Nihisohel: + - rscadd: You can now attach helmet covers as real accessories, not as a helmet + garb, on your helmets + - code_imp: 'NOTE: This does not support non-marine parent helmets (E.G. Riot helmet)' + - bugfix: You can take the essential fireteam utilities with either specialization + as the FTL now + - bugfix: XOs can also take either specialization kit with the whistle now + - bugfix: The action button for using the whistle is now shown when attached on + the uniform + - code_imp: Some minor backend for UI_action_buttons for accessories + - spellcheck: Switches UK specialisation to US specialization wording introduced + from trench whistles + Puckaboo2: + - spellcheck: Removes extra spaces between punctuation. + - spellcheck: Lots of spellchecks. + - soundadd: Adds The Marine's Hymn to Marine Major endgame tracks. + - bugfix: Helmets despawn like armors during the med challenge tutorial. + - spellcheck: '''Resistible'', multiple'', ''multiplied'', and ''inheritable'' are + no longer misspelled anywhere, among other words.' + Stakeyng Drathek: + - qol: added 40 more say/picksay/me bind slots (60 total) + - qol: added 10 more options per picksay (30 total) + - qol: limited the amount of characters per emote and picksay option to 256 + - bugfix: Fixed custom picksays not displaying the right mode when loading existing + bindings + Unknownity: + - balance: Whiskey Outpost now supports roundstart Queens. Simply ready up while + having the Queen job preference set to high. You will spawn in a cave, providing + ovi support to xenos until 1:00 ingame hour time after which you can join the + hive with the final assault. You are also able to evolve into a Queen if nobody + decides to become one roundstart. + - balance: Burrowers in Whiskey Outpost can burrow again while still be able to + make tunnels, in exchange most of the bunker inside locations have been reinforced + against xeno tunnels. + - balance: Whiskey Outpost xeno waves have been modified to allow sentinels, more + hivelords, early drones and low amount of early ravagers and boilers. Wave 14 + also grants xenos perma tacmap with humans visible. + - balance: Xenomorphs in Whiskey Outpost are now able to rest, avoiding bodyblock + issues and being able to passively heal, Reminder you don't need to die for + the next wave to progress. + - balance: Deevolution is now disabled in Whiskey Outpost. + - balance: Advanced Laser Designators found in Whiskey Outpost now provide sound + and blinking laser warnings to its CAS and Mortar airstrikes. + - balance: M56Ds on WO have had their AP decreased to 25 from 50. Removed some of + them placed on the map too. + - balance: Removed most of the starter Mortar incendiary shell supply in WO, replaced + them with frag shells. + - rscadd: Added crit and dead threshold increase gamemode modifier and added it + to WO. Humans now die at -150 health, getting extra 50 health. They now also + go into hard crit at -100 health. previously from -50, so you can stay awake + before then if you are on pain meds. + - rscadd: Added a gamemode modifier that disables Working Joes from spawning entirely, + currently only enabled on WO. + - rscadd: The Whiskey Outpost Combat Reporter now has access to the broadcasting + camera and portable fax backpack, check your closet! There's now also a television + outside medbay in WO. + - rscadd: Comtechs now have their own vendors in Whiskey Outpost, found in the Bunker + in their own special room and in Pillbox Beer. In exchange they lose 1 full + construction pouch of mats. + - rscadd: Added variations of Autodocs and Sleepers that are already fully upgraded, + these have been placed on Whiskey Outpost. + - rscadd: Added RecVendors also known as Walkman Vendors in Whiskey Outpost. + - rscadd: Renamed area_notunnel flag to area_noburrow, added a new area flag using + the old name used for disallowing the creation of xeno tunnels. + - bugfix: Fixed some grass tiles in Whiskey Outpost and added APCs to two areas + where they were missing and needed power. + - bugfix: Fixed Destination Taggers that are used in Whiskey Outpost. PSA, Wrap + crates with the wrappers and use the tagger on it then use the delivery chute! + - bugfix: Fixes ghosts/observers being able to health scan xenomorphs and simple + mobs. + - refactor: Refactored health_threshold_crit and dead code, merges xeno crit_health + into health threshold_dead. + - ui: Tweaked sleeper UI to handle more chems. + larentoun: + - bugfix: Xenomorphs with Seethrough Mob enabled (only Queen has it right now) now + will properly show wounds from damage on their icons. + ori-disillusion-mirnov: + - bugfix: ridden runners cannot ventcrawl +2026-01-24: + MistChristmas: + - bugfix: Decon-ing an APC and reconstructing it elsewhere no longer stops it from + charging + - code_imp: Terminals are now somewhat fluff and not a powernet object. + Red-byte3D: + - balance: Dirlock now has slowdown again +2026-01-26: + Drathek: + - bugfix: Self destruct now pauses win condition checks during SD sequence and is + explicitly a draw + - code_imp: Cleaned up some win condition handling + MistChristmas: + - soundtweak: 'Marine winning_triumph3: Marine Hymm is now normalised to -8db' + larentoun: + - bugfix: Mutated Despoiler is now Green Despoiler, not invisible one. + - bugfix: Mutated King is also Green now. + - maptweak: LV624 LZ1 is now correctly called "LZ1 Nexus", instead of being "Alamo + Landing Zone". +2026-01-28: + Nemesis1337, Zenith: + - bugfix: corrected broken icon states across all maps + - bugfix: corrected rotations of tiles and objects on Shivas and CORSAT + - bugfix: fixed broken bolt buttons on Shivas + - code_imp: adding glass to the window frame will now create the correct window + - balance: changed scrapeaway walls in west caves to only block the LZ + - balance: added empty IV bags and IV drips to all CLF inserts that didn't have + it + - imageadd: added new window variants for Shivas + - imagetweak: Shivas windows and walls are now darker + - maptweak: added missing tiles below windows and doors (Shivas and Fiorina) + - maptweak: added missing wiring terminals to SMESes on (Shivas, Fiorina and Kutjevo) + - maptweak: replaced unweedable turf in ETA (Solaris) + - maptweak: replaced old turrets in the CLF insert (Fiorina) + - maptweak: replaced old fences with the new slim fences and fence doors (Chance's + Claim) + - maptweak: replaced a prop M41AE2 with a functional one (Solaris) + - maptweak: updated basketball court visuals (Shivas and Fiorina) + - maptweak: tweaked area markers across all maps + - maptweak: changed scrapeaway walls in west caves to only block the LZ (Solaris) + - maptweak: removed duplicate objects (Solaris, Chance's Claim, Varadero, CORSAT) +2026-01-31: + Unknownity: + - maptweak: All ERT stations who had sleepers and autodocs have recieved upgrades + to said machines. + kiVts: + - rscadd: Fire-penetrating now makes particles appear on a fire + - balance: Made white-flame harder to get. diff --git a/html/changelogs/archive/2026-02.yml b/html/changelogs/archive/2026-02.yml new file mode 100644 index 000000000000..a0f24ba1cfe2 --- /dev/null +++ b/html/changelogs/archive/2026-02.yml @@ -0,0 +1,13 @@ +2026-02-01: + TrollerNoob: + - rscadd: Added Chestrig as a selectable backpack you can spawn with. Find it in + Backpack Types. +2026-02-03: + Ediblebomb: + - maptweak: The maintenance doors leading into the orbital bombardment control room + on both decks now have the correctg access requirements in place. + Xander3359: + - qol: Ladders will automatically show the radial wheel after being used +2026-02-04: + ihatethisengine: + - balance: removed aimed shot from PMC sniper spec diff --git a/html/paper_assets/background_card.png b/html/paper_assets/background_card.png new file mode 100644 index 000000000000..91fcf334ac6a Binary files /dev/null and b/html/paper_assets/background_card.png differ diff --git a/html/paper_assets/background_card_ribbed.png b/html/paper_assets/background_card_ribbed.png new file mode 100644 index 000000000000..4dc1476827d9 Binary files /dev/null and b/html/paper_assets/background_card_ribbed.png differ diff --git a/html/paper_assets/hd_punch_card.png b/html/paper_assets/hd_punch_card.png new file mode 100644 index 000000000000..ac10d4cc32be Binary files /dev/null and b/html/paper_assets/hd_punch_card.png differ diff --git a/html/paper_assets/logo_hd_carbon.png b/html/paper_assets/logo_hd_carbon.png new file mode 100644 index 000000000000..b81bc5f2f85c Binary files /dev/null and b/html/paper_assets/logo_hd_carbon.png differ diff --git a/html/paper_assets/logo_wy_carbon.png b/html/paper_assets/logo_wy_carbon.png new file mode 100644 index 000000000000..aea21676b646 Binary files /dev/null and b/html/paper_assets/logo_wy_carbon.png differ diff --git a/html/paper_assets/punch_card_inkscape.svg b/html/paper_assets/punch_card_inkscape.svg new file mode 100644 index 000000000000..8f56cd5f5f2d --- /dev/null +++ b/html/paper_assets/punch_card_inkscape.svg @@ -0,0 +1,1516 @@ + + + + diff --git a/html/paper_assets/punch_card_punch.png b/html/paper_assets/punch_card_punch.png new file mode 100644 index 000000000000..e109a55ee195 Binary files /dev/null and b/html/paper_assets/punch_card_punch.png differ diff --git a/html/paper_assets/wy_punch_card.png b/html/paper_assets/wy_punch_card.png new file mode 100644 index 000000000000..df424e3e6993 Binary files /dev/null and b/html/paper_assets/wy_punch_card.png differ diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi index 5da80718f590..0d199a18156d 100644 Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ diff --git a/icons/effects/mouse_pointer/twe.dmi b/icons/effects/mouse_pointer/twe.dmi index 1bc361422f26..7bb7e2b25b94 100644 Binary files a/icons/effects/mouse_pointer/twe.dmi and b/icons/effects/mouse_pointer/twe.dmi differ diff --git a/icons/effects/mouse_pointer/upp.dmi b/icons/effects/mouse_pointer/upp.dmi index 84c0e850f994..3839e0545421 100644 Binary files a/icons/effects/mouse_pointer/upp.dmi and b/icons/effects/mouse_pointer/upp.dmi differ diff --git a/icons/effects/mouse_pointer/uscm.dmi b/icons/effects/mouse_pointer/uscm.dmi index df7ca5e2d61a..dad19fe547cf 100644 Binary files a/icons/effects/mouse_pointer/uscm.dmi and b/icons/effects/mouse_pointer/uscm.dmi differ diff --git a/icons/effects/mouse_pointer/wy.dmi b/icons/effects/mouse_pointer/wy.dmi index 3ed617bc748c..5fda825c7366 100644 Binary files a/icons/effects/mouse_pointer/wy.dmi and b/icons/effects/mouse_pointer/wy.dmi differ diff --git a/icons/effects/mouse_pointer/xeno.dmi b/icons/effects/mouse_pointer/xeno.dmi index 07b7d4254588..39c28443d180 100644 Binary files a/icons/effects/mouse_pointer/xeno.dmi and b/icons/effects/mouse_pointer/xeno.dmi differ diff --git a/icons/effects/status_effects.dmi b/icons/effects/status_effects.dmi index 471da42ff35d..3c63fb6c9125 100644 Binary files a/icons/effects/status_effects.dmi and b/icons/effects/status_effects.dmi differ diff --git a/icons/landmarks.dmi b/icons/landmarks.dmi index 539a427c8e7b..97c34f21b625 100644 Binary files a/icons/landmarks.dmi and b/icons/landmarks.dmi differ diff --git a/icons/mob/hud/actions.dmi b/icons/mob/hud/actions.dmi index 547f59f4a80d..177c9cc783bb 100644 Binary files a/icons/mob/hud/actions.dmi and b/icons/mob/hud/actions.dmi differ diff --git a/icons/mob/hud/actions_xeno.dmi b/icons/mob/hud/actions_xeno.dmi index cb764515bf45..38dea9234207 100644 Binary files a/icons/mob/hud/actions_xeno.dmi and b/icons/mob/hud/actions_xeno.dmi differ diff --git a/icons/mob/hud/actions_yautja.dmi b/icons/mob/hud/actions_yautja.dmi index c94388456e96..5e0714f92d47 100644 Binary files a/icons/mob/hud/actions_yautja.dmi and b/icons/mob/hud/actions_yautja.dmi differ diff --git a/icons/mob/hud/factions/clf.dmi b/icons/mob/hud/factions/clf.dmi new file mode 100644 index 000000000000..dced2e369316 Binary files /dev/null and b/icons/mob/hud/factions/clf.dmi differ diff --git a/icons/mob/hud/factions/cmb.dmi b/icons/mob/hud/factions/cmb.dmi new file mode 100644 index 000000000000..0fb8fa05d202 Binary files /dev/null and b/icons/mob/hud/factions/cmb.dmi differ diff --git a/icons/mob/hud/factions/hyperdyne.dmi b/icons/mob/hud/factions/hyperdyne.dmi new file mode 100644 index 000000000000..a5b35ea1f7a4 Binary files /dev/null and b/icons/mob/hud/factions/hyperdyne.dmi differ diff --git a/icons/mob/hud/factions/marine.dmi b/icons/mob/hud/factions/marine.dmi new file mode 100644 index 000000000000..6b28fea5db99 Binary files /dev/null and b/icons/mob/hud/factions/marine.dmi differ diff --git a/icons/mob/hud/factions/twe.dmi b/icons/mob/hud/factions/twe.dmi new file mode 100644 index 000000000000..7c3dce877203 Binary files /dev/null and b/icons/mob/hud/factions/twe.dmi differ diff --git a/icons/mob/hud/factions/upp.dmi b/icons/mob/hud/factions/upp.dmi new file mode 100644 index 000000000000..4ddcc4867ab1 Binary files /dev/null and b/icons/mob/hud/factions/upp.dmi differ diff --git a/icons/mob/hud/factions/wy.dmi b/icons/mob/hud/factions/wy.dmi new file mode 100644 index 000000000000..4fd6ac57f038 Binary files /dev/null and b/icons/mob/hud/factions/wy.dmi differ diff --git a/icons/mob/hud/hud_yautja.dmi b/icons/mob/hud/hud_yautja.dmi index 50e631318a10..a6a753950d95 100644 Binary files a/icons/mob/hud/hud_yautja.dmi and b/icons/mob/hud/hud_yautja.dmi differ diff --git a/icons/mob/hud/human_status.dmi b/icons/mob/hud/human_status.dmi new file mode 100644 index 000000000000..4389ff107cee Binary files /dev/null and b/icons/mob/hud/human_status.dmi differ diff --git a/icons/mob/hud/marine_hud.dmi b/icons/mob/hud/marine_hud.dmi deleted file mode 100644 index 0e6b0d2137da..000000000000 Binary files a/icons/mob/hud/marine_hud.dmi and /dev/null differ diff --git a/icons/mob/hud/minimap_overlay.dmi b/icons/mob/hud/minimap_overlay.dmi new file mode 100644 index 000000000000..e3b6a4ce3dc2 Binary files /dev/null and b/icons/mob/hud/minimap_overlay.dmi differ diff --git a/icons/mob/hud/sec_hud.dmi b/icons/mob/hud/sec_hud.dmi index 92b690d8d47d..fda21cab1d49 100644 Binary files a/icons/mob/hud/sec_hud.dmi and b/icons/mob/hud/sec_hud.dmi differ diff --git a/icons/mob/humans/onmob/clothing/accessory/medals.dmi b/icons/mob/humans/onmob/clothing/accessory/medals.dmi index 66628ba5dee8..3fd218758b77 100644 Binary files a/icons/mob/humans/onmob/clothing/accessory/medals.dmi and b/icons/mob/humans/onmob/clothing/accessory/medals.dmi differ diff --git a/icons/mob/humans/onmob/clothing/accessory/misc.dmi b/icons/mob/humans/onmob/clothing/accessory/misc.dmi index a88106d41425..8e37b88654e0 100644 Binary files a/icons/mob/humans/onmob/clothing/accessory/misc.dmi and b/icons/mob/humans/onmob/clothing/accessory/misc.dmi differ diff --git a/icons/mob/humans/onmob/clothing/accessory/ranks.dmi b/icons/mob/humans/onmob/clothing/accessory/ranks.dmi index 5fad72f75070..aaae33ad5c38 100644 Binary files a/icons/mob/humans/onmob/clothing/accessory/ranks.dmi and b/icons/mob/humans/onmob/clothing/accessory/ranks.dmi differ diff --git a/icons/mob/humans/onmob/clothing/accessory/webbings.dmi b/icons/mob/humans/onmob/clothing/accessory/webbings.dmi index b466f60a5a0f..fdf8ff1c4ca4 100644 Binary files a/icons/mob/humans/onmob/clothing/accessory/webbings.dmi and b/icons/mob/humans/onmob/clothing/accessory/webbings.dmi differ diff --git a/icons/mob/humans/onmob/clothing/back/backpacks_by_faction/UA.dmi b/icons/mob/humans/onmob/clothing/back/backpacks_by_faction/UA.dmi index 1696678a898f..5e6acbedf6b9 100644 Binary files a/icons/mob/humans/onmob/clothing/back/backpacks_by_faction/UA.dmi and b/icons/mob/humans/onmob/clothing/back/backpacks_by_faction/UA.dmi differ diff --git a/icons/mob/humans/onmob/clothing/back/backpacks_by_map/classic.dmi b/icons/mob/humans/onmob/clothing/back/backpacks_by_map/classic.dmi index 67b36ca05b77..680ec4e20161 100644 Binary files a/icons/mob/humans/onmob/clothing/back/backpacks_by_map/classic.dmi and b/icons/mob/humans/onmob/clothing/back/backpacks_by_map/classic.dmi differ diff --git a/icons/mob/humans/onmob/clothing/back/guns_by_type/pred_guns.dmi b/icons/mob/humans/onmob/clothing/back/guns_by_type/pred_guns.dmi new file mode 100644 index 000000000000..247a5cfef3a7 Binary files /dev/null and b/icons/mob/humans/onmob/clothing/back/guns_by_type/pred_guns.dmi differ diff --git a/icons/mob/humans/onmob/clothing/belts/belts.dmi b/icons/mob/humans/onmob/clothing/belts/belts.dmi index 6bcdcccc3eda..5be262a1a2c7 100644 Binary files a/icons/mob/humans/onmob/clothing/belts/belts.dmi and b/icons/mob/humans/onmob/clothing/belts/belts.dmi differ diff --git a/icons/mob/humans/onmob/clothing/belts/belts_by_map/classic.dmi b/icons/mob/humans/onmob/clothing/belts/belts_by_map/classic.dmi index b14650e4c6b8..92663dd90d8b 100644 Binary files a/icons/mob/humans/onmob/clothing/belts/belts_by_map/classic.dmi and b/icons/mob/humans/onmob/clothing/belts/belts_by_map/classic.dmi differ diff --git a/icons/mob/humans/onmob/clothing/belts/belts_by_map/desert.dmi b/icons/mob/humans/onmob/clothing/belts/belts_by_map/desert.dmi index 6895c535e12d..45cb79432f49 100644 Binary files a/icons/mob/humans/onmob/clothing/belts/belts_by_map/desert.dmi and b/icons/mob/humans/onmob/clothing/belts/belts_by_map/desert.dmi differ diff --git a/icons/mob/humans/onmob/clothing/belts/belts_by_map/jungle.dmi b/icons/mob/humans/onmob/clothing/belts/belts_by_map/jungle.dmi index c0eb59845744..6df731b0eea6 100644 Binary files a/icons/mob/humans/onmob/clothing/belts/belts_by_map/jungle.dmi and b/icons/mob/humans/onmob/clothing/belts/belts_by_map/jungle.dmi differ diff --git a/icons/mob/humans/onmob/clothing/belts/belts_by_map/snow.dmi b/icons/mob/humans/onmob/clothing/belts/belts_by_map/snow.dmi index 3741cae5b9e3..be81ac30dc88 100644 Binary files a/icons/mob/humans/onmob/clothing/belts/belts_by_map/snow.dmi and b/icons/mob/humans/onmob/clothing/belts/belts_by_map/snow.dmi differ diff --git a/icons/mob/humans/onmob/clothing/belts/belts_by_map/urban.dmi b/icons/mob/humans/onmob/clothing/belts/belts_by_map/urban.dmi index 3741cae5b9e3..be81ac30dc88 100644 Binary files a/icons/mob/humans/onmob/clothing/belts/belts_by_map/urban.dmi and b/icons/mob/humans/onmob/clothing/belts/belts_by_map/urban.dmi differ diff --git a/icons/mob/humans/onmob/clothing/feet.dmi b/icons/mob/humans/onmob/clothing/feet.dmi index b265d2a3cd00..262e47b62b62 100644 Binary files a/icons/mob/humans/onmob/clothing/feet.dmi and b/icons/mob/humans/onmob/clothing/feet.dmi differ diff --git a/icons/mob/humans/onmob/clothing/hands.dmi b/icons/mob/humans/onmob/clothing/hands.dmi index 06744e9f615f..9588cda9d3b1 100644 Binary files a/icons/mob/humans/onmob/clothing/hands.dmi and b/icons/mob/humans/onmob/clothing/hands.dmi differ diff --git a/icons/mob/humans/onmob/clothing/head/hats_by_faction/WY.dmi b/icons/mob/humans/onmob/clothing/head/hats_by_faction/WY.dmi index 8eb50153391f..8ccd08f9bab4 100644 Binary files a/icons/mob/humans/onmob/clothing/head/hats_by_faction/WY.dmi and b/icons/mob/humans/onmob/clothing/head/hats_by_faction/WY.dmi differ diff --git a/icons/mob/humans/onmob/clothing/head/hats_by_map/classic.dmi b/icons/mob/humans/onmob/clothing/head/hats_by_map/classic.dmi index b5315259a123..f402783bb1bc 100644 Binary files a/icons/mob/humans/onmob/clothing/head/hats_by_map/classic.dmi and b/icons/mob/humans/onmob/clothing/head/hats_by_map/classic.dmi differ diff --git a/icons/mob/humans/onmob/clothing/head/hats_by_map/desert.dmi b/icons/mob/humans/onmob/clothing/head/hats_by_map/desert.dmi index 6c75839170df..749e7cf1c588 100644 Binary files a/icons/mob/humans/onmob/clothing/head/hats_by_map/desert.dmi and b/icons/mob/humans/onmob/clothing/head/hats_by_map/desert.dmi differ diff --git a/icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi b/icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi index 2db373cd697c..9448ba56fe73 100644 Binary files a/icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi and b/icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi differ diff --git a/icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi b/icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi index d0d82fccdca7..fd7c9d0596f5 100644 Binary files a/icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi and b/icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi differ diff --git a/icons/mob/humans/onmob/clothing/head/hats_by_map/urban.dmi b/icons/mob/humans/onmob/clothing/head/hats_by_map/urban.dmi index 01672b4da29a..86cf01faf1ef 100644 Binary files a/icons/mob/humans/onmob/clothing/head/hats_by_map/urban.dmi and b/icons/mob/humans/onmob/clothing/head/hats_by_map/urban.dmi differ diff --git a/icons/mob/humans/onmob/clothing/head/head_64.dmi b/icons/mob/humans/onmob/clothing/head/head_64.dmi index ea04fcaf39d3..c9ae56ad8ec1 100644 Binary files a/icons/mob/humans/onmob/clothing/head/head_64.dmi and b/icons/mob/humans/onmob/clothing/head/head_64.dmi differ diff --git a/icons/mob/humans/onmob/clothing/head/misc_ert_colony.dmi b/icons/mob/humans/onmob/clothing/head/misc_ert_colony.dmi index 8d4c91daa1e6..7d476bac5dd5 100644 Binary files a/icons/mob/humans/onmob/clothing/head/misc_ert_colony.dmi and b/icons/mob/humans/onmob/clothing/head/misc_ert_colony.dmi differ diff --git a/icons/mob/humans/onmob/clothing/head/surgical_caps.dmi b/icons/mob/humans/onmob/clothing/head/surgical_caps.dmi index e99ddf7361c1..2670b4e5a654 100644 Binary files a/icons/mob/humans/onmob/clothing/head/surgical_caps.dmi and b/icons/mob/humans/onmob/clothing/head/surgical_caps.dmi differ diff --git a/icons/mob/humans/onmob/clothing/helmet_garb/goggles.dmi b/icons/mob/humans/onmob/clothing/helmet_garb/goggles.dmi index a5e21fff8176..e94549bcdc19 100644 Binary files a/icons/mob/humans/onmob/clothing/helmet_garb/goggles.dmi and b/icons/mob/humans/onmob/clothing/helmet_garb/goggles.dmi differ diff --git a/icons/mob/humans/onmob/clothing/masks/objects.dmi b/icons/mob/humans/onmob/clothing/masks/objects.dmi index a9910d35ab44..c84f7845e279 100644 Binary files a/icons/mob/humans/onmob/clothing/masks/objects.dmi and b/icons/mob/humans/onmob/clothing/masks/objects.dmi differ diff --git a/icons/mob/humans/onmob/clothing/suit_storage/belts.dmi b/icons/mob/humans/onmob/clothing/suit_storage/belts.dmi index 4f44e24c0c34..c6f4a60ca1fe 100644 Binary files a/icons/mob/humans/onmob/clothing/suit_storage/belts.dmi and b/icons/mob/humans/onmob/clothing/suit_storage/belts.dmi differ diff --git a/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/pistols.dmi b/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/pistols.dmi index be10bc20bbf6..fb0afdc2783f 100644 Binary files a/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/pistols.dmi and b/icons/mob/humans/onmob/clothing/suit_storage/guns_by_type/pistols.dmi differ diff --git a/icons/mob/humans/onmob/clothing/suits/coats_robes.dmi b/icons/mob/humans/onmob/clothing/suits/coats_robes.dmi index c810860e3ef6..e424139edb84 100644 Binary files a/icons/mob/humans/onmob/clothing/suits/coats_robes.dmi and b/icons/mob/humans/onmob/clothing/suits/coats_robes.dmi differ diff --git a/icons/mob/humans/onmob/clothing/suits/misc_ert.dmi b/icons/mob/humans/onmob/clothing/suits/misc_ert.dmi index 33025af84f3f..68b177625f48 100644 Binary files a/icons/mob/humans/onmob/clothing/suits/misc_ert.dmi and b/icons/mob/humans/onmob/clothing/suits/misc_ert.dmi differ diff --git a/icons/mob/humans/onmob/clothing/suits/suits_by_faction/WY.dmi b/icons/mob/humans/onmob/clothing/suits/suits_by_faction/WY.dmi index 180350434403..dde69bd39a14 100644 Binary files a/icons/mob/humans/onmob/clothing/suits/suits_by_faction/WY.dmi and b/icons/mob/humans/onmob/clothing/suits/suits_by_faction/WY.dmi differ diff --git a/icons/mob/humans/onmob/clothing/suits/suits_by_map/classic.dmi b/icons/mob/humans/onmob/clothing/suits/suits_by_map/classic.dmi index 031609e7fc75..69c455a10fc8 100644 Binary files a/icons/mob/humans/onmob/clothing/suits/suits_by_map/classic.dmi and b/icons/mob/humans/onmob/clothing/suits/suits_by_map/classic.dmi differ diff --git a/icons/mob/humans/onmob/clothing/suits/suits_by_map/desert.dmi b/icons/mob/humans/onmob/clothing/suits/suits_by_map/desert.dmi index aab091d05a4d..d0f300ff270d 100644 Binary files a/icons/mob/humans/onmob/clothing/suits/suits_by_map/desert.dmi and b/icons/mob/humans/onmob/clothing/suits/suits_by_map/desert.dmi differ diff --git a/icons/mob/humans/onmob/clothing/suits/suits_by_map/jungle.dmi b/icons/mob/humans/onmob/clothing/suits/suits_by_map/jungle.dmi index 35c2598795fa..f854b57d9d87 100644 Binary files a/icons/mob/humans/onmob/clothing/suits/suits_by_map/jungle.dmi and b/icons/mob/humans/onmob/clothing/suits/suits_by_map/jungle.dmi differ diff --git a/icons/mob/humans/onmob/clothing/suits/suits_by_map/snow.dmi b/icons/mob/humans/onmob/clothing/suits/suits_by_map/snow.dmi index 433fb020d232..3ce7d96f90c6 100644 Binary files a/icons/mob/humans/onmob/clothing/suits/suits_by_map/snow.dmi and b/icons/mob/humans/onmob/clothing/suits/suits_by_map/snow.dmi differ diff --git a/icons/mob/humans/onmob/clothing/suits/suits_by_map/urban.dmi b/icons/mob/humans/onmob/clothing/suits/suits_by_map/urban.dmi index f757f6db98a1..72aa95bb3621 100644 Binary files a/icons/mob/humans/onmob/clothing/suits/suits_by_map/urban.dmi and b/icons/mob/humans/onmob/clothing/suits/suits_by_map/urban.dmi differ diff --git a/icons/mob/humans/onmob/clothing/uniforms/misc_ert_colony.dmi b/icons/mob/humans/onmob/clothing/uniforms/misc_ert_colony.dmi index 550a50e18947..2e27e1586c93 100644 Binary files a/icons/mob/humans/onmob/clothing/uniforms/misc_ert_colony.dmi and b/icons/mob/humans/onmob/clothing/uniforms/misc_ert_colony.dmi differ diff --git a/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/medical.dmi b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/medical.dmi index 3d751fc657af..f546ee2bdf2e 100644 Binary files a/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/medical.dmi and b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/medical.dmi differ diff --git a/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/research.dmi b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/research.dmi index 74b9efdcbb03..078e8f6f22df 100644 Binary files a/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/research.dmi and b/icons/mob/humans/onmob/clothing/uniforms/uniforms_by_department/research.dmi differ diff --git a/icons/mob/humans/onmob/hunter/items_lefthand.dmi b/icons/mob/humans/onmob/hunter/items_lefthand.dmi index 9c8cf47031ce..dd516a886b26 100644 Binary files a/icons/mob/humans/onmob/hunter/items_lefthand.dmi and b/icons/mob/humans/onmob/hunter/items_lefthand.dmi differ diff --git a/icons/mob/humans/onmob/hunter/items_righthand.dmi b/icons/mob/humans/onmob/hunter/items_righthand.dmi index ee66ee248810..7b1a009ef5d6 100644 Binary files a/icons/mob/humans/onmob/hunter/items_righthand.dmi and b/icons/mob/humans/onmob/hunter/items_righthand.dmi differ diff --git a/icons/mob/humans/onmob/hunter/pred_bracers.dmi b/icons/mob/humans/onmob/hunter/pred_bracers.dmi new file mode 100644 index 000000000000..fab89d1ffb16 Binary files /dev/null and b/icons/mob/humans/onmob/hunter/pred_bracers.dmi differ diff --git a/icons/mob/humans/onmob/hunter/pred_gear.dmi b/icons/mob/humans/onmob/hunter/pred_gear.dmi index 19609615404f..351de07408a1 100644 Binary files a/icons/mob/humans/onmob/hunter/pred_gear.dmi and b/icons/mob/humans/onmob/hunter/pred_gear.dmi differ diff --git a/icons/mob/humans/onmob/hunter/suit_storage.dmi b/icons/mob/humans/onmob/hunter/suit_storage.dmi new file mode 100644 index 000000000000..3b9104130ff1 Binary files /dev/null and b/icons/mob/humans/onmob/hunter/suit_storage.dmi differ diff --git a/icons/mob/humans/onmob/inhands/equipment/medical_lefthand.dmi b/icons/mob/humans/onmob/inhands/equipment/medical_lefthand.dmi index 231205ce8890..7ae4fd4152c6 100644 Binary files a/icons/mob/humans/onmob/inhands/equipment/medical_lefthand.dmi and b/icons/mob/humans/onmob/inhands/equipment/medical_lefthand.dmi differ diff --git a/icons/mob/humans/onmob/inhands/equipment/medical_righthand.dmi b/icons/mob/humans/onmob/inhands/equipment/medical_righthand.dmi index c3d6f5f82250..7743f29bb35d 100644 Binary files a/icons/mob/humans/onmob/inhands/equipment/medical_righthand.dmi and b/icons/mob/humans/onmob/inhands/equipment/medical_righthand.dmi differ diff --git a/icons/mob/humans/onmob/inhands/items/books_lefthand.dmi b/icons/mob/humans/onmob/inhands/items/books_lefthand.dmi index c0b4d408a020..a0b906710165 100644 Binary files a/icons/mob/humans/onmob/inhands/items/books_lefthand.dmi and b/icons/mob/humans/onmob/inhands/items/books_lefthand.dmi differ diff --git a/icons/mob/humans/onmob/inhands/items/books_righthand.dmi b/icons/mob/humans/onmob/inhands/items/books_righthand.dmi index b6309567cfff..4e096c6a3a49 100644 Binary files a/icons/mob/humans/onmob/inhands/items/books_righthand.dmi and b/icons/mob/humans/onmob/inhands/items/books_righthand.dmi differ diff --git a/icons/mob/humans/onmob/inhands/weapons/guns/pistols_lefthand.dmi b/icons/mob/humans/onmob/inhands/weapons/guns/pistols_lefthand.dmi index 544ee4baba5b..9a3d677f3990 100644 Binary files a/icons/mob/humans/onmob/inhands/weapons/guns/pistols_lefthand.dmi and b/icons/mob/humans/onmob/inhands/weapons/guns/pistols_lefthand.dmi differ diff --git a/icons/mob/humans/onmob/inhands/weapons/guns/pistols_righthand.dmi b/icons/mob/humans/onmob/inhands/weapons/guns/pistols_righthand.dmi index 3d3cbbee84c4..d028e02a18ed 100644 Binary files a/icons/mob/humans/onmob/inhands/weapons/guns/pistols_righthand.dmi and b/icons/mob/humans/onmob/inhands/weapons/guns/pistols_righthand.dmi differ diff --git a/icons/mob/humans/onmob/inhands/weapons/guns/pred_guns_lefthand.dmi b/icons/mob/humans/onmob/inhands/weapons/guns/pred_guns_lefthand.dmi new file mode 100644 index 000000000000..22bf724861d6 Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/guns/pred_guns_lefthand.dmi differ diff --git a/icons/mob/humans/onmob/inhands/weapons/guns/pred_guns_righthand.dmi b/icons/mob/humans/onmob/inhands/weapons/guns/pred_guns_righthand.dmi new file mode 100644 index 000000000000..749b6f14d1b0 Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/guns/pred_guns_righthand.dmi differ diff --git a/icons/mob/humans/onmob/inhands/weapons/guns/revolvers_lefthand.dmi b/icons/mob/humans/onmob/inhands/weapons/guns/revolvers_lefthand.dmi index 420e5c558e44..5ba35f8e4d6d 100644 Binary files a/icons/mob/humans/onmob/inhands/weapons/guns/revolvers_lefthand.dmi and b/icons/mob/humans/onmob/inhands/weapons/guns/revolvers_lefthand.dmi differ diff --git a/icons/mob/humans/onmob/inhands/weapons/guns/revolvers_righthand.dmi b/icons/mob/humans/onmob/inhands/weapons/guns/revolvers_righthand.dmi index 6bb767b893ec..ed8de42b1066 100644 Binary files a/icons/mob/humans/onmob/inhands/weapons/guns/revolvers_righthand.dmi and b/icons/mob/humans/onmob/inhands/weapons/guns/revolvers_righthand.dmi differ diff --git a/icons/mob/humans/onmob/inhands/weapons/guns/smgs_lefthand.dmi b/icons/mob/humans/onmob/inhands/weapons/guns/smgs_lefthand.dmi index 2d88cd450e2b..310ecbd61b87 100644 Binary files a/icons/mob/humans/onmob/inhands/weapons/guns/smgs_lefthand.dmi and b/icons/mob/humans/onmob/inhands/weapons/guns/smgs_lefthand.dmi differ diff --git a/icons/mob/humans/onmob/inhands/weapons/guns/smgs_righthand.dmi b/icons/mob/humans/onmob/inhands/weapons/guns/smgs_righthand.dmi index 61a3d4e46ec0..143e063158c0 100644 Binary files a/icons/mob/humans/onmob/inhands/weapons/guns/smgs_righthand.dmi and b/icons/mob/humans/onmob/inhands/weapons/guns/smgs_righthand.dmi differ diff --git a/icons/mob/humans/onmob/inhands/weapons/melee/64_weapons_lefthand.dmi b/icons/mob/humans/onmob/inhands/weapons/melee/64_weapons_lefthand.dmi new file mode 100644 index 000000000000..cf12407ae991 Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/melee/64_weapons_lefthand.dmi differ diff --git a/icons/mob/humans/onmob/inhands/weapons/melee/64_weapons_righthand.dmi b/icons/mob/humans/onmob/inhands/weapons/melee/64_weapons_righthand.dmi new file mode 100644 index 000000000000..34f8a4758215 Binary files /dev/null and b/icons/mob/humans/onmob/inhands/weapons/melee/64_weapons_righthand.dmi differ diff --git a/icons/mob/humans/onmob/inhands/weapons/melee/shields_lefthand.dmi b/icons/mob/humans/onmob/inhands/weapons/melee/shields_lefthand.dmi index c42c4c9bf95b..bbd7f7164263 100644 Binary files a/icons/mob/humans/onmob/inhands/weapons/melee/shields_lefthand.dmi and b/icons/mob/humans/onmob/inhands/weapons/melee/shields_lefthand.dmi differ diff --git a/icons/mob/humans/onmob/inhands/weapons/melee/shields_righthand.dmi b/icons/mob/humans/onmob/inhands/weapons/melee/shields_righthand.dmi index 56075cbe7734..9db9c136d9cd 100644 Binary files a/icons/mob/humans/onmob/inhands/weapons/melee/shields_righthand.dmi and b/icons/mob/humans/onmob/inhands/weapons/melee/shields_righthand.dmi differ diff --git a/icons/mob/humans/onmob/inhands/weapons/melee/swords_lefthand.dmi b/icons/mob/humans/onmob/inhands/weapons/melee/swords_lefthand.dmi index ddb9fd9854f1..f172c612dd53 100644 Binary files a/icons/mob/humans/onmob/inhands/weapons/melee/swords_lefthand.dmi and b/icons/mob/humans/onmob/inhands/weapons/melee/swords_lefthand.dmi differ diff --git a/icons/mob/humans/onmob/inhands/weapons/melee/swords_righthand.dmi b/icons/mob/humans/onmob/inhands/weapons/melee/swords_righthand.dmi index a60586fcb580..618b1fdbe5c6 100644 Binary files a/icons/mob/humans/onmob/inhands/weapons/melee/swords_righthand.dmi and b/icons/mob/humans/onmob/inhands/weapons/melee/swords_righthand.dmi differ diff --git a/icons/mob/humans/undershirt.dmi b/icons/mob/humans/undershirt.dmi index f0e9c1bc0f7e..b88cb365224c 100644 Binary files a/icons/mob/humans/undershirt.dmi and b/icons/mob/humans/undershirt.dmi differ diff --git a/icons/mob/humans/underwear.dmi b/icons/mob/humans/underwear.dmi index 53f3f0ea7970..4bb9f002fc9a 100644 Binary files a/icons/mob/humans/underwear.dmi and b/icons/mob/humans/underwear.dmi differ diff --git a/icons/mob/screen_alert.dmi b/icons/mob/screen_alert.dmi index 21cc40876fbc..edfb3d071652 100644 Binary files a/icons/mob/screen_alert.dmi and b/icons/mob/screen_alert.dmi differ diff --git a/icons/mob/xenos/castes/tier_3/despoiler.dmi b/icons/mob/xenos/castes/tier_3/despoiler.dmi new file mode 100644 index 000000000000..0ced39b2d745 Binary files /dev/null and b/icons/mob/xenos/castes/tier_3/despoiler.dmi differ diff --git a/icons/mob/xenos/effects_xenoids.dmi b/icons/mob/xenos/effects_xenoids.dmi new file mode 100644 index 000000000000..b3ac49a24617 Binary files /dev/null and b/icons/mob/xenos/effects_xenoids.dmi differ diff --git a/icons/mob/xenos/onmob/runner.dmi b/icons/mob/xenos/onmob/runner.dmi index 7ec0a18bad93..2a365b38dbb3 100644 Binary files a/icons/mob/xenos/onmob/runner.dmi and b/icons/mob/xenos/onmob/runner.dmi differ diff --git a/icons/mob/xenos/radial_xenos.dmi b/icons/mob/xenos/radial_xenos.dmi index 0310ab56d40a..2795a2c590ce 100644 Binary files a/icons/mob/xenos/radial_xenos.dmi and b/icons/mob/xenos/radial_xenos.dmi differ diff --git a/icons/mob/xenos/weeds_64x64.dmi b/icons/mob/xenos/weeds_64x64.dmi index b0c5c86f2c0a..f47fa6ecd1a4 100644 Binary files a/icons/mob/xenos/weeds_64x64.dmi and b/icons/mob/xenos/weeds_64x64.dmi differ diff --git a/icons/obj/items/books.dmi b/icons/obj/items/books.dmi index 056cbd5958d8..f5ce40e2bfe0 100644 Binary files a/icons/obj/items/books.dmi and b/icons/obj/items/books.dmi differ diff --git a/icons/obj/items/chemistry.dmi b/icons/obj/items/chemistry.dmi index ed1898313a24..a2f693a3dd26 100644 Binary files a/icons/obj/items/chemistry.dmi and b/icons/obj/items/chemistry.dmi differ diff --git a/icons/obj/items/clothing/accessory/inventory_overlays/medals.dmi b/icons/obj/items/clothing/accessory/inventory_overlays/medals.dmi index 4a79e556ed4b..95e2dc6244f3 100644 Binary files a/icons/obj/items/clothing/accessory/inventory_overlays/medals.dmi and b/icons/obj/items/clothing/accessory/inventory_overlays/medals.dmi differ diff --git a/icons/obj/items/clothing/accessory/inventory_overlays/misc.dmi b/icons/obj/items/clothing/accessory/inventory_overlays/misc.dmi index 6ae22d5d4326..cb74eb464c9a 100644 Binary files a/icons/obj/items/clothing/accessory/inventory_overlays/misc.dmi and b/icons/obj/items/clothing/accessory/inventory_overlays/misc.dmi differ diff --git a/icons/obj/items/clothing/accessory/inventory_overlays/ranks.dmi b/icons/obj/items/clothing/accessory/inventory_overlays/ranks.dmi index 7a22812d8283..73de7673acd6 100644 Binary files a/icons/obj/items/clothing/accessory/inventory_overlays/ranks.dmi and b/icons/obj/items/clothing/accessory/inventory_overlays/ranks.dmi differ diff --git a/icons/obj/items/clothing/accessory/inventory_overlays/webbings.dmi b/icons/obj/items/clothing/accessory/inventory_overlays/webbings.dmi index fcedd856d68d..6c3e57b5a20f 100644 Binary files a/icons/obj/items/clothing/accessory/inventory_overlays/webbings.dmi and b/icons/obj/items/clothing/accessory/inventory_overlays/webbings.dmi differ diff --git a/icons/obj/items/clothing/accessory/medals.dmi b/icons/obj/items/clothing/accessory/medals.dmi index f6150c0a8dff..2c1e008211a4 100644 Binary files a/icons/obj/items/clothing/accessory/medals.dmi and b/icons/obj/items/clothing/accessory/medals.dmi differ diff --git a/icons/obj/items/clothing/accessory/ranks.dmi b/icons/obj/items/clothing/accessory/ranks.dmi index 8abca6c6a82a..412a559d2bea 100644 Binary files a/icons/obj/items/clothing/accessory/ranks.dmi and b/icons/obj/items/clothing/accessory/ranks.dmi differ diff --git a/icons/obj/items/clothing/accessory/webbings.dmi b/icons/obj/items/clothing/accessory/webbings.dmi index e5a1c49b3971..d3f44f7afc02 100644 Binary files a/icons/obj/items/clothing/accessory/webbings.dmi and b/icons/obj/items/clothing/accessory/webbings.dmi differ diff --git a/icons/obj/items/clothing/backpack/backpacks_by_faction/UA.dmi b/icons/obj/items/clothing/backpack/backpacks_by_faction/UA.dmi index 6e3fec1a00da..b80a99f0819d 100644 Binary files a/icons/obj/items/clothing/backpack/backpacks_by_faction/UA.dmi and b/icons/obj/items/clothing/backpack/backpacks_by_faction/UA.dmi differ diff --git a/icons/obj/items/clothing/backpack/backpacks_by_map/classic.dmi b/icons/obj/items/clothing/backpack/backpacks_by_map/classic.dmi index 04c033fe6221..65a01916fe1c 100644 Binary files a/icons/obj/items/clothing/backpack/backpacks_by_map/classic.dmi and b/icons/obj/items/clothing/backpack/backpacks_by_map/classic.dmi differ diff --git a/icons/obj/items/clothing/backpack/backpacks_by_map/desert.dmi b/icons/obj/items/clothing/backpack/backpacks_by_map/desert.dmi index 71bbf8d51613..43c312a66c75 100644 Binary files a/icons/obj/items/clothing/backpack/backpacks_by_map/desert.dmi and b/icons/obj/items/clothing/backpack/backpacks_by_map/desert.dmi differ diff --git a/icons/obj/items/clothing/backpack/backpacks_by_map/jungle.dmi b/icons/obj/items/clothing/backpack/backpacks_by_map/jungle.dmi index 04c033fe6221..5333bbeee28d 100644 Binary files a/icons/obj/items/clothing/backpack/backpacks_by_map/jungle.dmi and b/icons/obj/items/clothing/backpack/backpacks_by_map/jungle.dmi differ diff --git a/icons/obj/items/clothing/backpack/backpacks_by_map/snow.dmi b/icons/obj/items/clothing/backpack/backpacks_by_map/snow.dmi index 1beb21390066..052d3e1a3a92 100644 Binary files a/icons/obj/items/clothing/backpack/backpacks_by_map/snow.dmi and b/icons/obj/items/clothing/backpack/backpacks_by_map/snow.dmi differ diff --git a/icons/obj/items/clothing/backpack/backpacks_by_map/urban.dmi b/icons/obj/items/clothing/backpack/backpacks_by_map/urban.dmi index 872d353bea77..b5661bc5524c 100644 Binary files a/icons/obj/items/clothing/backpack/backpacks_by_map/urban.dmi and b/icons/obj/items/clothing/backpack/backpacks_by_map/urban.dmi differ diff --git a/icons/obj/items/clothing/belts/belts.dmi b/icons/obj/items/clothing/belts/belts.dmi index 3a94b3bca54c..34477ee3ab22 100644 Binary files a/icons/obj/items/clothing/belts/belts.dmi and b/icons/obj/items/clothing/belts/belts.dmi differ diff --git a/icons/obj/items/clothing/belts/belts_by_map/classic.dmi b/icons/obj/items/clothing/belts/belts_by_map/classic.dmi index 55fd279f3235..88bcacf0e60c 100644 Binary files a/icons/obj/items/clothing/belts/belts_by_map/classic.dmi and b/icons/obj/items/clothing/belts/belts_by_map/classic.dmi differ diff --git a/icons/obj/items/clothing/belts/belts_by_map/desert.dmi b/icons/obj/items/clothing/belts/belts_by_map/desert.dmi index ac7e1fc9e073..c0183c42a422 100644 Binary files a/icons/obj/items/clothing/belts/belts_by_map/desert.dmi and b/icons/obj/items/clothing/belts/belts_by_map/desert.dmi differ diff --git a/icons/obj/items/clothing/belts/belts_by_map/jungle.dmi b/icons/obj/items/clothing/belts/belts_by_map/jungle.dmi index 55fd279f3235..88bcacf0e60c 100644 Binary files a/icons/obj/items/clothing/belts/belts_by_map/jungle.dmi and b/icons/obj/items/clothing/belts/belts_by_map/jungle.dmi differ diff --git a/icons/obj/items/clothing/belts/belts_by_map/snow.dmi b/icons/obj/items/clothing/belts/belts_by_map/snow.dmi index 8588d77189e0..5b2e3c5525d7 100644 Binary files a/icons/obj/items/clothing/belts/belts_by_map/snow.dmi and b/icons/obj/items/clothing/belts/belts_by_map/snow.dmi differ diff --git a/icons/obj/items/clothing/belts/belts_by_map/urban.dmi b/icons/obj/items/clothing/belts/belts_by_map/urban.dmi index 8588d77189e0..5b2e3c5525d7 100644 Binary files a/icons/obj/items/clothing/belts/belts_by_map/urban.dmi and b/icons/obj/items/clothing/belts/belts_by_map/urban.dmi differ diff --git a/icons/obj/items/clothing/belts/holstered_guns.dmi b/icons/obj/items/clothing/belts/holstered_guns.dmi index 24aca05827bc..fa431a5a00a7 100644 Binary files a/icons/obj/items/clothing/belts/holstered_guns.dmi and b/icons/obj/items/clothing/belts/holstered_guns.dmi differ diff --git a/icons/obj/items/clothing/glasses/huds.dmi b/icons/obj/items/clothing/glasses/huds.dmi index 1a32fc834927..cba1a429b91d 100644 Binary files a/icons/obj/items/clothing/glasses/huds.dmi and b/icons/obj/items/clothing/glasses/huds.dmi differ diff --git a/icons/obj/items/clothing/gloves.dmi b/icons/obj/items/clothing/gloves.dmi index 413fd55601b5..8b1140d0be2b 100644 Binary files a/icons/obj/items/clothing/gloves.dmi and b/icons/obj/items/clothing/gloves.dmi differ diff --git a/icons/obj/items/clothing/hats/hats_by_faction/WY.dmi b/icons/obj/items/clothing/hats/hats_by_faction/WY.dmi index 5a8eec116fdc..bbdbf468cacb 100644 Binary files a/icons/obj/items/clothing/hats/hats_by_faction/WY.dmi and b/icons/obj/items/clothing/hats/hats_by_faction/WY.dmi differ diff --git a/icons/obj/items/clothing/hats/hats_by_map/classic.dmi b/icons/obj/items/clothing/hats/hats_by_map/classic.dmi index d822ef272f9b..4eab209899cb 100644 Binary files a/icons/obj/items/clothing/hats/hats_by_map/classic.dmi and b/icons/obj/items/clothing/hats/hats_by_map/classic.dmi differ diff --git a/icons/obj/items/clothing/hats/hats_by_map/desert.dmi b/icons/obj/items/clothing/hats/hats_by_map/desert.dmi index f54a4fc199de..27b6d73524f3 100644 Binary files a/icons/obj/items/clothing/hats/hats_by_map/desert.dmi and b/icons/obj/items/clothing/hats/hats_by_map/desert.dmi differ diff --git a/icons/obj/items/clothing/hats/hats_by_map/jungle.dmi b/icons/obj/items/clothing/hats/hats_by_map/jungle.dmi index f7778b638c68..f57a458237ee 100644 Binary files a/icons/obj/items/clothing/hats/hats_by_map/jungle.dmi and b/icons/obj/items/clothing/hats/hats_by_map/jungle.dmi differ diff --git a/icons/obj/items/clothing/hats/hats_by_map/snow.dmi b/icons/obj/items/clothing/hats/hats_by_map/snow.dmi index 7c06a4cd30b2..1ccc8970a51c 100644 Binary files a/icons/obj/items/clothing/hats/hats_by_map/snow.dmi and b/icons/obj/items/clothing/hats/hats_by_map/snow.dmi differ diff --git a/icons/obj/items/clothing/hats/hats_by_map/urban.dmi b/icons/obj/items/clothing/hats/hats_by_map/urban.dmi index 8e0386c10fa6..c85a06d63a84 100644 Binary files a/icons/obj/items/clothing/hats/hats_by_map/urban.dmi and b/icons/obj/items/clothing/hats/hats_by_map/urban.dmi differ diff --git a/icons/obj/items/clothing/hats/misc_ert_colony.dmi b/icons/obj/items/clothing/hats/misc_ert_colony.dmi index db62b289cfb4..debcdd2a86ea 100644 Binary files a/icons/obj/items/clothing/hats/misc_ert_colony.dmi and b/icons/obj/items/clothing/hats/misc_ert_colony.dmi differ diff --git a/icons/obj/items/clothing/hats/surgical_caps.dmi b/icons/obj/items/clothing/hats/surgical_caps.dmi index b507e3497051..eb613c9297fd 100644 Binary files a/icons/obj/items/clothing/hats/surgical_caps.dmi and b/icons/obj/items/clothing/hats/surgical_caps.dmi differ diff --git a/icons/obj/items/clothing/masks/masks.dmi b/icons/obj/items/clothing/masks/masks.dmi index 48667bea9c5a..51cbf463e199 100644 Binary files a/icons/obj/items/clothing/masks/masks.dmi and b/icons/obj/items/clothing/masks/masks.dmi differ diff --git a/icons/obj/items/clothing/pouches.dmi b/icons/obj/items/clothing/pouches.dmi index 082d5aed1b7e..e36d767a4cef 100644 Binary files a/icons/obj/items/clothing/pouches.dmi and b/icons/obj/items/clothing/pouches.dmi differ diff --git a/icons/obj/items/clothing/shoes.dmi b/icons/obj/items/clothing/shoes.dmi index bf6a6c165715..d77b32053a61 100644 Binary files a/icons/obj/items/clothing/shoes.dmi and b/icons/obj/items/clothing/shoes.dmi differ diff --git a/icons/obj/items/clothing/suits/coats_robes.dmi b/icons/obj/items/clothing/suits/coats_robes.dmi index aadf110cde1a..077449016af7 100644 Binary files a/icons/obj/items/clothing/suits/coats_robes.dmi and b/icons/obj/items/clothing/suits/coats_robes.dmi differ diff --git a/icons/obj/items/clothing/suits/misc_ert.dmi b/icons/obj/items/clothing/suits/misc_ert.dmi index ce315432880e..c8313d3c5f00 100644 Binary files a/icons/obj/items/clothing/suits/misc_ert.dmi and b/icons/obj/items/clothing/suits/misc_ert.dmi differ diff --git a/icons/obj/items/clothing/suits/suits_by_faction/WY.dmi b/icons/obj/items/clothing/suits/suits_by_faction/WY.dmi index c669129e8d6d..9a3197083cf1 100644 Binary files a/icons/obj/items/clothing/suits/suits_by_faction/WY.dmi and b/icons/obj/items/clothing/suits/suits_by_faction/WY.dmi differ diff --git a/icons/obj/items/clothing/suits/suits_by_map/classic.dmi b/icons/obj/items/clothing/suits/suits_by_map/classic.dmi index aad5fc87eefc..5ccd75c032c0 100644 Binary files a/icons/obj/items/clothing/suits/suits_by_map/classic.dmi and b/icons/obj/items/clothing/suits/suits_by_map/classic.dmi differ diff --git a/icons/obj/items/clothing/suits/suits_by_map/desert.dmi b/icons/obj/items/clothing/suits/suits_by_map/desert.dmi index 376ee45a3b70..893451f308fd 100644 Binary files a/icons/obj/items/clothing/suits/suits_by_map/desert.dmi and b/icons/obj/items/clothing/suits/suits_by_map/desert.dmi differ diff --git a/icons/obj/items/clothing/suits/suits_by_map/jungle.dmi b/icons/obj/items/clothing/suits/suits_by_map/jungle.dmi index 0d77d84b8c57..9182394c63cc 100644 Binary files a/icons/obj/items/clothing/suits/suits_by_map/jungle.dmi and b/icons/obj/items/clothing/suits/suits_by_map/jungle.dmi differ diff --git a/icons/obj/items/clothing/suits/suits_by_map/snow.dmi b/icons/obj/items/clothing/suits/suits_by_map/snow.dmi index a952a3b5d354..6e189bd058cf 100644 Binary files a/icons/obj/items/clothing/suits/suits_by_map/snow.dmi and b/icons/obj/items/clothing/suits/suits_by_map/snow.dmi differ diff --git a/icons/obj/items/clothing/suits/suits_by_map/urban.dmi b/icons/obj/items/clothing/suits/suits_by_map/urban.dmi index f60be33c50da..c5cb30b54556 100644 Binary files a/icons/obj/items/clothing/suits/suits_by_map/urban.dmi and b/icons/obj/items/clothing/suits/suits_by_map/urban.dmi differ diff --git a/icons/obj/items/clothing/uniforms/misc_ert_colony.dmi b/icons/obj/items/clothing/uniforms/misc_ert_colony.dmi index e438acf5aa3f..cf34863b76eb 100644 Binary files a/icons/obj/items/clothing/uniforms/misc_ert_colony.dmi and b/icons/obj/items/clothing/uniforms/misc_ert_colony.dmi differ diff --git a/icons/obj/items/clothing/uniforms/uniforms_by_department/medical.dmi b/icons/obj/items/clothing/uniforms/uniforms_by_department/medical.dmi index e7fd63aff0e1..e0b1f8c8b503 100644 Binary files a/icons/obj/items/clothing/uniforms/uniforms_by_department/medical.dmi and b/icons/obj/items/clothing/uniforms/uniforms_by_department/medical.dmi differ diff --git a/icons/obj/items/clothing/uniforms/uniforms_by_department/research.dmi b/icons/obj/items/clothing/uniforms/uniforms_by_department/research.dmi index 692d429e0422..8339a00e899f 100644 Binary files a/icons/obj/items/clothing/uniforms/uniforms_by_department/research.dmi and b/icons/obj/items/clothing/uniforms/uniforms_by_department/research.dmi differ diff --git a/icons/obj/items/food/condiments.dmi b/icons/obj/items/food/condiments.dmi index b0a0a29eb2de..5c752359234e 100644 Binary files a/icons/obj/items/food/condiments.dmi and b/icons/obj/items/food/condiments.dmi differ diff --git a/icons/obj/items/food/drinks.dmi b/icons/obj/items/food/drinks.dmi index 341ee35a417b..8e4cf68f5616 100644 Binary files a/icons/obj/items/food/drinks.dmi and b/icons/obj/items/food/drinks.dmi differ diff --git a/icons/obj/items/hunter/pred_bracers.dmi b/icons/obj/items/hunter/pred_bracers.dmi new file mode 100644 index 000000000000..9022ccbe08ba Binary files /dev/null and b/icons/obj/items/hunter/pred_bracers.dmi differ diff --git a/icons/obj/items/hunter/pred_gear.dmi b/icons/obj/items/hunter/pred_gear.dmi index c1e65525f648..933a460e80ab 100644 Binary files a/icons/obj/items/hunter/pred_gear.dmi and b/icons/obj/items/hunter/pred_gear.dmi differ diff --git a/icons/obj/items/hunter/prey_items.dmi b/icons/obj/items/hunter/prey_items.dmi index 4d26d4c31d11..8eb13274bda4 100644 Binary files a/icons/obj/items/hunter/prey_items.dmi and b/icons/obj/items/hunter/prey_items.dmi differ diff --git a/icons/obj/items/medical_stacks.dmi b/icons/obj/items/medical_stacks.dmi index e574cc5e5011..9e37f177688c 100644 Binary files a/icons/obj/items/medical_stacks.dmi and b/icons/obj/items/medical_stacks.dmi differ diff --git a/icons/obj/items/new_assemblies.dmi b/icons/obj/items/new_assemblies.dmi index f4cde5e94317..131919913905 100644 Binary files a/icons/obj/items/new_assemblies.dmi and b/icons/obj/items/new_assemblies.dmi differ diff --git a/icons/obj/items/paper.dmi b/icons/obj/items/paper.dmi index 5660cfc500fa..e84fb88b6af6 100644 Binary files a/icons/obj/items/paper.dmi and b/icons/obj/items/paper.dmi differ diff --git a/icons/obj/items/radio.dmi b/icons/obj/items/radio.dmi index 501807e3944f..b7ed6f5b57b5 100644 Binary files a/icons/obj/items/radio.dmi and b/icons/obj/items/radio.dmi differ diff --git a/icons/obj/items/reagentfillings.dmi b/icons/obj/items/reagentfillings.dmi index 4bfd2752482b..3ab25b487a30 100644 Binary files a/icons/obj/items/reagentfillings.dmi and b/icons/obj/items/reagentfillings.dmi differ diff --git a/icons/obj/items/storage/boxes.dmi b/icons/obj/items/storage/boxes.dmi index 33d8d6713016..39a7fa1b318a 100644 Binary files a/icons/obj/items/storage/boxes.dmi and b/icons/obj/items/storage/boxes.dmi differ diff --git a/icons/obj/items/surgery_tools.dmi b/icons/obj/items/surgery_tools.dmi index d25c96801aa6..261133df1d9e 100644 Binary files a/icons/obj/items/surgery_tools.dmi and b/icons/obj/items/surgery_tools.dmi differ diff --git a/icons/obj/items/syringe.dmi b/icons/obj/items/syringe.dmi index 0e4c67ca07ea..e75ab5e81cd7 100644 Binary files a/icons/obj/items/syringe.dmi and b/icons/obj/items/syringe.dmi differ diff --git a/icons/obj/items/tank.dmi b/icons/obj/items/tank.dmi index 37479dfde18b..cc23d95eea63 100644 Binary files a/icons/obj/items/tank.dmi and b/icons/obj/items/tank.dmi differ diff --git a/icons/obj/items/tools.dmi b/icons/obj/items/tools.dmi index 15ee2bd336ed..8aa009812100 100644 Binary files a/icons/obj/items/tools.dmi and b/icons/obj/items/tools.dmi differ diff --git a/icons/obj/items/weapons/guns/ammo_boxes/handfuls.dmi b/icons/obj/items/weapons/guns/ammo_boxes/handfuls.dmi index 9a01aca977f9..92fe2869e5e4 100644 Binary files a/icons/obj/items/weapons/guns/ammo_boxes/handfuls.dmi and b/icons/obj/items/weapons/guns/ammo_boxes/handfuls.dmi differ diff --git a/icons/obj/items/weapons/guns/ammo_boxes/magazines.dmi b/icons/obj/items/weapons/guns/ammo_boxes/magazines.dmi index 982f1585d8a1..730d47f35ab2 100644 Binary files a/icons/obj/items/weapons/guns/ammo_boxes/magazines.dmi and b/icons/obj/items/weapons/guns/ammo_boxes/magazines.dmi differ diff --git a/icons/obj/items/weapons/guns/ammo_boxes/text.dmi b/icons/obj/items/weapons/guns/ammo_boxes/text.dmi index ecc8cd2eee3a..17c7adcbde11 100644 Binary files a/icons/obj/items/weapons/guns/ammo_boxes/text.dmi and b/icons/obj/items/weapons/guns/ammo_boxes/text.dmi differ diff --git a/icons/obj/items/weapons/guns/ammo_by_faction/TWE/smgs.dmi b/icons/obj/items/weapons/guns/ammo_by_faction/TWE/smgs.dmi index f57c6af9ef0f..1bfa94f88d40 100644 Binary files a/icons/obj/items/weapons/guns/ammo_by_faction/TWE/smgs.dmi and b/icons/obj/items/weapons/guns/ammo_by_faction/TWE/smgs.dmi differ diff --git a/icons/obj/items/weapons/guns/ammo_by_faction/USCM/pistols.dmi b/icons/obj/items/weapons/guns/ammo_by_faction/USCM/pistols.dmi index ea1ed69bb4af..1b9a641a6120 100644 Binary files a/icons/obj/items/weapons/guns/ammo_by_faction/USCM/pistols.dmi and b/icons/obj/items/weapons/guns/ammo_by_faction/USCM/pistols.dmi differ diff --git a/icons/obj/items/weapons/guns/attachments/barrel.dmi b/icons/obj/items/weapons/guns/attachments/barrel.dmi index 848b0be619dc..409bc84505bc 100644 Binary files a/icons/obj/items/weapons/guns/attachments/barrel.dmi and b/icons/obj/items/weapons/guns/attachments/barrel.dmi differ diff --git a/icons/obj/items/weapons/guns/attachments/rail.dmi b/icons/obj/items/weapons/guns/attachments/rail.dmi index d3abedf3acbb..2eb981e9af1e 100644 Binary files a/icons/obj/items/weapons/guns/attachments/rail.dmi and b/icons/obj/items/weapons/guns/attachments/rail.dmi differ diff --git a/icons/obj/items/weapons/guns/attachments/stock.dmi b/icons/obj/items/weapons/guns/attachments/stock.dmi index 92e78764cd56..40fa1f4f3880 100644 Binary files a/icons/obj/items/weapons/guns/attachments/stock.dmi and b/icons/obj/items/weapons/guns/attachments/stock.dmi differ diff --git a/icons/obj/items/weapons/guns/attachments/under.dmi b/icons/obj/items/weapons/guns/attachments/under.dmi index 7f9d54995f6b..6317eada05d2 100644 Binary files a/icons/obj/items/weapons/guns/attachments/under.dmi and b/icons/obj/items/weapons/guns/attachments/under.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_faction/TWE/smgs.dmi b/icons/obj/items/weapons/guns/guns_by_faction/TWE/smgs.dmi index c16c259ca8c8..5b6d72cf78da 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_faction/TWE/smgs.dmi and b/icons/obj/items/weapons/guns/guns_by_faction/TWE/smgs.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_faction/USCM/pistols.dmi b/icons/obj/items/weapons/guns/guns_by_faction/USCM/pistols.dmi index 649971f0470c..720a577a8bc8 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_faction/USCM/pistols.dmi and b/icons/obj/items/weapons/guns/guns_by_faction/USCM/pistols.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_faction/USCM/revolvers.dmi b/icons/obj/items/weapons/guns/guns_by_faction/USCM/revolvers.dmi index defdb073be8a..d23f551b6e93 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_faction/USCM/revolvers.dmi and b/icons/obj/items/weapons/guns/guns_by_faction/USCM/revolvers.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_faction/colony/pistols.dmi b/icons/obj/items/weapons/guns/guns_by_faction/colony/pistols.dmi index 9b72ab3a91b6..5c3b23f6215d 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_faction/colony/pistols.dmi and b/icons/obj/items/weapons/guns/guns_by_faction/colony/pistols.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_faction/colony/smgs.dmi b/icons/obj/items/weapons/guns/guns_by_faction/colony/smgs.dmi index 0dc2a0fcaacc..c1211741c629 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_faction/colony/smgs.dmi and b/icons/obj/items/weapons/guns/guns_by_faction/colony/smgs.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_faction/pred.dmi b/icons/obj/items/weapons/guns/guns_by_faction/pred.dmi new file mode 100644 index 000000000000..9e21d241f392 Binary files /dev/null and b/icons/obj/items/weapons/guns/guns_by_faction/pred.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/classic/back.dmi b/icons/obj/items/weapons/guns/guns_by_map/classic/back.dmi index 4e645084ccc9..3915e6094234 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/classic/back.dmi and b/icons/obj/items/weapons/guns/guns_by_map/classic/back.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/classic/guns_lefthand.dmi b/icons/obj/items/weapons/guns/guns_by_map/classic/guns_lefthand.dmi index 930d5ed0cdbf..2b06234c5385 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/classic/guns_lefthand.dmi and b/icons/obj/items/weapons/guns/guns_by_map/classic/guns_lefthand.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/classic/guns_lefthand_x64.dmi b/icons/obj/items/weapons/guns/guns_by_map/classic/guns_lefthand_x64.dmi new file mode 100644 index 000000000000..f9b1e764838b Binary files /dev/null and b/icons/obj/items/weapons/guns/guns_by_map/classic/guns_lefthand_x64.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/classic/guns_righthand.dmi b/icons/obj/items/weapons/guns/guns_by_map/classic/guns_righthand.dmi index acc04c484294..1cb013ff1551 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/classic/guns_righthand.dmi and b/icons/obj/items/weapons/guns/guns_by_map/classic/guns_righthand.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/classic/guns_righthand_x64.dmi b/icons/obj/items/weapons/guns/guns_by_map/classic/guns_righthand_x64.dmi new file mode 100644 index 000000000000..fbe4cebb2aa0 Binary files /dev/null and b/icons/obj/items/weapons/guns/guns_by_map/classic/guns_righthand_x64.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/classic/suit_slot.dmi b/icons/obj/items/weapons/guns/guns_by_map/classic/suit_slot.dmi index 446c9ad64efb..436be28ec64d 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/classic/suit_slot.dmi and b/icons/obj/items/weapons/guns/guns_by_map/classic/suit_slot.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/desert/back.dmi b/icons/obj/items/weapons/guns/guns_by_map/desert/back.dmi index 8b1cbac5ca3f..035d86259a1b 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/desert/back.dmi and b/icons/obj/items/weapons/guns/guns_by_map/desert/back.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/desert/guns_lefthand.dmi b/icons/obj/items/weapons/guns/guns_by_map/desert/guns_lefthand.dmi index b0bf7bec2788..c3fc70586121 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/desert/guns_lefthand.dmi and b/icons/obj/items/weapons/guns/guns_by_map/desert/guns_lefthand.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/desert/guns_lefthand_x64.dmi b/icons/obj/items/weapons/guns/guns_by_map/desert/guns_lefthand_x64.dmi new file mode 100644 index 000000000000..d73fef981a8b Binary files /dev/null and b/icons/obj/items/weapons/guns/guns_by_map/desert/guns_lefthand_x64.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/desert/guns_righthand.dmi b/icons/obj/items/weapons/guns/guns_by_map/desert/guns_righthand.dmi index ddb020fe6f32..a4432cebfc37 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/desert/guns_righthand.dmi and b/icons/obj/items/weapons/guns/guns_by_map/desert/guns_righthand.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/desert/guns_righthand_x64.dmi b/icons/obj/items/weapons/guns/guns_by_map/desert/guns_righthand_x64.dmi new file mode 100644 index 000000000000..c90f3183635b Binary files /dev/null and b/icons/obj/items/weapons/guns/guns_by_map/desert/guns_righthand_x64.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/desert/suit_slot.dmi b/icons/obj/items/weapons/guns/guns_by_map/desert/suit_slot.dmi index fb1118ec44a8..953c627b775a 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/desert/suit_slot.dmi and b/icons/obj/items/weapons/guns/guns_by_map/desert/suit_slot.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/jungle/back.dmi b/icons/obj/items/weapons/guns/guns_by_map/jungle/back.dmi index 320b656b23f3..19f6472358d8 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/jungle/back.dmi and b/icons/obj/items/weapons/guns/guns_by_map/jungle/back.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/jungle/guns_lefthand.dmi b/icons/obj/items/weapons/guns/guns_by_map/jungle/guns_lefthand.dmi index 93119acdcc2d..c732a9037812 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/jungle/guns_lefthand.dmi and b/icons/obj/items/weapons/guns/guns_by_map/jungle/guns_lefthand.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/jungle/guns_lefthand_x64.dmi b/icons/obj/items/weapons/guns/guns_by_map/jungle/guns_lefthand_x64.dmi new file mode 100644 index 000000000000..c069f4450c67 Binary files /dev/null and b/icons/obj/items/weapons/guns/guns_by_map/jungle/guns_lefthand_x64.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/jungle/guns_righthand.dmi b/icons/obj/items/weapons/guns/guns_by_map/jungle/guns_righthand.dmi index 737c6284a9eb..e3e711f7810a 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/jungle/guns_righthand.dmi and b/icons/obj/items/weapons/guns/guns_by_map/jungle/guns_righthand.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/jungle/guns_righthand_x64.dmi b/icons/obj/items/weapons/guns/guns_by_map/jungle/guns_righthand_x64.dmi new file mode 100644 index 000000000000..afaa563ab07a Binary files /dev/null and b/icons/obj/items/weapons/guns/guns_by_map/jungle/guns_righthand_x64.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/jungle/suit_slot.dmi b/icons/obj/items/weapons/guns/guns_by_map/jungle/suit_slot.dmi index 40fd5c424cf3..0b5c224ce387 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/jungle/suit_slot.dmi and b/icons/obj/items/weapons/guns/guns_by_map/jungle/suit_slot.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/snow/back.dmi b/icons/obj/items/weapons/guns/guns_by_map/snow/back.dmi index da19246a4275..26fc06959ea7 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/snow/back.dmi and b/icons/obj/items/weapons/guns/guns_by_map/snow/back.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/snow/guns_lefthand.dmi b/icons/obj/items/weapons/guns/guns_by_map/snow/guns_lefthand.dmi index 0e5c1d257f2d..d519a4afba2d 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/snow/guns_lefthand.dmi and b/icons/obj/items/weapons/guns/guns_by_map/snow/guns_lefthand.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/snow/guns_lefthand_x64.dmi b/icons/obj/items/weapons/guns/guns_by_map/snow/guns_lefthand_x64.dmi new file mode 100644 index 000000000000..7dd2e4f95843 Binary files /dev/null and b/icons/obj/items/weapons/guns/guns_by_map/snow/guns_lefthand_x64.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/snow/guns_righthand.dmi b/icons/obj/items/weapons/guns/guns_by_map/snow/guns_righthand.dmi index b703a53c2a49..01f58c279d34 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/snow/guns_righthand.dmi and b/icons/obj/items/weapons/guns/guns_by_map/snow/guns_righthand.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/snow/guns_righthand_x64.dmi b/icons/obj/items/weapons/guns/guns_by_map/snow/guns_righthand_x64.dmi new file mode 100644 index 000000000000..f451a0eb730f Binary files /dev/null and b/icons/obj/items/weapons/guns/guns_by_map/snow/guns_righthand_x64.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/snow/suit_slot.dmi b/icons/obj/items/weapons/guns/guns_by_map/snow/suit_slot.dmi index 0d038fffa025..a9553a842cd8 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/snow/suit_slot.dmi and b/icons/obj/items/weapons/guns/guns_by_map/snow/suit_slot.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/urban/guns_lefthand.dmi b/icons/obj/items/weapons/guns/guns_by_map/urban/guns_lefthand.dmi index 43220201fd20..ed15d012f176 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/urban/guns_lefthand.dmi and b/icons/obj/items/weapons/guns/guns_by_map/urban/guns_lefthand.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/urban/guns_lefthand_x64.dmi b/icons/obj/items/weapons/guns/guns_by_map/urban/guns_lefthand_x64.dmi new file mode 100644 index 000000000000..bc408f4e1900 Binary files /dev/null and b/icons/obj/items/weapons/guns/guns_by_map/urban/guns_lefthand_x64.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/urban/guns_righthand.dmi b/icons/obj/items/weapons/guns/guns_by_map/urban/guns_righthand.dmi index c81d5717b5b3..02cd02563ad8 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/urban/guns_righthand.dmi and b/icons/obj/items/weapons/guns/guns_by_map/urban/guns_righthand.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/urban/guns_righthand_x64.dmi b/icons/obj/items/weapons/guns/guns_by_map/urban/guns_righthand_x64.dmi new file mode 100644 index 000000000000..cf596380eaa6 Binary files /dev/null and b/icons/obj/items/weapons/guns/guns_by_map/urban/guns_righthand_x64.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_map/urban/suit_slot.dmi b/icons/obj/items/weapons/guns/guns_by_map/urban/suit_slot.dmi index c626f5cda166..d35529996aff 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_map/urban/suit_slot.dmi and b/icons/obj/items/weapons/guns/guns_by_map/urban/suit_slot.dmi differ diff --git a/icons/obj/items/weapons/guns/lineart.dmi b/icons/obj/items/weapons/guns/lineart.dmi index be66762f1f59..7f34ac7d1419 100644 Binary files a/icons/obj/items/weapons/guns/lineart.dmi and b/icons/obj/items/weapons/guns/lineart.dmi differ diff --git a/icons/obj/items/weapons/melee/misc_64.dmi b/icons/obj/items/weapons/melee/misc_64.dmi new file mode 100644 index 000000000000..301ff2c39502 Binary files /dev/null and b/icons/obj/items/weapons/melee/misc_64.dmi differ diff --git a/icons/obj/items/weapons/melee/shields.dmi b/icons/obj/items/weapons/melee/shields.dmi index 0e2355de7f62..a2d69b6246bc 100644 Binary files a/icons/obj/items/weapons/melee/shields.dmi and b/icons/obj/items/weapons/melee/shields.dmi differ diff --git a/icons/obj/items/weapons/melee/spears.dmi b/icons/obj/items/weapons/melee/spears.dmi index 069f6337aeff..cc83cd63753a 100644 Binary files a/icons/obj/items/weapons/melee/spears.dmi and b/icons/obj/items/weapons/melee/spears.dmi differ diff --git a/icons/obj/items/weapons/melee/swords.dmi b/icons/obj/items/weapons/melee/swords.dmi index 538cd1a714e6..80e3de4c2dc0 100644 Binary files a/icons/obj/items/weapons/melee/swords.dmi and b/icons/obj/items/weapons/melee/swords.dmi differ diff --git a/icons/obj/structures/barricades.dmi b/icons/obj/structures/barricades.dmi index ff69865eac76..80a7e633bdb4 100644 Binary files a/icons/obj/structures/barricades.dmi and b/icons/obj/structures/barricades.dmi differ diff --git a/icons/obj/structures/closet.dmi b/icons/obj/structures/closet.dmi index 6bc99fd0d517..468d4cc0a8cb 100644 Binary files a/icons/obj/structures/closet.dmi and b/icons/obj/structures/closet.dmi differ diff --git a/icons/obj/structures/doors/almayerdoor.dmi b/icons/obj/structures/doors/almayerdoor.dmi new file mode 100644 index 000000000000..8cad4b01e837 Binary files /dev/null and b/icons/obj/structures/doors/almayerdoor.dmi differ diff --git a/icons/obj/structures/doors/almayerdoor_glass.dmi b/icons/obj/structures/doors/almayerdoor_glass.dmi new file mode 100644 index 000000000000..fa8dd80a8a4d Binary files /dev/null and b/icons/obj/structures/doors/almayerdoor_glass.dmi differ diff --git a/icons/obj/structures/doors/blastdoors_shutters.dmi b/icons/obj/structures/doors/blastdoors_shutters.dmi index 89fea2b6f55e..44f5b1422897 100644 Binary files a/icons/obj/structures/doors/blastdoors_shutters.dmi and b/icons/obj/structures/doors/blastdoors_shutters.dmi differ diff --git a/icons/obj/structures/doors/escapepoddoor_black.dmi b/icons/obj/structures/doors/escapepoddoor_black.dmi new file mode 100644 index 000000000000..851896c33455 Binary files /dev/null and b/icons/obj/structures/doors/escapepoddoor_black.dmi differ diff --git a/icons/obj/structures/doors/escapepoddoor_white.dmi b/icons/obj/structures/doors/escapepoddoor_white.dmi new file mode 100644 index 000000000000..fd4d4ec70c73 Binary files /dev/null and b/icons/obj/structures/doors/escapepoddoor_white.dmi differ diff --git a/icons/obj/structures/doors/escapepoddoor_yellow.dmi b/icons/obj/structures/doors/escapepoddoor_yellow.dmi new file mode 100644 index 000000000000..54adfab6e5f2 Binary files /dev/null and b/icons/obj/structures/doors/escapepoddoor_yellow.dmi differ diff --git a/icons/obj/structures/liquid_tanks.dmi b/icons/obj/structures/liquid_tanks.dmi index a720a2875595..75348e8a67b8 100644 Binary files a/icons/obj/structures/liquid_tanks.dmi and b/icons/obj/structures/liquid_tanks.dmi differ diff --git a/icons/obj/structures/machinery/drone_fab.dmi b/icons/obj/structures/machinery/drone_fab.dmi index 785e46c90001..c75ebb3a8186 100644 Binary files a/icons/obj/structures/machinery/drone_fab.dmi and b/icons/obj/structures/machinery/drone_fab.dmi differ diff --git a/icons/obj/structures/machinery/geothermal.dmi b/icons/obj/structures/machinery/geothermal.dmi index 6d3d5af4ef88..124104b98685 100644 Binary files a/icons/obj/structures/machinery/geothermal.dmi and b/icons/obj/structures/machinery/geothermal.dmi differ diff --git a/icons/obj/structures/machinery/vending.dmi b/icons/obj/structures/machinery/vending.dmi index bda888afb8b6..92bbc7090ea1 100644 Binary files a/icons/obj/structures/machinery/vending.dmi and b/icons/obj/structures/machinery/vending.dmi differ diff --git a/icons/obj/structures/machinery/yautja_machines.dmi b/icons/obj/structures/machinery/yautja_machines.dmi index 147f854355e6..68b06890b996 100644 Binary files a/icons/obj/structures/machinery/yautja_machines.dmi and b/icons/obj/structures/machinery/yautja_machines.dmi differ diff --git a/icons/obj/structures/props/64x64_bodybag_pile.dmi b/icons/obj/structures/props/64x64_bodybag_pile.dmi new file mode 100644 index 000000000000..814d4f92090e Binary files /dev/null and b/icons/obj/structures/props/64x64_bodybag_pile.dmi differ diff --git a/icons/obj/structures/props/fences/dark_fence.dmi b/icons/obj/structures/props/fences/dark_fence.dmi index a4184b5bbf58..1fd163f432ce 100644 Binary files a/icons/obj/structures/props/fences/dark_fence.dmi and b/icons/obj/structures/props/fences/dark_fence.dmi differ diff --git a/icons/obj/structures/props/fences/dark_fence_alt.dmi b/icons/obj/structures/props/fences/dark_fence_alt.dmi new file mode 100644 index 000000000000..2942fdee415e Binary files /dev/null and b/icons/obj/structures/props/fences/dark_fence_alt.dmi differ diff --git a/icons/obj/structures/props/fences/dark_fence_alt_door.dmi b/icons/obj/structures/props/fences/dark_fence_alt_door.dmi new file mode 100644 index 000000000000..be8662008677 Binary files /dev/null and b/icons/obj/structures/props/fences/dark_fence_alt_door.dmi differ diff --git a/icons/obj/structures/props/fences/electric_fence.dmi b/icons/obj/structures/props/fences/electric_fence.dmi index 9e86a7cc3d0f..edc6df2d12ca 100644 Binary files a/icons/obj/structures/props/fences/electric_fence.dmi and b/icons/obj/structures/props/fences/electric_fence.dmi differ diff --git a/icons/obj/structures/props/fences/electric_fence_alt.dmi b/icons/obj/structures/props/fences/electric_fence_alt.dmi new file mode 100644 index 000000000000..19dcef016736 Binary files /dev/null and b/icons/obj/structures/props/fences/electric_fence_alt.dmi differ diff --git a/icons/obj/structures/props/fences/electric_fence_alt_door.dmi b/icons/obj/structures/props/fences/electric_fence_alt_door.dmi new file mode 100644 index 000000000000..e1ca77ba843d Binary files /dev/null and b/icons/obj/structures/props/fences/electric_fence_alt_door.dmi differ diff --git a/icons/obj/structures/props/fences/fence.dmi b/icons/obj/structures/props/fences/fence.dmi index 016aab562777..46f925c2a3f2 100644 Binary files a/icons/obj/structures/props/fences/fence.dmi and b/icons/obj/structures/props/fences/fence.dmi differ diff --git a/icons/obj/structures/props/fences/fence_alt.dmi b/icons/obj/structures/props/fences/fence_alt.dmi new file mode 100644 index 000000000000..e82c66819d99 Binary files /dev/null and b/icons/obj/structures/props/fences/fence_alt.dmi differ diff --git a/icons/obj/structures/props/fences/fence_alt_door.dmi b/icons/obj/structures/props/fences/fence_alt_door.dmi new file mode 100644 index 000000000000..87fffbdaec7b Binary files /dev/null and b/icons/obj/structures/props/fences/fence_alt_door.dmi differ diff --git a/icons/obj/structures/props/fences/fence_ew.dmi b/icons/obj/structures/props/fences/fence_ew.dmi deleted file mode 100644 index b1c242ff3b68..000000000000 Binary files a/icons/obj/structures/props/fences/fence_ew.dmi and /dev/null differ diff --git a/icons/obj/structures/props/fences/fence_ns.dmi b/icons/obj/structures/props/fences/fence_ns.dmi deleted file mode 100644 index 9c1a66875abc..000000000000 Binary files a/icons/obj/structures/props/fences/fence_ns.dmi and /dev/null differ diff --git a/icons/obj/structures/props/fences/overgrown_dark_fence.dmi b/icons/obj/structures/props/fences/overgrown_dark_fence.dmi new file mode 100644 index 000000000000..ef37432f94a8 Binary files /dev/null and b/icons/obj/structures/props/fences/overgrown_dark_fence.dmi differ diff --git a/icons/obj/structures/props/fences/overgrown_electric_fence.dmi b/icons/obj/structures/props/fences/overgrown_electric_fence.dmi new file mode 100644 index 000000000000..e8559f697dcf Binary files /dev/null and b/icons/obj/structures/props/fences/overgrown_electric_fence.dmi differ diff --git a/icons/obj/structures/props/fences/overgrown_fence.dmi b/icons/obj/structures/props/fences/overgrown_fence.dmi new file mode 100644 index 000000000000..e3edee507803 Binary files /dev/null and b/icons/obj/structures/props/fences/overgrown_fence.dmi differ diff --git a/icons/obj/structures/props/fences/perspective_fences.dmi b/icons/obj/structures/props/fences/perspective_fences.dmi deleted file mode 100644 index bd49cdfc7cf4..000000000000 Binary files a/icons/obj/structures/props/fences/perspective_fences.dmi and /dev/null differ diff --git a/icons/obj/structures/props/fences/upp_fence.dmi b/icons/obj/structures/props/fences/upp_fence.dmi new file mode 100644 index 000000000000..84ee9ec9c18c Binary files /dev/null and b/icons/obj/structures/props/fences/upp_fence.dmi differ diff --git a/icons/obj/structures/props/fences/upp_fence_door.dmi b/icons/obj/structures/props/fences/upp_fence_door.dmi new file mode 100644 index 000000000000..803a2cde5541 Binary files /dev/null and b/icons/obj/structures/props/fences/upp_fence_door.dmi differ diff --git a/icons/obj/structures/props/furniture/misc.dmi b/icons/obj/structures/props/furniture/misc.dmi index c5242e32982f..725caf2b0d4a 100644 Binary files a/icons/obj/structures/props/furniture/misc.dmi and b/icons/obj/structures/props/furniture/misc.dmi differ diff --git a/icons/obj/structures/props/ice_colony/fabs_64.dmi b/icons/obj/structures/props/ice_colony/fabs_64.dmi index c5d35e178870..68d5ccf921df 100644 Binary files a/icons/obj/structures/props/ice_colony/fabs_64.dmi and b/icons/obj/structures/props/ice_colony/fabs_64.dmi differ diff --git a/icons/obj/structures/props/ice_colony/fabs_tileset.dmi b/icons/obj/structures/props/ice_colony/fabs_tileset.dmi index 83c80d1f8e27..0a73f6caad61 100644 Binary files a/icons/obj/structures/props/ice_colony/fabs_tileset.dmi and b/icons/obj/structures/props/ice_colony/fabs_tileset.dmi differ diff --git a/icons/obj/structures/props/natural/vegetation/ground_map64.dmi b/icons/obj/structures/props/natural/vegetation/ground_map64.dmi index 4e3c28d3e193..0647398ee4f9 100644 Binary files a/icons/obj/structures/props/natural/vegetation/ground_map64.dmi and b/icons/obj/structures/props/natural/vegetation/ground_map64.dmi differ diff --git a/icons/obj/structures/props/platforms.dmi b/icons/obj/structures/props/platforms.dmi index db7fb36d2dce..3ae30cefee85 100644 Binary files a/icons/obj/structures/props/platforms.dmi and b/icons/obj/structures/props/platforms.dmi differ diff --git a/icons/obj/structures/restock_carts.dmi b/icons/obj/structures/restock_carts.dmi new file mode 100644 index 000000000000..96bcf30b5795 Binary files /dev/null and b/icons/obj/structures/restock_carts.dmi differ diff --git a/icons/obj/structures/tables.dmi b/icons/obj/structures/tables.dmi index 124fb5e0dc4b..77592285c56e 100644 Binary files a/icons/obj/structures/tables.dmi and b/icons/obj/structures/tables.dmi differ diff --git a/icons/obj/vehicles/interiors/apc.dmi b/icons/obj/vehicles/interiors/apc.dmi index 5855af1dc073..eb3ccb876301 100644 Binary files a/icons/obj/vehicles/interiors/apc.dmi and b/icons/obj/vehicles/interiors/apc.dmi differ diff --git a/icons/obj/vehicles/interiors/apc_pmc.dmi b/icons/obj/vehicles/interiors/apc_pmc.dmi index 8d18b30efb33..823aedfc9235 100644 Binary files a/icons/obj/vehicles/interiors/apc_pmc.dmi and b/icons/obj/vehicles/interiors/apc_pmc.dmi differ diff --git a/icons/obj/vehicles/interiors/box_van_interior.dmi b/icons/obj/vehicles/interiors/box_van_interior.dmi index 3586eb716bf6..c003ca9bc8a5 100644 Binary files a/icons/obj/vehicles/interiors/box_van_interior.dmi and b/icons/obj/vehicles/interiors/box_van_interior.dmi differ diff --git a/icons/obj/vehicles/interiors/clf_van.dmi b/icons/obj/vehicles/interiors/clf_van.dmi index a615c7c1ac7f..621d29abcc75 100644 Binary files a/icons/obj/vehicles/interiors/clf_van.dmi and b/icons/obj/vehicles/interiors/clf_van.dmi differ diff --git a/icons/obj/vehicles/interiors/pizza_van_interior.dmi b/icons/obj/vehicles/interiors/pizza_van_interior.dmi index e9b4a66edb7e..70418267ecbd 100644 Binary files a/icons/obj/vehicles/interiors/pizza_van_interior.dmi and b/icons/obj/vehicles/interiors/pizza_van_interior.dmi differ diff --git a/icons/obj/vehicles/interiors/tank.dmi b/icons/obj/vehicles/interiors/tank.dmi index d0153fedaeca..fadfcc64900d 100644 Binary files a/icons/obj/vehicles/interiors/tank.dmi and b/icons/obj/vehicles/interiors/tank.dmi differ diff --git a/icons/obj/vehicles/interiors/van.dmi b/icons/obj/vehicles/interiors/van.dmi index 1d875994462b..9c126729a0aa 100644 Binary files a/icons/obj/vehicles/interiors/van.dmi and b/icons/obj/vehicles/interiors/van.dmi differ diff --git a/icons/turf/floors/floors.dmi b/icons/turf/floors/floors.dmi index 0d6dc35b8a70..bea0864d2831 100644 Binary files a/icons/turf/floors/floors.dmi and b/icons/turf/floors/floors.dmi differ diff --git a/icons/turf/walls/ice_colony/shiva_turfs.dmi b/icons/turf/walls/ice_colony/shiva_turfs.dmi index 57f8297f0376..ce3d12b086c2 100644 Binary files a/icons/turf/walls/ice_colony/shiva_turfs.dmi and b/icons/turf/walls/ice_colony/shiva_turfs.dmi differ diff --git a/icons/turf/walls/ice_colony/shiva_windows.dmi b/icons/turf/walls/ice_colony/shiva_windows.dmi index 2e65944a09fa..855d1467982b 100644 Binary files a/icons/turf/walls/ice_colony/shiva_windows.dmi and b/icons/turf/walls/ice_colony/shiva_windows.dmi differ diff --git a/icons/ui_icons/hivebuff_radial.dmi b/icons/ui_icons/hivebuff_radial.dmi index f546ec268512..744b889bb80b 100644 Binary files a/icons/ui_icons/hivebuff_radial.dmi and b/icons/ui_icons/hivebuff_radial.dmi differ diff --git a/icons/ui_icons/logos.dmi b/icons/ui_icons/logos.dmi new file mode 100644 index 000000000000..476b7793878c Binary files /dev/null and b/icons/ui_icons/logos.dmi differ diff --git a/icons/ui_icons/map_blips.dmi b/icons/ui_icons/map_blips.dmi index 4c4cdc38f077..db6c2d4b4891 100644 Binary files a/icons/ui_icons/map_blips.dmi and b/icons/ui_icons/map_blips.dmi differ diff --git a/icons/ui_icons/map_blips_large.dmi b/icons/ui_icons/map_blips_large.dmi index f03433c8c8ef..c7d0af4494ca 100644 Binary files a/icons/ui_icons/map_blips_large.dmi and b/icons/ui_icons/map_blips_large.dmi differ diff --git a/icons/ui_icons/map_blips_larger.dmi b/icons/ui_icons/map_blips_larger.dmi new file mode 100644 index 000000000000..089ae0531b53 Binary files /dev/null and b/icons/ui_icons/map_blips_larger.dmi differ diff --git a/icons/ui_icons/minimap.dmi b/icons/ui_icons/minimap.dmi index 08dbb8de4512..1cd21e52712c 100644 Binary files a/icons/ui_icons/minimap.dmi and b/icons/ui_icons/minimap.dmi differ diff --git a/icons/ui_icons/minimap_buttons.dmi b/icons/ui_icons/minimap_buttons.dmi new file mode 100644 index 000000000000..75cf46faaaca Binary files /dev/null and b/icons/ui_icons/minimap_buttons.dmi differ diff --git a/icons/ui_icons/minimap_mouse/draw_black.dmi b/icons/ui_icons/minimap_mouse/draw_black.dmi new file mode 100644 index 000000000000..a9fbb52fe696 Binary files /dev/null and b/icons/ui_icons/minimap_mouse/draw_black.dmi differ diff --git a/icons/ui_icons/minimap_mouse/draw_blue.dmi b/icons/ui_icons/minimap_mouse/draw_blue.dmi new file mode 100644 index 000000000000..dbbe577dba37 Binary files /dev/null and b/icons/ui_icons/minimap_mouse/draw_blue.dmi differ diff --git a/icons/ui_icons/minimap_mouse/draw_erase.dmi b/icons/ui_icons/minimap_mouse/draw_erase.dmi new file mode 100644 index 000000000000..0b21efd9fc8b Binary files /dev/null and b/icons/ui_icons/minimap_mouse/draw_erase.dmi differ diff --git a/icons/ui_icons/minimap_mouse/draw_green.dmi b/icons/ui_icons/minimap_mouse/draw_green.dmi new file mode 100644 index 000000000000..43ffbfe44303 Binary files /dev/null and b/icons/ui_icons/minimap_mouse/draw_green.dmi differ diff --git a/icons/ui_icons/minimap_mouse/draw_purple.dmi b/icons/ui_icons/minimap_mouse/draw_purple.dmi new file mode 100644 index 000000000000..2b07261df1f9 Binary files /dev/null and b/icons/ui_icons/minimap_mouse/draw_purple.dmi differ diff --git a/icons/ui_icons/minimap_mouse/draw_red.dmi b/icons/ui_icons/minimap_mouse/draw_red.dmi new file mode 100644 index 000000000000..27626a1fd2ef Binary files /dev/null and b/icons/ui_icons/minimap_mouse/draw_red.dmi differ diff --git a/icons/ui_icons/minimap_mouse/draw_yellow.dmi b/icons/ui_icons/minimap_mouse/draw_yellow.dmi new file mode 100644 index 000000000000..985169252ad7 Binary files /dev/null and b/icons/ui_icons/minimap_mouse/draw_yellow.dmi differ diff --git a/icons/ui_icons/minimap_mouse/label.dmi b/icons/ui_icons/minimap_mouse/label.dmi new file mode 100644 index 000000000000..a91084b216c2 Binary files /dev/null and b/icons/ui_icons/minimap_mouse/label.dmi differ diff --git a/librust_g.so b/librust_g.so deleted file mode 100644 index 382d50e27fe2..000000000000 Binary files a/librust_g.so and /dev/null differ diff --git a/maps/Nightmare/maps/DesertDam/mapgen_variations.json b/maps/Nightmare/maps/DesertDam/mapgen_variations.json new file mode 100644 index 000000000000..df24d6d46bbf --- /dev/null +++ b/maps/Nightmare/maps/DesertDam/mapgen_variations.json @@ -0,0 +1,12 @@ +[ + { "type": "map_sprinkle", "path": "sprinkles/" }, + { "type": "map_variations", "landmark": "armory", "path": "armory/", "chance": 0.3 }, + { "type": "map_variations", "landmark": "nspa", "path": "nspa/", "chance": 0.3 }, + { "type": "map_variations", "landmark": "engicheckpoint", "path": "engicheckpoint/", "chance": 0.4 }, + { "type": "map_variations", "landmark": "workshop", "path": "workshop/", "chance": 0.4 }, + { "type": "map_variations", "landmark": "northcheckpoint", "path": "northcheckpoint/", "chance": 0.4 }, + { "type": "map_variations", "landmark": "xenoflora", "path": "xenoflora/", "chance": 0.4 }, + { "type": "map_variations", "landmark": "southbridge", "path": "southbridge/", "chance": 0.3 }, + { "type": "map_variations", "landmark": "treatmentone", "path": "treatmentone/", "chance": 0.3 }, + { "type": "map_variations", "landmark": "chapel", "path": "chapel/", "chance": 0.3 } +] diff --git a/maps/Nightmare/maps/DesertDam/nightmare.json b/maps/Nightmare/maps/DesertDam/nightmare.json index 965a65d0d70c..d0384aa6f147 100644 --- a/maps/Nightmare/maps/DesertDam/nightmare.json +++ b/maps/Nightmare/maps/DesertDam/nightmare.json @@ -1,10 +1,4 @@ [ - { "type": "pick", "choices": [ - { "type": "map_insert", "landmark": "green-new-bridge", "path": "greenriver/newbridge.dmm" } - ], "chance": 0.0 }, - { "type": "pick", "choices": [ - { "weight": 2, "type": "map_insert", "landmark": "purple-new-bridge", "path": "purpleriver/newbridge.dmm" } - ], "chance": 0.0 }, { "type": "map_sprinkle", "path": "sprinkles/" }, { "type": "map_insert", @@ -43,9 +37,27 @@ }, { "type": "map_insert", - "landmark": "clfpods", + "landmark": "barhold", + "chance": 0.4, + "path": "standalone/barhold.dmm", + "when": { "lvevent": "none" } + }, + { + "type": "map_insert", + "landmark": "quarantine", + "chance": 0.4, + "path": "standalone/quarantine.dmm", + "when": { "lvevent": "none" } + }, + { + "type": "map_insert", + "landmark": "clfpods", "chance": 1.0, "path": "standalone/clfpods.dmm", "when": { "lvevent": "clfpods" } + }, + { + "type": "include", "name": "Standalone variations", + "file": "mapgen_variations.json" } ] diff --git a/maps/Nightmare/maps/Kutjevo/nightmare.json b/maps/Nightmare/maps/Kutjevo/nightmare.json index eeeb3a4fc146..6e151aa1c49f 100644 --- a/maps/Nightmare/maps/Kutjevo/nightmare.json +++ b/maps/Nightmare/maps/Kutjevo/nightmare.json @@ -30,5 +30,11 @@ "chance": 1.0, "path": "standalone/clfsmugglers.dmm", "when": { "lvevent": "clfsmugglers" } + }, + { + "type": "map_insert", + "landmark": "lz1_alternative", + "chance": 0.60, + "path": "sprinkles/lz1alternative.dmm" } ] diff --git a/maps/Nightmare/maps/Sorokyne_Strata/nightmare.json b/maps/Nightmare/maps/Sorokyne_Strata/nightmare.json index fd19a52c33b3..f2c2de7736dc 100644 --- a/maps/Nightmare/maps/Sorokyne_Strata/nightmare.json +++ b/maps/Nightmare/maps/Sorokyne_Strata/nightmare.json @@ -44,5 +44,11 @@ "chance": 1.0, "path": "standalone/clfcamp.dmm", "when": { "lvevent": "clfcrash" } + }, + { + "type": "map_insert", + "landmark": "flamer_bodypile", + "chance": 0.60, + "path": "sprinkles/flamer_bodypile.dmm" } ] diff --git a/maps/bigredv2.json b/maps/bigredv2.json index 3a3d1961b3a9..3569cc828a91 100644 --- a/maps/bigredv2.json +++ b/maps/bigredv2.json @@ -36,10 +36,30 @@ ], "map_item_type": "/obj/item/map/big_red_map", "announce_text": "Weyland-Yutani has lost contact with one of its Biological Storage Facilities, Solaris Ridge, on the planet of LV-1413. The ###SHIPNAME### has been requested to look into the blackout by Weyland-Yutani.", + "co_briefing": { + "Hawks": "maps/map_briefings/commanding_officer/big_red/SOLARISRIDGEcpo.html", + "Doves": "maps/map_briefings/commanding_officer/big_red/SOLARISRIDGEhmm.html", + "Magpies": "maps/map_briefings/commanding_officer/big_red/SOLARISRIDGEmodi.html", + "Unaligned": "maps/map_briefings/commanding_officer/big_red/SOLARISRIDGEunaligned.html" + }, "monkey_types": [ "neaera" ], - "traits": [{ "Ground": true }], + "traits": [ + { + "Ground": true, + "Up": 1 + }, + { + "Ground": true, + "Up": 1, + "Down": -1 + }, + { + "Ground": true, + "Down": -1 + } + ], "nightmare_path": "maps/Nightmare/maps/BigRed/", "xvx_hives": { "xeno_hive_alpha": 0, diff --git a/maps/desert_dam.json b/maps/desert_dam.json index 58971c18e49c..1a913593da04 100644 --- a/maps/desert_dam.json +++ b/maps/desert_dam.json @@ -10,16 +10,45 @@ "/datum/equipment_preset/survivor/roughneck", "/datum/equipment_preset/survivor/chaplain/trijent", "/datum/equipment_preset/survivor/interstellar_commerce_commission_liaison", - "/datum/equipment_preset/survivor/colonial_marshal/trijent", + "/datum/equipment_preset/survivor/nspa/trijent", "/datum/equipment_preset/survivor/engineer/trijent", "/datum/equipment_preset/survivor/engineer/trijent/hydro", "/datum/equipment_preset/survivor/trucker/trijent", - "/datum/equipment_preset/survivor/security/trijent", + "/datum/equipment_preset/survivor/goon/trijent", "/datum/equipment_preset/survivor/corporate/trijent", "/datum/equipment_preset/survivor/civilian", "/datum/equipment_preset/survivor/civilian_unique", "/datum/equipment_preset/survivor/hybrisa/fire_fighter" ], + "synth_survivor_types": [ + "/datum/equipment_preset/synth/survivor/doctor_synth", + "/datum/equipment_preset/synth/survivor/surgeon_synth", + "/datum/equipment_preset/synth/survivor/emt_synth_teal", + "/datum/equipment_preset/synth/survivor/emt_synth_red", + "/datum/equipment_preset/synth/survivor/scientist_synth", + "/datum/equipment_preset/synth/survivor/biohazard_synth", + "/datum/equipment_preset/synth/survivor/archaeologist_synth", + "/datum/equipment_preset/synth/survivor/engineer_synth", + "/datum/equipment_preset/synth/survivor/firefighter_synth", + "/datum/equipment_preset/synth/survivor/miner_synth", + "/datum/equipment_preset/synth/survivor/chef_synth", + "/datum/equipment_preset/synth/survivor/teacher_synth", + "/datum/equipment_preset/synth/survivor/surveyor_synth", + "/datum/equipment_preset/synth/survivor/freelancer_synth", + "/datum/equipment_preset/synth/survivor/trucker_synth", + "/datum/equipment_preset/synth/survivor/bartender_synth", + "/datum/equipment_preset/synth/survivor/fisher_synth", + "/datum/equipment_preset/synth/survivor/hydro_synth", + "/datum/equipment_preset/synth/survivor/journalist_synth", + "/datum/equipment_preset/synth/survivor/atc_synth", + "/datum/equipment_preset/synth/survivor/nspa_synth", + "/datum/equipment_preset/synth/survivor/wy/security_synth", + "/datum/equipment_preset/synth/survivor/wy/corporate_synth", + "/datum/equipment_preset/synth/survivor/detective_synth", + "/datum/equipment_preset/synth/survivor/icc_synth", + "/datum/equipment_preset/synth/survivor/pilot_synth", + "/datum/equipment_preset/synth/survivor/radiation_synth" + ], "CO_insert_survivor_types": [ "/datum/equipment_preset/survivor/clf/coordinator" ], @@ -33,10 +62,40 @@ "map_item_type": "/obj/item/map/desert_dam", "announce_text": "We've lost contact with Weyland-Yutani's extra-solar colony, \"Trijent Dam\", on the planet \"Raijin.\" The ###SHIPNAME### has been dispatched to assist.", "liaison_briefing": "maps/map_briefings/cl_brief_trijent.html", + "co_briefing": { + "Hawks": "maps/map_briefings/commanding_officer/trijent_dam/TRIJENTDAMcpo.html", + "Doves": "maps/map_briefings/commanding_officer/trijent_dam/TRIJENTDAMhmm.html", + "Magpies": "maps/map_briefings/commanding_officer/trijent_dam/TRIJENTDAMmodi.html", + "Unaligned": "maps/map_briefings/commanding_officer/trijent_dam/TRIJENTDAMunaligned.html" + }, "monkey_types": [ "stok" ], - "traits": [{ "Ground": true }], + "traits": [ + { + "Ground": true, + "Up": 1 + }, + { + "Ground": true, + "Up": 1, + "Down": -1 + }, + { + "Ground": true, + "Up": 1, + "Down": -1 + }, + { + "Ground": true, + "Up": 1, + "Down": -1 + }, + { + "Ground": true, + "Down": -1 + } + ], "nightmare_path": "maps/Nightmare/maps/DesertDam/", "xvx_hives": { "xeno_hive_alpha": 0, diff --git a/maps/fiorina_sciannex.json b/maps/fiorina_sciannex.json index bd55117d9c6c..59616ba45ecb 100644 --- a/maps/fiorina_sciannex.json +++ b/maps/fiorina_sciannex.json @@ -27,6 +27,12 @@ 0.0 ], "survivor_message": "You are a survivor of the attack on Fiorina Orbital Penitentiary. You worked or lived on the prison station, and managed to avoid the alien attacks... until now.", + "co_briefing": { + "Hawks": "maps/map_briefings/commanding_officer/fiorina/FIORINAcpo.html", + "Doves": "maps/map_briefings/commanding_officer/fiorina/FIORINAhmm.html", + "Magpies": "maps/map_briefings/commanding_officer/fiorina/FIORINAmodi.html", + "Unaligned": "maps/map_briefings/commanding_officer/fiorina/FIORINAunaligned.html" + }, "map_item_type": "/obj/item/map/FOP_map_v3", "announce_text": "An automated distress signal has been received from maximum-security prison \"Fiorina Orbital Penitentiary\". A response team from the ###SHIPNAME### will be dispatched shortly to investigate.", "environment_traits": { "InSpace": true }, diff --git a/maps/interiors/clf_van.dmm b/maps/interiors/clf_van.dmm index a2250110250f..d1c4dd46c296 100644 --- a/maps/interiors/clf_van.dmm +++ b/maps/interiors/clf_van.dmm @@ -5,7 +5,7 @@ }, /obj/effect/landmark/interior/spawn/entrance{ dir = 8; - exit_type = /obj/structure/interior_exit/vehicle/van/backright; + exit_type = /obj/structure/interior_exit/vehicle/clf_van/backright; name = "back right entrance marker"; pixel_x = -32; tag = "back_right" @@ -89,7 +89,7 @@ /obj/effect/vehicle_roof/clf_van, /obj/effect/landmark/interior/spawn/entrance{ dir = 8; - exit_type = /obj/structure/interior_exit/vehicle/van/backleft; + exit_type = /obj/structure/interior_exit/vehicle/clf_van/backleft; name = "back left entrance marker"; pixel_x = -32; tag = "back_left" @@ -104,7 +104,7 @@ "t" = ( /obj/effect/landmark/interior/spawn/entrance{ dir = 1; - exit_type = /obj/structure/interior_exit/vehicle/van/left; + exit_type = /obj/structure/interior_exit/vehicle/clf_van/left; name = "left entrance marker"; pixel_y = 32; tag = "left" @@ -148,7 +148,7 @@ "y" = ( /obj/effect/landmark/interior/spawn/entrance{ alpha = 50; - exit_type = /obj/structure/interior_exit/vehicle/van/right; + exit_type = /obj/structure/interior_exit/vehicle/clf_van/right; name = "right entrance marker"; tag = "right" }, diff --git a/maps/kutjevo.json b/maps/kutjevo.json index efb1ab196ba1..3490beeb5591 100644 --- a/maps/kutjevo.json +++ b/maps/kutjevo.json @@ -36,11 +36,31 @@ "map_item_type": "/obj/item/map/kutjevo_map", "announce_text": "An automated distress signal has been received from Weyland-Yutani colony Kutjevo Refinery, known for botanical research, export, and raw materials processing and refinement. The ###SHIPNAME### has been dispatched to investigate.", "liaison_briefing": "maps/map_briefings/cl_brief_kutjevo.html", + "co_briefing": { + "Hawks": "maps/map_briefings/commanding_officer/kutjevo/KUTJEVOcpo.html", + "Doves": "maps/map_briefings/commanding_officer/kutjevo/KUTJEVOhmm.html", + "Magpies": "maps/map_briefings/commanding_officer/kutjevo/KUTJEVOmodi.html", + "Unaligned": "maps/map_briefings/commanding_officer/kutjevo/KUTJEVOunaligned.html" + }, "monkey_types": [ "neaera", "stok" ], - "traits": [{ "Ground": true }], + "traits": [ + { + "Ground": true, + "Up": 1 + }, + { + "Ground": true, + "Up": 1, + "Down": -1 + }, + { + "Ground": true, + "Down": -1 + } + ], "nightmare_path": "maps/Nightmare/maps/Kutjevo/", "camouflage": "desert", "gamemodes": [ diff --git a/maps/lv522_chances_claim.json b/maps/lv522_chances_claim.json index 75cf918d9706..675ceb10bd9d 100644 --- a/maps/lv522_chances_claim.json +++ b/maps/lv522_chances_claim.json @@ -25,12 +25,32 @@ "survivor_message": "You are USCM Force Reconnaissance (FORECON) marine from the USS Hanyut, stranded on this planet after your team was wiped out while investigating the distress signal. With your pilot dead along with the majority of your unit, you and your team have been running and gunning to survive... but with supplies low and food running out maybe your only means of survival is to move west to the crashed dropship to salvage anything useful.", "announce_text": "Pan-Pan. This is the commanding officer of the USS Hanyut, USCMC FORECON. We are currently grounded on planet LV-522 in the immediate area of Chance's Claim. We are unable to contact the Hanyut and our dropships are unable to take off at this time. We are requesting assistance from any nearby vessels; this broadcast is set to repeat every 24 hours.", "map_item_type": "/obj/item/map/lv522_map", - "monkey_types": [ + "co_briefing": { + "Hawks": "maps/map_briefings/commanding_officer/chances/CHANCEScpo.html", + "Doves": "maps/map_briefings/commanding_officer/chances/CHANCEShmm.html", + "Magpies": "maps/map_briefings/commanding_officer/chances/CHANCESmodi.html", + "Unaligned": "maps/map_briefings/commanding_officer/chances/CHANCESunaligned.html" + }, + "monkey_types": [ "neaera", "stok" ], "environment_traits": { "Fog": true }, - "traits": [{ "Ground": true }], + "traits": [ + { + "Ground": true, + "Up": 1 + }, + { + "Ground": true, + "Up": 1, + "Down": -1 + }, + { + "Ground": true, + "Down": -1 + } + ], "nightmare_path": "maps/Nightmare/maps/LV522_Chances_Claim/", "xvx_hives": { "xeno_hive_alpha": 0, diff --git a/maps/lv624.json b/maps/lv624.json index 5ef239cfadb8..e2fed8b1f0e0 100644 --- a/maps/lv624.json +++ b/maps/lv624.json @@ -21,6 +21,12 @@ "CO_insert_survivor_types": [ "/datum/equipment_preset/survivor/clf/coordinator" ], + "co_briefing": { + "Hawks": "maps/map_briefings/commanding_officer/lv624/LV624cpo.html", + "Doves": "maps/map_briefings/commanding_officer/lv624/LV624hmm.html", + "Magpies": "maps/map_briefings/commanding_officer/lv624/LV624modi.html", + "Unaligned": "maps/map_briefings/commanding_officer/lv624/LV624unaligned.html" + }, "map_item_type": "/obj/item/map/lazarus_landing_map", "announce_text": "An automated distress signal has been received from the archaeological site of Lazarus Landing, on the border world of LV-624. A response team from the ###SHIPNAME### will be dispatched shortly to investigate.", "monkey_types": [ @@ -30,7 +36,21 @@ "stok" ], "environment_traits": { "Fog": true }, - "traits": [{ "Ground": true }], + "traits": [ + { + "Ground": true, + "Up": 1 + }, + { + "Ground": true, + "Up": 1, + "Down": -1 + }, + { + "Ground": true, + "Down": -1 + } + ], "nightmare_path": "maps/Nightmare/maps/LV624/", "xvx_hives": { "xeno_hive_alpha": 0, diff --git a/maps/lv759_hybrisa_prospera.json b/maps/lv759_hybrisa_prospera.json index f9f604afd1bd..85bdc0fb80f4 100644 --- a/maps/lv759_hybrisa_prospera.json +++ b/maps/lv759_hybrisa_prospera.json @@ -48,12 +48,32 @@ ], "survivor_message": "As the city burns, you find yourself among the dwindling few who survived the initial onslaught, The catastrophic breach shattered the once-prosperous world of LV-759, home to the large commercial & industrial Weyland-Yutani colony known as Hybrisa Prospera. Through sheer will or cunning, you've evaded the relentless alien onslaught so far... but the nightmare persists.", "announce_text": "An automated distress signal has been received from the Weyland-Yutani colony, Hybrisa Prospera — a vast, city-like settlement renowned for its immense wealth, extensive mining operations, and thriving commerce. Recently fully acquired from the TWE, this former colony is now a key asset for Weyland-Yutani, with a sprawling urban center housing thousands of residents and numerous smaller outer colonies under its control. The ###SHIPNAME### has been dispatched to investigate the situation.", + "co_briefing": { + "Hawks": "maps/map_briefings/commanding_officer/hybrisa/HYBRISAcpo.html", + "Doves": "maps/map_briefings/commanding_officer/hybrisa/HYBRISAhmm.html", + "Magpies": "maps/map_briefings/commanding_officer/hybrisa/HYBRISAmodi.html", + "Unaligned": "maps/map_briefings/commanding_officer/hybrisa/HYBRISAunaligned.html" + }, "map_item_type": "/obj/item/map/lv759_map", "monkey_types": [ "monkey" ], "environment_traits": { "Fog": true }, - "traits": [{ "Ground": true }], + "traits": [ + { + "Ground": true, + "Up": 1 + }, + { + "Ground": true, + "Up": 1, + "Down": -1 + }, + { + "Ground": true, + "Down": -1 + } + ], "nightmare_path": "maps/Nightmare/maps/LV759_Hybrisa_Prospera/", "xvx_hives": { "xeno_hive_alpha": 0, diff --git a/maps/map_briefings/commanding_officer/big_red/SOLARISRIDGEcpo.html b/maps/map_briefings/commanding_officer/big_red/SOLARISRIDGEcpo.html new file mode 100644 index 000000000000..a22cea3d542b --- /dev/null +++ b/maps/map_briefings/commanding_officer/big_red/SOLARISRIDGEcpo.html @@ -0,0 +1,68 @@ + + + +
+
+
+ 
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ SECTOR ENFORCEMENT CENTER - FORT THUNDER, TRAPPIST-5
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Engagement Protocol - Solaris Ridge AO
+USCM REF: 48-77-SE CONFIDENTIAL +
+Commander,
+
+Solaris Ridge has gone dark under suspicious conditions.
+
+Colonial records cite environmental failure, sabotage, and contamination.
+
+All signs point to a serious biological threat and weak security oversight.
+
+You are ordered to seize control of the area and reestablish dominance with decisive force. +
+PRIMARY OBJECTIVES +
+
-
+
- - Deploy a fortified base in the colony's administrative and secure any and all personnel files. +
- - Sweep colonial infrastructure and disused mineral transport network for signs of hostile infection. +
- - Capture or destroy all unauthorized Weyland-Yutani materials and personnel as per Directive 61-E. +
+SECONDARY OBJECTIVES +
+
-
+
- - Enforce martial order across the Ridge and detain suspicious survivors in the field. +
- - Scuttle remaining research modules to prevent foreign exploitation. +
- - Reinforce the colony's perimeter and eliminate all unregistered lifeforms. +
+You are authorized to demolish critical infrastructure if it aids in strategic containment.
+Let this serve as a warning to all: the Corps does not tolerate failure. +
+United States Colonial Marine Corps
+Colonel Margaret A.W. Shanks
+Colonial Protection Organization - 4th Combat Division
+No mercy. No doubt.
+
+
+ DO NOT DEVIATE WITHOUT WRITTEN AUTHORIZATION +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ PROVOST MARSHAL'S FIELD OFFICE - NEW MASON COLONY, 61 CYGNI SYSTEM
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Deployment Priorities - Solaris Ridge AO
+USCM REF: 48-77-HM CONFIDENTIAL +
+Commander,
+
+Solaris Ridge is more than a derelict outpost, it's home to forgotten workers, families, and scientific pioneers.
+
+Satellite interference suggests they've gone silent amid worsening environmental strain.
+
+Your task is to protect what remains and who remains. +
+PRIMARY OBJECTIVES +
+
-
+
- - Establish a relatively unobtrusive Forward Operating Base to avoid unnecessary disruption. +
- - Locate and assist any remaining research personnel, particularly those affiliated with atmospheric control and botany. +
- - Secure research findings relevant to the Ridge's lichen-based terraforming experiments. +
+SECONDARY OBJECTIVES +
+
-
+
- - Maintain structural integrity of airlocks and shelter points to facilitate civilian use. +
- - Avoid unnecessary force during crowd encounters or tunnel sweeps. Exercise judgment before lethal engagement. +
- - Use auxiliary medevac protocols for trauma cases discovered during recon missions. +
+Hearts and minds may not win every war, but they win the right ones.
+Let your conduct reflect the humanity we fight to preserve. +
+USCM Provost Marshal
+Colonel Adrian Blackburn
+Hearts & Minds Movement - 4th Combat Division
+In service to justice and peace.
+
+
+ DO NOT FORWARD OUTSIDE COMMAND CHANNELS +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ TECHNICAL OPERATIONS DIRECTORATE - ANVIL STATION, HERCULINA ORBIT
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Research-Oriented Objectives - Solaris Ridge AO
+USCM REF: 48-77-RI CONFIDENTIAL +
+Commander,
+
+This mission classifies under Experimental Asset Salvage.
+
+Solaris Ridge was used by Weyland-Yutani for long-term bioengineering trials involving fungal and atmospheric cross-regulation.
+
+Seismic patterns and lost data uplinks suggest anomalous biological contact.
+
+Your priority is not elimination, it is extraction. +
+PRIMARY OBJECTIVES +
+
-
+
- - Deploy scientific forward modules to the Ridge's central research facilities and surrounding infrastructure. +
- - Recover climate-stabilization data, lichen growth logs, and any evidence of synthetic-AI interaction. +
- - Secure live or inert specimens if containment can be achieved safely. +
+SECONDARY OBJECTIVES +
+
-
+
- - Avoid unnecessary damage to data cores, relay pylons, and sample cryofridges. +
- - Document all suspected adaptations to low-atmosphere environments and record visual evidence. +
- - If applicable, repurpose solar relay stations to power research equipment. +
+Remember: an intact discovery is worth more than a burned one.
+Bring the science back with you intact, if possible. +
+Division Logistics Commander
+Lt. Colonel Geoffrey Lamdem
+Military Organization for Development and Innovation - 4th Combat Division
+Onward through progress.
+
+
+ DO NOT FORWARD OUTSIDE COMMAND CHANNELS +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ REGIMENTAL COMMAND - CHINOOK 91 GSO STATION
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Operational Objectives - Solaris Ridge AO
+USCM REF: 48-77-AQ CONFIDENTIAL +
+Commander,
+
+Regimental Command has issued new deployment priorities for your operation at Solaris Ridge, a remote research-industrial colony now marked unresponsive following seismic interference and suspected biohazard presence.
+
+Standard biological protocol is in effect. +
+PRIMARY OBJECTIVES +
+
-
+
- - Establish and maintain a secure Forward Operating Base within walking distance of the colony's hospital. +
- - Locate and rescue any survivors from the research stations located in the colonies two main laboratories. +
- - Secure and recover classified Weyland-Yutani assets, including lichen samples, atmospheric readings, and communications black boxes. +
+SECONDARY OBJECTIVES +
+
-
+
- - Restore basic power and environmental control to key structures, including tram tunnels and storage wings. +
- - Identify and map seismic anomalies linked to movement beneath the subsoil. +
- - Neutralize any hostile threats located near the tramline junction or eastern industrial wing. +
+Prepare for dust storms and low visibility.
+External communications may be degraded.
+
+Maintain operational discipline and report any anomalies immediately. +
+Strategic Liaison Officer
+Second Lieutenant Lucas Harlan
+2nd Battalion, 3rd Regiment - 4th Combat Division
+For the Corps.
+
+
+ DO NOT FORWARD OUTSIDE COMMAND CHANNELS +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ SECTOR ENFORCEMENT CENTER - FORT THUNDER, TRAPPIST-5
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Engagement Protocol - LV-522 "Chance's Claim" AO
+USCM REF: 48-77-SE CONFIDENTIAL +
+Commander,
+
+Weyland-Yutani has lost control of Chance's Claim, and our own Force Recon unit has gone silent.
+
+This situation is a clear threat to colonial energy stability and USCM prestige.
+
+Regain control with force and prevent reactor sabotage. +
+PRIMARY OBJECTIVES +
+
-
+
- - Deploy and fortify a FOB that offers rapid access to both reactor sectors. +
- - Terminate any hostile personnel in reactor control, maintenance tunnels, and hab sector. +
- - Seize FORECON equipment caches and recover classified intelligence no matter the cost. +
+SECONDARY OBJECTIVES +
+
-
+
- - Prevent Weyland-Yutani or local survivors from compromising reactor integrity. +
- - Demolish access to unsecure auxiliary tunnels if signs of infestation are detected. +
- - Reestablish control over uplink tower to deny communication outside USCM channels. +
+You are not rescuers. You are the line, hold it.
+Any remaining assets must be loyal, or they must be removed. +
+United States Colonial Marine Corps
+Colonel Margaret A.W. Shanks
+Colonial Protection Organization - 4th Combat Division
+No mercy. No doubt.
+
+
+ DO NOT DEVIATE WITHOUT WRITTEN AUTHORIZATION +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ PROVOST MARSHAL'S FIELD OFFICE - NEW MASON COLONY, 61 CYGNI SYSTEM
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Deployment Priorities - LV-522 "Chance's Claim" AO
+USCM REF: 48-77-HM CONFIDENTIAL +
+Commander,
+
+Chance's Claim is a company-run power colony with a small civilian population and dual-reactor core.
+
+The distress signal was followed by the deployment, and silence, of our Force Recon unit.
+
+We must act quickly, but responsibly. Lives are likely still at risk; both ours and theirs. +
+PRIMARY OBJECTIVES +
+
-
+
- - Establish a Forward Operating Base, ideally using existing infrastructure, without structural damage. +
- - Locate civilian survivors and FORECON personnel, avoid collateral trauma or panic. +
- - Ensure both nuclear reactors remain stable and under secure, humane oversight. +
+SECONDARY OBJECTIVES +
+
-
+
- - Avoid hostile escalation with Weyland-Yutani operatives unless directly endangered. +
- - Preserve access routes for emergency evacuation through secondary tram tunnels. +
- - Disable enemy strongholds with targeted strikes and avoid unnecessary destruction of infrastructure. +
+You are not just marines, you're the last line of defence for people already abandoned once. +
+USCM Provost Marshal
+Colonel Adrian Blackburn
+Hearts & Minds Movement - 4th Combat Division
+In service to justice and peace.
+
+
+ DO NOT FORWARD OUTSIDE COMMAND CHANNELS +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ TECHNICAL OPERATIONS DIRECTORATE - ANVIL STATION, HERCULINA ORBIT
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Research-Oriented Objectives - LV-522 "Chance's Claim" AO
+USCM REF: 48-77-RI CONFIDENTIAL +
+Commander,
+
+The Chance's Claim facility includes two Weyland-Yutani reactors, a cryo-research sublevel, and multiple unreleased prototype systems for energy export.
+
+Following the loss of a deployed Force Recon team, this site now qualifies for strategic data salvage.
+
+Proceed carefully but thoroughly. Recovery takes priority. +
+PRIMARY OBJECTIVES +
+
-
+
- - Establish a FOB that enables direct access to central reactor diagnostics and WY vault. +
- - Recover FORECON field data, biosample containers, and helmet cam logs. +
- - Secure and extract reactor core performance files and biosafety test modules. +
+SECONDARY OBJECTIVES +
+
-
+
- - Use remotely operated scouts to document unusual behavior in geothermal maintenance tunnels. +
- - Preserve any modified reactor shielding or coolant tech for analysis. +
- - Survey enemy locations relative to electrical emissions or containment field failures. +
+This colony might not survive. The science must. +
+Division Logistics Commander
+Lt. Colonel Geoffrey Lamdem
+Military Organization for Development and Innovation - 4th Combat Division
+Onward through progress.
+
+
+ DO NOT FORWARD OUTSIDE COMMAND CHANNELS +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ REGIMENTAL COMMAND - CHINOOK 91 GSO STATION
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Operational Objectives - LV-522 "Chance's Claim" AO
+USCM REF: 48-77-AQ CONFIDENTIAL +
+Commander,
+
+You are being deployed to the Weyland-Yutani colony Chance's Claim on LV-522, following the loss of contact with a deployed USCM Force Reconnaissance (FORECON) detachment.
+
+The colony houses two functioning nuclear reactors that supply power to surrounding colonial assets across the sector.
+
+Mission priority is to secure the reactors, locate surviving Marines or civilians, and prevent further escalation. +
+PRIMARY OBJECTIVES +
+
-
+
- - Establish a Forward Operating Base with with direct access to reactor control and main colony entrance. +
- - Locate and extract any surviving FORECON operators, if possible. +
- - Secure both reactor control rooms and confirm reactor safety protocols remain intact. +
+SECONDARY OBJECTIVES +
+
-
+
- - Sweep geothermal cooling tunnels for signs of unexplained biological activity or possible infestation. +
- - Recover data from FORECON drop pod and helmet recorders. +
- - Ensure reactors are not compromised. Initiate shutdown only if absolutely necessary. +
+Standard containment protocols are in effect.
+Reactor destabilization will trigger sector-wide blackouts.
+
+Avoid at all costs. +
+Strategic Liaison Officer
+Second Lieutenant Lucas Harlan
+2nd Battalion, 3rd Regiment - 4th Combat Division
+For the Corps.
+
+
+ DO NOT FORWARD OUTSIDE COMMAND CHANNELS +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ SECTOR ENFORCEMENT CENTER - FORT THUNDER, TRAPPIST-5
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Engagement Protocol - Fiorina Science Annex AO
+USCM REF: 48-77-SE CONFIDENTIAL +
+Commander,
+
+The Fiorina Annex has violated Joint Security Order 9.
+
+Communications are down, and we have reason to believe Weyland-Yutani has lost control of its own experiments.
+
+You are to secure the site with overwhelming force and terminate all rogue assets. +
+PRIMARY OBJECTIVES +
+
-
+
- - Fortify a Forward Operating Base adjacent to the Lower Industrial Block. +
- - Sweep the facility's prison tiers, medlabs, and freight elevator junctions for hostile elements. +
- - Confiscate or destroy all Weyland-Yutani biological and classified equipment. +
+SECONDARY OBJECTIVES +
+
-
+
- - Execute crowd control protocols in inmate holding areas. Non-compliant prisoners are not to be released. +
- - Seal shuttle hangar and deny all escape attempts by corporate or compromised subjects. +
- - Eliminate anomalous biological formations near the science wing containment zones. +
+Minimal patience. Maximum pressure.
+The Corps does not recognize private interference in secure combat zones. +
+United States Colonial Marine Corps
+Colonel Margaret A.W. Shanks
+Colonial Protection Organization - 4th Combat Division
+No mercy. No doubt.
+
+
+ DO NOT DEVIATE WITHOUT WRITTEN AUTHORIZATION +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ PROVOST MARSHAL'S FIELD OFFICE - NEW MASON COLONY, 61 CYGNI SYSTEM
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Deployment Priorities - Fiorina Science Annex AO
+USCM REF: 48-77-HM CONFIDENTIAL +
+Commander,
+
+The Fiorina Annex is both prison and proving ground.
+
+It is a site with human lives at its center, many of them forgotten and uncared for.
+
+WY and UA oversight may be fragmented, but your orders are not: prioritize preservation, justice, and restraint. +
+PRIMARY OBJECTIVES +
+
-
+
- - Deploy your FOB at a location where aid and triage can be delivered to both staff and inmate survivors. +
- - Locate missing medical teams and security personnel last seen near the transit hub. +
- - Secure ethically questionable research logs and bring evidence of abuse or violations to the Almayer. +
+SECONDARY OBJECTIVES +
+
-
+
- - Avoid lethal force in prison areas unless direct threat is confirmed. +
- - Facilitate safe evacuation of non-hostile prisoners through upper docking platforms. +
- - Preserve biological storage and archive blocks for forensic review. +
+Human dignity persists even in places left behind.
+Show Fiorina what the Corps stands for. +
+USCM Provost Marshal
+Colonel Adrian Blackburn
+Hearts & Minds Movement - 4th Combat Division
+In service to justice and peace.
+
+
+ DO NOT FORWARD OUTSIDE COMMAND CHANNELS +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ TECHNICAL OPERATIONS DIRECTORATE - ANVIL STATION, HERCULINA ORBIT
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Research-Oriented Objectives - Fiorina Science Annex AO
+USCM REF: 48-77-RI CONFIDENTIAL +
+Commander,
+
+The Fiorina Annex was host to dual-research protocols: behavioral modification of inmate populations and bioweapon experimentation.
+
+We need to know what survived the collapse.
+
+Proceed as an asset recovery expedition. +
+PRIMARY OBJECTIVES +
+
-
+
- - Secure FOB at a location that will offer direct access to the Botany Wing and Cryo Storage. +
- - Recover research data, subject samples, and neurological implants from terminated projects in the main lab. +
- - Identify and quarantine anomalous biological strains or unknown entities within the prison's boundaries. +
+SECONDARY OBJECTIVES +
+
-
+
- - Preserve AI logs and camera footage from the Warden's office. +
- - Monitor potential biological movement via trail sensors in the prison chapel and autopsy theater. +
- - Extract unfinished prototypes or unauthorized drug batches stored near LZ1 medstorage. +
+You are not here to destroy everything.
+You are here to learn what we'd rather not forget. +
+Division Logistics Commander
+Lt. Colonel Geoffrey Lamdem
+Military Organization for Development and Innovation - 4th Combat Division
+Onward through progress.
+
+
+ DO NOT FORWARD OUTSIDE COMMAND CHANNELS +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ REGIMENTAL COMMAND - CHINOOK 91 GSO STATION
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Operational Objectives - Fiorina Science Annex AO
+USCM REF: 48-77-AQ CONFIDENTIAL +
+Commander,
+
+You are being deployed to Fiorina Science Annex, a joint United Americas-Weyland-Yutani facility.
+
+All communications ceased 16 hours ago.
+
+Local signals suggest both penal containment and research control systems have failed. +
+PRIMARY OBJECTIVES +
+
-
+
- - Establish and maintain a secure Forward Operating Base near the Processing Block entry. +
- - Locate and extract survivors, including researchers, corrections staff, and any unarmed inmates. +
- - Secure biological samples, experiment logs, and personnel files stored in the central cryo lab and the servers. +
+SECONDARY OBJECTIVES +
+
-
+
- - Restore security lockdown control to isolation chambers and armory block. +
- - Prevent spread of biohazards or prisoner breakout beyond any established perimeter. +
- - Investigate and neutralize reported hostile activity within the prison chapel or east annex crawlways. +
+Facility jurisdiction is legally complex. Proceed carefully around UA or WY markings.
+Detain high-risk personnel. +
+Strategic Liaison Officer
+Second Lieutenant Lucas Harlan
+2nd Battalion, 3rd Regiment - 4th Combat Division
+For the Corps.
+
+
+ DO NOT FORWARD OUTSIDE COMMAND CHANNELS +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ SECTOR ENFORCEMENT CENTER - FORT THUNDER, TRAPPIST-5
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Engagement Protocol - Hybrisa Prospera AO
+USCM REF: 48-77-SE CONFIDENTIAL +
+Commander,
+
+Hybrisa Prospera was lost under suspicious conditions immediately following the withdrawal of TWE forces.
+
+Intelligence suggests enemy contact may have coincided with — or been accelerated by — covert corporate operations. This is now a hostile urban AO. Your task is to take control of the situation before the Empire or any other power can intervene further. +
+PRIMARY OBJECTIVES +
+
-
+
- - Fortify FOB at a location which gives direct access to high-density civilian zones and corporate infrastructure. +
- - Eliminate suspected infestations or dangerous non-human elements in sub-city transit tunnels, sewer grids, or excavation sites near the xenocraft chamber. +
- - Seize and lock down all Weyland-Yutani blacksite facilities — detain or eliminate PMC personnel. +
+SECONDARY OBJECTIVES +
+
-
+
- - Prevent exfil of sensitive tech or bioweapons to off-world smugglers via the starport. +
- - Establish control over Hybrisa's planetary defense uplink and secure TWE depot bunkers. +
- - Apprehend or neutralize known CLF agitators operating in the worker districts. +
+This is no longer a city. It's a contested battlespace.
+Secure it - fast, hard, and without ambiguity. +
+United States Colonial Marine Corps
+Colonel Margaret A.W. Shanks
+Colonial Protection Organization - 4th Combat Division
+No mercy. No doubt.
+
+
+ DO NOT DEVIATE WITHOUT WRITTEN AUTHORIZATION +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ PROVOST MARSHAL'S FIELD OFFICE - NEW MASON COLONY, 61 CYGNI SYSTEM
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Deployment Priorities - Hybrisa Prospera AO
+USCM REF: 48-77-HM CONFIDENTIAL +
+Commander,
+
+You are about to enter one of the largest urban colonies in the Neroid Sector.
+
+Once a thriving city, Hybrisa has suffered from mounting instability, culminating in a full planetary blackout.
+
+We must treat this as both a rescue and peacekeeping operation. +
+PRIMARY OBJECTIVES +
+
-
+
- - Deploy FOB at a location which allows access to residential and civic medical sectors. +
- - Locate and evacuate civilian non-combatants, with emphasis on children, wounded, and medical staff. +
- - Secure and preserve access to the city's emergency services control center. +
+SECONDARY OBJECTIVES +
+
-
+
- - Avoid damage to hospitals, shelters, and communications infrastructure. +
- - Detain, not kill, Whiteguard PMC or CLF personnel when possible. +
- - Offer safe surrender channels to any stranded civilian officials or miners in the industrial zones. +
+The population may still be alive beneath the chaos.
+Be their protector, not their invader. +
+USCM Provost Marshal
+Colonel Adrian Blackburn
+Hearts & Minds Movement - 4th Combat Division
+In service to justice and peace.
+
+
+ DO NOT FORWARD OUTSIDE COMMAND CHANNELS +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ TECHNICAL OPERATIONS DIRECTORATE - ANVIL STATION, HERCULINA ORBIT
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Research-Oriented Objectives - Hybrisa Prospera AO
+USCM REF: 48-77-RI CONFIDENTIAL +
+Commander,
+
+Hybrisa Prospera sits atop the most extensive alien structure discovery since the Derelict on LV-426.
+
+Intelligence confirms that Weyland-Yutani was conducting unauthorized excavation beneath the colony with multiple layered facilities of unknown origin.
+
+This is a high-priority recovery operation for advanced xeno-technology. +
+PRIMARY OBJECTIVES +
+
-
+
- - Secure a FOB near corporate transit lines and excavation zone entry. +
- - Recover all data cores from Weyland-Yutani's underground research chambers. +
- - Tag and document any evidence of the xenocraft's internal structure. Avoid triggering automated systems. +
+SECONDARY OBJECTIVES +
+
-
+
- - Obtain DNA or biomechanical samples from Whiteguard containment facilities. +
- - Preserve advanced medical AI housed in the city's neurological hospital. +
- - Trace possible anomalous activity vectors using biometric traffic logs from spaceport scanners. +
+Do not allow this discovery to vanish in fire and bullets.
+The future of humanity may rest here. +
+Division Logistics Commander
+Lt. Colonel Geoffrey Lamdem
+Military Organization for Development and Innovation - 4th Combat Division
+Onward through progress.
+
+
+ DO NOT FORWARD OUTSIDE COMMAND CHANNELS +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ REGIMENTAL COMMAND - CHINOOK 91 GSO STATION
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Operational Objectives - Hybrisa Prospera AO
+USCM REF: 48-77-AQ CONFIDENTIAL +
+Commander,
+
+You are tasked with responding to a complete communications blackout from Hybrisa Prospera, a major colony on LV-759 with a population in the tens of thousands.
+
+The colony hosts critical mineral refining infrastructure, a major spaceport, and is a key transit hub for the Neroid Sector.
+
+USCMC intervention was requested jointly by the Three World Empire and Weyland-Yutani following the sudden loss of all contact with planetary authorities. +
+PRIMARY OBJECTIVES +
+
-
+
- - Establish a secure Forward Operating Base near the central transit loop and spaceport junction. +
- - Locate and recover key government, security, and medical personnel from the city center and outlying medical complex. +
- - Secure classified Weyland-Yutani research data and prevent its exfiltration by third parties. +
+SECONDARY OBJECTIVES +
+
-
+
- - Restore control over city-wide power and traffic systems via transit control or engineering hubs. +
- - Investigate rumors of a buried alien structure south of the colony. Initiate recon but avoid deep penetration without support. +
- - Neutralize or detain any paramilitary elements operating in the city's lower districts or corporate zones. +
+Tread carefully. This is a population center and political flashpoint.
+Collateral damage must be minimized where feasible. +
+Strategic Liaison Officer
+Second Lieutenant Lucas Harlan
+2nd Battalion, 3rd Regiment - 4th Combat Division
+For the Corps.
+
+
+ DO NOT FORWARD OUTSIDE COMMAND CHANNELS +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ SECTOR ENFORCEMENT CENTER - FORT THUNDER, TRAPPIST-5
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Engagement Protocol - Kutjevo Refinery AO
+USCM REF: 48-77-SE CONFIDENTIAL +
+Commander,
+
+Kutjevo isn't just a bottling plant. It is a monopoly on Dykuma I's aquifers.
+
+If biological contamination spreads through the water system, it could threaten the entire biosphere and spark large-scale ecological collapse.
+
+You are tasked with rapid containment and infrastructure denial. +
+PRIMARY OBJECTIVES +
+
-
+
- - Fortify a FOB positioned to defend access to central filtration shafts. +
- - Eliminate all unauthorized biological activity from aquifer intake tunnels and sublevel caverns. +
- - Shut down or secure all refinery systems to prevent external contamination or misuse. +
+SECONDARY OBJECTIVES +
+
-
+
- - Neutralize any hostile survivors attempting to sabotage or hijack Weyland-Yutani shipment equipment. +
- - Destroy wildlife showing signs of unusual or unnatural mutation near the water reservoir. +
- - Collapse compromised tunnel systems if large-scale nesting structures are detected near deepwater zones. +
+This is not an asset. It's a vector for invasion.
+Lock it down. Burn what you can't save. +
+United States Colonial Marine Corps
+Colonel Margaret A.W. Shanks
+Colonial Protection Organization - 4th Combat Division
+No mercy. No doubt.
+
+
+ DO NOT DEVIATE WITHOUT WRITTEN AUTHORIZATION +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ PROVOST MARSHAL'S FIELD OFFICE - NEW MASON COLONY, 61 CYGNI SYSTEM
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Deployment Priorities - Kutjevo Refinery AO
+USCM REF: 48-77-HM CONFIDENTIAL +
+Commander,
+
+Kutjevo's people rely on the aquifer not just for survival, but for hope.
+
+Whatever threat has befallen the refinery, our mission must center on protecting the 2,000 workers and preserving the natural balance of this fragile desert world. +
+PRIMARY OBJECTIVES +
+
-
+
- - Establish a non-disruptive FOB at near the botanical block and medical suite. +
- - Locate and rescue non-combatant refinery personnel sheltering in administration or safety control stations. +
- - Preserve environmental monitoring and water flow systems from deliberate or accidental damage. +
+SECONDARY OBJECTIVES +
+
-
+
- - Use nonlethal deterrents where possible in case of worker unrest or confusion. +
- - Prevent aquifer runoff into structurally compromised tunnels or unknown subterranean spaces. +
- - Coordinate evac efforts through Weyland-Yutani's shuttlepad access corridor. +
+Remember: this is their home, their water, and their lives.
+Treat the terrain and its people with care. +
+USCM Provost Marshal
+Colonel Adrian Blackburn
+Hearts & Minds Movement - 4th Combat Division
+In service to justice and peace.
+
+
+ DO NOT FORWARD OUTSIDE COMMAND CHANNELS +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ TECHNICAL OPERATIONS DIRECTORATE - ANVIL STATION, HERCULINA ORBIT
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Research-Oriented Objectives - Kutjevo Refinery AO
+USCM REF: 48-77-RI CONFIDENTIAL +
+Commander,
+
+Preliminary data suggests Kutjevo's aquifer system may have undergone rapid biological shifts following the blackout.
+
+You are to conduct a recovery operation for both biological and hydrological data.
+
+Avoid ecological collapse. Do not contaminate the aquifer. +
+PRIMARY OBJECTIVES +
+
-
+
- - Establish a FOB to enable secure ingress to testing stations and storage silos. +
- - Collect tissue and water samples from areas showing unusual biological interaction with the ecosystem. +
- - Recover mineral filtration logs, biotech experiments, and aquifer microbiome studies from Weyland-Yutani archives. +
+SECONDARY OBJECTIVES +
+
-
+
- - Deploy remotely operated equipment to sub-aquifer vents to investigate any signs of large-scale biological clustering. +
- - Extract contaminated water samples before purification occurs. +
- - Capture wild fauna showing behavioral anomalies for xenogenetic analysis. +
+This may be the first large-scale ecosystem showing signs of exposure to unknown biohazard agents that we've discovered.
+Document everything. +
+Division Logistics Commander
+Lt. Colonel Geoffrey Lamdem
+Military Organization for Development and Innovation - 4th Combat Division
+Onward through progress.
+
+
+ DO NOT FORWARD OUTSIDE COMMAND CHANNELS +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ REGIMENTAL COMMAND - CHINOOK 91 GSO STATION
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Operational Objectives - Kutjevo Refinery AO
+USCM REF: 48-77-AQ CONFIDENTIAL +
+Commander,
+
+You are ordered to deploy to Kutjevo Refinery, a Weyland-Yutani-owned water purification and bottling facility located on the desert world of Dykuma I.
+
+A full loss of contact occurred 36 hours ago.
+
+The refinery serves as the lifeline for over two thousand residents and hosts the only potable water export operation in the region. +
+PRIMARY OBJECTIVES +
+
-
+
- - Establish a Forward Operating Base adjacent to the water extraction pipeline and purification nexus. +
- - Recover civilian personnel or refinery workers sheltering near the primary reservoir control deck or filtration chambers. +
- - Secure refinery data servers and shipment logs from central administration. +
+SECONDARY OBJECTIVES +
+
-
+
- - Restore environmental systems to avoid aquifer contamination. +
- - Sweep sublevel maintenance shafts and water tunnels for signs of xenoform activity. +
- - Avoid disruption of filtration processes unless tactically necessary. +
+Local wildlife may become hostile due to aquifer disruption.
+Proceed with caution in subterranean zones. +
+Strategic Liaison Officer
+Second Lieutenant Lucas Harlan
+2nd Battalion, 3rd Regiment - 4th Combat Division
+For the Corps.
+
+
+ DO NOT FORWARD OUTSIDE COMMAND CHANNELS +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ SECTOR ENFORCEMENT CENTER - FORT THUNDER, TRAPPIST-5
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Engagement Protocol - LV-624 AO
+USCM REF: 48-77-SE CONFIDENTIAL +
+Commander,
+
+Your deployment to LV-624 falls under Directive C-6: Hostile Containment and Elimination.
+
+The colony has experienced complete communications blackout following reports of biological aggression and possible corporate interference.
+
+This is a live-combat zone.
+
+Show the enemy what happens when they test the strength of the Corps. +
+PRIMARY OBJECTIVES +
+
-
+
- - Establish a fortified Forward Operating Base at one of the landing sites adjacent to colonial facilities. +
- - Conduct lethal search-and-destroy operations within the lower colony and nearby cave systems, where unidentified hostile activity has been reported. +
- - Secure all Weyland-Yutani assets for seizure and interrogation under Military Code 47-K. +
+SECONDARY OBJECTIVES +
+
-
+
- - Execute martial oversight over surviving colonists. Detain or eliminate based on security assessments. +
- - Deny the enemy access to comms towers and fuel processing stations. +
- - Clear sublevel sectors of any suspected or unidentified threats with maximum force. No survivors. +
+Authorization is granted for escalated rules of engagement.
+No quarter. No compromise. Win fast, win completely. +
+United States Colonial Marine Corps
+Colonel Margaret A.W. Shanks
+Colonial Protection Organization - 4th Combat Division
+No mercy. No doubt.
+
+
+ DO NOT DEVIATE WITHOUT WRITTEN AUTHORIZATION +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ PROVOST MARSHAL'S FIELD OFFICE - NEW MASON COLONY, 61 CYGNI SYSTEM
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Deployment Priorities - LV-624 AO
+USCM REF: 48-77-HM CONFIDENTIAL +
+Commander,
+
+LV-624 was once a thriving example of colonial promise. Now, it has gone silent under suspicious and tragic circumstances.
+
+Your mission is to restore order with precision and empathy.
+
+Civilian lives may still hang in the balance. +
+PRIMARY OBJECTIVES +
+
-
+
- - Establish a secure and minimally intrusive Forward Operating Base near important colonial infrastructure. +
- - Locate and extract any surviving colonists, researchers, or visiting personnel from the lower colony. +
- - Recover Weyland-Yutani data carefully, ensuring no disruption to local environmental or infrastructure systems. +
+SECONDARY OBJECTIVES +
+
-
+
- - Preserve remaining habitats, hydroponics, and clean water systems. +
- - Evacuate or safeguard non-combatants from colonial dwellings and attached workplaces. +
- - Use nonlethal suppression methods wherever possible. Prioritize warning and deterrence over immediate force. +
+This operation is as much about restoration as defense.
+Demonstrate the Corps' capacity for compassion and courage. +
+USCM Provost Marshal
+Colonel Adrian Blackburn
+Hearts & Minds Movement - 4th Combat Division
+In service to justice and peace.
+
+
+ DO NOT FORWARD OUTSIDE COMMAND CHANNELS +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ TECHNICAL OPERATIONS DIRECTORATE - ANVIL STATION, HERCULINA ORBIT
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Research-Oriented Objectives - LV-624 AO
+USCM REF: 48-77-RI CONFIDENTIAL +
+Commander,
+
+LV-624 is of particular interest due to preliminary signals suggesting advanced biohazard mutation and unauthorized research development.
+
+This mission represents an opportunity for significant scientific return if handled with appropriate containment and data recovery protocols. +
+PRIMARY OBJECTIVES +
+
-
+
- - Establish an outpost at the central comms array for secure uplink and logistics coordination. +
- - Recover sample containers, terminal logs, or subject recordings from the Lower Colony's medlab and R&D wings. +
- - Secure and preserve all Weyland-Yutani equipment, including blackbox modules and specimen containment cases. +
+SECONDARY OBJECTIVES +
+
-
+
- - Avoid collateral damage to systems needed for research viability (i.e., hydroponics, reactors, biospheres). +
- - Monitor and document any anomalous organism behavior with visual confirmation. Live sample preferred but not required. +
- - Recover or account for any prototype hardware used during last Weyland-Yutani cycle. +
+Data matters more than firepower.
+Extract what you can. Document what you can't. And bring it all home. +
+Division Logistics Commander
+Lt. Colonel Geoffrey Lamdem
+Military Organization for Development and Innovation - 4th Combat Division
+Onward through progress.
+
+
+ DO NOT FORWARD OUTSIDE COMMAND CHANNELS +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ REGIMENTAL COMMAND - CHINOOK 91 GSO STATION
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Operational Objectives - LV-624 AO
+USCM REF: 48-77-AQ CONFIDENTIAL +
+Commander,
+
+The following strategic objectives have been issued by Regimental Command for your current deployment to the LV-624 Area of Operations.
+
+These objectives are to be completed in conjunction with standard mission directives and terror suppression protocol.
+
+Deviation from these priorities must be justified through official after-action reporting. +
+PRIMARY OBJECTIVES +
+
-
+
- - Establish and maintain a secure Forward Operating Base at one of the landing sites adjacent to colonial facilities. +
- - Locate and recover any surviving personnel from the Nexus and adjacent colonial facilities. +
- - Secure and extract any classified Weyland-Yutani data caches or research samples located within the colony's science wing or comms outpost. +
+SECONDARY OBJECTIVES +
+
-
+
- - Minimize collateral damage to the central power grid and underground water systems. +
- - Confirm status of remaining civilians in the Lower Colony and enact evac procedures if survivors are located. +
- - Conduct sweep and neutralization operations targeting the presumed terrorist presence in the Upper Colony. +
+Mission performance will be evaluated based on objective completion, Marine casualty rate, and command efficiency.
+
+You are authorized to obtain additional support via requisitions uplink if deemed mission-critical.
+
+Maintain operational discipline and report any anomalies immediately. +
+Strategic Liaison Officer
+Second Lieutenant Lucas Harlan
+2nd Battalion, 3rd Regiment - 4th Combat Division
+For the Corps.
+
+
+ DO NOT FORWARD OUTSIDE COMMAND CHANNELS +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ SECTOR ENFORCEMENT CENTER - FORT THUNDER, TRAPPIST-5
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Engagement Protocol - New Varadero AO
+USCM REF: 48-77-SE CONFIDENTIAL +
+Commander,
+
+New Varadero has become a liability.
+
+A xenoform spacecraft has crash-landed near the Latin American Colonial Navy base. Predictably, LACN personnel were overrun or compromised.
+
+You are to enter this AO with full authority and suppress all threats, regardless of flag or origin. +
+PRIMARY OBJECTIVES +
+
-
+
- - Establish fortified FOB overseeing the crash site and garrison compound. +
- - Terminate all active non-human combatants. +
- - Seize the alien vessel and destroy any hostile or uncooperative LACN holdouts. +
+SECONDARY OBJECTIVES +
+
-
+
- - Disable surveillance and transmitter towers to prevent civilian footage leaks. +
- - Purge local biosigns in surrounding jungle and cave systems. +
- - Collect proof of foreign tampering or weapons trafficking through the site. +
+This is not a rescue. This is a lockdown.
+Let the wreckage tell no stories. +
+United States Colonial Marine Corps
+Colonel Margaret A.W. Shanks
+Colonial Protection Organization - 4th Combat Division
+No mercy. No doubt.
+
+
+ DO NOT DEVIATE WITHOUT WRITTEN AUTHORIZATION +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ PROVOST MARSHAL'S FIELD OFFICE - NEW MASON COLONY, 61 CYGNI SYSTEM
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Deployment Priorities - New Varadero AO
+USCM REF: 48-77-HM CONFIDENTIAL +
+Commander,
+
+A crash of an apparent extraterrestrial vessel near New Varadero triggered a full communications blackout.
+
+While local records confirm the presence of at least one non-human entity, the political situation with the Latin American Colonial Navy must be treated with the utmost diplomatic care.
+
+Avoid escalation. Seek survivors. Do not allow a rescue to become an incident. +
+PRIMARY OBJECTIVES +
+
-
+
- - Deploy FOB at a secure location, taking care not to disturb LACN fortifications. +
- - Locate and secure LACN personnel in medbay, barracks, or command center. Prioritize cooperation. +
- - Secure and shield any civilians exposed to the alien vessel or its occupants. +
+SECONDARY OBJECTIVES +
+
-
+
- - Open communication with remaining LACN officers if possible. De-escalate. +
- - Minimize destruction of local structures and infrastructure. +
- - Prevent technology or biological contamination from affecting the wider colony. +
+This is not about conquest, it's about responsibility.
+Show them what integrity looks like. +
+USCM Provost Marshal
+Colonel Adrian Blackburn
+Hearts & Minds Movement - 4th Combat Division
+In service to justice and peace.
+
+
+ DO NOT FORWARD OUTSIDE COMMAND CHANNELS +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ TECHNICAL OPERATIONS DIRECTORATE - ANVIL STATION, HERCULINA ORBIT
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Research-Oriented Objectives - New Varadero AO
+USCM REF: 48-77-RI CONFIDENTIAL +
+Commander,
+
+We have confirmation that a highly advanced extraterrestrial spacecraft has crash-landed at New Varadero, an LACN outpost.
+
+You are ordered to recover alien technology, biological traces, and environmental data intact and uncompromised.
+
+Time is limited. Every other power will want what lies in that wreck. +
+PRIMARY OBJECTIVES +
+
-
+
- - Deploy FOB at a location which provides a clear route to the vessel and LACN tech bunkers. +
- - Recover as much intact alien material (armor, tools, DNA, recordings) as possible. +
- - Secure blacksite data servers within the LACN command structure and flag all contact logs. +
+SECONDARY OBJECTIVES +
+
-
+
- - Avoid structural damage to the vessel. Document its propulsion, hull, and weapons systems. +
- - Track non-human movements using biometric trace systems left in caves or power conduits. +
- - Preserve jungle biome as evidence of any non-human interference. +
+Bring back proof. Bring back brilliance.
+Bring back everything. +
+Division Logistics Commander
+Lt. Colonel Geoffrey Lamdem
+Military Organization for Development and Innovation - 4th Combat Division
+Onward through progress.
+
+
+ DO NOT FORWARD OUTSIDE COMMAND CHANNELS +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ REGIMENTAL COMMAND - CHINOOK 91 GSO STATION
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Operational Objectives - New Varadero AO
+USCM REF: 48-77-AQ CONFIDENTIAL +
+Commander,
+
+New Varadero is an active Latin American Colonial Navy (LACN) military outpost located on the outer rim.
+
+Seismic and visual satellite tracking confirm that a non-terrestrial craft crash-landed at the site four days ago.
+
+Contact with the garrison was lost shortly thereafter.
+
+Your mission is to assess the situation and restore control. +
+PRIMARY OBJECTIVES +
+
-
+
- - Establish Forward Operating Base near the northern perimeter of the LACN command post. +
- - Secure the crash site and assess the nature and threat of the vessel. Unknown hostile presence likely. +
- - Locate any LACN survivors and render aid. +
+SECONDARY OBJECTIVES +
+
-
+
- - Prevent looting or tampering with alien tech by USCM personnel. +
- - Isolate the vessel from power or signal transmission pathways. +
- - Eliminate any confirmed hostile xenoforms or non-human entities. +
+Expect resistance. Expect irregularities.
+Use your best judgment in an unconventional AO. +
+Strategic Liaison Officer
+Second Lieutenant Lucas Harlan
+2nd Battalion, 3rd Regiment - 4th Combat Division
+For the Corps.
+
+
+ DO NOT FORWARD OUTSIDE COMMAND CHANNELS +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ SECTOR ENFORCEMENT CENTER - FORT THUNDER, TRAPPIST-5
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Engagement Protocol - Shivas Snowball AO
+USCM REF: 48-77-SE CONFIDENTIAL +
+Commander,
+
+Weyland-Yutani's research installation has gone dark in the middle of one of the coldest and most desolate planets in the Drift.
+
+The nature of their research remains classified, but the loss of all contact, including with internal security personnel, is cause for immediate concern.
+
+You are authorized to enter and secure by force. +
+PRIMARY OBJECTIVES +
+
-
+
- - Establish a fortified FOB with clear fields of fire toward excavation sites. +
- - Eliminate threats and reestablish control over both surface and subsurface structures. +
- - Seize R&D vaults, armories, and power junctions before sabotage or data wipes occur. +
+SECONDARY OBJECTIVES +
+
-
+
- - Destroy Weyland-Yutani field labs that cannot be secured. +
- - Monitor for biohazard vectors or contamination reports. +
- - Ensure no survivors escape without full debrief and inspection. +
+Do not trust anyone on-site.
+If the company called it a “weather station,” it's probably a lab. +
+United States Colonial Marine Corps
+Colonel Margaret A.W. Shanks
+Colonial Protection Organization - 4th Combat Division
+No mercy. No doubt.
+
+
+ DO NOT DEVIATE WITHOUT WRITTEN AUTHORIZATION +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ PROVOST MARSHAL'S FIELD OFFICE - NEW MASON COLONY, 61 CYGNI SYSTEM
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Deployment Priorities - Shivas Snowball AO
+USCM REF: 48-77-HM CONFIDENTIAL +
+Commander,
+
+Shiva-1 is a small Weyland-Yutani research station on a frozen, isolated world.
+
+It was self-sustaining and, until recently, entirely peaceful.
+
+Its sudden silence raises concerns about equipment failure, medical emergencies, or environmental catastrophe.
+
+You are being sent not as occupiers, but as investigators. +
+PRIMARY OBJECTIVES +
+
-
+
- - Deploy a Forward Operating Base on site, avoiding damage to entry tunnels or habitat domes. +
- - Find and evacuate all surviving scientists, engineers, or maintenance crews. +
- - Protect research archives from weather damage or corporate erasure. +
+SECONDARY OBJECTIVES +
+
-
+
- - Ensure heating and oxygenation in residential quarters are restored. +
- - Handle unarmed personnel with non-lethal methods. Prioritize diplomacy. +
- - Scan and report suspicious excavation zones without destroying them. +
+Every scientist down there had a family, a purpose, and a life worth saving.
+Don't forget that. +
+USCM Provost Marshal
+Colonel Adrian Blackburn
+Hearts & Minds Movement - 4th Combat Division
+In service to justice and peace.
+
+
+ DO NOT FORWARD OUTSIDE COMMAND CHANNELS +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ TECHNICAL OPERATIONS DIRECTORATE - ANVIL STATION, HERCULINA ORBIT
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Research-Oriented Objectives - Shivas Snowball AO
+USCM REF: 48-77-RI CONFIDENTIAL +
+Commander,
+
+Shiva-1 was an experimental cold-zone lab with excavation capabilities.
+
+Most of its sensor output was classified or suppressed by Weyland-Yutani internal channels.
+
+We believe the blackout may relate to something unearthed beneath the ice, and we need to find out what. +
+PRIMARY OBJECTIVES +
+
-
+
- - Secure a FOB with direct access to sub-zero labs and excavation boreholes. +
- - Recover cryogenic samples, dig logs, and deep-ice anomaly readings. +
- - Retrieve all preserved biological material. Priority is to be given to frozen or dormant forms. +
+SECONDARY OBJECTIVES +
+
-
+
- - Scan any abnormal growths near glacial walls or thermal anomalies. +
- - Recover excavation drones or control interfaces for analysis. +
- - Document sudden heating or thawing patterns in permafrost tunnels. +
+You may be standing atop an incredibly old and well preserved Xenoform.
+
+Don't miss it. +
+Division Logistics Commander
+Lt. Colonel Geoffrey Lamdem
+Military Organization for Development and Innovation - 4th Combat Division
+Onward through progress.
+
+
+ DO NOT FORWARD OUTSIDE COMMAND CHANNELS +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ REGIMENTAL COMMAND - CHINOOK 91 GSO STATION
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Operational Objectives - Shivas Snowball AO
+USCM REF: 48-77-AQ CONFIDENTIAL +
+Commander,
+
+A Weyland-Yutani research outpost ceased all contact 72 hours ago.
+
+Located on an uncolonized ice world in the Altalune Drift, the facility was used primarily for geologic and subzero climate studies.
+
+The outpost is designed for long-term habitation, with full life-support and deep-field excavation equipment.
+
+Civilian presence is expected. +
+PRIMARY OBJECTIVES +
+
-
+
- - Establish a Forward Operating Base near the main entrance to the primary habitat block. +
- - Locate and evacuate surviving staff, particularly those in dormitory, medical, or recreational commons. +
- - Secure all communications logs and R&D backups stored in the data center or server room. +
+SECONDARY OBJECTIVES +
+
-
+
- - Restore power and environmental controls to the facility if intact. +
- - Sweep lower excavation areas for physical hazards or collapse. +
- - Log environmental anomalies or sudden temperature drops. +
+Prepare for low visibility, extreme cold, and infrastructure degradation.
+Weather and loss of heating will be ongoing threats. +
+Strategic Liaison Officer
+Second Lieutenant Lucas Harlan
+2nd Battalion, 3rd Regiment - 4th Combat Division
+For the Corps.
+
+
+ DO NOT FORWARD OUTSIDE COMMAND CHANNELS +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ SECTOR ENFORCEMENT CENTER - FORT THUNDER, TRAPPIST-5
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Engagement Protocol - Sorokyne Strata AO
+USCM REF: 48-77-SE CONFIDENTIAL +
+Commander,
+
+Sorokyne Strata is a decaying Union of Progressive Peoples mining outpost.
+
+The UPP maintains a small military presence and Cosmos Exploration Corps unit to guard lithium and silicon operations, but production has dropped sharply.
+
+Intelligence suggests internal unrest as the primary cause, but be prepared for anything. +
+PRIMARY OBJECTIVES +
+
-
+
- - Establish a FOB in a location that secures high ground over UPP infrastructure and shaft entrances. +
- - Neutralize any suspicious activity and eliminate hostile forces if they interfere. +
- - Secure power stations and mine-head reactors to prevent sabotage or theft. +
+SECONDARY OBJECTIVES +
+
-
+
- - Collect UPP operational logs and troop strength data. +
- - Disable or capture UPP security communications relays. +
- - Deny further lithium exports until UA authorities regain leverage. +
+This colony is a chess piece in a long game.
+Show the UPP the cost of encroachment. +
+United States Colonial Marine Corps
+Colonel Margaret A.W. Shanks
+Colonial Protection Organization - 4th Combat Division
+No mercy. No doubt.
+
+
+ DO NOT DEVIATE WITHOUT WRITTEN AUTHORIZATION +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ PROVOST MARSHAL'S FIELD OFFICE - NEW MASON COLONY, 61 CYGNI SYSTEM
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Deployment Priorities - Sorokyne Strata AO
+USCM REF: 48-77-HM CONFIDENTIAL +
+Commander,
+
+Sorokyne Strata on LV-976 was originally developed by Jùtóu Combine, a state-owned enterprise of the Union of Progressive Peoples, after its discovery by the CANC in 2110.
+
+Following the Dog War in 2166, the UPP formally annexed the colony and continues to operate its lithium, carbon, and silicon mines through Jùtóu oversight.
+
+Your mission is to protect civilian life and avert any escalation that could inflame tensions between the UPP and United Americas. +
+PRIMARY OBJECTIVES +
+
-
+
- - Construct a FOB aimed at minimizing disruption to daily mining operations. +
- - Provide medical and logistical assistance to miners, their families, and local workers regardless of affiliation. +
- - Open respectful communication with UPP Army, Cosmos Exploration Corps, and PAP security forces to coordinate relief and evacuation if required. +
+SECONDARY OBJECTIVES +
+
-
+
- - Stabilize key infrastructure, power, water, and habitat systems to ensure civilian safety. +
- - Document humanitarian needs and living conditions for intergovernmental review. +
- - Avoid unnecessary confrontation with UPP personnel; engage only in self-defense. +
+Our presence must reassure, not intimidate.
+Act with professionalism and compassion to safeguard lives and maintain this fragile peace. +
+USCM Provost Marshal
+Colonel Adrian Blackburn
+Hearts & Minds Movement - 4th Combat Division
+In service to justice and peace.
+
+
+ DO NOT FORWARD OUTSIDE COMMAND CHANNELS +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ TECHNICAL OPERATIONS DIRECTORATE - ANVIL STATION, HERCULINA ORBIT
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Research-Oriented Objectives - Sorokyne Strata AO
+USCM REF: 48-77-RI CONFIDENTIAL +
+Commander,
+
+Sorokyne Strata's rich carbon, lithium, and silicon deposits are nearly exhausted, but decades of mining leave a valuable technological footprint.
+
+UPP Army and Cosmos Exploration Corps units guard the site, and decline has created unrest and opportunities. +
+PRIMARY OBJECTIVES +
+
-
+
- - Deploy FOB at a location with quick access to core mining and refinery labs. +
- - Recover geological and production data on lithium extraction and power export systems. +
- - Secure samples of advanced UPP mining equipment and automation tech. +
+SECONDARY OBJECTIVES +
+
-
+
- - Survey abandoned shafts for rare isotopic deposits or experimental machinery. +
- - Intercept UPP communications regarding long-term mining strategies. +
- - Collect atmospheric readings from deep vents for resource modeling. +
+The mines may be dying, but their data and hardware are gold. +
+Division Logistics Commander
+Lt. Colonel Geoffrey Lamdem
+Military Organization for Development and Innovation - 4th Combat Division
+Onward through progress.
+
+
+ DO NOT FORWARD OUTSIDE COMMAND CHANNELS +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ REGIMENTAL COMMAND - CHINOOK 91 GSO STATION
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Operational Objectives - Sorokyne Strata AO
+USCM REF: 48-77-AQ CONFIDENTIAL +
+Commander,
+
+Sorokyne Strata is a UPP-controlled mining colony on LV-976.
+
+Originally a Jùtóu Combine settlement (est. 2110), it was annexed by the Union of Progressive Peoples in 2166 following the Dog War.
+
+The colony's lithium-carbon-silicon deposits are declining, creating economic instability and civil unrest.
+
+Your mission is to respond to the colony's recent distress signal, determine the status of UPP forces, and secure all U.S. citizens and interests. +
+PRIMARY OBJECTIVES +
+
-
+
- - Establish a Forward Operating Base at a location with access to the central mining complex. +
- - Locate and evacuate any UA nationals and civilian contractors. +
+SECONDARY OBJECTIVES +
+
-
+
- - Survey key mine shafts for structural instability or sabotage. +
- - Gather intelligence on UPP troop deployments and PAP patrol routines. +
- - Maintain neutral posture unless directly engaged by UPP forces. +
+Maintain professional rules of engagement.
+Diplomatic repercussions are possible. +
+Strategic Liaison Officer
+Second Lieutenant Lucas Harlan
+2nd Battalion, 3rd Regiment - 4th Combat Division
+For the Corps.
+
+
+ DO NOT FORWARD OUTSIDE COMMAND CHANNELS +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ SECTOR ENFORCEMENT CENTER - FORT THUNDER, TRAPPIST-5
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Engagement Protocol - Trijent Dam AO
+USCM REF: 48-77-SE CONFIDENTIAL +
+Commander,
+
+You are being inserted at a critical economic chokepoint.
+
+The Trijent Dam and lithium transfer ports power the Tritium refining supply chain.
+
+Their failure is unacceptable.
+
+Your task: reclaim, hold, and eliminate. +
+PRIMARY OBJECTIVES +
+
-
+
- - Deploy your FOB at a location overseeing the loading bay and telecommunications. +
- - Purge hostile elements from the dam's structural interior and lithium storage facility. +
- - Secure all corporate Tritium isotope caches for strategic redirection. +
+SECONDARY OBJECTIVES +
+
-
+
- - Eliminate unauthorized personnel operating dam controls or pilfering lithium crates. +
- - Secure the water purification facilities to prevent hostile flanking from water intake valves. +
- - Collapse or seal off suspected infestations detected in auxiliary coolant or vent channels. +
+This is not a colony to be liberated.
+It is an asset to be defended with force. Hold the line. +
+United States Colonial Marine Corps
+Colonel Margaret A.W. Shanks
+Colonial Protection Organization - 4th Combat Division
+No mercy. No doubt.
+
+
+ DO NOT DEVIATE WITHOUT WRITTEN AUTHORIZATION +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ PROVOST MARSHAL'S FIELD OFFICE - NEW MASON COLONY, 61 CYGNI SYSTEM
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Deployment Priorities - Trijent Dam AO
+USCM REF: 48-77-HM CONFIDENTIAL +
+Commander,
+
+Trijent Dam is more than a generator. It's the lifeline of Oxley's Butte and its people.
+
+Our top priority is restoring critical utilities while protecting the workers who once kept this system running.
+
+Minimize harm, maximize assistance. +
+PRIMARY OBJECTIVES +
+
-
+
- - Establish your FOB to enable rapid access to the generator deck and evac platform. +
- - Locate and rescue unarmed technicians, engineers, or miners trapped near the lithium refining laboratory. +
- - Recover safety override data and power grid logs to restore energy to the colony. +
+SECONDARY OBJECTIVES +
+
-
+
- - Avoid structural damage to spillway towers or pipeline junctions near living quarters. +
- - Coordinate medical aid in the canteen and warehouse shelter zones. +
- - Evacuate surviving workers via the dam’s western catwalks or water lift tunnels. +
+This facility was built by people.
+Don't let their work or their lives drown in silence. +
+USCM Provost Marshal
+Colonel Adrian Blackburn
+Hearts & Minds Movement - 4th Combat Division
+In service to justice and peace.
+
+
+ DO NOT FORWARD OUTSIDE COMMAND CHANNELS +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ TECHNICAL OPERATIONS DIRECTORATE - ANVIL STATION, HERCULINA ORBIT
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Research-Oriented Objectives - Trijent Dam AO
+USCM REF: 48-77-RI CONFIDENTIAL +
+Commander,
+
+Trijent Dam contains high-priority experimental tech: isotope compressors, real-time lithium sensors, and Weyland-Yutani efficiency algorithms.
+
+We suspect biological exposure to Tritium waste may have catalyzed variant behavior.
+
+Document it. +
+PRIMARY OBJECTIVES +
+
-
+
- - Deploy your FOB at a location that maximizes access to any lithium or tritium storage facilities. +
- - Recover mining telemetry, Tritium extraction records, and mutated organism bio-signs. +
- - Secure vent camera logs and pump reactor feedback loops for behavioral study. +
+SECONDARY OBJECTIVES +
+
-
+
- - Preserve cryostorage and pipeflow AI modules located near the western dam maintenance controls. +
- - Tag and track any infestations around the coolant reservoir or outflow chute. +
- - Extract or study hostile organisms found near contaminated water treatment zones. +
+Study any affected organisms. Don't just kill them.
+Knowledge is the payload here. +
+Division Logistics Commander
+Lt. Colonel Geoffrey Lamdem
+Military Organization for Development and Innovation - 4th Combat Division
+Onward through progress.
+
+
+ DO NOT FORWARD OUTSIDE COMMAND CHANNELS +
+
+
+
+
+
+
+
+
+ United States Colonial Marine Corps
+
+
+ 2ND BATTALION, 3RD REGIMENT - 4TH COMBAT DIVISION
+ REGIMENTAL COMMAND - CHINOOK 91 GSO STATION
+
+
+TO: Commanding Officer, USS Almayer
+SUBJECT: Operational Objectives - Trijent Dam AO
+USCM REF: 48-77-AQ CONFIDENTIAL +
+Commander,
+
+You are ordered to deploy to Trijent Dam, a hydroelectric power installation supplying Oxley's Butte and its lithium export lanes.
+
+The colony lost contact following seismic irregularities and a sharp drop in power output.
+
+Expect hostile resistance and terrain instability. +
+PRIMARY OBJECTIVES +
+
-
+
- - Establish and secure a Forward Operating Base that enables you easy access to the turbine control complex. +
- - Recover surviving maintenance personnel and security teams stationed along the dam interior and technical storage. +
- - Retrieve engineering logs and lithium transport manifests from the operations terminal and export pad. +
+SECONDARY OBJECTIVES +
+
-
+
- - Restore power flow to the lower generator rooms to reactivate water purification systems. +
- - Prevent damage to lithium isotope storage. Potential for secondary contamination. +
- - Neutralize any hostiles occupying the dam itself or central access bridge. +
+Expect high humidity, low visibility, and possible water contamination.
+Proceed with caution. +
+Strategic Liaison Officer
+Second Lieutenant Lucas Harlan
+2nd Battalion, 3rd Regiment - 4th Combat Division
+For the Corps.
+
+
+ DO NOT FORWARD OUTSIDE COMMAND CHANNELS +