" return . @@ -185,6 +188,7 @@ var/datum/antagonist/nukeop/converter = creator.mind.has_antag_datum(/datum/antagonist/nukeop,TRUE) var/datum/antagonist/nukeop/N = new() N.send_to_spawnpoint = FALSE + N.give_bonus_tc = FALSE N.nukeop_outfit = null add_antag_datum(N,converter.nuke_team) diff --git a/code/datums/mocking/client.dm b/code/datums/mocking/client.dm index 5c684f08521..79611ef0e9d 100644 --- a/code/datums/mocking/client.dm +++ b/code/datums/mocking/client.dm @@ -83,7 +83,7 @@ /datum/client_interface/proc/get_award_status(achievement_type, mob/user, value = 1) return FALSE -/datum/client_interface/proc/set_fullscreen(logging_in = FALSE) +/datum/client_interface/proc/set_fullscreen() return TRUE /datum/client_interface/proc/check_drag_proximity(atom/dragging, atom/over, src_location, over_location, src_control, over_control, params) diff --git a/code/datums/mood_events/generic_negative_events.dm b/code/datums/mood_events/generic_negative_events.dm index 665857195f1..60f6b09aed1 100644 --- a/code/datums/mood_events/generic_negative_events.dm +++ b/code/datums/mood_events/generic_negative_events.dm @@ -655,3 +655,8 @@ description = "Man, getting jabbed with that thing really sucked." mood_change = -4 timeout = 5 MINUTES + +/datum/mood_event/gizmo_negative + description = "I hear a voice whispering, and I don't like what it says." + mood_change = -3 + timeout = 30 SECONDS diff --git a/code/datums/mood_events/generic_positive_events.dm b/code/datums/mood_events/generic_positive_events.dm index ab581040bf9..7364493f853 100644 --- a/code/datums/mood_events/generic_positive_events.dm +++ b/code/datums/mood_events/generic_positive_events.dm @@ -701,3 +701,8 @@ description = "What a night! I can't wait to do it all again!" mood_change = 2 timeout = 10 MINUTES + +/datum/mood_event/gizmo_positive + description = "I hear a voice whispering kind words in my ear!" + mood_change = 3 + timeout = 30 SECONDS diff --git a/code/datums/move_manager.dm b/code/datums/move_manager.dm index 23ddcbecdb7..8b74eb1fe14 100644 --- a/code/datums/move_manager.dm +++ b/code/datums/move_manager.dm @@ -88,7 +88,7 @@ GLOBAL_DATUM_INIT(move_manager, /datum/move_manager, new) return //Give up if(existing_loop?.compare_loops(arglist(args.Copy(2)))) - return //it already exists stop trying to make the same moveloop + return existing_loop //it already exists stop trying to make the same moveloop var/datum/move_loop/new_loop = new loop_type(src, subsystem, parent, priority, flags, extra_info) //Pass the mob to move and ourselves in via new var/list/arguments = args.Copy(6) //Just send the args we've not already dealt with diff --git a/code/datums/mutations/_mutations.dm b/code/datums/mutations/_mutations.dm index 4f47db0b487..48155e0804c 100644 --- a/code/datums/mutations/_mutations.dm +++ b/code/datums/mutations/_mutations.dm @@ -89,9 +89,8 @@ var/list/valid_chrom_list = list() /// List of traits that are added or removed by the mutation with GENETIC_TRAIT source. var/list/mutation_traits - -/datum/mutation/New() - . = ..() + /// if TRUE admins get alerted when someone force-injects someone else with this mutation + var/warn_admins_on_inject = FALSE /datum/mutation/Destroy() power_path = null diff --git a/code/datums/mutations/body.dm b/code/datums/mutations/body.dm index 66a2cf8d7e5..f587e85dd60 100644 --- a/code/datums/mutations/body.dm +++ b/code/datums/mutations/body.dm @@ -269,6 +269,7 @@ instability = NEGATIVE_STABILITY_MAJOR // mmmonky remove_on_aheal = FALSE locked = TRUE //Species specific, keep out of actual gene pool + warn_admins_on_inject = TRUE var/datum/species/original_species = /datum/species/human var/original_name @@ -556,6 +557,7 @@ difficulty = 12 //pretty good for traitors quality = NEGATIVE //holy shit no eyes or tongue or ears text_gain_indication = span_warning("Something feels off.") + warn_admins_on_inject = TRUE /datum/mutation/headless/on_acquiring() . = ..() diff --git a/code/datums/mutations/touch.dm b/code/datums/mutations/touch.dm index 7a91cc390e8..8ce75e746c5 100644 --- a/code/datums/mutations/touch.dm +++ b/code/datums/mutations/touch.dm @@ -88,8 +88,8 @@ quality = POSITIVE locked = FALSE difficulty = 16 - text_gain_indication = span_notice("Your hand feels blessed!") - text_lose_indication = span_notice("Your hand feels secular once more.") + text_gain_indication = span_notice("Your hands feel blessed!") + text_lose_indication = span_notice("Your hands no longer feel blessed.") power_path = /datum/action/cooldown/spell/touch/lay_on_hands instability = POSITIVE_INSTABILITY_MAJOR energy_coeff = 1 @@ -124,7 +124,7 @@ hand_path = /obj/item/melee/touch_attack/lay_on_hands draw_message = span_notice("You ready your hand to transfer injuries to yourself.") drop_message = span_notice("You lower your hand.") - /// Multiplies the amount healed. + /// Multiplies the amount healed (or damage dealt, in the case of a smite). var/heal_multiplier = 1 /// Multiplies the incoming pain from healing. (Halved with synchronizer chromosome) var/pain_multiplier = 1 @@ -140,7 +140,7 @@ if(!.) return . var/obj/item/bodypart/transfer_limb = cast_on.get_active_hand() - if(IS_ROBOTIC_LIMB(transfer_limb)) + if(!IS_ORGANIC_LIMB(transfer_limb)) to_chat(cast_on, span_notice("You fail to channel your mending powers through your inorganic hand.")) return FALSE @@ -255,43 +255,45 @@ // Did the transfer work? . = FALSE - // Get the hurtguy's limbs and the mendicant's limbs to attempt a 1-1 transfer. - var/list/hurt_limbs = hurtguy.get_damaged_bodyparts(1, 1, BODYTYPE_ORGANIC) + hurtguy.get_wounded_bodyparts(BODYTYPE_ORGANIC) - var/list/mendicant_organic_limbs = list() - for(var/obj/item/bodypart/possible_limb in mendicant.get_bodyparts()) - if(IS_ORGANIC_LIMB(possible_limb)) - mendicant_organic_limbs += possible_limb - - // If we have no organic available limbs just give up. - if(!length(mendicant_organic_limbs)) - mendicant.balloon_alert(mendicant, "no organic limbs!") - return . - if(!length(hurt_limbs)) - hurtguy.balloon_alert(mendicant, "no damaged organic limbs!") - return . // Counter to make sure we don't take too much from separate limbs - var/total_damage_healed = 0 - // Transfer damage from one limb to the mendicant's counterpart. - for(var/obj/item/bodypart/affected_limb as anything in hurt_limbs) + var/healing_budget = 35 * heal_multiplier + // Transfer damage from each limb to the mendicant's counterpart. + for(var/obj/item/bodypart/affected_limb as anything in hurtguy.get_bodyparts()) + if(!(affected_limb.bodytype & BODYTYPE_ORGANIC)) + continue var/obj/item/bodypart/mendicant_transfer_limb = mendicant.get_bodypart(affected_limb.body_zone) - // If the compared limb isn't organic, skip it and pick a random one. - if(!(mendicant_transfer_limb in mendicant_organic_limbs)) - mendicant_transfer_limb = pick(mendicant_organic_limbs) - - // Transfer at most 35 damage, by default. - var/brute_damage = min(affected_limb.brute_dam, 35 * heal_multiplier) - // no double dipping - var/burn_damage = min(affected_limb.burn_dam, (35 * heal_multiplier) - brute_damage) - if((brute_damage || burn_damage) && total_damage_healed < (35 * heal_multiplier)) - total_damage_healed += brute_damage + burn_damage + var/list/mendicant_organic_limbs = list() + for(var/obj/item/bodypart/possible_limb in mendicant.get_bodyparts(include_stumps = TRUE)) // Keeping this here in case stumps can store damage in the future + if(IS_ORGANIC_LIMB(possible_limb) && !IS_STUMP(possible_limb)) // No stumps are currently organic, this is futureproofing. + mendicant_organic_limbs += possible_limb + // Spread the healing between brute and burn + var/affected_limb_damage = affected_limb.brute_dam + affected_limb.burn_dam + var/brute_damage = 0 + var/burn_damage = 0 + if(healing_budget >= affected_limb_damage) + healing_budget -= affected_limb_damage + brute_damage = affected_limb.brute_dam + burn_damage = affected_limb.burn_dam + else + if(affected_limb.brute_dam > affected_limb.burn_dam) + burn_damage = min(affected_limb.burn_dam, healing_budget/2) + brute_damage = healing_budget - burn_damage + else + brute_damage = min(affected_limb.burn_dam, healing_budget/2) + burn_damage = healing_budget - brute_damage + healing_budget = 0 + if((brute_damage || burn_damage)) . = TRUE var/brute_taken = brute_damage * pain_multiplier var/burn_taken = burn_damage * pain_multiplier // Heal! affected_limb.heal_damage(brute_damage, burn_damage, required_bodytype = BODYTYPE_ORGANIC) // Hurt! - mendicant_transfer_limb.receive_damage(brute_taken, burn_taken, forced = TRUE, wound_bonus = CANT_WOUND) + if((mendicant_transfer_limb in mendicant_organic_limbs)) + mendicant_transfer_limb.receive_damage(brute_taken, burn_taken, forced = TRUE, wound_bonus = CANT_WOUND) + else // spread damage if we're trying to heal a bodypart we have no organic parallel of + mendicant.take_overall_damage(brute_damage, burn_damage, required_bodytype = BODYTYPE_ORGANIC) // Force light wounds onto you. for(var/datum/wound/iter_wound as anything in affected_limb.wounds) @@ -300,21 +302,26 @@ if(prob(50 * heal_multiplier)) continue if(WOUND_SEVERITY_CRITICAL) - if(heal_multiplier < 1.5) // need buffs to transfer crit wounds + if(heal_multiplier < 1.5 && prob(30 * heal_multiplier)) // need buffs to transfer crit wounds continue . = TRUE iter_wound.remove_wound() iter_wound.apply_wound(mendicant_transfer_limb) + if(!healing_budget) + break + if(!CAN_HAVE_BLOOD(mendicant) || !CAN_HAVE_BLOOD(hurtguy)) return . // 10% base var/max_blood_transfer = (BLOOD_VOLUME_NORMAL * 0.10) * heal_multiplier + var/hurtguy_blood = hurtguy.get_blood_volume() // Too little blood - if(hurtguy.get_blood_volume() < BLOOD_VOLUME_NORMAL) + if(hurtguy_blood < BLOOD_VOLUME_NORMAL) + var/amount_to_transfer = min(max_blood_transfer, BLOOD_VOLUME_NORMAL - hurtguy_blood) // We ignore incompatibility here. - var/blood_transferred = mendicant.transfer_blood_to(hurtguy, max_blood_transfer, ignore_low_blood = TRUE, ignore_incompatibility = TRUE) + var/blood_transferred = mendicant.transfer_blood_to(hurtguy, amount_to_transfer, ignore_low_blood = TRUE, ignore_incompatibility = TRUE) if(!blood_transferred) return @@ -329,11 +336,12 @@ to_chat(hurtguy, span_notice("Your veins feel thicker!")) return - if(hurtguy.get_blood_volume() < BLOOD_VOLUME_EXCESS) + if(hurtguy_blood < BLOOD_VOLUME_MAXIMUM) return + var/amount_to_receive = min(max_blood_transfer, hurtguy_blood - BLOOD_VOLUME_MAXIMUM) // We ignore incompatibility here. - var/blood_received = hurtguy.transfer_blood_to(mendicant, hurtguy.get_blood_volume() - BLOOD_VOLUME_EXCESS, ignore_incompatibility = TRUE) + var/blood_received = hurtguy.transfer_blood_to(mendicant, amount_to_receive, ignore_incompatibility = TRUE) if(!blood_received) return @@ -346,6 +354,8 @@ to_chat(mendicant, span_notice("Your veins swell and itch!")) else to_chat(mendicant, span_notice("Your veins swell!")) + if(!.) + mendicant.balloon_alert(hurtguy, "no damaged organic limbs!") /datum/action/cooldown/spell/touch/lay_on_hands/proc/determine_if_this_hurts_instead(mob/living/carbon/mendicant, mob/living/hurtguy) diff --git a/code/datums/mutations/void_magnet.dm b/code/datums/mutations/void_magnet.dm index 122fab4e198..aef24d19629 100644 --- a/code/datums/mutations/void_magnet.dm +++ b/code/datums/mutations/void_magnet.dm @@ -60,7 +60,7 @@ /datum/action/cooldown/spell/void/cursed/proc/on_life(mob/living/source, seconds_per_tick) SIGNAL_HANDLER - if(!isliving(source) || HAS_TRAIT(source, TRAIT_STASIS) || source.stat == DEAD || HAS_TRAIT(source, TRAIT_NO_TRANSFORM)) + if(HAS_TRAIT(source, TRAIT_STASIS) || source.stat == DEAD) return if(!is_valid_target(source)) diff --git a/code/datums/quirks/negative_quirks/addict.dm b/code/datums/quirks/negative_quirks/addict.dm index f2dc41e84a2..843dc492866 100644 --- a/code/datums/quirks/negative_quirks/addict.dm +++ b/code/datums/quirks/negative_quirks/addict.dm @@ -95,11 +95,11 @@ associated_typepath = /datum/quirk/item_quirk/addict/junkie customization_options = list(/datum/preference/choiced/junkie) -/datum/quirk/item_quirk/addict/junkie/add_unique(client/client_source) - - var/addiction = client_source?.prefs.read_preference(/datum/preference/choiced/junkie) - if(addiction && (addiction != "Random")) - reagent_type = GLOB.possible_junkie_addictions[addiction] +/datum/quirk/item_quirk/addict/junkie/add_to_holder(mob/living/new_holder, quirk_transfer = FALSE, client/client_source, unique = TRUE, announce = TRUE) + if(!quirk_transfer) + var/addiction = client_source?.prefs.read_preference(/datum/preference/choiced/junkie) + if(addiction && (addiction != "Random")) + reagent_type = GLOB.possible_junkie_addictions[addiction] return ..() /datum/quirk/item_quirk/addict/remove() diff --git a/code/datums/quirks/negative_quirks/asthma.dm b/code/datums/quirks/negative_quirks/asthma.dm index 1c4e53640f9..31532b2a3fe 100644 --- a/code/datums/quirks/negative_quirks/asthma.dm +++ b/code/datums/quirks/negative_quirks/asthma.dm @@ -84,10 +84,7 @@ /datum/quirk/item_quirk/asthma/proc/on_life(mob/living/source, seconds_per_tick) SIGNAL_HANDLER - if (quirk_holder.stat == DEAD) - return - - if (HAS_TRAIT(quirk_holder, TRAIT_STASIS) || HAS_TRAIT(quirk_holder, TRAIT_NO_TRANSFORM)) + if (quirk_holder.stat == DEAD || HAS_TRAIT(quirk_holder, TRAIT_STASIS)) return var/obj/item/organ/lungs/holder_lungs = quirk_holder.get_organ_slot(ORGAN_SLOT_LUNGS) diff --git a/code/datums/quirks/negative_quirks/limper.dm b/code/datums/quirks/negative_quirks/limper.dm new file mode 100644 index 00000000000..e272bd2c712 --- /dev/null +++ b/code/datums/quirks/negative_quirks/limper.dm @@ -0,0 +1,30 @@ +/datum/quirk/item_quirk/limper + name = "Limper" + desc = "You have a pronounced limp when you walk. This will slow you down considerably. Good thing you brought your cane." + icon = FA_ICON_PERSON_CANE + gain_text = span_danger("Your leg feels a bit weak.") + lose_text = span_notice("Your legs feel normal again.") + medical_record_text = "Patient appears to suffer from a weakness in the leg." + value = -6 + hardcore_value = 3 + quirk_flags = QUIRK_HUMAN_ONLY + + mail_goodies = list( + /obj/item/cane, + /obj/item/cane/crutch, + /obj/item/cane/white, + ) + +/datum/quirk/item_quirk/limper/add_unique(client/client_source) + give_item_to_holder(new /obj/item/cane(get_turf(quirk_holder)), list( + LOCATION_HANDS, + LOCATION_BACKPACK, + )) + return + +/datum/quirk/item_quirk/limper/add(client/client_source) + quirk_holder.apply_status_effect(/datum/status_effect/limp/quirk) + +/datum/quirk/item_quirk/limper/remove(client/client_source) + quirk_holder.remove_status_effect(/datum/status_effect/limp/quirk) + diff --git a/code/datums/quirks/positive_quirks/spacer.dm b/code/datums/quirks/positive_quirks/spacer.dm index c448244e7c7..d41f6e5536c 100644 --- a/code/datums/quirks/positive_quirks/spacer.dm +++ b/code/datums/quirks/positive_quirks/spacer.dm @@ -1,5 +1,6 @@ #define LAST_STATE_PLANET "on_planet" #define LAST_STATE_SPACE "in_space" +#define LAST_STATE_NOGRAV "in_nograv" /datum/quirk/spacer_born name = "Spacer" @@ -17,7 +18,7 @@ /obj/item/reagent_containers/applicator/pill/gravitum, ) /// How high spacers get bumped up to - var/modded_height = HUMAN_HEIGHT_TALLER + var/modded_height = HUMAN_HEIGHT_TALLEST /// How long on a planet before we get averse effects var/planet_period = 3 MINUTES /// TimerID for time spend on a planet @@ -26,9 +27,14 @@ var/recover_period = 1 MINUTES /// TimerID for time spend in space VAR_FINAL/recovering_timer - /// Determines the last state we were in ([LAST_STATE_PLANET] or [LAST_STATE_SPACE]) + /// Determines the last state we were in ([LAST_STATE_PLANET], [LAST_STATE_SPACE], or [LAST_STATE_NOGRAV]) VAR_FINAL/last_state + /// Modifier to damage taken from pressure/cold + VAR_FINAL/damage_mod = 0.66 + /// Modifier to drift speed in zero G + VAR_FINAL/drift_mod = 0.75 + /datum/quirk/spacer_born/add(client/client_source) if(isdummy(quirk_holder)) return @@ -38,19 +44,20 @@ // It won't really make sense to walk 3 feet and then suddenly gain / lose gravity sickness. // If I'm proven wrong, swap this to use Moved. RegisterSignal(quirk_holder, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(spacer_moved)) + RegisterSignal(quirk_holder, COMSIG_LIVING_GRAVITY_CHANGED, PROC_REF(spacer_grav)) // Yes, it's assumed for planetary maps that you start at gravity sickness. - check_z(quirk_holder, skip_timers = TRUE) + update_effects(quirk_holder, skip_timers = TRUE) // drift slightly faster through zero G - quirk_holder.inertia_move_multiplier *= 0.8 + quirk_holder.inertia_move_multiplier_passive *= drift_mod var/mob/living/carbon/human/human_quirker = quirk_holder //BUBBER EDIT REMOVAL START //human_quirker.set_mob_height(modded_height) //BUBBER EDIT REMOVAL END - human_quirker.physiology.pressure_mod *= 0.8 - human_quirker.physiology.cold_mod *= 0.8 + human_quirker.physiology.pressure_mod *= damage_mod + human_quirker.physiology.cold_mod *= damage_mod /datum/quirk/spacer_born/post_add() var/on_a_planet = SSmapping.is_planetary() @@ -71,11 +78,12 @@ /datum/quirk/spacer_born/remove() UnregisterSignal(quirk_holder, COMSIG_MOVABLE_Z_CHANGED) + UnregisterSignal(quirk_holder, COMSIG_LIVING_GRAVITY_CHANGED) if(QDELING(quirk_holder)) return - quirk_holder.inertia_move_multiplier /= 0.8 + quirk_holder.inertia_move_multiplier_passive /= drift_mod quirk_holder.clear_mood_event("spacer") quirk_holder.remove_movespeed_modifier(/datum/movespeed_modifier/spacer) quirk_holder.remove_status_effect(/datum/status_effect/spacer) @@ -84,14 +92,20 @@ //BUBBER EDIT REMOVAL START //human_quirker.set_mob_height(HUMAN_HEIGHT_MEDIUM) //BUBBER EDIT REMOVAL END - human_quirker.physiology.pressure_mod /= 0.8 - human_quirker.physiology.cold_mod /= 0.8 + human_quirker.physiology.pressure_mod /= damage_mod + human_quirker.physiology.cold_mod /= damage_mod /// Check on Z change whether we should start or stop timers /datum/quirk/spacer_born/proc/spacer_moved(mob/living/source, turf/old_turf, turf/new_turf, same_z_layer) SIGNAL_HANDLER - check_z(source) + update_effects(source) + +/// Check on gravity change whether we should start or stop timers +/datum/quirk/spacer_born/proc/spacer_grav(mob/living/source, new_gravity, old_gravity) + SIGNAL_HANDLER + + update_effects(source) /** * Used to check if we should start or stop timers based on the quirk holder's location. @@ -99,9 +113,12 @@ * * afflicted - the mob arriving / same as quirk holder * * skip_timers - if TRUE, this is being done instantly / should not have feedback (such as in init) */ -/datum/quirk/spacer_born/proc/check_z(mob/living/spacer, skip_timers = FALSE) +/datum/quirk/spacer_born/proc/update_effects(mob/living/spacer, skip_timers = FALSE) if(is_on_a_planet(spacer)) - on_planet(spacer, skip_timers) + if(spacer.has_gravity()) + on_planet(spacer, skip_timers) + else + has_nograv(spacer, skip_timers) else in_space(spacer, skip_timers) @@ -172,9 +189,10 @@ deltimer(planetside_timer) planetside_timer = null + var/was_nograv = last_state == LAST_STATE_NOGRAV last_state = LAST_STATE_SPACE - if(skip_timers) + if(skip_timers || was_nograv) comfortably_in_space(afflicted, TRUE) return @@ -185,7 +203,7 @@ to_chat(afflicted, span_green("You start feeling better now that you're back in space.")) /** - * Ran when living back in space for a long enough period. + * Ran when living back in space, or just no-grav in general, for a long enough period. * * * afflicted - the mob arriving / same as quirk holder * * skip_timers - if TRUE, this is being done instantly / should not have feedback (such as in init) @@ -201,5 +219,33 @@ if(!skip_timers) to_chat(afflicted, span_green("You feel better.")) +// On a planet but has no gravity + +/** + * Ran when we are on a planet while having no gravity. + * + * * afflicted - the mob arriving / same as quirk holder + * * skip_timers - if TRUE, this is being done instantly / should not have feedback (such as in init) + */ +/datum/quirk/spacer_born/proc/has_nograv(mob/living/afflicted, skip_timers = FALSE) + if(last_state == LAST_STATE_NOGRAV) + return + if(planetside_timer) + deltimer(planetside_timer) + planetside_timer = null + if(recovering_timer) + deltimer(recovering_timer) + recovering_timer = null + + var/was_in_space = last_state == LAST_STATE_SPACE + last_state = LAST_STATE_NOGRAV + + afflicted.apply_status_effect(/datum/status_effect/spacer/gravity_wellness) + afflicted.add_mood_event("spacer", /datum/mood_event/spacer/on_planet/low_grav) + afflicted.add_movespeed_modifier(/datum/movespeed_modifier/spacer/in_space) + if(!skip_timers && !was_in_space) + to_chat(afflicted, span_green("You feel like you're back in space!")) + #undef LAST_STATE_PLANET #undef LAST_STATE_SPACE +#undef LAST_STATE_NOGRAV diff --git a/code/datums/records/crime.dm b/code/datums/records/crime.dm index 729b85c56b8..a403923ab80 100644 --- a/code/datums/records/crime.dm +++ b/code/datums/records/crime.dm @@ -19,7 +19,7 @@ src.author = author src.details = details src.name = name - src.time = station_time_timestamp() + src.time = round_timestamp() /datum/crime/citation /// Fine for the crime diff --git a/code/datums/records/manifest.dm b/code/datums/records/manifest.dm index 00c41459b48..4b399dbe0f4 100644 --- a/code/datums/records/manifest.dm +++ b/code/datums/records/manifest.dm @@ -133,7 +133,7 @@ GLOBAL_DATUM_INIT(manifest, /datum/manifest, new) character_appearance = character_appearance, dna_string = record_dna.unique_enzymes, fingerprint = md5(record_dna.unique_identity), - gender = person_gender, + gender = person.gender, initial_rank = assignment, name = person.real_name, rank = chosen_assignment, // SKYRAT EDIT - Alt job titles - ORIGINAL: rank = assignment, diff --git a/code/datums/records/record.dm b/code/datums/records/record.dm index 04f3205a755..c34ac664a10 100644 --- a/code/datums/records/record.dm +++ b/code/datums/records/record.dm @@ -159,7 +159,7 @@ character_appearance, dna_string = "Unknown", fingerprint = "?????", - gender = "Other", + gender = "neuter", initial_rank = "Unassigned", name = "Unknown", rank = "Unassigned", diff --git a/code/datums/request_message.dm b/code/datums/request_message.dm index 18feada06cb..c88433e5ca9 100644 --- a/code/datums/request_message.dm +++ b/code/datums/request_message.dm @@ -21,7 +21,7 @@ /datum/request_message/New(data) sender_department = data["sender_department"] - received_time = station_time_timestamp() + received_time = round_timestamp() content = data["message"] message_verified_by = data["verified"] message_stamped_by = data["stamped"] diff --git a/code/datums/ruins/icemoon.dm b/code/datums/ruins/icemoon.dm index 94c269792a1..bf0b661d6f6 100644 --- a/code/datums/ruins/icemoon.dm +++ b/code/datums/ruins/icemoon.dm @@ -86,6 +86,15 @@ description = "A manufacturing and packaging facility producing insulated gloves." suffix = "icemoon_surface_gloves.dmm" +/datum/map_template/ruin/icemoon/shoe_facotry + name = "Ice-Ruin Shoe Factory" + id = "shoe_factory" + description = "An abandoned shoe factory." + prefix = "_maps/RandomRuins/AnywhereRuins/" + suffix = "shoe_factory.dmm" + allow_duplicates = FALSE + cost = 10 + // above and below ground together /datum/map_template/ruin/icemoon/entemology diff --git a/code/datums/ruins/lavaland.dm b/code/datums/ruins/lavaland.dm index 299cbf6cdf9..e19158a5c6d 100644 --- a/code/datums/ruins/lavaland.dm +++ b/code/datums/ruins/lavaland.dm @@ -334,3 +334,12 @@ description = "They launched too early" suffix = "lavaland_surface_crashsite.dmm" allow_duplicates = FALSE + +/datum/map_template/ruin/lavaland/shoe_facotry + name = "Lava-Ruin Shoe Factory" + id = "shoe_factory" + description = "An abandoned shoe factory." + prefix = "_maps/RandomRuins/AnywhereRuins/" + suffix = "shoe_factory.dmm" + allow_duplicates = FALSE + cost = 10 diff --git a/code/datums/sprite_accessories.dm b/code/datums/sprite_accessories.dm index acc125d1208..22b7c850b74 100644 --- a/code/datums/sprite_accessories.dm +++ b/code/datums/sprite_accessories.dm @@ -998,7 +998,7 @@ GLOBAL_LIST_EMPTY(blended_hair_icons_cache) /datum/sprite_accessory/gradient/none name = SPRITE_ACCESSORY_NONE - icon_state = "none" + icon_state = SPRITE_ACCESSORY_NONE /datum/sprite_accessory/gradient/full name = "Full" @@ -1245,10 +1245,11 @@ GLOBAL_LIST_EMPTY(blended_hair_icons_cache) /datum/sprite_accessory/facial_hair/shaved name = "Shaved" - icon_state = null + icon_state = SPRITE_ACCESSORY_NONE gender = NEUTER /datum/sprite_accessory/clothing + abstract_type = /datum/sprite_accessory/clothing /// Allows you to specify a greyscale config var/greyscale_config /// Icon state in the digitigrade template file to use if the wearer is digitigrade. @@ -1257,6 +1258,14 @@ GLOBAL_LIST_EMPTY(blended_hair_icons_cache) /// Color pallete for static colored underwear, like hearts. /// Used so greyscale copies can have the same palette. var/greyscale_colors = "#FFFFFF#FFFFFF#FFFFFF" + /// The layer this sprite accessory should render on + var/layer = BODY_LAYER + /// What kind of gender shaping this sprite accessory should use (in case your sprite gets a weird missing pixel in the center) + var/female_sprite_flags = FEMALE_UNIFORM_FULL + +/// Override to return a different icon state given a bodytype or physique +/datum/sprite_accessory/clothing/proc/get_icon_state(physique, bodyshape) + return icon_state /** * Generate an appearance from this clothing datum @@ -1267,18 +1276,22 @@ GLOBAL_LIST_EMPTY(blended_hair_icons_cache) */ /datum/sprite_accessory/clothing/proc/make_appearance(color = COLOR_WHITE, physique = MALE, bodyshape = BODYSHAPE_HUMANOID) var/static/list/cached_icons = list() - var/use_female = physique == FEMALE + var/use_female = physique == FEMALE && female_sprite_flags var/use_digi = digi_icon_state && (bodyshape & BODYSHAPE_DIGITIGRADE) + var/female_sprite_flags_to_use = female_sprite_flags + var/icon_state_to_use = get_icon_state(physique, bodyshape) + if(use_digi && female_sprite_flags_to_use) + female_sprite_flags_to_use = FEMALE_UNIFORM_TOP_ONLY // No bottom gender shaping for the digi legs - var/key = "[icon_state]-[greyscale_config || "ng"]-[use_female]-[use_digi]-[greyscale_colors]" + var/key = "[icon_state_to_use]-[greyscale_config || "ng"]-[use_female]-[use_digi]-[greyscale_colors]" var/mutable_appearance/result if(cached_icons[key]) // it's already cached result = mutable_appearance(icon(cached_icons[key])) else if(greyscale_config || use_female || use_digi) // icon ops ahead - var/icon/created = icon(greyscale_config ? SSgreyscale.GetColoredIconByType(greyscale_config, greyscale_colors) : icon, icon_state) + var/icon/created = icon(greyscale_config ? SSgreyscale.GetColoredIconByType(greyscale_config, greyscale_colors) : icon, icon_state_to_use) if(use_female) - created = wear_female_version(icon_state, icon, FEMALE_UNIFORM_FULL) + created = wear_female_version(icon_state_to_use, icon, female_sprite_flags_to_use) if(use_digi) var/icon/replacement = icon(SSgreyscale.GetColoredIconByType(/datum/greyscale_config/digitigrade_underwear, greyscale_colors), digi_icon_state) created = replace_icon_legs(created, replacement) @@ -1289,7 +1302,7 @@ GLOBAL_LIST_EMPTY(blended_hair_icons_cache) else // no caching necessary result = mutable_appearance(icon, icon_state) - result.layer = -BODY_LAYER + result.layer = -layer result.color = use_static ? null : color return result @@ -1303,6 +1316,7 @@ GLOBAL_LIST_EMPTY(blended_hair_icons_cache) icon = 'icons/mob/clothing/underwear.dmi' use_static = FALSE em_block = TRUE + abstract_type = /datum/sprite_accessory/clothing/underwear //MALE UNDERWEAR /datum/sprite_accessory/clothing/underwear/nude @@ -1500,6 +1514,7 @@ GLOBAL_LIST_EMPTY(blended_hair_icons_cache) /datum/sprite_accessory/clothing/undershirt icon = 'icons/mob/clothing/underwear.dmi' em_block = TRUE + abstract_type = /datum/sprite_accessory/clothing/undershirt /datum/sprite_accessory/clothing/undershirt/nude name = "Nude" @@ -1790,6 +1805,7 @@ GLOBAL_LIST_EMPTY(blended_hair_icons_cache) /datum/sprite_accessory/clothing/socks icon = 'icons/mob/clothing/underwear.dmi' em_block = TRUE + abstract_type = /datum/sprite_accessory/clothing/socks /datum/sprite_accessory/clothing/socks/nude name = "Nude" diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index c3734662080..b8730620c2d 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -732,3 +732,24 @@ /datum/status_effect/rev_resilience/on_remove() to_chat(owner, span_notice("You feel your surge of revolutionary zeal fade. You hope you don't get shot in the foot...")) owner.remove_traits(list(TRAIT_HARDLY_WOUNDED,TRAIT_ANALGESIA,TRAIT_FEARLESS), TRAIT_STATUS_EFFECT(id)) + +//status effect granted when taking attack damage while metabolizing synthpax +/datum/status_effect/synthpax_immunity + id = "synthpax_immune" + duration = 5 SECONDS + status_type = STATUS_EFFECT_REFRESH + alert_type = null + +/datum/status_effect/synthpax_immunity/on_creation(mob/living/new_owner, duration = 5 SECONDS) + src.duration = duration + return ..() + +/datum/status_effect/synthpax_immunity/on_apply() + ADD_TRAIT(owner, TRAIT_SYNTHPAX_IMMUNE, TRAIT_STATUS_EFFECT(id)) + REMOVE_TRAIT(owner, TRAIT_PACIFISM, METABOLIZATION_TRAIT(/datum/reagent/pax/peaceborg)) + return TRUE + +/datum/status_effect/synthpax_immunity/on_remove() + REMOVE_TRAIT(owner, TRAIT_SYNTHPAX_IMMUNE, TRAIT_STATUS_EFFECT(id)) + if(owner.reagents.has_reagent(/datum/reagent/pax/peaceborg)) + ADD_TRAIT(owner, TRAIT_PACIFISM, METABOLIZATION_TRAIT(/datum/reagent/pax/peaceborg)) diff --git a/code/datums/status_effects/cuffed_item.dm b/code/datums/status_effects/cuffed_item.dm index 4711af1cb01..297666efc75 100644 --- a/code/datums/status_effects/cuffed_item.dm +++ b/code/datums/status_effects/cuffed_item.dm @@ -14,47 +14,80 @@ var/obj/item/cuffed ///Reference to the pair of handcuffs used to bind the item var/obj/item/restraints/handcuffs/cuffs + ///Reference to the bodypart we're cuffed to + var/obj/item/bodypart/arm/cuffed_to + ///Reference to the component managing the link between the mob and the item + VAR_PRIVATE/datum/component/chained_together/link_effect /datum/status_effect/cuffed_item/on_creation(mob/living/new_owner, obj/item/cuffed, obj/item/restraints/handcuffs/cuffs) src.cuffed = cuffed src.cuffs = cuffs . = ..() //throws the alert and all + if(QDELETED(src)) + return linked_alert.update_appearance(UPDATE_OVERLAYS) /datum/status_effect/cuffed_item/on_apply() - if(HAS_TRAIT_FROM(cuffed, TRAIT_NODROP, CUFFED_ITEM_TRAIT)) - qdel(src) - return FALSE owner.temporarilyRemoveItemFromInventory(cuffs, force = TRUE) - if(!owner.is_holding(cuffed) && !owner.put_in_hands(cuffed)) + cuffed_to = owner.get_inactive_hand() + if(isnull(cuffed_to) || !update_link()) owner.put_in_hands(cuffs) qdel(src) return FALSE - ADD_TRAIT(cuffed, TRAIT_NODROP, CUFFED_ITEM_TRAIT) - - RegisterSignals(cuffed, list(COMSIG_ITEM_DROPPED, COMSIG_MOVABLE_MOVED, COMSIG_QDELETING), PROC_REF(on_displaced)) + RegisterSignals(cuffed, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED, COMSIG_MOVABLE_MOVED), PROC_REF(check_for_link)) + RegisterSignal(cuffed, COMSIG_QDELETING, PROC_REF(cleanup_effect)) RegisterSignal(cuffed, COMSIG_ATOM_UPDATE_APPEARANCE, PROC_REF(on_item_update_appearance)) RegisterSignal(cuffed, COMSIG_ATOM_EXAMINE, PROC_REF(cuffed_reminder)) RegisterSignal(cuffed, COMSIG_TOPIC, PROC_REF(topic_handler)) RegisterSignal(cuffed, COMSIG_ITEM_GET_STRIPPABLE_ALT_ACTIONS, PROC_REF(get_strippable_action)) RegisterSignal(cuffed, COMSIG_ITEM_STRIPPABLE_ALT_ACTION, PROC_REF(do_strippable_action)) + RegisterSignal(cuffed, COMSIG_ITEM_PRE_STORAGE_INSERTION, PROC_REF(block_storage_insert)) + RegisterSignal(cuffed, COMSIG_ITEM_PRE_CUFFED_TO_MOB, PROC_REF(block_item_cuff)) - RegisterSignals(cuffs, list(COMSIG_ITEM_EQUIPPED, COMSIG_MOVABLE_MOVED, COMSIG_QDELETING), PROC_REF(on_displaced)) + RegisterSignals(cuffs, list(COMSIG_ITEM_EQUIPPED, COMSIG_QDELETING, COMSIG_MOVABLE_MOVED), PROC_REF(cleanup_effect)) RegisterSignal(cuffs, COMSIG_ATOM_UPDATE_APPEARANCE, PROC_REF(on_item_update_appearance)) + cuffed_to.set_speed_modifiers(cuffed_to.interaction_modifier + 0.25, cuffed_to.click_cd_modifier + 0.25) + RegisterSignal(cuffed_to, COMSIG_QDELETING, PROC_REF(cleanup_effect)) + RegisterSignal(cuffed_to, COMSIG_BODYPART_REMOVED, PROC_REF(cuffed_to_removed)) + RegisterSignal(owner, COMSIG_ATOM_EXAMINE_MORE, PROC_REF(on_examine_more)) - owner.log_message("bound [src] to themselves with restraints", LOG_GAME) + owner.log_message("bound [cuffed] to [owner.p_themselves()] with restraints", LOG_GAME) + SSblackbox.record_feedback("tally", "cuffed_item", 1, cuffed.type) return TRUE /datum/status_effect/cuffed_item/on_remove() //Prevent possible recursions from these signals - UnregisterSignal(cuffed, list(COMSIG_ITEM_DROPPED, COMSIG_MOVABLE_MOVED, COMSIG_QDELETING)) - UnregisterSignal(cuffs, list(COMSIG_ITEM_EQUIPPED, COMSIG_MOVABLE_MOVED, COMSIG_QDELETING)) - - REMOVE_TRAIT(cuffed, TRAIT_NODROP, CUFFED_ITEM_TRAIT) + UnregisterSignal(cuffed, list( + COMSIG_ATOM_EXAMINE, + COMSIG_ATOM_UPDATE_APPEARANCE, + COMSIG_ITEM_PRE_CUFFED_TO_MOB, + COMSIG_ITEM_DROPPED, + COMSIG_ITEM_EQUIPPED, + COMSIG_ITEM_GET_STRIPPABLE_ALT_ACTIONS, + COMSIG_ITEM_PRE_STORAGE_INSERTION, + COMSIG_ITEM_STRIPPABLE_ALT_ACTION, + COMSIG_MOVABLE_MOVED, + COMSIG_QDELETING, + COMSIG_TOPIC, + )) + UnregisterSignal(cuffs, list( + COMSIG_ATOM_UPDATE_APPEARANCE, + COMSIG_ITEM_EQUIPPED, + COMSIG_MOVABLE_MOVED, + COMSIG_QDELETING, + )) + UnregisterSignal(cuffed_to, list( + COMSIG_BODYPART_REMOVED, + COMSIG_QDELETING, + )) + UnregisterSignal(owner, list( + COMSIG_ATOM_EXAMINE_MORE, + COMSIG_CARBON_POST_ATTACH_LIMB, + )) cuffed = null if(!QDELETED(cuffs)) @@ -63,14 +96,117 @@ cuffs.forceMove(owner.drop_location()) cuffs = null + cuffed_to.set_speed_modifiers(cuffed_to.interaction_modifier - 0.25, cuffed_to.click_cd_modifier - 0.25) + cuffed_to = null + + break_leash() + ///Called when someone examines the owner twice, so they can know if someone has a cuffed item /datum/status_effect/cuffed_item/proc/on_examine_more(datum/source, mob/user, list/examine_list) SIGNAL_HANDLER - examine_list += span_warning("[cuffed.examine_title(user)] is bound to [owner.p_their()] [owner.get_held_index_name(owner.get_held_index_of_item(cuffed))] by [cuffs.examine_title(user)]") + examine_list += span_warning("There's [cuffed.examine_title(user)] bound to [owner.p_their()] \ + [cuffed_to.plaintext_zone] by [cuffs.examine_title(user)].") + +/// What happens if the limb we're cuffed to is removed? +/datum/status_effect/cuffed_item/proc/cuffed_to_removed(datum/source, mob/living/carbon/owner, special) + SIGNAL_HANDLER + // if special we will just wait for the new limb + if(special) + UnregisterSignal(cuffed_to, list(COMSIG_QDELETING, COMSIG_BODYPART_REMOVED)) + cuffed_to.set_speed_modifiers(cuffed_to.interaction_modifier - 0.25, cuffed_to.click_cd_modifier - 0.25) + cuffed_to = null + RegisterSignal(owner, COMSIG_CARBON_POST_ATTACH_LIMB, PROC_REF(new_cuffed_to_attached)) + return + // otherwise we wipe the effect + qdel(src) + +/// Specifically if our cuffed limb is removed "specially", change it to the newly applied arm +/datum/status_effect/cuffed_item/proc/new_cuffed_to_attached(datum/source, obj/item/bodypart/limb, special) + SIGNAL_HANDLER + + if(!istype(limb, /obj/item/bodypart/arm)) + return + + cuffed_to = limb + cuffed_to.set_speed_modifiers(cuffed_to.interaction_modifier + 0.25, cuffed_to.click_cd_modifier + 0.25) + RegisterSignal(cuffed_to, COMSIG_QDELETING, PROC_REF(cleanup_effect)) + RegisterSignal(cuffed_to, COMSIG_BODYPART_REMOVED, PROC_REF(cuffed_to_removed)) + UnregisterSignal(owner, COMSIG_CARBON_POST_ATTACH_LIMB) + +/// Check if we need to spawn the tether effect or not +/datum/status_effect/cuffed_item/proc/check_for_link(...) + SIGNAL_HANDLER + if(!update_link()) + qdel(src) + +/// Updates our link and beam effect based on our state +/// Returns TRUE if we are in a valid link state, FALSE otherwise +/datum/status_effect/cuffed_item/proc/update_link() + // when held, we need no tether + if(cuffed.loc == owner) + return break_leash() + + // when on the ground, init a tether between item <-> owner + if(isturf(cuffed.loc)) + return init_leash(cuffed) + + // when being picked up by something else, init a tether between grabber <-> owner + if(ismovable(cuffed.loc) && isturf(cuffed.loc.loc)) + return init_leash(cuffed.loc) + + // we have no idea where it is... + return FALSE + +/// Inits the leash and beam effect to the given target, cleaning up old ones if necessary +/datum/status_effect/cuffed_item/proc/init_leash(atom/movable/leash_to) + if(link_effect) + if(link_effect.parent == leash_to) + return TRUE + break_leash() + + link_effect = leash_to.AddComponentFrom(REF(src), /datum/component/chained_together, chained_to = owner) + if(!QDELETED(link_effect)) + return TRUE + + // chain component failed to apply + if(ismob(leash_to)) + var/mob/leash_to_mob = leash_to + addtimer(CALLBACK(src, PROC_REF(eject_item), leash_to_mob), 1) + return TRUE + + return FALSE + +/datum/status_effect/cuffed_item/proc/break_leash() + link_effect?.parent.RemoveComponentSource(REF(src), /datum/component/chained_together) + if(QDELETED(link_effect)) + link_effect = null + return TRUE + +// Delayed unequip after an invalid pickup. This sucks but I can't think of a better way around due to move order shenanigans +/datum/status_effect/cuffed_item/proc/eject_item(mob/leash_to_mob) + if(QDELETED(src) || cuffed.loc != leash_to_mob) + return + if(!leash_to_mob.dropItemToGround(cuffed)) + qdel(src) + return + to_chat(leash_to_mob, span_warning("[cuffs] binding [cuffed] to [owner] tugs it out of your grasp!")) + +/// Stops it from being stored anywhere +/datum/status_effect/cuffed_item/proc/block_storage_insert(obj/item/source, atom/target_storage, mob/user, force, messages) + SIGNAL_HANDLER + if(messages) + target_storage.balloon_alert(user, "can't store [source.name] while cuffed!") + return BLOCK_STORAGE_INSERT + +/// Stops double cuff +/datum/status_effect/cuffed_item/proc/block_item_cuff(obj/item/source, mob/cuffer, obj/item/cuffs) + SIGNAL_HANDLER + source.balloon_alert(cuffer, "cuffed to someone else!") + return BLOCK_ITEM_CUFF ///What happens if one of the items is moved away from the mob -/datum/status_effect/cuffed_item/proc/on_displaced(datum/source) +/datum/status_effect/cuffed_item/proc/cleanup_effect(datum/source) SIGNAL_HANDLER qdel(src) @@ -128,9 +264,10 @@ log_combat(user, owner, "removed restraints binding [cuffed] to") var/obj/item/restraints/handcuffs/ref_cuffs = cuffs + var/mob/living/ref_owner = owner ref_cuffs.forceMove(owner.drop_location()) //This will cause the status effect to delete itself, which unsets the 'cuffs' var user.put_in_hands(ref_cuffs) - owner.balloon_alert(user, "cuffs removed from item") + ref_owner.balloon_alert(user, "cuffs removed from item") return TRUE @@ -162,3 +299,55 @@ if(.) var/datum/status_effect/cuffed_item/effect = attached_effect effect?.try_remove_cuffs(owner) + +// Chains two movable to be adjacent to each other. YMMV using this +/datum/component/chained_together + dupe_mode = COMPONENT_DUPE_SOURCES + /// Weakref to the thing we're chained to + var/datum/weakref/chained_to_weakref + // Tracks the various things we apply to whatever we are cuffed to for cleanup + VAR_PRIVATE/datum/component/leash/link_effect + VAR_PRIVATE/datum/component/tug_towards/tug_effect + VAR_PRIVATE/datum/beam/beam_effect + +/datum/component/chained_together/on_source_add(source, atom/movable/chained_to) + // more sources are only allowed if they're chaining to the same thing + // having something linked to two different things is not supported now, and will break horribly + return chained_to_weakref?.resolve() == chained_to ? ..() : COMPONENT_REDUNDANT + +/datum/component/chained_together/Initialize(atom/movable/chained_to) + if(!ismovable(parent) || !ismovable(chained_to)) + return COMPONENT_INCOMPATIBLE + + chained_to_weakref = WEAKREF(chained_to) + var/atom/movable/movable_parent = parent + link_effect = movable_parent.AddComponent(/datum/component/leash, owner = chained_to, distance = 1) + tug_effect = movable_parent.AddComponent(/datum/component/tug_towards, tugging_to = chained_to, strength = 0.66) + beam_effect = movable_parent.Beam(chained_to, "chain") + RegisterSignal(link_effect, COMSIG_QDELETING, PROC_REF(delete_self)) + RegisterSignal(tug_effect, COMSIG_QDELETING, PROC_REF(delete_self)) + RegisterSignal(beam_effect, COMSIG_QDELETING, PROC_REF(recreate_beam)) + +/datum/component/chained_together/Destroy() + UnregisterSignal(beam_effect, COMSIG_QDELETING) + UnregisterSignal(link_effect, COMSIG_QDELETING) + UnregisterSignal(tug_effect, COMSIG_QDELETING) + if(!QDELETED(link_effect)) + QDEL_NULL(link_effect) + if(!QDELETED(tug_effect)) + QDEL_NULL(tug_effect) + if(!QDELETED(beam_effect)) + QDEL_NULL(beam_effect) + return ..() + +/datum/component/chained_together/proc/recreate_beam(datum/beam/source) + SIGNAL_HANDLER + + UnregisterSignal(beam_effect, COMSIG_QDELETING) + var/atom/movable/movable_parent = parent + beam_effect = movable_parent.Beam(chained_to_weakref.resolve(), "chain") + RegisterSignal(beam_effect, COMSIG_QDELETING, PROC_REF(recreate_beam)) + +/datum/component/chained_together/proc/delete_self(datum/source) + SIGNAL_HANDLER + qdel(src) diff --git a/code/datums/status_effects/debuffs/debuffs.dm b/code/datums/status_effects/debuffs/debuffs.dm index 53fefde4dc4..59d76c40a67 100644 --- a/code/datums/status_effects/debuffs/debuffs.dm +++ b/code/datums/status_effects/debuffs/debuffs.dm @@ -289,7 +289,7 @@ var/delta = world.time - last_dead_time var/new_timeofdeath = owner.timeofdeath + delta owner.timeofdeath = new_timeofdeath - owner.station_timestamp_timeofdeath = station_time_timestamp(wtime=new_timeofdeath) + owner.station_timestamp_timeofdeath = round_timestamp(wtime=new_timeofdeath) last_dead_time = null if(owner.stat == DEAD) last_dead_time = world.time diff --git a/code/datums/status_effects/debuffs/dna_transformation.dm b/code/datums/status_effects/debuffs/dna_transformation.dm index 76f6cdd9fb0..1ec9848322b 100644 --- a/code/datums/status_effects/debuffs/dna_transformation.dm +++ b/code/datums/status_effects/debuffs/dna_transformation.dm @@ -5,10 +5,12 @@ tick_interval = STATUS_EFFECT_NO_TICK duration = 1 MINUTES // set in on creation, this just needs to be any value to process alert_type = null + /// Flags used to determine what all we're copying over + VAR_PROTECTED/copy_dna_flags = COPY_DNA_SPECIES /// A reference to a COPY of the DNA that the mob will be transformed into. - var/datum/dna/new_dna + VAR_PRIVATE/datum/dna/new_dna /// A reference to a COPY of the DNA of the mob prior to transformation. - var/datum/dna/old_dna + VAR_PRIVATE/datum/dna/old_dna /datum/status_effect/temporary_transformation/Destroy() . = ..() // parent must be called first, so we clear DNA refs AFTER transforming back... yeah i know @@ -16,10 +18,14 @@ QDEL_NULL(old_dna) /datum/status_effect/temporary_transformation/on_creation(mob/living/new_owner, new_duration = 1 MINUTES, datum/dna/dna_to_copy) + if(!iscarbon(new_owner) || isnull(dna_to_copy)) + qdel(src) + return + src.duration = new_duration src.new_dna = new() src.old_dna = new() - dna_to_copy.copy_dna(new_dna) + init_dna(new_owner, dna_to_copy) return ..() /datum/status_effect/temporary_transformation/on_apply() @@ -30,16 +36,8 @@ if(!transforming.has_dna()) return FALSE - // Save the old DNA - transforming.dna.copy_dna(old_dna) - // Makes them into the new DNA - transforming.visual_only_organs = TRUE // SKYRAT EDIT ADDITION - Customization - new_dna.copy_dna(transforming.dna, COPY_DNA_SPECIES) - transforming.visual_only_organs = initial(transforming.visual_only_organs) // SKYRAT EDIT ADDITION - Customization - transforming.real_name = new_dna.real_name - transforming.name = transforming.get_visible_name() - transforming.updateappearance(mutcolor_update = TRUE) - transforming.domutcheck() + save_dna() + apply_dna() return TRUE /datum/status_effect/temporary_transformation/on_remove() @@ -47,7 +45,7 @@ if(!QDELING(owner)) // Don't really need to do appearance stuff if we're being deleted transforming.visual_only_organs = TRUE // SKYRAT EDIT ADDITION - Customization - old_dna.copy_dna(transforming.dna, COPY_DNA_SPECIES) + old_dna.copy_dna(transforming.dna, copy_dna_flags) transforming.visual_only_organs = initial(transforming.visual_only_organs) // SKYRAT EDIT ADDITION - Customization transforming.updateappearance(mutcolor_update = TRUE) transforming.domutcheck() @@ -55,6 +53,24 @@ transforming.real_name = old_dna.real_name // Name is fine though transforming.name = transforming.get_visible_name() +/// Called when initializing the DNA that the mob is transforming into +/datum/status_effect/temporary_transformation/proc/init_dna(mob/living/carbon/new_owner, datum/dna/dna_to_copy) + dna_to_copy.copy_dna(new_dna, copy_dna_flags) + +/// Called when saving the mob's DNA before transformation +/datum/status_effect/temporary_transformation/proc/save_dna() + var/mob/living/carbon/transforming = owner + transforming.dna.copy_dna(old_dna, copy_dna_flags) + +/// Applies the DNA to the mob +/datum/status_effect/temporary_transformation/proc/apply_dna() + var/mob/living/carbon/transforming = owner + new_dna.copy_dna(transforming.dna, copy_dna_flags) + transforming.real_name = new_dna.real_name + transforming.name = transforming.get_visible_name() + transforming.updateappearance(mutcolor_update = TRUE) + transforming.domutcheck() + /datum/status_effect/temporary_transformation/trans_sting /// Tracks the time left on the effect when the owner last died. Used to pause the effect. var/time_before_pause = -1 @@ -93,3 +109,35 @@ else if(time_before_pause != -1) duration = time_before_pause time_before_pause = -1 + +/datum/status_effect/temporary_transformation/dna_injector + id = "temp_dna_injector_transformation" + status_type = STATUS_EFFECT_MULTIPLE + copy_dna_flags = NONE // no touching species or mutations + +// when initting dna, any unset fields are copied from the mob's dna (so nothing changes effectively) +/datum/status_effect/temporary_transformation/dna_injector/init_dna(mob/living/carbon/new_owner, datum/dna/dna_to_copy) + . = ..() + new_dna.real_name ||= new_owner.dna.real_name + new_dna.unique_enzymes ||= new_owner.dna.unique_enzymes + new_dna.unique_features ||= new_owner.dna.unique_features + new_dna.unique_identity ||= new_owner.dna.unique_identity + new_dna.blood_type ||= new_owner.dna.blood_type + // just to put something there, it'll get updated if UF does anyways + new_dna.features = new_owner.dna.features.Copy() + +// ensure secondary transformation make a copy of the original dna (to prevent latter effects that expire earlier from returning to the wrong dna) +/datum/status_effect/temporary_transformation/dna_injector/save_dna() + for(var/datum/status_effect/temporary_transformation/dna_injector/other_effect in owner.status_effects) + other_effect.old_dna.copy_dna(src.old_dna, copy_dna_flags) + return + + return ..() + +// when the effect ends, see if there's any other active effects, and re-apply them if necessary +/datum/status_effect/temporary_transformation/dna_injector/on_remove() + . = ..() + if(QDELING(owner)) + return + for(var/datum/status_effect/temporary_transformation/dna_injector/other_effect in owner.status_effects) + other_effect.apply_dna() diff --git a/code/datums/status_effects/debuffs/slime/slime_leech.dm b/code/datums/status_effects/debuffs/slime/slime_leech.dm index 0df86b15130..5c7b7567d55 100644 --- a/code/datums/status_effects/debuffs/slime/slime_leech.dm +++ b/code/datums/status_effects/debuffs/slime/slime_leech.dm @@ -41,7 +41,10 @@ our_slime = null /datum/status_effect/slime_leech/tick(seconds_between_ticks) - if(our_slime.stat != CONSCIOUS) + if(QDELETED(our_slime)) + qdel(src) + return + if(our_slime.stat != CONSCIOUS || !owner) our_slime.stop_feeding(silent = TRUE) return diff --git a/code/datums/status_effects/debuffs/spacer.dm b/code/datums/status_effects/debuffs/spacer.dm index 6f970eafac9..7fa342370e2 100644 --- a/code/datums/status_effects/debuffs/spacer.dm +++ b/code/datums/status_effects/debuffs/spacer.dm @@ -18,33 +18,58 @@ // The good side (being in space) /datum/status_effect/spacer/gravity_wellness alert_type = null - tick_interval = 3 SECONDS + tick_interval = 1 SECONDS /// How much disgust to heal per tick - var/disgust_healing_per_tick = 1.5 - /// How much of stamina damage to heal per tick when we've been in nograv for a while - var/stamina_heal_per_tick = 3 + var/disgust_healing_per_second = 0.5 + /// How much of stamina damage to heal per tick when we've been in nograv for a while. + var/stamina_heal_per_second = 4 /// How many seconds of stuns to reduce per tick when we've been in nograv for a while - var/stun_heal_per_tick = 3 SECONDS + var/stun_heal_per_second = 2 SECONDS + /// How much to reduce incoming knockdown effects while in nograv for a while + var/knockdown_multiplier = 0.75 /// Tracks how long we've been in no gravity VAR_FINAL/seconds_in_nograv = 0 SECONDS + /// Tracks if we've applied knockdown modifier reduction to the mob + VAR_FINAL/knockdown_mod_applied = FALSE /datum/status_effect/spacer/gravity_wellness/tick(seconds_between_ticks) var/in_nograv = !owner.has_gravity() - var/nograv_mod = in_nograv ? 1 : 0.5 - owner.adjust_disgust(-1 * disgust_healing_per_tick * nograv_mod) + var/nograv_mod = in_nograv ? 2 : 0.5 + owner.adjust_disgust(-1 * nograv_mod * disgust_healing_per_second * seconds_between_ticks) if(!in_nograv) seconds_in_nograv = 0 SECONDS + if(knockdown_mod_applied) + remove_knockdown_mod() return seconds_in_nograv += (seconds_between_ticks * 0.1) - if(seconds_in_nograv >= 3 MINUTES) - // This has some interesting side effects with gravitum or similar negating effects that may be worth nothing - owner.adjust_stamina_loss(-1 * stamina_heal_per_tick) - owner.AdjustAllImmobility(-1 * stun_heal_per_tick) - // For comparison: Ephedrine heals 4 stamina per tick / 2 per second - // and Nicotine heals 5 seconds of stun per tick / 2.5 per second + if(seconds_in_nograv >= 1 MINUTES) + // With 4 stamina healing per second you'd get out of stamcrit in 6 seconds instead of the usual 10 + owner.adjust_stamina_loss(-1 * stamina_heal_per_second * seconds_between_ticks) + if(seconds_in_nograv >= 10 SECONDS) + owner.AdjustAllImmobility(-1 * stun_heal_per_second * seconds_between_ticks) + if(!knockdown_mod_applied) + apply_knockdown_mod() + +/datum/status_effect/spacer/gravity_wellness/on_remove() + . = ..() + remove_knockdown_mod() + +/datum/status_effect/spacer/gravity_wellness/proc/apply_knockdown_mod() + if(knockdown_mod_applied || !ishuman(owner)) + return + var/mob/living/carbon/human/the_spacer = owner + the_spacer.physiology.knockdown_mod *= knockdown_multiplier + knockdown_mod_applied = TRUE + +/datum/status_effect/spacer/gravity_wellness/proc/remove_knockdown_mod() + if(!knockdown_mod_applied || !ishuman(owner)) + return + var/mob/living/carbon/human/the_spacer = owner + the_spacer.physiology.knockdown_mod /= knockdown_multiplier + knockdown_mod_applied = FALSE // The bad side (being on a planet) /datum/status_effect/spacer/gravity_sickness @@ -105,13 +130,27 @@ description = "I'm stationed on a planet. I'd love to be back in space." mood_change = -3 +/datum/mood_event/spacer/on_planet/low_grav + description = "This feels like I'm back home!" + mood_change = 3 + +/datum/mood_event/spacer/on_planet/low_grav/add_effects(...) + . = ..() + addtimer(CALLBACK(src, PROC_REF(lower_mood_bonus)), 5 MINUTES, TIMER_DELETE_ME) + +/datum/mood_event/spacer/on_planet/low_grav/proc/lower_mood_bonus() + mood_change -= 1 + owner.mob_mood.update_mood() + if(mood_change > 1) + addtimer(CALLBACK(src, PROC_REF(lower_mood_bonus)), 5 MINUTES, TIMER_DELETE_ME) + /datum/movespeed_modifier/spacer id = "spacer" /datum/movespeed_modifier/spacer/in_space movetypes = FLOATING blacklisted_movetypes = FLYING - multiplicative_slowdown = -0.1 + multiplicative_slowdown = -0.15 /datum/movespeed_modifier/spacer/on_planet movetypes = GROUND|FLYING @@ -122,4 +161,4 @@ multiplicative_slowdown = 0.5 /datum/movespeed_modifier/spacer/on_planet/nerfed - multiplicative_slowdown = 0.25 + multiplicative_slowdown = 0.15 diff --git a/code/datums/status_effects/neutral.dm b/code/datums/status_effects/neutral.dm index d5989f91a7e..9ccc6e3d333 100644 --- a/code/datums/status_effects/neutral.dm +++ b/code/datums/status_effects/neutral.dm @@ -891,3 +891,28 @@ owner.add_mood_event("[id]_[moodlet_type]", moodlet_type) else owner.clear_mood_event("[id]_[moodlet_type]") + +/datum/status_effect/admin_esp + id = "admin_esp" + duration = STATUS_EFFECT_PERMANENT + tick_interval = STATUS_EFFECT_NO_TICK + status_type = STATUS_EFFECT_UNIQUE + alert_type = null + /// What the mob's see_invisible should be once this status effect is removed + VAR_PRIVATE/real_invis_see + +/datum/status_effect/admin_esp/on_apply() + real_invis_see = owner.see_invisible + owner.set_invis_see(SEE_INVISIBLE_ADMIN) + RegisterSignal(owner, COMSIG_MOB_SEE_INVIS_CHANGE, PROC_REF(on_invis_changed)) + return TRUE + +/datum/status_effect/admin_esp/on_remove() + UnregisterSignal(owner, COMSIG_MOB_SEE_INVIS_CHANGE) + owner.set_invis_see(real_invis_see) // restore our 'real' invis_see + +/// Whenever our invis_see updates from some other source, keep real_invis_see up to date +/datum/status_effect/admin_esp/proc/on_invis_changed(datum/source, see_invis, old_invis) + SIGNAL_HANDLER + + real_invis_see = see_invis diff --git a/code/datums/status_effects/wound_effects.dm b/code/datums/status_effects/wound_effects.dm index 1fd6c53e8c1..5ea0be0b256 100644 --- a/code/datums/status_effects/wound_effects.dm +++ b/code/datums/status_effects/wound_effects.dm @@ -79,17 +79,22 @@ // less limping while we have determination still var/determined_mod = owner.has_status_effect(/datum/status_effect/determined) ? 0.5 : 1 + var/limp_chance + var/limp_slowdown + if(next_leg == left) + limp_chance = limp_chance_left + limp_slowdown = slowdown_left + next_leg = right + else + limp_chance = limp_chance_right + limp_slowdown = slowdown_right + next_leg = left + if(SEND_SIGNAL(owner, COMSIG_CARBON_LIMPING) & COMPONENT_CANCEL_LIMP) return - if(next_leg == left) - if(prob(limp_chance_left * determined_mod)) - owner.client.move_delay += slowdown_left * determined_mod - next_leg = right - else - if(prob(limp_chance_right * determined_mod)) - owner.client.move_delay += slowdown_right * determined_mod - next_leg = left + if(prob(limp_chance * determined_mod)) + owner.client.move_delay += limp_slowdown * determined_mod /// We need to make sure that we properly clear these refs if one of the owner's limbs gets deleted /datum/status_effect/limp/proc/on_limb_removed(datum/source, obj/item/bodypart/limb_lost, special, dismembered) @@ -137,6 +142,31 @@ carbon_mob.remove_status_effect(src) return +//Quirk variant of limping. Will always be applied as long as you have a leg to stand on. +/datum/status_effect/limp/quirk + id = "limp_quirk" + alert_type = null + +/datum/status_effect/limp/quirk/update_limp(datum/source) + var/mob/living/carbon/carbon_mob = owner + left = carbon_mob.get_bodypart(BODY_ZONE_L_LEG) + right = carbon_mob.get_bodypart(BODY_ZONE_R_LEG) + + slowdown_left = 0 + slowdown_right = 0 + limp_chance_left = 0 + limp_chance_right = 0 + + + if(left) + slowdown_left = 7 //Same as compound fracture + limp_chance_left = 70 + + else if(right) + slowdown_right = 7 + limp_chance_right = 70 + + ///////////////////////// //////// WOUNDS ///////// ///////////////////////// diff --git a/code/datums/storage/storage.dm b/code/datums/storage/storage.dm index ab6b1d03f05..b468f40b7d8 100644 --- a/code/datums/storage/storage.dm +++ b/code/datums/storage/storage.dm @@ -489,6 +489,8 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) return FALSE if(SEND_SIGNAL(parent, COMSIG_ATOM_PRE_STORED_ITEM, to_insert, user, force, messages) & BLOCK_STORAGE_INSERT) return FALSE + if(SEND_SIGNAL(to_insert, COMSIG_ITEM_PRE_STORAGE_INSERTION, parent, user, force, messages) & BLOCK_STORAGE_INSERT) + return FALSE SEND_SIGNAL(parent, COMSIG_ATOM_STORED_ITEM, to_insert, user, force) SEND_SIGNAL(src, COMSIG_STORAGE_STORED_ITEM, to_insert, user, force) @@ -499,7 +501,8 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) to_insert.forceMove(real_location) if(get(real_location, /mob) != user) to_insert.do_pickup_animation(real_location, user) - item_insertion_feedback(user, to_insert, override) + if (messages) + item_insertion_feedback(user, to_insert, override) parent.update_appearance() return TRUE @@ -1071,10 +1074,10 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) if(to_show.active_storage != src && (to_show.stat == CONSCIOUS)) for(var/obj/item/thing in real_location) if(thing.on_found(to_show)) - to_show.active_storage.hide_contents(to_show) + to_show.active_storage?.hide_contents(to_show) + return FALSE - if(to_show.active_storage) - to_show.active_storage.hide_contents(to_show) + to_show.active_storage?.hide_contents(to_show) to_show.active_storage = src diff --git a/code/datums/storage/storage_interface.dm b/code/datums/storage/storage_interface.dm index 1f358af00ef..2e42e34a6ea 100644 --- a/code/datums/storage/storage_interface.dm +++ b/code/datums/storage/storage_interface.dm @@ -112,7 +112,7 @@ for(var/obj/item as anything in storage_contents) item.mouse_opacity = MOUSE_OPACITY_OPAQUE - item.screen_loc = "[current_x]:[screen_pixel_x],[current_y]:[screen_pixel_y]" + item.screen_loc = "[current_x]:[screen_pixel_x + item.base_pixel_x],[current_y]:[screen_pixel_y + item.base_pixel_y]" if(parent_storage.numerical_stacking) item.maptext = storage_contents[item] SET_PLANE(item, ABOVE_HUD_PLANE, our_turf) diff --git a/code/datums/verbs.dm b/code/datums/verbs.dm deleted file mode 100644 index 9fed14c20c8..00000000000 --- a/code/datums/verbs.dm +++ /dev/null @@ -1,102 +0,0 @@ -/datum/verbs - var/name - var/list/children - var/datum/verbs/parent - var/list/verblist - var/abstract = FALSE - -//returns the master list for verbs of a type -/datum/verbs/proc/GetList() - CRASH("Abstract verblist for [type]") - -//do things for each entry in Generate_list -//return value sets Generate_list[verbpath] -/datum/verbs/proc/HandleVerb(list/entry, procpath/verbpath, ...) - return entry - -/datum/verbs/New() - var/mainlist = GetList() - var/ourentry = mainlist[type] - children = list() - verblist = list() - if (ourentry) - if (!islist(ourentry)) //some of our childern already loaded - qdel(src) - CRASH("Verb double load: [type]") - Add_children(ourentry) - - mainlist[type] = src - - Load_verbs(type, typesof("[type]/verb")) - - var/datum/verbs/parent = mainlist[parent_type] - if (!parent) - mainlist[parent_type] = list(src) - else if (islist(parent)) - parent += src - else - parent.Add_children(list(src)) - -/datum/verbs/proc/Set_parent(datum/verbs/_parent) - parent = _parent - if (abstract) - parent.Add_children(children) - var/list/verblistoftypes = list() - for(var/thing in verblist) - LAZYADD(verblistoftypes[verblist[thing]], thing) - - for(var/verbparenttype in verblistoftypes) - parent.Load_verbs(verbparenttype, verblistoftypes[verbparenttype]) - -/datum/verbs/proc/Add_children(list/kids) - if (abstract && parent) - parent.Add_children(kids) - return - - for(var/thing in kids) - var/datum/verbs/item = thing - item.Set_parent(src) - if (!item.abstract) - children += item - -/datum/verbs/proc/Load_verbs(verb_parent_type, list/verbs) - if (abstract && parent) - parent.Load_verbs(verb_parent_type, verbs) - return - - for (var/verbpath in verbs) - verblist[verbpath] = verb_parent_type - -/datum/verbs/proc/Generate_list(...) - . = list() - if (length(children)) - for (var/thing in children) - var/datum/verbs/child = thing - var/list/childlist = child.Generate_list(arglist(args)) - if (childlist) - var/childname = "[child]" - if (childname == "[child.type]") - var/list/tree = splittext(childname, "/") - childname = tree[tree.len] - .[child.type] = "parent=[url_encode("[type]")];name=[childname]" - . += childlist - - for (var/thing in verblist) - var/procpath/verbpath = thing - if (!verbpath) - stack_trace("Bad VERB in [type] verblist: [english_list(verblist)]") - var/list/entry = list() - entry["parent"] = "[type]" - entry["name"] = verbpath.desc - if (verbpath.name[1] == "@") - entry["command"] = copytext(verbpath.name, length(verbpath.name[1]) + 1) - else - entry["command"] = replacetext(verbpath.name, " ", "-") - - .[verbpath] = HandleVerb(arglist(list(entry, verbpath) + args)) - -/world/proc/LoadVerbs(verb_type) - if(!ispath(verb_type, /datum/verbs) || verb_type == /datum/verbs) - CRASH("Invalid verb_type: [verb_type]") - for (var/typepath in subtypesof(verb_type)) - new typepath() diff --git a/code/datums/view.dm b/code/datums/view.dm index 7559e204b90..ce0cccd5d99 100644 --- a/code/datums/view.dm +++ b/code/datums/view.dm @@ -45,16 +45,16 @@ SEND_SIGNAL(chief.mob, COMSIG_VIEWDATA_UPDATE, getView()) /datum/view_data/proc/assertFormat()//T-Pose - winset(chief, "mapwindow.map", "zoom=0") + winset(chief, SKIN_MAPWINDOW_MAP, "zoom=0") zoom = 0 /datum/view_data/proc/resetFormat()//Cuck zoom = chief?.prefs.read_preference(/datum/preference/numeric/pixel_size) - winset(chief, "mapwindow.map", "zoom=[zoom]") + winset(chief, SKIN_MAPWINDOW_MAP, "zoom=[zoom]") chief?.attempt_auto_fit_viewport() // If you change zoom mode, fit the viewport /datum/view_data/proc/setZoomMode() - winset(chief, "mapwindow.map", "zoom-mode=[chief?.prefs.read_preference(/datum/preference/choiced/scaling_method)]") + winset(chief, SKIN_MAPWINDOW_MAP, "zoom-mode=[chief?.prefs.read_preference(/datum/preference/choiced/scaling_method)]") /datum/view_data/proc/isZooming() return (width || height) diff --git a/code/datums/wires/big_manipulator.dm b/code/datums/wires/big_manipulator.dm index 4d56f5470e1..9ad7dbeb3a2 100644 --- a/code/datums/wires/big_manipulator.dm +++ b/code/datums/wires/big_manipulator.dm @@ -23,8 +23,7 @@ var/list/status = list() status += "The big light bulb [holder_manipulator.power_access_wire_cut ? "is off" : "is glowing [holder_manipulator.on ? "green" : "red"]"]." status += "The small light bulb [holder_manipulator.held_object ? "is glowing bright green" : "is off"]." - status += "The green number on the display shows [length(holder_manipulator.pickup_points)]." - status += "The red number on the display shows [length(holder_manipulator.dropoff_points)]." + status += "The number on the display shows [length(holder_manipulator.tasks)]." return status /datum/wires/big_manipulator/on_pulse(wire) diff --git a/code/datums/wounds/_wounds.dm b/code/datums/wounds/_wounds.dm index 1654670e504..9b03a328382 100644 --- a/code/datums/wounds/_wounds.dm +++ b/code/datums/wounds/_wounds.dm @@ -405,6 +405,9 @@ var/obj/item/bodypart/cached_limb = limb // remove_wound() nulls limb so we have to track it locally remove_wound(replaced=TRUE) new_wound.apply_wound(cached_limb, old_wound = src, smited = smited, attack_direction = attack_direction, wound_source = wound_source, replacing = TRUE) + if(HAS_TRAIT(src, TRAIT_WOUND_SCANNED) && severity > new_wound.severity) + for(var/trait_source in GET_TRAIT_SOURCES(src, TRAIT_WOUND_SCANNED)) + ADD_TRAIT(new_wound, TRAIT_WOUND_SCANNED, trait_source) . = new_wound qdel(src) diff --git a/code/datums/wounds/pierce.dm b/code/datums/wounds/pierce.dm index 2ccf49d293f..e13fd79e935 100644 --- a/code/datums/wounds/pierce.dm +++ b/code/datums/wounds/pierce.dm @@ -39,8 +39,8 @@ /// When hit on this bodypart, we have this chance of losing some blood + the incoming damage var/internal_bleeding_chance - /// If we let off blood when hit, the max blood lost is this * the incoming damage - var/internal_bleeding_coefficient + /// A multiplier applied to how much blood is lost from damage to the wounded limb + var/internal_bleeding_coefficient = 1 /// If TRUE we are ready to be mended in surgery VAR_FINAL/mend_state = FALSE @@ -51,37 +51,37 @@ return ..() -/datum/wound/pierce/bleed/receive_damage(wounding_type, wounding_dmg, wound_bonus) - if(victim.stat == DEAD || (wounding_dmg < 5) || !limb.can_bleed() || !victim.get_blood_volume() || !prob(internal_bleeding_chance + wounding_dmg)) +/datum/wound/pierce/bleed/receive_damage(wounding_type, wounding_dmg, wound_bonus, attack_direction, damage_source) + if(victim.stat == DEAD || wounding_dmg < 5 || !limb.can_bleed() || !victim.get_blood_volume() || !prob(internal_bleeding_chance + wounding_dmg)) return - var/blood_bled = rand(1, limb.get_splint_factor() * internal_bleeding_coefficient) // 12 brute toolbox can cause up to 15/18/21 bloodloss on mod/sev/crit + // 20 force attack ~= 5-16 blood loss ~= 1%-3% of blood volume + // 30 force attack ~= 6-20 blood loss ~= 1%-4% of blood volume + var/blood_bled = sqrt(wounding_dmg) * internal_bleeding_coefficient * limb.get_splint_factor() * pick(0.75, 1, 1.25, 1.5) switch(blood_bled) - if(1 to 6) - victim.bleed(blood_bled, TRUE) - if(7 to 13) + if(8 to 12) victim.visible_message( span_smalldanger("Blood droplets fly from the hole in [victim]'s [limb.plaintext_zone]."), span_danger("You cough up a bit of blood from the blow to your [limb.plaintext_zone]."), vision_distance = COMBAT_MESSAGE_RANGE, + visible_message_flags = ALWAYS_SHOW_SELF_MESSAGE, ) - victim.bleed(blood_bled, TRUE) - if(14 to 19) + if(12 to 18) victim.visible_message( span_smalldanger("A small stream of blood spurts from the hole in [victim]'s [limb.plaintext_zone]!"), span_danger("You spit out a string of blood from the blow to your [limb.plaintext_zone]!"), vision_distance = COMBAT_MESSAGE_RANGE, + visible_message_flags = ALWAYS_SHOW_SELF_MESSAGE, ) - victim.create_splatter(victim.dir) - victim.bleed(blood_bled) - if(20 to INFINITY) + if(18 to INFINITY) victim.visible_message( span_danger("A spray of blood streams from the gash in [victim]'s [limb.plaintext_zone]!"), span_bolddanger("You choke up on a spray of blood from the blow to your [limb.plaintext_zone]!"), vision_distance = COMBAT_MESSAGE_RANGE, + visible_message_flags = ALWAYS_SHOW_SELF_MESSAGE, ) - victim.bleed(blood_bled) - victim.create_splatter(victim.dir) - victim.add_splatter_floor(get_step(victim.loc, victim.dir)) + victim.bleed(blood_bled) + if(blood_bled >= 18) + victim.spray_blood(attack_direction) /datum/wound/pierce/bleed/get_bleed_rate_of_change() //basically if a species doesn't bleed, the wound is stagnant and will not heal on its own (nor get worse) @@ -169,7 +169,7 @@ playsound(user, 'sound/items/handling/surgery/cautery2.ogg', 75, TRUE) - var/bleeding_wording = (!limb.can_bleed() ? "holes" : "bleeding") + var/bleeding_wording = (limb.can_bleed() ? "bleeding" : "holes") user.visible_message(span_green("[user] cauterizes some of the [bleeding_wording] on [victim]."), span_green("You cauterize some of the [bleeding_wording] on [victim].")) victim.apply_damage(2 + severity, BURN, limb, wound_bonus = CANT_WOUND) if(prob(30)) @@ -206,7 +206,7 @@ gauzed_clot_rate = 0.75 clot_rate = 0.03 internal_bleeding_chance = 30 - internal_bleeding_coefficient = 1.25 + internal_bleeding_coefficient = 1.5 series_threshold_penalty = 20 status_effect_type = /datum/status_effect/wound/pierce/moderate scar_keyword = "piercemoderate" @@ -240,7 +240,6 @@ gauzed_clot_rate = 0.1 clot_rate = 0.03 // will close quickly on its own internal_bleeding_chance = 0 - internal_bleeding_coefficient = 1 threshold_penalty = 5 /datum/wound_pregen_data/flesh_pierce/open_puncture/pinprick @@ -285,7 +284,7 @@ gauzed_clot_rate = 0.5 clot_rate = 0.02 internal_bleeding_chance = 60 - internal_bleeding_coefficient = 1.5 + internal_bleeding_coefficient = 2 series_threshold_penalty = 35 status_effect_type = /datum/status_effect/wound/pierce/severe scar_keyword = "piercesevere" @@ -397,7 +396,7 @@ initial_flow = 2.5 gauzed_clot_rate = 0.3 internal_bleeding_chance = 80 - internal_bleeding_coefficient = 1.75 + internal_bleeding_coefficient = 2.5 threshold_penalty = 15 status_effect_type = /datum/status_effect/wound/pierce/critical scar_keyword = "piercecritical" diff --git a/code/datums/wounds/slash.dm b/code/datums/wounds/slash.dm index 856a54f8631..e0ac7b30ddc 100644 --- a/code/datums/wounds/slash.dm +++ b/code/datums/wounds/slash.dm @@ -276,7 +276,7 @@ playsound(user, 'sound/items/handling/surgery/cautery2.ogg', 75, TRUE) - var/bleeding_wording = (!limb.can_bleed() ? "cuts" : "bleeding") + var/bleeding_wording = (limb.can_bleed() ? "bleeding" : "cuts") user.visible_message(span_green("[user] cauterizes some of the [bleeding_wording] on [victim]."), span_green("You cauterize some of the [bleeding_wording] on [victim].")) victim.apply_damage(2 + severity, BURN, limb, wound_bonus = CANT_WOUND) if(prob(30)) diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index c9692021a01..87104b8cd47 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -117,8 +117,13 @@ /// Wire assignment for airlocks in this area var/airlock_wires = /datum/wires/airlock - ///This datum, if set, allows terrain generation behavior to be ran on Initialize() + /// Should we actually be running our mapgen if one is set? + /// FALSE here with a set map_generator allows the area to probe from shared generators without actually generating its' turfs + var/use_mapgen = TRUE + /// Datum that would be used in terrain generation behavior var/datum/map_generator/map_generator + /// Should the map_generator be shared with all other willing areas on our z_level? + var/share_map_generator = TRUE ///Used to decide what kind of reverb the area makes sound have var/sound_environment = SOUND_ENVIRONMENT_NONE @@ -220,27 +225,56 @@ GLOBAL_LIST_EMPTY(teleportlocs) /// Generate turfs, including cool cave wall gen /area/proc/RunTerrainGeneration() - if(map_generator) - map_generator = new map_generator() - var/list/turfs = list() - for(var/turf/T in contents) - turfs += T - map_generator.generate_terrain(turfs, src) + if (!use_mapgen || !map_generator) + return + map_generator = get_generator() + var/list/turfs = list() + for(var/turf/T in contents) + turfs += T + map_generator.generate_terrain(turfs, src) /// Populate the previously generated terrain with mobs and objects /area/proc/RunTerrainPopulation() - if(map_generator) - var/list/turfs = list() - for(var/turf/T in contents) - turfs += T - map_generator.populate_terrain(turfs, src) + if (!use_mapgen || !map_generator) + return + map_generator = get_generator() + var/list/turfs = list() + for(var/turf/T in contents) + turfs += T + map_generator.populate_terrain(turfs, src) /area/proc/test_gen() - if(map_generator) - var/list/turfs = list() - for(var/turf/T in contents) - turfs += T - map_generator.generate_terrain(turfs, src) + if (!use_mapgen || !map_generator) + return + map_generator = get_generator() + var/list/turfs = list() + for(var/turf/T in contents) + turfs += T + map_generator.generate_terrain(turfs, src) + +/// Gets own, or shared, map generator +/area/proc/get_generator() + RETURN_TYPE(/datum/map_generator) + if (!map_generator) + return + + if (istype(map_generator)) + return map_generator + + if (!share_map_generator) + map_generator = new map_generator() + return map_generator + + var/list/z_generators = GLOB.map_generators_by_z["[z]"] + if (z_generators && z_generators[map_generator]) + map_generator = z_generators[map_generator] + + if (!istype(map_generator)) + var/new_generator = new map_generator() + LAZYSET(GLOB.map_generators_by_z["[z]"], map_generator, new_generator) + map_generator = new_generator + + return map_generator /// Returns the highest zlevel that this area contains turfs for /area/proc/get_highest_zlevel() diff --git a/code/game/area/areas/mining.dm b/code/game/area/areas/mining.dm index 3d97da72c39..af047a00698 100644 --- a/code/game/area/areas/mining.dm +++ b/code/game/area/areas/mining.dm @@ -137,6 +137,8 @@ sound_environment = SOUND_AREA_LAVALAND ambient_buzz = 'sound/ambience/lavaland/magma.ogg' allow_shuttle_docking = TRUE + map_generator = /datum/map_generator/cave_generator/lavaland + use_mapgen = FALSE /area/lavaland/surface name = "Lavaland" @@ -167,7 +169,7 @@ icon_state = "unexplored" area_flags = VALID_TERRITORY area_flags_mapping = UNIQUE_AREA | CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED - map_generator = /datum/map_generator/cave_generator/lavaland + use_mapgen = TRUE /area/lavaland/surface/outdoors/unexplored/danger //megafauna will also spawn here icon_state = "danger" diff --git a/code/game/area/areas/ruins/icemoon.dm b/code/game/area/areas/ruins/icemoon.dm index 7adcf57cb57..549fab5e846 100644 --- a/code/game/area/areas/ruins/icemoon.dm +++ b/code/game/area/areas/ruins/icemoon.dm @@ -28,6 +28,10 @@ name = "\improper Listening Post" sound_environment = SOUND_ENVIRONMENT_CITY +/area/ruin/comms_agent/Initialize(mapload) + . = ..() + AddElement(/datum/element/block_area_power_fail) + /area/ruin/comms_agent/maint name = "\improper Listening Post Maintenance" sound_environment = SOUND_AREA_TUNNEL_ENCLOSED diff --git a/code/game/area/areas/station/ai.dm b/code/game/area/areas/station/ai.dm index ff12a728f28..faa717845b3 100644 --- a/code/game/area/areas/station/ai.dm +++ b/code/game/area/areas/station/ai.dm @@ -45,6 +45,10 @@ icon_state = "ai_chamber" annoying_ambience = null +/area/station/ai/satellite/chamber/Initialize(mapload) + . = ..() + AddElement(/datum/element/block_area_power_fail) + /area/station/ai/satellite/exterior name = "\improper AI Satellite Exterior" secure = FALSE diff --git a/code/game/area/areas/station/engineering.dm b/code/game/area/areas/station/engineering.dm index 1193404c975..9ad25f233cb 100644 --- a/code/game/area/areas/station/engineering.dm +++ b/code/game/area/areas/station/engineering.dm @@ -16,6 +16,10 @@ name = "Engineering" icon_state = "engine" +/area/station/engineering/main/Initialize(mapload) + . = ..() + AddElement(/datum/element/block_area_power_fail) + /area/station/engineering/hallway name = "Engineering Hallway" icon_state = "engine_hallway" @@ -69,6 +73,10 @@ icon_state = "atmos_engine" area_flags = BLOBS_ALLOWED | CULT_PERMITTED +/area/station/engineering/atmospherics_engine/Initialize(mapload) + . = ..() + AddElement(/datum/element/block_area_power_fail) + /area/station/engineering/lobby name = "\improper Engineering Lobby" icon_state = "engi_lobby" @@ -79,6 +87,10 @@ area_flags = BLOBS_ALLOWED | CULT_PERMITTED sound_environment = SOUND_AREA_SMALL_ENCLOSED +/area/station/engineering/supermatter/Initialize(mapload) + . = ..() + AddElement(/datum/element/block_area_power_fail) + /area/station/engineering/supermatter/waste name = "\improper Supermatter Waste Chamber" icon_state = "engine_sm_waste" diff --git a/code/game/atom/atom_materials.dm b/code/game/atom/atom_materials.dm index 05a1801ee6f..1f787d217bd 100644 --- a/code/game/atom/atom_materials.dm +++ b/code/game/atom/atom_materials.dm @@ -343,6 +343,7 @@ ///Apply material effects of a single material. /atom/proc/apply_single_mat_effect(datum/material/material, amount, multiplier) SHOULD_CALL_PARENT(TRUE) + SEND_SIGNAL(src, COMSIG_ATOM_SINGLE_MATERIAL_EFFECT_APPLY, material, amount, multiplier) // Derived and not optional, so this needs to be on base and not in the property code itself var/beauty_modifier = material.get_property(MATERIAL_BEAUTY) @@ -432,6 +433,7 @@ ///Remove material effects of a single material. /atom/proc/remove_single_mat_effect(datum/material/material, amount, multiplier) SHOULD_CALL_PARENT(TRUE) + SEND_SIGNAL(src, COMSIG_ATOM_SINGLE_MATERIAL_EFFECT_REMOVE, material, amount, multiplier) var/beauty_modifier = material.get_property(MATERIAL_BEAUTY) if(beauty_modifier) diff --git a/code/game/atom/atom_vv.dm b/code/game/atom/atom_vv.dm index 85d7ed011c7..d5a4b5ccd9d 100644 --- a/code/game/atom/atom_vv.dm +++ b/code/game/atom/atom_vv.dm @@ -11,6 +11,7 @@ if(curturf) . += "" VV_DROPDOWN_OPTION(VV_HK_MODIFY_TRANSFORM, "Modify Transform") + VV_DROPDOWN_OPTION(VV_HK_DEBUG_APPEARANCE, "Debug Appearance") VV_DROPDOWN_OPTION(VV_HK_SPIN_ANIMATION, "SpinAnimation") VV_DROPDOWN_OPTION(VV_HK_STOP_ALL_ANIMATIONS, "Stop All Animations") VV_DROPDOWN_OPTION(VV_HK_SHOW_HIDDENPRINTS, "Show Hiddenprint log") diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 3e9a8361a22..fbab282ef5e 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -36,9 +36,13 @@ var/speech_span ///Are we moving with inertia? Mostly used as an optimization var/inertia_moving = FALSE - ///Multiplier for inertia based movement in space - var/inertia_move_multiplier = 1 - ///Object "weight", higher weight reduces acceleration applied to the object + /// Multiplies speed the movable drifts when unaffected by gravity. + /// "Passive" is used for referring "base drift speed" - only the smaller of the two are used. + var/inertia_move_multiplier_passive = 1 + /// Multiplies speed the movable drifts when unaffected by gravity. + /// "Active" is used for referring to things boosting our drift speed, like jetpacks - only the smaller of the two are used. + var/inertia_move_multiplier_active = 1 + /// Object "weight", higher weight reduces acceleration applied to the object var/inertia_force_weight = 1 ///The last time we pushed off something ///This is a hack to get around dumb him him me scenarios diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm index f16d3367770..6a7ff67445f 100644 --- a/code/game/data_huds.dm +++ b/code/game/data_huds.dm @@ -44,7 +44,7 @@ hud_icons = list(FAN_HUD) /datum/atom_hud/data/diagnostic - hud_icons = list(DIAG_HUD, DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD, DIAG_BOT_HUD, DIAG_TRACK_HUD, DIAG_CAMERA_HUD, DIAG_AIRLOCK_HUD, DIAG_LAUNCHPAD_HUD, BIG_MANIP_HUD, DIAG_NANITE_FULL_HUD) // BUBBER EDIT ADDITION - NANITE_HUD + hud_icons = list(DIAG_HUD, DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD, DIAG_BOT_HUD, DIAG_TRACK_HUD, DIAG_CAMERA_HUD, DIAG_AIRLOCK_HUD, DIAG_LAUNCHPAD_HUD, DIAG_NANITE_FULL_HUD) // BUBBER EDIT ADDITION - NANITE_HUD /datum/atom_hud/data/bot_path hud_icons = list(DIAG_PATH_HUD) @@ -62,7 +62,7 @@ . = ..() if(!new_viewer || hud_users_all_z_levels.len != 1) return - for(var/mob/eye/camera/ai/eye as anything in GLOB.camera_eyes) + for(var/mob/eye/camera/ai/eye in GLOB.camera_eyes) eye.update_ai_detect_hud() /datum/atom_hud/data/malf_apc diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index 171086b06b6..002ec4787a6 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -23,7 +23,7 @@ continue if(!station_area.requires_power || station_area.always_unpowered ) continue - if(GLOB.typecache_powerfailure_safe_areas[station_area.type]) + if(HAS_TRAIT(station_area, TRAIT_AREA_BLOCK_POWER_FAIL)) continue station_area.power_light = FALSE @@ -34,7 +34,7 @@ for(var/obj/machinery/power/apc/C as anything in SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/power/apc)) if(C.cell && is_station_level(C.z)) var/area/A = C.area - if(GLOB.typecache_powerfailure_safe_areas[A.type]) + if(HAS_TRAIT(A, TRAIT_AREA_BLOCK_POWER_FAIL)) continue C.cell.charge = 0 diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index 70f2fb76470..70cb1811034 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -185,12 +185,15 @@ if(occupant_typecache) occupant_typecache = typecacheof(occupant_typecache) - if((resistance_flags & INDESTRUCTIBLE) && component_parts){ // This is needed to prevent indestructible machinery still blowing up. If an explosion occurs on the same tile as the indestructible machinery without the PREVENT_CONTENTS_EXPLOSION_1 flag, /datum/controller/subsystem/explosions/proc/propagate_blastwave will call ex_act on all movable atoms inside the machine, including the circuit board and component parts. However, if those parts get deleted, the entire machine gets deleted, allowing for INDESTRUCTIBLE machines to be destroyed. (See #62164 for more info) + if((resistance_flags & INDESTRUCTIBLE) && component_parts) // This is needed to prevent indestructible machinery still blowing up. If an explosion occurs on the same tile as the indestructible machinery without the PREVENT_CONTENTS_EXPLOSION_1 flag, /datum/controller/subsystem/explosions/proc/propagate_blastwave will call ex_act on all movable atoms inside the machine, including the circuit board and component parts. However, if those parts get deleted, the entire machine gets deleted, allowing for INDESTRUCTIBLE machines to be destroyed. (See #62164 for more info) flags_1 |= PREVENT_CONTENTS_EXPLOSION_1 - } + + if(critical_machine) + AddElement(/datum/element/block_area_power_fail) if(HAS_TRAIT(SSstation, STATION_TRAIT_MACHINES_GLITCHED) && mapload) randomize_language_if_on_station() + SEND_GLOBAL_SIGNAL(COMSIG_GLOB_NEW_MACHINE, src) return INITIALIZE_HINT_LATELOAD @@ -1289,8 +1292,18 @@ set_machine_stat(vval) datum_flags |= DF_VAR_EDITED return TRUE + if(vname == NAMEOF(src, critical_machine)) + if(critical_machine == !!vval) // boolean cast in case a badmin tries to set it to 2 for some reason + return FALSE + critical_machine = !!vval + if(critical_machine) + AddElement(/datum/element/block_area_power_fail) + else + RemoveElement(/datum/element/block_area_power_fail) + datum_flags |= DF_VAR_EDITED + return TRUE - return ..() + . = ..() /** * Alerts the AI that a hack is in progress. diff --git a/code/game/machinery/big_manipulator/_defines.dm b/code/game/machinery/big_manipulator/_defines.dm index 362831bd8e7..b04d1b90bb6 100644 --- a/code/game/machinery/big_manipulator/_defines.dm +++ b/code/game/machinery/big_manipulator/_defines.dm @@ -18,32 +18,17 @@ #define MAX_SPEED_MULTIPLIER_TIER_3 5 #define MAX_SPEED_MULTIPLIER_TIER_4 6 -#define MAX_INTERACTION_POINTS_TIER_1 2 -#define MAX_INTERACTION_POINTS_TIER_2 3 -#define MAX_INTERACTION_POINTS_TIER_3 4 -#define MAX_INTERACTION_POINTS_TIER_4 6 +#define MAX_TASKS_TIER_1 6 +#define MAX_TASKS_TIER_2 12 +#define MAX_TASKS_TIER_3 24 +#define MAX_TASKS_TIER_4 32 -#define CURRENT_TASK_NONE "NO TASK" // manipulator is off -#define CURRENT_TASK_IDLE "IDLE" // manipulator is skipping a cycle because it has nothing to do -#define CURRENT_TASK_MOVING_PICKUP "MOVING TO PICKUP POINT" -#define CURRENT_TASK_MOVING_DROPOFF "MOVING TO DROPOFF POINT" -#define CURRENT_TASK_INTERACTING "INTERACTING" -#define CURRENT_TASK_STOPPING "STOPPING" // How should the worker interact with the point #define WORKER_SINGLE_USE "SINGLE TIME" #define WORKER_EMPTY_USE "EMPTY HAND" #define WORKER_NORMAL_USE "NORMAL" -// The tasking schedules the manipulator uses to iterate through points -#define TASKING_ROUND_ROBIN "Round Robin" // 1 - 2 - 3 - 2 - 3 -#define TASKING_STRICT_ROBIN "Strict Robin" // 1 - 2 - 3 - (waiting for 1) - 1 - 2 -#define TASKING_PREFER_FIRST "Prefer First" // 1 - 2 - 1 - 2 - 3 - 2 - 1 - 3 (first availiable) - -// Defines if this point is a pickup or a dropoff point -#define TRANSFER_TYPE_PICKUP "PICK UP" -#define TRANSFER_TYPE_DROPOFF "DROP OFF" - #define BASE_POWER_USAGE 0.2 #define BASE_INTERACTION_TIME 0.3 SECONDS @@ -62,6 +47,16 @@ #define POST_INTERACTION_DROP_NEXT_FITTING "AT ANY FITTING" #define POST_INTERACTION_WAIT "CONTINUE" -// Some macros for interaction checks -#define IS_STOPPING (current_task == CURRENT_TASK_STOPPING) -#define IS_BUSY (current_task != CURRENT_TASK_NONE) + +#define PICKUP_EAGER "Always Pick Up" +#define PICKUP_CAN_WAIT "Wait For Suiting" + +#define TASK_TYPE_PICKUP "pickup" +#define TASK_TYPE_DROP "drop" +#define TASK_TYPE_THROW "throw" +#define TASK_TYPE_USE "use" +#define TASK_TYPE_INTERACT "interact" +#define TASK_TYPE_WAIT "wait" + +#define TASKING_SEQUENTIAL "Sequential" +#define TASKING_STRICT "Strict order" diff --git a/code/game/machinery/big_manipulator/big_manipulator.dm b/code/game/machinery/big_manipulator/big_manipulator.dm index 3a9e9d83d35..83ab74f9a03 100644 --- a/code/game/machinery/big_manipulator/big_manipulator.dm +++ b/code/game/machinery/big_manipulator/big_manipulator.dm @@ -8,7 +8,6 @@ circuit = /obj/item/circuitboard/machine/big_manipulator greyscale_colors = "#d8ce13" greyscale_config = /datum/greyscale_config/big_manipulator - hud_possible = list(BIG_MANIP_HUD) /// Is the manipulator turned on? var/on = FALSE @@ -17,13 +16,8 @@ /// How quickly the manipulator will process it's actions. var/speed_multiplier = 1 - var/min_speed_multiplier = MIN_SPEED_MULTIPLIER_TIER_1 - var/max_speed_multiplier = MAX_SPEED_MULTIPLIER_TIER_1 - - /// The current task. - var/current_task = CURRENT_TASK_NONE - var/current_task_start_time = 0 - var/current_task_duration = 0 + var/min_speed_multiplier = MIN_SPEED_MULTIPLIER_TIER_1 + var/max_speed_multiplier = MAX_SPEED_MULTIPLIER_TIER_1 /// The object inside the manipulator. var/datum/weakref/held_object = null @@ -31,112 +25,88 @@ var/datum/weakref/monkey_worker = null /// Weakref to the ID that locked this manipulator. var/datum/weakref/id_lock = null + /// Inserted manipulator task disk. + var/obj/item/disk/manipulator/task_disk = null /// The manipulator's arm. var/obj/effect/big_manipulator_arm/manipulator_arm = null /// Is the power access wire cut? Disables the power button if `TRUE`. var/power_access_wire_cut = FALSE - /// How many interaction points of each kind can we have? - var/interaction_point_limit = MAX_INTERACTION_POINTS_TIER_1 - /// List of pickup points. - var/list/pickup_points = list() - /// List of dropoff points. - var/list/dropoff_points = list() + /// How many tasks total we can have. + var/interaction_point_limit = MAX_TASKS_TIER_1 - /// Which tasking scenario we use for pickup points? - var/pickup_tasking = TASKING_ROUND_ROBIN - /// Which tasking scenario we use for dropoff points? - var/dropoff_tasking = TASKING_ROUND_ROBIN + /// A list of tasks for the manipulator. + var/list/tasks = list() + /// The task we're currently working on. + var/datum/manipulator_task/current_task - /// List of all HUD icons resembling interaction points. - var/list/hud_points = list() + /// Is the manipulator in the process of stopping? + var/stopping = FALSE + /// Is the manipulator waiting for a turf signal to retry? + var/waiting_for_signal = FALSE + /// Turfs we registered enter/exit signals on while waiting. + var/list/signal_turfs = list() - /// Pickup strategy for tasking. - var/datum/tasking_strategy/pickup_strategy - /// Dropoff strategy for tasking. - var/datum/tasking_strategy/dropoff_strategy + /// Which tasking scenario we use for iterating tasks. + var/tasking_strategy = TASKING_SEQUENTIAL + /// Tasking strategy instance. + var/datum/tasking_strategy/master_tasking -/// Re-creates hud images for the points -/obj/machinery/big_manipulator/proc/update_hud() - LAZYCLEARLIST(hud_points) - - var/image/main_hud = hud_list[BIG_MANIP_HUD] - if(!main_hud) - return - - main_hud.loc = get_turf(src) - main_hud.appearance = mutable_appearance('icons/effects/interaction_points.dmi', null, ABOVE_ALL_MOB_LAYER, src, GAME_PLANE) - - main_hud.overlays.Cut() - var/list/point_overlays = list() - - for(var/i in 1 to length(pickup_points)) - var/datum/interaction_point/point = pickup_points[i] - var/turf/target_turf = point.interaction_turf - if(target_turf) - var/mutable_appearance/point_appearance = mutable_appearance('icons/effects/interaction_points.dmi', "pickup_[i]", ABOVE_ALL_MOB_LAYER, src, GAME_PLANE) - var/turf/manip_turf = get_turf(src) - point_appearance.pixel_x = (target_turf.x - manip_turf.x) * 32 - point_appearance.pixel_y = (target_turf.y - manip_turf.y) * 32 - point_overlays += point_appearance - - for(var/i in 1 to length(dropoff_points)) - var/datum/interaction_point/point = dropoff_points[i] - var/turf/target_turf = point.interaction_turf - if(target_turf) - var/mutable_appearance/point_appearance = mutable_appearance('icons/effects/interaction_points.dmi', "dropoff_[i]", ABOVE_ALL_MOB_LAYER, src, GAME_PLANE) - var/turf/manip_turf = get_turf(src) - point_appearance.pixel_x = (target_turf.x - manip_turf.x) * 32 - point_appearance.pixel_y = (target_turf.y - manip_turf.y) * 32 - point_overlays += point_appearance - - main_hud.overlays += point_overlays - hud_points += main_hud - set_hud_image_active(BIG_MANIP_HUD) - -/// Attempts to find a suitable turf near the manipulator +/// Attempts to find a suitable turf near the manipulator for creating a cargo task. /obj/machinery/big_manipulator/proc/find_suitable_turf() - var/turf/center = get_turf(src) - - for(var/turf/checked_turf in orange(center, 1)) + var/turf/base = get_turf(src) + for(var/turf/checked_turf in orange(base, 1)) if(!isclosedturf(checked_turf)) return checked_turf - - // didn't find any :boowomp: return null -/// Attempts to create a new interaction point and assign it to the correct list. -/obj/machinery/big_manipulator/proc/create_new_interaction_point(mob/user, turf/new_turf, list/new_filters, new_filters_status, new_interaction_mode, transfer_type) - if(!new_turf || !isturf(new_turf)) - new_turf = find_suitable_turf() - if(!new_turf) - balloon_alert(user, "no suitable turfs found!") - return FALSE - - var/list/current_points = (transfer_type == TRANSFER_TYPE_PICKUP) ? pickup_points : dropoff_points - var/point_type = (transfer_type == TRANSFER_TYPE_PICKUP) ? "pickup" : "dropoff" - - if(length(current_points) + 1 > interaction_point_limit) - balloon_alert(user, "[point_type] point limit reached!") +/// Attempts to create a new task and assign it to the list. +/obj/machinery/big_manipulator/proc/create_new_task(mob/user, task_type, turf/new_turf) + if(length(tasks) >= interaction_point_limit) + balloon_alert(user, "task limit reached!") return FALSE var/datum/stock_part/servo/locate_servo = locate() in component_parts var/manipulator_tier = locate_servo ? locate_servo.tier : 1 - var/datum/interaction_point/new_interaction_point = new(new_turf, new_filters, new_filters_status, new_interaction_mode, manipulator_tier) + var/datum/manipulator_task/new_task + var/needs_turf = task_type in list(TASK_TYPE_PICKUP, TASK_TYPE_DROP, TASK_TYPE_THROW, TASK_TYPE_USE, TASK_TYPE_INTERACT) - if(QDELETED(new_interaction_point)) // if something STILL somehow went wrong + if(needs_turf) + if(!new_turf) + new_turf = find_suitable_turf() + if(!new_turf) + return FALSE + + switch(task_type) + if(TASK_TYPE_PICKUP) + new_task = new /datum/manipulator_task/cargo/pickup(new_turf, manipulator_tier) + if(TASK_TYPE_DROP) + new_task = new /datum/manipulator_task/cargo/dropoff_base/drop(new_turf, manipulator_tier) + if(TASK_TYPE_THROW) + new_task = new /datum/manipulator_task/cargo/dropoff_base/throw(new_turf, manipulator_tier) + if(TASK_TYPE_USE) + new_task = new /datum/manipulator_task/cargo/dropoff_base/use(new_turf, manipulator_tier) + if(TASK_TYPE_INTERACT) + new_task = new /datum/manipulator_task/cargo/interact(new_turf, manipulator_tier) + if(TASK_TYPE_WAIT) + new_task = new /datum/manipulator_task/simple/wait() + + if(QDELETED(new_task)) return FALSE - current_points += new_interaction_point + tasks += new_task - if(obj_flags & EMAGGED) - new_interaction_point.type_filters += /mob/living + if(istype(new_task, /datum/manipulator_task/cargo)) + var/datum/manipulator_task/cargo/cargo_task = new_task + cargo_task.offset_dx = new_turf.x - x + cargo_task.offset_dy = new_turf.y - y - if(is_operational) - update_hud() + if((obj_flags & EMAGGED) && istype(new_task, /datum/manipulator_task/cargo)) + var/datum/manipulator_task/cargo/cargo_task = new_task + cargo_task.type_filters += /mob/living - return new_interaction_point + return new_task /obj/machinery/big_manipulator/Initialize(mapload) . = ..() @@ -147,11 +117,6 @@ set_wires(new /datum/wires/big_manipulator(src)) register_context() - for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds) - diag_hud.add_atom_to_hud(src) - - prepare_huds() - update_hud() update_strategies() /// Checks the component tiers, adjusting the properties of the manipulator. @@ -165,35 +130,32 @@ if(-INFINITY to 1) min_speed_multiplier = MIN_SPEED_MULTIPLIER_TIER_1 max_speed_multiplier = MAX_SPEED_MULTIPLIER_TIER_1 - interaction_point_limit = MAX_INTERACTION_POINTS_TIER_1 + interaction_point_limit = MAX_TASKS_TIER_1 set_greyscale(COLOR_YELLOW) manipulator_arm?.set_greyscale(COLOR_YELLOW) if(2) min_speed_multiplier = MIN_SPEED_MULTIPLIER_TIER_2 max_speed_multiplier = MAX_SPEED_MULTIPLIER_TIER_2 - interaction_point_limit = MAX_INTERACTION_POINTS_TIER_2 + interaction_point_limit = MAX_TASKS_TIER_2 set_greyscale(COLOR_ORANGE) manipulator_arm?.set_greyscale(COLOR_ORANGE) if(3) min_speed_multiplier = MIN_SPEED_MULTIPLIER_TIER_3 max_speed_multiplier = MAX_SPEED_MULTIPLIER_TIER_3 - interaction_point_limit = MAX_INTERACTION_POINTS_TIER_3 + interaction_point_limit = MAX_TASKS_TIER_3 set_greyscale(COLOR_RED) manipulator_arm?.set_greyscale(COLOR_RED) if(4 to INFINITY) min_speed_multiplier = MIN_SPEED_MULTIPLIER_TIER_4 max_speed_multiplier = MAX_SPEED_MULTIPLIER_TIER_4 - interaction_point_limit = MAX_INTERACTION_POINTS_TIER_4 + interaction_point_limit = MAX_TASKS_TIER_4 set_greyscale(COLOR_PURPLE) manipulator_arm?.set_greyscale(COLOR_PURPLE) active_power_usage = BASE_MACHINE_ACTIVE_CONSUMPTION * BASE_POWER_USAGE * manipulator_tier - for(var/datum/interaction_point/each_point in pickup_points) - each_point.interaction_priorities = each_point.fill_priority_list(manipulator_tier) - - for(var/datum/interaction_point/each_point in dropoff_points) - each_point.interaction_priorities = each_point.fill_priority_list(manipulator_tier) + for(var/datum/manipulator_task/cargo/cargo_task in tasks) + cargo_task.interaction_priorities = cargo_task.fill_priority_list(manipulator_tier) /obj/machinery/big_manipulator/examine(mob/user) . = ..() @@ -205,10 +167,15 @@ try_press_on(user) return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN +/obj/machinery/big_manipulator/click_alt(mob/user) + eject_task_disk(user) + return CLICK_ACTION_SUCCESS + /obj/machinery/big_manipulator/add_context(atom/source, list/context, obj/item/held_item, mob/user) . = ..() context[SCREENTIP_CONTEXT_RMB] = "Toggle" + context[SCREENTIP_CONTEXT_ALT_LMB] = "Eject disk" if(isnull(held_item)) context[SCREENTIP_CONTEXT_LMB] = panel_open ? "Interact with wires" : "Open UI" @@ -228,16 +195,23 @@ context[SCREENTIP_CONTEXT_LMB] = "Interact with wires" return CONTEXTUAL_SCREENTIP_SET -/obj/machinery/big_manipulator/Destroy(force) - remove_all_huds() - for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds) - diag_hud.remove_atom_from_hud(src) - +/obj/machinery/big_manipulator/atom_deconstruct(disassembled) + if(task_disk) + task_disk.forceMove(drop_location()) + task_disk = null + unregister_task_turf_signals() QDEL_NULL(manipulator_arm) - // QDEL_NULL(monkey_worker.resolve()) - // QDEL_NULL(held_object.resolve()) + QDEL_LIST(tasks) id_lock = null - . = ..() + return ..() + +/obj/machinery/big_manipulator/Destroy(force) + unregister_task_turf_signals() + QDEL_NULL(task_disk) + QDEL_NULL(manipulator_arm) + QDEL_LIST(tasks) + id_lock = null + return ..() /obj/machinery/big_manipulator/Exited(atom/movable/gone, direction) . = ..() @@ -252,90 +226,13 @@ poor_monkey.remove_offsets(type) monkey_worker = null -/obj/machinery/big_manipulator/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change) - . = ..() - if(!old_loc || !isturf(old_loc)) +/// Removes an invalid task from the list. +/obj/machinery/big_manipulator/proc/remove_invalid_task(datum/manipulator_task/task) + if(!task) return - - var/turf/old_turf = old_loc - var/turf/new_turf = get_turf(src) - if(!new_turf || old_turf == new_turf) - return - - var/dx = new_turf.x - old_turf.x - var/dy = new_turf.y - old_turf.y - - if(dx == 0 && dy == 0) // if we rotated for instance - return - - for(var/datum/interaction_point/point in pickup_points) - update_point_position(point, dx, dy) - - for(var/datum/interaction_point/point in dropoff_points) - update_point_position(point, dx, dy) - - if(is_operational) - update_hud() - -/// Updates a single interaction point's position by the given offset -/obj/machinery/big_manipulator/proc/update_point_position(datum/interaction_point/point, dx, dy) - if(!point || !point.interaction_turf) - return - - var/turf/old_turf = point.interaction_turf - if(!old_turf) - return - - var/turf/manipulator_turf = get_turf(src) - if(!manipulator_turf) - return - - var/turf/new_turf = locate(old_turf.x + dx, old_turf.y + dy, manipulator_turf.z) - - // if manipulator is not anchored, allow points to be anywhere (even in walls) to not mess up your stuff when moving it - if(!anchored) - if(new_turf) - point.interaction_turf = new_turf - return - - if(!new_turf || isclosedturf(new_turf)) - new_turf = find_suitable_turf_near(new_turf || old_turf) - if(!new_turf) - remove_invalid_point(point) - return - - if(new_turf == old_turf) - return - - point.interaction_turf = new_turf - -/// Finds a suitable turf near the given location -/obj/machinery/big_manipulator/proc/find_suitable_turf_near(turf/center) - if(!center) - return null - - var/turf/manipulator_turf = get_turf(src) - if(!manipulator_turf) - return null - - for(var/turf/each in orange(1, src)) - if(!isclosedturf(each)) - return each - - return null - -/// Removes an invalid interaction point from the lists. -/obj/machinery/big_manipulator/proc/remove_invalid_point(datum/interaction_point/point) - if(!point) - return - - pickup_points.Remove(point) - dropoff_points.Remove(point) - - qdel(point) - if(is_operational) - update_hud() + tasks -= task + qdel(task) /obj/machinery/big_manipulator/emag_act(mob/user, obj/item/card/emag/emag_card) . = ..() @@ -345,10 +242,8 @@ balloon_alert(user, "overloaded") obj_flags |= EMAGGED - for(var/datum/interaction_point/pickup_point in pickup_points) - pickup_point.type_filters += /mob/living - for(var/datum/interaction_point/dropoff_point in dropoff_points) - dropoff_point.type_filters += /mob/living + for(var/datum/manipulator_task/cargo/cargo_task in tasks) + cargo_task.type_filters += /mob/living return TRUE @@ -358,7 +253,7 @@ return ITEM_INTERACT_SUCCESS /obj/machinery/big_manipulator/can_be_unfasten_wrench(mob/user, silent) - if(current_task != CURRENT_TASK_NONE || on) + if(on || stopping) to_chat(user, span_warning("[src] is activated!")) return FAILED_UNFASTEN return ..() @@ -366,11 +261,8 @@ /obj/machinery/big_manipulator/default_unfasten_wrench(mob/user, obj/item/wrench, time) . = ..() if(. == SUCCESSFUL_UNFASTEN) - if(anchored) // on anchoring, validate all points and remove invalid ones - validate_all_points() - update_hud() - else - remove_all_huds() + if(anchored) + validate_all_tasks() /obj/machinery/big_manipulator/screwdriver_act(mob/living/user, obj/item/tool) return default_deconstruction_screwdriver(user, tool) @@ -381,6 +273,21 @@ /obj/machinery/big_manipulator/item_interaction(mob/living/user, obj/item/tool, list/modifiers) if(user.combat_mode) return NONE + + if(istype(tool, /obj/item/disk/manipulator)) + if(on || stopping) + balloon_alert(user, "turn it off first!") + return ITEM_INTERACT_BLOCKING + if(task_disk) + task_disk.forceMove(drop_location()) + task_disk = null + if(!user.transferItemToLoc(tool, src)) + return ITEM_INTERACT_BLOCKING + task_disk = tool + balloon_alert(user, "disk inserted") + SStgui.update_uis(src) + return ITEM_INTERACT_SUCCESS + if(!panel_open || !is_wire_tool(tool)) return NONE wires.interact(user) @@ -391,7 +298,7 @@ process_upgrades() /obj/machinery/big_manipulator/mouse_drop_dragged(atom/drop_point, mob/user, src_location, over_location, params) - if(current_task != CURRENT_TASK_NONE) + if(on || stopping) balloon_alert(user, "turn it off first!") return @@ -409,7 +316,7 @@ poor_monkey.forceMove(drop_point) /obj/machinery/big_manipulator/mouse_drop_receive(atom/monkey, mob/user, params) - if(current_task != CURRENT_TASK_NONE) + if(on || stopping) balloon_alert(user, "turn it off first!") return @@ -470,8 +377,6 @@ if(!user) on = newly_on - if(!on) - remove_all_huds() return if(newly_on) @@ -483,7 +388,7 @@ balloon_alert(user, "anchor first!") return - validate_all_points() + validate_all_tasks() on = newly_on SStgui.update_uis(src) @@ -493,28 +398,21 @@ drop_held_atom() on = newly_on next_cycle_scheduled = FALSE - // Set stopping task instead of ending current task immediately - if(current_task != CURRENT_TASK_NONE && current_task != CURRENT_TASK_STOPPING) - start_task(CURRENT_TASK_STOPPING, 0) - // Schedule automatic completion of stopping task + if(current_task != null && !stopping) + stopping = TRUE addtimer(CALLBACK(src, PROC_REF(complete_stopping_task)), 1 SECONDS) else - end_current_task() + stopping = FALSE + unregister_task_turf_signals() + waiting_for_signal = FALSE SStgui.update_uis(src) -/obj/machinery/big_manipulator/proc/validate_all_points() - for(var/datum/interaction_point/point in pickup_points) - if(!point.is_valid()) - pickup_points -= point - qdel(point) - - for(var/datum/interaction_point/point in dropoff_points) - if(!point.is_valid()) - dropoff_points -= point - qdel(point) - - if(is_operational) - update_hud() +/// Validates all cargo tasks, removing those on closed turfs. +/obj/machinery/big_manipulator/proc/validate_all_tasks() + for(var/datum/manipulator_task/cargo/cargo_task in tasks) + if(!cargo_task.is_valid()) + tasks -= cargo_task + qdel(cargo_task) /// Attempts to press the power button. /obj/machinery/big_manipulator/proc/try_press_on(mob/living/carbon/human/user) @@ -522,8 +420,7 @@ balloon_alert(user, "unresponsive!") return - // Reject activation during stopping task - if(current_task == CURRENT_TASK_STOPPING) + if(stopping) balloon_alert(user, "stopping in progress!") return @@ -533,14 +430,6 @@ else balloon_alert(user, "deactivated") -/// Drop the held atom. -/obj/machinery/big_manipulator/proc/drop_held_atom() - if(isnull(held_object)) - return - var/obj/obj_resolve = held_object?.resolve() - obj_resolve?.forceMove(get_turf(obj_resolve)) - finish_manipulation(TRANSFER_TYPE_DROPOFF) // MCBALAAM TODO - /obj/machinery/big_manipulator/ui_interact(mob/user, datum/tgui/ui) if(id_lock) to_chat(user, span_warning("[src] is locked behind ID authentication!")) @@ -558,78 +447,105 @@ /obj/machinery/big_manipulator/ui_data(mob/user) var/list/data = list() data["active"] = on - data["current_task"] = current_task - data["current_task_duration"] = current_task_duration + data["stopping"] = stopping + data["current_task"] = current_task ? REF(current_task) : null data["speed_multiplier"] = speed_multiplier data["min_speed_multiplier"] = min_speed_multiplier data["max_speed_multiplier"] = max_speed_multiplier data["manipulator_position"] = "[x],[y]" - data["pickup_tasking"] = pickup_tasking - data["dropoff_tasking"] = dropoff_tasking + data["tasking_strategy"] = tasking_strategy + data["has_monkey"] = !isnull(monkey_worker?.resolve()) + data["disk_inserted"] = !isnull(task_disk) + data["disk_read_only"] = task_disk?.read_only + data["disk_task_count"] = length(task_disk?.tasks_data) - var/list/pickup_points_data = list() - for(var/datum/interaction_point/point in pickup_points) - var/list/point_data = list() - point_data["name"] = point.name - point_data["id"] = REF(point) - var/turf/resolved_turf = point.interaction_turf - point_data["turf"] = resolved_turf ? "[resolved_turf.x],[resolved_turf.y]" : "0,0" - point_data["mode"] = "PICK" - var/list/filter_names = list() - for(var/obj/item/some_path as anything in point.atom_filters) - filter_names += some_path::name - point_data["item_filters"] = filter_names - point_data["filters_status"] = point.should_use_filters - point_data["filtering_mode"] = point.filtering_mode - point_data["worker_interaction"] = point.worker_interaction - point_data["overflow_status"] = point.overflow_status - point_data["worker_use_rmb"] = point.worker_use_rmb - point_data["worker_combat_mode"] = point.worker_combat_mode - point_data["throw_range"] = point.throw_range + var/list/tasks_data = list() + for(var/datum/manipulator_task/task in tasks) + var/list/td = list() + td["name"] = task.name + td["id"] = REF(task) - var/list/settings_list_pick = list() - for(var/datum/manipulator_priority/pr_pick in point.interaction_priorities) - var/list/entry_pick = list() - entry_pick["name"] = pr_pick.name - entry_pick["active"] = pr_pick.active - settings_list_pick += list(entry_pick) - point_data["settings_list"] = settings_list_pick - pickup_points_data += list(point_data) - data["pickup_points"] = pickup_points_data + if(istype(task, /datum/manipulator_task/cargo/pickup)) + td["task_type"] = TASK_TYPE_PICKUP + var/datum/manipulator_task/cargo/pickup/t = task + td["turf"] = "[t.offset_dx],[t.offset_dy]" + td["filters_status"] = t.should_use_filters + td["filtering_mode"] = t.filtering_mode + td["item_filters"] = _collect_filter_names(t.atom_filters) + td["settings_list"] = _collect_priorities(t.interaction_priorities) + td["pickup_eagerness"] = t.pickup_eagerness - var/list/dropoff_points_data = list() - for(var/datum/interaction_point/point in dropoff_points) - var/list/point_data = list() - point_data["name"] = point.name - point_data["id"] = REF(point) - var/turf/resolved_turf = point.interaction_turf - point_data["turf"] = resolved_turf ? "[resolved_turf.x],[resolved_turf.y]" : "0,0" - point_data["mode"] = point.interaction_mode - var/list/filter_names = list() - for(var/obj/item/some_path as anything in point.atom_filters) - filter_names += some_path::name - point_data["item_filters"] = filter_names - point_data["filters_status"] = point.should_use_filters - point_data["filtering_mode"] = point.filtering_mode - point_data["worker_interaction"] = point.worker_interaction - point_data["overflow_status"] = point.overflow_status - point_data["worker_use_rmb"] = point.worker_use_rmb - point_data["worker_combat_mode"] = point.worker_combat_mode - point_data["throw_range"] = point.throw_range - point_data["use_post_interaction"] = point.use_post_interaction + else if(istype(task, /datum/manipulator_task/cargo/dropoff_base/drop)) + td["task_type"] = TASK_TYPE_DROP + var/datum/manipulator_task/cargo/dropoff_base/drop/t = task + td["turf"] = "[t.offset_dx],[t.offset_dy]" + td["filters_status"] = t.should_use_filters + td["filtering_mode"] = t.filtering_mode + td["item_filters"] = _collect_filter_names(t.atom_filters) + td["settings_list"] = _collect_priorities(t.interaction_priorities) + td["overflow_status"] = t.overflow_status - var/list/settings_list_drop = list() - for(var/datum/manipulator_priority/pr_drop in point.interaction_priorities) - var/list/entry_drop = list() - entry_drop["name"] = pr_drop.name - entry_drop["active"] = pr_drop.active - settings_list_drop += list(entry_drop) - point_data["settings_list"] = settings_list_drop - dropoff_points_data += list(point_data) - data["dropoff_points"] = dropoff_points_data + else if(istype(task, /datum/manipulator_task/cargo/dropoff_base/throw)) + td["task_type"] = TASK_TYPE_THROW + var/datum/manipulator_task/cargo/dropoff_base/throw/t = task + td["turf"] = "[t.offset_dx],[t.offset_dy]" + td["filters_status"] = t.should_use_filters + td["filtering_mode"] = t.filtering_mode + td["item_filters"] = _collect_filter_names(t.atom_filters) + td["settings_list"] = _collect_priorities(t.interaction_priorities) + td["throw_range"] = t.throw_range + else if(istype(task, /datum/manipulator_task/cargo/dropoff_base/use)) + td["task_type"] = TASK_TYPE_USE + var/datum/manipulator_task/cargo/dropoff_base/use/t = task + td["turf"] = "[t.offset_dx],[t.offset_dy]" + td["filters_status"] = t.should_use_filters + td["filtering_mode"] = t.filtering_mode + td["item_filters"] = _collect_filter_names(t.atom_filters) + td["settings_list"] = _collect_priorities(t.interaction_priorities) + td["worker_interaction"] = t.worker_interaction + td["use_post_interaction"] = t.use_post_interaction + td["worker_use_rmb"] = t.worker_use_rmb + td["worker_combat_mode"] = t.worker_combat_mode + + else if(istype(task, /datum/manipulator_task/cargo/interact)) + td["task_type"] = TASK_TYPE_INTERACT + var/datum/manipulator_task/cargo/interact/t = task + td["turf"] = "[t.offset_dx],[t.offset_dy]" + td["filters_status"] = t.should_use_filters + td["filtering_mode"] = t.filtering_mode + td["item_filters"] = _collect_filter_names(t.atom_filters) + td["settings_list"] = _collect_priorities(t.interaction_priorities) + td["worker_interaction"] = t.worker_interaction + td["use_post_interaction"] = t.use_post_interaction + td["worker_use_rmb"] = t.worker_use_rmb + td["worker_combat_mode"] = t.worker_combat_mode + + else if(istype(task, /datum/manipulator_task/simple/wait)) + td["task_type"] = TASK_TYPE_WAIT + var/datum/manipulator_task/simple/wait/t = task + td["time"] = t.time_seconds + + tasks_data += list(td) + + data["tasks_data"] = tasks_data return data +/obj/machinery/big_manipulator/proc/_collect_filter_names(list/filters) + var/list/names = list() + for(var/atom/f as anything in filters) + names += initial(f.name) + return names + +/obj/machinery/big_manipulator/proc/_collect_priorities(list/priorities) + var/list/out = list() + for(var/datum/manipulator_priority/pr in priorities) + var/list/entry = list() + entry["name"] = pr.name + entry["active"] = pr.active + out += list(entry) + return out + /obj/machinery/big_manipulator/ui_act(action, params, datum/tgui/ui) . = ..() if(.) @@ -644,41 +560,29 @@ drop_held_atom() return TRUE - if("create_pickup_point") - create_new_interaction_point(ui.user, null, list(), FALSE, null, TRANSFER_TYPE_PICKUP) + if("create_task") + create_new_task(ui.user, params["task_type"]) + maybe_wake() return TRUE - if("create_dropoff_point") - create_new_interaction_point(ui.user, null, list(), FALSE, INTERACT_DROP, TRANSFER_TYPE_DROPOFF) + if("reset_tasking_index") + master_tasking.current_index = 1 + balloon_alert(ui.user, "tasking index reset") + maybe_wake() return TRUE - if("reset_tasking_Pickup Points") - pickup_strategy.current_index = 1 - balloon_alert(ui.user, "index reset") - return TRUE - - if("reset_tasking_Dropoff Points") - dropoff_strategy.current_index = 1 - balloon_alert(ui.user, "index reset") - return TRUE - - if("cycle_tasking_schedule") - var/new_schedule = params["new_schedule"] - - if(new_schedule in list(TASKING_ROUND_ROBIN, TASKING_STRICT_ROBIN, TASKING_PREFER_FIRST)) - var/is_pickup = params["is_pickup"] - if(is_pickup) - pickup_tasking = new_schedule - else - dropoff_tasking = new_schedule + if("cycle_tasking_strategy") + var/new_strategy = params["new_strategy"] + if(new_strategy in list(TASKING_SEQUENTIAL, TASKING_STRICT)) + tasking_strategy = new_strategy update_strategies() + maybe_wake() return TRUE if("adjust_interaction_speed") var/new_speed = text2num(params["new_speed"]) if(isnull(new_speed)) return FALSE - speed_multiplier = clamp(new_speed, min_speed_multiplier, max_speed_multiplier) return TRUE @@ -687,163 +591,331 @@ monkey_worker = null return TRUE - if("adjust_point_param") - return adjust_param_for_point(params["pointId"], params["param"], params["value"], ui.user) + if("adjust_task_param") + var/success = adjust_param_for_task(params["taskId"], params["param"], params["value"], ui.user) + if(success) + maybe_wake() + return success -/obj/machinery/big_manipulator/proc/adjust_param_for_point(point_ref, param, value, mob/user) - if(!param) // there may be no value if we're resetting stuff + if("disk_eject") + return eject_task_disk(ui.user) + + if("disk_read") + if(read_disk_tasks(ui.user)) + maybe_wake() + return TRUE + + if("disk_write") + return write_disk_tasks(ui.user) + + if("disk_clear") + return clear_disk_tasks(ui.user) + + +/obj/machinery/big_manipulator/proc/eject_task_disk(mob/user) + if(on || stopping) + balloon_alert(user, "turn it off first!") + return FALSE + if(!task_disk) + return FALSE + var/obj/item/disk/manipulator/ejectable_disk = task_disk + task_disk = null + if(istype(user) && user.put_in_hands(ejectable_disk)) + balloon_alert(user, "disk ejected") + else + ejectable_disk.forceMove(drop_location()) + balloon_alert(user, "disk dropped") + SStgui.update_uis(src) + return TRUE + +/obj/machinery/big_manipulator/proc/clear_disk_tasks(mob/user) + if(on || stopping) + balloon_alert(user, "turn it off first!") + return FALSE + if(!task_disk) + return FALSE + if(task_disk.read_only) + balloon_alert(user, "disk protected") + return FALSE + task_disk.set_tasks(list()) + balloon_alert(user, "cleared") + SStgui.update_uis(src) + return TRUE + +/obj/machinery/big_manipulator/proc/write_disk_tasks(mob/user) + if(on || stopping) + balloon_alert(user, "turn it off first!") + return FALSE + if(!task_disk) + return FALSE + if(task_disk.read_only) + balloon_alert(user, "disk protected") return FALSE - var/datum/interaction_point/target_point = locate(point_ref) in (pickup_points + dropoff_points) - if(!target_point) + var/list/out = list() + for(var/datum/manipulator_task/task as anything in tasks) + out += list(task.serialize()) + + task_disk.set_tasks(out) + balloon_alert(user, "written") + SStgui.update_uis(src) + return TRUE + +/obj/machinery/big_manipulator/proc/read_disk_tasks(mob/user) + if(on || stopping) + balloon_alert(user, "turn it off first!") + return FALSE + if(!task_disk) + return FALSE + + QDEL_LIST(tasks) + tasks = list() + current_task = null + + var/turf/base = get_turf(src) + var/datum/stock_part/servo/locate_servo = locate() in component_parts + var/manipulator_tier = locate_servo ? locate_servo.tier : 1 + + for(var/list/task_data as anything in task_disk.tasks_data) + if(length(tasks) >= interaction_point_limit) + break + if(!islist(task_data)) + continue + var/task_type = task_data["type"] + if(!ispath(task_type, /datum/manipulator_task)) + continue + var/datum/manipulator_task/new_task + if(ispath(task_type, /datum/manipulator_task/cargo)) + if(!base) + continue + var/list/offset = task_data["offset"] + if(!islist(offset)) + continue + var/dx = offset["dx"] + var/dy = offset["dy"] + if(!isnum(dx) || !isnum(dy)) + continue + if(dx < -1 || dx > 1 || dy < -1 || dy > 1) + continue + if(dx == 0 && dy == 0) + continue + var/turf/target_turf = locate(base.x + dx, base.y + dy, base.z) + if(!target_turf || isclosedturf(target_turf)) + continue + new_task = new task_type(target_turf, manipulator_tier, serialized_data = task_data) + if(istype(new_task, /datum/manipulator_task/cargo)) + var/datum/manipulator_task/cargo/c = new_task + c.offset_dx = dx + c.offset_dy = dy + else + new_task = new task_type(serialized_data = task_data) + if(!new_task || QDELETED(new_task)) + continue + tasks += new_task + + process_upgrades() + validate_all_tasks() + balloon_alert(user, "loaded") + SStgui.update_uis(src) + return TRUE + +/obj/machinery/big_manipulator/proc/adjust_param_for_task(task_ref, param, value, mob/user) + if(!param) + return FALSE + + var/datum/manipulator_task/target_task = locate(task_ref) in tasks + if(!target_task) return FALSE switch(param) if("set_name") - target_point.name = sanitize_name(value, allow_numbers = TRUE) - return TRUE - - if("toggle_priority") - return target_point.tick_priority_by_index(value) - - if("remove_point") - pickup_points.Remove(target_point) - dropoff_points.Remove(target_point) // one'll hit for sure - update_hud() - qdel(target_point) - return TRUE - - if("reset_atom_filters") - target_point.atom_filters = list() - return TRUE - - if("cycle_dropoff_point_interaction") - target_point.interaction_mode = cycle_value(target_point.interaction_mode, monkey_worker ? list(INTERACT_DROP, INTERACT_THROW, INTERACT_USE) : list(INTERACT_DROP, INTERACT_THROW)) - var/datum/stock_part/servo/locate_servo = locate() in component_parts - var/manipulator_tier = locate_servo ? locate_servo.tier : 1 - target_point.interaction_priorities = target_point.fill_priority_list(manipulator_tier) - return TRUE - - if("toggle_filter_skip") - target_point.should_use_filters = !target_point.should_use_filters - return TRUE - - if("cycle_pickup_point_type") - target_point.filtering_mode = cycle_value(target_point.filtering_mode, obj_flags & EMAGGED ? list(TAKE_ITEMS, TAKE_CLOSETS, TAKE_HUMANS) : list(TAKE_ITEMS, TAKE_CLOSETS)) - return TRUE - - if("cycle_worker_interaction") - target_point.worker_interaction = cycle_value(target_point.worker_interaction, list(WORKER_NORMAL_USE, WORKER_SINGLE_USE, WORKER_EMPTY_USE)) - return TRUE - - if("cycle_overflow_status") - target_point.overflow_status = cycle_value(target_point.overflow_status, list(POINT_OVERFLOW_ALLOWED, POINT_OVERFLOW_FILTERS, POINT_OVERFLOW_HELD, POINT_OVERFLOW_FORBIDDEN)) - return TRUE - - if("cycle_throw_range") - target_point.throw_range = cycle_value(target_point.throw_range, list(1, 2, 3, 4, 5, 6, 7)) - return TRUE - - if("cycle_post_interaction") - target_point.use_post_interaction = cycle_value(target_point.use_post_interaction, list(POST_INTERACTION_DROP_AT_POINT, POST_INTERACTION_DROP_AT_MACHINE, POST_INTERACTION_DROP_NEXT_FITTING, POST_INTERACTION_WAIT)) - return TRUE - - if("add_atom_filter_from_held") - var/obj/item/held_item = user.get_active_held_item() - - if(!held_item) + if(!value) return FALSE - - for(var/filter_path in target_point.atom_filters) - if(istype(held_item, filter_path)) - return FALSE - - target_point.atom_filters += held_item.type + target_task.name = sanitize_name(value, allow_numbers = TRUE) return TRUE - if("delete_filter") - target_point.atom_filters.Cut(value, value + 1) + if("set_wait_time") + if(!istype(target_task, /datum/manipulator_task/simple/wait)) + return FALSE + var/datum/manipulator_task/simple/wait/t = target_task + t.time_seconds = clamp(text2num(value), 1, 60) return TRUE - if("toggle_worker_rmb") - target_point.worker_use_rmb = !target_point.worker_use_rmb + if("remove_task") + tasks.Remove(target_task) + qdel(target_task) return TRUE - if("toggle_worker_combat") - target_point.worker_combat_mode = !target_point.worker_combat_mode + if("move_up") + var/idx = tasks.Find(target_task) + if(idx <= 1) + return FALSE + tasks.Swap(idx, idx - 1) return TRUE - if("priority_move_up") - return target_point.move_priority_up_by_index(value) + if("move_down") + var/idx = tasks.Find(target_task) + if(idx >= length(tasks)) + return FALSE + tasks.Swap(idx, idx + 1) + return TRUE if("move_to") + if(!istype(target_task, /datum/manipulator_task/cargo)) + return FALSE + var/datum/manipulator_task/cargo/cargo_task = target_task var/button_number = text2num(value["buttonNumber"]) - + if(button_number < 1 || button_number > 9) + return var/dx = ((button_number - 1) % 3) - 1 var/dy = 1 - round((button_number - 1) / 3) - var/turf/new_turf = locate(x + dx, y + dy, z) if(!new_turf || isclosedturf(new_turf)) return FALSE - - target_point.interaction_turf = new_turf - update_hud() + cargo_task.interaction_turf = new_turf + cargo_task.offset_dx = dx + cargo_task.offset_dy = dy return TRUE -/// Cycles the given value in the given list. Retuns the next value in the list, or the first one if the list isn't long enough. + if("toggle_filter_skip") + if(!istype(target_task, /datum/manipulator_task/cargo)) + return FALSE + var/datum/manipulator_task/cargo/ct = target_task + ct.should_use_filters = !ct.should_use_filters + return TRUE + + if("reset_atom_filters") + if(!istype(target_task, /datum/manipulator_task/cargo)) + return FALSE + var/datum/manipulator_task/cargo/ct = target_task + ct.atom_filters = list() + return TRUE + + if("add_atom_filter_from_held") + if(!istype(target_task, /datum/manipulator_task/cargo)) + return FALSE + var/datum/manipulator_task/cargo/ct = target_task + var/obj/item/held_item = user.get_active_held_item() + if(!held_item) + return FALSE + for(var/filter_path in ct.atom_filters) + if(istype(held_item, filter_path)) + return FALSE + ct.atom_filters += held_item.type + return TRUE + + if("delete_filter") + if(!istype(target_task, /datum/manipulator_task/cargo)) + return FALSE + var/datum/manipulator_task/cargo/ct = target_task + ct.atom_filters.Cut(value, value + 1) + return TRUE + + if("cycle_filtering_mode") + if(!istype(target_task, /datum/manipulator_task/cargo)) + return FALSE + var/datum/manipulator_task/cargo/ct = target_task + ct.filtering_mode = cycle_value(ct.filtering_mode, obj_flags & EMAGGED ? list(TAKE_ITEMS, TAKE_CLOSETS, TAKE_HUMANS) : list(TAKE_ITEMS, TAKE_CLOSETS)) + return TRUE + + if("toggle_priority") + if(!istype(target_task, /datum/manipulator_task/cargo)) + return FALSE + var/datum/manipulator_task/cargo/current_task = target_task + return current_task.tick_priority_by_index(value) + + if("priority_move_up") + if(!istype(target_task, /datum/manipulator_task/cargo)) + return FALSE + var/datum/manipulator_task/cargo/current_task = target_task + return current_task.move_priority_up_by_index(value) + + if("cycle_pickup_eagerness") + if(!istype(target_task, /datum/manipulator_task/cargo/pickup)) + return FALSE + var/datum/manipulator_task/cargo/pickup/cycle_target_task = target_task + cycle_target_task.pickup_eagerness = cycle_value(cycle_target_task.pickup_eagerness, list(PICKUP_CAN_WAIT, PICKUP_EAGER)) + return TRUE + + if("cycle_overflow_status") + if(!istype(target_task, /datum/manipulator_task/cargo/dropoff_base/drop)) + return FALSE + var/datum/manipulator_task/cargo/dropoff_base/drop/cycle_target_task = target_task + cycle_target_task.overflow_status = cycle_value(cycle_target_task.overflow_status, list(POINT_OVERFLOW_ALLOWED, POINT_OVERFLOW_FILTERS, POINT_OVERFLOW_HELD, POINT_OVERFLOW_FORBIDDEN)) + return TRUE + + if("cycle_throw_range") + if(!istype(target_task, /datum/manipulator_task/cargo/dropoff_base/throw)) + return FALSE + var/datum/manipulator_task/cargo/dropoff_base/throw/cycle_target_task = target_task + cycle_target_task.throw_range = cycle_value(cycle_target_task.throw_range, list(1, 2, 3, 4, 5, 6, 7)) + return TRUE + + if("cycle_worker_interaction") + var/list/vals = list(WORKER_NORMAL_USE, WORKER_SINGLE_USE, WORKER_EMPTY_USE) + if(istype(target_task, /datum/manipulator_task/cargo/dropoff_base/use)) + var/datum/manipulator_task/cargo/dropoff_base/use/cycle_target_task = target_task + cycle_target_task.worker_interaction = cycle_value(cycle_target_task.worker_interaction, vals) + return TRUE + if(istype(target_task, /datum/manipulator_task/cargo/interact)) + var/datum/manipulator_task/cargo/interact/cycle_target_task = target_task + cycle_target_task.worker_interaction = cycle_value(cycle_target_task.worker_interaction, vals) + return TRUE + return FALSE + + if("cycle_post_interaction") + var/list/vals = list(POST_INTERACTION_DROP_AT_POINT, POST_INTERACTION_DROP_AT_MACHINE, POST_INTERACTION_DROP_NEXT_FITTING, POST_INTERACTION_WAIT) + if(istype(target_task, /datum/manipulator_task/cargo/dropoff_base/use)) + var/datum/manipulator_task/cargo/dropoff_base/use/cycle_target_task = target_task + cycle_target_task.use_post_interaction = cycle_value(cycle_target_task.use_post_interaction, vals) + return TRUE + if(istype(target_task, /datum/manipulator_task/cargo/interact)) + var/datum/manipulator_task/cargo/interact/cycle_target_task = target_task + cycle_target_task.use_post_interaction = cycle_value(cycle_target_task.use_post_interaction, vals) + return TRUE + return FALSE + + if("toggle_worker_rmb") + if(istype(target_task, /datum/manipulator_task/cargo/dropoff_base/use)) + var/datum/manipulator_task/cargo/dropoff_base/use/cycle_target_task = target_task + cycle_target_task.worker_use_rmb = !cycle_target_task.worker_use_rmb + return TRUE + if(istype(target_task, /datum/manipulator_task/cargo/interact)) + var/datum/manipulator_task/cargo/interact/cycle_target_task = target_task + cycle_target_task.worker_use_rmb = !cycle_target_task.worker_use_rmb + return TRUE + return FALSE + + if("toggle_worker_combat") + if(istype(target_task, /datum/manipulator_task/cargo/dropoff_base/use)) + var/datum/manipulator_task/cargo/dropoff_base/use/cycle_target_task = target_task + cycle_target_task.worker_combat_mode = !cycle_target_task.worker_combat_mode + return TRUE + if(istype(target_task, /datum/manipulator_task/cargo/interact)) + var/datum/manipulator_task/cargo/interact/cycle_target_task = target_task + cycle_target_task.worker_combat_mode = !cycle_target_task.worker_combat_mode + return TRUE + return FALSE + +/// Cycles the given value in the given list. /obj/machinery/big_manipulator/proc/cycle_value(current_value, list/possible_values) var/current_index = possible_values.Find(current_value) if(current_index == 0) return possible_values[1] + return possible_values[(current_index % length(possible_values)) + 1] - var/next_index = (current_index % length(possible_values)) + 1 - return possible_values[next_index] - -/// Begins a new task with the specified type and duration -/obj/machinery/big_manipulator/proc/start_task(task_type, duration) - if(current_task == CURRENT_TASK_STOPPING) - return - - end_current_task() // ends any previous task first (momentarily sets IDLE) - current_task_start_time = world.time - current_task_duration = duration - current_task = task_type - SStgui.update_uis(src) - -/// Ends the current task -/obj/machinery/big_manipulator/proc/end_current_task() - current_task_start_time = 0 - current_task_duration = 0 - if(current_task == CURRENT_TASK_STOPPING) - current_task = CURRENT_TASK_NONE - SStgui.update_uis(src) // Update UI immediately - -/// Completes the stopping task and transitions to TASK_NONE -/obj/machinery/big_manipulator/proc/complete_stopping_task() - on = FALSE - next_cycle_scheduled = FALSE - end_current_task() - SStgui.update_uis(src) - -/obj/machinery/big_manipulator/proc/remove_all_huds() - var/image/main_hud = hud_list[BIG_MANIP_HUD] - if(main_hud) - main_hud.overlays.Cut() - main_hud.loc = null - - hud_points.Cut() - set_hud_image_inactive(BIG_MANIP_HUD) +/// Retries the task loop if we're waiting for a signal and the machine is on. +/obj/machinery/big_manipulator/proc/maybe_wake() + if(on && !stopping && waiting_for_signal) + something_happened() /obj/machinery/big_manipulator/proc/update_strategies() - pickup_strategy = create_strategy(pickup_tasking) - dropoff_strategy = create_strategy(dropoff_tasking) + master_tasking = create_strategy(tasking_strategy) -/obj/machinery/big_manipulator/proc/create_strategy(tasking_mode) - switch(tasking_mode) - if(TASKING_PREFER_FIRST) - return new /datum/tasking_strategy/prefer_first() - if(TASKING_ROUND_ROBIN) - return new /datum/tasking_strategy/round_robin() - if(TASKING_STRICT_ROBIN) - return new /datum/tasking_strategy/strict_robin() - return new /datum/tasking_strategy/prefer_first() +/obj/machinery/big_manipulator/proc/create_strategy(strategy_mode) + switch(strategy_mode) + if(TASKING_SEQUENTIAL) + return new /datum/tasking_strategy/sequential() + if(TASKING_STRICT) + return new /datum/tasking_strategy/strict() + return new /datum/tasking_strategy/sequential() diff --git a/code/game/machinery/big_manipulator/big_manipulator_interactions.dm b/code/game/machinery/big_manipulator/big_manipulator_interactions.dm index 900f659c5ac..01500efdd5a 100644 --- a/code/game/machinery/big_manipulator/big_manipulator_interactions.dm +++ b/code/game/machinery/big_manipulator/big_manipulator_interactions.dm @@ -1,55 +1,42 @@ -/// Selects which atom to pick up from this point for interaction with available dropoff points based on the dropoff points. -/obj/machinery/big_manipulator/proc/find_pickup_candidate_for_pickup_point(datum/interaction_point/pickup_point) - if(!pickup_point) - return null +/// We have no tasks to execute for some reason. Waits for a turf signal to retry. +/obj/machinery/big_manipulator/proc/nothing_ever_happens() + if(stopping) + complete_stopping_task() + return FALSE - var/turf/pickup_turf = pickup_point.interaction_turf - if(!pickup_turf) - return null + current_task = null + waiting_for_signal = TRUE + register_task_turf_signals() - var/list/candidates = list() - for(var/atom/movable/candidate as anything in pickup_turf.contents) - if(candidate.anchored || HAS_TRAIT(candidate, TRAIT_NODROP) || move_resist > MOVE_FORCE_STRONG) - continue + return FALSE - if(!pickup_point.check_filters_for_atom(candidate)) - continue +/// A signal ran or some settings changed; checking if we can run the tasks now. +/obj/machinery/big_manipulator/proc/something_happened() + next_cycle_scheduled = FALSE + step_tasks() - for(var/datum/interaction_point/dest_point as anything in dropoff_points) - if(!dest_point || !dest_point.is_valid()) - continue - if(!dest_point.check_filters_for_atom(candidate)) - continue - if(dest_point.is_available(TRANSFER_TYPE_DROPOFF, candidate)) - candidates += candidate - break - - if(!length(candidates)) - return null - - return pickup_strategy.get_next_candidate(candidates) - -/// Calculates the next interaction point the manipulator should transfer the item to or pick up it from. -/obj/machinery/big_manipulator/proc/find_next_point(transfer_type) - if(!transfer_type) - return NONE - - var/atom/movable/target = held_object?.resolve() - if(isnull(target) && transfer_type == TRANSFER_TYPE_DROPOFF) - return NONE - - var/list/interaction_points = transfer_type == TRANSFER_TYPE_DROPOFF ? dropoff_points : pickup_points - if(!length(interaction_points)) - return NONE - - var/datum/tasking_strategy/strategy = transfer_type == TRANSFER_TYPE_DROPOFF ? dropoff_strategy : pickup_strategy - var/datum/callback/availability_callback = transfer_type == TRANSFER_TYPE_DROPOFF ? CALLBACK(src, PROC_REF(check_dropoff_availability)) : CALLBACK(src, PROC_REF(check_pickup_availability)) - - return strategy.get_next_available(interaction_points, target, transfer_type, availability_callback) +/// Runs the next task. Or doesn't. +/obj/machinery/big_manipulator/proc/step_tasks() + if(!on || stopping) + return + next_cycle_scheduled = FALSE + if(waiting_for_signal) + unregister_task_turf_signals() + waiting_for_signal = FALSE + if(!length(tasks)) + nothing_ever_happens() + return + var/datum/manipulator_task/next_task = master_tasking.get_next_task(tasks, src) + if(!next_task) + nothing_ever_happens() + return + current_task = next_task + SStgui.update_uis(src) + next_task.run_task(src) /// Attempts to launch the work cycle. Should only be ran on pressing the "Run" button. /obj/machinery/big_manipulator/proc/try_kickstart(mob/user) - if(!on || !anchored || IS_BUSY) + if(!on || !anchored || stopping || current_task != null) return FALSE if(!use_energy(active_power_usage, force = FALSE)) @@ -58,208 +45,62 @@ return FALSE next_cycle_scheduled = FALSE - run_pickup_phase() + step_tasks() -/// Safely schedules the next cycle attempt to prevent overlapping. -/obj/machinery/big_manipulator/proc/schedule_next_cycle() - if(next_cycle_scheduled || IS_STOPPING) - return - - // Allow scheduling if manipulator is idle, none, or if we have a held object (need to drop it off) - if(current_task != CURRENT_TASK_IDLE && current_task != CURRENT_TASK_NONE && !held_object) +/// Safely schedules the next step to prevent overlapping. +/obj/machinery/big_manipulator/proc/schedule_next_cycle(time_seconds = BASE_INTERACTION_TIME) + if(next_cycle_scheduled || stopping) return next_cycle_scheduled = TRUE - if(held_object) - run_dropoff_phase() - else - run_pickup_phase() + addtimer(CALLBACK(src, PROC_REF(step_tasks)), time_seconds) -/// Handles the common pattern of waiting and scheduling next cycle when no work can be done. -/obj/machinery/big_manipulator/proc/handle_no_work_available() - // If we're stopping, don't schedule next cycle - if(IS_STOPPING) - complete_stopping_task() - return FALSE - - current_task = CURRENT_TASK_IDLE - - addtimer(CALLBACK(src, PROC_REF(schedule_next_cycle)), CYCLE_SKIP_TIMEOUT) - return FALSE - -/obj/machinery/big_manipulator/proc/check_pickup_availability(datum/interaction_point/point, atom/movable/target, transfer_type) - if(!point) - return FALSE - - var/turf/pickup_turf = point.interaction_turf - if(!pickup_turf) - return FALSE - - for(var/atom/movable/candidate as anything in pickup_turf.contents) - if(!candidate.anchored && !HAS_TRAIT(candidate, TRAIT_NODROP)) - return TRUE - - return FALSE - -/obj/machinery/big_manipulator/proc/check_dropoff_availability(datum/interaction_point/point, atom/movable/target, transfer_type) - return point.is_available(transfer_type, target) - -/// Attempts to run the pickup phase. Selects the next origin point and attempts to pick up an item from it. -/obj/machinery/big_manipulator/proc/run_pickup_phase() - if(!on || IS_STOPPING) +/// Rotates the manipulator arm to face the target task's turf. +/obj/machinery/big_manipulator/proc/rotate_to_point(datum/manipulator_task/cargo/target_task, callback_object, callback) + if(stopping) return - next_cycle_scheduled = FALSE - - var/datum/interaction_point/origin_point = find_next_point(TRANSFER_TYPE_PICKUP) - - if(!origin_point) - return handle_no_work_available() - - rotate_to_point(origin_point, PROC_REF(try_interact_with_origin_point), CURRENT_TASK_MOVING_PICKUP) - return TRUE - -/// Attempts to interact with the origin point (pick up the object) -/obj/machinery/big_manipulator/proc/try_interact_with_origin_point(datum/interaction_point/origin_point, hand_is_empty = FALSE) - // If we're stopping, just finish the task and shut down - if(IS_STOPPING) - complete_stopping_task() - return - - if(!origin_point.interaction_turf) - return handle_no_work_available() - - var/atom/movable/selected = find_pickup_candidate_for_pickup_point(origin_point) // find a suitable item that matches available destinations - if(!selected) - return handle_no_work_available() - - if(selected.anchored || HAS_TRAIT(selected, TRAIT_NODROP)) - return handle_no_work_available() - - if(isitem(selected)) - var/obj/item/selected_item = selected - if(selected_item.item_flags & (ABSTRACT|DROPDEL)) - return handle_no_work_available() - - start_task(CURRENT_TASK_INTERACTING, 0.2 SECONDS) - interact_with_origin_point(selected, hand_is_empty) - return TRUE - -/// Attempts to start a work cycle (pick up the object) -/obj/machinery/big_manipulator/proc/interact_with_origin_point(atom/movable/target, hand_is_empty = FALSE) - if(!hand_is_empty) - target.forceMove(src) - held_object = WEAKREF(target) - manipulator_arm.update_claw(held_object) - - // Schedule the dropoff phase after a successful pickup to avoid overlapping tasks - if(!hand_is_empty) - schedule_next_cycle() - -/obj/machinery/big_manipulator/proc/run_dropoff_phase() - // Find the next available destination point that can accept the held item - var/datum/interaction_point/destination_point = find_next_point(TRANSFER_TYPE_DROPOFF) - - next_cycle_scheduled = FALSE - - if(!destination_point) - return handle_no_work_available() - - rotate_to_point(destination_point, PROC_REF(try_interact_with_destination_point), CURRENT_TASK_MOVING_DROPOFF) - return TRUE - -/// Attempts to interact with the destination point (drop/use/throw the object) -/obj/machinery/big_manipulator/proc/try_interact_with_destination_point(datum/interaction_point/destination_point, hand_is_empty = FALSE) - // If we're stopping, just finish the task and shut down - if(IS_STOPPING) - complete_stopping_task() + if(!target_task) return FALSE - start_task(CURRENT_TASK_INTERACTING, 0.2 SECONDS) - - if(hand_is_empty) - use_thing_with_empty_hand(destination_point) - return TRUE - - var/obj/actual_held_object = held_object?.resolve() - if(actual_held_object.loc != src) - handle_no_work_available() - return FALSE - - switch(destination_point.interaction_mode) - if(INTERACT_DROP) - try_drop_thing(destination_point) - if(INTERACT_USE) - try_use_thing(destination_point) - if(INTERACT_THROW) - throw_thing(destination_point) - - return TRUE - -/// Rotates the manipulator arm to face the target point. -/obj/machinery/big_manipulator/proc/rotate_to_point(datum/interaction_point/target_point, callback, type) - if(IS_STOPPING) - return - - if(!target_point) - return FALSE - - var/target_dir = get_dir(get_turf(src), target_point.interaction_turf) + var/target_dir = get_dir(get_turf(src), target_task.interaction_turf) var/target_angle = dir2angle(target_dir) var/current_angle = manipulator_arm.transform.get_angle() var/angle_diff = closer_angle_difference(current_angle, target_angle) var/num_rotations = round(abs(angle_diff) / 45) - var/total_rotation_time = num_rotations * BASE_INTERACTION_TIME / speed_multiplier - start_task(type == CURRENT_TASK_MOVING_PICKUP ? CURRENT_TASK_MOVING_PICKUP : CURRENT_TASK_MOVING_DROPOFF, total_rotation_time) - - // If the next point is on the same tile, we don't need to rotate at all if(!num_rotations) - addtimer(CALLBACK(src, callback, target_point), BASE_INTERACTION_TIME) + var/datum/callback/cb = CALLBACK(callback_object, callback, src) + cb.Invoke() return TRUE - // Breaking the angle up into 45 degree steps var/rotation_step = 45 * sign(angle_diff) - do_step_rotation(target_point, callback, current_angle, target_angle, rotation_step, 0, total_rotation_time) - + do_step_rotation(target_task, callback_object, callback, current_angle, target_angle, rotation_step) return TRUE /// Does a 45 degree step, animating the claw -/obj/machinery/big_manipulator/proc/do_step_rotation(datum/interaction_point/target_point, callback, current_angle, target_angle, rotation_step, elapsed_time, total_time) - if(IS_STOPPING) +/obj/machinery/big_manipulator/proc/do_step_rotation(datum/manipulator_task/cargo/target_task, callback_object, callback, current_angle, target_angle, rotation_step) + if(stopping) return - // Just making sure we're not there already var/angle_diff = closer_angle_difference(current_angle, target_angle) if(abs(angle_diff) < abs(rotation_step)) - // If this is the last step, doing a precise degree turn var/matrix/final_matrix = matrix() final_matrix.Turn(target_angle) animate(manipulator_arm, transform = final_matrix, time = BASE_INTERACTION_TIME / speed_multiplier) - addtimer(CALLBACK(src, callback, target_point), BASE_INTERACTION_TIME / speed_multiplier) + addtimer(CALLBACK(callback_object, callback, src), BASE_INTERACTION_TIME / speed_multiplier) return - // Animating a single rotation step - - // YES, this has to be done like that because byond or whatever is stupid and `animate`ing a 180+ degree turn - // fucking fails and squashes the icon vertically (or horizontally, whichever it feels like) instead - var/next_angle = current_angle + rotation_step var/matrix/next_matrix = matrix() next_matrix.Turn(next_angle) animate(manipulator_arm, transform = next_matrix, time = BASE_INTERACTION_TIME / speed_multiplier) - // Recursively planning the next step (yay recursion :yuppie: call me a madman I LOVE recursion) - elapsed_time += BASE_INTERACTION_TIME / speed_multiplier - addtimer(CALLBACK(src, PROC_REF(do_step_rotation), target_point, callback, next_angle, target_angle, rotation_step, elapsed_time, total_time), BASE_INTERACTION_TIME / speed_multiplier) + addtimer(CALLBACK(src, PROC_REF(do_step_rotation), target_task, callback_object, callback, next_angle, target_angle, rotation_step), BASE_INTERACTION_TIME / speed_multiplier) -/// Moves the item onto the turf. -/// -/// If the turf has an atom with fitting `atom_storage` that corresponds to the -/// priority settings, it will attempt to insert the held item. -/obj/machinery/big_manipulator/proc/try_drop_thing(datum/interaction_point/destination_point) - var/drop_endpoint = destination_point.find_type_priority() +/obj/machinery/big_manipulator/proc/try_drop_thing(datum/manipulator_task/cargo/dropoff_base/drop/destination_task) + var/drop_endpoint = destination_task.find_type_priority() var/obj/actual_held_object = held_object?.resolve() if(isnull(drop_endpoint)) @@ -268,46 +109,42 @@ var/atom/drop_target = drop_endpoint if(drop_target.atom_storage && actual_held_object && (!drop_target.atom_storage.attempt_insert(actual_held_object, override = TRUE, messages = FALSE))) actual_held_object.forceMove(drop_target.drop_location()) - finish_manipulation(TRANSFER_TYPE_DROPOFF) + finish_manipulation() return TRUE actual_held_object?.forceMove(drop_endpoint) - finish_manipulation(TRANSFER_TYPE_DROPOFF) + finish_manipulation() return TRUE -/// Attempts to use the held object on the atoms of the interaction turf. -/// -/// If the interaction turf has an atom that corresponds to the priority settings, -/// it will attempt to use the held item. If it doesn't, it will simply drop the item. -/obj/machinery/big_manipulator/proc/try_use_thing(datum/interaction_point/destination_point, work_done_at_point = FALSE) - if(IS_STOPPING) +/obj/machinery/big_manipulator/proc/try_use_thing(datum/manipulator_task/cargo/interact/destination_task, work_done_at_point = FALSE) + if(stopping) return var/obj/obj_resolve = held_object?.resolve() var/mob/living/carbon/human/species/monkey/monkey_resolve = monkey_worker?.resolve() - var/destination_turf = destination_point.interaction_turf + var/destination_turf = destination_task.interaction_turf if(!obj_resolve || QDELETED(obj_resolve) || obj_resolve.loc != src) - finish_manipulation(TRANSFER_TYPE_DROPOFF) + finish_manipulation() return FALSE if(!monkey_resolve || !destination_turf) - finish_manipulation(TRANSFER_TYPE_DROPOFF) + finish_manipulation() return FALSE - if(!(monkey_resolve.loc == src)) - finish_manipulation(TRANSFER_TYPE_DROPOFF) + if(monkey_resolve.loc != src) + finish_manipulation() return FALSE var/obj/item/held_item = obj_resolve - var/atom/type_to_use = destination_point.find_type_priority() + var/atom/type_to_use = destination_task.find_type_priority() if(isnull(type_to_use)) - check_for_cycle_end_drop(destination_point, FALSE, work_done_at_point) + check_for_cycle_end_drop(destination_task, FALSE, work_done_at_point) return FALSE - if(isitem(type_to_use) && !destination_point.check_filters_for_atom(type_to_use)) - check_for_cycle_end_drop(destination_point, FALSE, work_done_at_point) + if(isitem(type_to_use) && !destination_task.check_filters_for_atom(type_to_use)) + check_for_cycle_end_drop(destination_task, FALSE, work_done_at_point) return FALSE var/original_loc = held_item.loc @@ -316,109 +153,99 @@ if(held_item.GetComponent(/datum/component/two_handed)) held_item.attack_self(monkey_resolve) - var/use_rmb = destination_point.worker_use_rmb - var/use_combat = destination_point.worker_combat_mode - - monkey_resolve.combat_mode = use_combat - held_item.melee_attack_chain(monkey_resolve, type_to_use, list(RIGHT_CLICK = use_rmb ? TRUE : FALSE)) + monkey_resolve.combat_mode = destination_task.worker_combat_mode + held_item.melee_attack_chain(monkey_resolve, type_to_use, list(RIGHT_CLICK = destination_task.worker_use_rmb ? TRUE : FALSE)) monkey_resolve.combat_mode = FALSE do_attack_animation(destination_turf) manipulator_arm.do_attack_animation(destination_turf) - // if we destroyed the item while using it OR something else uncanny happened to it and it's GONE if(QDELETED(held_item) || !held_item || (held_item.loc != monkey_resolve && held_item.loc != original_loc)) held_object = null manipulator_arm.update_claw(null) - finish_manipulation(TRANSFER_TYPE_DROPOFF) + finish_manipulation() return TRUE if(held_item.loc == monkey_resolve) held_item.forceMove(original_loc) - check_for_cycle_end_drop(destination_point, TRUE, TRUE) + check_for_cycle_end_drop(destination_task, TRUE, TRUE) -/// Checks what should we do with the `held_object` after `USE`-ing it. -/obj/machinery/big_manipulator/proc/check_for_cycle_end_drop(datum/interaction_point/drop_point, item_used_this_iteration, work_done_at_point = FALSE) +/obj/machinery/big_manipulator/proc/check_for_cycle_end_drop(datum/manipulator_task/cargo/interact/destination_task, item_used_this_iteration, work_done_at_point = FALSE) var/obj/obj_resolve = held_object?.resolve() - var/turf/drop_turf = drop_point.interaction_turf + var/turf/drop_turf = destination_task.interaction_turf if(!obj_resolve || obj_resolve.loc != src || QDELETED(obj_resolve)) - finish_manipulation(TRANSFER_TYPE_DROPOFF) + finish_manipulation() return - if(drop_point.worker_interaction == WORKER_SINGLE_USE && item_used_this_iteration) + if(destination_task.worker_interaction == WORKER_SINGLE_USE && item_used_this_iteration) obj_resolve.forceMove(drop_turf) obj_resolve.dir = get_dir(get_turf(obj_resolve), get_turf(src)) - finish_manipulation(TRANSFER_TYPE_DROPOFF) + finish_manipulation() return - if(!on || drop_point.interaction_mode != INTERACT_USE) - finish_manipulation(TRANSFER_TYPE_DROPOFF) + if(!on) + finish_manipulation() return if(item_used_this_iteration) - addtimer(CALLBACK(src, PROC_REF(try_use_thing), drop_point, TRUE), BASE_INTERACTION_TIME * 2) + addtimer(CALLBACK(src, PROC_REF(try_use_thing), destination_task, TRUE), BASE_INTERACTION_TIME * 2) return - switch(drop_point.use_post_interaction) + drop_held_after_use(destination_task) + +/obj/machinery/big_manipulator/proc/drop_held_after_use(datum/manipulator_task/cargo/interact/destination_task) + var/obj/obj_resolve = held_object?.resolve() + var/turf/drop_turf = destination_task.interaction_turf + + switch(destination_task.use_post_interaction) if(POST_INTERACTION_DROP_AT_POINT) obj_resolve.forceMove(drop_turf) obj_resolve.dir = get_dir(get_turf(obj_resolve), get_turf(src)) - finish_manipulation(TRANSFER_TYPE_DROPOFF) - return + finish_manipulation() if(POST_INTERACTION_DROP_AT_MACHINE) obj_resolve.forceMove(get_turf(src)) - finish_manipulation(TRANSFER_TYPE_DROPOFF) - return + finish_manipulation() if(POST_INTERACTION_DROP_NEXT_FITTING) - var/datum/interaction_point/next = find_next_point(TRANSFER_TYPE_DROPOFF) - if(next) - rotate_to_point(next, PROC_REF(try_interact_with_destination_point), CURRENT_TASK_MOVING_DROPOFF) + var/datum/manipulator_task/next = master_tasking.get_next_task(tasks, src) + if(istype(next, /datum/manipulator_task/cargo/dropoff_base)) + rotate_to_point(next, next, TYPE_PROC_REF(/datum/manipulator_task/cargo/dropoff_base, try_dropoff)) return obj_resolve.forceMove(drop_turf) obj_resolve.dir = get_dir(get_turf(obj_resolve), get_turf(src)) - finish_manipulation(TRANSFER_TYPE_DROPOFF) - return - - if(POST_INTERACTION_WAIT) + finish_manipulation() + else schedule_next_cycle() - return - schedule_next_cycle() - -/// Throws the held object in the direction of the interaction point. -/obj/machinery/big_manipulator/proc/throw_thing(datum/interaction_point/drop_point) - var/drop_turf = drop_point.interaction_turf - var/item_throw_range = drop_point.throw_range +/obj/machinery/big_manipulator/proc/throw_thing(datum/manipulator_task/cargo/dropoff_base/throw/throw_task) + var/drop_turf = throw_task.interaction_turf var/atom/movable/held_atom = held_object?.resolve() held_atom.forceMove(drop_turf) do_attack_animation(drop_turf) manipulator_arm.do_attack_animation(drop_turf) - if(((isliving(held_atom))) && !(obj_flags & EMAGGED)) + if(isliving(held_atom) && !(obj_flags & EMAGGED)) held_atom.dir = get_dir(get_turf(held_atom), get_turf(src)) - finish_manipulation(TRANSFER_TYPE_DROPOFF) + finish_manipulation() return - held_atom.throw_at(get_edge_target_turf(get_turf(src), get_dir(get_turf(src), get_turf(held_atom))), item_throw_range, 2) - finish_manipulation(TRANSFER_TYPE_DROPOFF) + held_atom.throw_at(get_edge_target_turf(get_turf(src), get_dir(get_turf(src), get_turf(held_atom))), throw_task.throw_range, 2) + finish_manipulation() -/// Uses the empty hand to interact with objects -/obj/machinery/big_manipulator/proc/use_thing_with_empty_hand(datum/interaction_point/destination_point) +/obj/machinery/big_manipulator/proc/use_thing_with_empty_hand(datum/manipulator_task/cargo/interact/destination_task) var/mob/living/carbon/human/species/monkey/monkey_resolve = monkey_worker?.resolve() if(isnull(monkey_resolve)) - finish_manipulation(TRANSFER_TYPE_DROPOFF) + finish_manipulation() return - var/atom/type_to_use = destination_point.find_type_priority() + var/atom/type_to_use = destination_task.find_type_priority() if(isnull(type_to_use)) - check_end_of_use_for_use_with_empty_hand(destination_point, FALSE) + check_end_of_use_for_use_with_empty_hand(destination_task, FALSE) return - // We don't perform an unarmed attack on items because we pick them up duh if(isitem(type_to_use)) var/obj/item/interact_with_item = type_to_use var/resolve_loc = interact_with_item.loc @@ -426,37 +253,78 @@ interact_with_item.attack_self(monkey_resolve) interact_with_item.forceMove(resolve_loc) else + monkey_resolve.combat_mode = destination_task.worker_combat_mode monkey_resolve.UnarmedAttack(type_to_use) + monkey_resolve.combat_mode = FALSE - var/turf/dest_turf = destination_point.interaction_turf + var/turf/dest_turf = destination_task.interaction_turf if(dest_turf) do_attack_animation(dest_turf) manipulator_arm.do_attack_animation(dest_turf) - check_end_of_use_for_use_with_empty_hand(destination_point, TRUE) -/// Checks if we should continue using the empty hand after interaction -/obj/machinery/big_manipulator/proc/check_end_of_use_for_use_with_empty_hand(datum/interaction_point/destination_point, item_was_used = TRUE) - if(!on || (destination_point.worker_interaction != WORKER_EMPTY_USE && destination_point.interaction_mode == INTERACT_USE)) - finish_manipulation(TRANSFER_TYPE_DROPOFF) + check_end_of_use_for_use_with_empty_hand(destination_task, TRUE) + +/obj/machinery/big_manipulator/proc/check_end_of_use_for_use_with_empty_hand(datum/manipulator_task/cargo/interact/destination_task, item_was_used = TRUE) + if(!on || destination_task.worker_interaction != WORKER_EMPTY_USE) + finish_manipulation() return if(!item_was_used) - finish_manipulation(TRANSFER_TYPE_DROPOFF) + finish_manipulation() return - addtimer(CALLBACK(src, PROC_REF(use_thing_with_empty_hand), destination_point), BASE_INTERACTION_TIME) + addtimer(CALLBACK(src, PROC_REF(use_thing_with_empty_hand), destination_task), BASE_INTERACTION_TIME) -/// Completes the current manipulation action -/obj/machinery/big_manipulator/proc/finish_manipulation(transfer_type = TRANSFER_TYPE_DROPOFF) +/// Completes the current manipulation action and schedules the next step. +/obj/machinery/big_manipulator/proc/finish_manipulation() held_object = null manipulator_arm.update_claw(null) + current_task = null - end_current_task() + SStgui.update_uis(src) - if(IS_STOPPING) + if(stopping) complete_stopping_task() return - current_task = CURRENT_TASK_IDLE - schedule_next_cycle() + +/// Completes the stopping task and transitions to idle +/obj/machinery/big_manipulator/proc/complete_stopping_task() + on = FALSE + stopping = FALSE + next_cycle_scheduled = FALSE + current_task = null + unregister_task_turf_signals() + waiting_for_signal = FALSE + SStgui.update_uis(src) + +/// Registers enter/exit signals on all unique cargo task turfs. +/obj/machinery/big_manipulator/proc/register_task_turf_signals() + unregister_task_turf_signals() + for(var/datum/manipulator_task/cargo/task in tasks) + if(!task.interaction_turf || (task.interaction_turf in signal_turfs)) + continue + signal_turfs += task.interaction_turf + RegisterSignals(task.interaction_turf, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_EXITED), PROC_REF(on_task_turf_changed)) + +/// Unregisters all previously registered turf signals. +/obj/machinery/big_manipulator/proc/unregister_task_turf_signals() + for(var/turf/t in signal_turfs) + UnregisterSignal(t, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_EXITED)) + signal_turfs = list() + +/// Fires when something enters or leaves a watched task turf. +/obj/machinery/big_manipulator/proc/on_task_turf_changed(datum/source) + SIGNAL_HANDLER + if(!on || stopping || !waiting_for_signal) + return + something_happened() + +/// Drop the held atom. +/obj/machinery/big_manipulator/proc/drop_held_atom() + if(isnull(held_object)) + return + var/obj/obj_resolve = held_object?.resolve() + obj_resolve?.forceMove(get_turf(obj_resolve)) + finish_manipulation() diff --git a/code/game/machinery/big_manipulator/interaction_points.dm b/code/game/machinery/big_manipulator/interaction_points.dm deleted file mode 100644 index 3d3a8c4b8fb..00000000000 --- a/code/game/machinery/big_manipulator/interaction_points.dm +++ /dev/null @@ -1,239 +0,0 @@ -/datum/interaction_point - var/name = "interaction point" - - /// The turf this interaction point represents. - var/turf/interaction_turf - /// Should we check our filters while interacting with this point? - var/should_use_filters = FALSE - /// How should this point be interacted with? - var/interaction_mode = INTERACT_DROP - /// How should the monkey worker (if there is one) interact with the target point? - var/worker_interaction = WORKER_NORMAL_USE - /// How far should the manipulator throw the object? - var/throw_range = 1 - /// Which items are supposed to be picked up from `interaction_turf` if this is a pickup point - /// or looked for in the `interaction_turf` if this is a dropoff point. - var/list/atom_filters = list() - /// If this is a dropoff point, influences which interaction endpoints are preferred over which - /// by the manipulator. - var/list/interaction_priorities = list() - /// Should the manipulator put items on this point if there are already such items on the turf? - var/overflow_status = POINT_OVERFLOW_ALLOWED - /// Which object category should the filters be looking out for. - var/filtering_mode = TAKE_ITEMS - /// Whether the worker will use combat mode while interacting with this point. - var/worker_combat_mode = FALSE - /// Whether the worker will simulate RMB instead of LMB on interaction. - var/worker_use_rmb = FALSE - /// List of types that can be picked up from this point - var/list/type_filters = list( - /obj/item, - /obj/structure/closet, - ) - /// What should the manipulator do when there's nothing to "USE" the held item on anymore? - var/use_post_interaction = POST_INTERACTION_DROP_AT_POINT - -/datum/interaction_point/New(turf/new_turf, list/new_filters, new_should_use_filters, new_interaction_mode, new_allowed_types, new_overflow_status, manipulator_tier) - if(!new_turf) - stack_trace("New manipulator interaction point created with no valid turf references passed.") - qdel(src) - return - - if(isclosedturf(new_turf)) - qdel(src) - return - - interaction_turf = new_turf - - if(length(new_filters)) - atom_filters = new_filters - - if(new_should_use_filters) - should_use_filters = new_should_use_filters - - if(new_interaction_mode) - interaction_mode = new_interaction_mode - - if(new_allowed_types) - type_filters = new_allowed_types - - if(new_overflow_status) - overflow_status = new_overflow_status - - interaction_priorities = fill_priority_list(manipulator_tier) - -/// Finds the type priority of the interaction point. -/datum/interaction_point/proc/find_type_priority() - var/list/turf_contents = interaction_turf.contents - - var/atom/movable/best_candidate = null - var/best_priority_index = INFINITY - - for(var/atom/movable/thing as anything in turf_contents) - for(var/i in 1 to length(interaction_priorities)) - if(i >= best_priority_index) - break - - var/datum/manipulator_priority/prio = interaction_priorities[i] - - if(!prio.active) - continue - - if(prio.atom_typepath == /turf) - if(i < best_priority_index) - best_candidate = interaction_turf - best_priority_index = i - continue - - if(!istype(thing, prio.atom_typepath)) - continue - - if(isliving(thing)) - var/mob/living/L = thing - if(L.stat == DEAD) - continue - - best_candidate = thing - best_priority_index = i - - if(best_priority_index == 1) - return best_candidate - break - - return best_candidate - -/// Checks if the interaction point is available - if it has items that can be interacted with. -/datum/interaction_point/proc/is_available(transfer_type, atom/movable/target) - if(!is_valid()) - return FALSE - - // All atoms on the turf that can be interacted with. - var/list/atoms_on_the_turf = interaction_turf?.contents - - // For pickup points, we want points that have atoms to pick up - if(transfer_type == TRANSFER_TYPE_PICKUP) - - if(!length(atoms_on_the_turf)) - return FALSE // nothing to pick up - - // If the atom filters are required, we need to check if any atom on the turf fits the filters. If not, the check will only determine whether it fits the category - for(var/atom/movable/movable_atom as anything in atoms_on_the_turf) - if(check_filters_for_atom(movable_atom)) - return TRUE - - // No suitable atoms to pick up - the pickup point is unavailable. - return FALSE - - if(transfer_type == TRANSFER_TYPE_DROPOFF) - // If filters are enabled, the held item itself must match them for any overflow mode - if(!check_filters_for_atom(target) && should_use_filters) - return FALSE - - if(interaction_mode != INTERACT_DROP) // you don't check for overflow if you're not actually putting anything on the turf silly - return TRUE - - switch(overflow_status) - if(POINT_OVERFLOW_ALLOWED) - // If we don't care if there are already things on this turf, then we just check for filters - // Hence if the atom filters are skipped, the point is available for dropoff - if(!should_use_filters) - return TRUE - - if(POINT_OVERFLOW_FILTERS) - // We need to check if there are already items matching the filters on the turf - for(var/atom/movable/movable_atom as anything in atoms_on_the_turf) - if(check_filters_for_atom(movable_atom)) - return FALSE // the item on the turf was in the filters, hence the turf is considered overflowed - - if(POINT_OVERFLOW_HELD) - // We need to check if any of the items on the turf match the item we're holding - for(var/atom/movable/movable_atom as anything in atoms_on_the_turf) - if(istype(movable_atom, target?.type)) - return FALSE // one of the items on the turf was the same as the one we're holding - - if(POINT_OVERFLOW_FORBIDDEN) - // We need to check if there are already ANY items on the turf - if(locate(/obj/item) in atoms_on_the_turf) - return FALSE - - return TRUE - - // Ambiguous interaction type — no interaction is possible, point is unavailable - return FALSE - -/// Checks if the interaction point is valid — is not located on a closed turf. -/datum/interaction_point/proc/is_valid() - if(!interaction_turf) - return FALSE - - if(isclosedturf(interaction_turf)) - return FALSE - return TRUE - -/// Checks if the passed movable `atom` fits the filters. -/datum/interaction_point/proc/check_filters_for_atom(atom/movable/target) - if(!target || target.anchored || HAS_TRAIT(target, TRAIT_NODROP)) - return FALSE - - switch(filtering_mode) - if(TAKE_CLOSETS) - return iscloset(target) - - if(TAKE_HUMANS) - return ishuman(target) - - if(TAKE_ITEMS) - if(!should_use_filters) - return(isitem(target)) - - for(var/filter_path in atom_filters) - if(istype(target, filter_path)) - return TRUE - return FALSE - - return FALSE - -/// Fills the interaction endpoint priority list for the current interaction mode. -/datum/interaction_point/proc/fill_priority_list(manipulator_tier) - var/list/priorities_to_set = new /list((manipulator_tier == 4 ? 5 : 4)) - - switch(interaction_mode) - if(INTERACT_DROP) - priorities_to_set[1] = new /datum/manipulator_priority/drop/in_storage - priorities_to_set[2] = new /datum/manipulator_priority/drop/on_floor - - if(INTERACT_USE) - priorities_to_set[1] = new /datum/manipulator_priority/interact/with_living - priorities_to_set[2] = new /datum/manipulator_priority/interact/with_structure - priorities_to_set[3] = new /datum/manipulator_priority/interact/with_machinery - priorities_to_set[4] = new /datum/manipulator_priority/interact/with_items - - if(manipulator_tier == 4) - priorities_to_set[5] = new /datum/manipulator_priority/interact/with_vehicles - - return priorities_to_set - -/// Moves the priority for a given index 1 step higher. -/datum/interaction_point/proc/move_priority_up_by_index(index) - if(!index) // also handles index being 0 - return FALSE - - interaction_priorities.Swap(index, index + 1) - - return TRUE - -/// Toggles the priority's `active` param. Sets to TRUE if `reset` is TRUE. -/datum/interaction_point/proc/tick_priority_by_index(index, reset = FALSE) - var/datum/manipulator_priority/target_priority = interaction_priorities[index + 1] - - if(reset) - target_priority.active = TRUE - else - target_priority.active = !target_priority.active - - return TRUE - -/datum/interaction_point/Destroy() - interaction_turf = null - QDEL_LIST(interaction_priorities) - return ..() diff --git a/code/game/machinery/big_manipulator/manipulator_tasks.dm b/code/game/machinery/big_manipulator/manipulator_tasks.dm new file mode 100644 index 00000000000..48a136ff255 --- /dev/null +++ b/code/game/machinery/big_manipulator/manipulator_tasks.dm @@ -0,0 +1,501 @@ +/datum/manipulator_task + var/name = "task" + +/datum/manipulator_task/proc/can_run(obj/machinery/big_manipulator/manipulator) + return FALSE + +/datum/manipulator_task/proc/run_task(obj/machinery/big_manipulator/manipulator) + return + +/datum/manipulator_task/proc/serialize() + return list("type" = type) + +/datum/manipulator_task/New(...) + ..() + return + +// ===== WAIT ===== + +/datum/manipulator_task/simple/wait + name = "wait" + var/time_seconds = 1 + +/datum/manipulator_task/simple/wait/can_run(obj/machinery/big_manipulator/manipulator) + for(var/datum/manipulator_task/cargo/task in manipulator.tasks) + if(task.can_run(manipulator)) + return TRUE + return FALSE + +/datum/manipulator_task/simple/wait/run_task(obj/machinery/big_manipulator/manipulator) + manipulator.schedule_next_cycle(time_seconds SECONDS) + +/datum/manipulator_task/simple/wait/serialize() + var/list/data = ..() + data["time_seconds"] = time_seconds + return data + +/datum/manipulator_task/simple/wait/New(..., serialized_data) + ..() + if(serialized_data) + time_seconds = serialized_data["time_seconds"] + return + +// ===== BASE CARGO ===== + +/datum/manipulator_task/cargo + var/turf/interaction_turf + var/offset_dx + var/offset_dy + var/should_use_filters = FALSE + var/list/atom_filters = list() + var/filtering_mode = TAKE_ITEMS + var/list/type_filters = list( + /obj/item, + /obj/structure/closet, + ) + var/list/interaction_priorities = list() + +/datum/manipulator_task/cargo/New(turf/new_turf, manipulator_tier, serialized_data) + if(serialized_data) + var/list/offset = serialized_data["offset"] + if(islist(offset)) + offset_dx = offset["dx"] + offset_dy = offset["dy"] + if(new_turf) + interaction_turf = new_turf + + should_use_filters = !!serialized_data["should_use_filters"] + atom_filters = serialized_data["atom_filters"] || list() + filtering_mode = serialized_data["filtering_mode"] + type_filters = serialized_data["type_filters"] || list() + + var/list/prios_data = serialized_data["interaction_priorities"] + if(islist(prios_data)) + interaction_priorities = list() + for(var/list/prio_data as anything in prios_data) + if(!islist(prio_data)) + continue + var/prio_type = prio_data["type"] + if(!ispath(prio_type, /datum/manipulator_priority)) + continue + var/datum/manipulator_priority/prio = new prio_type + prio.active = !!prio_data["active"] + interaction_priorities += prio + + return ..() + + if(!new_turf) + stack_trace("New manipulator task created with no valid turf reference passed.") + qdel(src) + return + + if(isclosedturf(new_turf)) + qdel(src) + return + + interaction_turf = new_turf + interaction_priorities = fill_priority_list(manipulator_tier) + return ..() + +/datum/manipulator_task/cargo/proc/fill_priority_list(manipulator_tier) + return list() + +/datum/manipulator_task/cargo/proc/find_type_priority() + var/atom/movable/best_candidate = null + var/best_priority_index = INFINITY + + for(var/atom/movable/thing as anything in interaction_turf.contents) + for(var/i in 1 to length(interaction_priorities)) + if(i >= best_priority_index) + break + + var/datum/manipulator_priority/prio = interaction_priorities[i] + + if(!prio.active || ispath(prio, /turf)) + continue + + if(!istype(thing, prio.atom_typepath)) + continue + + if(isliving(thing)) + var/mob/living/living_mob = thing + if(living_mob.stat == DEAD) + continue + + best_candidate = thing + best_priority_index = i + + if(best_priority_index == 1) + return best_candidate + break + + for(var/i in 1 to length(interaction_priorities)) + if(i >= best_priority_index) + break + var/datum/manipulator_priority/prio = interaction_priorities[i] + if(prio.active && prio.atom_typepath == /turf) + best_candidate = interaction_turf + best_priority_index = i + break + + return best_candidate + +/datum/manipulator_task/cargo/proc/move_priority_up_by_index(index) + if(!index) + return FALSE + interaction_priorities.Swap(index, index + 1) + return TRUE + +/datum/manipulator_task/cargo/proc/tick_priority_by_index(index, reset = FALSE) + var/datum/manipulator_priority/target_priority = interaction_priorities[index + 1] + if(reset) + target_priority.active = TRUE + else + target_priority.active = !target_priority.active + return TRUE + +/datum/manipulator_task/cargo/proc/is_valid() + if(!interaction_turf) + return FALSE + return !isclosedturf(interaction_turf) + +/datum/manipulator_task/cargo/proc/check_filters_for_atom(atom/movable/target) + if(!target || target.anchored || HAS_TRAIT(target, TRAIT_NODROP)) + return FALSE + + switch(filtering_mode) + if(TAKE_CLOSETS) + return iscloset(target) + if(TAKE_HUMANS) + return ishuman(target) + if(TAKE_ITEMS) + if(!should_use_filters) + return isitem(target) + for(var/filter_path in atom_filters) + if(istype(target, filter_path)) + return TRUE + return FALSE + + return FALSE + +/datum/manipulator_task/cargo/can_run(obj/machinery/big_manipulator/manipulator) + return is_valid() + +/datum/manipulator_task/cargo/serialize() + var/list/data = ..() + data["offset"] = list( + "dx" = offset_dx, + "dy" = offset_dy, + ) + data["should_use_filters"] = should_use_filters + data["atom_filters"] = atom_filters + data["filtering_mode"] = filtering_mode + data["type_filters"] = type_filters + data["interaction_priorities"] = list() + for(var/datum/manipulator_priority/prio as anything in interaction_priorities) + data["interaction_priorities"] += list(list( + "type" = prio.type, + "active" = prio.active, + )) + return data + + +/datum/manipulator_task/cargo/Destroy() + interaction_turf = null + QDEL_LIST(interaction_priorities) + return ..() + +// ===== PICKUP ===== + +/datum/manipulator_task/cargo/pickup + name = "pickup" + var/pickup_eagerness = PICKUP_CAN_WAIT + +/datum/manipulator_task/cargo/pickup/fill_priority_list(manipulator_tier) + return list() + +/datum/manipulator_task/cargo/pickup/can_run(obj/machinery/big_manipulator/manipulator) + if(!..()) + return FALSE + if(manipulator.held_object) + return FALSE + for(var/atom/movable/candidate as anything in interaction_turf.contents) + if(!check_filters_for_atom(candidate)) + continue + if(pickup_eagerness == PICKUP_EAGER) + return TRUE + for(var/datum/manipulator_task/cargo/dropoff_base/dest in manipulator.tasks) + if(dest.can_accept(candidate)) + return TRUE + return FALSE + +/datum/manipulator_task/cargo/pickup/run_task(obj/machinery/big_manipulator/manipulator) + manipulator.rotate_to_point(src, src, PROC_REF(try_pickup)) + +/datum/manipulator_task/cargo/pickup/proc/try_pickup(obj/machinery/big_manipulator/manipulator) + var/atom/movable/selected = find_pickup_candidate(manipulator) + if(!selected) + manipulator.nothing_ever_happens() + return + + if(selected.anchored || HAS_TRAIT(selected, TRAIT_NODROP)) + manipulator.nothing_ever_happens() + return + + if(isitem(selected)) + var/obj/item/selected_item = selected + if(selected_item.item_flags & (ABSTRACT|DROPDEL)) + manipulator.nothing_ever_happens() + return + + selected.forceMove(manipulator) + manipulator.held_object = WEAKREF(selected) + manipulator.manipulator_arm.update_claw(manipulator.held_object) + manipulator.schedule_next_cycle() + +/datum/manipulator_task/cargo/pickup/serialize() + var/list/data = ..() + data["pickup_eagerness"] = pickup_eagerness + return data + +/datum/manipulator_task/cargo/pickup/New(turf/new_turf, manipulator_tier, serialized_data) + ..(new_turf, manipulator_tier, serialized_data) + if(serialized_data) + pickup_eagerness = serialized_data["pickup_eagerness"] + return + +/datum/manipulator_task/cargo/pickup/proc/find_pickup_candidate(obj/machinery/big_manipulator/manipulator) + var/list/candidates = list() + + for(var/atom/movable/candidate as anything in interaction_turf.contents) + if(candidate.anchored || HAS_TRAIT(candidate, TRAIT_NODROP)) + continue + if(!check_filters_for_atom(candidate)) + continue + if(pickup_eagerness == PICKUP_EAGER) + candidates += candidate + continue + for(var/datum/manipulator_task/cargo/dropoff_base/dest in manipulator.tasks) + if(dest.can_accept(candidate)) + candidates += candidate + break + + if(!length(candidates)) + return null + + return manipulator.master_tasking.get_next_candidate(candidates) + +// ===== BASE DROPOFF ===== +// Base type for anything that accepts a `held_object`: drop, throw, use. +// Pickup iterates by this type to find a target point. + +/datum/manipulator_task/cargo/dropoff_base + name = "dropoff" + +/datum/manipulator_task/cargo/dropoff_base/proc/can_accept(atom/movable/target) + if(!is_valid()) + return FALSE + if(should_use_filters && !check_filters_for_atom(target)) + return FALSE + return TRUE + +/datum/manipulator_task/cargo/dropoff_base/can_run(obj/machinery/big_manipulator/manipulator) + if(!..()) + return FALSE + var/atom/movable/target = manipulator.held_object?.resolve() + if(!target) + return FALSE + return can_accept(target) + +/datum/manipulator_task/cargo/dropoff_base/run_task(obj/machinery/big_manipulator/manipulator) + manipulator.rotate_to_point(src, src, PROC_REF(try_dropoff)) + +/datum/manipulator_task/cargo/dropoff_base/proc/try_dropoff(obj/machinery/big_manipulator/manipulator) + var/obj/actual_held_object = manipulator.held_object?.resolve() + if(!actual_held_object || actual_held_object.loc != manipulator) + manipulator.nothing_ever_happens() + return FALSE + do_dropoff(manipulator) + return TRUE + +/datum/manipulator_task/cargo/dropoff_base/serialize() + var/list/data = ..() + return data + + +/datum/manipulator_task/cargo/dropoff_base/proc/do_dropoff(obj/machinery/big_manipulator/manipulator) + return + +// ===== DROP ===== + +/datum/manipulator_task/cargo/dropoff_base/drop + name = "drop" + var/overflow_status = POINT_OVERFLOW_ALLOWED + +/datum/manipulator_task/cargo/dropoff_base/drop/fill_priority_list(manipulator_tier) + return list( + new /datum/manipulator_priority/drop/in_storage, + new /datum/manipulator_priority/drop/on_floor + ) + +/datum/manipulator_task/cargo/dropoff_base/drop/can_accept(atom/movable/target) + if(!..()) + return FALSE + + var/list/atoms_on_the_turf = interaction_turf.contents + switch(overflow_status) + if(POINT_OVERFLOW_ALLOWED) + return TRUE + if(POINT_OVERFLOW_FILTERS) + for(var/atom/movable/movable_atom as anything in atoms_on_the_turf) + if(check_filters_for_atom(movable_atom)) + return FALSE + if(POINT_OVERFLOW_HELD) + for(var/atom/movable/movable_atom as anything in atoms_on_the_turf) + if(istype(movable_atom, target?.type)) + return FALSE + if(POINT_OVERFLOW_FORBIDDEN) + if(locate(/obj/item) in atoms_on_the_turf) + return FALSE + + return TRUE + +/datum/manipulator_task/cargo/dropoff_base/drop/serialize() + var/list/data = ..() + data["overflow_status"] = overflow_status + return data + +/datum/manipulator_task/cargo/dropoff_base/drop/New(turf/new_turf, manipulator_tier, serialized_data) + ..(new_turf, manipulator_tier, serialized_data) + if(serialized_data) + overflow_status = serialized_data["overflow_status"] + return + +/datum/manipulator_task/cargo/dropoff_base/drop/do_dropoff(obj/machinery/big_manipulator/manipulator) + manipulator.try_drop_thing(src) + +// ===== THROW ===== + +/datum/manipulator_task/cargo/dropoff_base/throw + name = "throw" + var/throw_range = 1 + +/datum/manipulator_task/cargo/dropoff_base/throw/can_accept(atom/movable/target) + if(!is_valid()) + return FALSE + if(should_use_filters && !check_filters_for_atom(target)) + return FALSE + return TRUE + +/datum/manipulator_task/cargo/dropoff_base/throw/serialize() + var/list/data = ..() + data["throw_range"] = throw_range + return data + +/datum/manipulator_task/cargo/dropoff_base/throw/New(turf/new_turf, manipulator_tier, serialized_data) + ..(new_turf, manipulator_tier, serialized_data) + if(serialized_data) + throw_range = serialized_data["throw_range"] + return + +/datum/manipulator_task/cargo/dropoff_base/throw/do_dropoff(obj/machinery/big_manipulator/manipulator) + manipulator.throw_thing(src) + +// ===== USE ===== + +/datum/manipulator_task/cargo/dropoff_base/use + name = "use" + var/worker_interaction = WORKER_NORMAL_USE + var/use_post_interaction = POST_INTERACTION_DROP_AT_POINT + var/worker_combat_mode = FALSE + var/worker_use_rmb = FALSE + +/datum/manipulator_task/cargo/dropoff_base/use/fill_priority_list(manipulator_tier) + var/list/priorities = list( + new /datum/manipulator_priority/interact/with_living, + new /datum/manipulator_priority/interact/with_structure, + new /datum/manipulator_priority/interact/with_machinery, + new /datum/manipulator_priority/interact/with_items, + ) + if(manipulator_tier == 4) + priorities += new /datum/manipulator_priority/interact/with_vehicles + return priorities + +/datum/manipulator_task/cargo/dropoff_base/use/can_accept(atom/movable/target) + if(!is_valid()) + return FALSE + if(should_use_filters && !check_filters_for_atom(target)) + return FALSE + return TRUE + +/datum/manipulator_task/cargo/dropoff_base/use/serialize() + var/list/data = ..() + data["worker_interaction"] = worker_interaction + data["use_post_interaction"] = use_post_interaction + data["worker_combat_mode"] = worker_combat_mode + data["worker_use_rmb"] = worker_use_rmb + return data + +/datum/manipulator_task/cargo/dropoff_base/use/New(turf/new_turf, manipulator_tier, serialized_data) + ..(new_turf, manipulator_tier, serialized_data) + if(serialized_data) + worker_interaction = serialized_data["worker_interaction"] + use_post_interaction = serialized_data["use_post_interaction"] + worker_combat_mode = !!serialized_data["worker_combat_mode"] + worker_use_rmb = !!serialized_data["worker_use_rmb"] + return + +/datum/manipulator_task/cargo/dropoff_base/use/do_dropoff(obj/machinery/big_manipulator/manipulator) + manipulator.try_use_thing(src) + +// ===== INTERACT (empty hand) ===== + +/datum/manipulator_task/cargo/interact + name = "interact" + var/worker_interaction = WORKER_EMPTY_USE + var/use_post_interaction = POST_INTERACTION_DROP_AT_POINT + var/worker_combat_mode = FALSE + var/worker_use_rmb = FALSE + +/datum/manipulator_task/cargo/interact/fill_priority_list(manipulator_tier) + var/list/priorities = list( + new /datum/manipulator_priority/interact/with_living, + new /datum/manipulator_priority/interact/with_structure, + new /datum/manipulator_priority/interact/with_machinery, + new /datum/manipulator_priority/interact/with_items, + ) + if(manipulator_tier == 4) + priorities += new /datum/manipulator_priority/interact/with_vehicles + return priorities + +/datum/manipulator_task/cargo/interact/can_run(obj/machinery/big_manipulator/manipulator) + if(!..()) + return FALSE + return find_type_priority() != null + +/datum/manipulator_task/cargo/interact/run_task(obj/machinery/big_manipulator/manipulator) + manipulator.rotate_to_point(src, src, PROC_REF(try_interact)) + +/datum/manipulator_task/cargo/interact/serialize() + var/list/data = ..() + data["worker_interaction"] = worker_interaction + data["use_post_interaction"] = use_post_interaction + data["worker_combat_mode"] = worker_combat_mode + data["worker_use_rmb"] = worker_use_rmb + return data + +/datum/manipulator_task/cargo/interact/New(turf/new_turf, manipulator_tier, serialized_data) + ..(new_turf, manipulator_tier, serialized_data) + if(serialized_data) + worker_interaction = serialized_data["worker_interaction"] + use_post_interaction = serialized_data["use_post_interaction"] + worker_combat_mode = !!serialized_data["worker_combat_mode"] + worker_use_rmb = !!serialized_data["worker_use_rmb"] + return + +/datum/manipulator_task/cargo/interact/proc/try_interact(obj/machinery/big_manipulator/manipulator) + var/atom/movable/held = manipulator.held_object?.resolve() + if(held) + manipulator.try_use_thing(src) + else + manipulator.use_thing_with_empty_hand(src) diff --git a/code/game/machinery/big_manipulator/tasking.dm b/code/game/machinery/big_manipulator/tasking.dm index 90db115d1f6..cc91434363e 100644 --- a/code/game/machinery/big_manipulator/tasking.dm +++ b/code/game/machinery/big_manipulator/tasking.dm @@ -1,109 +1,69 @@ -// Handles indexing for the tasking strategy used for the manipulator's point iteraction /datum/tasking_strategy var/current_index = 1 -/// Get the next available point for this tasking strategy -/datum/tasking_strategy/proc/get_next_available(list/points, atom/movable/target, transfer_type, availability_check) +/// Returns the next task to run, or null if nothing is available. +/datum/tasking_strategy/proc/get_next_task(list/tasks) return null -// Prefers the first point avaliable -/datum/tasking_strategy/prefer_first - -/datum/tasking_strategy/prefer_first/get_next_available(list/points, atom/movable/target, transfer_type, datum/callback/availability_check) - if(!length(points)) - return null - - for(var/datum/interaction_point/point in points) - if(availability_check.Invoke(point, target, transfer_type)) - return point - - return null - -/datum/tasking_strategy/round_robin - -/datum/tasking_strategy/round_robin/get_next_available(list/points, atom/movable/target, transfer_type, datum/callback/availability_check) - if(!length(points)) - return null - - if(current_index < 1 || current_index > length(points)) - current_index = 1 - - var/starting_index = current_index - - while(TRUE) - var/datum/interaction_point/point = points[current_index] - - if(point && availability_check.Invoke(point, target, transfer_type)) - advance_index(length(points)) - return point - - advance_index(length(points)) - - if(current_index == starting_index) - break - - return null - -/// Advances the index of the last point the manipulator interacted with to properly iterate in the correct order -/datum/tasking_strategy/round_robin/proc/advance_index(list_length) - current_index++ - if(current_index > list_length) - current_index = 1 - -/datum/tasking_strategy/strict_robin - -/datum/tasking_strategy/strict_robin/get_next_available(list/points, atom/movable/target, transfer_type, datum/callback/availability_check) - if(!length(points)) - return null - - if(current_index < 1 || current_index > length(points)) - current_index = 1 - - var/datum/interaction_point/point = points[current_index] - - if(point && availability_check.Invoke(point, target, transfer_type)) - current_index++ - if(current_index > length(points)) - current_index = 1 - return point - - return null - -/// Picks a next candidate to run the checks for +/// Picks a next candidate from a list of eligible atoms. /datum/tasking_strategy/proc/get_next_candidate(list/candidates) if(!length(candidates)) return null return candidates[1] -/datum/tasking_strategy/prefer_first/get_next_candidate(list/candidates) +// Moves through the list, skipping tasks that can't run. +/datum/tasking_strategy/sequential + +/datum/tasking_strategy/sequential/get_next_task(list/tasks, obj/machinery/big_manipulator/manipulator) + if(!length(tasks)) + return null + if(current_index < 1 || current_index > length(tasks)) + current_index = 1 + var/start = current_index + while(TRUE) + var/datum/manipulator_task/task = tasks[current_index] + current_index++ + if(current_index > length(tasks)) + current_index = 1 + if(task.can_run(manipulator)) + return task + if(current_index == start) + return null + +/datum/tasking_strategy/sequential/get_next_candidate(list/candidates) if(!length(candidates)) return null - return candidates[1] - -/datum/tasking_strategy/round_robin/get_next_candidate(list/candidates) - if(!length(candidates)) - return null - if(current_index < 1 || current_index > length(candidates)) current_index = 1 - var/candidate = candidates[current_index] current_index++ if(current_index > length(candidates)) current_index = 1 - return candidate -/datum/tasking_strategy/strict_robin/get_next_candidate(list/candidates) +// Stays on the current task until it can run. +/datum/tasking_strategy/strict + +/datum/tasking_strategy/strict/get_next_task(list/tasks, obj/machinery/big_manipulator/manipulator) + if(!length(tasks)) + return null + if(current_index < 1 || current_index > length(tasks)) + current_index = 1 + var/datum/manipulator_task/task = tasks[current_index] + if(!task.can_run(manipulator)) + return null + current_index++ + if(current_index > length(tasks)) + current_index = 1 + return task + +/datum/tasking_strategy/strict/get_next_candidate(list/candidates) if(!length(candidates)) return null - if(current_index < 1 || current_index > length(candidates)) current_index = 1 - var/candidate = candidates[current_index] current_index++ if(current_index > length(candidates)) current_index = 1 - return candidate diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 1988c2b70ae..66b37ddd7a3 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -334,20 +334,28 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0) if(proximity_monitor) drop_upgrade(proximity_monitor) -/obj/machinery/camera/update_icon_state() //TO-DO: Make panel open states, xray camera, and indicator lights overlays instead. - var/xray_module - if(isXRay(TRUE)) - xray_module = "xray" - - if(!camera_enabled) +/obj/machinery/camera/update_icon_state() + var/xray_module = isXRay(TRUE) ? "xray" : "" + if(!camera_enabled || (machine_stat & EMPED)) icon_state = "[xray_module][base_icon_state]_off" return ..() - if(machine_stat & EMPED) - icon_state = "[xray_module][base_icon_state]_emp" - return ..() - icon_state = "[xray_module][base_icon_state][in_use_lights ? "_in_use" : ""]" + icon_state = "[xray_module][base_icon_state]" return ..() +/obj/machinery/camera/update_overlays() + . = ..() + if(panel_open) + . += "[base_icon_state]_panel" + + var/xray_module = isXRay(TRUE) ? "xray" : "" + if(machine_stat & EMPED) + . += "[xray_module][base_icon_state]_emp" + . += emissive_appearance(icon, "[xray_module][base_icon_state]_emp", src, alpha = src.alpha) + return + if(camera_enabled) + . += "[xray_module][base_icon_state]_[in_use_lights ? "in_use" : "on"]" + . += emissive_appearance(icon, "[xray_module][base_icon_state]_[in_use_lights ? "in_use" : "on"]", src, alpha = src.alpha) + /obj/machinery/camera/proc/toggle_cam(mob/user, displaymessage = TRUE) camera_enabled = !camera_enabled if(can_use()) diff --git a/code/game/machinery/computer/accounting.dm b/code/game/machinery/computer/accounting.dm index 05a1d12ed40..6ccc1d2c7b3 100644 --- a/code/game/machinery/computer/accounting.dm +++ b/code/game/machinery/computer/accounting.dm @@ -37,7 +37,7 @@ data["accounts"] = player_accounts data["audit_log"] = SSeconomy.audit_log data["crashing"] = HAS_TRAIT(SSeconomy, TRAIT_MARKET_CRASHING) - data["station_time"] = station_time_timestamp("hh:mm") + data["station_time"] = round_timestamp("hh:mm") return data /obj/machinery/computer/accounting/ui_static_data(mob/user) diff --git a/code/game/machinery/computer/apc_control.dm b/code/game/machinery/computer/apc_control.dm index 6c56f6e2aa6..a7add4639c3 100644 --- a/code/game/machinery/computer/apc_control.dm +++ b/code/game/machinery/computer/apc_control.dm @@ -48,7 +48,7 @@ /obj/machinery/computer/apc_control/proc/log_activity(log_text) if(!should_log) return - LAZYADD(logs, "([station_time_timestamp()]): [auth_id] [log_text]") + LAZYADD(logs, "([round_timestamp()]): [auth_id] [log_text]") ///Resets the console's emagged state and re-enables logging of activity /obj/machinery/computer/apc_control/proc/restore_comp(mob/user) diff --git a/code/game/machinery/computer/dna_console.dm b/code/game/machinery/computer/dna_console.dm index 3654e25d176..043d0fc47ac 100644 --- a/code/game/machinery/computer/dna_console.dm +++ b/code/game/machinery/computer/dna_console.dm @@ -834,7 +834,7 @@ // Create a new DNA Injector and add the appropriate mutations to it var/obj/item/dnainjector/activator/injector = new /obj/item/dnainjector/activator(loc) - injector.add_mutations += mutation.make_copy() + LAZYADD(injector.add_mutations, mutation.make_copy()) var/is_activator = text2num(params["is_activator"]) @@ -1308,93 +1308,19 @@ // number later // params["type"] - Type of injector to create // Expected results: - // "ue" - Unique Enzyme, changes name and blood type + // "ue" - Unique Enzyme, changes name and blood type // "ui" - Unique Identity, changes looks // "uf" - Unique Features, changes mutant bodyparts and mutcolors // "mixed" - Combination of both ue and ui if("makeup_injector") if(!COOLDOWN_FINISHED(src, enzyme_copy_timer)) return - // Convert the index to a number and clamp within the array range, then - // copy the data from the disk to that buffer - var/buffer_index = text2num(params["index"]) - buffer_index = clamp(buffer_index, 1, NUMBER_OF_BUFFERS) - var/list/buffer_slot = genetic_makeup_buffer[buffer_index] - - // GUARD CHECK - This shouldn't be possible to execute this on a null - // buffer. Unexpected resut - if(!istype(buffer_slot)) + // Convert the index to a number and clamp within the array range, then copy the data from the disk to that buffer + var/buffer_index = clamp(text2num(params["index"]), 1, NUMBER_OF_BUFFERS) + if(!make_cosmetic_dna_injector(dna_injector_type_to_flag(params["type"]), genetic_makeup_buffer[buffer_index])) + to_chat(usr, span_warning("Genetic data corrupted, unable to create injector.")) return - - var/type = params["type"] - var/obj/item/dnainjector/timed/I - - switch(type) - if("ui") - // GUARD CHECK - There's currently no way to save partial genetic data. - // However, if this is the case, we can't make a complete injector and - // this catches that edge case - if(!buffer_slot["UI"]) - to_chat(usr,span_warning("Genetic data corrupted, unable to create injector.")) - return - - I = new /obj/item/dnainjector/timed(loc) - I.fields = list("UI"=buffer_slot["UI"]) - - // If there is a connected scanner, we can use its upgrades to reduce - // the genetic damage generated by this injector - if(scanner_operational()) - I.damage_coeff = connected_scanner.damage_coeff - if("ue") - // GUARD CHECK - There's currently no way to save partial genetic data. - // However, if this is the case, we can't make a complete injector and - // this catches that edge case - if(!buffer_slot["name"] || !buffer_slot["UE"] || !buffer_slot["blood_type"]) - to_chat(usr,span_warning("Genetic data corrupted, unable to create injector.")) - return - - I = new /obj/item/dnainjector/timed(loc) - I.fields = list("name"=buffer_slot["name"], "UE"=buffer_slot["UE"], "blood_type"=buffer_slot["blood_type"]) - - // If there is a connected scanner, we can use its upgrades to reduce - // the genetic damage generated by this injector - if(scanner_operational()) - I.damage_coeff = connected_scanner.damage_coeff - if("uf") - // GUARD CHECK - There's currently no way to save partial genetic data. - // However, if this is the case, we can't make a complete injector and - // this catches that edge case - if(!buffer_slot["name"] || !buffer_slot["UF"] || !buffer_slot["blood_type"]) - to_chat(usr,span_warning("Genetic data corrupted, unable to create injector.")) - return - - I = new /obj/item/dnainjector/timed(loc) - I.fields = list("name"=buffer_slot["name"], "UF"=buffer_slot["UF"]) - - // If there is a connected scanner, we can use its upgrades to reduce - // the genetic damage generated by this injector - if(scanner_operational()) - I.damage_coeff = connected_scanner.damage_coeff - if("mixed") - // GUARD CHECK - There's currently no way to save partial genetic data. - // However, if this is the case, we can't make a complete injector and - // this catches that edge case - if(!buffer_slot["UI"] || !buffer_slot["name"] || !buffer_slot["UE"] || !buffer_slot["UF"] || !buffer_slot["blood_type"]) - to_chat(usr,span_warning("Genetic data corrupted, unable to create injector.")) - return - - I = new /obj/item/dnainjector/timed(loc) - I.fields = list("UI"=buffer_slot["UI"],"name"=buffer_slot["name"], "UE"=buffer_slot["UE"], "UF"=buffer_slot["UF"], "blood_type"=buffer_slot["blood_type"]) - - // If there is a connected scanner, we can use its upgrades to reduce - // the genetic damage generated by this injector - if(scanner_operational()) - I.damage_coeff = connected_scanner.damage_coeff - - // If we successfully created an injector, don't forget to set the new - // ready timer. - if(I) - injector_ready = world.time + MISC_INJECTOR_TIMEOUT + injector_ready = world.time + MISC_INJECTOR_TIMEOUT if(connected_scanner) connected_scanner.use_energy(connected_scanner.active_power_usage) else @@ -1584,7 +1510,7 @@ // new injector var/total_stability = 0 for(var/datum/mutation/mutation as anything in injector_selection[inj_name]) - injector.add_mutations += mutation.make_copy() + LAZYADD(injector.add_mutations, mutation.make_copy()) total_stability += mutation.instability // Force apply any mutations, this is functionality similar to mutators @@ -1790,12 +1716,90 @@ return TRUE return FALSE + /** * Checks if there is a connected DNA Scanner that is operational */ /obj/machinery/computer/dna_console/proc/scanner_operational() return connected_scanner?.is_operational +/** + * Gets the damage coefficient of the connected DNA Scanner, or 1 if there isn't an operational one + */ +/obj/machinery/computer/dna_console/proc/get_injector_damage_coeff() + if(scanner_operational()) + return connected_scanner.damage_coeff + return 1 + +/// Copy UI to the dna injector +#define DNA_INJECTOR_FLAG_UI (1<<0) +/// Copy UE to the dna injector +#define DNA_INJECTOR_FLAG_UE (1<<1) +/// Copy UF to the dna injector +#define DNA_INJECTOR_FLAG_UF (1<<2) +/// Copy name to the dna injector +#define DNA_INJECTOR_FLAG_NAME (1<<3) +/// Copy blood type to the dna injector +#define DNA_INJECTOR_FLAG_BLOOD (1<<4) + +/** + * Converts a string (from tgui) to a series of flags determine what we should put in a DNA Injector + */ +/obj/machinery/computer/dna_console/proc/dna_injector_type_to_flag(injector_type) + switch(injector_type) + if("ui") + return DNA_INJECTOR_FLAG_UI + if("ue") + return DNA_INJECTOR_FLAG_UE | DNA_INJECTOR_FLAG_NAME | DNA_INJECTOR_FLAG_BLOOD + if("uf") + return DNA_INJECTOR_FLAG_UF | DNA_INJECTOR_FLAG_NAME + if("mixed") + return ALL + return NONE + +/** + * Pass an injector flag and a genetic makeup buffer slot to create a DNA Injector + */ +/obj/machinery/computer/dna_console/proc/make_cosmetic_dna_injector(dna_flag, list/buffer_slot = list()) + if(!dna_flag || !length(buffer_slot)) + return FALSE + + var/datum/dna/stored_dna = new() + + if(dna_flag & DNA_INJECTOR_FLAG_NAME) + if(!buffer_slot["name"]) + return FALSE + stored_dna.real_name = buffer_slot["name"] + + if(dna_flag & DNA_INJECTOR_FLAG_BLOOD) + if(!buffer_slot["blood_type"]) + return FALSE + stored_dna.blood_type = buffer_slot["blood_type"] + + if(dna_flag & DNA_INJECTOR_FLAG_UI) + if(!buffer_slot["UI"]) + return FALSE + stored_dna.unique_identity = buffer_slot["UI"] + + if(dna_flag & DNA_INJECTOR_FLAG_UE) + if(!buffer_slot["UE"]) + return FALSE + stored_dna.unique_enzymes = buffer_slot["UE"] + + if(dna_flag & DNA_INJECTOR_FLAG_UF) + if(!buffer_slot["UF"]) + return FALSE + stored_dna.unique_features = buffer_slot["UF"] + + new /obj/item/dnainjector/timed(loc, stored_dna, get_injector_damage_coeff()) + return TRUE + +#undef DNA_INJECTOR_FLAG_UI +#undef DNA_INJECTOR_FLAG_UE +#undef DNA_INJECTOR_FLAG_UF +#undef DNA_INJECTOR_FLAG_NAME +#undef DNA_INJECTOR_FLAG_BLOOD + /** * Checks if there is a valid DNA Scanner occupant for genetic modification * diff --git a/code/game/machinery/computer/orders/order_items/mining/order_mining.dm b/code/game/machinery/computer/orders/order_items/mining/order_mining.dm index cf33d3bd8e5..d628e3fc329 100644 --- a/code/game/machinery/computer/orders/order_items/mining/order_mining.dm +++ b/code/game/machinery/computer/orders/order_items/mining/order_mining.dm @@ -122,4 +122,4 @@ /datum/orderable_item/mining/grapple_gun purchase_path = /obj/item/grapple_gun - cost_per_order = 3000 + cost_per_order = 1500 diff --git a/code/game/machinery/computer/orders/order_items/mining/order_pka.dm b/code/game/machinery/computer/orders/order_items/mining/order_pka.dm index ceaa83d8ef7..9ebe4b72b8b 100644 --- a/code/game/machinery/computer/orders/order_items/mining/order_pka.dm +++ b/code/game/machinery/computer/orders/order_items/mining/order_pka.dm @@ -34,7 +34,7 @@ cost_per_order = 150 /datum/orderable_item/accelerator/aoe_mobs - purchase_path = /obj/item/borg/upgrade/modkit/aoe/mobs + purchase_path = /obj/item/borg/upgrade/modkit/cooldown/aoe/mobs cost_per_order = 1500 /datum/orderable_item/accelerator/minebot_passthrough diff --git a/code/game/machinery/computer/records/medical.dm b/code/game/machinery/computer/records/medical.dm index af464c0be42..aeaa0d5a19a 100644 --- a/code/game/machinery/computer/records/medical.dm +++ b/code/game/machinery/computer/records/medical.dm @@ -106,7 +106,7 @@ if(!content) return FALSE - var/datum/medical_note/new_note = new(usr.name, content, station_time_timestamp()) + var/datum/medical_note/new_note = new(usr.name, content, round_timestamp()) while(length(target.medical_notes) > 2) target.medical_notes.Cut(1, 2) diff --git a/code/game/machinery/digital_clock.dm b/code/game/machinery/digital_clock.dm index 57c58083aae..e43ed60c32f 100644 --- a/code/game/machinery/digital_clock.dm +++ b/code/game/machinery/digital_clock.dm @@ -110,7 +110,7 @@ if(obj_flags & EMAGGED) station_minutes = rand(0, 99) else - station_minutes = text2num(station_time_timestamp(format = "mm")) + station_minutes = text2num(round_timestamp(format = "mm")) // tenth / the '3' in '31' / 31 -> 3.1 -> 3 var/station_minute_tenth = station_minutes >= 10 ? round(station_minutes * 0.1) : 0 @@ -122,7 +122,7 @@ if(obj_flags & EMAGGED) station_hours = rand(0, 99) else - station_hours = text2num(station_time_timestamp(format = "hh")) + station_hours = text2num(round_timestamp(format = "hh")) // one / the '1' in '12' / 12 -> 1.2 -> 1 var/station_hours_tenth = station_minutes >= 10 ? round(station_hours * 0.1) : 0 diff --git a/code/game/machinery/dna_infuser/infuser_entries/infuser_tier_one_entries.dm b/code/game/machinery/dna_infuser/infuser_entries/infuser_tier_one_entries.dm index e69a78f132d..83ed8b3a02e 100644 --- a/code/game/machinery/dna_infuser/infuser_entries/infuser_tier_one_entries.dm +++ b/code/game/machinery/dna_infuser/infuser_entries/infuser_tier_one_entries.dm @@ -214,3 +214,43 @@ tier = DNA_MUTANT_TIER_ONE unreachable_effect = TRUE status_effect_type = /datum/status_effect/organ_set_bonus/fish + +/datum/infuser_entry/stoat + name = "Stoat" + infuse_mob_name = "stoat" + desc = "We looked at a stoat, and begin to admire its fearless nature, hunting animals much larger than itself head on. \ + This kind of action is what we need on the corporate ladder." + threshold_desc = "become fearless, dodging attacks from larger opponents" + qualities = list( + "a snout!", + "really tall", + "better senses, weaker organs", + "instinctively want to be alone", + "ferocious bites - especially when grappling", + "rodents and eggs look very tasty... but anything plant does not", + ) + input_obj_or_mob = list( + /mob/living/basic/stoat, + ) + output_organs = list( + /obj/item/organ/eyes/stoat, + /obj/item/organ/ears/stoat, + /obj/item/organ/heart/stoat, + /obj/item/organ/tongue/stoat, + /obj/item/organ/snout/stoat, + ) + infusion_desc = "ermine" + tier = DNA_MUTANT_TIER_ONE + status_effect_type = /datum/status_effect/organ_set_bonus/stoat + +/datum/infuser_entry/stoat/get_output_organs(mob/living/carbon/human/target, atom/movable/infused_from) + // eyes and ears are low priority, infuse them last + var/datum/status_effect/organ_set_bonus/stoat/organ_tracker = target.has_status_effect(__IMPLIED_TYPE__) + if(organ_tracker?.organs < 3) + return list( + /obj/item/organ/heart/stoat, + /obj/item/organ/tongue/stoat, + /obj/item/organ/snout/stoat, + ) + + return ..() diff --git a/code/game/machinery/dna_infuser/infuser_entries/infuser_tier_zero_entries.dm b/code/game/machinery/dna_infuser/infuser_entries/infuser_tier_zero_entries.dm index e4d93a587f8..a00e561d589 100644 --- a/code/game/machinery/dna_infuser/infuser_entries/infuser_tier_zero_entries.dm +++ b/code/game/machinery/dna_infuser/infuser_entries/infuser_tier_zero_entries.dm @@ -110,3 +110,56 @@ ) infusion_desc = "domestic" tier = DNA_MUTANT_TIER_ZERO + +/datum/infuser_entry/penguin + name = "Penguin" + infuse_mob_name = "penguin" + desc = "Honestly, there wasn't much to gleam from a penguin's DNA, other than they walk funny." + threshold_desc = DNA_INFUSION_NO_THRESHOLD + qualities = list( + "you waddle when you walk", + ) + input_obj_or_mob = list( + /mob/living/basic/pet/penguin, + ) + output_organs = list( + /obj/item/organ/ears/penguin, + ) + infusion_desc = "waddly" + tier = DNA_MUTANT_TIER_ZERO + +/datum/infuser_entry/plants + name = "Plant" + infuse_mob_name = "plant hybrid" + desc = "Hydroponics research has long been interested in splicing human DNA into plant DNA, creating podpeople. \ + Many scientists didn't want to let those hippies get the leg up on them, so they attempted the opposite - to pretty uninteresting results." + threshold_desc = DNA_INFUSION_NO_THRESHOLD + qualities = list( + "gives you neat hair", + "not much else, honestly", + ) + input_obj_or_mob = list( + /obj/item/food/grown, + /obj/item/grown, + ) + output_organs = list( + /obj/item/organ/appendix/pod, + /obj/item/organ/brain/pod, + /obj/item/organ/ears/pod, + /obj/item/organ/eyes/pod, + /obj/item/organ/heart/pod, + /obj/item/organ/liver/pod, + /obj/item/organ/lungs/pod, + /obj/item/organ/pod_hair, + /obj/item/organ/stomach/pod, + /obj/item/organ/tongue/pod, + ) + infusion_desc = "botanical" + tier = DNA_MUTANT_TIER_ZERO + +/datum/infuser_entry/plants/get_output_organs(mob/living/carbon/human/target, atom/movable/infused_from) + // Prioritize pod hair since it's the only thing that matters here + if(!target.get_organ_by_type(/obj/item/organ/pod_hair)) + return list(/obj/item/organ/pod_hair) + + return ..() diff --git a/code/game/machinery/dna_infuser/organ_sets/fish_organs.dm b/code/game/machinery/dna_infuser/organ_sets/fish_organs.dm index 2284e2afa18..78a32be3c6f 100644 --- a/code/game/machinery/dna_infuser/organ_sets/fish_organs.dm +++ b/code/game/machinery/dna_infuser/organ_sets/fish_organs.dm @@ -6,7 +6,6 @@ /// Currently liver, stomach, lungs and tail plus tongue #define FISH_INFUSION_ALL_ORGANS 4 -///bonus of the observing gondola: you can ignore environmental hazards /datum/status_effect/organ_set_bonus/fish id = "organ_set_bonus_fish" tick_interval = 1 SECONDS diff --git a/code/game/machinery/dna_infuser/organ_sets/goliath_organs.dm b/code/game/machinery/dna_infuser/organ_sets/goliath_organs.dm index 8939fb64e0f..3a9a893d54d 100644 --- a/code/game/machinery/dna_infuser/organ_sets/goliath_organs.dm +++ b/code/game/machinery/dna_infuser/organ_sets/goliath_organs.dm @@ -3,7 +3,6 @@ #define GOLIATH_PUPIL_COLOR COLOR_RED #define GOLIATH_COLORS GOLIATH_ORGAN_COLOR + GOLIATH_SCLERA_COLOR + GOLIATH_PUPIL_COLOR -///bonus of the goliath: you can swim through space! /datum/status_effect/organ_set_bonus/goliath id = "organ_set_bonus_goliath" organs_needed = 4 diff --git a/code/game/machinery/dna_infuser/organ_sets/gondola_organs.dm b/code/game/machinery/dna_infuser/organ_sets/gondola_organs.dm index b3d400ac39d..d8c0ee95f53 100644 --- a/code/game/machinery/dna_infuser/organ_sets/gondola_organs.dm +++ b/code/game/machinery/dna_infuser/organ_sets/gondola_organs.dm @@ -57,6 +57,7 @@ Fluoride Stare: After someone says 5 words, blah blah blah... post_init_icon_state = "tongue" greyscale_config = /datum/greyscale_config/mutant_organ greyscale_colors = GONDOLA_COLORS + speakable_with = FALSE organ_traits = list(TRAIT_MUTE) /obj/item/organ/tongue/gondola/Initialize(mapload) diff --git a/code/game/machinery/dna_infuser/organ_sets/rat_organs.dm b/code/game/machinery/dna_infuser/organ_sets/rat_organs.dm index 3b1e1b9f3bb..d9a0abbe76a 100644 --- a/code/game/machinery/dna_infuser/organ_sets/rat_organs.dm +++ b/code/game/machinery/dna_infuser/organ_sets/rat_organs.dm @@ -62,6 +62,7 @@ greyscale_config = /datum/greyscale_config/mutant_organ greyscale_colors = RAT_COLORS beat_noise = "a fast-paced high-pitched pit-pat" + organ_traits = list(TRAIT_DWARF) /obj/item/organ/heart/rat/Initialize(mapload) . = ..() @@ -74,8 +75,6 @@ if(!ishuman(receiver)) return var/mob/living/carbon/human/human_receiver = receiver - if(human_receiver.can_mutate()) - human_receiver.dna.add_mutation(/datum/mutation/dwarfism, MUTATION_SOURCE_RAT_HEART) //but 1.5 damage human_receiver.physiology?.damage_resistance -= 50 @@ -84,7 +83,6 @@ if(!ishuman(heartless)) return var/mob/living/carbon/human/human_heartless = heartless - human_heartless.dna.remove_mutation(/datum/mutation/dwarfism, MUTATION_SOURCE_RAT_HEART) human_heartless.physiology?.damage_resistance += 50 /// you occasionally squeak, and have some rat related verbal tics diff --git a/code/game/machinery/dna_infuser/organ_sets/stoat_organs.dm b/code/game/machinery/dna_infuser/organ_sets/stoat_organs.dm new file mode 100644 index 00000000000..90c5c2c1f4f --- /dev/null +++ b/code/game/machinery/dna_infuser/organ_sets/stoat_organs.dm @@ -0,0 +1,303 @@ +// Organ color - Sclera color - Pupil color +#define STOAT_COLORS COLOR_BROWNER_BROWN + COLOR_BLACK + COLOR_BLACK + +/datum/status_effect/organ_set_bonus/stoat + id = "organ_set_bonus_stoat" + tick_interval = 3 SECONDS + organs_needed = 4 + bonus_activate_text = span_notice("Stoat DNA is deeply infused with you! \ + Your instincts set in - you now feel fearless, as if you could take on any enemy, no matter the size difference.") + bonus_deactivate_text = span_notice("You are no longer majority stoat, \ + and you realize larger enemies are quite intimidating after all.") + bonus_traits = list(TRAIT_FEARLESS, TRAIT_NOFEAR_HOLDUPS) + COOLDOWN_DECLARE(big_attack_dodge_cd) + +/datum/status_effect/organ_set_bonus/stoat/enable_bonus(obj/item/organ/inserted_organ) + . = ..() + RegisterSignal(owner, COMSIG_LIVING_CHECK_BLOCK, PROC_REF(dodge_bigger_attack)) + +/datum/status_effect/organ_set_bonus/stoat/disable_bonus(obj/item/organ/removed_organ) + . = ..() + UnregisterSignal(owner, COMSIG_LIVING_CHECK_BLOCK) + owner.clear_mood_event("stoat_enemy") + owner.clear_mood_event("stoat_friendly") + +/datum/status_effect/organ_set_bonus/stoat/on_remove() + . = ..() + UnregisterSignal(owner, COMSIG_LIVING_CHECK_BLOCK) + owner.clear_mood_event("stoat_enemy") + owner.clear_mood_event("stoat_friendly") + +/datum/status_effect/organ_set_bonus/stoat/proc/dodge_bigger_attack(datum/source, atom/movable/hit_by, damage, the_attack, attack_type, ...) + SIGNAL_HANDLER + + if(attack_type != UNARMED_ATTACK && attack_type != OVERWHELMING_ATTACK && attack_type != LEAP_ATTACK) + return NONE + if(!COOLDOWN_FINISHED(src, big_attack_dodge_cd)) + return NONE + if(isliving(hit_by)) + var/mob/living/attacker = hit_by + if(attacker.mob_size <= owner.mob_size) + return NONE + else if(!ismecha(hit_by)) + return NONE + + if(owner.incapacitated || owner.is_blind()) + return FAILED_BLOCK + + INVOKE_ASYNC(owner, TYPE_PROC_REF(/mob, emote), "spin") + owner.visible_message( + span_warning("[owner] instinctively dodges [the_attack] from [hit_by]!"), + span_warning("You instinctively dodge out of the way of [the_attack] from [hit_by]!"), + vision_distance = COMBAT_MESSAGE_RANGE, + ) + owner.add_movespeed_modifier(/datum/movespeed_modifier/stoat_dodge) + addtimer(CALLBACK(owner, TYPE_PROC_REF(/mob, remove_movespeed_modifier), /datum/movespeed_modifier/stoat_dodge), 1 SECONDS) + COOLDOWN_START(src, big_attack_dodge_cd, 5 SECONDS) + playsound(owner, 'sound/items/weapons/punchmiss.ogg', 25, TRUE, -1) + return SUCCESSFUL_BLOCK + +/datum/status_effect/organ_set_bonus/stoat/proc/is_dangerous_mob(mob/living/target) + if(target.stat >= UNCONSCIOUS) + return FALSE + if(istype(target, /mob/living/basic/stoat)) + return owner.gender == MALE && target.gender == MALE // other stoats are ENEMIES if we are both males + for(var/obj/item/weapon in target.held_items) + if(weapon.force > 15 || isgun(weapon)) + return TRUE + if(target.mob_size > owner.mob_size) + return TRUE + if(target.mob_size == owner.mob_size) + return !ishuman(target) // assuming same-sized animals are enemies, same-sized humans are friends + return FALSE + +/datum/status_effect/organ_set_bonus/stoat/proc/is_friendly_mob(mob/living/target) + if(target.stat >= UNCONSCIOUS) + return FALSE + if(istype(target, /mob/living/basic/stoat)) + return owner.gender != MALE || target.gender != MALE + if(ishuman(target)) + return TRUE + return FALSE + +/datum/status_effect/organ_set_bonus/stoat/tick(seconds_between_ticks) + . = ..() + if(!bonus_active) + return + var/nearby_friends = 0 + var/nearby_enemies = 0 + for(var/obj/vehicle/sealed/mecha/mech in oview(owner, 5)) + nearby_enemies++ + for(var/mob/living/nearby in oview(owner, 5)) + if(is_dangerous_mob(nearby)) + nearby_enemies++ + else if(is_friendly_mob(nearby)) + nearby_friends++ + + if(nearby_enemies) + switch(nearby_enemies) + if(1) + owner.add_mood_event("stoat_enemy", /datum/mood_event/stoat/enemies_nearby/one) + if(2 to 4) + owner.add_mood_event("stoat_enemy", /datum/mood_event/stoat/enemies_nearby/multiple) + if(4 to INFINITY) + owner.add_mood_event("stoat_enemy", /datum/mood_event/stoat/enemies_nearby/crowd) + owner.clear_mood_event("stoat_friendly") + + else + switch(nearby_friends) + if(0) + owner.add_mood_event("stoat_friendly", /datum/mood_event/stoat/friendlies_nearby/one) + if(2 to 4) + owner.add_mood_event("stoat_friendly", /datum/mood_event/stoat/friendlies_nearby/multiple) + if(4 to INFINITY) + owner.add_mood_event("stoat_friendly", /datum/mood_event/stoat/friendlies_nearby/crowd) + owner.clear_mood_event("stoat_enemy") + + +/obj/item/organ/heart/stoat + name = "mutated stoat-heart" + desc = "Stoat DNA infused into what was once a normal heart." + icon = 'icons/map_icons/items/_item.dmi' + icon_state = "/obj/item/organ/heart/stoat" + post_init_icon_state = "heart" + greyscale_config = /datum/greyscale_config/mutant_organ + greyscale_colors = STOAT_COLORS + beat_noise = "a fast-paced high-pitched pit-pat" + maxHealth = parent_type::maxHealth * 0.8 // weaker heart + /// Tracks height of the mob on add + var/mob_base_height = HUMAN_HEIGHT_MEDIUM + +/obj/item/organ/heart/stoat/Initialize(mapload) + . = ..() + AddElement(/datum/element/organ_set_bonus, /datum/status_effect/organ_set_bonus/stoat) + AddElement(/datum/element/update_icon_blocker) + +/obj/item/organ/heart/stoat/on_mob_insert(mob/living/carbon/organ_owner, special, movement_flags) + . = ..() + if(!ishuman(organ_owner)) + return + var/mob/living/carbon/human/human_owner = organ_owner + mob_base_height = human_owner.get_base_mob_height() + human_owner.set_mob_height(HUMAN_HEIGHT_TALLEST, update_dna = FALSE) + +/obj/item/organ/heart/stoat/on_mob_remove(mob/living/carbon/organ_owner, special, movement_flags) + . = ..() + if(!ishuman(organ_owner)) + return + var/mob/living/carbon/human/human_owner = organ_owner + human_owner.set_mob_height(mob_base_height, update_dna = FALSE) + +/obj/item/organ/tongue/stoat + name = "mutated stoat-tongue" + desc = "Stoat DNA infused into what was once a normal tongue." + say_mod = "chirps" + modifies_speech = TRUE + icon = 'icons/map_icons/items/_item.dmi' + icon_state = "/obj/item/organ/tongue/rat" + post_init_icon_state = "tongue" + greyscale_config = /datum/greyscale_config/mutant_organ + greyscale_colors = STOAT_COLORS + liked_foodtypes = MEAT | RAW | GORE | BUGS + disliked_foodtypes = FRUIT | VEGETABLES + taste_sensitivity = 12 + organ_traits = list(TRAIT_FERAL_BITER) + +/obj/item/organ/tongue/stoat/Initialize(mapload) + . = ..() + AddElement(/datum/element/organ_set_bonus, /datum/status_effect/organ_set_bonus/stoat) + +/obj/item/organ/tongue/stoat/on_life(seconds_per_tick) + . = ..() + if(prob(1)) + playsound(owner, 'sound/mobs/non-humanoids/stoat/stoat_sounds.ogg', 100) + +/obj/item/organ/tongue/stoat/on_mob_insert(mob/living/carbon/receiver, special, movement_flags) + . = ..() + RegisterSignals(receiver, COMSIG_LIVING_GET_PERCEIVED_FOOD_QUALITY, PROC_REF(get_perceived_food_quality)) + if(ishuman(receiver)) + var/mob/living/carbon/human/human_receiver = receiver + human_receiver.physiology.hunger_mod *= 2 + +/obj/item/organ/tongue/stoat/on_mob_remove(mob/living/carbon/organ_owner, special, movement_flags) + . = ..() + UnregisterSignal(organ_owner, COMSIG_LIVING_GET_PERCEIVED_FOOD_QUALITY) + if(ishuman(organ_owner)) + var/mob/living/carbon/human/human_remover = organ_owner + human_remover.physiology.hunger_mod /= 2 + +/obj/item/organ/tongue/stoat/on_bodypart_insert(obj/item/bodypart/limb) + . = ..() + limb.unarmed_damage_low += 7 + limb.unarmed_damage_high += 7 + limb.unarmed_effectiveness += 20 + limb.unarmed_pummeling_bonus += 0.75 + limb.unarmed_attack_effect = ATTACK_EFFECT_BITE + limb.unarmed_sharpness = SHARP_POINTY + +/obj/item/organ/tongue/stoat/on_bodypart_remove(obj/item/bodypart/limb) + . = ..() + limb.unarmed_damage_low -= 7 + limb.unarmed_damage_high -= 7 + limb.unarmed_effectiveness -= 20 + limb.unarmed_pummeling_bonus -= 0.75 + limb.unarmed_attack_effect = initial(limb.unarmed_attack_effect) + limb.unarmed_sharpness = initial(limb.unarmed_sharpness) + +/obj/item/organ/tongue/stoat/proc/get_perceived_food_quality(mob/living/carbon/consumer, obj/item/food/consumed_food, list/extra_quality) + SIGNAL_HANDLER + + if(organ_flags & ORGAN_FAILING) + return + if(istype(consumed_food, /obj/item/food/deadmouse) || istype(consumed_food, /obj/item/food/egg)) + extra_quality += LIKED_FOOD_QUALITY_CHANGE + +/obj/item/organ/eyes/stoat + name = "mutated stoat-eyes" + desc = "Stoat DNA infused into what was once a normal pair of eyes." + icon = 'icons/map_icons/items/_item.dmi' + icon_state = "/obj/item/organ/eyes/stoat" + post_init_icon_state = "eyes" + greyscale_config = /datum/greyscale_config/mutant_organ + greyscale_colors = STOAT_COLORS + eye_color_left = COLOR_BLACK + eye_color_right = COLOR_BLACK + lighting_cutoff = LIGHTING_CUTOFF_LOW + maxHealth = parent_type::maxHealth * 0.8 // weaker eyes + penlight_message = "shine green" + +/obj/item/organ/eyes/stoat/Initialize(mapload) + . = ..() + AddElement(/datum/element/organ_set_bonus, /datum/status_effect/organ_set_bonus/stoat) + AddElement(/datum/element/noticable_organ, "%PRONOUN_Their eyes are black orbs.", zone) + +/obj/item/organ/ears/stoat + name = "mutated stoat-ears" + desc = "Stoat DNA infused into what was once a normal pair of ears." + icon = 'icons/map_icons/items/_item.dmi' + icon_state = "/obj/item/organ/ears/stoat" + post_init_icon_state = "ears" + greyscale_config = /datum/greyscale_config/mutant_organ + greyscale_colors = STOAT_COLORS + damage_multiplier = 1.2 + maxHealth = parent_type::maxHealth * 0.8 // weaker ears + +/obj/item/organ/ears/stoat/Initialize(mapload) + . = ..() + AddElement(/datum/element/organ_set_bonus, /datum/status_effect/organ_set_bonus/stoat) + AddElement(/datum/element/noticable_organ, "%PRONOUN_Their ears are furred, and twitch occasionally.", zone) + +/obj/item/organ/ears/stoat/on_mob_insert(mob/living/carbon/organ_owner, special, movement_flags) + . = ..() + organ_owner.eavesdrop_range += 2 + +/obj/item/organ/ears/stoat/on_mob_remove(mob/living/carbon/organ_owner, special, movement_flags) + . = ..() + organ_owner.eavesdrop_range -= 2 + +/obj/item/organ/snout/stoat + name = "stoat snout" + +/obj/item/organ/snout/stoat/Initialize(mapload) + . = ..() + AddElement(/datum/element/organ_set_bonus, /datum/status_effect/organ_set_bonus/stoat) + +/datum/mood_event/stoat + +/datum/mood_event/stoat/enemies_nearby + event_flags = MOOD_EVENT_FEAR + +/datum/mood_event/stoat/enemies_nearby/one + description = "My instincts say there's something dangerous nearby, better be careful." + mood_change = -1 + +/datum/mood_event/stoat/enemies_nearby/multiple + description = "My instincts say there potential danger nearby, better be on edge." + mood_change = -3 + +/datum/mood_event/stoat/enemies_nearby/crowd + description = "My instincts say there are a lot of dangerous things nearby, I need to get out of here!" + mood_change = -5 + +/datum/mood_event/stoat/alone + description = "There is no one nearby, my instincts are at rest. I feel at peace." + mood_change = 1 + +/datum/mood_event/stoat/friendlies_nearby + event_flags = MOOD_EVENT_FEAR + +/datum/mood_event/stoat/friendlies_nearby/one + description = "There is only one friend nearby, my instincts are at rest." + +/datum/mood_event/stoat/friendlies_nearby/multiple + description = "My instincts say there are too many people nearby, I feel a little on edge." + mood_change = -1 + +/datum/mood_event/stoat/friendlies_nearby/crowd + description = "My instincts say there are too many people nearby, I need to get out of here!" + mood_change = -3 + +/datum/movespeed_modifier/stoat_dodge + multiplicative_slowdown = 1 + +#undef STOAT_COLORS diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 5103813eead..ed8d694c71a 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -1582,7 +1582,7 @@ bolt() //Bolt it! set_electrified(MACHINE_ELECTRIFIED_PERMANENT) //Shock it! if(origin) - LAZYADD(shockedby, "\[[time_stamp()]\] [key_name(origin)]") + LAZYADD(shockedby, "\[[server_timestamp()]\] [key_name(origin)]") /obj/machinery/door/airlock/disable_lockdown() @@ -1606,7 +1606,7 @@ return if(prob(severity*10 - 20) && (secondsElectrified < 30) && (secondsElectrified != MACHINE_ELECTRIFIED_PERMANENT)) set_electrified(30) - LAZYADD(shockedby, "\[[time_stamp()]\]EM Pulse") + LAZYADD(shockedby, "\[[server_timestamp()]\]EM Pulse") /obj/machinery/door/airlock/proc/set_electrified(seconds, mob/user) secondsElectrified = seconds @@ -1623,7 +1623,7 @@ message = "unshocked" else message = "temp shocked for [secondsElectrified] seconds" - LAZYADD(shockedby, "\[[time_stamp()]\] [key_name(user)] - ([uppertext(message)])") + LAZYADD(shockedby, "\[[server_timestamp()]\] [key_name(user)] - ([uppertext(message)])") log_combat(user, src, message) add_hiddenprint(user) @@ -2407,6 +2407,10 @@ security_level = 1 damage_deflection = 30 +/obj/machinery/door/airlock/highsecurity/syndicate + icon = 'icons/obj/doors/airlocks/syndicate/highsec.dmi' + overlays_file = null + // Shuttle Airlocks /obj/machinery/door/airlock/shuttle diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 97a546f8f62..a3d62de92d8 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -322,6 +322,10 @@ return return ..() +/obj/machinery/door/allowed(mob/accessor) + return ..() || emergency + +/// A mob is trying to open or close the door /obj/machinery/door/proc/try_to_activate_door(mob/user, access_bypass = FALSE, bumped = FALSE) add_fingerprint(user) if(operating || (obj_flags & EMAGGED)) @@ -333,24 +337,8 @@ if(elevator_mode && elevator_status != LIFT_PLATFORM_UNLOCKED) return - var/access_check = access_bypass - if(emergency) - access_check = TRUE - else if(unrestricted_side(user) && !delayed_unres_open) - access_check = TRUE - else if(!requiresID()) - access_check = TRUE - else if(allowed(user)) // You - access_check = TRUE - else for(var/mob/living/human_backpack in user.buckled_mobs) - if(allowed(human_backpack)) // Your partner in crime - access_check = TRUE - break - - if(!access_check && unrestricted_side(user) && attempt_delayed_unres_open(user)) - access_check = TRUE - - if(access_check) + // note: if the ID wire is cut no ID cards are checked at all! (This is intentional!) + if(access_bypass || (requiresID() && user_can_activate_door(user))) if(density) open() else @@ -360,6 +348,18 @@ else if(!operating && density) run_animation(DOOR_DENY_ANIMATION) +/// Used in try_to_activate_door +/obj/machinery/door/proc/user_can_activate_door(mob/user) + PRIVATE_PROC(TRUE) + if(allowed(user)) + return TRUE + for(var/mob/living/human_backpack in user.buckled_mobs) + if(allowed(human_backpack)) + return TRUE + if(unrestricted_side(user)) + return !delayed_unres_open || attempt_delayed_unres_open(user) + return FALSE + /// Allows for specific side of airlocks to be unrestricted (IE, can exit maint freely, but need access to enter) /obj/machinery/door/proc/unrestricted_side(mob/opener) return get_dir(src, opener) & unres_sides diff --git a/code/game/machinery/doors/shutters.dm b/code/game/machinery/doors/shutters.dm index 46370354003..72c5f4f5eed 100644 --- a/code/game/machinery/doors/shutters.dm +++ b/code/game/machinery/doors/shutters.dm @@ -99,3 +99,15 @@ icon_state = "open" density = FALSE opacity = FALSE + +/obj/machinery/door/poddoor/shutters/syndicate + icon = 'icons/obj/doors/syndicateshutters.dmi' + +/obj/machinery/door/poddoor/shutters/syndicate/preopen + icon_state = "open" + density = FALSE + opacity = FALSE + +/obj/machinery/door/poddoor/shutters/syndicate/indestructible + name = "hardened syndicate shutters" + resistance_flags = INDESTRUCTIBLE diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index ee4158538b3..01ec6e7b66c 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -535,6 +535,18 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/door/window/brigdoor/security/holding icon_state = "rightsecure" base_state = "rightsecure" +/obj/machinery/door/window/brigdoor/security/holodeck + name = "cell door" + desc = "For keeping in criminal scum." + req_one_access = COMMON_ACCESS + +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/door/window/brigdoor/security/holodeck/left, 0) +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/door/window/brigdoor/security/holodeck/right, 0) + +/obj/machinery/door/window/brigdoor/security/holodeck/right + icon_state = "rightsecure" + base_state = "rightsecure" + /* * Subtype used in unit tests to ensure instant windoor open/close */ diff --git a/code/game/machinery/experimental_cloner/experimental_cloner_pod.dm b/code/game/machinery/experimental_cloner/experimental_cloner_pod.dm index 460786c9ea8..617d013fab3 100644 --- a/code/game/machinery/experimental_cloner/experimental_cloner_pod.dm +++ b/code/game/machinery/experimental_cloner/experimental_cloner_pod.dm @@ -163,7 +163,7 @@ GLOBAL_VAR_INIT(experimental_cloner_fuckup_chance, 50) if (prob(75)) var/static/list/permitted_heights = list(HUMAN_HEIGHT_SHORTEST, HUMAN_HEIGHT_SHORT, HUMAN_HEIGHT_MEDIUM, HUMAN_HEIGHT_TALL, HUMAN_HEIGHT_TALLER, HUMAN_HEIGHT_TALLEST) - new_clone.dna.remove_mutation(/datum/mutation/dwarfism, list(MUTATION_SOURCE_ACTIVATED, MUTATION_SOURCE_MUTATOR)) + new_clone.dna.remove_mutation(/datum/mutation/dwarfism, GLOB.standard_mutation_sources) new_clone.set_mob_height(pick(permitted_heights - loaded_record.height)) // To differentiate the clones return new_clone diff --git a/code/game/machinery/fat_sucker.dm b/code/game/machinery/fat_sucker.dm index d9806ba6f2b..a0756ca11db 100644 --- a/code/game/machinery/fat_sucker.dm +++ b/code/game/machinery/fat_sucker.dm @@ -190,17 +190,17 @@ meat.set_custom_materials(list(SSmaterials.get_material(/datum/material/meat/mob_meat, C) = round(SHEET_MATERIAL_AMOUNT * (4/3)))) nutrients = 0 -/obj/machinery/fat_sucker/screwdriver_act(mob/living/user, obj/item/I) +/obj/machinery/fat_sucker/screwdriver_act(mob/living/user, obj/item/tool) if(occupant) to_chat(user, span_warning("[src] is currently occupied!")) return ITEM_INTERACT_BLOCKING if(state_open) to_chat(user, span_warning("[src] must be closed to [panel_open ? "close" : "open"] its maintenance hatch!")) return ITEM_INTERACT_BLOCKING - return default_deconstruction_screwdriver(user, I) + return default_deconstruction_screwdriver(user, tool) -/obj/machinery/fat_sucker/crowbar_act(mob/living/user, obj/item/I) - return default_deconstruction_crowbar(user, I) +/obj/machinery/fat_sucker/crowbar_act(mob/living/user, obj/item/tool) + return default_deconstruction_crowbar(user, tool) /obj/machinery/fat_sucker/emag_act(mob/user, obj/item/card/emag/emag_card) if(obj_flags & EMAGGED) diff --git a/code/game/machinery/launch_pad.dm b/code/game/machinery/launch_pad.dm index 34a52615623..ed60bd83539 100644 --- a/code/game/machinery/launch_pad.dm +++ b/code/game/machinery/launch_pad.dm @@ -91,7 +91,12 @@ /obj/machinery/launchpad/update_icon_state() . = ..() - icon_state = panel_open ? "[base_icon_state]-open" : base_icon_state + if(machine_stat & (BROKEN|NOPOWER)) + icon_state = "[base_icon_state]-off" + else if(state_open) + icon_state = "[base_icon_state]-open" + else + icon_state = "[base_icon_state]-idle" /obj/machinery/launchpad/attack_ghost(mob/dead/observer/ghost) . = ..() @@ -399,11 +404,18 @@ if("move_pos") var/plus_x = text2num(params["x"]) var/plus_y = text2num(params["y"]) - // sanitizes our ranges for us - our_pad.set_offset( - x = our_pad.x_offset + plus_x, - y = our_pad.y_offset + plus_y - ) + if(plus_x || plus_y) + // sanitizes our ranges for us + our_pad.set_offset( + x = our_pad.x_offset + plus_x, + y = our_pad.y_offset + plus_y, + ) + else + // for resetting + our_pad.set_offset( + x = 0, + y = 0, + ) . = TRUE if("rename") . = TRUE diff --git a/code/game/machinery/medipen_refiller.dm b/code/game/machinery/medipen_refiller.dm index 272365dfea6..65e848b54bb 100644 --- a/code/game/machinery/medipen_refiller.dm +++ b/code/game/machinery/medipen_refiller.dm @@ -119,12 +119,10 @@ return TRUE /obj/machinery/medipen_refiller/wrench_act(mob/living/user, obj/item/tool) - default_unfasten_wrench(user, tool) - return ITEM_INTERACT_SUCCESS + return default_unfasten_wrench(user, tool) /obj/machinery/medipen_refiller/crowbar_act(mob/living/user, obj/item/tool) - default_deconstruction_crowbar(tool) - return ITEM_INTERACT_SUCCESS + return default_deconstruction_crowbar(user, tool) /obj/machinery/medipen_refiller/screwdriver_act(mob/living/user, obj/item/tool) return default_deconstruction_screwdriver(user, tool) diff --git a/code/game/machinery/newscaster/newscaster_data.dm b/code/game/machinery/newscaster/newscaster_data.dm index 59b8f09db47..6c91c94d6af 100644 --- a/code/game/machinery/newscaster/newscaster_data.dm +++ b/code/game/machinery/newscaster/newscaster_data.dm @@ -207,7 +207,7 @@ GLOBAL_LIST_EMPTY(request_list) var/datum/feed_message/new_article = new /datum/feed_message new_article.author = author new_article.body = msg - new_article.time_stamp = "[station_time_timestamp()]" + new_article.time_stamp = "[round_timestamp()]" new_article.is_admin_message = adminMessage new_article.locked = !allow_comments @@ -243,7 +243,7 @@ GLOBAL_LIST_EMPTY(request_list) var/datum/feed_comment/new_feed_comment = new/datum/feed_comment new_feed_comment.author = newscaster_username new_feed_comment.body = comment_text - new_feed_comment.time_stamp = station_time_timestamp() + new_feed_comment.time_stamp = round_timestamp() GLOB.news_network.last_action ++ current_message.comments += new_feed_comment if(user) diff --git a/code/game/machinery/prisongate.dm b/code/game/machinery/prisongate.dm index 88cb40dd50f..688ddc08702 100644 --- a/code/game/machinery/prisongate.dm +++ b/code/game/machinery/prisongate.dm @@ -1,4 +1,7 @@ #define SPAM_CD (3 SECONDS) +#define ALLOW_EXIT "allow_exit" +#define BLOCK_EXIT "block_exit" +#define SKIP_EXIT null /obj/machinery/prisongate name = "prison gate scanner" @@ -14,6 +17,7 @@ idle_power_usage = BASE_MACHINE_IDLE_CONSUMPTION * 0.05 active_power_usage = BASE_MACHINE_ACTIVE_CONSUMPTION * 0.03 anchored = TRUE + req_one_access = list(ACCESS_BRIG) /// dictates whether the gate barrier is up or not var/gate_active = TRUE COOLDOWN_DECLARE(spam_cooldown_time) @@ -55,39 +59,74 @@ COOLDOWN_START(src, spam_cooldown_time, SPAM_CD) return FALSE var/mob/living/carbon/the_toucher = gate_toucher - if(gate_active == FALSE) + if(!gate_active) return TRUE - for(var/obj/item/card/id/regular_id in the_toucher.get_all_contents()) - var/list/id_access = regular_id.GetAccess() - if(ACCESS_BRIG in id_access) - if(COOLDOWN_FINISHED(src, spam_cooldown_time)) - say("Brig clearance detected. Access granted.") - playsound(src, 'sound/machines/chime.ogg', 50, FALSE) - COOLDOWN_START(src, spam_cooldown_time, SPAM_CD) - return TRUE - for(var/obj/item/card/id/advanced/prisoner/prison_id in the_toucher.get_all_contents()) - if(!prison_id.timed) - continue - if(prison_id.time_to_assign) - say("Prison ID with active sentence detected. Please enjoy your stay in our corporate rehabilitation center, [prison_id.registered_name]!") - playsound(src, 'sound/machines/chime.ogg', 50, FALSE) - prison_id.time_left = prison_id.time_to_assign - prison_id.time_to_assign = initial(prison_id.time_to_assign) - prison_id.start_timer() - return TRUE - if(prison_id.time_left <= 0) - say("Prison ID with served sentence detected. Access granted.") - prison_id.timed = FALSE //disables the id check from earlier so you can't just throw it back into perma for mass escapes - playsound(src, 'sound/machines/chime.ogg', 50, FALSE) - return TRUE + if(allowed(the_toucher)) if(COOLDOWN_FINISHED(src, spam_cooldown_time)) - say("Prison ID with ongoing sentence detected. Access denied.") - playsound(src, 'sound/machines/buzz/buzz-two.ogg', 50, FALSE) + say("Brig clearance detected. Access granted.") + playsound(src, 'sound/machines/chime.ogg', 50, FALSE) COOLDOWN_START(src, spam_cooldown_time, SPAM_CD) - return FALSE + return TRUE + + else if(the_toucher.pulledby && allowed(the_toucher.pulledby)) + if(COOLDOWN_FINISHED(src, spam_cooldown_time)) + say("Brig escort detected. Access granted.") + playsound(src, 'sound/machines/chime.ogg', 50, FALSE) + COOLDOWN_START(src, spam_cooldown_time, SPAM_CD) + return TRUE + + for(var/obj/item/card/id/advanced/prisoner/prison_id in the_toucher.get_all_contents()) + switch(allow_prisoner_id(prison_id)) + if(ALLOW_EXIT) + return TRUE + if(BLOCK_EXIT) + return FALSE + if(COOLDOWN_FINISHED(src, spam_cooldown_time)) to_chat(the_toucher, span_warning("You try to push through the hardlight barrier with little effect.")) COOLDOWN_START(src, spam_cooldown_time, SPAM_CD) return FALSE +/obj/machinery/prisongate/proc/allow_prisoner_id(obj/item/card/id/advanced/prisoner/prison_id) + if(!prison_id.timed) + return SKIP_EXIT + if(prison_id.time_to_assign) + say("Prison ID with active sentence detected. Please enjoy your stay in our corporate rehabilitation center, [prison_id.registered_name]!") + playsound(src, 'sound/machines/chime.ogg', 50, FALSE) + prison_id.time_left = prison_id.time_to_assign + prison_id.time_to_assign = initial(prison_id.time_to_assign) + prison_id.start_timer() + return ALLOW_EXIT + if(prison_id.time_left <= 0) + say("Prison ID with served sentence detected. Access granted.") + prison_id.timed = FALSE //disables the id check from earlier so you can't just throw it back into perma for mass escapes + playsound(src, 'sound/machines/chime.ogg', 50, FALSE) + return ALLOW_EXIT + if(COOLDOWN_FINISHED(src, spam_cooldown_time)) + say("Prison ID with ongoing sentence detected. Access denied.") + playsound(src, 'sound/machines/buzz/buzz-two.ogg', 50, FALSE) + COOLDOWN_START(src, spam_cooldown_time, SPAM_CD) + return BLOCK_EXIT + +/obj/machinery/prisongate/labour + name = "labor camp gate scanner" + +/obj/machinery/prisongate/labour/allow_prisoner_id(obj/item/card/id/advanced/prisoner/prison_id) + if(!prison_id.goal) + return SKIP_EXIT + if(prison_id.points >= prison_id.goal) + if(COOLDOWN_FINISHED(src, spam_cooldown_time)) + say("All points served. Access granted.") + playsound(src, 'sound/machines/chime.ogg', 50, FALSE) + COOLDOWN_START(src, spam_cooldown_time, SPAM_CD) + return ALLOW_EXIT + if(COOLDOWN_FINISHED(src, spam_cooldown_time)) + say("[prison_id.goal - prison_id.points] point\s remaining on sentence. Access denied.") + playsound(src, 'sound/machines/buzz/buzz-two.ogg', 50, FALSE) + COOLDOWN_START(src, spam_cooldown_time, SPAM_CD) + return BLOCK_EXIT + #undef SPAM_CD +#undef ALLOW_EXIT +#undef BLOCK_EXIT +#undef SKIP_EXIT diff --git a/code/game/machinery/quantum_pad.dm b/code/game/machinery/quantum_pad.dm index 3d3bbc76163..b57df71107f 100644 --- a/code/game/machinery/quantum_pad.dm +++ b/code/game/machinery/quantum_pad.dm @@ -94,7 +94,10 @@ /obj/machinery/quantumpad/update_icon_state() . = ..() - icon_state = panel_open ? "[base_icon_state]-idle-open" : "[base_icon_state]-idle" + if(machine_stat & (BROKEN|NOPOWER) || state_open) + icon_state = "[base_icon_state]-idle-open" + else + icon_state = "[base_icon_state]-idle" /obj/machinery/quantumpad/interact(mob/user, obj/machinery/quantumpad/target_pad = linked_pad) if(QDELETED(target_pad)) diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 71fb98e224d..1babfa078e9 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -389,7 +389,7 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments) /obj/machinery/requests_console/ui_data(mob/user) var/list/data = list() - data["is_admin_ghost_ai"] = isAdminGhostAI() + data["is_admin_ghost_ai"] = isAdminGhostAI(user) data["can_send_announcements"] = can_send_announcements data["department"] = department data["emergency"] = emergency diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm index 8903bacc8f0..5fcb061e065 100644 --- a/code/game/machinery/slotmachine.dm +++ b/code/game/machinery/slotmachine.dm @@ -579,7 +579,7 @@ desc = "Repurposed from a confiscated syndicate gambling ring. Losing is a crime. Winning is also a crime." symbol_paths = list( /obj/item/food/donut/berry, - /mob/living/simple_animal/bot/secbot/beepsky, + /mob/living/basic/bot/secbot/beepsky, /obj/item/melee/baton/security/loaded, /obj/item/gun/energy/disabler, /obj/vehicle/sealed/mecha/ripley/paddy, diff --git a/code/game/machinery/stasis.dm b/code/game/machinery/stasis.dm index 539d3cc0e8d..89f8c527e18 100644 --- a/code/game/machinery/stasis.dm +++ b/code/game/machinery/stasis.dm @@ -172,10 +172,10 @@ else if(HAS_TRAIT(L_occupant, TRAIT_STASIS)) thaw_them(L_occupant) -/obj/machinery/stasis/screwdriver_act(mob/living/user, obj/item/I) - return default_deconstruction_screwdriver(user, I) +/obj/machinery/stasis/screwdriver_act(mob/living/user, obj/item/tool) + return default_deconstruction_screwdriver(user, tool) -/obj/machinery/stasis/crowbar_act(mob/living/user, obj/item/I) - return default_deconstruction_crowbar(user, I) +/obj/machinery/stasis/crowbar_act(mob/living/user, obj/item/tool) + return default_deconstruction_crowbar(user, tool) #undef STASIS_TOGGLE_COOLDOWN diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 5b78deb2bc0..838e902f0bc 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -732,8 +732,7 @@ wires.interact(user) return ITEM_INTERACT_SUCCESS else if(tool.tool_behaviour == TOOL_CROWBAR) - default_deconstruction_crowbar(tool) - return ITEM_INTERACT_SUCCESS + return default_deconstruction_crowbar(user, tool) if(default_pry_open(user, tool) & ITEM_INTERACT_SUCCESS) dump_inventory_contents() diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index 97ac006bcd5..7eec0b16f40 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -24,10 +24,6 @@ if(user) to_chat(user, span_notice("The connected wire doesn't have enough current.")) return - for (var/datum/component/singularity/singulo as anything in GLOB.singularities) - var/atom/singulo_atom = singulo.parent - if(singulo_atom.z == z) - singulo.target = src icon_state = "[icontype]1" active = TRUE if(user) @@ -35,8 +31,7 @@ /obj/machinery/power/singularity_beacon/proc/Deactivate(mob/user = null) - for(var/_singulo in GLOB.singularities) - var/datum/component/singularity/singulo = _singulo + for(var/datum/component/singularity/singulo as anything in GLOB.singularities) if(singulo.target == src) singulo.target = null icon_state = "[icontype]0" @@ -97,10 +92,10 @@ add_load(energy_used) if(COOLDOWN_FINISHED(src, singularity_beacon_cd)) COOLDOWN_START(src, singularity_beacon_cd, 8 SECONDS) - for(var/_singulo_component in GLOB.singularities) - var/datum/component/singularity/singulo_component = _singulo_component + for(var/datum/component/singularity/singulo_component as anything in GLOB.singularities) var/atom/singulo = singulo_component.parent if(singulo.z == z) + singulo_component.target = src say("[singulo] is now [get_dist(src,singulo)] standard lengths away to the [dir2text(get_dir(src,singulo))]") else Deactivate() diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index c09b74cab85..942344a30d6 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -20,7 +20,7 @@ /// What is the lowest amount of time we can set the timer to? var/minimum_timer = SYNDIEBOMB_MIN_TIMER_SECONDS /// What is the highest amount of time we can set the timer to? - var/maximum_timer = 100 MINUTES + var/maximum_timer = 100*60 // 100 MINUTES // not using the MINUTES define because those are for deciseconds /// What is the default amount of time we set the timer to? var/timer_set = SYNDIEBOMB_MIN_TIMER_SECONDS /// Can we be unanchored? diff --git a/code/game/machinery/telecomms/machines/message_server.dm b/code/game/machinery/telecomms/machines/message_server.dm index f9fb183e53e..cb34bf1e813 100644 --- a/code/game/machinery/telecomms/machines/message_server.dm +++ b/code/game/machinery/telecomms/machines/message_server.dm @@ -105,7 +105,7 @@ if (calibrating) calibrating += world.time say("Calibrating... Estimated wait time: [rand(3, 9)] minutes.") - pda_msgs += new /datum/data_tablet_msg("System Administrator", "system", "This is an automated message. System calibration started at [station_time_timestamp()].") + pda_msgs += new /datum/data_tablet_msg("System Administrator", "system", "This is an automated message. System calibration started at [server_timestamp(ic_time = TRUE)] (PT: [round_timestamp()]).") else pda_msgs += new /datum/data_tablet_msg("System Administrator", "system", MESSAGE_SERVER_FUNCTIONING_MESSAGE) diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm index 4e7ca61d0dd..91e858273ec 100644 --- a/code/game/objects/effects/decals/cleanable.dm +++ b/code/game/objects/effects/decals/cleanable.dm @@ -82,12 +82,16 @@ RETURN_TYPE(/datum/reagents) if (reagents) return reagents + return init_reagents(decal_reagent, reagent_amount) - if (!decal_reagent) +/obj/effect/decal/cleanable/proc/init_reagents(reagent = null, amount = null) + RETURN_TYPE(/datum/reagents) + + if (!reagent) return - create_reagents(reagent_amount) - reagents.add_reagent(decal_reagent, reagent_amount) + create_reagents(amount) + reagents.add_reagent(reagent, amount) return reagents /obj/effect/decal/cleanable/item_interaction(mob/living/user, obj/item/tool, list/modifiers) diff --git a/code/game/objects/effects/decals/cleanable/blood.dm b/code/game/objects/effects/decals/cleanable/blood.dm index 6ce7fc07c5f..3c1481a0ceb 100644 --- a/code/game/objects/effects/decals/cleanable/blood.dm +++ b/code/game/objects/effects/decals/cleanable/blood.dm @@ -134,7 +134,9 @@ create_reagents(round(bloodiness * BLOOD_TO_UNITS_MULTIPLIER, CHEMICAL_VOLUME_ROUNDING)) var/num_reagents = length(reagents_to_add) for(var/reagent_type in reagents_to_add) - reagents.add_reagent(reagent_type, round(bloodiness * BLOOD_TO_UNITS_MULTIPLIER / num_reagents, CHEMICAL_VOLUME_ROUNDING)) + reagents.add_reagent(reagent_type = reagent_type, + amount = round(bloodiness * BLOOD_TO_UNITS_MULTIPLIER / num_reagents, CHEMICAL_VOLUME_ROUNDING), + data = ispath(reagent_type, /datum/reagent/blood) ? list("blood_DNA" = pick(blood_DNA)) : null) return reagents /obj/effect/decal/cleanable/blood/replace_decal(obj/effect/decal/cleanable/blood/merger) @@ -540,13 +542,7 @@ /obj/effect/decal/cleanable/blood/gibs/lazy_init_reagents() if (reagents) return reagents - - if (!decal_reagent) - return - - create_reagents(reagent_amount) - reagents.add_reagent(decal_reagent, reagent_amount) - return reagents + return init_reagents(decal_reagent, reagent_amount) /obj/effect/decal/cleanable/blood/gibs/update_overlays() . = ..() diff --git a/code/game/objects/effects/decals/cleanable/toxic.dm b/code/game/objects/effects/decals/cleanable/toxic.dm new file mode 100644 index 00000000000..13a3fe57a0f --- /dev/null +++ b/code/game/objects/effects/decals/cleanable/toxic.dm @@ -0,0 +1,61 @@ +#define DISSOLVE_DURATION 45 SECONDS + +/obj/effect/decal/cleanable/greenglow/waste + name = "caustic sludge" + desc = "A puddle of toxic, industrial waste. Eats through the floor if not cleaned up." + icon_state = "waste_spill" + light_power = 1 + beauty = -300 + clean_type = CLEAN_TYPE_ACID + decal_reagent = /datum/reagent/toxin/acid/industrial_waste + reagent_amount = 5 + alpha = 0 + color = "#bebebe8e" + + /// audio of the waste bubbling and melting things. + var/datum/looping_sound/bubbling_audio // It's really just bubbling liquid audio, which is what I need here. + /// TimerID for the floor melting effect, so we can stop it if it gets cleaned up. + var/dissolve_timer + +/obj/effect/decal/cleanable/greenglow/waste/Initialize(mapload, list/datum/disease/diseases) + . = ..() + animate(src, alpha = 255, time = 0.5 SECONDS) + + var/mutable_appearance/splash_animation = mutable_appearance('icons/effects/effects.dmi', "splash_hydroponics") + splash_animation.color = "#15ff00" + flick_overlay_view(splash_animation, 1.1 SECONDS) + +/obj/effect/decal/cleanable/greenglow/waste/Destroy() + QDEL_NULL(bubbling_audio) + QDEL_NULL(particles) + return ..() + +/** + * Sets up our waste to perform dissolve_floor after the timer goes off. + */ +/obj/effect/decal/cleanable/greenglow/waste/proc/pre_dissolve(display_message = TRUE, dissolve_clock = DISSOLVE_DURATION) + if(display_message) + visible_message(span_warning("\The [src] begins corroding \the [get_turf(src)]!")) + color = "#ffffffff" + + playsound(src, 'sound/items/tools/welder.ogg', 50, TRUE) + bubbling_audio = new /datum/looping_sound/soup/toxic(src) + bubbling_audio.start() + + dissolve_timer = addtimer(CALLBACK(src, PROC_REF(dissolve_floor)), dissolve_clock, TIMER_STOPPABLE | TIMER_DELETE_ME) + particles = new /particles/acid/toxic() + +/obj/effect/decal/cleanable/greenglow/waste/proc/dissolve_floor() + if(QDELETED(src)) + return + var/atom/splashed_turf = get_turf(src) + if(!isfloorturf(splashed_turf)) + return + var/turf/open/splash_floor = splashed_turf + splash_floor.ScrapeAway(flags = CHANGETURF_IGNORE_AIR) //Eat away the floor + visible_message(span_warning("The waste eats away at the floor, leaving \the [get_turf(src)] behind.")) + animate(src, time = 0.5 SECONDS, color = "#bebebe8e") + bubbling_audio?.stop() + QDEL_NULL(particles) + +#undef DISSOLVE_DURATION diff --git a/code/game/objects/effects/effect_system/fluid_spread/effects_foam.dm b/code/game/objects/effects/effect_system/fluid_spread/effects_foam.dm index 736be058ee4..cea1190aa66 100644 --- a/code/game/objects/effects/effect_system/fluid_spread/effects_foam.dm +++ b/code/game/objects/effects/effect_system/fluid_spread/effects_foam.dm @@ -31,12 +31,17 @@ var/allow_duplicate_results = TRUE /// The amount of time this foam stick around for before it dissipates. var/lifetime = 8 SECONDS + /// The orignal value of lifetime + var/original_lifetime = 8 SECONDS /// Whether or not this foam should be slippery. var/slippery_foam = TRUE -/obj/effect/particle_effect/fluid/foam/Initialize(mapload) +/obj/effect/particle_effect/fluid/foam/Initialize(mapload, fluid_group, source, lifetime, slippery) . = ..() + src.lifetime = lifetime ? lifetime : src.lifetime + src.original_lifetime = src.lifetime + src.slippery_foam = !isnull(slippery) ? slippery : slippery_foam if(slippery_foam) AddComponent(/datum/component/slippery, 100, can_slip_callback = CALLBACK(src, PROC_REF(try_slip))) if(HAS_TRAIT(loc, TRAIT_ELEVATED_TURF)) @@ -165,7 +170,7 @@ continue foam_mob(foaming, seconds_per_tick) - var/obj/effect/particle_effect/fluid/foam/spread_foam = new type(spread_turf, group, src) + var/obj/effect/particle_effect/fluid/foam/spread_foam = new type(spread_turf, group, src, src.original_lifetime, src.slippery_foam) reagents.trans_to(spread_foam, reagents.total_volume, copy_only = TRUE) spread_foam.add_atom_colour(color, FIXED_COLOUR_PRIORITY) spread_foam.result_type = result_type @@ -219,7 +224,7 @@ /// What type of thing the foam should leave behind when it dissipates. var/atom/movable/result_type = null -/datum/effect_system/fluid_spread/foam/New(turf/location, range = 1, amount = null, atom/holder = null, datum/reagents/carry = null, result_type = null, stop_reactions = FALSE, reagent_scale = FOAM_REAGENT_SCALE) +/datum/effect_system/fluid_spread/foam/New(turf/location, range = 1, amount = null, atom/holder = null, datum/reagents/carry = null, result_type = null, stop_reactions = FALSE, reagent_scale = FOAM_REAGENT_SCALE,) . = ..() chemholder = new(1000, NO_REACT) carry?.trans_to(chemholder, carry.total_volume, no_react = stop_reactions, copy_only = TRUE) @@ -231,8 +236,8 @@ QDEL_NULL(chemholder) return ..() -/datum/effect_system/fluid_spread/foam/start(log = FALSE) - var/obj/effect/particle_effect/fluid/foam/foam = new effect_type(location, new /datum/fluid_group(amount)) +/datum/effect_system/fluid_spread/foam/start(log = FALSE, lifetime, slippery) + var/obj/effect/particle_effect/fluid/foam/foam = new effect_type(location, new /datum/fluid_group(amount), null, lifetime, slippery) var/foamcolor = mix_color_from_reagents(chemholder.reagent_list) if(reagent_scale > 1) // Make room in case we were created by a particularly stuffed payload. foam.reagents.maximum_volume *= reagent_scale @@ -291,10 +296,9 @@ QDEL_NULL(hotspot) var/datum/gas_mixture/air = location.air - var/list/gases = air.gases - if (gases[/datum/gas/plasma]) - var/scrub_amt = min(30, gases[/datum/gas/plasma][MOLES]) //Absorb some plasma - gases[/datum/gas/plasma][MOLES] -= scrub_amt + if (air.gases[/datum/gas/plasma]) + var/scrub_amt = min(30, air.gases[/datum/gas/plasma][MOLES]) //Absorb some plasma + air.adjust_gas(/datum/gas/plasma, -scrub_amt) absorbed_plasma += scrub_amt if (air.temperature > T20C) air.temperature = max(air.temperature / 2, T20C) diff --git a/code/game/objects/effects/effect_system/fluid_spread/effects_smoke.dm b/code/game/objects/effects/effect_system/fluid_spread/effects_smoke.dm index b6d3d892896..cca69643fb3 100644 --- a/code/game/objects/effects/effect_system/fluid_spread/effects_smoke.dm +++ b/code/game/objects/effects/effect_system/fluid_spread/effects_smoke.dm @@ -297,11 +297,10 @@ if(!distcheck || get_dist(location, chilly) < blast) // Otherwise we'll get silliness like people using Nanofrost to kill people through walls with cold air air.temperature = temperature - var/list/gases = air.gases - if(gases[/datum/gas/plasma]) - air.assert_gas(/datum/gas/nitrogen) - gases[/datum/gas/nitrogen][MOLES] += gases[/datum/gas/plasma][MOLES] - gases[/datum/gas/plasma][MOLES] = 0 + if(air.gases[/datum/gas/plasma]) + var/mole_count = air.gases[/datum/gas/plasma][MOLES] + air.adjust_gas(/datum/gas/nitrogen, mole_count) + air.adjust_gas(/datum/gas/plasma, -mole_count) air.garbage_collect() for(var/obj/effect/hotspot/fire in chilly) diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index d4d54ed8abf..edd348fb52a 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -275,36 +275,64 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark) GLOB.wizardstart += loc return INITIALIZE_HINT_QDEL -/obj/effect/landmark/start/nukeop +/// Places to put midround nukeops (normal) +GLOBAL_LIST_EMPTY(nukeop_base_start) +/// Places to put midround nukeops (leader) +GLOBAL_LIST_EMPTY(nukeop_base_leader_start) +/// Places to put nukeops overwatch agents +GLOBAL_LIST_EMPTY(nukeop_base_overwatch_start) +/// Places to spawn nukeops on roundstart +GLOBAL_LIST_EMPTY(nukeop_elevator_start) + +/obj/effect/landmark/start/nukeop_base name = "nukeop" icon = 'icons/effects/landmarks_static.dmi' icon_state = "snukeop_spawn" -/obj/effect/landmark/start/nukeop/Initialize(mapload) +/obj/effect/landmark/start/nukeop_base/Initialize(mapload) ..() - GLOB.nukeop_start += loc + var/list/add_to = get_global_list() + add_to += loc return INITIALIZE_HINT_QDEL -/obj/effect/landmark/start/nukeop_leader +/obj/effect/landmark/start/nukeop_base/proc/get_global_list() + return GLOB.nukeop_base_start + +/obj/effect/landmark/start/nukeop_base/leader name = "nukeop leader" icon = 'icons/effects/landmarks_static.dmi' icon_state = "snukeop_leader_spawn" -/obj/effect/landmark/start/nukeop_leader/Initialize(mapload) - ..() - GLOB.nukeop_leader_start += loc - return INITIALIZE_HINT_QDEL +/obj/effect/landmark/start/nukeop_base/leader/get_global_list() + return GLOB.nukeop_base_leader_start -/obj/effect/landmark/start/nukeop_overwatch +/obj/effect/landmark/start/nukeop_base/overwatch name = "nukeop overwatch" icon = 'icons/effects/landmarks_static.dmi' icon_state = "snukeop_leader_spawn" -/obj/effect/landmark/start/nukeop_overwatch/Initialize(mapload) - ..() - GLOB.nukeop_overwatch_start += loc +/obj/effect/landmark/start/nukeop_base/overwatch/get_global_list() + return GLOB.nukeop_base_overwatch_start + +/obj/effect/landmark/start/nukeop_elevator + name = "nukeop (elevator)" + icon = /obj/effect/landmark/start/nukeop_base::icon + icon_state = /obj/effect/landmark/start/nukeop_base::icon_state + +/obj/effect/landmark/start/nukeop_elevator/Initialize(mapload) + . = ..() + GLOB.nukeop_elevator_start += loc return INITIALIZE_HINT_QDEL +/obj/effect/landmark/nukeop_elevator + icon_state = "x" + +/obj/effect/landmark/nukeop_elevator/interior + name = "nukeop elevator interior top right corner" + +/obj/effect/landmark/nukeop_elevator/exterior + name = "nukeop elevator exterior top right corner" + // Must be immediate because players will // join before SSatom initializes everything. INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player) diff --git a/code/game/objects/effects/particles/acid.dm b/code/game/objects/effects/particles/acid.dm index 5ce0984991d..19683b6ad78 100644 --- a/code/game/objects/effects/particles/acid.dm +++ b/code/game/objects/effects/particles/acid.dm @@ -13,3 +13,16 @@ gravity = list(0, 0.15) position = generator(GEN_SPHERE, 0, 16, NORMAL_RAND) spin = generator(GEN_NUM, -15, 15, NORMAL_RAND) + +/particles/acid/toxic + count = 1000 + spawning = 4 + color = "#34ff19a1" + lifespan = null + grow = -0.08 + velocity = list(0, 1, 0) + position = generator(GEN_CIRCLE, 0, 16, NORMAL_RAND) + drift = generator(GEN_VECTOR, list(0, -0.2), list(0, 0.2)) + gravity = list(0, 0) + rotation = 25 + spin = generator(GEN_NUM, -20, 20) diff --git a/code/game/objects/effects/spawners/bombspawner.dm b/code/game/objects/effects/spawners/bombspawner.dm index 9d1da48cd29..c5c82b485e0 100644 --- a/code/game/objects/effects/spawners/bombspawner.dm +++ b/code/game/objects/effects/spawners/bombspawner.dm @@ -44,14 +44,11 @@ if(!first_gasmix || !second_gasmix) return - first_gasmix.temperature = 1413 - second_gasmix.temperature = 141.3 + first_gasmix.set_temperature(1413) + second_gasmix.set_temperature(141.3) - first_gasmix.assert_gas(/datum/gas/plasma) - second_gasmix.assert_gas(/datum/gas/oxygen) - - first_gasmix.gases[/datum/gas/plasma][MOLES] = calculate_pressure(first_gasmix, TANK_LEAK_PRESSURE - 1) - second_gasmix.gases[/datum/gas/oxygen][MOLES] = calculate_pressure(second_gasmix, TANK_LEAK_PRESSURE - 1) + first_gasmix.set_gas(/datum/gas/plasma, calculate_pressure(first_gasmix, TANK_LEAK_PRESSURE - 1)) + second_gasmix.set_gas(/datum/gas/oxygen, calculate_pressure(second_gasmix, TANK_LEAK_PRESSURE - 1)) /obj/effect/spawner/newbomb/tritium @@ -60,16 +57,13 @@ if(!first_gasmix || !second_gasmix) return - first_gasmix.temperature = 8000 - second_gasmix.temperature = 43 + first_gasmix.set_temperature(8000) + second_gasmix.set_temperature(43) - first_gasmix.assert_gas(/datum/gas/plasma) - second_gasmix.assert_gas(/datum/gas/oxygen) - second_gasmix.assert_gas(/datum/gas/tritium) + first_gasmix.set_gas(/datum/gas/plasma, calculate_pressure(first_gasmix, TANK_LEAK_PRESSURE - 1)) - first_gasmix.gases[/datum/gas/plasma][MOLES] = calculate_pressure(first_gasmix, TANK_LEAK_PRESSURE - 1) - second_gasmix.gases[/datum/gas/oxygen][MOLES] = 0.67 * calculate_pressure(second_gasmix, TANK_LEAK_PRESSURE - 1) - second_gasmix.gases[/datum/gas/tritium][MOLES] = 0.33 * calculate_pressure(second_gasmix, TANK_LEAK_PRESSURE - 1) + second_gasmix.set_gas(/datum/gas/oxygen, 0.67 * calculate_pressure(second_gasmix, TANK_LEAK_PRESSURE - 1)) + second_gasmix.set_gas(/datum/gas/tritium, 0.33 * calculate_pressure(second_gasmix, TANK_LEAK_PRESSURE - 1)) /obj/effect/spawner/newbomb/isolated_tritium @@ -78,16 +72,13 @@ if(!first_gasmix || !second_gasmix) return - first_gasmix.temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST + 1 - second_gasmix.temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST + 1 + first_gasmix.set_temperature(FIRE_MINIMUM_TEMPERATURE_TO_EXIST + 1) + second_gasmix.set_temperature(FIRE_MINIMUM_TEMPERATURE_TO_EXIST + 1) - first_gasmix.assert_gas(/datum/gas/hypernoblium) - first_gasmix.assert_gas(/datum/gas/tritium) - second_gasmix.assert_gas(/datum/gas/oxygen) + first_gasmix.set_gas(/datum/gas/hypernoblium, REACTION_OPPRESSION_THRESHOLD - 0.01,) + first_gasmix.set_gas( /datum/gas/tritium, 0.5 * calculate_pressure(first_gasmix, TANK_LEAK_PRESSURE - 1)) - first_gasmix.gases[/datum/gas/hypernoblium][MOLES] = REACTION_OPPRESSION_THRESHOLD - 0.01 - first_gasmix.gases[/datum/gas/tritium][MOLES] = 0.5 * calculate_pressure(first_gasmix, TANK_LEAK_PRESSURE - 1) - second_gasmix.gases[/datum/gas/oxygen][MOLES] = calculate_pressure(second_gasmix, TANK_LEAK_PRESSURE-1) + second_gasmix.set_gas(/datum/gas/oxygen, calculate_pressure(second_gasmix, TANK_LEAK_PRESSURE-1)) /obj/effect/spawner/newbomb/noblium @@ -96,14 +87,11 @@ if(!first_gasmix || !second_gasmix) return - first_gasmix.temperature = 2.7 - second_gasmix.temperature = 2.7 + first_gasmix.set_temperature(2.7) + second_gasmix.set_temperature(2.7) - first_gasmix.assert_gas(/datum/gas/nitrogen) - second_gasmix.assert_gas(/datum/gas/tritium) - - first_gasmix.gases[/datum/gas/nitrogen][MOLES] = calculate_pressure(first_gasmix, TANK_LEAK_PRESSURE - 1) - second_gasmix.gases[/datum/gas/tritium][MOLES] = calculate_pressure(second_gasmix, TANK_LEAK_PRESSURE - 1) + first_gasmix.set_gas(/datum/gas/nitrogen, calculate_pressure(first_gasmix, TANK_LEAK_PRESSURE - 1)) + second_gasmix.set_gas(/datum/gas/tritium, calculate_pressure(second_gasmix, TANK_LEAK_PRESSURE - 1)) /obj/effect/spawner/newbomb/pressure @@ -112,11 +100,8 @@ if(!first_gasmix || !second_gasmix) return - first_gasmix.temperature = 20000 - second_gasmix.temperature = 2.7 + first_gasmix.set_temperature(20000) + second_gasmix.set_temperature(2.7) - first_gasmix.assert_gas(/datum/gas/hypernoblium) - second_gasmix.assert_gas(/datum/gas/tritium) - - first_gasmix.gases[/datum/gas/hypernoblium][MOLES] = calculate_pressure(first_gasmix, TANK_LEAK_PRESSURE - 1) - second_gasmix.gases[/datum/gas/tritium][MOLES] = calculate_pressure(second_gasmix, TANK_LEAK_PRESSURE - 1) + first_gasmix.set_gas(/datum/gas/hypernoblium, calculate_pressure(first_gasmix, TANK_LEAK_PRESSURE - 1)) + second_gasmix.set_gas(/datum/gas/tritium, calculate_pressure(second_gasmix, TANK_LEAK_PRESSURE - 1)) diff --git a/code/game/objects/effects/spawners/random/exotic.dm b/code/game/objects/effects/spawners/random/exotic.dm index 901bb06cee7..500d0832e4c 100644 --- a/code/game/objects/effects/spawners/random/exotic.dm +++ b/code/game/objects/effects/spawners/random/exotic.dm @@ -43,35 +43,61 @@ ) /obj/effect/spawner/random/exotic/antag_gear_weak - name = "antag gear weak" + name = "loot weak" icon_state = "syndi_toolbox" loot = list( - /obj/item/storage/medkit/regular = 45, - /obj/item/storage/medkit/toxin = 35, - /obj/item/storage/medkit/brute = 27, - /obj/item/storage/medkit/fire = 27, - /obj/item/storage/toolbox/syndicate = 12, - /obj/item/borg/upgrade/diamond_drill = 3, - /obj/item/knife/butcher = 14, - /obj/item/clothing/glasses/night = 10, - /obj/item/pickaxe/drill/diamonddrill = 6, + /obj/item/clothing/glasses/science/night = 15, + /obj/item/storage/fancy/cigarettes/cigpack_syndicate = 10, + /obj/item/storage/toolbox/syndicate = 10, + /obj/item/shield/riot = 10, + /obj/item/storage/box/syndie_kit/chameleon = 10, + /obj/item/knife/combat = 10, + /obj/item/grenade/clusterbuster/smoke = 10, + /obj/item/stack/sheet/mineral/diamond{amount = 15} = 5, + /obj/item/stack/sheet/mineral/uranium{amount = 15} = 5, + /obj/item/stack/sheet/mineral/plasma{amount = 15} = 5, + /obj/item/stack/sheet/mineral/gold{amount = 15} = 5, + /obj/item/implantcase/deathrattle = 5, ) /obj/effect/spawner/random/exotic/antag_gear name = "antag gear" icon_state = "esword" loot = list( - /obj/item/clothing/glasses/science/night = 15, - /obj/item/shield/riot = 12, - /obj/item/stack/sheet/mineral/diamond{amount = 15} = 5, - /obj/item/stack/sheet/mineral/uranium{amount = 15} = 5, - /obj/item/stack/sheet/mineral/plasma{amount = 15} = 5, - /obj/item/stack/sheet/mineral/gold{amount = 15} = 5, - /obj/item/grenade/clusterbuster/smoke = 15, - /obj/item/clothing/under/chameleon = 13, - /obj/item/knife/combat = 10, - /obj/item/implantcase/deathrattle = 5, - /obj/item/storage/fancy/cigarettes/cigpack_syndicate = 1, + /obj/item/storage/box/stockparts/deluxe = 13, + /obj/item/storage/box/survival/syndie = 9, + /obj/item/reagent_containers/spray/syndicate = 9, + /obj/item/flashlight/lantern/syndicate = 5, + /obj/item/storage/box/evilmeds = 5, + /obj/item/storage/box/syndie_kit/space = 5, + /obj/item/gun/ballistic/automatic/pistol/m1911 = 5,//replaces makarov + /obj/item/climbing_hook/syndicate = 5, + /obj/item/dualsaber/toy = 5, + /obj/item/card/emag/blue = 5, + /obj/item/storage/box/syndie_kit/imp_storage = 5, + /obj/item/storage/box/syndie_kit/imp_radio = 5, + /obj/item/storage/box/alchemist_random_chems = 5, + /obj/item/gun/ballistic/automatic/smartgun = 4, + /obj/item/autosurgeon/syndicate/emaggedsurgerytoolset/single_use = 3, + /obj/item/mod/module/energy_shield/prototype = 2, + /obj/item/mod/module/jetpack/advanced = 2, + /obj/item/mod/module/visor/night = 2, + /obj/item/mod/module/storage/syndicate = 2, + /obj/item/autosurgeon/syndicate/anti_stun/single_use = 2, + /obj/item/mod/module/jetpack/advanced = 2, + /obj/item/melee/energy/sword/surplus = 1, + /obj/item/mod/control/pre_equipped/responsory/inquisitory/syndie/less_mods = 1, + /obj/item/gun/ballistic/automatic/napad = 1, + /obj/effect/spawner/random/exotic/antag_sub_spawner = 1, + /obj/item/card/emag/blue = 1, + ) + +/obj/effect/spawner/random/exotic/antag_sub_spawner + name = "antag gear sub spawner" + loot = list( + /obj/item/storage/box/stockparts/deluxe = 98, + /obj/item/storage/box/syndicate/bundle_b = 1, + /obj/item/storage/box/syndicate/bundle_a = 1, ) /obj/effect/spawner/random/exotic/snow_gear @@ -90,3 +116,25 @@ /obj/structure/mecha_wreckage/ripley = 3, /obj/vehicle/sealed/mecha/ripley/mining = 1, ) + +/obj/item/mod/module/energy_shield/prototype + name = "MOD prototype energy shield" + desc = "An early prototype of energy shield adapted for use inside of a MOD, the energy shield before this saw \ + extensive use in now defunct construction, combat, and mining exosuits with exosuits being something between a \ + modsuit and a mech with most still functioning exosuits either being in a museaum or a military parade" + recharge_start_delay = 30 SECONDS + max_charges = 2 + charge_increment_delay = 30 SECONDS + shield_icon = "shield-yellow" + +/obj/item/mod/control/pre_equipped/responsory/inquisitory/syndie/less_mods + starting_frequency = null + req_access = null + applied_cell = /obj/item/stock_parts/power_store/cell/super + insignia_type = /obj/item/mod/module/insignia/security + theme = /datum/mod_theme/responsory/traitor + applied_modules = list( + /obj/item/mod/module/magnetic_harness, + /obj/item/mod/module/jetpack, + /obj/item/mod/module/pathfinder, + ) diff --git a/code/game/objects/effects/spawners/random/medical.dm b/code/game/objects/effects/spawners/random/medical.dm index 57b180a02b4..5c2017e23b2 100644 --- a/code/game/objects/effects/spawners/random/medical.dm +++ b/code/game/objects/effects/spawners/random/medical.dm @@ -75,7 +75,7 @@ /obj/effect/spawner/random/medical/surgery_tool name = "Surgery tool spawner" - icon_state = "scapel" + icon_state = "scalpel" loot = list( /obj/item/scalpel, /obj/item/hemostat, @@ -88,7 +88,7 @@ /obj/effect/spawner/random/medical/surgery_tool_advanced name = "Advanced surgery tool spawner" - icon_state = "scapel" + icon_state = "scalpel" loot = list( // Mail loot spawner. Drop pool of advanced medical tools typically from research. Not endgame content. /obj/item/scalpel/advanced, /obj/item/retractor/advanced, @@ -97,7 +97,7 @@ /obj/effect/spawner/random/medical/surgery_tool_alien name = "Rare surgery tool spawner" - icon_state = "scapel" + icon_state = "scalpel" loot = list( // Mail loot spawner. Some sort of random and rare surgical tool. Alien tech found here. /obj/item/scalpel/alien, /obj/item/hemostat/alien, diff --git a/code/game/objects/effects/spawners/random/mining_loot.dm b/code/game/objects/effects/spawners/random/mining_loot.dm index 682c6e4ad23..f5f86dbe5f3 100644 --- a/code/game/objects/effects/spawners/random/mining_loot.dm +++ b/code/game/objects/effects/spawners/random/mining_loot.dm @@ -58,7 +58,7 @@ icon = 'icons/obj/mining.dmi' icon_state = "modkit" loot = list( - /obj/item/borg/upgrade/modkit/aoe/mobs/andturfs = 1, + /obj/item/borg/upgrade/modkit/cooldown/aoe/mobs/andturfs = 1, /obj/item/borg/upgrade/modkit/cooldown/repeater = 1, /obj/item/borg/upgrade/modkit/resonator_blasts = 1, /obj/item/borg/upgrade/modkit/bounty = 1, diff --git a/code/game/objects/effects/spawners/random/structure.dm b/code/game/objects/effects/spawners/random/structure.dm index bfebd92e01f..38f49d611cb 100644 --- a/code/game/objects/effects/spawners/random/structure.dm +++ b/code/game/objects/effects/spawners/random/structure.dm @@ -22,6 +22,7 @@ /obj/structure/closet/mini_fridge = 35, /obj/effect/spawner/random/trash/mess = 30, /obj/item/kirbyplants/fern = 20, + /obj/effect/spawner/random/gizmo = 20, /obj/structure/closet/crate/decorations = 15, /obj/effect/decal/remains/human/smokey/maintenance = 7, /obj/structure/destructible/cult/pants_altar = 1, diff --git a/code/game/objects/effects/temporary_visuals/effect_trail.dm b/code/game/objects/effects/temporary_visuals/effect_trail.dm index 5eed9462dfd..e8ab9526f51 100644 --- a/code/game/objects/effects/temporary_visuals/effect_trail.dm +++ b/code/game/objects/effects/temporary_visuals/effect_trail.dm @@ -27,7 +27,7 @@ return INITIALIZE_HINT_QDEL AddElement(/datum/element/floor_loving) - AddComponent(/datum/component/spawner, spawn_types = list(spawned_effect), max_spawned = max_spawned, spawn_time = spawn_interval) + add_spawner() src.target = target movement = GLOB.move_manager.move_towards(src, chasing = target, delay = move_speed, home = homing, timeout = duration, flags = MOVEMENT_LOOP_START_FAST) @@ -35,6 +35,9 @@ if (isliving(target)) RegisterSignal(target, COMSIG_LIVING_DEATH, PROC_REF(on_target_invalid)) +/obj/effect/temp_visual/effect_trail/proc/add_spawner() + AddComponent(/datum/component/spawner, spawn_types = list(spawned_effect), max_spawned = max_spawned, spawn_time = spawn_interval) + /// Destroy ourselves if the target is no longer valid /obj/effect/temp_visual/effect_trail/proc/on_target_invalid() SIGNAL_HANDLER diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm index 6d8e8104f50..91729cae9b2 100644 --- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm +++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm @@ -782,17 +782,17 @@ pixel_x = -16 pixel_y = -16 duration = 0.5 SECONDS - color = COLOR_LIME var/max_alpha = 255 ///How far the effect would scale in size var/amount_to_scale = 2 -/obj/effect/temp_visual/circle_wave/Initialize(mapload) +/obj/effect/temp_visual/circle_wave/Initialize(mapload, color) transform = matrix().Scale(0.1) animate(src, transform = matrix().Scale(amount_to_scale), time = duration, flags = ANIMATION_PARALLEL) animate(src, alpha = max_alpha, time = duration * 0.6, flags = ANIMATION_PARALLEL) animate(alpha = 0, time = duration * 0.4) apply_wibbly_filters(src) + src.color ||= color return ..() /obj/effect/temp_visual/circle_wave/bioscrambler diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 8461f99a880..bfcf2ab4e59 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -445,7 +445,8 @@ if(item_flags & CRUEL_IMPLEMENT) .[span_red("morbid")] = "It seems quite practical for particularly morbid procedures and experiments." - + if(item_flags & BLUESPACE_INTERFERENCE) + .["bluespace-active"] = "It is highly active in bluespace and will cause malfunctions in teleporters." if (siemens_coefficient == 0) .["insulated"] = "It is made from a robust electrical insulator and will block any electricity passing through it!" else if (siemens_coefficient <= 0.5) @@ -2106,47 +2107,8 @@ obj_flags |= CONDUCTS_ELECTRICITY /obj/item/change_material_strength(datum/material/material, mat_amount, multiplier, remove = FALSE) - var/density = material.get_property(MATERIAL_DENSITY) - var/hardness = material.get_property(MATERIAL_HARDNESS) - var/flexibility = material.get_property(MATERIAL_FLEXIBILITY) - - // Item force calculation depends on its initial (assumed to be main) sharpness - // Transforming component doesn't work with materials at all and will need a refactor to change that, so we don't care about it here. - - var/force_mod = 1 - var/throwforce_mod = 1 - - switch (sharpness) - if (NONE) - // Blunt items are really hurt by all the flexing - force_mod = (1 + (density - 4) * 0.1) / (1 + flexibility * 0.1) - throwforce_mod = 1 + (density - 4) * 0.1 - flexibility * 0.1 - - if (SHARP_EDGED) - // Sharp items don't care about density and need high hardness to get a real bonus, but can tolerate (and benefit from) some flex - force_mod = 1 + (hardness - 4) * 0.1 - throwforce_mod = 1 + (hardness - 4) * 0.1 - - // Peaks out at 20% at flexibility of 1, drops off up to -80% at 10 - if (flexibility < 2) - force_mod *= 1 + (1 - abs(1 - flexibility)) * 0.2 - throwforce_mod += (1 - abs(1 - flexibility)) * 0.2 - else - force_mod *= 1 - (flexibility - 2) * 0.1 - throwforce_mod -= (flexibility - 2) * 0.1 - - if (SHARP_POINTY) - // Pointy items care about both density and hardness - force_mod = 1 + MATERIAL_PROPERTY_DIVERGENCE(density, 4, 6) * 0.05 + (hardness - 4) * 0.1 - throwforce_mod = 1 + MATERIAL_PROPERTY_DIVERGENCE(density, 4, 6) * 0.05 * 0.05 + (hardness - 4) * 0.1 - // But are not affected by flexibility until higher values, although they don't benefit from it either - if (flexibility > 4) - force_mod *= (1 - (flexibility - 4) * 0.2) - throwforce_mod -= (flexibility - 4) * 0.2 - - // Just for sanity in case something breaks - force_mod = round(clamp(force_mod, MATERIAL_MIN_FORCE_MULTIPLIER, MATERIAL_MAX_FORCE_MULTIPLIER), 0.01) - throwforce_mod = round(clamp(throwforce_mod, MATERIAL_MIN_FORCE_MULTIPLIER, MATERIAL_MAX_FORCE_MULTIPLIER), 0.01) + var/force_mod = get_material_force_modifier(material) + var/throwforce_mod = get_material_throwforce_modifier(material) if (!remove) force *= GET_MATERIAL_MODIFIER(force_mod, multiplier) @@ -2155,43 +2117,69 @@ force /= GET_MATERIAL_MODIFIER(force_mod, multiplier) throwforce /= GET_MATERIAL_MODIFIER(throwforce_mod, multiplier) -/obj/item/apply_main_material_effects(datum/material/main_material, amount, multipier) - . = ..() - if(material_flags & MATERIAL_GREYSCALE) - var/main_mat_type = main_material.type - var/worn_path = get_material_greyscale_config(main_mat_type, greyscale_config_worn) - var/lefthand_path = get_material_greyscale_config(main_mat_type, greyscale_config_inhand_left) - var/righthand_path = get_material_greyscale_config(main_mat_type, greyscale_config_inhand_right) - set_greyscale( - new_worn_config = worn_path, - new_inhand_left = lefthand_path, - new_inhand_right = righthand_path - ) - if(!main_material.item_sound_override) - return - hitsound = main_material.item_sound_override - usesound = main_material.item_sound_override - mob_throw_hit_sound = main_material.item_sound_override - equip_sound = main_material.item_sound_override - pickup_sound = main_material.item_sound_override - drop_sound = main_material.item_sound_override +/// Returns a force multiplier from a material for a given sharpness +/obj/item/proc/get_material_force_modifier(datum/material/material, item_sharpness = get_sharpness()) + var/density = material.get_property(MATERIAL_DENSITY) + var/hardness = material.get_property(MATERIAL_HARDNESS) + var/flexibility = material.get_property(MATERIAL_FLEXIBILITY) + var/force_mod = 1 + switch (item_sharpness) + if (NONE) + // Blunt items are really hurt by all the flexing + force_mod = (1 + (density - 4) * 0.1) / (1 + flexibility * 0.1) -/obj/item/remove_main_material_effects(datum/material/main_material, amount, multipier) - . = ..() - if(material_flags & MATERIAL_GREYSCALE) - set_greyscale( - new_worn_config = initial(greyscale_config_worn), - new_inhand_left = initial(greyscale_config_inhand_left), - new_inhand_right = initial(greyscale_config_inhand_right) - ) - if(!main_material.item_sound_override) - return - hitsound = initial(hitsound) - usesound = initial(usesound) - mob_throw_hit_sound = initial(mob_throw_hit_sound) - equip_sound = initial(equip_sound) - pickup_sound = initial(pickup_sound) - drop_sound = initial(drop_sound) + if (SHARP_EDGED) + // Sharp items don't care about density and need high hardness to get a real bonus, but can tolerate (and benefit from) some flex + force_mod = 1 + (hardness - 4) * 0.1 + + // Peaks out at 20% at flexibility of 1, drops off up to -80% at 10 + if (flexibility < 2) + force_mod *= 1 + (1 - abs(1 - flexibility)) * 0.2 + else + force_mod *= 1 - (flexibility - 2) * 0.1 + + if (SHARP_POINTY) + // Pointy items care about both density and hardness + force_mod = 1 + MATERIAL_PROPERTY_DIVERGENCE(density, 4, 6) * 0.05 + (hardness - 4) * 0.1 + // But are not affected by flexibility until higher values, although they don't benefit from it either + if (flexibility > 4) + force_mod *= (1 - (flexibility - 4) * 0.2) + + // Just for sanity in case something breaks + force_mod = round(clamp(force_mod, MATERIAL_MIN_FORCE_MULTIPLIER, MATERIAL_MAX_FORCE_MULTIPLIER), 0.01) + return force_mod + +/// Returns a force multiplier from a material for a given sharpness +/obj/item/proc/get_material_throwforce_modifier(datum/material/material, item_sharpness = get_sharpness()) + var/density = material.get_property(MATERIAL_DENSITY) + var/hardness = material.get_property(MATERIAL_HARDNESS) + var/flexibility = material.get_property(MATERIAL_FLEXIBILITY) + var/throwforce_mod = 1 + switch (item_sharpness) + if (NONE) + // Blunt items are really hurt by all the flexing + throwforce_mod = 1 + (density - 4) * 0.1 - flexibility * 0.1 + + if (SHARP_EDGED) + // Sharp items don't care about density and need high hardness to get a real bonus, but can tolerate (and benefit from) some flex + throwforce_mod = 1 + (hardness - 4) * 0.1 + + // Peaks out at 20% at flexibility of 1, drops off up to -80% at 10 + if (flexibility < 2) + throwforce_mod += (1 - abs(1 - flexibility)) * 0.2 + else + throwforce_mod -= (flexibility - 2) * 0.1 + + if (SHARP_POINTY) + // Pointy items care about both density and hardness + throwforce_mod = 1 + MATERIAL_PROPERTY_DIVERGENCE(density, 4, 6) * 0.05 * 0.05 + (hardness - 4) * 0.1 + // But are not affected by flexibility until higher values, although they don't benefit from it either + if (flexibility > 4) + throwforce_mod -= (flexibility - 4) * 0.2 + + // Just for sanity in case something breaks + throwforce_mod = round(clamp(throwforce_mod, MATERIAL_MIN_FORCE_MULTIPLIER, MATERIAL_MAX_FORCE_MULTIPLIER), 0.01) + return throwforce_mod /** * Returns the atom(either itself or an internal module) that will interact/attack the target on behalf of us diff --git a/code/game/objects/items/AI_modules/_AI_modules.dm b/code/game/objects/items/AI_modules/_AI_modules.dm index be1d5a311cf..b89b9099f58 100644 --- a/code/game/objects/items/AI_modules/_AI_modules.dm +++ b/code/game/objects/items/AI_modules/_AI_modules.dm @@ -89,7 +89,7 @@ else to_chat(user, span_notice("Upload complete.")) - var/time = time2text(world.realtime,"hh:mm:ss", TIMEZONE_UTC) + var/time = round_timestamp() var/ainame = law_datum.owner ? law_datum.owner.name : "empty AI core" var/aikey = law_datum.owner ? law_datum.owner.ckey : "null" diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index d4a964246e0..949e4b7d8a1 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -824,7 +824,7 @@ /obj/item/card/id/click_alt(mob/living/user) if(!alt_click_can_use_id(user)) return NONE - if (registered_account.being_dumped) + if (LAZYLEN(registered_account.being_dumped)) registered_account.bank_card_talk(span_warning("内部服务器错误"), TRUE) return CLICK_ACTION_SUCCESS if(registered_account.account_debt) diff --git a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm index 6d0745a6a14..3c3fc8fb4b5 100644 --- a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm @@ -1702,6 +1702,7 @@ /obj/item/assembly/igniter/condenser = 1, /datum/stock_part/servo = 2, /datum/stock_part/matter_bin = 2, + /obj/item/reagent_containers/cup/beaker = 1, ) /obj/item/circuitboard/machine/smelter @@ -1712,6 +1713,7 @@ /obj/item/assembly/igniter = 1, /datum/stock_part/servo = 2, /datum/stock_part/matter_bin = 2, + /obj/item/reagent_containers/cup/beaker = 1, ) /obj/item/circuitboard/machine/shieldwallgen diff --git a/code/game/objects/items/clown_items.dm b/code/game/objects/items/clown_items.dm index 9b2537e205b..be4b16908c1 100644 --- a/code/game/objects/items/clown_items.dm +++ b/code/game/objects/items/clown_items.dm @@ -114,6 +114,10 @@ cleanspeed = 0.3 SECONDS //Only the truest of mind soul and body get one of these uses = 800 //In the Greek numeric system, Omega has a value of 800 +/obj/item/soap/omega/Initialize(mapload) + . = ..() + AddComponent(/datum/component/slippery, 120) //Same slipperiness as Super Lube + /obj/item/soap/omega/grind_results() return list( /datum/reagent/consumable/potato_juice = 9, @@ -125,7 +129,8 @@ /datum/reagent/consumable/ethanol/hooch = 9, /datum/reagent/bluespace = 9, /datum/reagent/drug/pumpup = 9, - /datum/reagent/consumable/space_cola = 9 + /datum/reagent/consumable/space_cola = 9, + /datum/reagent/iron = 9 ) /obj/item/soap/omega/suicide_act(mob/living/user) @@ -136,7 +141,7 @@ /obj/item/paper/fluff/stations/soap name = "ancient janitorial poem" desc = "An old paper that has passed many hands." - default_raw_text = "The legend of the omega soap
Essence of potato. Juice, not grind.
A lizard's tail, turned into wine.
powder of monkey, to help the workload.
Some Krokodil, because meth would explode.
Nitric acid and Baldium, for organic dissolving.
A cup filled with Hooch, for sinful absolving
Some Bluespace Dust, for removal of stains.
A syringe full of Pump-up, it's security's bane.
Add a can of Space Cola, because we've been paid.
Heat as hot as you can, let the soap be your blade.
Ten units of each reagent create a soap that could topple all others." + default_raw_text = "
The Legend of the Omega Soap
Essence of potato, juice, not grind.
A lizard's tail, turned into wine.
Powder of monkey, to help the workload.
Some Krokodil, because meth would explode.
Nitric acid and Baldium, for organic dissolving.
A cup full of hooch, for sins' absolving.
A dash of bluespace dust, for removal of stains.
A syringe of Pump-Up, Security's worst of pains.
A can of Space Cola, to watch the dirt fade.
Heat as hot as possible, let the soap be your blade.
With ten units of each, the soap that topples all will be made." /obj/item/soap/suicide_act(mob/living/user) user.say(";FFFFFFFFFFFFFFFFUUUUUUUDGE!!", forced="soap suicide") diff --git a/code/game/objects/items/crab17.dm b/code/game/objects/items/crab17.dm index 77407bd7946..fdb179ba55a 100644 --- a/code/game/objects/items/crab17.dm +++ b/code/game/objects/items/crab17.dm @@ -27,9 +27,9 @@ if(isliving(user)) L = user accounts_to_rob -= L.get_bank_account() + var/obj/effect/dumpeet_target/dump_machine = new /obj/effect/dumpeet_target(targetturf, L) for(var/datum/bank_account/B as anything in accounts_to_rob) - B.dumpeet() - new /obj/effect/dumpeet_target(targetturf, L) + B.dumpeet(dump_machine.dump) to_chat(user, span_notice("You have activated Protocol CRAB-17.")) user.log_message("activated Protocol CRAB-17.", LOG_GAME) @@ -67,7 +67,7 @@ */ /obj/structure/checkoutmachine/proc/check_if_finished() for(var/datum/bank_account/B as anything in accounts_to_rob) - if (B.being_dumped) + if(LAZYFIND(B.being_dumped, src)) return FALSE return TRUE @@ -94,13 +94,13 @@ balloon_alert(user, "card has no registered account!") return - if(!card.registered_account.being_dumped) + if(!LAZYFIND(card.registered_account.being_dumped, src)) balloon_alert(user, "funds are already safe!") return to_chat(user, span_warning("You quickly cash out your funds to a more secure banking location. Funds are safu.")) // This is a reference and not a typo accounts_to_rob -= card.registered_account - card.registered_account.stop_dump() + card.registered_account.stop_dump(src) if(check_if_finished()) qdel(src) @@ -112,6 +112,8 @@ return bogdanoff = user internal_account = new /datum/bank_account/remote("CRAB-17", 0, player_account = FALSE) + +/obj/structure/checkoutmachine/proc/setup_siphoning() add_overlay("flaps") add_overlay("hatch") add_overlay("legs_retracted") @@ -232,7 +234,7 @@ */ /obj/structure/checkoutmachine/proc/stop_dumping() for(var/datum/bank_account/B as anything in accounts_to_rob) - B.stop_dump() + B.stop_dump(src) /** * Splits the balance of the internal_account into several smaller piles of cash and scatters them around the area. @@ -274,6 +276,7 @@ /obj/effect/dumpeet_target/Initialize(mapload, user) . = ..() bogdanoff = user + dump = new /obj/structure/checkoutmachine(null, bogdanoff) addtimer(CALLBACK(src, PROC_REF(startLaunch)), 10 SECONDS) sound_to_playing_players('sound/items/dump_it.ogg', 20) deadchat_broadcast("Protocol CRAB-17 has been activated. A space-coin market has been launched at the station!", turf_target = get_turf(src), message_type=DEADCHAT_ANNOUNCEMENT) @@ -283,7 +286,7 @@ */ /obj/effect/dumpeet_target/proc/startLaunch() DF = new /obj/effect/dumpeet_fall(drop_location()) - dump = new /obj/structure/checkoutmachine(null, bogdanoff) + dump.setup_siphoning() priority_announce("The spacecoin bubble has popped! Get to the credit deposit machine at [get_area(src)] and cash out before you lose all of your funds!", sender_override = "CRAB-17 Protocol") animate(DF, pixel_z = -8, time = 5, , easing = LINEAR_EASING) playsound(src, 'sound/items/weapons/mortar_whistle.ogg', 70, TRUE, 6) diff --git a/code/game/objects/items/devices/aicard_evil.dm b/code/game/objects/items/devices/aicard_evil.dm index d5146c0a54a..307748172db 100644 --- a/code/game/objects/items/devices/aicard_evil.dm +++ b/code/game/objects/items/devices/aicard_evil.dm @@ -76,6 +76,7 @@ // create and apply syndie datum var/datum/antagonist/nukeop/nuke_datum = new() nuke_datum.send_to_spawnpoint = FALSE + nuke_datum.give_bonus_tc = FALSE new_ai.mind.add_antag_datum(nuke_datum, op_datum.nuke_team) LAZYADD(new_ai.mind.special_roles, "Syndicate AI") new_ai.add_faction(ROLE_SYNDICATE) diff --git a/code/game/objects/items/devices/broadcast_camera.dm b/code/game/objects/items/devices/broadcast_camera.dm index 5553470aab2..d97ffd5d59e 100644 --- a/code/game/objects/items/devices/broadcast_camera.dm +++ b/code/game/objects/items/devices/broadcast_camera.dm @@ -28,6 +28,8 @@ var/broadcast_name = "Curator News" /// The networks it broadcasts to, default is CAMERANET_NETWORK_CURATOR var/list/camera_networks = list(CAMERANET_NETWORK_CURATOR) + /// Range of the camera + var/camera_range = 7 /// The "virtual" security camera inside of the physical camera var/obj/machinery/camera/internal_camera /// The "virtual" radio inside of the the physical camera, a la microphone @@ -86,6 +88,7 @@ // INTERNAL CAMERA internal_camera = new(wielding_carbon) // Cameras for some reason do not work inside of obj's internal_camera.internal_light = FALSE + internal_camera.view_range = camera_range internal_camera.network = camera_networks internal_camera.c_tag = "LIVE: [broadcast_name]" start_broadcasting_network(camera_networks, "[broadcast_name] is now LIVE!") @@ -126,3 +129,16 @@ /obj/item/broadcast_camera/proc/set_microphone_state() internal_radio.set_broadcasting(active_microphone) + +// Orderable from cargo +/obj/item/broadcast_camera/cargo + slowdown = 0.3 + item_flags = parent_type::item_flags | SLOWS_WHILE_IN_HAND + broadcast_name = "Camera Broadcast" + camera_range = 5 + +/obj/item/broadcast_camera/cargo/Initialize(mapload) + . = ..() + // Gives each cargo camera a unique network id + var/static/cargo_camera_network_id = 0 + camera_networks = list("cargo_camera_id_[cargo_camera_network_id++]") diff --git a/code/game/objects/items/devices/earthcracker.dm b/code/game/objects/items/devices/earthcracker.dm new file mode 100644 index 00000000000..455be3168f2 --- /dev/null +++ b/code/game/objects/items/devices/earthcracker.dm @@ -0,0 +1,178 @@ +#define EARTHCRACKER_READY "ready" +#define EARTHCRACKER_ACTIVE "active" +#define EARTHCRACKER_SPENT "spent" + +/** + * The E-2 Earthcracker, a traitor device that creates intentional weakpoints on the station after use, which can be triggered via explosions. + * See weakpoint.dm for more specifics on their effects. + */ +/obj/item/earthcracker + name = "E-2 Earthcracker" + desc = "A nasty automated pilebunker can be used to create a massive weakpoint in flooring,\ + which can be triggered afterwards by a sufficiently strong enough explosion." + icon = 'icons/obj/devices/tool.dmi' + icon_state = "earthcracker" + base_icon_state = "earthcracker" + /// Is the earthcracker ready to arm, arming, activating, or spent? + var/status = EARTHCRACKER_READY + /// What kind of weakpoint shall you spawn? + var/obj/weakpoint_type = /obj/effect/weakpoint/big + /// The timer for the strike_the_earth activation + var/activation_timer + +/obj/item/earthcracker/Initialize(mapload) + . = ..() + if(!weakpoint_type) + CRASH("An earthcracker spawned without a designated weakpoint!") + register_context() + +/obj/item/earthcracker/attack_self(mob/user, modifiers) + . = ..() + if(status == EARTHCRACKER_READY) + handle_arming(user) + +/obj/item/earthcracker/attack_hand(mob/user, list/modifiers) + . = ..() + if(!anchored) + return NONE + switch(status) + if(EARTHCRACKER_ACTIVE) + if(activation_timer) + return FALSE + var/response = tgui_alert(user, "Activate the earthcracker?", "Activate?", list("Yes", "No")) == "Yes" + if(!response) + return FALSE + if(!user.Adjacent(src)) + return FALSE + flick("[base_icon_state]-active", src) + if(is_mining_level(z)) + activation_timer = addtimer(CALLBACK(src, PROC_REF(mining_act), user), 1.2 SECONDS) + return TRUE + activation_timer = addtimer(CALLBACK(src, PROC_REF(strike_the_earth)), 1.2 SECONDS) + return TRUE + if(EARTHCRACKER_SPENT) + balloon_alert(user, "used up!") + return FALSE + +/obj/item/earthcracker/update_icon_state() + . = ..() + switch(status) + if(EARTHCRACKER_READY) + icon_state = "[base_icon_state]" + if(EARTHCRACKER_ACTIVE) + icon_state = "[base_icon_state]-armed" + if(EARTHCRACKER_SPENT) + icon_state = "[base_icon_state]-spent" + +/obj/item/earthcracker/wrench_act(mob/living/user, obj/item/tool) + if(anchored && status == EARTHCRACKER_SPENT) + balloon_alert(user, "it falls apart") + animate(src, 0.6 SECONDS, alpha = 0, easing = CIRCULAR_EASING|EASE_IN) + addtimer(CALLBACK(src, PROC_REF(post_break)), 0.6 SECONDS) + return ITEM_INTERACT_SUCCESS + if(!anchored && status == EARTHCRACKER_READY) + balloon_alert(user, "arm in hands first!") + return ITEM_INTERACT_SUCCESS + if(anchored && status == EARTHCRACKER_ACTIVE) + balloon_alert(user, "unfastening from the floor...") + if(!tool.use_tool(src, user, 8 SECONDS, volume = 50)) + return ITEM_INTERACT_FAILURE + anchored = FALSE + status = EARTHCRACKER_READY + update_appearance(UPDATE_ICON) + return NONE + +/obj/item/earthcracker/add_context(atom/source, list/context, obj/item/held_item, mob/user) + switch(status) + if(EARTHCRACKER_ACTIVE) + context[SCREENTIP_CONTEXT_LMB] = "Activate device" + if(EARTHCRACKER_SPENT) + if(held_item?.tool_behaviour == TOOL_WRENCH) + context[SCREENTIP_CONTEXT_LMB] = "Disassemble device" + return CONTEXTUAL_SCREENTIP_SET + +/obj/item/earthcracker/examine(mob/user) + . = ..() + if(status == EARTHCRACKER_SPENT) + . += span_warning("This device is toast. You could disassemble the remains using a [EXAMINE_HINT("Wrench")].") + else + . += span_info("This device can be unanchored using a [EXAMINE_HINT("Wrench")].") + +/obj/item/earthcracker/proc/handle_arming(mob/user) + var/turf/arm_location = get_turf(user) + if(!arm_location) + return FALSE + if(isgroundlessturf(arm_location)) + balloon_alert(user, "can't deploy here") + return FALSE + + if(status == EARTHCRACKER_SPENT) + balloon_alert(user, "used up!") + return FALSE + balloon_alert(user, "arming...") + if(!do_after(user, 3 SECONDS, src)) + balloon_alert(user, "failed to arm") + return FALSE + + forceMove(arm_location) + anchored = TRUE + flick("[base_icon_state]-arm", src) + playsound(src, 'sound/items/barcodebeep.ogg', 50, FALSE) + status = EARTHCRACKER_ACTIVE + update_appearance(UPDATE_ICON) + return TRUE + +/// The fun part. We spawn a huge weakpoint here. +/obj/item/earthcracker/proc/strike_the_earth() + if(QDELETED(src)) + return + playsound(src, 'sound/items/weapons/earthcracker_bang.mp3', 75, FALSE, 3) + var/turf/cracked_hull = drop_location() + new weakpoint_type(cracked_hull) + handle_after_activation(cracked_hull) + +/// Cleanup after an earthcracker is activated either for sabotage or mining. +/obj/item/earthcracker/proc/handle_after_activation(turf/cracked_hull) + do_sparks(2, FALSE, src) + cracked_hull.levelupdate() + + status = EARTHCRACKER_SPENT + update_appearance(UPDATE_ICON) + particles = new /particles/smoke/burning/small + activation_timer = null + +/// Called after the earthcracker activates. +/obj/item/earthcracker/proc/post_break() + deconstruct(TRUE) + +/// When this item is used on a mining Z, we perform an action that breaks all rocks in a radius around us, the same as starting an ore vent wave. +/obj/item/earthcracker/proc/mining_act(mob/user) + for(var/i in 1 to 5) + for(var/turf/rock in oview(i)) // This collects a list of rings of turfs (in a growing radius of i) that we'll applying logic to "drill" below. + + if(istype(rock, /turf/closed/mineral)) + if(prob(50 + (i * 8))) + continue + var/turf/closed/mineral/drillable = rock + drillable.gets_drilled(user) + if(prob(50)) + new /obj/effect/decal/cleanable/rubble(rock) + continue + + if(istype(rock, /turf/open/misc/asteroid) && prob(35)) + new /obj/effect/decal/cleanable/rubble(rock) + continue + sleep(0.6 SECONDS) + handle_after_activation() + +/// Small subtype for shenanigans. +/obj/item/earthcracker/small + name = "E-1 Earthcracker" + desc = "A rusty automated pilebunker can be used to create a weakpoint in flooring,\ + which can be triggered afterwards by a sufficiently strong enough explosion.\ + You're pretty sure the mining company that used to make these got bought by Nanotrasen ages ago." + weakpoint_type = /obj/effect/weakpoint + +#undef EARTHCRACKER_READY +#undef EARTHCRACKER_ACTIVE +#undef EARTHCRACKER_SPENT diff --git a/code/game/objects/items/devices/scanners/autopsy_scanner.dm b/code/game/objects/items/devices/scanners/autopsy_scanner.dm index c541e513a0d..5e0376879e7 100644 --- a/code/game/objects/items/devices/scanners/autopsy_scanner.dm +++ b/code/game/objects/items/devices/scanners/autopsy_scanner.dm @@ -54,8 +54,9 @@ var/obj/item/paper/autopsy_report = new(get_turf(src)) autopsy_report.color = "#99ccff" - autopsy_report.name = "autopsy report of [scanned] - [station_time_timestamp()])" - var/final_report_text = "
" + var/floor_text = "Analyzing results for [scan_turf] ([round_timestamp()]):
" floor_text += "Overall status: Unknown
" floor_text += "Subject lacks a brain.
" floor_text += "Body temperature: [scan_turf?.return_air()?.return_temperature() || "???"]
" @@ -168,7 +168,7 @@ oxy_loss += 200 - (oxy_loss + tox_loss + fire_loss + brute_loss) oxy_loss = clamp(oxy_loss, 0, 200) - render_list += "[span_info("Analyzing results for [target] ([station_time_timestamp()]):")]
Overall status: [mob_status]
" + render_list += "[span_info("Analyzing results for [target] ([round_timestamp()]):")]
Overall status: [mob_status]
" if(!advanced && target.has_reagent(/datum/reagent/inverse/technetium)) advanced = TRUE @@ -473,11 +473,12 @@ var/obj/item/paper/medical_report/report_paper = new(get_turf(src)) report_paper.color = "#99ccff" - report_paper.name = "health scan report - [station_time_timestamp()]" - var/report_text = "
" + report_paper.name = "health scan report - [server_timestamp(format = "hh:mm", ic_time = TRUE)]" + var/report_text = "
" report_text += last_scan_text - report_paper.add_raw_text(report_text) + report_paper.add_raw_text(report_text, advanced_html = TRUE) report_paper.update_appearance() user.put_in_hands(report_paper) diff --git a/code/game/objects/items/devices/table_clock.dm b/code/game/objects/items/devices/table_clock.dm index 0d819536366..c4420a81383 100644 --- a/code/game/objects/items/devices/table_clock.dm +++ b/code/game/objects/items/devices/table_clock.dm @@ -31,8 +31,9 @@ if(broken) . += span_info("It appears to be currently broken. You can use it in-hand to repair it.") else - . += span_info("The current CST (local) time is: [station_time_timestamp()].") - . += span_info("The current TCT (galactic) time is: [time2text(world.realtime, "hh:mm:ss", NO_TIMEZONE)].") + . += span_info("The current NST (local) time is: [server_timestamp(ic_time = TRUE, twelve_hour_clock = user.client?.prefs.read_preference(/datum/preference/toggle/twelve_hour))].") + if(user.is_literate()) + . += span_info("That means it is currently [round_timestamp()] into the shift.") /obj/item/table_clock/attackby(obj/item/attacking_item, mob/user, list/modifiers, list/attack_modifiers) . = ..() diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 0b5574de31c..c1e7f296846 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -33,6 +33,20 @@ attached_device = null return ..() +/obj/item/transfer_valve/examine(mob/user) + . = ..() + if(tank_one) + . += span_notice("A [tank_one] is attached to the primary port.") + if(tank_two) + . += span_notice("A [tank_two] is attached to the secondary port.") + if(!tank_one || !tank_two) + . += span_notice("You could attach a gas tank onto the open port.") + if(attached_device) + . += span_notice("A [attached_device] is attached to the fuse input.") + if(wired) + . += span_notice("It looks like some nutjob added makeshift backpack straps with [EXAMINE_HINT("wires")]...") + . += span_notice("You could cut off the straps with [EXAMINE_HINT(TOOL_WIRECUTTER)].") + /obj/item/transfer_valve/add_context(atom/source, list/context, obj/item/held_item, mob/user) . = ..() @@ -79,58 +93,37 @@ /obj/item/transfer_valve/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) . = ..() - if (!istype(interacting_with, /obj/vehicle/ridden/wheelchair)) - return NONE - var/obj/vehicle/ridden/wheelchair/chair = interacting_with + if(istype(interacting_with, /obj/vehicle/ridden/wheelchair)) + var/obj/vehicle/ridden/wheelchair/chair = interacting_with - if (chair.bomb_attached) - user.balloon_alert(user, "already has a TTV!") - return ITEM_INTERACT_FAILURE - user.balloon_alert(user, "attaching TTV...") - if (!do_after(user, 0.5 SECONDS, chair)) - return ITEM_INTERACT_FAILURE + if (chair.bomb_attached) + user.balloon_alert(user, "already has a TTV!") + return ITEM_INTERACT_FAILURE + user.balloon_alert(user, "attaching TTV...") + if (!do_after(user, 0.5 SECONDS, chair)) + return ITEM_INTERACT_FAILURE - chair.attach_bomb(src) - user.log_message("attached [src] to [chair]", LOG_GAME) - return ITEM_INTERACT_SUCCESS + chair.attach_bomb(src) + user.log_message("attached [src] to [chair]", LOG_GAME) + return ITEM_INTERACT_SUCCESS + else if(istype(interacting_with, /obj/item/tank)) + if(try_attach_tank(interacting_with)) + return ITEM_INTERACT_SUCCESS + else + return ITEM_INTERACT_FAILURE + else if(isassembly(interacting_with)) + if(try_attach_assembly(interacting_with)) + return ITEM_INTERACT_SUCCESS + else + return ITEM_INTERACT_FAILURE + return NONE /obj/item/transfer_valve/attackby(obj/item/item, mob/user, params) if(istype(item, /obj/item/tank)) - if(tank_one && tank_two) - to_chat(user, span_warning("There are already two tanks attached, remove one first!")) - return - - if(!tank_one) - if(!user.transferItemToLoc(item, src)) - return - tank_one = item - to_chat(user, span_notice("You attach the tank to the transfer valve.")) - else if(!tank_two) - if(!user.transferItemToLoc(item, src)) - return - tank_two = item - to_chat(user, span_notice("You attach the tank to the transfer valve.")) - - update_appearance() + try_attach_tank(item, user) //TODO: Have this take an assemblyholder else if(isassembly(item)) - var/obj/item/assembly/A = item - if(A.secured) - to_chat(user, span_notice("The device is secured.")) - return - if(attached_device) - to_chat(user, span_warning("There is already a device attached to the valve, remove it first!")) - return - if(!user.transferItemToLoc(item, src)) - return - attached_device = A - to_chat(user, span_notice("You attach the [item] to the valve controls and secure it.")) - A.holder = src - A.on_attach() - A.toggle_secure() //this calls update_icon(), which calls update_icon() on the holder (i.e. the bomb). - log_bomber(user, "attached a [item.name] to a ttv -", src, null, FALSE) - attacher = user - + try_attach_assembly(item, user) else if(istype(item, /obj/item/stack/cable_coil) && !wired) var/obj/item/stack/cable_coil/coil = item if (coil.get_amount() < 15) @@ -153,6 +146,42 @@ return +/obj/item/transfer_valve/proc/try_attach_tank(obj/item/tank/new_tank, mob/user) + if(!tank_one) + if(!user.transferItemToLoc(new_tank, src)) + return FALSE + tank_one = new_tank + to_chat(user, span_notice("You attach the [new_tank] to the transfer valve's primary port.")) + else if(!tank_two) + if(!user.transferItemToLoc(new_tank, src)) + return FALSE + tank_two = new_tank + to_chat(user, span_notice("You attach the [new_tank] to the transfer valve's secondary port.")) + else + to_chat(user, span_warning("There are already two tanks attached, remove one first!")) + return FALSE + + update_appearance() + return TRUE + +/obj/item/transfer_valve/proc/try_attach_assembly(obj/item/assembly/A, mob/user) + if(A.secured) + to_chat(user, span_notice("The [A] is secured; unsecure it first.")) + return FALSE + if(attached_device) + to_chat(user, span_warning("There is already a device attached to the valve, remove it first!")) + return FALSE + if(!user.transferItemToLoc(A, src)) + return FALSE + attached_device = A + to_chat(user, span_notice("You attach the [A] to the valve controls and secure it.")) + A.holder = src + A.on_attach() + A.toggle_secure() //this calls update_icon(), which calls update_icon() on the holder (i.e. the bomb). + log_bomber(user, "attached a [A.name] to a ttv -", src, null, FALSE) + attacher = user + return TRUE + //These keep attached devices synced up, for example a TTV with a mouse trap being found in a bag so it's triggered, or moving the TTV with an infrared beam sensor to update the beam's direction. /obj/item/transfer_valve/Move() . = ..() diff --git a/code/game/objects/items/dna_injector.dm b/code/game/objects/items/dna_injector.dm index baf4bb85e62..178f67c0b00 100644 --- a/code/game/objects/items/dna_injector.dm +++ b/code/game/objects/items/dna_injector.dm @@ -11,18 +11,34 @@ throw_range = 5 w_class = WEIGHT_CLASS_TINY + /// Modified to damage caused from injection, currently unused though var/damage_coeff = 1 - var/list/fields - var/list/add_mutations = list() - var/list/remove_mutations = list() + /// Adds all mutations in this list to the injected mob, activating it rather than mutating it if possible. + var/list/add_mutations + /// If the injected mob has any mutations in this list activated or mutated, they will be removed. + var/list/remove_mutations + /// Tracks if it's been used + VAR_FINAL/used = FALSE + /// Duration of the mutations added/activated or DNA changes. Does not affect removed mutations. + var/duration = INFINITY + /// A DNA datum that has its fields copied to the target on injection. + var/datum/dna/stored_dna - var/used = FALSE - -/obj/item/dnainjector/Initialize(mapload) +/obj/item/dnainjector/Initialize(mapload, datum/dna/stored_dna, damage_coeff = 1) . = ..() AddElement(/datum/element/update_icon_updates_onmob) if(used) update_appearance() + src.stored_dna = stored_dna + src.damage_coeff = damage_coeff + +/obj/item/dnainjector/Destroy() + if(stored_dna?.holder) + stack_trace("DNA injector got owned DNA somehow") + stored_dna = null + else + QDEL_NULL(stored_dna) + return ..() /obj/item/dnainjector/vv_edit_var(vname, vval) . = ..() @@ -43,27 +59,26 @@ /obj/item/dnainjector/proc/inject(mob/living/carbon/target, mob/user) if(!target.can_mutate()) return FALSE + if(target.stat == DEAD) //prevents dead people from having their DNA changed + to_chat(user, span_notice("You can't modify [target]'s DNA while [target.p_theyre()] dead.")) + return FALSE for(var/removed_mutation in remove_mutations) - target.dna.remove_mutation(removed_mutation, list(MUTATION_SOURCE_ACTIVATED, MUTATION_SOURCE_MUTATOR)) - for(var/added_mutation in add_mutations) - if(added_mutation == /datum/mutation/race) - message_admins("[ADMIN_LOOKUPFLW(user)] injected [key_name_admin(target)] with \the [src] [span_danger("(MONKEY)")]") + target.dna.remove_mutation(removed_mutation, GLOB.standard_mutation_sources) + + for(var/datum/mutation/added_mutation as anything in add_mutations) + if(added_mutation::warn_admins_on_inject && target != user && !ismonkey(target)) + message_admins("[ADMIN_LOOKUPFLW(user)] injected [key_name_admin(target)] with [src] containing [added_mutation::name].") if(target.dna.mutation_in_sequence(added_mutation)) target.dna.activate_mutation(added_mutation) + if(duration != INFINITY) + addtimer(CALLBACK(target.dna, TYPE_PROC_REF(/datum/dna, remove_mutation), added_mutation, MUTATION_SOURCE_ACTIVATED), duration) else target.dna.add_mutation(added_mutation, MUTATION_SOURCE_MUTATOR) - if(fields) - if(fields["name"] && fields["UE"] && fields["blood_type"]) - target.real_name = fields["name"] - target.dna.unique_enzymes = fields["UE"] - target.name = target.real_name - target.set_blood_type(fields["blood_type"]) - if(fields["UI"]) //UI+UE - target.dna.unique_identity = merge_text(target.dna.unique_identity, fields["UI"]) - if(fields["UF"]) - target.dna.unique_features = merge_text(target.dna.unique_features, fields["UF"]) - if(fields["UI"] || fields["UF"]) - target.updateappearance(mutcolor_update = TRUE, mutations_overlay_update = TRUE) + if(duration != INFINITY) + addtimer(CALLBACK(target.dna, TYPE_PROC_REF(/datum/dna, remove_mutation), added_mutation, MUTATION_SOURCE_MUTATOR), duration) + + if(stored_dna) + target.apply_status_effect(/datum/status_effect/temporary_transformation/dna_injector, duration, stored_dna) return TRUE /obj/item/dnainjector/attack(mob/target, mob/user) @@ -100,53 +115,7 @@ update_appearance() /obj/item/dnainjector/timed - var/duration = 60 SECONDS - -/obj/item/dnainjector/timed/inject(mob/living/carbon/target, mob/user) - if(target.stat == DEAD) //prevents dead people from having their DNA changed - to_chat(user, span_notice("You can't modify [target]'s DNA while [target.p_theyre()] dead.")) - return FALSE - if(!target.can_mutate()) - return FALSE - var/endtime = world.time + duration - for(var/mutation in remove_mutations) - target.dna.remove_mutation(mutation, list(MUTATION_SOURCE_ACTIVATED, MUTATION_SOURCE_MUTATOR)) - for(var/mutation in add_mutations) - if(target.dna.get_mutation(mutation)) - continue //Skip permanent mutations we already have. - if(mutation == /datum/mutation/race && !ismonkey(target)) - message_admins("[ADMIN_LOOKUPFLW(user)] injected [key_name_admin(target)] with \the [src] [span_danger("(MONKEY)")]") - target.dna.add_mutation(mutation, MUTATION_SOURCE_TIMED_INJECTOR) - addtimer(CALLBACK(target.dna, TYPE_PROC_REF(/datum/dna, remove_mutation), mutation, MUTATION_SOURCE_TIMED_INJECTOR), duration) - if(fields) - if(fields["name"] && fields["UE"] && fields["blood_type"]) - LAZYINITLIST(target.dna.previous) - if(!target.dna.previous["name"]) - target.dna.previous["name"] = target.real_name - if(!target.dna.previous["UE"]) - target.dna.previous["UE"] = target.dna.unique_enzymes - if(!target.dna.previous["blood_type"]) - target.dna.previous["blood_type"] = target.get_bloodtype() - target.real_name = fields["name"] - target.dna.unique_enzymes = fields["UE"] - target.name = target.real_name - target.set_blood_type(fields["blood_type"]) - LAZYSET(target.dna.temporary_mutations, UE_CHANGED, endtime) - if(fields["UI"]) //UI+UE - LAZYINITLIST(target.dna.previous) - if(!target.dna.previous["UI"]) - target.dna.previous["UI"] = target.dna.unique_identity - target.dna.unique_identity = merge_text(target.dna.unique_identity, fields["UI"]) - LAZYSET(target.dna.temporary_mutations, UI_CHANGED, endtime) - if(fields["UF"]) //UI+UE - LAZYINITLIST(target.dna.previous) - if(!target.dna.previous["UF"]) - target.dna.previous["UF"] = target.dna.unique_features - target.dna.unique_features = merge_text(target.dna.unique_features, fields["UF"]) - LAZYSET(target.dna.temporary_mutations, UF_CHANGED, endtime) - if(fields["UI"] || fields["UF"]) - target.updateappearance(mutcolor_update = TRUE, mutations_overlay_update = TRUE) - return TRUE + duration = 60 SECONDS /obj/item/dnainjector/timed/hulk name = "\improper DNA injector (Hulk)" diff --git a/code/game/objects/items/emags.dm b/code/game/objects/items/emags.dm index 739ba154584..735c7c6a03a 100644 --- a/code/game/objects/items/emags.dm +++ b/code/game/objects/items/emags.dm @@ -86,6 +86,9 @@ color = rgb(40, 130, 255) prox_check = FALSE +/obj/item/card/emag/blue + color = rgb(40, 130, 255) + /obj/item/card/emag/halloween name = "hack-o'-lantern" desc = "It's a pumpkin with a cryptographic sequencer sticking out." diff --git a/code/game/objects/items/floppy_disk.dm b/code/game/objects/items/floppy_disk.dm index 83a5a6d2dca..3b7a75f1fa6 100644 --- a/code/game/objects/items/floppy_disk.dm +++ b/code/game/objects/items/floppy_disk.dm @@ -358,6 +358,20 @@ . = ..() new /obj/item/disk/data(src) +/obj/item/disk/manipulator + name = "manipulator task disk" + desc = "A floppy disk containing manipulator tasks." + var/list/tasks_data = list() + +/obj/item/disk/manipulator/proc/set_tasks(list/new_tasks_data) + if(read_only) + return FALSE + tasks_data = islist(new_tasks_data) ? new_tasks_data : list() + return TRUE + +/obj/item/disk/manipulator/proc/get_tasks() + return tasks_data?.Copy() || list() + #undef STARTING_STICKER #undef MAX_DISK_STACK_SIZE #undef STACK_PIXEL_STEP diff --git a/code/game/objects/items/food/dough.dm b/code/game/objects/items/food/dough.dm index 75fda88fc20..3266f9658c3 100644 --- a/code/game/objects/items/food/dough.dm +++ b/code/game/objects/items/food/dough.dm @@ -46,7 +46,7 @@ /obj/item/food/pizzabread/Initialize(mapload) . = ..() - AddComponent(/datum/component/ingredients_holder, /obj/item/food/pizza, CUSTOM_INGREDIENT_ICON_SCATTER, max_ingredients = 12) + AddComponent(/datum/component/ingredients_holder, /obj/item/food/pizza/custom, CUSTOM_INGREDIENT_ICON_SCATTER, max_ingredients = 12) /obj/item/food/doughslice name = "dough slice" diff --git a/code/game/objects/items/food/packaged.dm b/code/game/objects/items/food/packaged.dm index 95054ec4a1a..597ec3ce60d 100644 --- a/code/game/objects/items/food/packaged.dm +++ b/code/game/objects/items/food/packaged.dm @@ -117,6 +117,7 @@ if(!check_buffability(user)) return ..() apply_buff(user) + return TRUE /obj/item/food/canned/envirochow/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) if(!check_buffability(interacting_with)) diff --git a/code/game/objects/items/food/pizza.dm b/code/game/objects/items/food/pizza.dm index 061a255fd1b..b4e5bdf9406 100644 --- a/code/game/objects/items/food/pizza.dm +++ b/code/game/objects/items/food/pizza.dm @@ -106,6 +106,7 @@ slice.reagents.remove_all() reagents.trans_to(slice, amount = reagents.total_volume / slices_left, no_react = TRUE) + SEND_SIGNAL(src, COMSIG_PIZZA_SLICE_TAKEN, user, slice) slices_left-- if(slices_left <= 0) @@ -116,15 +117,6 @@ remove_filter("pizzaslices") add_filter("pizzaslices", 1, get_slices_filter()) -// Raw Pizza -/obj/item/food/pizza/raw - foodtypes = GRAIN | RAW - slice_type = null - crafting_complexity = FOOD_COMPLEXITY_2 - -/obj/item/food/pizza/raw/make_bakeable() - AddComponent(/datum/component/bakeable, /obj/item/food/pizza, rand(70 SECONDS, 80 SECONDS), TRUE, TRUE) - // Pizza Slice /obj/item/food/pizzaslice name = "bugged pizza slice" @@ -140,6 +132,17 @@ /obj/item/food/pizzaslice/make_processable() AddElement(/datum/element/processable, TOOL_ROLLINGPIN, /obj/item/stack/sheet/pizza, 1, 1 SECONDS, table_required = TRUE, screentip_verb = "Flatten", sound_to_play = SFX_ROLLING_PIN_ROLLING) +/obj/item/food/pizza/custom + name = "pizza" + desc = "A fancy custom pizza." + icon_state = "pizzamargherita" // Colored by the ingredient_holder component + slice_type = /obj/item/food/pizzaslice/custom + +/obj/item/food/pizzaslice/custom + name = "pizza slice" + desc = "A slice of custom fancy pizza." + icon_state = "pizzamargheritaslice" + /obj/item/food/pizza/margherita name = "pizza margherita" desc = "The most cheezy pizza in galaxy." diff --git a/code/game/objects/items/food/sweets.dm b/code/game/objects/items/food/sweets.dm index 4be75cf07fc..e429976657f 100644 --- a/code/game/objects/items/food/sweets.dm +++ b/code/game/objects/items/food/sweets.dm @@ -258,7 +258,7 @@ to_chat(victim, span_warning("[pick("You hear faint whispers.", "You smell ash.", "You feel hot.", "You hear a roar in the distance.")]")) /obj/item/food/bubblegum/bubblegum/suicide_act(mob/living/user) - user.say(";[pick(BUBBLEGUM_HALLUCINATION_LINES)]") + user.say(";[pick(BUBBLEGUM_HALLUCINATION_LINES)]", spans = list(SPAN_COLOSSUS)) return ..() /obj/item/food/gumball diff --git a/code/game/objects/items/grenades/_grenade.dm b/code/game/objects/items/grenades/_grenade.dm index 11e7f3683e2..0d715d8e6d9 100644 --- a/code/game/objects/items/grenades/_grenade.dm +++ b/code/game/objects/items/grenades/_grenade.dm @@ -145,7 +145,7 @@ /obj/item/grenade/proc/log_grenade(mob/user) if(!type_cluster) - log_bomber(user, "has primed a", src, "for detonation", message_admins = dud_flags != NONE) + log_bomber(user, "has primed a", src, "for detonation", message_admins = dud_flags == NONE) /** * arm_grenade (formerly preprime) refers to when a grenade with a standard time fuze is activated, making it go beepbeepbeep and then detonate a few seconds later. diff --git a/code/game/objects/items/grenades/ghettobomb.dm b/code/game/objects/items/grenades/ghettobomb.dm index 9afe5cd4aa6..5dbf5052168 100644 --- a/code/game/objects/items/grenades/ghettobomb.dm +++ b/code/game/objects/items/grenades/ghettobomb.dm @@ -198,6 +198,7 @@ /// Static list of reagent to explosive power var/static/list/fuel_power = list( /datum/reagent/fuel = 0.5, + /datum/reagent/toxin/plasma = 0.75, /datum/reagent/gunpowder = 1, /datum/reagent/nitroglycerin = 2, /datum/reagent/tatp = 2.5, diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm index e9b05a8c08c..89980733fa7 100644 --- a/code/game/objects/items/handcuffs.dm +++ b/code/game/objects/items/handcuffs.dm @@ -420,6 +420,8 @@ slowdown = 7 breakouttime = 30 SECONDS slot_flags = ITEM_SLOT_LEGCUFFED + /// Icon state for the legcuff overlay + var/legcuff_state = "legcuff" /** * # Bear trap diff --git a/code/game/objects/items/inspector.dm b/code/game/objects/items/inspector.dm index bc82fa85b94..4ca2320caa2 100644 --- a/code/game/objects/items/inspector.dm +++ b/code/game/objects/items/inspector.dm @@ -77,7 +77,6 @@ /obj/item/inspector/examine(mob/user) . = ..() - . += span_info("Use in-hand to scan the local area, creating an encrypted security inspection.") . += span_info("Use on an item to scan if it contains, or is, contraband.") if(!cell_cover_open) . += span_notice("Its cell cover is closed. It looks like it could be pried out, but doing so would require an appropriate tool.") diff --git a/code/game/objects/items/robot/items/tools.dm b/code/game/objects/items/robot/items/tools.dm index ce010ca50ec..dbf44a19b86 100644 --- a/code/game/objects/items/robot/items/tools.dm +++ b/code/game/objects/items/robot/items/tools.dm @@ -191,13 +191,20 @@ return ..() /obj/item/borg/cyborg_omnitool/add_context(atom/source, list/context, obj/item/held_item, mob/user) - . = ..() + . = NONE if (!issilicon(user)) return + var/mob/living/silicon/robot/as_cyborg = user if (!(src in as_cyborg.held_items)) context[SCREENTIP_CONTEXT_RMB] = "Select Tool" - return CONTEXTUAL_SCREENTIP_SET + return CONTEXTUAL_SCREENTIP_SET + +/obj/item/borg/cyborg_omnitool/examine(mob/user) + . = ..() + if(reference) + var/obj/item/tool = get_proxy_attacker_for(src, usr) + . += tool.examine(user) /** * Sets the new internal tool to be used @@ -206,8 +213,6 @@ * * obj/item/ref - typepath for the new internal omnitool */ /obj/item/borg/cyborg_omnitool/proc/set_internal_tool(obj/item/tool) - SHOULD_NOT_OVERRIDE(TRUE) - for(var/obj/item/internal_tool as anything in omni_toolkit) if(internal_tool == tool) reference = internal_tool @@ -241,11 +246,14 @@ //if all else fails just make a new one from scratch tool = new reference(user) + //assign the upgraded toolspeed, if engi omnitool upgrade was applied. + tool.toolspeed = initial(tool.toolspeed) - upgraded * 0.3 //the internal tool is considered part of the tool itself, so don't let it be dropped. tool.item_flags |= ABSTRACT ADD_TRAIT(tool, TRAIT_NODROP, INNATE_TRAIT) + //store tool for future use atoms[reference] = tool - tool.toolspeed = initial(tool.toolspeed) - upgraded * 0.3 //and finally assign the upgraded toolspeed, if any. + return tool /obj/item/borg/cyborg_omnitool/attack_self(mob/user) @@ -274,7 +282,8 @@ var/mob/living/silicon/robot/user = usr if (!(src in user.held_items)) attack_self(user) - return ..() + . = ..() + user.select_module(user.held_items.Find(src)) /obj/item/borg/cyborg_omnitool/update_icon_state() if (reference) @@ -322,15 +331,77 @@ /obj/item/screwdriver/cyborg, /obj/item/crowbar/cyborg, /obj/item/multitool/cyborg, + /obj/item/weldingtool/largetank/cyborg, ) +/obj/item/borg/cyborg_omnitool/engineering/Initialize(mapload) + . = ..() + RegisterSignal(src, COMSIG_SILICON_MODULE_ACTIVATION, PROC_REF(welder_toggle)) + +/obj/item/borg/cyborg_omnitool/engineering/add_context(atom/source, list/context, obj/item/held_item, mob/user) + . = ..() + if (!issilicon(user) || tool_behaviour != TOOL_WELDER) + return + + context[SCREENTIP_CONTEXT_CTRL_LMB] = "Toggle welder" + return CONTEXTUAL_SCREENTIP_SET + /obj/item/borg/cyborg_omnitool/engineering/examine(mob/user) . = ..() + if(tool_behaviour == TOOL_WELDER) + . += span_notice("Use [EXAMINE_HINT("Ctrl Click")] to toggle welder") - if(tool_behaviour == TOOL_MULTITOOL) - for(var/obj/item/multitool/tool in atoms) - . += "Its multitool buffer contains [tool.buffer]" - break +/obj/item/borg/cyborg_omnitool/engineering/update_overlays() + . = ..() + if(tool_behaviour == TOOL_WELDER) + var/obj/item/weldingtool/tool = atoms[/obj/item/weldingtool/largetank/cyborg] + if(tool?.welding) + . |= tool.update_overlays() + +/obj/item/borg/cyborg_omnitool/engineering/set_internal_tool(obj/item/tool) + if(tool_behaviour == TOOL_WELDER) + welder_toggle(src, FALSE) + + . = ..() + + if(tool_behaviour == TOOL_WELDER) + welder_toggle(src, TRUE) + +/obj/item/borg/cyborg_omnitool/engineering/item_ctrl_click(mob/user) + . = NONE + if(tool_behaviour == TOOL_WELDER) + var/mob/living/silicon/robot/borgy = loc + if(!istype(borgy) || borgy.module_active != src) + return + + welder_toggle(src, null) + return CLICK_ACTION_SUCCESS + +///Reflects internal welder icon onto the omnitool +/obj/item/borg/cyborg_omnitool/engineering/proc/welder_update(source) + PRIVATE_PROC(TRUE) + SIGNAL_HANDLER + + update_appearance(UPDATE_OVERLAYS) + +///Toggles welder on/off when module slot is selected/deselected +/obj/item/borg/cyborg_omnitool/engineering/proc/welder_toggle(datum/omnitool, state) + PRIVATE_PROC(TRUE) + SIGNAL_HANDLER + + if(tool_behaviour == TOOL_WELDER) + var/obj/item/weldingtool/tool = get_proxy_attacker_for(src, usr) + if(isnull(state)) + state = !tool.welding + if(state == tool.welding) + return + + if(state) + RegisterSignal(tool, COMSIG_ATOM_UPDATE_APPEARANCE, PROC_REF(welder_update)) + tool.switched_on(usr) + else + tool.switched_off() + UnregisterSignal(tool, COMSIG_ATOM_UPDATE_APPEARANCE) /obj/item/borg/cyborg_omnitool/botany name = "botanical omni-toolset" diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index fe81a77a273..c69dcb31b10 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -459,10 +459,6 @@ if(!.) return . ADD_TRAIT(cyborg, TRAIT_FASTMED, REF(src)) - for(var/obj/item/borg/cyborg_omnitool/medical/omnitool_upgrade in cyborg.model.modules) - if(omnitool_upgrade.upgraded) - to_chat(user, span_warning("This unit is already equipped with an omnitool upgrade!")) - return FALSE for(var/obj/item/borg/cyborg_omnitool/medical/omnitool in cyborg.model.modules) omnitool.set_upgraded(TRUE) @@ -471,7 +467,7 @@ if(!.) return . REMOVE_TRAIT(cyborg, TRAIT_FASTMED, REF(src)) - for(var/obj/item/borg/cyborg_omnitool/omnitool in cyborg.model.modules) + for(var/obj/item/borg/cyborg_omnitool/medical/omnitool in cyborg.model.modules) omnitool.set_upgraded(FALSE) /obj/item/borg/upgrade/engineering_omnitool @@ -486,24 +482,16 @@ /obj/item/borg/upgrade/engineering_omnitool/action(mob/living/silicon/robot/cyborg, mob/living/user = usr) . = ..() if(!.) - return . - for(var/obj/item/borg/cyborg_omnitool/engineering/omnitool_upgrade in cyborg.model.modules) - if(omnitool_upgrade.upgraded) - to_chat(user, span_warning("This unit is already equipped with an omnitool upgrade!")) - return FALSE + return for(var/obj/item/borg/cyborg_omnitool/engineering/omnitool in cyborg.model.modules) omnitool.set_upgraded(TRUE) - for(var/obj/item/weldingtool/largetank/cyborg/welder in cyborg.model.modules) - welder.toolspeed = initial(welder.toolspeed) - 0.3 /obj/item/borg/upgrade/engineering_omnitool/deactivate(mob/living/silicon/robot/cyborg, mob/living/user = usr) . = ..() if(!.) - return . - for(var/obj/item/borg/cyborg_omnitool/omnitool in cyborg.model.modules) + return + for(var/obj/item/borg/cyborg_omnitool/engineering/omnitool in cyborg.model.modules) omnitool.set_upgraded(FALSE) - for(var/obj/item/weldingtool/largetank/cyborg/welder in cyborg.model.modules) - welder.toolspeed = initial(welder.toolspeed) /obj/item/borg/upgrade/defib name = "medical cyborg defibrillator" diff --git a/code/game/objects/items/sharpener.dm b/code/game/objects/items/sharpener.dm index daf1bf0ba96..f01ca917f8c 100644 --- a/code/game/objects/items/sharpener.dm +++ b/code/game/objects/items/sharpener.dm @@ -53,7 +53,8 @@ I.wound_bonus = I.wound_bonus + increment //wound_bonus has no cap user.visible_message(span_notice("[user] sharpens [I] with [src]!"), span_notice("You sharpen [I], making it much more deadly than before.")) playsound(src, 'sound/items/unsheath.ogg', 25, TRUE) - I.sharpness = SHARP_EDGED //When you whetstone something, it becomes an edged weapon, even if it was previously dull or pointy + if(!(signal_out & COMPONENT_BLOCK_SHARPEN_SHARPNESS)) + I.sharpness = SHARP_EDGED //When you whetstone something, it becomes an edged weapon, even if it was previously dull or pointy I.throwforce = clamp(I.throwforce + increment, 0, max) I.name = "[prefix] [I.name]" //This adds a prefix and a space to the item's name regardless of what the prefix is desc = "[desc] At least, it used to." diff --git a/code/game/objects/items/stacks/bscrystal.dm b/code/game/objects/items/stacks/bscrystal.dm index 762e9ce4032..c893888eaf3 100644 --- a/code/game/objects/items/stacks/bscrystal.dm +++ b/code/game/objects/items/stacks/bscrystal.dm @@ -13,6 +13,10 @@ refined_type = /obj/item/stack/sheet/bluespace_crystal scan_state = "rock_bscrystal" merge_type = /obj/item/stack/ore/bluespace_crystal + vein_type = ORE_VEIN_SCATTER + vein_distance = 5 + min_vein_size = 1 + max_vein_size = 2 /// The teleport range when crushed/thrown at someone. var/blink_range = 8 diff --git a/code/game/objects/items/stacks/sheets/runed_metal.dm b/code/game/objects/items/stacks/sheets/runed_metal.dm index 674dea391c1..e68a1356d0f 100644 --- a/code/game/objects/items/stacks/sheets/runed_metal.dm +++ b/code/game/objects/items/stacks/sheets/runed_metal.dm @@ -39,8 +39,7 @@ GLOBAL_LIST_INIT(runed_metal_recipes, list( \ req_amount = 3, \ time = 4 SECONDS, \ crafting_flags = CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, \ - desc = span_cult_bold("Daemon Forge: Can make Nar'Sien Hardened Armor, Flagellant's Robes, \ - and Eldritch Longswords. Emits Light."), \ + desc = span_cult_bold("Daemon Forge: Can make Nar'Sien Hardened Armor and Eldritch Longswords. Emits Light."), \ required_noun = "runed metal sheet", \ category = CAT_CULT, \ ), \ diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 43e07364716..d62cca101c2 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -478,8 +478,12 @@ if(isstack(created)) var/obj/item/stack/crafted_stack = created + if(recipe.res_amount > 0 && recipe.req_amount != recipe.res_amount) + var/scale = recipe.req_amount / recipe.res_amount + for(var/mat in result_mats) + result_mats[mat] *= scale crafted_stack.mats_per_unit = SSmaterials.get_material_set_cache(result_mats) - update_custom_materials() + crafted_stack.update_custom_materials() else created.set_custom_materials(result_mats, recipe.req_amount * multiplier) diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index a203d3ad0c0..5f5e9616992 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -60,7 +60,7 @@ icon_state = "bag_of_holding" inhand_icon_state = "holdingpack" resistance_flags = FIRE_PROOF - item_flags = NO_MAT_REDEMPTION + item_flags = NO_MAT_REDEMPTION | BLUESPACE_INTERFERENCE armor_type = /datum/armor/backpack_holding storage_type = /datum/storage/bag_of_holding pickup_sound = null diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 7a915b2e471..c2bc54dc71a 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -466,7 +466,8 @@ worn_icon_state = "soulstonebelt" storage_type = /datum/storage/wands_belt -/obj/item/storage/belt/wands/full/PopulateContents() +/// Put some wands in that bad boy +/obj/item/storage/belt/wands/full/proc/create_wands() new /obj/item/gun/magic/wand/death(src) new /obj/item/gun/magic/wand/resurrection(src) new /obj/item/gun/magic/wand/fireball(src) //SKYRAT EDIT - Trades polymorph for second fireball @@ -475,10 +476,96 @@ new /obj/item/gun/magic/wand/fireball(src) new /obj/item/gun/magic/wand/shrink(src) +/obj/item/storage/belt/wands/full/PopulateContents() + create_wands() for(var/obj/item/gun/magic/wand/W in contents) //All wands in this pack come in the best possible condition W.max_charges = initial(W.max_charges) W.charges = W.max_charges +/// Filled with budget wands instead of cool ones +/obj/item/storage/belt/wands/full/discount + /// Which wands can appear? + var/static/list/possible_options = list( + /obj/item/gun/magic/wand/animate, + /obj/item/gun/magic/wand/babel, + /obj/item/gun/magic/wand/bald, + /obj/item/gun/magic/wand/door, + /obj/item/gun/magic/wand/fireball, + /obj/item/gun/magic/wand/freeze, + /obj/item/gun/magic/wand/hallucination, + /obj/item/gun/magic/wand/levitate, + /obj/item/gun/magic/wand/pax, + /obj/item/gun/magic/wand/pizza, + /obj/item/gun/magic/wand/plague, + /obj/item/gun/magic/wand/prank, + /obj/item/gun/magic/wand/rebel, + /obj/item/gun/magic/wand/repulse, + /obj/item/gun/magic/wand/swap, + /obj/item/gun/magic/wand/teleport, + /obj/item/gun/magic/wand/tentacles, + /obj/item/gun/magic/wand/zap, + ) + +/obj/item/storage/belt/wands/full/discount/create_wands() + var/list/available_options = possible_options.Copy() + for (var/i in 1 to 6) + if (!length(available_options)) + break + var/wand_path = pick_n_take(available_options) + new wand_path(src) + +/// Not a subtype of bandolier because it acts pretty differently +/obj/item/storage/belt/wand_bandolier + name = "wand bandolier" + desc = "A bandolier for holding a whole lot of wands. If worn on your suit, swaps expended wands for fresh ones on the fly." + icon_state = "bandolier" + inhand_icon_state = "bandolier" + worn_icon_state = "bandolier" + storage_type = /datum/storage/wands_belt + w_class = WEIGHT_CLASS_NORMAL + +/obj/item/storage/belt/wand_bandolier/equipped(mob/user, slot) + . = ..() + if (!(slot & ITEM_SLOT_SUITSTORE)) + return + ADD_CLOTHING_TRAIT(user, TRAIT_GUNFLIP) + RegisterSignal(user, COMSIG_MOB_FIRED_GUN, PROC_REF(on_gun_fired)) + +/obj/item/storage/belt/wand_bandolier/dropped(mob/user) + . = ..() + REMOVE_CLOTHING_TRAIT(user, TRAIT_GUNFLIP) + UnregisterSignal(user, COMSIG_MOB_FIRED_GUN) + +/// After we fire a gun, check if it's a wand. If it is and it's empty, do a swap +/obj/item/storage/belt/wand_bandolier/proc/on_gun_fired(mob/living/wizard, obj/item/gun/magic/wand/old_wand) + SIGNAL_HANDLER + INVOKE_ASYNC(src, PROC_REF(equip_new_wand), wizard, old_wand) + +/obj/item/storage/belt/wand_bandolier/proc/equip_new_wand(mob/living/wizard, obj/item/gun/magic/wand/old_wand) + if (!istype(old_wand)) + return + if (!atom_storage.real_location.contents.len) // no other wands + return + if (old_wand.charges > 1) // It hasn't subtracted yet + return + + var/obj/item/fresh_wand + for (var/obj/item/gun/magic/wand/checked in atom_storage.real_location.contents) + if (checked.charges) + fresh_wand = checked + break + if (!fresh_wand || fresh_wand.on_found()) + return // Nothing to swap with + + wizard.temporarilyRemoveItemFromInventory(old_wand) + if (!wizard.put_in_hands(fresh_wand)) + return + to_chat(wizard, span_notice("You quickly draw [fresh_wand].")) + if (atom_storage.attempt_insert(old_wand, wizard)) + return + old_wand.forceMove(wizard.drop_location()) + to_chat(wizard, span_warning("...and drop [old_wand] on the ground.")) + /obj/item/storage/belt/janitor name = "janibelt" desc = "A belt used to hold most janitorial supplies." diff --git a/code/game/objects/items/storage/boxes/cargo_boxes.dm b/code/game/objects/items/storage/boxes/cargo_boxes.dm index 749873b50a0..a299ab08509 100644 --- a/code/game/objects/items/storage/boxes/cargo_boxes.dm +++ b/code/game/objects/items/storage/boxes/cargo_boxes.dm @@ -13,3 +13,19 @@ /obj/item/stack/wrapping_paper/small = 1, ) generate_items_inside(items_inside,src) + +/obj/item/storage/box/shipping/debug + name = "box of bigger shipping supplies" + desc = "Everything you need to make your own cargo department." + +/obj/item/storage/box/shipping/debug/PopulateContents() + var/list/items_inside = list( + /obj/item/universal_scanner = 1, + /obj/item/stack/package_wrap/small = 2, + /obj/item/stack/wrapping_paper/small = 2, + /obj/item/boulder_beacon = 1, + /obj/item/stack/conveyor/thirty = 1, + /obj/item/conveyor_switch_construct = 1, + /obj/item/construction/plumbing = 1, + ) + generate_items_inside(items_inside,src) diff --git a/code/game/objects/items/storage/garment.dm b/code/game/objects/items/storage/garment.dm index 960ab7c9334..3be99e8d337 100644 --- a/code/game/objects/items/storage/garment.dm +++ b/code/game/objects/items/storage/garment.dm @@ -47,6 +47,7 @@ new /obj/item/clothing/under/rank/captain(src) new /obj/item/clothing/under/rank/captain/skirt(src) new /obj/item/clothing/under/rank/captain/parade(src) + new /obj/item/clothing/under/rank/captain/royal(src) new /obj/item/clothing/suit/armor/vest/capcarapace(src) new /obj/item/clothing/suit/armor/vest/capcarapace/captains_formal(src) new /obj/item/clothing/suit/hooded/wintercoat/captain(src) @@ -56,6 +57,7 @@ new /obj/item/clothing/head/costume/crown/fancy(src) new /obj/item/clothing/head/hats/caphat(src) new /obj/item/clothing/head/hats/caphat/parade(src) + new /obj/item/clothing/head/hats/caphat/bicorne(src) new /obj/item/clothing/neck/cloak/cap(src) new /obj/item/clothing/shoes/laceup(src) new /obj/item/storage/backpack/captain(src) diff --git a/code/game/objects/items/storage/toolboxes/medical.dm b/code/game/objects/items/storage/toolboxes/medical.dm index 0c9323212b6..26630831aef 100644 --- a/code/game/objects/items/storage/toolboxes/medical.dm +++ b/code/game/objects/items/storage/toolboxes/medical.dm @@ -41,4 +41,4 @@ /obj/item/storage/toolbox/medical/coroner/Initialize(mapload) . = ..() - AddElement(/datum/element/bane, mob_biotypes = MOB_UNDEAD, damage_multiplier = 1) //Just in case one of the tennants get uppity + AddComponent(/datum/component/bane, affected_biotypes = MOB_UNDEAD, damage_multiplier = 2) //Just in case one of the tennants get uppity diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index 75aa8ce47a5..8d1260a638b 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -491,6 +491,11 @@ new /obj/item/reagent_containers/cup/bottle/amanitin(src) new /obj/item/reagent_containers/syringe(src) +/obj/item/storage/box/syndie_kit/carnivorous_blood/PopulateContents() + new /obj/item/reagent_containers/cup/bottle/carnivorous_blood(src) + new /obj/item/reagent_containers/syringe(src) + new /obj/item/food/meat/slab/human(src) + /obj/item/storage/box/syndie_kit/nuke name = "nuke core extraction kit" desc = "A box containing the equipment and instructions for extracting the plutonium cores of most Nanotrasen nuclear explosives." @@ -798,6 +803,7 @@ var/datum/antagonist/nukeop/nuke_datum = new() nuke_datum.send_to_spawnpoint = FALSE + nuke_datum.give_bonus_tc = FALSE nuke_datum.nukeop_outfit = null human_target.mind?.add_antag_datum(nuke_datum) human_target.add_faction(ROLE_SYNDICATE) diff --git a/code/game/objects/items/tanks/jetpack.dm b/code/game/objects/items/tanks/jetpack.dm index 3a665d903a6..74557295dac 100644 --- a/code/game/objects/items/tanks/jetpack.dm +++ b/code/game/objects/items/tanks/jetpack.dm @@ -73,8 +73,7 @@ /obj/item/tank/jetpack/populate_gas() if(gas_type) var/datum/gas_mixture/our_mix = return_air() - our_mix.assert_gas(gas_type) - our_mix.gases[gas_type][MOLES] = ((6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)) + our_mix.set_gas(gas_type, ((6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C))) /obj/item/tank/jetpack/ui_action_click(mob/user, action) if(istype(action, /datum/action/item_action/toggle_jetpack)) diff --git a/code/game/objects/items/tanks/tank_types.dm b/code/game/objects/items/tanks/tank_types.dm index 5ecfa9e154e..5f26c569932 100644 --- a/code/game/objects/items/tanks/tank_types.dm +++ b/code/game/objects/items/tanks/tank_types.dm @@ -35,8 +35,7 @@ /obj/item/tank/internals/oxygen/populate_gas() - air_contents.assert_gas(/datum/gas/oxygen) - air_contents.gases[/datum/gas/oxygen][MOLES] = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) + air_contents.set_gas(/datum/gas/oxygen, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) /obj/item/tank/internals/oxygen/yellow @@ -68,9 +67,9 @@ force = 10 /obj/item/tank/internals/anesthetic/populate_gas() - air_contents.assert_gases(/datum/gas/oxygen, /datum/gas/nitrous_oxide) - air_contents.gases[/datum/gas/oxygen][MOLES] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD - air_contents.gases[/datum/gas/nitrous_oxide][MOLES] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD + air_contents.set_gas(/datum/gas/oxygen, (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD) + air_contents.set_gas(/datum/gas/nitrous_oxide, (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD) + /obj/item/tank/internals/anesthetic/examine(mob/user) . = ..() @@ -82,8 +81,7 @@ icon_state = "anesthetic_warning" /obj/item/tank/internals/anesthetic/pure/populate_gas() - air_contents.assert_gases(/datum/gas/nitrous_oxide) - air_contents.gases[/datum/gas/nitrous_oxide][MOLES] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) + air_contents.adjust_gas(/datum/gas/nitrous_oxide, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) /* * Plasma @@ -101,8 +99,7 @@ /obj/item/tank/internals/plasma/populate_gas() - air_contents.assert_gas(/datum/gas/plasma) - air_contents.gases[/datum/gas/plasma][MOLES] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) + air_contents.set_gas(/datum/gas/plasma, (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) /obj/item/tank/internals/plasma/attackby(obj/item/W, mob/user, list/modifiers, list/attack_modifiers) if(istype(W, /obj/item/flamethrower)) @@ -118,8 +115,7 @@ return ..() /obj/item/tank/internals/plasma/full/populate_gas() - air_contents.assert_gas(/datum/gas/plasma) - air_contents.gases[/datum/gas/plasma][MOLES] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) + air_contents.set_gas(/datum/gas/plasma, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) /obj/item/tank/internals/plasma/empty/populate_gas() return @@ -138,12 +134,10 @@ distribute_pressure = TANK_PLASMAMAN_RELEASE_PRESSURE /obj/item/tank/internals/plasmaman/populate_gas() - air_contents.assert_gas(/datum/gas/plasma) - air_contents.gases[/datum/gas/plasma][MOLES] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) + air_contents.set_gas(/datum/gas/plasma, (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) /obj/item/tank/internals/plasmaman/full/populate_gas() - air_contents.assert_gas(/datum/gas/plasma) - air_contents.gases[/datum/gas/plasma][MOLES] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) + air_contents.set_gas(/datum/gas/plasma, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) /obj/item/tank/internals/plasmaman/belt @@ -158,8 +152,7 @@ w_class = WEIGHT_CLASS_SMALL //thanks i forgot this /obj/item/tank/internals/plasmaman/belt/full/populate_gas() - air_contents.assert_gas(/datum/gas/plasma) - air_contents.gases[/datum/gas/plasma][MOLES] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) + air_contents.set_gas(/datum/gas/plasma, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) /obj/item/tank/internals/plasmaman/belt/empty/populate_gas() return @@ -186,8 +179,7 @@ /obj/item/tank/internals/emergency_oxygen/populate_gas() - air_contents.assert_gas(/datum/gas/oxygen) - air_contents.gases[/datum/gas/oxygen][MOLES] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) + air_contents.set_gas(/datum/gas/oxygen, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) /obj/item/tank/internals/emergency_oxygen/empty/populate_gas() @@ -247,21 +239,18 @@ /obj/item/tank/internals/emergency_oxygen/engi/clown/n2o /obj/item/tank/internals/emergency_oxygen/engi/clown/n2o/populate_gas() - air_contents.assert_gases(/datum/gas/oxygen, /datum/gas/nitrous_oxide) - air_contents.gases[/datum/gas/oxygen][MOLES] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * 0.95 - air_contents.gases[/datum/gas/nitrous_oxide][MOLES] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * 0.05 + air_contents.set_gas(/datum/gas/oxygen, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * 0.95) + air_contents.set_gas(/datum/gas/nitrous_oxide, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * 0.05) /obj/item/tank/internals/emergency_oxygen/engi/clown/bz /obj/item/tank/internals/emergency_oxygen/engi/clown/bz/populate_gas() - air_contents.assert_gases(/datum/gas/oxygen, /datum/gas/bz) - air_contents.gases[/datum/gas/oxygen][MOLES] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * 0.9 - air_contents.gases[/datum/gas/bz][MOLES] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * 0.1 + air_contents.set_gas(/datum/gas/oxygen,(10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * 0.9) + air_contents.set_gas(/datum/gas/bz,(10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * 0.1) /obj/item/tank/internals/emergency_oxygen/engi/clown/helium distribute_pressure = TANK_CLOWN_RELEASE_PRESSURE + 2 /obj/item/tank/internals/emergency_oxygen/engi/clown/helium/populate_gas() - air_contents.assert_gases(/datum/gas/oxygen, /datum/gas/helium) - air_contents.gases[/datum/gas/oxygen][MOLES] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * 0.75 - air_contents.gases[/datum/gas/helium][MOLES] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * 0.25 + air_contents.set_gas(/datum/gas/oxygen, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * 0.75) + air_contents.set_gas(/datum/gas/helium, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * 0.25) diff --git a/code/game/objects/items/teleportation.dm b/code/game/objects/items/teleportation.dm index 9a9edfabe3d..d038a2eb254 100644 --- a/code/game/objects/items/teleportation.dm +++ b/code/game/objects/items/teleportation.dm @@ -406,11 +406,9 @@ var/teleport_distance = rand(minimum_teleport_distance, maximum_teleport_distance) var/turf/destination = get_teleport_loc(current_location, user, teleport_distance) var/bagholdingcheck = FALSE - if(iscarbon(user)) - var/mob/living/carbon/teleporting_guy = user - if(locate(/obj/item/storage/backpack/holding) in teleporting_guy.get_all_gear(INCLUDE_PROSTHETICS|INCLUDE_ABSTRACT|INCLUDE_ACCESSORIES)) + for(var/obj/item/check as anything in user.get_all_contents_type(/obj/item)) + if(check.item_flags & BLUESPACE_INTERFERENCE) bagholdingcheck = TRUE - if(isclosedturf(destination)) if(!triggered_by_emp && !bagholdingcheck) panic_teleport(user, destination) //We're in a wall, engage emergency parallel teleport. @@ -501,7 +499,7 @@ ///Bleed and make blood splatters at tele start and end points /obj/item/syndicate_teleporter/proc/make_bloods(turf/old_location, turf/new_location, mob/living/user) - if(!user.can_bleed(BLOOD_COVER_TURFS) != BLEED_SPLATTER) + if(user.can_bleed(BLOOD_COVER_TURFS) != BLEED_SPLATTER) return FALSE user.add_splatter_floor(old_location) user.add_splatter_floor(new_location) diff --git a/code/game/objects/items/tools/engineering/weldingtool.dm b/code/game/objects/items/tools/engineering/weldingtool.dm index ad7770a84cc..c3eee46701a 100644 --- a/code/game/objects/items/tools/engineering/weldingtool.dm +++ b/code/game/objects/items/tools/engineering/weldingtool.dm @@ -261,13 +261,13 @@ START_PROCESSING(SSobj, src) else balloon_alert(user, "no fuel!") - switched_off(user) + switched_off() else playsound(loc, deactivation_sound, 50, TRUE) - switched_off(user) + switched_off() /// Switches the welder off -/obj/item/weldingtool/proc/switched_off(mob/user) +/obj/item/weldingtool/proc/switched_off() set_welding(FALSE) force = 3 diff --git a/code/game/objects/items/tools/medical/defib.dm b/code/game/objects/items/tools/medical/defib.dm index 05b31ed295f..ecf01547462 100644 --- a/code/game/objects/items/tools/medical/defib.dm +++ b/code/game/objects/items/tools/medical/defib.dm @@ -122,12 +122,12 @@ /obj/item/defibrillator/attack_hand(mob/user, list/modifiers) if(loc == user) if(user.get_slot_by_item(src) & slot_flags) - ui_action_click() + ui_action_click(user, modifiers) else balloon_alert(user, "equip the unit first!") return else if(istype(loc, /obj/machinery/defibrillator_mount)) - ui_action_click() //checks for this are handled in defibrillator.mount.dm + ui_action_click(user, modifiers) //checks for this are handled in defibrillator.mount.dm return ..() /obj/item/defibrillator/screwdriver_act(mob/living/user, obj/item/tool) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index ce765778cb6..a4f64946c0e 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -1139,7 +1139,9 @@ /obj/item/toy/clockwork_watch/examine(mob/user) . = ..() - . += span_info("Station Time: [station_time_timestamp()]") + . += span_info("Station Time: [server_timestamp(ic_time = TRUE, twelve_hour_clock = user.client?.prefs.read_preference(/datum/preference/toggle/twelve_hour))]") + if(user.is_literate()) + . += span_info("That means it is currently [round_timestamp()] into the shift.") /* * Toy Dagger diff --git a/code/game/objects/items/weaponry/melee/baton.dm b/code/game/objects/items/weaponry/melee/baton.dm index 3c5f0a4991a..a4ceccaa4eb 100644 --- a/code/game/objects/items/weaponry/melee/baton.dm +++ b/code/game/objects/items/weaponry/melee/baton.dm @@ -1009,22 +1009,19 @@ AddElement(/datum/element/examine_lore, \ lore_hint = span_notice("You can [EXAMINE_HINT("look closer")] to learn a little more about [src]."), \ lore = "The Secure Apprehension Device (sometimes referred to as the SAD in the officer training manuals) is \ - the unholy union of a mace and a cattleprod. This nonlethal device was designed to put a stop to ruffians, \ - scoundrels, ne'er-do-wells and criminals wherever they may rear their ugly heads.
\ + an unholy union of mace and cattleprod. Designed to stop criminals in their tracks, Nanotrasen security members \ + are rarely without their trusty stun baton. Assuming they haven't lost it somewhere.
\
\ - A symbol of Nanotrasen security forces, the stun baton is the primary tool officers employ against the \ - unlawful scum and villainy of the Spinward and abroad. Trained to 'baton first, interrogate later', \ - Nanotrasen security has long since earned itself a mixed reputation. Able to rapidly shut down the \ - central nervous system of a criminal with only a few direct applications of the conductive striking head \ - of the device, few would-be troublemakers want to find themselves on the wrong end of an officer brandishing \ - this baton.
\ + Trained to 'baton first, interrogate later', Nanotrasen security has long since earned itself a mixed reputation. \ + The device is able to rapidly shut down the central nervous system of a criminal with only a few direct applications \ + of the conductive striking head.
\
\ TerraGov law enforcement has avoided the adoption of stun batons due to various ethical dilemmas posed by \ - their usage, largely because of the longterm physical and mental ramifications of being struck by a human cattleprod. \ - Citizens' rights advocacy groups protest against the proliferation of stun batons as a policing tool, \ - arguing that they are 'inhumane' and 'authoritarian'. Nanotrasen, on the other hand, has had no such qualms \ - when deploying stun batons as a compliance measure across all of their existing stations and facilities against \ - unruly members of staff." \ + their utilization. Studies of their usage have shown numerous longterm physical and mental ramifications caused by \ + being struck by a human cattleprod. Citizens' rights advocacy groups protest against the proliferation of stun \ + batons as a policing tool, arguing that they are 'inhumane' and 'authoritarian'. Nanotrasen, on the other hand, \ + has had no such qualms when deploying stun batons as a compliance measure across all of their existing stations \ + and facilities against their own unruly members of staff." \ ) // Contractor Baton @@ -1033,25 +1030,14 @@ AddElement(/datum/element/examine_lore, \ lore_hint = span_notice("You can [EXAMINE_HINT("look closer")] to learn a little more about [src]."), \ lore = "The Contract Acquisition Device (sometimes referred to as the CAD in encrypted correspondence) is \ - one of the more frequently encountered examples of Cybersun Industries weaponry. Extremely similar to Nanotrasen's \ - own Secure Apprehension Device (also simply known as the stun baton), the contractor baton is able to induce \ - CNS disruption in a target to render them helpless. It is also capable of devastating blunt force trauma if \ - used as a bludgeon. The contractor baton is also capable of telescopic deployment, allowing for discretion while \ - making an approach towards a target.
\ + the most frequently encountered example of Cybersun Industries weaponry. Similar in purpose to Nanotrasen's \ + own Secure Apprehension Device, the baton is capable of inducing rapid CNS disruption in a target to render them \ + helpless. It also makes for an effective bludgeon, another quality it shares with the stun baton. To maximize \ + ease of concealment, the baton is also able to be telescopically collapsed, to then be rapidly deployed at the \ + pull of a trigger.
\
\ - The contractor baton is famously associated with contractors, elite Cybersun field agents. While the standard \ - agent would often be tasked with sabotage, terrorism, murder or theft, contractors have the critical task of \ - kidnapping high value personnel. Anyone with the potential to possess classified or sensitive data about Nanotrasen \ - security systems and devices could be a target for Cybersun.
\ -
\ - Extracting this information is most easily performed on living subjects. As such, the contractor baton was designed \ - with nonlethal incapacitation in mind. However, Cybersun Industries has long since found workarounds for extracting \ - data from the recently deceased, should the contractor find themselves with only a corpse left to send back. Death \ - may not spare you from the machinations of Cybersun Industries if they deem you a valuable asset towards their goals.
\ -
\ - Nanotrasen utilizes a number of countermeasures to contractor insurgencies, such as employing selective memory wiping \ - or falsified memory injection, the establishment of 'dummy' command staff through the artificial acceleration \ - of otherwise incompetent but useful crewmembers (whose incompetence will often result in an acceptable degree \ - of operational disruption), which provides convenient scapegoats in the event of a security breach as well as \ - frequent staff turnover and reassignment." \ + The contractor baton is famously associated with contractors, elite Cybersun field agents sent to kidnap and extract \ + high value enemy personnel for interrogation. Anyone with the potential to possess classified or sensitive data about \ + Nanotrasen could find themselves a target for Cybersun. The company relentlessly employs contractors to probe Nanotrasen \ + for vulnerabilities, starting with their employees." \ ) diff --git a/code/game/objects/items/weaponry/melee/misc.dm b/code/game/objects/items/weaponry/melee/misc.dm index 11d951f22a9..b79ff035f20 100644 --- a/code/game/objects/items/weaponry/melee/misc.dm +++ b/code/game/objects/items/weaponry/melee/misc.dm @@ -488,7 +488,18 @@ /obj/effect/decal/cleanable/ants, /obj/item/queen_bee, )) - AddElement(/datum/element/bane, mob_biotypes = MOB_BUG, target_type = /mob/living/basic, damage_multiplier = 0, added_damage = 24, requires_combat_mode = FALSE) + AddComponent(/datum/component/bane, affected_biotypes = MOB_BUG, pre_bane_callback = CALLBACK(src, PROC_REF(bane_check)) ) + +// Different type of bug mobs get different amounts of damage multipliers +/obj/item/melee/flyswatter/proc/bane_check(mob/living/target, mob/living/attacker, list/attack_modifiers) + if(isanimal_or_basicmob(target)) + MODIFY_ATTACK_FORCE(attack_modifiers, 24) + else if(isflyperson(target)) + MODIFY_ATTACK_FORCE(attack_modifiers, 29) + else if(ismoth(target)) + MODIFY_ATTACK_FORCE(attack_modifiers, 9) + else // ?? Whatever + MODIFY_ATTACK_FORCE(attack_modifiers, 14) /obj/item/melee/flyswatter/afterattack(atom/target, mob/user, list/modifiers, list/attack_modifiers) if(is_type_in_typecache(target, splattable)) diff --git a/code/game/objects/items/weaponry/melee/sabre.dm b/code/game/objects/items/weaponry/melee/sabre.dm index 0cc90020800..1507193e3e8 100644 --- a/code/game/objects/items/weaponry/melee/sabre.dm +++ b/code/game/objects/items/weaponry/melee/sabre.dm @@ -34,29 +34,23 @@ bonus_modifier = 5, \ ) // The weight of authority comes down on the tider's crimes. - AddElement(/datum/element/bane, target_type = /mob/living/carbon/human, damage_multiplier = 0.35) - RegisterSignal(src, COMSIG_OBJECT_PRE_BANING, PROC_REF(attempt_bane)) - RegisterSignal(src, COMSIG_OBJECT_ON_BANING, PROC_REF(bane_effects)) - -/** - * If the target reeks of maintenance, the blade can tear through their body with a total of 20 damage. - */ -/obj/item/melee/sabre/proc/attempt_bane(element_owner, mob/living/carbon/criminal) - SIGNAL_HANDLER - var/obj/item/organ/liver/liver = criminal.get_organ_slot(ORGAN_SLOT_LIVER) - if(isnull(liver) || !HAS_TRAIT(liver, TRAIT_MAINTENANCE_METABOLISM)) - return COMPONENT_CANCEL_BANING - -/** - * Assistants should fear this weapon. - */ -/obj/item/melee/sabre/proc/bane_effects(element_owner, mob/living/carbon/human/baned_target) - SIGNAL_HANDLER - baned_target.visible_message( - span_warning("[src] tears through [baned_target] with unnatural ease!"), - span_userdanger("As [src] tears into your body, you feel the weight of authority collapse into your wounds!"), + AddComponent(/datum/component/bane, \ + damage_multiplier = 1.35, \ + should_bane_callback = CALLBACK(src, PROC_REF(bane_check)), \ + on_bane_callback = CALLBACK(src, PROC_REF(bane_message)), \ + label_text = "assistants", \ ) - INVOKE_ASYNC(baned_target, TYPE_PROC_REF(/mob/living/carbon/human, emote), "scream") + +/obj/item/melee/sabre/proc/bane_check(mob/living/target) + var/obj/item/organ/liver/liver = target.get_organ_slot(ORGAN_SLOT_LIVER) + return !isnull(liver) && HAS_TRAIT(liver, TRAIT_MAINTENANCE_METABOLISM) + +/obj/item/melee/sabre/proc/bane_message(mob/living/target, mob/living/attacker) + target.visible_message( + span_warning("[src] tears through [target] with unnatural ease!"), + span_boldwarning("As [src] tears into your body, you feel the weight of authority collapse into your wounds!"), + ) + INVOKE_ASYNC(target, TYPE_PROC_REF(/mob, emote), "scream") /obj/item/melee/sabre/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK, damage_type = BRUTE) if(attack_type == PROJECTILE_ATTACK || attack_type == LEAP_ATTACK || attack_type == OVERWHELMING_ATTACK) diff --git a/code/game/objects/items/weaponry/melee/soulscythe.dm b/code/game/objects/items/weaponry/melee/soulscythe.dm index 35b27736e13..596166d14e0 100644 --- a/code/game/objects/items/weaponry/melee/soulscythe.dm +++ b/code/game/objects/items/weaponry/melee/soulscythe.dm @@ -38,7 +38,7 @@ RegisterSignal(soul, COMSIG_MOB_ATTACK_RANGED, PROC_REF(on_attack)) RegisterSignal(soul, COMSIG_MOB_ATTACK_RANGED_SECONDARY, PROC_REF(on_secondary_attack)) RegisterSignal(src, COMSIG_ATOM_INTEGRITY_CHANGED, PROC_REF(on_integrity_change)) - AddElement(/datum/element/bane, mob_biotypes = MOB_PLANT, damage_multiplier = 0.5, requires_combat_mode = FALSE) + AddComponent(/datum/component/bane, affected_biotypes = MOB_PLANT, damage_multiplier = 1.5) /obj/item/soulscythe/examine(mob/user) . = ..() @@ -263,12 +263,10 @@ /mob/living/basic/soulscythe/Initialize(mapload) . = ..() add_traits(list(TRAIT_ASHSTORM_IMMUNE, TRAIT_SNOWSTORM_IMMUNE, TRAIT_LAVA_IMMUNE), INNATE_TRAIT) - RegisterSignal(src, COMSIG_LIVING_LIFE, PROC_REF(on_life)) -/mob/living/basic/soulscythe/proc/on_life(datum/source, seconds_per_tick) // done like this because there's no need to go through all of life since the item does the work anyways +/mob/living/basic/soulscythe/Life(seconds_per_tick) if(stat == CONSCIOUS) adjust_blood_volume(round(1 * seconds_per_tick), maximum = MAX_BLOOD_LEVEL) - return COMPONENT_LIVING_CANCEL_LIFE_PROCESSING /// Special projectile for the soulscythe. /obj/projectile/soulscythe diff --git a/code/game/objects/items/weaponry/melee/spear.dm b/code/game/objects/items/weaponry/melee/spear.dm index 8eb3c842b30..5f358a7b2f5 100644 --- a/code/game/objects/items/weaponry/melee/spear.dm +++ b/code/game/objects/items/weaponry/melee/spear.dm @@ -459,7 +459,7 @@ /obj/item/spear/dragonator/Initialize(mapload) . = ..() - AddElement(/datum/element/bane, mob_biotypes = MOB_MINING, damage_multiplier = 0, added_damage = 80, requires_combat_mode = FALSE) //For killing really big monsters. + AddComponent(/datum/component/bane, affected_biotypes = MOB_MINING, added_damage = 80) //For killing really big monsters. /* * Untreated Giantslayer , needs to be thrown into lava diff --git a/code/game/objects/items/weaponry/ranged/flamethrower.dm b/code/game/objects/items/weaponry/ranged/flamethrower.dm index 29a410dcb10..c8421c9fe80 100644 --- a/code/game/objects/items/weaponry/ranged/flamethrower.dm +++ b/code/game/objects/items/weaponry/ranged/flamethrower.dm @@ -231,7 +231,8 @@ var/datum/gas_mixture/air_transfer = tank_mix.remove_ratio(release_amount) if(air_transfer.gases[/datum/gas/plasma]) - air_transfer.gases[/datum/gas/plasma][MOLES] *= 5 //Suffering + var/moles = air_transfer.gases[/datum/gas/plasma][MOLES] * 5 //Suffering + air_transfer.set_gas(/datum/gas/plasma, moles) target.assume_air(air_transfer) //Burn it based on transferred gas target.hotspot_expose((tank_mix.temperature*2) + 380,500) @@ -286,8 +287,7 @@ SIGNAL_HANDLER if(ptank) var/datum/gas_mixture/tank_mix = ptank.return_air() - tank_mix.assert_gas(/datum/gas/plasma) - tank_mix.gases[/datum/gas/plasma][MOLES] = (10*ONE_ATMOSPHERE)*ptank.volume/(R_IDEAL_GAS_EQUATION*T20C) + tank_mix.set_gas(/datum/gas/plasma, (10*ONE_ATMOSPHERE)*ptank.volume/(R_IDEAL_GAS_EQUATION*T20C)) else ptank = new /obj/item/tank/internals/plasma/full(src) update_appearance() diff --git a/code/game/objects/items/weaponry/shields.dm b/code/game/objects/items/weaponry/shields.dm index c2fa89a06b8..2f8b5ab46cb 100644 --- a/code/game/objects/items/weaponry/shields.dm +++ b/code/game/objects/items/weaponry/shields.dm @@ -43,6 +43,7 @@ /obj/item/shield/Initialize(mapload) . = ..() AddElement(/datum/element/disarm_attack) + AddElement(/datum/element/cuffable_item) /obj/item/shield/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK, damage_type = BRUTE) var/effective_block_chance = final_block_chance diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 167ca422109..3db7bc1c079 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -357,6 +357,8 @@ GLOBAL_LIST_EMPTY(objects_by_id_tag) /// Returns modifier to how much damage this object does to a target considered vulnerable to "demolition" (other objects, robots, etc) /obj/proc/get_demolition_modifier(obj/target) + if(HAS_TRAIT(target, TRAIT_IGNORE_DEMOLITION)) + return 1 if(HAS_TRAIT(target, TRAIT_INVERTED_DEMOLITION)) return (1 / demolition_mod) return demolition_mod diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index 7e8d586a4d3..ec0994a5025 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -629,8 +629,9 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool/bar, 0) fishing_modifier = -21 //it only lives for 25 seconds, so we make them worth it. custom_materials = null -/obj/structure/chair/mime/wrench_act_secondary(mob/living/user, obj/item/weapon) - return NONE +/obj/structure/chair/mime/Initialize(mapload) + . = ..() + AddElement(/datum/element/tool_blocker, TOOL_WRENCH, TOOL_ACT_SECONDARY) /obj/structure/chair/mime/post_buckle_mob(mob/living/M) M.add_offsets(type, z_add = 5) diff --git a/code/game/objects/structures/crates_lockers/closets/bodybag.dm b/code/game/objects/structures/crates_lockers/closets/bodybag.dm index 28c2b6030b3..b911705b010 100644 --- a/code/game/objects/structures/crates_lockers/closets/bodybag.dm +++ b/code/game/objects/structures/crates_lockers/closets/bodybag.dm @@ -159,11 +159,9 @@ content.forceMove(folding_bodybag) if(isliving(content)) to_chat(content, span_userdanger("You're suddenly forced into a tiny, compressed space!")) - if(iscarbon(content)) - var/mob/living/carbon/mob = content - if (mob.dna?.get_mutation(/datum/mutation/dwarfism)) - max_weight_of_contents = max(WEIGHT_CLASS_NORMAL, max_weight_of_contents) - continue + if(HAS_TRAIT(content, TRAIT_DWARF)) + max_weight_of_contents = max(WEIGHT_CLASS_NORMAL, max_weight_of_contents) + continue if(!isitem(content)) max_weight_of_contents = max(WEIGHT_CLASS_BULKY, max_weight_of_contents) continue @@ -297,8 +295,8 @@ air_contents.temperature = T20C air_contents.assert_gases(/datum/gas/oxygen, /datum/gas/nitrogen) - air_contents.gases[/datum/gas/oxygen][MOLES] = (ONE_ATMOSPHERE*50)/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD - air_contents.gases[/datum/gas/nitrogen][MOLES] = (ONE_ATMOSPHERE*50)/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD + air_contents.adjust_gas(/datum/gas/oxygen, (ONE_ATMOSPHERE*50)/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD) + air_contents.adjust_gas(/datum/gas/nitrogen, (ONE_ATMOSPHERE*50)/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD) /obj/structure/closet/body_bag/environmental/nanotrasen name = "elite environmental protection bag" @@ -428,8 +426,8 @@ air_contents.temperature = T20C air_contents.assert_gases(/datum/gas/oxygen, /datum/gas/nitrous_oxide) - air_contents.gases[/datum/gas/oxygen][MOLES] = (ONE_ATMOSPHERE*50)/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD - air_contents.gases[/datum/gas/nitrous_oxide][MOLES] = (ONE_ATMOSPHERE*50)/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD + air_contents.adjust_gas(/datum/gas/oxygen, (ONE_ATMOSPHERE*50)/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD) + air_contents.adjust_gas(/datum/gas/nitrous_oxide, (ONE_ATMOSPHERE*50)/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD) /obj/structure/closet/body_bag/environmental/hardlight name = "hardlight bodybag" @@ -509,11 +507,10 @@ var/inner_temp = T0C - 60 air_contents = null air_contents = new(mol_count) - air_contents.temperature = inner_temp + air_contents.set_temperature(inner_temp) - air_contents.assert_gases(/datum/gas/oxygen, /datum/gas/nitrogen) - air_contents.gases[/datum/gas/oxygen][MOLES] = (ONE_ATMOSPHERE * mol_count) / (R_IDEAL_GAS_EQUATION * inner_temp) * O2STANDARD - air_contents.gases[/datum/gas/nitrogen][MOLES] = (ONE_ATMOSPHERE * mol_count) / (R_IDEAL_GAS_EQUATION * inner_temp) * N2STANDARD + air_contents.set_gas(/datum/gas/oxygen, ((ONE_ATMOSPHERE * mol_count) / (R_IDEAL_GAS_EQUATION * inner_temp) * O2STANDARD)) + air_contents.set_gas(/datum/gas/nitrogen, ((ONE_ATMOSPHERE * mol_count) / (R_IDEAL_GAS_EQUATION * inner_temp) * N2STANDARD)) /obj/structure/closet/body_bag/environmental/stasis/examine_status(mob/user) switch(100 * get_integrity_percentage()) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm index 3bfee4282c2..66fa776f403 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -9,6 +9,7 @@ new /obj/item/radio/weather_monitor (src) new /obj/item/radio/headset/heads/qm(src) new /obj/item/megaphone/cargo(src) + new /obj/item/assembly/flash/handheld(src) new /obj/item/tank/internals/emergency_oxygen(src) new /obj/item/universal_scanner(src) new /obj/item/door_remote/quartermaster(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 7e4350c4cb0..b5e287585e2 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -210,6 +210,9 @@ req_one_access = list(ACCESS_BRIG) var/id = null +/obj/structure/closet/secure_closet/brig/holodeck + req_one_access = COMMON_ACCESS + /obj/structure/closet/secure_closet/brig/genpop name = "genpop storage locker" desc = "Used for storing the belongings of genpop's tourists visiting the locals." diff --git a/code/game/objects/structures/crates_lockers/crates/abandoned_crates/abandoned_crates.dm b/code/game/objects/structures/crates_lockers/crates/abandoned_crates/abandoned_crates.dm index 3a17fdc4b8b..61034b9f017 100644 --- a/code/game/objects/structures/crates_lockers/crates/abandoned_crates/abandoned_crates.dm +++ b/code/game/objects/structures/crates_lockers/crates/abandoned_crates/abandoned_crates.dm @@ -76,7 +76,7 @@ ) = 11, list( // Mobs - /mob/living/basic/bot/honkbot = 5, + /mob/living/basic/bot/secbot/honkbot = 5, /mob/living/basic/pet/gondola = 2, /obj/effect/spawner/abandoned_crate/bloodroaches = 1, ) = 8, @@ -188,6 +188,12 @@ return ITEM_INTERACT_SUCCESS +/obj/structure/closet/crate/secure/loot/multitool_act_secondary(mob/living/user, obj/item/tool) + if(!locked) + return + attack_hand(user) + return ITEM_INTERACT_SUCCESS + /// Implements bulls and cows algorithm to compare guess against actual code /obj/structure/closet/crate/secure/loot/proc/bulls_and_cows(guess) var/bulls = 0 diff --git a/code/game/objects/structures/crates_lockers/crates/abandoned_crates/abandoned_crates_loot.dm b/code/game/objects/structures/crates_lockers/crates/abandoned_crates/abandoned_crates_loot.dm index 490b280c66c..943af17cf1f 100644 --- a/code/game/objects/structures/crates_lockers/crates/abandoned_crates/abandoned_crates_loot.dm +++ b/code/game/objects/structures/crates_lockers/crates/abandoned_crates/abandoned_crates_loot.dm @@ -64,7 +64,7 @@ /obj/effect/spawner/abandoned_crate/space_suit loot = list( - /obj/item/borg/upgrade/modkit/aoe/mobs = 1, + /obj/item/borg/upgrade/modkit/cooldown/aoe/mobs = 1, /obj/item/clothing/suit/space = 1, /obj/item/clothing/head/helmet/space = 1 ) diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index 430ae36fb77..6407bb104d9 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -388,7 +388,7 @@ /obj/structure/displaycase/trophy/proc/toggle_historian_mode(mob/user) historian_mode = !historian_mode balloon_alert(user, "[historian_mode ? "enabled" : "disabled"] historian mode.") - playsound(src, 'sound/machines/beep/twobeep.ogg', vary = 50) + playsound(src, 'sound/machines/beep/twobeep.ogg', 10, vary = 50) SStgui.update_uis(src) /obj/structure/displaycase/trophy/toggle_lock(mob/user) diff --git a/code/game/objects/structures/electricchair.dm b/code/game/objects/structures/electricchair.dm index d68457f9bae..ffe4252f6ef 100644 --- a/code/game/objects/structures/electricchair.dm +++ b/code/game/objects/structures/electricchair.dm @@ -8,10 +8,14 @@ /obj/structure/chair/e_chair/Initialize(mapload) . = ..() - var/obj/item/assembly/shock_kit/stored_kit = new(contents) var/mutable_appearance/export_to_component = mutable_appearance('icons/obj/chairs.dmi', "echair_over", OBJ_LAYER, src, appearance_flags = KEEP_APART) export_to_component = color_atom_overlay(export_to_component) - AddComponent(/datum/component/electrified_buckle, (SHOCK_REQUIREMENT_ITEM | SHOCK_REQUIREMENT_LIVE_CABLE | SHOCK_REQUIREMENT_SIGNAL_RECEIVED_TOGGLE), stored_kit, list(export_to_component)) + + AddComponent(\ + /datum/component/electrified_buckle,\ + overlays_to_add = list(export_to_component),\ + shock_flags = (SHOCK_NOGLOVES)\ + ) /obj/structure/chair/e_chair/attackby(obj/item/W, mob/user, list/modifiers, list/attack_modifiers) if(W.tool_behaviour == TOOL_WRENCH) diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 974425c94ca..4882007ddbb 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -1059,9 +1059,82 @@ /obj/structure/flora/rock/pile/style_random/Initialize(mapload) . = ..() - icon_state = "lavarocks[rand(1, 3)]" + icon_state = "lavarocks[pick(3;1,3;2,1;3)]" update_appearance() +/obj/structure/flora/rock/pile/siderite + icon_state = "lavarocks_siderite1" + +/obj/structure/flora/rock/pile/siderite/get_potential_products() + return list(/obj/item/stack/ore/glass/siderite = 1) + +/obj/structure/flora/rock/pile/siderite/style_2 + icon_state = "lavarocks_siderite2" + +/obj/structure/flora/rock/pile/siderite/style_3 + icon_state = "lavarocks_siderite3" + +/obj/structure/flora/rock/pile/siderite/style_random/Initialize(mapload) + . = ..() + icon_state = "lavarocks_siderite[pick(3;1,3;2,1;3)]" + update_appearance() + +/obj/structure/flora/rock/pile/shale + icon_state = "lavarocks_shale1" + +/obj/structure/flora/rock/pile/shale/style_2 + icon_state = "lavarocks_shale2" + +/obj/structure/flora/rock/pile/shale/style_3 + icon_state = "lavarocks_shale3" + +/obj/structure/flora/rock/pile/shale/style_random/Initialize(mapload) + . = ..() + icon_state = "lavarocks_shale[pick(3;1,3;2,1;3)]" + update_appearance() + +/obj/structure/flora/rock/siderite_growth + name = "siderite growth" + desc = "A natural stalagmite formed of siderite, with thin pointy strands of dirty metal sticking out of the top." + icon_state = "siderite_growth1" + base_icon_state = "siderite_growth" + icon = 'icons/obj/mining_zones/terrain.dmi' + harvest_message_med = "You finish mining the growth." + +/obj/structure/flora/rock/siderite_growth/Initialize(mapload) + . = ..() + icon_state = "[base_icon_state][pick(3;1,3;2,1;3)]" + update_appearance() + AddComponent(/datum/component/seethrough, SEE_THROUGH_MAP_DEFAULT) + +/obj/structure/flora/rock/siderite_growth/get_potential_products() + return list(/obj/item/stack/ore/glass/siderite = 1) + +/obj/structure/flora/rock/volcano + name = "volcanic pore" + desc = "A miniature volcano-like rock formed of the lava slowly pouring from it." + icon_state = "volcano_1" + base_icon_state = "volcano" + harvest_message_med = "You finish mining the pore buildup." + light_range = 3 + light_power = 2.5 + light_color = LIGHT_COLOR_LAVA + +/obj/structure/flora/rock/volcano/Initialize(mapload) + . = ..() + icon_state = "[base_icon_state]_[rand(1, 5)]" + update_appearance() + +/obj/structure/flora/rock/volcano/update_overlays() + . = ..() + . += emissive_appearance(icon, "[icon_state]_e", src, alpha = 200) + +/obj/structure/flora/rock/volcano/after_harvest(user) + var/turf/open/our_turf = loc + if (istype(our_turf)) + our_turf.ChangeTurf(/turf/open/lava/smooth, flags = CHANGETURF_INHERIT_AIR) + return ..() + /obj/structure/flora/rock/pile/jungle icon_state = "rock1" icon = 'icons/obj/fluff/flora/jungleflora.dmi' diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index ec618d60831..77e80e95dc4 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -31,6 +31,7 @@ /obj/structure/grille/Initialize(mapload) . = ..() AddElement(/datum/element/atmos_sensitive, mapload) + register_context() /obj/structure/grille/Destroy() update_cable_icons_on_turf(get_turf(src)) @@ -59,9 +60,19 @@ if(resistance_flags & INDESTRUCTIBLE) return if(anchored) - . += span_notice("It's secured in place with screws. The rods look like they could be cut through.") + . += span_notice("It's secured in place with [EXAMINE_HINT("screws")]. The rods look like they could be [EXAMINE_HINT("cut")] through.") else - . += span_notice("The anchoring screws are unscrewed. The rods look like they could be cut through.") + . += span_notice("The anchoring screws are [EXAMINE_HINT("unscrewed")]. The rods look like they could be [EXAMINE_HINT("cut")] through.") + +/obj/structure/grille/add_context(atom/source, list/context, obj/item/held_item, mob/user) + . = ..() + if(held_item?.tool_behaviour == TOOL_WIRECUTTER) + context[SCREENTIP_CONTEXT_RMB] = "Deconstruct" + return CONTEXTUAL_SCREENTIP_SET + if(held_item?.tool_behaviour == TOOL_SCREWDRIVER) + context[SCREENTIP_CONTEXT_LMB] = "[anchored ? "Unanchor" : "Anchor"]" + return CONTEXTUAL_SCREENTIP_SET + return . /obj/structure/grille/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) switch(the_rcd.mode) @@ -199,7 +210,7 @@ return TRUE return FALSE -/obj/structure/grille/wirecutter_act(mob/living/user, obj/item/tool) +/obj/structure/grille/wirecutter_act_secondary(mob/living/user, obj/item/tool) add_fingerprint(user) if(shock(user, 100)) return diff --git a/code/game/objects/structures/guillotine.dm b/code/game/objects/structures/guillotine.dm index 50a9473e19f..0615ea579da 100644 --- a/code/game/objects/structures/guillotine.dm +++ b/code/game/objects/structures/guillotine.dm @@ -244,8 +244,7 @@ var/datum/species/S = victim.dna.species if (istype(S)) - victim.cut_overlays() - victim.update_body_parts_head_only() + victim.render_only_head() victim.remove_overlay(BODY_ADJ_LAYER) victim.pixel_y += -GUILLOTINE_HEAD_OFFSET // Offset their body so it looks like they're in the guillotine victim.layer += GUILLOTINE_LAYER_DIFF diff --git a/code/game/objects/structures/lavaland/geyser.dm b/code/game/objects/structures/lavaland/geyser.dm index bbbc8da76e4..5c790457e44 100644 --- a/code/game/objects/structures/lavaland/geyser.dm +++ b/code/game/objects/structures/lavaland/geyser.dm @@ -72,6 +72,7 @@ return to_chat(user, span_notice("You discovered the geyser and mark it on the GPS system!")) + playsound(src, 'sound/machines/beep/twobeep_high.ogg', 30) SEND_SIGNAL(user, COMSIG_LIVING_DISCOVERED_GEYSER, src) if(discovery_message) to_chat(user, discovery_message) diff --git a/code/game/objects/structures/lavaland/necropolis_tendril.dm b/code/game/objects/structures/lavaland/necropolis_tendril.dm deleted file mode 100644 index e6ca59016ed..00000000000 --- a/code/game/objects/structures/lavaland/necropolis_tendril.dm +++ /dev/null @@ -1,141 +0,0 @@ -//Necropolis Tendrils, which spawn lavaland monsters and break into a chasm when killed -/obj/structure/spawner/lavaland - name = "necropolis tendril" - desc = "A vile tendril of corruption, originating deep underground. Terrible monsters are pouring out of it." - - icon = 'icons/mob/simple/lavaland/nest.dmi' - icon_state = "tendril" - - faction = list(FACTION_MINING, FACTION_ASHWALKER) - max_mobs = 3 - max_integrity = 250 - mob_types = list(/mob/living/basic/mining/watcher) - - move_resist=INFINITY // just killing it tears a massive hole in the ground, let's not move it - anchored = TRUE - resistance_flags = FIRE_PROOF | LAVA_PROOF - var/obj/effect/light_emitter/tendril/emitted_light - scanner_taggable = TRUE - mob_gps_id = "WT" - spawner_gps_id = "Necropolis Tendril" - -/obj/structure/spawner/lavaland/goliath - mob_types = list(/mob/living/basic/mining/goliath) - mob_gps_id = "GL" - -/obj/structure/spawner/lavaland/legion - mob_types = list(/mob/living/basic/mining/legion/spawner_made) - mob_gps_id = "LG" - -/obj/structure/spawner/lavaland/icewatcher - mob_types = list(/mob/living/basic/mining/watcher/icewing) - mob_gps_id = "WT|I" // icewing - -GLOBAL_LIST_INIT(tendrils, list()) -/obj/structure/spawner/lavaland/Initialize(mapload) - . = ..() - emitted_light = new(loc) - for(var/F in RANGE_TURFS(1, src)) - if(ismineralturf(F)) - var/turf/closed/mineral/M = F - M.ScrapeAway(null, CHANGETURF_IGNORE_AIR) - AddComponent(/datum/component/gps, "Eerie Signal") - GLOB.tendrils += src - -/obj/structure/spawner/lavaland/atom_deconstruct(disassembled) - new /obj/effect/collapse(loc) - -/obj/structure/spawner/lavaland/examine(mob/user) - var/list/examine_messages = ..() - examine_messages += span_notice("Once this thing gets hurts enough, it triggers a violent final retaliation.") - examine_messages += span_notice("You'll only have a few moments to run up, grab some loot with an open hand, and get out with it.") - return examine_messages - -/obj/structure/spawner/lavaland/Destroy() - var/last_tendril = TRUE - if(GLOB.tendrils.len>1) - last_tendril = FALSE - - if(last_tendril && !(flags_1 & ADMIN_SPAWNED_1)) - if(SSachievements.achievements_enabled) - for(var/mob/living/L in view(7,src)) - if(L.stat || !L.client) - continue - L.client.give_award(/datum/award/achievement/boss/tendril_exterminator, L) - L.client.give_award(/datum/award/score/tendril_score, L) //Progresses score by one - GLOB.tendrils -= src - QDEL_NULL(emitted_light) - return ..() - -/obj/effect/light_emitter/tendril - set_luminosity = 4 - set_cap = 2.5 - light_color = LIGHT_COLOR_LAVA - -/obj/effect/collapse - name = "collapsing necropolis tendril" - desc = "Get your loot and get clear!" - layer = TABLE_LAYER - icon = 'icons/mob/simple/lavaland/nest.dmi' - icon_state = "tendril" - anchored = TRUE - density = TRUE - /// weakref list of which mobs have gotten their loot from this effect. - var/list/collected = list() - /// a bit of light as to make less unfair deaths from the chasm - var/obj/effect/light_emitter/tendril/emitted_light - -/obj/effect/collapse/Initialize(mapload) - . = ..() - emitted_light = new(loc) - visible_message(span_bolddanger("The tendril writhes in fury as the earth around it begins to crack and break apart! Get back!")) - balloon_alert_to_viewers("interact to grab loot before collapse!", vision_distance = 7) - playsound(loc,'sound/effects/tendril_destroyed.ogg', 200, FALSE, 50, TRUE, TRUE) - addtimer(CALLBACK(src, PROC_REF(collapse)), 5 SECONDS) - -/obj/effect/collapse/examine(mob/user) - var/list/examine_messages = ..() - if(isliving(user)) - if(has_collected(user)) - examine_messages += span_boldnotice("You've grabbed what you can, now get out!") - else - examine_messages += span_boldnotice("You might have some time to grab some goodies with an open hand before it collapses!") - return examine_messages - -/obj/effect/collapse/attack_hand(mob/living/collector, list/modifiers) - . = ..() - if(has_collected(collector)) - to_chat(collector, span_danger("You've already gotten some loot, just get out of there with it!")) - return - visible_message(span_warning("Something falls free of the tendril!")) - var/obj/structure/closet/crate/necropolis/tendril/loot = new /obj/structure/closet/crate/necropolis/tendril(loc) - collector.start_pulling(loot) - collected += WEAKREF(collector) - -/obj/effect/collapse/Destroy() - collected.Cut() - QDEL_NULL(emitted_light) - return ..() - -///Helper proc that resolves weakrefs to determine if collector is in collected list, returning a boolean. -/obj/effect/collapse/proc/has_collected(mob/collector) - for(var/datum/weakref/weakref as anything in collected) - var/mob/living/resolved = weakref.resolve() - //it could have been collector, it could not have been, we don't care - if(!resolved) - continue - if(resolved == collector) - return TRUE - return FALSE - -/obj/effect/collapse/proc/collapse() - for(var/mob/M in range(7,src)) - shake_camera(M, 15, 1) - playsound(get_turf(src),'sound/effects/explosion/explosionfar.ogg', 200, TRUE) - visible_message(span_bolddanger("The tendril falls inward, the ground around it widening into a yawning chasm!")) - for(var/turf/T in RANGE_TURFS(2,src)) - if(HAS_TRAIT(T, TRAIT_NO_TERRAFORM)) - continue - if(!T.density) - T.TerraformTurf(/turf/open/chasm/lavaland, /turf/open/chasm/lavaland, flags = CHANGETURF_INHERIT_AIR) - qdel(src) diff --git a/code/game/objects/structures/lavaland/ore_vent.dm b/code/game/objects/structures/lavaland/ore_vent.dm index f4ef87a2c09..244e88102be 100644 --- a/code/game/objects/structures/lavaland/ore_vent.dm +++ b/code/game/objects/structures/lavaland/ore_vent.dm @@ -1,4 +1,4 @@ -#define MAX_ARTIFACT_ROLL_CHANCE 10 +#define ARTIFACT_ROLL_CHANCE 7 #define MINERAL_TYPE_OPTIONS_RANDOM 4 #define OVERLAY_OFFSET_START 0 #define OVERLAY_OFFSET_EACH 5 @@ -72,7 +72,7 @@ /// What base icon_state do we use for this vent's boulders? var/boulder_icon_state = "boulder" /// Percent chance that this vent will produce an artifact boulder. - var/artifact_chance = 0 + var/artifact_chance = ARTIFACT_ROLL_CHANCE /// We use a cooldown to prevent the wave defense from being started multiple times. COOLDOWN_DECLARE(wave_cooldown) /// We use a cooldown to prevent players from tapping boulders rapidly from vents. @@ -140,6 +140,7 @@ . = ..() if(HAS_TRAIT(user, TRAIT_BOULDER_BREAKER)) produce_boulder(TRUE) + return TRUE /obj/structure/ore_vent/is_buckle_possible(mob/living/target, force, check_loc) . = ..() @@ -160,6 +161,8 @@ . += span_notice("This vent produces [span_bold("large")] boulders containing [ore_string]") else . += span_notice("This vent can be scanned with a [span_bold("Mining Scanner")].") + if(artifact_chance) + . += span_notice("This vent has a low chance to produce an [span_bold("artifact boulder.")] These may contain rare minerals or strange artifacts.") /obj/structure/ore_vent/add_context(atom/source, list/context, obj/item/held_item, mob/living/user) if(is_type_in_list(held_item, scanning_equipment)) @@ -221,8 +224,8 @@ * This also means a large boulder can highroll a boulder with a full stack of 50 sheets of material. * @params ore_floor The number of minerals already rolled. Used to scale the logarithmic function. */ -/obj/structure/ore_vent/proc/ore_quantity_function(ore_floor) - return SHEET_MATERIAL_AMOUNT * max(round(boulder_size * (log(rand(1 + ore_floor, 4 + ore_floor)) ** -1)), 1) +/obj/structure/ore_vent/proc/ore_quantity_function(ore_floor, ore_per_size = HALF_SHEET_MATERIAL_AMOUNT) + return ore_per_size * max(round(boulder_size * (log(rand(1 + ore_floor, 4 + ore_floor)) ** -1)), 1) /** * This confirms that the user wants to start the wave defense event, and that they can start it. @@ -357,7 +360,7 @@ miner.mind?.adjust_experience(/datum/skill/mining, MINING_SKILL_BOULDER_SIZE_XP * boulder_size) if(!user_id_card) continue - var/point_reward_val = (MINER_POINT_MULTIPLIER * boulder_size) - MINER_POINT_MULTIPLIER // We remove the base value of discovering the vent + var/point_reward_val = (MINER_POINT_MULTIPLIER * (boulder_size + 2)) - MINER_POINT_MULTIPLIER // We remove the base value of discovering the vent if(user_id_card.registered_account) user_id_card.registered_account.mining_points += point_reward_val user_id_card.registered_account.bank_card_talk("You have been awarded [point_reward_val] mining points for your efforts.") @@ -525,6 +528,11 @@ var/atom/movable/flick_visual/visual = flick_overlay_view(mutable_appearance('icons/effects/vent_overlays.dmi', selected_mat.name), 4.5 SECONDS) animate(visual, alpha = 0, time = 4.5 SECONDS, easing = CIRCULAR_EASING|EASE_IN) + if(artifact_chance) + var/atom/movable/flick_visual/rare = flick_overlay_view(mutable_appearance('icons/effects/vent_overlays.dmi', "rare_ore"), 4.5 SECONDS) + animate(rare, alpha = 0, time = 4.5 SECONDS, easing = CIRCULAR_EASING|EASE_IN) + + /** * Here is where we handle producing a new boulder, based on the qualities of this ore vent. * Returns the boulder produced. @@ -540,7 +548,8 @@ //produce the boulder var/obj/item/boulder/new_rock if(prob(artifact_chance)) - new_rock = new /obj/item/boulder/artifact(loc) + var/picked_artifact = pick(typesof(/obj/item/boulder/artifact)) + new_rock = new picked_artifact(loc) else new_rock = new /obj/item/boulder(loc) Shake(duration = 1.5 SECONDS) @@ -645,6 +654,10 @@ /datum/material/glass = 1, ) +/obj/structure/ore_vent/starter_resources/Initialize(mapload) + . = ..() + generate_description() + /obj/structure/ore_vent/random // Todo: determine if we need a boulder_size default thats unique from the override performed in vent_size_setup. @@ -653,7 +666,6 @@ if(!unique_vent && !mapload) generate_mineral_breakdown(map_loading = mapload) //Default to random mineral breakdowns, unless this is a unique vent or we're still setting up default vent distribution. generate_description() - artifact_chance = rand(0, MAX_ARTIFACT_ROLL_CHANCE) if(!mapload) vent_size_setup(random = TRUE) // We only do this here specific to random distribution ore vents, and within mapload we handle this manually within SSore_generation. @@ -699,9 +711,9 @@ /datum/material/titanium = 1, /datum/material/silver = 1, /datum/material/gold = 1, - /datum/material/diamond = 1, + /datum/material/diamond = 0.1, /datum/material/uranium = 1, - /datum/material/bluespace = 1, + /datum/material/bluespace = 0.1, /datum/material/plastic = 1, ) defending_mobs = list( @@ -758,6 +770,41 @@ /mob/living/simple_animal/hostile/megafauna/colossus, ) +/obj/structure/ore_vent/debug + name = "debug ore vent" + desc = "How the hell did you get this?." + tapped = TRUE + discovered = TRUE + unique_vent = TRUE + color = "#ff00f2" + boulder_size = BOULDER_SIZE_SMALL + mineral_breakdown = list( + /datum/material/iron = 1, + ) + +/obj/structure/ore_vent/debug/attack_hand(mob/living/user, list/modifiers) + . = ..() + var/datum/material/choice = tgui_input_list(user, "Choose a material to add/remove.", "New material", subtypesof(/datum/material)) + if(!choice) + return + if(mineral_breakdown[choice]) + mineral_breakdown -= choice + balloon_alert_to_viewers("removed [choice::name]") + return + mineral_breakdown += choice + balloon_alert_to_viewers("added [choice::name]") + var/value = tgui_input_number(user, "What weight should it have?", "ore pickweight", 1, 100, 1) + mineral_breakdown[choice] = value + balloon_alert_to_viewers("weighting of [value] added") + generate_description() + +/obj/structure/ore_vent/debug/attack_hand_secondary(mob/user, list/modifiers) + . = ..() + var/choice = tgui_input_list(user, "Choose a vent size.", "New size", list(SMALL_VENT_TYPE, MEDIUM_VENT_TYPE, LARGE_VENT_TYPE)) + if(!choice) + return + vent_size_setup(random = FALSE, force_size = choice, map_loading = FALSE) + /obj/effect/landmark/mining_center name = "Mining Epicenter" icon_state = "mining_epicenter" @@ -772,7 +819,7 @@ GLOB.mining_center += loc return INITIALIZE_HINT_QDEL -#undef MAX_ARTIFACT_ROLL_CHANCE +#undef ARTIFACT_ROLL_CHANCE #undef MINERAL_TYPE_OPTIONS_RANDOM #undef OVERLAY_OFFSET_START #undef OVERLAY_OFFSET_EACH diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index 4b2ba45770c..548cc1d8f80 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -15,6 +15,9 @@ #define PRIDE_MIRROR_OPTIONS list(CHANGE_HAIR, CHANGE_BEARD, CHANGE_RACE, CHANGE_SEX, CHANGE_EYES) #define MAGIC_MIRROR_OPTIONS list(CHANGE_HAIR, CHANGE_BEARD, CHANGE_RACE, CHANGE_SEX, CHANGE_EYES, CHANGE_NAME) +// Chance for the mirror to be haunted at creation +#define ROUNDSTART_CURSED_CHANCE 0.2 + /obj/structure/mirror name = "mirror" desc = "Mirror mirror on the wall, who's the most robust of them all?" @@ -29,7 +32,8 @@ ///Can this mirror be removed from walls with tools? var/deconstructable = TRUE var/list/mirror_options = INERT_MIRROR_OPTIONS - + // Can a revenant be imprisoned in this mirror? + var/cursable = TRUE ///Flags this race must have to be selectable with this type of mirror. var/race_flags = MIRROR_MAGIC ///List of all Races that can be chosen, decided by its Initialize. @@ -57,6 +61,8 @@ ) if(mapload) find_and_mount_on_atom() + if(prob(ROUNDSTART_CURSED_CHANCE) && cursable) + AddComponent(/datum/component/revenant_prison, create_on_release = TRUE) update_choices() register_context() @@ -72,10 +78,12 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror, 28) /obj/structure/mirror/broken icon_state = "mirror_broke" + cursable = FALSE + broken = TRUE + desc = "Oh no, seven years of bad luck!" /obj/structure/mirror/broken/Initialize(mapload) . = ..() - atom_break(null, mapload) MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror/broken, 28) @@ -262,7 +270,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror/broken, 28) return user.set_eye_color(sanitize_hexcolor(new_eye_color)) user.dna.update_ui_block(/datum/dna_block/identity/eye_colors) - user.update_body() + user.update_eyes() to_chat(user, span_notice("You gaze at your new eyes with your new eyes. Perfect!")) /obj/structure/mirror/examine(mob/user) @@ -302,13 +310,12 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror/broken, 28) to_chat(unlucky_dude, span_warning("A chill runs down your spine as [src] shatters...")) unlucky_dude.AddComponent(/datum/component/omen, incidents_left = 7) -/obj/structure/mirror/atom_break(damage_flag, mapload) +/obj/structure/mirror/atom_break(damage_flag) . = ..() if(broken) return icon_state = "mirror_broke" - if(!mapload) - playsound(src, SFX_SHATTER, 70, TRUE) + playsound(src, SFX_SHATTER, 70, TRUE) if(desc == initial(desc)) desc = "Oh no, seven years of bad luck!" broken = TRUE @@ -361,6 +368,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror/broken, 28) icon_state = "magic_mirror" mirror_options = MAGIC_MIRROR_OPTIONS deconstructable = FALSE + cursable = FALSE /obj/structure/mirror/magic/Initialize(mapload) . = ..() @@ -463,3 +471,5 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror/broken, 28) #undef INERT_MIRROR_OPTIONS #undef PRIDE_MIRROR_OPTIONS #undef MAGIC_MIRROR_OPTIONS + +#undef ROUNDSTART_CURSED_CHANCE diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 0848cfecc37..82485224ad6 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -463,35 +463,28 @@ GLOBAL_LIST_EMPTY(crematoriums) /obj/structure/bodycontainer/crematorium/proc/cremate(mob/user) if(locked) return //don't let you cremate something twice or w/e + // Make sure we don't delete the actual morgue and its tray var/list/conts = get_all_contents() - src - connected - - if(!conts.len) + if(!length(conts)) audible_message(span_hear("You hear a hollow crackle.")) return - else - audible_message(span_hear("You hear a roar as the crematorium activates.")) + audible_message(span_hear("You hear a roar as the crematorium activates.")) + locked = TRUE + update_appearance() - locked = TRUE - update_appearance() + for(var/mob/living/victim in conts) + if(victim.incorporeal_move) //can't cook revenants! + continue - for(var/mob/living/M in conts) - if(M.incorporeal_move) //can't cook revenants! - continue - if (M.stat != DEAD) - M.emote("scream") - if(user) - log_combat(user, M, "cremated") - else - M.log_message("was cremated", LOG_ATTACK) + if (victim.stat != DEAD) + victim.emote("scream") - if(user.stat != DEAD) - user.investigate_log("has died from being cremated.", INVESTIGATE_DEATHS) - M.death(TRUE) - if(!QDELETED(M)) //some animals get automatically deleted on death. - M.ghostize() - qdel(M) + if(user) + log_combat(user, victim, "cremated") + else + victim.log_message("was cremated", LOG_ATTACK) for(var/obj/O in conts) //conts defined above, ignores crematorium and tray // SKYRAT EDIT ADDITION @@ -502,15 +495,32 @@ GLOBAL_LIST_EMPTY(crematoriums) continue qdel(O) - if(!locate(/obj/effect/decal/cleanable/ash) in get_step(src, dir))//prevent pile-up - new/obj/effect/decal/cleanable/ash(src) + if(user.stat != DEAD) + user.investigate_log("has died from being cremated.", INVESTIGATE_DEATHS) - sleep(3 SECONDS) + victim.death(TRUE) + if(!QDELETED(victim)) //some animals get automatically deleted on death. + victim.ghostize() + qdel(victim) - if(!QDELETED(src)) - locked = FALSE - update_appearance() - playsound(src.loc, 'sound/machines/ding.ogg', 50, TRUE) //you horrible people + for(var/obj/to_destroy in conts) // conts defined above, ignores crematorium and tray + // Indestructible atoms should not be destroyed + if(istype(to_destroy, /obj/effect/dummy/phased_mob) || (to_destroy.resistance_flags & INDESTRUCTIBLE)) + continue + qdel(to_destroy) + + addtimer(CALLBACK(src, PROC_REF(unlock)), 3 SECONDS) + +/obj/structure/bodycontainer/crematorium/proc/unlock() + if(QDELETED(src)) + return + + if(!locate(/obj/effect/decal/cleanable/ash) in get_step(src, dir)) // As to prevent pile-up + new /obj/effect/decal/cleanable/ash(src) + + locked = FALSE + update_appearance() + playsound(src.loc, 'sound/machines/ding.ogg', 50, TRUE) // You horrible people /obj/structure/bodycontainer/crematorium/creamatorium name = "creamatorium" @@ -584,8 +594,8 @@ GLOBAL_LIST_EMPTY(crematoriums) if(!istype(O, /obj/structure/closet/body_bag)) return else - var/mob/M = O - if(M.buckled) + var/mob/victim = O + if(victim.buckled) return O.forceMove(src.loc) if (user != O) diff --git a/code/game/objects/structures/mystery_box.dm b/code/game/objects/structures/mystery_box.dm index 7b71200fb47..28700113381 100644 --- a/code/game/objects/structures/mystery_box.dm +++ b/code/game/objects/structures/mystery_box.dm @@ -77,6 +77,7 @@ GLOBAL_LIST_INIT(mystery_magic, list( /obj/item/gun/magic/wand/door, /obj/item/gun/magic/wand/nothing, /obj/item/storage/belt/wands/full, + /obj/item/storage/belt/wands/full/discount, /obj/item/gun/magic/staff/healing, /obj/item/gun/magic/staff/chaos, /obj/item/gun/magic/staff/door, diff --git a/code/game/objects/structures/petrified_statue.dm b/code/game/objects/structures/petrified_statue.dm index e6327a1a811..1f4f76c6768 100644 --- a/code/game/objects/structures/petrified_statue.dm +++ b/code/game/objects/structures/petrified_statue.dm @@ -8,7 +8,7 @@ ///Should we leave a brain behind when the statue is wrecked? var/brain = TRUE ///Time left before the petrification ends and we let the mob free - var/timer = 48 SECONDS + var/timer = 8 MINUTES ///The mob that got medusa'd var/mob/living/petrified_mob @@ -37,7 +37,7 @@ /obj/structure/statue/petrified/process(seconds_per_tick) if(!petrified_mob) STOP_PROCESSING(SSobj, src) - timer -= seconds_per_tick + timer -= seconds_per_tick SECONDS petrified_mob.Stun(4 SECONDS) //So they can't do anything while petrified if(timer <= 0) STOP_PROCESSING(SSobj, src) diff --git a/code/game/objects/structures/signboards/_signboard.dm b/code/game/objects/structures/signboards/_signboard.dm new file mode 100644 index 00000000000..307993a52d8 --- /dev/null +++ b/code/game/objects/structures/signboards/_signboard.dm @@ -0,0 +1,213 @@ +#define INVESTIGATE_SIGNBOARD "signboard" +#define SIGNBOARD_WIDTH (ICON_SIZE_X * 3.5) +#define SIGNBOARD_HEIGHT (ICON_SIZE_Y * 2.5) +#define MAX_SIGN_LEN 106 + +/obj/structure/signboard + name = "sign" + desc = "A foldable sign." + icon = 'icons/obj/signboards.dmi' + icon_state = "sign" + base_icon_state = "sign" + density = TRUE + anchored = TRUE + interaction_flags_atom = INTERACT_ATOM_ATTACK_HAND | INTERACT_ATOM_REQUIRES_DEXTERITY + custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 5) + /// The image holding this sign's text + var/image/text_image + /// The current text written on the sign + var/sign_text + /// The maximum length of text that can be input onto the sign. + var/max_length = MAX_SIGN_LEN + /// If true, the text cannot be changed by players. + var/locked = FALSE + /// If text should be shown while unanchored. + var/show_while_unanchored = FALSE + /// If TRUE, the sign can be edited without a pen. + var/edit_by_hand = FALSE + +/obj/structure/signboard/Initialize(mapload) + . = ..() + if(sign_text) + set_text(sign_text, force = TRUE) + investigate_log("had its text set on load to \"[sign_text]\"", INVESTIGATE_SIGNBOARD) + update_appearance() + register_context() + +/obj/structure/signboard/Destroy(force) + QDEL_NULL(text_image) + return ..() + +/obj/structure/signboard/add_context(atom/source, list/context, obj/item/held_item, mob/user) + . = ..() + if(is_locked(user)) + return + if(held_item?.tool_behaviour == TOOL_WRENCH) + context[SCREENTIP_CONTEXT_LMB] = anchored ? "Unsecure" : "Secure" + return CONTEXTUAL_SCREENTIP_SET + if((edit_by_hand || istype(held_item, /obj/item/pen)) && (anchored || show_while_unanchored)) + context[SCREENTIP_CONTEXT_LMB] = "Set Displayed Text" + if(sign_text) + context[SCREENTIP_CONTEXT_ALT_RMB] = "Clear Sign" + return CONTEXTUAL_SCREENTIP_SET + +/obj/structure/signboard/examine(mob/user) + . = ..() + if(!edit_by_hand) + . += span_notice("You can write on the sign with a pen.") + if(anchored) + . += span_notice("It's secured to the floor, you could use a wrench to unsecure and move it.") + else + . += span_notice("It's unsecured, you could use a wrench to secure it in place.") + if(sign_text) + . += span_boldnotice("\nIt currently displays the following:") + . += span_info(html_encode(sign_text)) + else + . += span_notice("\nIt's blank.") + +/obj/structure/signboard/update_icon_state() + . = ..() + icon_state = "[base_icon_state][sign_text ? "" : "_blank"]" + +/obj/structure/signboard/vv_edit_var(var_name, var_value) + if(var_name == NAMEOF(src, sign_text)) + if(!set_text(var_value, force = TRUE)) + return FALSE + datum_flags |= DF_VAR_EDITED + return TRUE + return ..() + +/obj/structure/signboard/item_interaction(mob/living/user, obj/item/tool, list/modifiers) + if(!istype(tool, /obj/item/pen)) + return NONE + try_set_text(user) + return ITEM_INTERACT_SUCCESS + +/obj/structure/signboard/attack_hand(mob/living/user, list/modifiers) + . = ..() + if(.) + return + if(!edit_by_hand && !user.is_holding_item_of_type(/obj/item/pen)) + balloon_alert(user, "need a pen!") + return TRUE + if(try_set_text(user)) + return TRUE + +/obj/structure/signboard/proc/try_set_text(mob/living/user) + . = FALSE + if(!anchored && !show_while_unanchored) + return FALSE + if(check_locked(user)) + return FALSE + var/new_text = tgui_input_text( + user, + message = "What would you like to set this sign's text to?", + title = full_capitalize(name), + default = sign_text, + max_length = max_length, + multiline = TRUE, + encode = FALSE, + ) + if(QDELETED(src) || !new_text || check_locked(user)) + return FALSE + var/list/filter_result = CAN_BYPASS_FILTER(user) ? null : is_ic_filtered(new_text) + if(filter_result) + REPORT_CHAT_FILTER_TO_USER(user, filter_result) + return FALSE + var/list/soft_filter_result = CAN_BYPASS_FILTER(user) ? null : is_soft_ic_filtered(new_text) + if(soft_filter_result) + if(tgui_alert(user, "Your message contains \"[soft_filter_result[CHAT_FILTER_INDEX_WORD]]\". \"[soft_filter_result[CHAT_FILTER_INDEX_REASON]]\", Are you sure you want to say it?", "Soft Blocked Word", list("Yes", "No")) != "Yes") + return FALSE + message_admins("[ADMIN_LOOKUPFLW(user)] has passed the soft filter for \"[soft_filter_result[CHAT_FILTER_INDEX_WORD]]\" when writing to the sign at [ADMIN_VERBOSEJMP(src)], they may be using a disallowed term. Sign text: \"[html_encode(new_text)]\"") + log_admin_private("[key_name(user)] has passed the soft filter for \"[soft_filter_result[CHAT_FILTER_INDEX_WORD]]\" when writing to the sign at [loc_name(src)], they may be using a disallowed term. Sign text: \"[new_text]\"") + if(set_text(new_text)) + balloon_alert(user, "set text") + investigate_log("([key_name(user)]) set text to \"[sign_text || "(none)"]\"", INVESTIGATE_SIGNBOARD) + return TRUE + +/obj/structure/signboard/click_alt_secondary(mob/user) + . = ..() + if(!sign_text || !can_interact(user) || !user.can_perform_action(src, NEED_DEXTERITY)) + return + if(!edit_by_hand && !user.is_holding_item_of_type(/obj/item/pen)) + balloon_alert(user, "need a pen!") + return + if(check_locked(user)) + return + if(set_text(null)) + balloon_alert(user, "cleared text") + investigate_log("([key_name(user)]) cleared the text", INVESTIGATE_SIGNBOARD) + +/obj/structure/signboard/wrench_act(mob/living/user, obj/item/tool) + . = ..() + if(!anchored || !check_locked(user)) + default_unfasten_wrench(user, tool) + return ITEM_INTERACT_SUCCESS + +/obj/structure/signboard/on_changed_z_level(turf/old_turf, turf/new_turf, same_z_layer, notify_contents) + if(!same_z_layer) + SET_PLANE_EXPLICIT(text_image, ABOVE_GAME_PLANE, src) + return ..() + +/obj/structure/signboard/set_anchored(anchorvalue) + . = ..() + update_text() + +/obj/structure/signboard/proc/is_locked(mob/user) + if(isAdminGhostAI(user)) + return FALSE + return locked + +/obj/structure/signboard/proc/check_locked(mob/user, silent = FALSE) + . = is_locked(user) + if(. && !silent) + balloon_alert(user, "locked!") + +/obj/structure/signboard/proc/should_display_text() + if(QDELETED(src) || !isturf(loc) || !sign_text) + return FALSE + if(!anchored && !show_while_unanchored) + return FALSE + return TRUE + +/obj/structure/signboard/MouseEntered(location, control, params) + . = ..() + if(QDELETED(src) || !should_display_text()) + return + usr.client.images |= text_image + +/obj/structure/signboard/MouseExited(location, control, params) + . = ..() + usr.client.images -= text_image + +/// Creates [text_image] if it doesn't exist, and sets its maptext to [sign_text] +/obj/structure/signboard/proc/update_text() + PROTECTED_PROC(TRUE) // Use set_text instead + var/safe_width = src.bound_width || ICON_SIZE_X + var/safe_height = src.bound_height || ICON_SIZE_Y + var/text_html = MAPTEXT_GRAND9K("[html_encode(sign_text)]") + if(!text_image) + text_image = new + SET_PLANE_EXPLICIT(text_image, ABOVE_GAME_PLANE, src) + text_image.alpha = 192 + text_image.loc = src + text_image.maptext_x = (SIGNBOARD_WIDTH - safe_width) * -0.5 + text_image.maptext_y = safe_height + text_image.maptext_width = SIGNBOARD_WIDTH + text_image.maptext_height = SIGNBOARD_HEIGHT + text_image.maptext = text_html + +/obj/structure/signboard/proc/set_text(new_text, force = FALSE) + . = FALSE + if(QDELETED(src) || (locked && !force)) + return + if(!istext(new_text) && !isnull(new_text)) + CRASH("Attempted to set invalid signtext: [new_text]") + . = TRUE + sign_text = trim(new_text, max_length) + update_text() + update_appearance() + +#undef MAX_SIGN_LEN +#undef SIGNBOARD_HEIGHT +#undef SIGNBOARD_WIDTH diff --git a/code/game/objects/structures/signboards/holosign.dm b/code/game/objects/structures/signboards/holosign.dm new file mode 100644 index 00000000000..2c5c074d127 --- /dev/null +++ b/code/game/objects/structures/signboards/holosign.dm @@ -0,0 +1,239 @@ +/obj/structure/signboard/holosign + name = "holographic sign" + desc = "A holographic signboard, projecting text above it." + icon_state = "holographic_sign" + base_icon_state = "holographic_sign" + layer = ABOVE_MOB_LAYER + density = FALSE + edit_by_hand = TRUE + show_while_unanchored = TRUE + light_range = MINIMUM_USEFUL_LIGHT_RANGE + light_power = 0.3 + light_color = COLOR_CARP_TEAL + light_on = FALSE + custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5.05, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.7) + /// If set, only IDs with this name can (un)lock the sign. + var/registered_owner + /// The current color of the sign. + /// The sign will be greyscale if this is set. + var/current_color + +/obj/structure/signboard/holosign/Initialize(mapload) + . = ..() + if(current_color) + INVOKE_ASYNC(src, PROC_REF(set_color), current_color) + AddComponent(/datum/component/usb_port, list( + /obj/item/circuit_component/holo_signboard, + )) + +/obj/structure/signboard/holosign/add_context(atom/source, list/context, obj/item/held_item, mob/user) + . = ..() + var/locked = is_locked(user) + if(istype(held_item, /obj/item/card/emag)) + context[SCREENTIP_CONTEXT_LMB] = "Short Out Locking Mechanisms" + . = CONTEXTUAL_SCREENTIP_SET + else if(!locked && istype(held_item?.GetID(), /obj/item/usb_cable)) + context[SCREENTIP_CONTEXT_LMB] = "Connect USB Cable" + else if(!locked && istype(held_item?.GetID(), /obj/item/card/id)) + context[SCREENTIP_CONTEXT_LMB] = registered_owner ? "Remove ID Lock" : "Lock To ID" + . = CONTEXTUAL_SCREENTIP_SET + if(!locked) + context[SCREENTIP_CONTEXT_RMB] = "Set Sign Color" + . = CONTEXTUAL_SCREENTIP_SET + +/obj/structure/signboard/holosign/update_icon_state() + base_icon_state = current_color ? "[initial(base_icon_state)]_greyscale" : initial(base_icon_state) + . = ..() + if(obj_flags & EMAGGED) + icon_state += "_emag" + +/obj/structure/signboard/holosign/examine(mob/user) + . = ..() + if(obj_flags & EMAGGED) + . += span_warning("
Its locking mechanisms appear to be shorted out!") + else if(registered_owner) + . += span_info("
It is locked to the ID of [span_name(registered_owner)].") + +/obj/structure/signboard/holosign/update_overlays() + . = ..() + if(sign_text) + . += emissive_appearance(icon, "holographic_sign_e", src) + +/obj/structure/signboard/holosign/vv_edit_var(var_name, var_value) + if(var_name == NAMEOF(src, color) || var_name == NAMEOF(src, current_color)) + INVOKE_ASYNC(src, PROC_REF(set_color), var_value) + datum_flags |= DF_VAR_EDITED + return TRUE + return ..() + +/obj/structure/signboard/holosign/item_interaction(mob/living/user, obj/item/tool, list/modifiers) + var/obj/item/item = astype(tool, /obj/item) + var/obj/item/card/id/id = item?.GetID() + if(!istype(id) || !can_interact(user) || !user.can_perform_action(src, NEED_DEXTERITY)) + return NONE + + var/trimmed_id_name = trimtext(id.registered_name) + if(!trimmed_id_name) + balloon_alert(user, "no name on id!") + return ITEM_INTERACT_BLOCKING + if(obj_flags & EMAGGED) + balloon_alert(user, "lock shorted out!") + return ITEM_INTERACT_BLOCKING + if(registered_owner) + if(!check_locked(user)) + registered_owner = null + balloon_alert(user, "id lock removed") + investigate_log("([key_name(user)]) removed id lock", INVESTIGATE_SIGNBOARD) + else + registered_owner = trimmed_id_name + balloon_alert(user, "locked to id") + investigate_log("([key_name(user)]) added id lock for \"[registered_owner]\"", INVESTIGATE_SIGNBOARD) + update_appearance() + return ITEM_INTERACT_SUCCESS + +/obj/structure/signboard/holosign/is_locked(mob/living/user) + . = ..() + if(.) + return + if(registered_owner && isliving(user)) + var/obj/item/card/id/id = user.get_idcard() + if(!istype(id) || QDELING(id)) + return TRUE + return !cmptext(trimtext(id.registered_name), registered_owner) + +/obj/structure/signboard/holosign/set_text(new_text, force) + . = ..() + set_light(l_on = !!sign_text) + +/obj/structure/signboard/holosign/attack_hand_secondary(mob/user, list/modifiers) + . = ..() + if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN) + return + if(try_set_color(user)) + return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN + +/obj/structure/signboard/holosign/proc/try_set_color(mob/user) + . = TRUE + if(!can_interact(user) || !user.can_perform_action(src, NEED_DEXTERITY)) + return FALSE + if(check_locked(user)) + return + var/new_color = sanitize_color(tgui_color_picker(user, "Set Sign Color", full_capitalize(name), current_color)) + if(new_color && is_color_dark_with_saturation(new_color, 25)) + balloon_alert(user, "color too dark!") + return + if(check_locked(user)) + return + INVOKE_ASYNC(src, PROC_REF(set_color), new_color) + if(new_color) + balloon_alert(user, "set color to [new_color]") + investigate_log("([key_name(user)]) set the color to [new_color || "(none)"]", INVESTIGATE_SIGNBOARD) + else + balloon_alert(user, "unset color") + investigate_log("([key_name(user)]) cleared the color", INVESTIGATE_SIGNBOARD) + +/obj/structure/signboard/holosign/emag_act(mob/user, obj/item/card/emag/emag_card) + if(obj_flags & EMAGGED) + return FALSE + playsound(src, SFX_SPARKS, vol = 100, vary = TRUE, extrarange = SHORT_RANGE_SOUND_EXTRARANGE) + do_sparks(3, cardinal_only = FALSE, source = src) + balloon_alert(user, "lock broken") + investigate_log("was emagged by [key_name(user)] (previous owner: [registered_owner || "(none)"])", INVESTIGATE_SIGNBOARD) + registered_owner = null + obj_flags |= EMAGGED + update_appearance() + +/obj/structure/signboard/holosign/proc/sanitize_color(color) + . = sanitize_hexcolor(color) + if(!. || . == COLOR_BLACK) + return null + +/obj/structure/signboard/holosign/proc/set_color(new_color) + new_color = sanitize_color(new_color) + if(!new_color) + current_color = null + remove_atom_colour(FIXED_COLOUR_PRIORITY) + else + current_color = new_color + add_atom_colour(new_color, FIXED_COLOUR_PRIORITY) + set_light(l_color = current_color || src::light_color) + update_appearance() + +/obj/item/circuit_component/holo_signboard + display_name = "Holographic Signboard" + desc = "Output text to a signboard, insert
in the message field to linebreak. Set the color to 0, 0, 0 to reset to default." + circuit_flags = CIRCUIT_FLAG_INPUT_SIGNAL|CIRCUIT_FLAG_OUTPUT_SIGNAL + + var/datum/port/input/message + var/datum/port/input/clear + + var/datum/port/output/fail_reason + var/datum/port/output/on_fail + + var/datum/port/input/red + var/datum/port/input/green + var/datum/port/input/blue + var/datum/port/input/set_color + + var/obj/structure/signboard/holosign/connected_display + +/obj/item/circuit_component/holo_signboard/populate_ports() + message = add_input_port("Message", PORT_TYPE_STRING) + clear = add_input_port("Clear", PORT_TYPE_SIGNAL, trigger = PROC_REF(clear_received)) + + fail_reason = add_output_port("Fail Reason", PORT_TYPE_STRING) + on_fail = add_output_port("Failed", PORT_TYPE_SIGNAL) + + red = add_input_port("Red", PORT_TYPE_NUMBER) + green = add_input_port("Green", PORT_TYPE_NUMBER) + blue = add_input_port("Blue", PORT_TYPE_NUMBER) + set_color = add_input_port("Set Color", PORT_TYPE_SIGNAL, trigger = PROC_REF(color_received)) + +/obj/item/circuit_component/holo_signboard/register_usb_parent(atom/movable/shell) + . = ..() + if(istype(shell, /obj/structure/signboard/holosign)) + connected_display = shell + +/obj/item/circuit_component/holo_signboard/input_received(datum/port/input/port) + if(!connected_display) + return + if(length(message.value) > connected_display.max_length) //5000 is a hell of a lot longer than 144. + fail_reason.set_output("Too long ([length(message.value)]/[connected_display.max_length]).") + on_fail.set_output(COMPONENT_SIGNAL) + return + if(is_ic_filtered(message.value)) + fail_reason.set_output("Prohibited content.") + on_fail.set_output(COMPONENT_SIGNAL) + return + + var/edited_message = replacetextEx_char(message.value, "
", "\n") + if(connected_display.set_text(edited_message)) + investigate_log("Circuit USB ([parent.get_creator()]) set text to \"[connected_display.sign_text || "(none)"]\"", INVESTIGATE_SIGNBOARD) + if(is_soft_ic_filtered(message.value)) + message_admins("A circuit component (by [parent.get_creator_admin()]) added a soft filtered message to a signboard. [ADMIN_COORDJMP(src)]") + else + fail_reason.set_output("Connection refused by external endpoint.") + on_fail.set_output(COMPONENT_SIGNAL) + +/obj/item/circuit_component/holo_signboard/proc/clear_received(datum/port/input/port) + if(!connected_display.set_text(null)) + fail_reason.set_output("Connection refused by external endpoint.") + on_fail.set_output(COMPONENT_SIGNAL) + +/obj/item/circuit_component/holo_signboard/proc/color_received(datum/port/input/port) + red.set_value(clamp(red.value, 0, 255)) + blue.set_value(clamp(blue.value, 0, 255)) + green.set_value(clamp(green.value, 0, 255)) + var/signboard_color = rgb(red.value, green.value, blue.value) + if(signboard_color && signboard_color != rgb(0, 0, 0) && is_color_dark_with_saturation(signboard_color, 25)) + fail_reason.set_output("Color too dark to display.") + on_fail.set_output(COMPONENT_SIGNAL) + return + connected_display.set_color(signboard_color) //doesnt have a return so no need to check and error + investigate_log("Circuit USB ([parent.get_creator()]) set the color to [signboard_color || "(none)"]", INVESTIGATE_SIGNBOARD) + +/// Given a color in the format of "#RRGGBB", will return if the color +/// is dark. Value is mixed with Saturation and Brightness from HSV. +/proc/is_color_dark_with_saturation(color, threshold = 25) + var/hsl = rgb2num(color, COLORSPACE_HSL) + return hsl[3] < threshold diff --git a/code/game/objects/structures/signs/signs_interactive.dm b/code/game/objects/structures/signs/signs_interactive.dm index 5ef9031fef9..49ae5ba6c29 100644 --- a/code/game/objects/structures/signs/signs_interactive.dm +++ b/code/game/objects/structures/signs/signs_interactive.dm @@ -1,14 +1,15 @@ /obj/structure/sign/clock name = "wall clock" - desc = "It's your run-of-the-mill wall clock showing both the local Coalition Standard Time and the galactic Treaty Coordinated Time. Perfect for staring at instead of working." + desc = "It's your run-of-the-mill wall clock showing both the local Nanotrasen Standard Time and the galactic Treaty Coordinated Time. Perfect for staring at instead of working." icon_state = "clock" MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/clock, 32) /obj/structure/sign/clock/examine(mob/user) . = ..() - . += span_info("The current CST (local) time is: [station_time_timestamp()].") - . += span_info("The current TCT (galactic) time is: [time2text(world.realtime, "hh:mm:ss", 0)].") + . += span_info("The current NST (local) time is: [server_timestamp(ic_time = TRUE, twelve_hour_clock = user.client?.prefs.read_preference(/datum/preference/toggle/twelve_hour))].") + if(user.is_literate()) + . += span_info("That means it is currently [round_timestamp()] into the shift.") /obj/structure/sign/calendar name = "wall calendar" diff --git a/code/game/objects/structures/toiletbong.dm b/code/game/objects/structures/toiletbong.dm index 72549bdbcc7..93e54886e6e 100644 --- a/code/game/objects/structures/toiletbong.dm +++ b/code/game/objects/structures/toiletbong.dm @@ -95,7 +95,7 @@ return FALSE new /obj/item/flamethrower(get_turf(src)) var/obj/item/tank/internals/plasma/ptank = new /obj/item/tank/internals/plasma(get_turf(src)) - ptank.air_contents.gases[/datum/gas/plasma][MOLES] = (0) + ptank.air_contents.set_gas(/datum/gas/plasma, 0) drop_custom_materials() qdel(src) return TRUE diff --git a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm index fe806662dac..30ea69ff0d4 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm @@ -14,9 +14,8 @@ /obj/structure/transit_tube_pod/Initialize(mapload) . = ..() - air_contents.add_gases(/datum/gas/oxygen, /datum/gas/nitrogen) - air_contents.gases[/datum/gas/oxygen][MOLES] = MOLES_O2STANDARD - air_contents.gases[/datum/gas/nitrogen][MOLES] = MOLES_N2STANDARD + var/list/new_gases = list(/datum/gas/oxygen = MOLES_O2STANDARD, /datum/gas/nitrogen = MOLES_N2STANDARD) + air_contents.adjust_multiple_gases(new_gases) air_contents.temperature = T20C /obj/structure/transit_tube_pod/Destroy() diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 0c97edf906e..cdfae783ccb 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -849,17 +849,12 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/tinted/frosted/spaw flags_1 = PREVENT_CLICK_UNDER_1 resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF -/obj/structure/window/reinforced/shuttle/indestructible/welder_act(mob/living/user, obj/item/tool) - return NONE - -/obj/structure/window/reinforced/shuttle/indestructible/screwdriver_act(mob/living/user, obj/item/tool) - return NONE - -/obj/structure/window/reinforced/shuttle/indestructible/wrench_act(mob/living/user, obj/item/tool) - return NONE - -/obj/structure/window/reinforced/shuttle/indestructible/crowbar_act(mob/living/user, obj/item/tool) - return NONE +/obj/structure/window/reinforced/shuttle/indestructible/Initialize(mapload) + . = ..() + AddElement(/datum/element/tool_blocker, TOOL_WELDER, TOOL_ACT_PRIMARY) + AddElement(/datum/element/tool_blocker, TOOL_SCREWDRIVER, TOOL_ACT_PRIMARY) + AddElement(/datum/element/tool_blocker, TOOL_WRENCH, TOOL_ACT_PRIMARY) + AddElement(/datum/element/tool_blocker, TOOL_CROWBAR, TOOL_ACT_PRIMARY) /obj/structure/window/reinforced/plasma/plastitanium name = "plastitanium window" diff --git a/code/game/turfs/change_turf.dm b/code/game/turfs/change_turf.dm index 230eecabeec..0ad2a59c67b 100644 --- a/code/game/turfs/change_turf.dm +++ b/code/game/turfs/change_turf.dm @@ -163,8 +163,12 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list( if(SSlighting.initialized) // Space tiles should never have lighting objects if(!space_lit) + if(old_lighting_object) + lighting_object = old_lighting_object + vis_contents += lighting_object // Should have a lighting object if we never had one - lighting_object = old_lighting_object || new /datum/lighting_object(src) + else + new /atom/movable/lighting_object(null, src) else if (old_lighting_object) qdel(old_lighting_object, force = TRUE) @@ -311,7 +315,7 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list( var/list/giver_gases = mix.gases for(var/giver_id in giver_gases) ASSERT_GAS_IN_LIST(giver_id, total_gases) - total_gases[giver_id][MOLES] += giver_gases[giver_id][MOLES] + total.adjust_gas(giver_id, giver_gases[giver_id][MOLES]) total.temperature = energy / heat_cap for(var/id in total_gases) diff --git a/code/game/turfs/closed/minerals.dm b/code/game/turfs/closed/minerals.dm index b2acb199948..3cd2df8e233 100644 --- a/code/game/turfs/closed/minerals.dm +++ b/code/game/turfs/closed/minerals.dm @@ -1,4 +1,5 @@ #define MINING_MESSAGE_COOLDOWN 20 +#define DEFAULT_BORDER_DISTANCE -1 /**********************Mineral deposits**************************/ @@ -27,14 +28,14 @@ temperature = TCMB var/turf/turf_type = /turf/open/misc/asteroid/airless /// The path of the ore stack we spawn when we're mined. - var/obj/item/stack/ore/mineralType = null - /// If we spawn a boulder like on the gulag, we use this in lou of mineralType + var/obj/item/stack/ore/mineral_type = null + /// If we spawn a boulder like on the gulag, we use this in lou of mineral_type var/obj/item/boulder/spawned_boulder = null - /// How much ore we spawn when we're mining a mineralType. - var/mineralAmt = 3 + /// How much ore we spawn when we're mining a mineral_type. + var/mineral_amt = 3 /// The icon of the image we display when we're pinged by a mining scanner, to be overridden if you want to use an alternate file for a subtype. var/scan_icon = 'icons/effects/ore_visuals.dmi' - /// Placeholder for the icon_state of the image we display when we're pinged by a mining scanner + /// Placeholder for the image we display when we're pinged by a mining scanner var/scan_state = "" /// If true, this turf will not call AfterChange during change_turf calls. var/defer_change = FALSE @@ -44,7 +45,10 @@ var/tool_mine_speed = 4 SECONDS /// How long it takes to mine this turf without tools, if it's weak. var/hand_mine_speed = 15 SECONDS - + /// Distance to the nearest open turf + var/open_turf_distance = DEFAULT_BORDER_DISTANCE + /// Wall plane overlay icon state + var/wall_icon_state = "rock" /turf/closed/mineral/Initialize(mapload) . = ..() @@ -53,7 +57,11 @@ // So we draw them as if they were on the game plane, and then overlay a copy onto // The wall plane (so emissives/light masks behave) // I am so sorry - var/static/mutable_appearance/wall_overlay = mutable_appearance('icons/turf/mining.dmi', "rock", appearance_flags = RESET_TRANSFORM) + var/static/list/mutable_appearance/wall_overlays = list() + var/mutable_appearance/wall_overlay = wall_overlays[wall_icon_state] + if (!wall_overlay) + wall_overlay = mutable_appearance('icons/turf/mining.dmi', wall_icon_state, appearance_flags = RESET_TRANSFORM) + wall_overlays[wall_icon_state] = wall_overlay wall_overlay.plane = MUTATE_PLANE(WALL_PLANE, src) overlays += wall_overlay @@ -74,85 +82,138 @@ else if(held_item.tool_behaviour == TOOL_MINING) attackby(held_item, bumping) -/turf/closed/mineral/proc/Spread_Vein() - var/spreadChance = initial(mineralType.spreadChance) - if(spreadChance) - for(var/dir in GLOB.cardinals) - if(prob(spreadChance)) - var/turf/T = get_step(src, dir) - var/turf/closed/mineral/random/M = T - if(istype(M) && !M.mineralType) - M.Change_Ore(mineralType) +/turf/closed/mineral/proc/spread_vein(ore_type) + if(!ispath(ore_type, /obj/item/stack/ore)) + change_ore(ore_type) + return -/turf/closed/mineral/proc/Change_Ore(ore_type, random = 0) - if(random) - mineralAmt = rand(1, 5) - if(ispath(ore_type, /obj/item/stack/ore)) // If it has a scan_state, switch to it - var/obj/item/stack/ore/the_ore = ore_type - scan_state = initial(the_ore.scan_state) // I SAID. SWITCH. TO. IT. - mineralType = ore_type // Everything else assumes that this is typed correctly so don't set it to non-ores thanks. - if(ispath(ore_type, /obj/item/boulder)) + var/obj/item/stack/ore/ore_path = ore_type + if (!ore_path::vein_type) + change_ore(ore_type) + return + + // No need to recalculate ore vein size lists every time we want to spawn one + var/static/list/vein_sizes = null + if (!vein_sizes) + vein_sizes = list() + + var/min_vein_size = ore_path::min_vein_size + var/max_vein_size = ore_path::max_vein_size + if (!vein_sizes[ore_path]) + var/list/ore_sizes = list() + // Larger veins are rarer by default + for (var/i in min_vein_size to max_vein_size) + ore_sizes["[i]"] = max_vein_size - i + 1 + vein_sizes[ore_path] = ore_sizes + + var/vein_size = text2num(pick_weight(vein_sizes[ore_path])) + + switch (ore_path::vein_type) + if (ORE_VEIN_CLUSTER) + for (var/turf/closed/mineral/rock in range(vein_size, src)) + if (rock.mineral_type) + continue + + var/spread_prob = 100 + // Easiest way to check for different rock types + if (rock.base_icon_state != base_icon_state) + spread_prob = 50 + + if (rock == src || prob(spread_prob * sqrt(max(0, 1 - sqrt((x - rock.x) ** 2 + (y - rock.y) ** 2) / vein_size)))) + rock.change_ore(ore_path) + + if (ORE_VEIN_SCATTER) + var/list/turf/closed/mineral/rocks = list() + for (var/turf/closed/mineral/rock in range(vein_size, src)) + if (rock.base_icon_state != base_icon_state && prob(50)) + continue + if (!rock.mineral_type) + rocks += rock + + for (var/i in 1 to rand(min_vein_size ** 2, max_vein_size ** 2)) + var/turf/closed/mineral/rock = pick_n_take(rocks) + if (istype(rock)) + rock.change_ore(ore_path, FALSE) + rock.mineral_amt = 1 + + if (ORE_VEIN_PLAIN) + var/list/turf/closed/mineral/rocks = list() + for (var/turf/closed/mineral/rock in range(vein_size, src)) + if (rock.base_icon_state != base_icon_state && prob(50)) + continue + if (!rock.mineral_type) + rocks += rock + + if (!length(rocks)) + return + + var/turf/first_end = pick(rocks) + var/first_dist = get_dist(src, first_end) + var/second_dist = vein_size - first_dist + var/turf/second_end = locate(x - round((first_end.x - x) / first_dist * second_dist, 1), y - round((first_end.y - y) / first_dist * second_dist, 1), z) + if (!istype(second_end)) + second_end = src + + rocks.Cut() + for (var/turf/closed/mineral/rock in range(1, second_end)) + if (!rock.mineral_type) + rocks += rock + + if (!length(rocks)) + return + + second_end = pick(rocks) + for (var/turf/closed/mineral/rock in get_line(first_end, src) + get_line(second_end, src)) + rock.change_ore(ore_path) + if (rock == src || prob(100 / get_dist(src, rock))) + var/turf/closed/mineral/other_rock = get_step(rock, pick(GLOB.cardinals)) + if (istype(other_rock) && !other_rock.mineral_type) + other_rock.change_ore(ore_path) + + if (ORE_VEIN_BRANCH) + for (var/branch in 1 to rand(3, 5)) + var/list/turf/closed/mineral/rocks = list() + for (var/turf/closed/mineral/rock in range(vein_size, src)) + if (rock.base_icon_state != base_icon_state && prob(50)) + continue + if (!rock.mineral_type) + rocks += rock + + if (!length(rocks)) + continue + + for (var/turf/closed/mineral/rock in get_line(src, pick(rocks))) + if (!rock.mineral_type) + rock.change_ore(ore_path) + +/turf/closed/mineral/proc/change_ore(ore_type, random = TRUE) + if (ispath(ore_type, /obj/item/boulder)) scan_state = "rock_boulder" // Yes even the lowly boulder has a scan state spawned_boulder = /obj/item/boulder/gulag_expanded + return -/** - * Returns the distance to the nearest ore vent, where ore vents are tracked in SSore_generation's possible vents list. - * Returns 0 if we're not on lavaland, and as we're using get_dist, our range is limited to 127 tiles. - */ -/turf/closed/mineral/proc/prox_to_vent() - if(!is_mining_level(z)) - return 0 + if (random) + mineral_amt = rand(1, 5) - var/distance = 128 // Max distance for a get_dist is 127 - for(var/obj/structure/ore_vent/vent as anything in SSore_generation.possible_vents) - if(vent.z != src.z) - continue //Silly - var/temp_distance = get_dist(src, vent) - if(temp_distance < distance) - distance = temp_distance - return distance + if (!ispath(ore_type, /obj/item/stack/ore)) + return -/** - * Returns the chance of ore spawning in this turf, based on proximity to a vent. - * See mining defines for the chances and distance defines. - */ -/turf/closed/mineral/proc/proximity_ore_chance() - var/distance = prox_to_vent() - if(distance == 0) //We asked for a random chance but we could not successfully find a vent, so 0. - return 0 + var/obj/item/stack/ore/the_ore = ore_type + scan_state = initial(the_ore.scan_state) // If it has a scan_state, switch to it + mineral_type = ore_type // Everything else assumes that this is typed correctly so don't set it to non-ores thanks. - if(distance < VENT_PROX_VERY_HIGH) - return VENT_CHANCE_VERY_HIGH - if(distance < VENT_PROX_HIGH) - return VENT_CHANCE_HIGH - if(distance < VENT_PROX_MEDIUM) - return VENT_CHANCE_MEDIUM - if(distance < VENT_PROX_LOW) - return VENT_CHANCE_LOW - if(distance < VENT_PROX_FAR) - return VENT_CHANCE_FAR - return 0 - -/** - * Returns the amount of ore to spawn in this turf, based on proximity to a vent. - * If for some reason we have a distance of zero (like being off mining Z levels), we return a random amount between 1 and 5 instead. - */ -/turf/closed/mineral/proc/scale_ore_to_vent() - var/distance = prox_to_vent() - if(distance == 0) // We're not on lavaland or similar failure condition - return rand(1,5) - - if(distance < VENT_PROX_VERY_HIGH) - return ORE_WALL_VERY_HIGH - if(distance < VENT_PROX_HIGH) - return ORE_WALL_HIGH - if(distance < VENT_PROX_MEDIUM) - return ORE_WALL_MEDIUM - if(distance < VENT_PROX_LOW) - return ORE_WALL_LOW - if(distance < VENT_PROX_FAR) - return ORE_WALL_FAR - return 0 +/turf/closed/mineral/proc/flash_scan() + var/obj/effect/temp_visual/mining_overlay/scan_overlay = locate(/obj/effect/temp_visual/mining_overlay) in src + if(scan_overlay) + deltimer(scan_overlay.timerid) + scan_overlay.timerid = QDEL_IN_STOPPABLE(scan_overlay, scan_overlay.duration) + animate(scan_overlay, alpha = 0, time = scan_overlay.duration, easing = scan_overlay.easing_style) + return + scan_overlay = new(src) + var/mutable_appearance/scan_state_overlay = mutable_appearance(scan_icon, scan_state) + scan_state_overlay.pixel_x = 224 + scan_state_overlay.pixel_y = 224 + scan_overlay.add_overlay(scan_state_overlay) /turf/closed/mineral/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir) if(turf_type) @@ -161,7 +222,6 @@ return TRUE return ..() - /turf/closed/mineral/attackby(obj/item/I, mob/user, list/modifiers, list/attack_modifiers, exp_multiplier = 1) if (!ISADVANCEDTOOLUSER(user)) to_chat(usr, span_warning("You don't have the dexterity to do this!")) @@ -212,22 +272,23 @@ /turf/closed/mineral/proc/gets_drilled(mob/user, exp_multiplier = 0) if(istype(user)) SEND_SIGNAL(user, COMSIG_MOB_MINED, src, exp_multiplier) - if(mineralType && (mineralAmt > 0)) - new mineralType(src, mineralAmt) - SSblackbox.record_feedback("tally", "ore_mined", mineralAmt, mineralType) + if(mineral_type && (mineral_amt > 0)) + new mineral_type(src, mineral_amt) + SSblackbox.record_feedback("tally", "ore_mined", mineral_amt, mineral_type) if(spawned_boulder) var/obj/item/boulder/wall_boulder = new spawned_boulder(src) wall_boulder.platform_lifespan = PLATFORM_LIFE_GULAG if(ishuman(user)) var/mob/living/carbon/human/H = user if(exp_multiplier) - if (mineralType && (mineralAmt > 0)) - H.mind.adjust_experience(/datum/skill/mining, initial(mineralType.mine_experience) * mineralAmt * exp_multiplier) + if (mineral_type && (mineral_amt > 0)) + H.mind.adjust_experience(/datum/skill/mining, initial(mineral_type.mine_experience) * mineral_amt * exp_multiplier) else H.mind.adjust_experience(/datum/skill/mining, 4 * exp_multiplier) for(var/obj/effect/temp_visual/mining_overlay/M in src) qdel(M) + var/flags = NONE var/old_type = type if(defer_change) // TODO: make the defer change var a var for any changeturf flag @@ -237,15 +298,24 @@ playsound(src, 'sound/effects/break_stone.ogg', 50, TRUE) //beautiful destruction mined.update_visuals() +/// When the turf gets drilled from an AOE explosion +/// Has a chance of not being drilled based on own hardness +/turf/closed/mineral/proc/drill_aoe(mob/user, exp_multiplier = 0) + var/speed_change = /turf/closed/mineral::tool_mine_speed / tool_mine_speed + // Probability scaling isn't linear to still mine somewhat reliably in dense rocks + // Rocks with ores always get broken by AOE + if (speed_change >= 1 || mineral_type || spawned_boulder || prob(100 * (1 - (1 - sqrt(speed_change)) * 1.5))) + return gets_drilled(user, exp_multiplier) + /turf/closed/mineral/attack_alien(mob/living/carbon/alien/user, list/modifiers) balloon_alert(user, "digging...") playsound(src, 'sound/effects/break_stone.ogg', 50, TRUE) - if(do_after(user, 4 SECONDS, target = src)) + if(do_after(user, tool_mine_speed, target = src)) gets_drilled(user) /turf/closed/mineral/attack_hulk(mob/living/carbon/human/H) ..() - if(do_after(H, 5 SECONDS, target = src)) + if(do_after(H, tool_mine_speed * 1.25, target = src)) playsound(src, 'sound/effects/meteorimpact.ogg', 100, TRUE) H.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ), forced = "hulk") gets_drilled(H) @@ -259,27 +329,69 @@ if(target == src) gets_drilled() return TRUE + + var/hardness = /turf/closed/mineral::tool_mine_speed / tool_mine_speed switch(severity) if(EXPLODE_DEVASTATE) gets_drilled() if(EXPLODE_HEAVY) - if(prob(90)) + if(prob(90 * hardness)) gets_drilled() if(EXPLODE_LIGHT) - if(prob(75)) + if(prob(75 * hardness)) gets_drilled() return TRUE /turf/closed/mineral/blob_act(obj/structure/blob/B) - if(prob(50)) + if(prob(50 * /turf/closed/mineral::tool_mine_speed / tool_mine_speed)) gets_drilled() +/proc/calculate_rock_edges() + var/cardinals = GLOB.cardinals.Copy() // i'm sorry + for(var/mining_z in SSmapping.levels_by_trait(ZTRAIT_MINING)) + var/list/adjacent_minerals = list() + for(var/turf/open/open_turf in Z_TURFS(mining_z)) + for (var/neighbour_dir in cardinals) + var/turf/neighbour = get_step(open_turf, neighbour_dir) + if (!ismineralturf(neighbour)) + continue + + var/turf/closed/mineral/rock = neighbour + if(rock.open_turf_distance != DEFAULT_BORDER_DISTANCE) + continue + + rock.open_turf_distance = 1 + adjacent_minerals |= rock + CHECK_TICK + + var/index = 1 + while(index <= length(adjacent_minerals)) + var/turf/closed/mineral/rock = adjacent_minerals[index] + index += 1 + for (var/neighbour_dir in cardinals) + var/turf/neighbour = get_step(rock, neighbour_dir) + if (!ismineralturf(neighbour)) + continue + + var/turf/closed/mineral/rock_neighbour = neighbour + // Don't need to check if we're closer because we're doing BFS fill + if(rock_neighbour.open_turf_distance == DEFAULT_BORDER_DISTANCE) + rock_neighbour.open_turf_distance = rock.open_turf_distance + 1 + adjacent_minerals += rock_neighbour + CHECK_TICK + /turf/closed/mineral/random /// What are the base odds that this turf spawns a mineral in the wall on initialize? - var/mineralChance = 13 - /// Does this mineral determine its random chance and mineral contents based on proximity to a vent? Overrides mineralChance and mineralAmt. - var/proximity_based = FALSE + var/mineral_chance = 7 + /// Does this turf's chance of spawning ore increase with distance to open air? + var/exposure_based = FALSE + /// Chance of spawning a specific mineral per type, cached for speed + var/static/list/mineral_chances_by_type = list() + /// Chance of spawning a specific mineral per type per depth + var/static/list/mineral_chances_by_depth = list() + /// Sum of ore spawn probabilities per type per depth + var/static/list/spawn_chances_by_depth = list() /// Returns a list of the chances for minerals to spawn. /// Will only run once, and will then be cached. @@ -287,62 +399,124 @@ return list( /obj/item/stack/ore/bananium = check_holidays(APRIL_FOOLS) ? 3 : 0, /obj/item/stack/ore/bluespace_crystal = 1, - /obj/item/stack/ore/diamond = 1, - /obj/item/stack/ore/gold = 10, - /obj/item/stack/ore/iron = 40, - /obj/item/stack/ore/plasma = 20, - /obj/item/stack/ore/silver = 12, - /obj/item/stack/ore/titanium = 11, + /obj/item/stack/ore/diamond = 2, + /obj/item/stack/ore/gold = 8, + /obj/item/stack/ore/iron = 18, // Iron and plasma are this low due to how much they spread into veins + /obj/item/stack/ore/plasma = 12, + /obj/item/stack/ore/silver = 8, + /obj/item/stack/ore/titanium = 8, /obj/item/stack/ore/uranium = 5, /turf/closed/mineral/gibtonite = 4, ) /turf/closed/mineral/random/Initialize(mapload) - var/static/list/mineral_chances_by_type = list() - . = ..() - var/dynamic_prob = mineralChance - var/ore_amount = rand(1,5) - if(proximity_based) - dynamic_prob = proximity_ore_chance() // We assign the chance of ore spawning based on probability. - ore_amount = scale_ore_to_vent() - if (prob(dynamic_prob)) - var/list/spawn_chance_list = mineral_chances_by_type[type] - if (isnull(spawn_chance_list)) - mineral_chances_by_type[type] = expand_weights(mineral_chances()) - spawn_chance_list = mineral_chances_by_type[type] - var/path = pick(spawn_chance_list) - if(ispath(path, /turf)) - var/stored_flags = 0 - if(turf_flags & NO_RUINS) - stored_flags |= NO_RUINS - var/turf/T = ChangeTurf(path,null,CHANGETURF_IGNORE_AIR) - T.flags_1 |= stored_flags + if (exposure_based) + SSore_generation.ore_turfs += src + return - if(ismineralturf(T)) - var/turf/closed/mineral/M = T - M.turf_type = src.turf_type - M.mineralAmt = ore_amount - GLOB.post_ore_random["[M.mineralAmt]"] += 1 - src = M - M.levelupdate() - else - src = T - T.levelupdate() + var/list/spawn_chance_list = mineral_chances_by_type[type] + if (isnull(spawn_chance_list)) + mineral_chances_by_type[type] = expand_weights(mineral_chances()) + spawn_chance_list = mineral_chances_by_type[type] - else - Change_Ore(path, FALSE) - Spread_Vein(path) - mineralAmt = ore_amount - GLOB.post_ore_manual["[mineralAmt]"] += 1 + if (prob(mineral_chance)) + spawn_ore(pick(spawn_chance_list)) - if(mineralType && !mineralAmt) - stack_trace("Mineral turf with mineralAmt being zero initialized at [src.x], [src.y], [src.z] ([get_area(src)])") +/turf/closed/mineral/random/proc/randomize_ore() +#ifdef TESTING + if (open_turf_distance == -1) + color = COLOR_BLUE + else + color = BlendRGB(COLOR_GREEN, COLOR_RED, clamp((open_turf_distance - 1) / 5, 0, 0.99)) + maptext_x = 4 + maptext_y = 4 + maptext = MAPTEXT_TINY_UNICODE("[open_turf_distance]") +#endif + + var/list/spawn_type_list = mineral_chances_by_depth[type] + if (isnull(spawn_type_list)) + spawn_type_list = list() + mineral_chances_by_depth[type] = spawn_type_list + + var/list/ore_depth_chances = spawn_chances_by_depth[type] + if (isnull(ore_depth_chances)) + ore_depth_chances = list() + spawn_chances_by_depth[type] = ore_depth_chances + + var/list/spawn_chance_list = spawn_type_list["[open_turf_distance]"] + var/ore_depth_chance = ore_depth_chances["[open_turf_distance]"] + if (isnull(spawn_chance_list)) + spawn_chance_list = mineral_chances() + var/total_spawn_sum = 0 + var/base_spawn_sum = 0 + var/lowest_factor = 1 + for (var/obj/item/stack/ore/ore_type as anything in spawn_chance_list) + if (!spawn_chance_list[ore_type]) + continue + base_spawn_sum += spawn_chance_list[ore_type] + if (!ispath(ore_type, /obj/item/stack/ore)) + total_spawn_sum += spawn_chance_list[ore_type] + continue + + var/depth_factor = 1 / (1 + abs(ore_type::vein_distance - open_turf_distance)) + lowest_factor = clamp(ceil(1 / (spawn_chance_list[ore_type] * depth_factor)), lowest_factor, ORE_CHANCE_PRECISION) + spawn_chance_list[ore_type] *= depth_factor + total_spawn_sum += spawn_chance_list[ore_type] + + for (var/obj/item/stack/ore/ore_type as anything in spawn_chance_list) + spawn_chance_list[ore_type] = floor(spawn_chance_list[ore_type] * lowest_factor) + + ore_depth_chance = mineral_chance * total_spawn_sum / base_spawn_sum + + LAZYSET(SSore_generation.ore_spread_probabilities[type], "[open_turf_distance]", spawn_chance_list.Copy() + list("chance" = ore_depth_chance, "count" = 0)) + + spawn_chance_list = expand_weights(spawn_chance_list) + + spawn_type_list["[open_turf_distance]"] = spawn_chance_list + ore_depth_chances["[open_turf_distance]"] = ore_depth_chance + + SSore_generation.ore_spread_probabilities[type]["[open_turf_distance]"]["count"] += 1 + if (prob(ore_depth_chance)) + spawn_ore(pick(spawn_chance_list)) + +/turf/closed/mineral/random/proc/spawn_ore(ore_path) + if (!SSore_generation.ores_generated[ore_path]) + SSore_generation.ores_generated[ore_path] = 0 + SSore_generation.ores_generated[ore_path] += 1 + + if(!ispath(ore_path, /turf)) + change_ore(ore_path) + if (!ispath(ore_path, /obj/item/stack/ore)) + return + var/obj/item/stack/ore/ore_type = ore_path + if (prob(ore_type::spread_chance)) + spread_vein(ore_path) + return + + var/stored_flags = 0 + if(turf_flags & NO_RUINS) + stored_flags |= NO_RUINS + var/turf/new_turf = ChangeTurf(ore_path, null, CHANGETURF_IGNORE_AIR) + new_turf.flags_1 |= stored_flags + + if(ismineralturf(new_turf)) + src = new_turf + new_turf.levelupdate() + return + + var/turf/closed/mineral/new_rock = new_turf + new_rock.turf_type = src.turf_type + src = new_rock + new_rock.levelupdate() + + if(mineral_type && !mineral_amt) + stack_trace("Mineral turf with mineral_amt being zero initialized at [src.x], [src.y], [src.z] ([get_area(src)])") /turf/closed/mineral/random/high_chance icon_state = "rock_highchance" - mineralChance = 25 - proximity_based = FALSE + mineral_chance = 14 + exposure_based = FALSE /turf/closed/mineral/random/high_chance/mineral_chances() return list( @@ -356,11 +530,12 @@ ) /turf/closed/mineral/random/high_chance/volcanic + name = "basalt" turf_type = /turf/open/misc/asteroid/basalt/lava_land_surface baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface initial_gas_mix = LAVALAND_DEFAULT_ATMOS defer_change = TRUE - proximity_based = FALSE + exposure_based = FALSE /turf/closed/mineral/random/high_chance/volcanic/mineral_chances() return list( @@ -375,15 +550,15 @@ /turf/closed/mineral/random/low_chance icon_state = "rock_lowchance" - mineralChance = 6 + mineral_chance = 2 /turf/closed/mineral/random/low_chance/mineral_chances() return list( /obj/item/stack/ore/bluespace_crystal = 1, /obj/item/stack/ore/diamond = 1, /obj/item/stack/ore/gold = 4, - /obj/item/stack/ore/iron = 40, - /obj/item/stack/ore/plasma = 15, + /obj/item/stack/ore/iron = 30, + /obj/item/stack/ore/plasma = 10, /obj/item/stack/ore/silver = 6, /obj/item/stack/ore/titanium = 4, /obj/item/stack/ore/uranium = 2, @@ -393,13 +568,13 @@ //extremely low chance of rare ores, meant mostly for populating stations with large amounts of asteroid /turf/closed/mineral/random/stationside icon_state = "rock_nochance" - mineralChance = 4 + mineral_chance = 1 /turf/closed/mineral/random/stationside/mineral_chances() return list( /obj/item/stack/ore/diamond = 1, /obj/item/stack/ore/gold = 3, - /obj/item/stack/ore/iron = 50, + /obj/item/stack/ore/iron = 30, /obj/item/stack/ore/plasma = 3, /obj/item/stack/ore/silver = 4, /obj/item/stack/ore/titanium = 5, @@ -407,24 +582,82 @@ ) /turf/closed/mineral/random/volcanic + name = "basalt" turf_type = /turf/open/misc/asteroid/basalt/lava_land_surface baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface initial_gas_mix = LAVALAND_DEFAULT_ATMOS defer_change = TRUE - proximity_based = FALSE //SKYRAT EDIT: Original TRUE - mineralChance = 5 + exposure_based = TRUE + mineral_chance = 7 // N% functionally, 7.17% default, accounts for ~65% turfs /turf/closed/mineral/random/volcanic/mineral_chances() return list( /obj/item/stack/ore/bluespace_crystal = 1, - /obj/item/stack/ore/diamond = 1, - /obj/item/stack/ore/gold = 10, - /obj/item/stack/ore/iron = 40, - /obj/item/stack/ore/plasma = 20, - /obj/item/stack/ore/silver = 12, + /obj/item/stack/ore/diamond = 2, + /obj/item/stack/ore/gold = 8, + /obj/item/stack/ore/iron = 16, + /obj/item/stack/ore/plasma = 10, + /obj/item/stack/ore/silver = 8, /obj/item/stack/ore/titanium = 11, - /obj/item/stack/ore/uranium = 5, - /turf/closed/mineral/gibtonite/volcanic = 4, + /obj/item/stack/ore/uranium = 7, + /turf/closed/mineral/gibtonite/volcanic = 2, + ) + +/turf/closed/mineral/random/volcanic/red_rock + name = "siderite" + icon = MAP_SWITCH('icons/turf/walls/red_rock.dmi', 'icons/turf/mining.dmi') + icon_state = "red_rock" + base_icon_state = "red_rock" + transform = MAP_SWITCH(TRANSLATE_MATRIX(-8, -8), matrix()) + smoothing_groups = SMOOTH_GROUP_CLOSED_TURFS + SMOOTH_GROUP_RED_ROCK_WALLS + canSmoothWith = SMOOTH_GROUP_RED_ROCK_WALLS + tool_mine_speed = 5 SECONDS // 25% harder than basalt + hand_mine_speed = 17 SECONDS + mineral_chance = 8 // N% functionally, 6.67% default, accounts for ~22% turfs + wall_icon_state = "red_rock" + turf_type = /turf/open/misc/asteroid/basalt/smooth/siderite/lava_land_surface + baseturfs = /turf/open/misc/asteroid/basalt/smooth/siderite/lava_land_surface + +/turf/closed/mineral/random/volcanic/red_rock/mineral_chances() + return list( + // Cannot spawn these two + // /obj/item/stack/ore/bluespace_crystal = 0, + // /obj/item/stack/ore/diamond = 0, + /obj/item/stack/ore/gold = 2, + /obj/item/stack/ore/iron = 32, // Iron and plasma are this low due to how much they spread into veins + /obj/item/stack/ore/plasma = 6, + /obj/item/stack/ore/silver = 14, + /obj/item/stack/ore/titanium = 25, + /obj/item/stack/ore/uranium = 3, + /turf/closed/mineral/gibtonite/volcanic/red_rock = 1, + ) + +/turf/closed/mineral/random/volcanic/shale + name = "shale" + icon = MAP_SWITCH('icons/turf/walls/shale.dmi', 'icons/turf/mining.dmi') + icon_state = "shale" + base_icon_state = "shale" + transform = MAP_SWITCH(TRANSLATE_MATRIX(-8, -8), matrix()) + smoothing_groups = SMOOTH_GROUP_CLOSED_TURFS + SMOOTH_GROUP_SHALE_WALLS + canSmoothWith = SMOOTH_GROUP_SHALE_WALLS + tool_mine_speed = 7 SECONDS // 75% harder than basalt + hand_mine_speed = 20 SECONDS + mineral_chance = 8 // N% functionally, 7.01% default, accounts for ~13% turfs + wall_icon_state = "shale" + turf_type = /turf/open/misc/asteroid/basalt/smooth/shale/lava_land_surface + baseturfs = /turf/open/misc/asteroid/basalt/smooth/shale/lava_land_surface + +/turf/closed/mineral/random/volcanic/shale/mineral_chances() + return list( + /obj/item/stack/ore/bluespace_crystal = 1.5, + /obj/item/stack/ore/diamond = 3, + /obj/item/stack/ore/gold = 12, + /obj/item/stack/ore/iron = 10, // Iron and plasma are this low due to how much they spread into veins + /obj/item/stack/ore/plasma = 28, + /obj/item/stack/ore/silver = 4, + /obj/item/stack/ore/titanium = 8, + /obj/item/stack/ore/uranium = 14, + /turf/closed/mineral/gibtonite/volcanic/shale = 3, ) /turf/closed/mineral/random/snow @@ -439,11 +672,11 @@ baseturfs = /turf/open/misc/asteroid/snow/icemoon initial_gas_mix = ICEMOON_DEFAULT_ATMOS weak_turf = TRUE - proximity_based = FALSE //SKYRAT EDIT: Original TRUE + exposure_based = TRUE -/turf/closed/mineral/random/snow/Change_Ore(ore_type, random = 0) +/turf/closed/mineral/random/snow/change_ore(ore_type, random = TRUE) . = ..() - if(mineralType) + if(mineral_type) icon = 'modular_zubbers/icons/turf/walls/icerock_wall.dmi' // BUBBER EDIT icon_state = "icerock_wall-0" base_icon_state = "icerock_wall" @@ -452,11 +685,11 @@ /turf/closed/mineral/random/snow/mineral_chances() return list( /obj/item/stack/ore/bluespace_crystal = 1, - /obj/item/stack/ore/diamond = 1, - /obj/item/stack/ore/gold = 10, - /obj/item/stack/ore/iron = 40, - /obj/item/stack/ore/plasma = 20, - /obj/item/stack/ore/silver = 12, + /obj/item/stack/ore/diamond = 2, + /obj/item/stack/ore/gold = 8, + /obj/item/stack/ore/iron = 22, + /obj/item/stack/ore/plasma = 12, + /obj/item/stack/ore/silver = 8, /obj/item/stack/ore/titanium = 11, /obj/item/stack/ore/uranium = 5, /turf/closed/mineral/gibtonite/ice/icemoon = 4, @@ -471,7 +704,7 @@ /turf/closed/mineral/random/snow/underground baseturfs = /turf/open/misc/asteroid/snow/icemoon // abundant ore - mineralChance = 20 + mineral_chance = 11 /turf/closed/mineral/random/snow/underground/mineral_chances() return list( @@ -479,8 +712,8 @@ /obj/item/stack/ore/bluespace_crystal = 2, /obj/item/stack/ore/diamond = 4, /obj/item/stack/ore/gold = 20, - /obj/item/stack/ore/iron = 20, - /obj/item/stack/ore/plasma = 20, + /obj/item/stack/ore/iron = 10, // Iron and plasma are this low due to how much they spread into veins, + /obj/item/stack/ore/plasma = 14, /obj/item/stack/ore/silver = 24, /obj/item/stack/ore/titanium = 22, /obj/item/stack/ore/uranium = 10, @@ -488,7 +721,7 @@ ) /turf/closed/mineral/random/snow/high_chance - proximity_based = FALSE + exposure_based = FALSE /turf/closed/mineral/random/snow/high_chance/mineral_chances() return list( @@ -511,6 +744,7 @@ ) /turf/closed/mineral/random/labormineral/volcanic + name = "basalt" turf_type = /turf/open/misc/asteroid/basalt/lava_land_surface baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface initial_gas_mix = LAVALAND_DEFAULT_ATMOS @@ -542,19 +776,20 @@ /turf/closed/mineral/gibtonite/ice/icemoon = 2, ) -/turf/closed/mineral/random/labormineral/ice/Change_Ore(ore_type, random = 0) +/turf/closed/mineral/random/labormineral/ice/change_ore(ore_type, random = TRUE) . = ..() - if(mineralType) + if(mineral_type) icon = 'modular_zubbers/icons/turf/walls/icerock_wall.dmi' // BUBBER EDIT icon_state = "icerock_wall-0" base_icon_state = "icerock_wall" smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER /turf/closed/mineral/iron - mineralType = /obj/item/stack/ore/iron + mineral_type = /obj/item/stack/ore/iron scan_state = "rock_iron" /turf/closed/mineral/iron/volcanic + name = "basalt" turf_type = /turf/open/misc/asteroid/basalt/lava_land_surface baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface initial_gas_mix = LAVALAND_DEFAULT_ATMOS @@ -571,20 +806,22 @@ defer_change = TRUE /turf/closed/mineral/uranium - mineralType = /obj/item/stack/ore/uranium + mineral_type = /obj/item/stack/ore/uranium scan_state = "rock_uranium" /turf/closed/mineral/uranium/volcanic + name = "basalt" turf_type = /turf/open/misc/asteroid/basalt/lava_land_surface baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface initial_gas_mix = LAVALAND_DEFAULT_ATMOS defer_change = TRUE /turf/closed/mineral/diamond - mineralType = /obj/item/stack/ore/diamond + mineral_type = /obj/item/stack/ore/diamond scan_state = "rock_diamond" /turf/closed/mineral/diamond/volcanic + name = "basalt" turf_type = /turf/open/misc/asteroid/basalt/lava_land_surface baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface initial_gas_mix = LAVALAND_DEFAULT_ATMOS @@ -601,20 +838,22 @@ defer_change = TRUE /turf/closed/mineral/gold - mineralType = /obj/item/stack/ore/gold + mineral_type = /obj/item/stack/ore/gold scan_state = "rock_gold" /turf/closed/mineral/gold/volcanic + name = "basalt" turf_type = /turf/open/misc/asteroid/basalt/lava_land_surface baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface initial_gas_mix = LAVALAND_DEFAULT_ATMOS defer_change = TRUE /turf/closed/mineral/silver - mineralType = /obj/item/stack/ore/silver + mineral_type = /obj/item/stack/ore/silver scan_state = "rock_silver" /turf/closed/mineral/silver/volcanic + name = "basalt" turf_type = /turf/open/misc/asteroid/basalt/lava_land_surface baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface initial_gas_mix = LAVALAND_DEFAULT_ATMOS @@ -626,20 +865,22 @@ initial_gas_mix = ICEMOON_DEFAULT_ATMOS /turf/closed/mineral/titanium - mineralType = /obj/item/stack/ore/titanium + mineral_type = /obj/item/stack/ore/titanium scan_state = "rock_titanium" /turf/closed/mineral/titanium/volcanic + name = "basalt" turf_type = /turf/open/misc/asteroid/basalt/lava_land_surface baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface initial_gas_mix = LAVALAND_DEFAULT_ATMOS defer_change = TRUE /turf/closed/mineral/plasma - mineralType = /obj/item/stack/ore/plasma + mineral_type = /obj/item/stack/ore/plasma scan_state = "rock_plasma" /turf/closed/mineral/plasma/volcanic + name = "basalt" turf_type = /turf/open/misc/asteroid/basalt/lava_land_surface baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface initial_gas_mix = LAVALAND_DEFAULT_ATMOS @@ -656,22 +897,24 @@ defer_change = TRUE /turf/closed/mineral/bananium - mineralType = /obj/item/stack/ore/bananium - mineralAmt = 3 + mineral_type = /obj/item/stack/ore/bananium + mineral_amt = 3 scan_state = "rock_bananium" /turf/closed/mineral/bananium/volcanic + name = "basalt" turf_type = /turf/open/misc/asteroid/basalt/lava_land_surface baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface initial_gas_mix = LAVALAND_DEFAULT_ATMOS defer_change = TRUE /turf/closed/mineral/bscrystal - mineralType = /obj/item/stack/ore/bluespace_crystal - mineralAmt = 1 + mineral_type = /obj/item/stack/ore/bluespace_crystal + mineral_amt = 1 scan_state = "rock_bscrystal" /turf/closed/mineral/bscrystal/volcanic + name = "basalt" turf_type = /turf/open/misc/asteroid/basalt/lava_land_surface baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface initial_gas_mix = LAVALAND_DEFAULT_ATMOS @@ -688,11 +931,46 @@ initial_gas_mix = AIRLESS_ATMOS /turf/closed/mineral/volcanic/lava_land_surface + name = "basalt" turf_type = /turf/open/misc/asteroid/basalt/lava_land_surface baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface defer_change = TRUE -/turf/closed/mineral/ash_rock //wall piece +/// Rock type which replaces itself with whichever rock would've been generated by the biome underneath +/turf/closed/mineral/volcanic/lava_land_surface/biome_replace + icon = 'icons/turf/mining.dmi' + icon_state = "volcanic_biome" + smoothing_flags = NONE + /// Area type to whose generator we try to default to + var/default_area = /area/lavaland/surface/outdoors/unexplored/danger + +/turf/closed/mineral/volcanic/lava_land_surface/biome_replace/Initialize(mapload) + . = ..() + // Just spawn a normal lavaland rock if we fail to get a mapgen, such as being spawned over lava + var/supposed_type = /turf/closed/mineral/volcanic/lava_land_surface + var/area/cur_area = loc + var/datum/map_generator/cave_generator/map_generator = cur_area?.get_generator() + if (!map_generator) + cur_area = GLOB.areas_by_type[default_area] + map_generator = cur_area?.get_generator() + + if (istype(map_generator)) + var/biome = map_generator.get_biome_for_turf(src) + if (biome) + var/datum/biome/generating_biome = SSmapping.biomes[biome] + supposed_type = generating_biome.closed_turf_type + + var/cur_flags = turf_flags + var/turf/new_turf = ChangeTurf(supposed_type, flags = CHANGETURF_FORCEOP | CHANGETURF_INHERIT_AIR) + if(cur_flags & NO_RUINS) + new_turf.turf_flags |= NO_RUINS + +/// A turf that can't we can't build openspace chasms on or spawn ruins in. +/turf/closed/mineral/volcanic/lava_land_surface/do_not_chasm + turf_flags = NO_RUINS + +/// Wall piece +/turf/closed/mineral/ash_rock name = "rock" icon = 'icons/turf/mining.dmi' icon = MAP_SWITCH('icons/turf/walls/rock_wall.dmi', 'icons/turf/mining.dmi') @@ -753,14 +1031,24 @@ /turf/closed/mineral/asteroid name = "iron rock" - icon_state = "redrock" - icon = MAP_SWITCH('icons/turf/walls/red_wall.dmi', 'icons/turf/mining.dmi') - base_icon_state = "red_wall" + icon = MAP_SWITCH('icons/turf/walls/red_rock.dmi', 'icons/turf/mining.dmi') + icon_state = "red_rock" + base_icon_state = "red_rock" + layer = EDGED_TURF_LOWER_LAYER + transform = MAP_SWITCH(TRANSLATE_MATRIX(-8, -8), matrix()) + smoothing_groups = SMOOTH_GROUP_CLOSED_TURFS + SMOOTH_GROUP_RED_ROCK_WALLS + canSmoothWith = SMOOTH_GROUP_RED_ROCK_WALLS + wall_icon_state = "red_rock" /turf/closed/mineral/random/stationside/asteroid name = "iron rock" - icon = MAP_SWITCH('icons/turf/walls/red_wall.dmi', 'icons/turf/mining.dmi') - base_icon_state = "red_wall" + icon = MAP_SWITCH('icons/turf/walls/red_rock.dmi', 'icons/turf/mining.dmi') + icon_state = "red_rock" + base_icon_state = "red_rock" + transform = MAP_SWITCH(TRANSLATE_MATRIX(-8, -8), matrix()) + smoothing_groups = SMOOTH_GROUP_CLOSED_TURFS + SMOOTH_GROUP_RED_ROCK_WALLS + canSmoothWith = SMOOTH_GROUP_RED_ROCK_WALLS + wall_icon_state = "red_rock" /turf/closed/mineral/random/stationside/asteroid/porus name = "porous iron rock" @@ -775,7 +1063,7 @@ //GIBTONITE /turf/closed/mineral/gibtonite - mineralAmt = 1 + mineral_amt = 1 MAP_SWITCH(, icon_state = "rock_Gibtonite_inactive") scan_state = "rock_gibtonite" var/det_time = 8 //Countdown till explosion, but also rewards the player for how close you were to detonation when you defuse it @@ -803,60 +1091,68 @@ user.visible_message(span_danger("[user] hit gibtonite with [attacking_item.name], launching [user.p_them()] back!"), span_danger("You've struck gibtonite! Your [attacking_item.name] launched you back!")) /turf/closed/mineral/gibtonite/proc/explosive_reaction(mob/user = null) - if(stage == GIBTONITE_UNSTRUCK) - activated_overlay = mutable_appearance('icons/turf/smoothrocks_overlays.dmi', "rock_Gibtonite_inactive", ON_EDGED_TURF_LAYER) //shows in gaps between pulses if there are any - add_overlay(activated_overlay) - name = "gibtonite deposit" - desc = "An active gibtonite reserve. Run!" - stage = GIBTONITE_ACTIVE - visible_message(span_danger("There's gibtonite inside! It's going to explode!")) + if(stage != GIBTONITE_UNSTRUCK) + return - var/notify_admins = !is_mining_level(z) + activated_overlay = mutable_appearance('icons/turf/smoothrocks_overlays.dmi', "rock_Gibtonite_inactive", ON_EDGED_TURF_LAYER) //shows in gaps between pulses if there are any + activated_overlay.pixel_x = 2 + activated_overlay.pixel_y = 2 + add_overlay(activated_overlay) + name = "gibtonite deposit" + desc = "An active gibtonite reserve. Run!" + stage = GIBTONITE_ACTIVE + visible_message(span_danger("There's gibtonite inside! It's going to explode!")) - if(user) - log_bomber(user, "has triggered a gibtonite deposit reaction via", src, null, notify_admins) - else - log_bomber(null, "An explosion has triggered a gibtonite deposit reaction via", src, null, notify_admins) + var/notify_admins = !is_mining_level(z) - countdown(notify_admins) + if(user) + log_bomber(user, "has triggered a gibtonite deposit reaction via", src, null, notify_admins) + else + log_bomber(null, "An explosion has triggered a gibtonite deposit reaction via", src, null, notify_admins) + + countdown(notify_admins) /turf/closed/mineral/gibtonite/proc/countdown(notify_admins = FALSE) set waitfor = FALSE - while(istype(src, /turf/closed/mineral/gibtonite) && stage == GIBTONITE_ACTIVE && det_time > 0 && mineralAmt >= 1) - flick_overlay_view(mutable_appearance('icons/turf/smoothrocks_overlays.dmi', "rock_Gibtonite_active", ON_EDGED_TURF_LAYER + 0.1), 0.5 SECONDS) //makes the animation pulse one time per tick + while(istype(src, /turf/closed/mineral/gibtonite) && stage == GIBTONITE_ACTIVE && det_time > 0 && mineral_amt >= 1) + var/mutable_appearance/boom_overlay = mutable_appearance('icons/turf/smoothrocks_overlays.dmi', "rock_Gibtonite_active", ON_EDGED_TURF_LAYER + 0.1) + boom_overlay.pixel_x = 2 + boom_overlay.pixel_y = 2 + flick_overlay_view(boom_overlay, 0.5 SECONDS) //makes the animation pulse one time per tick det_time-- sleep(0.5 SECONDS) if(istype(src, /turf/closed/mineral/gibtonite)) - if(stage == GIBTONITE_ACTIVE && det_time <= 0 && mineralAmt >= 1) + if(stage == GIBTONITE_ACTIVE && det_time <= 0 && mineral_amt >= 1) var/turf/bombturf = get_turf(src) - mineralAmt = 0 + mineral_amt = 0 stage = GIBTONITE_DETONATE explosion(bombturf, devastation_range = 1, heavy_impact_range = 3, light_impact_range = 5, flame_range = 0, flash_range = 0, adminlog = notify_admins, explosion_cause = src) /turf/closed/mineral/gibtonite/proc/defuse(mob/living/defuser) - if(stage == GIBTONITE_ACTIVE) - cut_overlay(activated_overlay) - activated_overlay.icon_state = "rock_Gibtonite_inactive" - add_overlay(activated_overlay) - desc = "An inactive gibtonite reserve. The ore can be extracted." - stage = GIBTONITE_STABLE - if(det_time < 0) - det_time = 0 - visible_message(span_notice("The chain reaction stopped! The gibtonite had [det_time] reactions left till the explosion!")) - if(defuser) - SEND_SIGNAL(defuser, COMSIG_LIVING_DEFUSED_GIBTONITE, det_time) + if(stage != GIBTONITE_ACTIVE) + return + cut_overlay(activated_overlay) + activated_overlay.icon_state = "rock_Gibtonite_inactive" + add_overlay(activated_overlay) + desc = "An inactive gibtonite reserve. The ore can be extracted." + stage = GIBTONITE_STABLE + if(det_time < 0) + det_time = 0 + visible_message(span_notice("The chain reaction stopped! The gibtonite had [det_time] reactions left till the explosion!")) + if(defuser) + SEND_SIGNAL(defuser, COMSIG_LIVING_DEFUSED_GIBTONITE, det_time) /turf/closed/mineral/gibtonite/gets_drilled(mob/user, exp_multiplier = 0, triggered_by_explosion = FALSE) if(istype(user)) SEND_SIGNAL(user, COMSIG_MOB_MINED, src, exp_multiplier) - if(stage == GIBTONITE_UNSTRUCK && mineralAmt >= 1) //Gibtonite deposit is activated + if(stage == GIBTONITE_UNSTRUCK && mineral_amt >= 1) //Gibtonite deposit is activated playsound(src,'sound/effects/hit_on_shattered_glass.ogg',50,TRUE) explosive_reaction(user) return - if(stage == GIBTONITE_ACTIVE && mineralAmt >= 1) //Gibtonite deposit goes kaboom + if(stage == GIBTONITE_ACTIVE && mineral_amt >= 1) //Gibtonite deposit goes kaboom var/turf/bombturf = get_turf(src) - mineralAmt = 0 + mineral_amt = 0 stage = GIBTONITE_DETONATE explosion(bombturf, devastation_range = 1, heavy_impact_range = 2, light_impact_range = 5, flame_range = 0, flash_range = 0, adminlog = FALSE, explosion_cause = src) if(stage == GIBTONITE_STABLE) //Gibtonite deposit is now benign and extractable. Depending on how close you were to it blowing up before defusing, you get better quality ore. @@ -877,11 +1173,36 @@ mined.update_visuals() /turf/closed/mineral/gibtonite/volcanic + name = "basalt" turf_type = /turf/open/misc/asteroid/basalt/lava_land_surface baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface initial_gas_mix = LAVALAND_DEFAULT_ATMOS defer_change = TRUE +/turf/closed/mineral/gibtonite/volcanic/red_rock + name = "siderite" + icon = MAP_SWITCH('icons/turf/walls/red_rock.dmi', 'icons/turf/mining.dmi') + icon_state = "red_rock" + base_icon_state = "red_rock" + transform = MAP_SWITCH(TRANSLATE_MATRIX(-8, -8), matrix()) + smoothing_groups = SMOOTH_GROUP_CLOSED_TURFS + SMOOTH_GROUP_RED_ROCK_WALLS + canSmoothWith = SMOOTH_GROUP_RED_ROCK_WALLS + tool_mine_speed = 5 SECONDS // 25% harder than basalt + hand_mine_speed = 17 SECONDS + wall_icon_state = "red_rock" + +/turf/closed/mineral/gibtonite/volcanic/shale + name = "shale" + icon = MAP_SWITCH('icons/turf/walls/shale.dmi', 'icons/turf/mining.dmi') + icon_state = "shale" + base_icon_state = "shale" + transform = MAP_SWITCH(TRANSLATE_MATRIX(-8, -8), matrix()) + smoothing_groups = SMOOTH_GROUP_CLOSED_TURFS + SMOOTH_GROUP_SHALE_WALLS + canSmoothWith = SMOOTH_GROUP_SHALE_WALLS + tool_mine_speed = 7 SECONDS // 75% harder than basalt + hand_mine_speed = 20 SECONDS + wall_icon_state = "shale" + /turf/closed/mineral/gibtonite/volcanic/airless turf_type = /turf/open/misc/asteroid/basalt baseturfs = /turf/open/misc/asteroid/basalt @@ -904,7 +1225,7 @@ initial_gas_mix = ICEMOON_DEFAULT_ATMOS /turf/closed/mineral/strong - name = "Very strong rock" + name = "very strong rock" desc = "Seems to be stronger than the other rocks in the area. Only a master of mining techniques could destroy this." turf_type = /turf/open/misc/asteroid/basalt/lava_land_surface baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface @@ -958,3 +1279,4 @@ return FALSE #undef MINING_MESSAGE_COOLDOWN +#undef DEFAULT_BORDER_DISTANCE diff --git a/code/game/turfs/open/asteroid.dm b/code/game/turfs/open/asteroid.dm index 9675f0c45d3..9ac571c2e6d 100644 --- a/code/game/turfs/open/asteroid.dm +++ b/code/game/turfs/open/asteroid.dm @@ -186,9 +186,34 @@ GLOBAL_LIST_EMPTY(dug_up_basalt) /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins turf_flags = NO_RUINS -/// A turf that can't we can't build openspace chasms on or spawn ruins in. -/turf/closed/mineral/volcanic/lava_land_surface/do_not_chasm - turf_flags = NO_RUINS +/// Variant for ruins which replaces itself with the floor of a biome it generates in +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace + icon = 'icons/turf/mining.dmi' + icon_state = "basalt_biome" + smoothing_flags = NONE + /// Area type to whose generator we try to default to + var/default_area = /area/lavaland/surface/outdoors/unexplored/danger + +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace/Initialize(mapload) + . = ..() + // Just spawn a normal lavaland rock if we fail to get a mapgen, such as being spawned over lava + var/supposed_type = /turf/open/misc/asteroid/basalt/lava_land_surface + var/area/cur_area = loc + var/datum/map_generator/cave_generator/map_generator = cur_area?.get_generator() + if (!map_generator) + cur_area = GLOB.areas_by_type[default_area] + map_generator = cur_area?.get_generator() + + if (istype(map_generator)) + var/biome = map_generator.get_biome_for_turf(src) + if (biome) + var/datum/biome/generating_biome = SSmapping.biomes[biome] + supposed_type = generating_biome.open_turf_type + + var/cur_flags = turf_flags + var/turf/new_turf = ChangeTurf(supposed_type, flags = CHANGETURF_FORCEOP | CHANGETURF_INHERIT_AIR) + if(cur_flags & NO_RUINS) + new_turf.turf_flags |= NO_RUINS /turf/open/misc/asteroid/lowpressure initial_gas_mix = OPENTURF_LOW_PRESSURE @@ -201,6 +226,77 @@ GLOBAL_LIST_EMPTY(dug_up_basalt) turf_type = /turf/open/misc/asteroid/airless worm_chance = 0 +/turf/open/misc/asteroid/basalt/smooth + smoothing_flags = SMOOTH_BITMASK + layer = MID_TURF_LAYER + floor_variance = 0 + transform = MAP_SWITCH(TRANSLATE_MATRIX(-8, -8), matrix()) + /// DMI used by unsmoothed turfs for variance + var/variant_dmi = null + /// Amount of variants this turf has + var/variant_num = 8 + +/turf/open/misc/asteroid/basalt/smooth/set_smoothed_icon_state(new_junction) + . = ..() + if (new_junction == 255 && variant_dmi) + icon = variant_dmi + icon_state = "[base_icon_state][rand(1, variant_num)]" + else + icon = initial(icon) + +/turf/open/misc/asteroid/basalt/smooth/update_overlays() + . = ..() + if (smoothing_junction != 255 && variant_dmi) + . = list(mutable_appearance(variant_dmi, "[base_icon_state][rand(1, variant_num)]")) + . + +/turf/open/misc/asteroid/basalt/smooth/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir) + . = ..() + if (!.) + return + if(!smoothing_flags) + return + underlay_appearance.transform = transform + +/turf/open/misc/asteroid/basalt/smooth/siderite + name = "siderite floor" + baseturfs = /turf/open/misc/asteroid/basalt/smooth/siderite + icon = 'icons/turf/floors/siderite.dmi' + damaged_dmi = 'icons/turf/floors/siderite_variants.dmi' + variant_dmi = 'icons/turf/floors/siderite_variants.dmi' + icon_state = "siderite-255" + base_icon_state = "siderite" + layer = HIGH_TURF_LAYER + smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_FLOOR_SIDERITE + canSmoothWith = SMOOTH_GROUP_FLOOR_SIDERITE + SMOOTH_GROUP_CLOSED_TURFS + dig_result = /obj/item/stack/ore/glass/siderite + +/turf/open/misc/asteroid/basalt/smooth/siderite/lava_land_surface + initial_gas_mix = LAVALAND_DEFAULT_ATMOS + planetary_atmos = TRUE + baseturfs = /turf/open/lava/smooth/lava_land_surface + +/turf/open/misc/asteroid/basalt/smooth/siderite/lava_land_surface/no_ruins + turf_flags = NO_RUINS + +/turf/open/misc/asteroid/basalt/smooth/shale + name = "shale floor" + baseturfs = /turf/open/misc/asteroid/basalt/smooth/shale + icon = 'icons/turf/floors/shale.dmi' + damaged_dmi = 'icons/turf/floors/shale_variants.dmi' + variant_dmi = 'icons/turf/floors/shale_variants.dmi' + icon_state = "shale-255" + base_icon_state = "shale" + smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_FLOOR_SHALE + canSmoothWith = SMOOTH_GROUP_FLOOR_SHALE + SMOOTH_GROUP_CLOSED_TURFS + +/turf/open/misc/asteroid/basalt/smooth/shale/lava_land_surface + initial_gas_mix = LAVALAND_DEFAULT_ATMOS + planetary_atmos = TRUE + baseturfs = /turf/open/lava/smooth/lava_land_surface + +/turf/open/misc/asteroid/basalt/smooth/shale/lava_land_surface/no_ruins + turf_flags = NO_RUINS + /turf/open/misc/asteroid/snow gender = PLURAL name = "snow" diff --git a/code/game/turfs/open/floor/plating.dm b/code/game/turfs/open/floor/plating.dm index 2a440db7c74..7718f4b143e 100644 --- a/code/game/turfs/open/floor/plating.dm +++ b/code/game/turfs/open/floor/plating.dm @@ -150,6 +150,10 @@ upgradable = FALSE attachment_holes = FALSE +/turf/open/floor/plating/foam/Initialize(mapload) + . = ..() + AddElement(/datum/element/tool_blocker, TOOL_WELDER, TOOL_ACT_PRIMARY) + /turf/open/floor/plating/foam/burn_tile() return //jetfuel can't melt steel foam @@ -197,9 +201,6 @@ ScrapeAway(flags = CHANGETURF_INHERIT_AIR) return TRUE -/turf/open/floor/plating/foam/welder_act(mob/living/user, obj/item/I) - return NONE // Fuck you - //reinforced plating deconstruction states #define PLATE_INTACT 0 #define PLATE_BOLTS_LOOSENED 1 diff --git a/code/game/turfs/open/openspace.dm b/code/game/turfs/open/openspace.dm index f72423d1432..68c60752d4e 100644 --- a/code/game/turfs/open/openspace.dm +++ b/code/game/turfs/open/openspace.dm @@ -191,7 +191,7 @@ if(!ismineralturf(T) || !drill_below) return var/turf/closed/mineral/M = T - M.mineralAmt = 0 + M.mineral_amt = 0 M.gets_drilled() baseturfs = /turf/open/openspace/icemoon //This is to ensure that IF random turf generation produces a openturf, there won't be other turfs assigned other than openspace. diff --git a/code/game/turfs/open/river.dm b/code/game/turfs/open/river.dm index 2540699c586..07450383bef 100644 --- a/code/game/turfs/open/river.dm +++ b/code/game/turfs/open/river.dm @@ -5,7 +5,6 @@ #define RANDOM_LOWER_Y 50 /proc/spawn_rivers(target_z, nodes, turf_type, whitelist_area, min_x = RANDOM_LOWER_X, min_y = RANDOM_LOWER_Y, max_x = RANDOM_UPPER_X, max_y = RANDOM_UPPER_Y) - var/list/river_nodes = list() var/num_spawned = 0 var/width = max_x - min_x var/height = max_y - min_y @@ -16,19 +15,19 @@ var/area/A = get_area(T) if(!istype(A, whitelist_area) || (T.turf_flags & NO_LAVA_GEN)) possible_locs -= T - else - river_nodes += new /obj/effect/landmark/river_waypoint(T) - num_spawned++ + continue + new /obj/effect/landmark/river_waypoint(T) + num_spawned++ //make some randomly pathing rivers - for(var/obj/effect/landmark/river_waypoint/waypoints as anything in river_nodes) + for(var/obj/effect/landmark/river_waypoint/waypoints as anything in GLOB.river_waypoint_list["[target_z]"]) if (waypoints.z != target_z || waypoints.connected) continue waypoints.connected = TRUE // Workaround around ChangeTurf that's safe because of when this proc is called var/turf/cur_turf = get_turf(waypoints) cur_turf = new turf_type(cur_turf) - var/turf/target_turf = get_turf(pick(river_nodes - waypoints)) + var/turf/target_turf = get_turf(pick(GLOB.river_waypoint_list["[target_z]"] - waypoints)) if(!target_turf) break var/detouring = FALSE @@ -55,20 +54,28 @@ cur_dir = get_dir(cur_turf, target_turf) cur_turf = get_step(cur_turf, cur_dir) continue - else - // Workaround around ChangeTurf that's safe because of when this proc is called - var/turf/river_turf = new turf_type(cur_turf) - river_turf.Spread(25, 11, whitelist_area) - for(var/waypoints_spawned in river_nodes) - qdel(waypoints_spawned) + // Workaround around ChangeTurf that's safe because of when this proc is called + var/turf/river_turf = new turf_type(cur_turf) + river_turf.Spread(25, 11, whitelist_area) + for(var/obj/effect/landmark/river_waypoint/waypoint as anything in GLOB.river_waypoint_list["[target_z]"]) + qdel(waypoint) + + GLOB.river_waypoint_list -= "[target_z]" /obj/effect/landmark/river_waypoint name = "river waypoint" var/connected = FALSE invisibility = INVISIBILITY_ABSTRACT +/obj/effect/landmark/river_waypoint/Initialize(mapload) + . = ..() + LAZYADD(GLOB.river_waypoint_list["[z]"], src) + +/obj/effect/landmark/river_waypoint/Destroy() + LAZYREMOVE(GLOB.river_waypoint_list["[z]"], src) + return ..() /turf/proc/Spread(probability = 30, prob_loss = 25, whitelisted_area) if(probability <= 0) diff --git a/code/game/turfs/open/water.dm b/code/game/turfs/open/water.dm index 35678cc45ad..ecf75011189 100644 --- a/code/game/turfs/open/water.dm +++ b/code/game/turfs/open/water.dm @@ -138,6 +138,20 @@ /turf/open/water/lavaland_atmos initial_gas_mix = LAVALAND_DEFAULT_ATMOS +/turf/open/water/lavaland_atmos/basalt + icon = 'icons/turf/floors/water_lavaland.dmi' + icon_state = "water_lavaland-255" + base_icon_state = "water_lavaland" + smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER + smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_FLOOR_WATER_LAVALAND + canSmoothWith = SMOOTH_GROUP_FLOOR_WATER_LAVALAND + fishing_datum = /datum/fish_source/ocean + +/turf/open/water/lavaland_atmos/basalt/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir) + underlay_appearance.icon = /turf/open/misc/asteroid/basalt::icon + underlay_appearance.icon_state = /turf/open/misc/asteroid/basalt::icon_state + return TRUE + /turf/open/water/beach/tizira desc = "Shallow water. It somehow reminds you of lizardfolk." icon_state = "tizira_water" diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index ca126bc69b5..7c70b219709 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -67,7 +67,7 @@ GLOBAL_LIST_EMPTY(station_turfs) var/tmp/lighting_corners_initialised = FALSE ///Our lighting object. - var/tmp/datum/lighting_object/lighting_object + var/tmp/atom/movable/lighting_object/lighting_object ///Lighting Corner datums. var/tmp/datum/lighting_corner/lighting_corner_NE var/tmp/datum/lighting_corner/lighting_corner_SE diff --git a/code/game/world.dm b/code/game/world.dm index ec5f3fd1c9e..3523d674f3e 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -126,12 +126,7 @@ GLOBAL_VAR(restart_counter) * All atoms in both compiled and uncompiled maps are initialized() */ /world/New() - log_world("World loaded at [time_stamp()]!") - - // From a really fucking old commit (91d7150) - // I wanted to move it but I think this needs to be after /world/New is called but before any sleeps? - // - Dominion/Cyberboss - GLOB.timezoneOffset = world.timezone * 36000 + log_world("World loaded at [server_timestamp()]!") // First possible sleep() InitTgs() @@ -170,8 +165,6 @@ GLOBAL_VAR(restart_counter) // Initialize RETA system - code/modules/reta/reta_system.dm reta_init_config() - LoadVerbs(/datum/verbs/menu) - if(fexists(RESTART_COUNTER_PATH)) GLOB.restart_counter = text2num(trim(file2text(RESTART_COUNTER_PATH))) fdel(RESTART_COUNTER_PATH) @@ -246,7 +239,7 @@ GLOBAL_VAR(restart_counter) GLOB.picture_logging_prefix += "R_[GLOB.round_id]_" GLOB.picture_log_directory += "[GLOB.round_id]" else - var/timestamp = replacetext(time_stamp(), ":", ".") + var/timestamp = replacetext(server_timestamp(), ":", ".") GLOB.log_directory += "[timestamp]" GLOB.public_log_directory += "[timestamp]" // BUBBER EDIT ADDITION GLOB.picture_log_directory += "[timestamp]" @@ -379,14 +372,14 @@ GLOBAL_VAR_INIT(last_maptick_time, 0) return #else if(check_hard_reboot()) - log_world("World hard rebooted at [time_stamp()]") + log_world("World hard rebooted at [server_timestamp()]") shutdown_logging() // See comment below. QDEL_NULL(Tracy) QDEL_NULL(Debugger) TgsEndProcess() return ..() - log_world("World rebooted at [time_stamp()]") + log_world("World rebooted at [server_timestamp()]") shutdown_logging() // Past this point, no logging procs can be used, at risk of data loss. QDEL_NULL(Tracy) @@ -443,7 +436,7 @@ GLOBAL_VAR_INIT(last_maptick_time, 0) else if(SSticker.current_state == GAME_STATE_SETTING_UP) new_status += "
Starting: Now" else if(SSticker.IsRoundInProgress()) - new_status += "
Time: [time2text(STATION_TIME_PASSED(), "hh:mm", NO_TIMEZONE)]" + new_status += "
Time: [round_timestamp("hh:mm")]" if(SSshuttle?.emergency && SSshuttle?.emergency?.mode != (SHUTTLE_IDLE || SHUTTLE_ENDGAME)) new_status += " | Shuttle: [SSshuttle.emergency.getModeStr()] [SSshuttle.emergency.getTimerStr()]" else if(SSticker.current_state == GAME_STATE_FINISHED) diff --git a/code/modules/admin/admin_investigate.dm b/code/modules/admin/admin_investigate.dm index 75c5176c844..b118b0beb4a 100644 --- a/code/modules/admin/admin_investigate.dm +++ b/code/modules/admin/admin_investigate.dm @@ -10,7 +10,7 @@ var/mob/living/source_mob = src source += " ([source_mob.ckey ? source_mob.ckey : "*no key*"])" - WRITE_FILE(F, "[time_stamp(format = "YYYY-MM-DD hh:mm:ss")] [REF(src)] ([x],[y],[z]) || [source] [message]
") + WRITE_FILE(F, "[server_timestamp(format = "YYYY-MM-DD hh:mm:ss")] [REF(src)] ([x],[y],[z]) || [source] [message]
") ADMIN_VERB(investigate_show, R_NONE, "Investigate", "Browse various detailed logs.", ADMIN_CATEGORY_GAME) var/static/list/investigates = list( diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 77af0c72fb9..62f07be0679 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -1,3 +1,6 @@ + +#define STEALTH_MODE_TRAIT "stealth_mode" + /client/proc/add_admin_verbs() control_freak = CONTROL_FREAK_SKIN | CONTROL_FREAK_MACROS SSadmin_verbs.assosciate_admin(src) @@ -27,31 +30,93 @@ ADMIN_VERB(admin_ghost, R_ADMIN, "AGhost", "Become a ghost without DNR.", ADMIN_ ghost.reenter_corpse() BLACKBOX_LOG_ADMIN_VERB("Admin Reenter") else if(isnewplayer(user.mob)) - to_chat(user, "Error: Aghost: Can't admin-ghost whilst in the lobby. Join or Observe first.", confidential = TRUE) + to_chat(user, span_warning("Error: Aghost: Can't admin-ghost whilst in the lobby. Join or Observe first."), confidential = TRUE) return FALSE else //ghostize log_admin("[key_name(user)] admin ghosted.") message_admins("[key_name_admin(user)] admin ghosted.") var/mob/body = user.mob - body.ghostize(TRUE, TRUE) + var/mob/dead/observer/ghost = body.ghostize(TRUE, TRUE) user.init_verbs() if(body && !body.key) body.key = "@[user.key]" //Haaaaaaaack. But the people have spoken. If it breaks; blame adminbus + // Carry over invisimin to their aghost + var/is_stealth_mode = user.holder.fakekey + var/is_invisimin = HAS_TRAIT_FROM(body, TRAIT_INVISIMIN, ADMIN_TRAIT) + if(is_stealth_mode || is_invisimin) + if(is_invisimin) + ADD_TRAIT(ghost, TRAIT_INVISIMIN, ADMIN_TRAIT) + ghost.SetInvisibility(INVISIBILITY_ADMIN, INVISIBILITY_SOURCE_INVISIMIN, INVISIBILITY_PRIORITY_ADMIN) + else + ghost.SetInvisibility(INVISIBILITY_ABSTRACT, INVISIBILITY_SOURCE_STEALTHMODE, INVISIBILITY_PRIORITY_ADMIN) + ghost.name = " " + ghost.mouse_opacity = MOUSE_OPACITY_TRANSPARENT + ghost.alpha = 0 + ghost.remove_from_all_data_huds() + ADD_TRAIT(ghost, TRAIT_ORBITING_FORBIDDEN, is_invisimin ? ADMIN_TRAIT : STEALTH_MODE_TRAIT) + QDEL_NULL(ghost.orbiters) + BLACKBOX_LOG_ADMIN_VERB("Admin Ghost") ADMIN_VERB(invisimin, R_ADMIN, "Invisimin", "Toggles ghost-like invisibility.", ADMIN_CATEGORY_GAME) + // Toggle OFF if(HAS_TRAIT(user.mob, TRAIT_INVISIMIN)) - REMOVE_TRAIT(user.mob, TRAIT_INVISIMIN, ADMIN_TRAIT) + user.mob.remove_traits(list( + TRAIT_INVISIMIN, + TRAIT_ORBITING_FORBIDDEN, + TRAIT_MOVE_PHASING, + TRAIT_PIERCEIMMUNE, + TRAIT_INVISIBLE_TO_CAMERA, + ), ADMIN_TRAIT) user.mob.add_to_all_human_data_huds() user.mob.RemoveInvisibility(INVISIBILITY_SOURCE_INVISIMIN) to_chat(user, span_adminnotice(span_bold("Invisimin off. Invisibility reset.")), confidential = TRUE) + if(isobserver(user.mob) && !user.holder.fakekey) // Set the alpha back if we're not still stealth mode + user.mob.alpha = initial(user.mob.alpha) return - ADD_TRAIT(user.mob, TRAIT_INVISIMIN, ADMIN_TRAIT) + // Toggle ON + user.mob.add_traits(list( + TRAIT_INVISIMIN, + TRAIT_ORBITING_FORBIDDEN, + TRAIT_MOVE_PHASING, + TRAIT_PIERCEIMMUNE, + TRAIT_INVISIBLE_TO_CAMERA, + ), ADMIN_TRAIT) user.mob.remove_from_all_data_huds() - user.mob.SetInvisibility(INVISIBILITY_OBSERVER, INVISIBILITY_SOURCE_INVISIMIN, INVISIBILITY_PRIORITY_ADMIN) - to_chat(user, span_adminnotice(span_bold("Invisimin on. You are now as invisible as a ghost.")), confidential = TRUE) + user.mob.SetInvisibility(INVISIBILITY_ADMIN, INVISIBILITY_SOURCE_INVISIMIN, INVISIBILITY_PRIORITY_ADMIN) + if(isobserver(user.mob)) + user.mob.alpha = 0 + QDEL_NULL(user.mob.orbiters) + to_chat(user, span_adminnotice(span_bold("Invisimin on. You are now invisible to players and ghosts.")), confidential = TRUE) + +ADMIN_VERB(toggle_admin_esp, R_ADMIN, "Toggle Admin ESP", "Toggle to be able to see ghosts and invisimins.", ADMIN_CATEGORY_GAME) + // Toggle OFF + if(HAS_TRAIT(user.mob, TRAIT_ADMIN_ESP)) + if(isliving(user.mob)) + var/mob/living/living_user = user.mob + living_user.remove_status_effect(/datum/status_effect/admin_esp) + else if(isobserver(user.mob)) + user.mob.set_invis_see(SEE_INVISIBLE_OBSERVER) + else + user.mob.set_invis_see(SEE_INVISIBLE_LIVING) + REMOVE_TRAIT(user.mob, TRAIT_ADMIN_ESP, ADMIN_TRAIT) + to_chat(user.mob, span_adminnotice("Admin ESP off. You will no longer see [isliving(user.mob) ? "ghosts or " : ""]invisimins."), confidential = TRUE) + return + + // Toggle ON + if(isliving(user.mob)) + var/mob/living/living_user = user.mob + living_user.apply_status_effect(/datum/status_effect/admin_esp) + else if(ismob(user.mob)) + user.mob.set_invis_see(SEE_INVISIBLE_ADMIN) + else + to_chat(user.mob, span_warning("Admin ESP only works if you are in a mob!"), confidential = TRUE) + return + + ADD_TRAIT(user.mob, TRAIT_ADMIN_ESP, ADMIN_TRAIT) + to_chat(user.mob, span_adminnotice("Admin ESP on. You will now be able to see [isliving(user.mob) ? "ghosts and " : ""]invisimins."), confidential = TRUE) ADMIN_VERB(check_antagonists, R_ADMIN, "Check Antagonists", "See all antagonists for the round.", ADMIN_CATEGORY_GAME) user.holder.check_antagonists() @@ -141,8 +206,6 @@ ADMIN_VERB(stealth, R_STEALTH, "Stealth Mode", "Toggle stealth.", ADMIN_CATEGORY BLACKBOX_LOG_ADMIN_VERB("Stealth Mode") -#define STEALTH_MODE_TRAIT "stealth_mode" - /client/proc/enable_stealth_mode() var/new_key = ckeyEx(stripped_input(usr, "Enter your desired display name.", "Fake Key", key, 26)) if(!new_key) @@ -165,7 +228,8 @@ ADMIN_VERB(stealth, R_STEALTH, "Stealth Mode", "Toggle stealth.", ADMIN_CATEGORY holder.fakekey = null if(isobserver(mob)) mob.RemoveInvisibility(INVISIBILITY_SOURCE_STEALTHMODE) - mob.alpha = initial(mob.alpha) + if(!HAS_TRAIT_FROM(mob, TRAIT_INVISIMIN, ADMIN_TRAIT)) // Don't reset our alpha if we're also invisimin'd + mob.alpha = initial(mob.alpha) if(mob.mind) if(mob.mind.ghostname) mob.name = mob.mind.ghostname @@ -180,8 +244,6 @@ ADMIN_VERB(stealth, R_STEALTH, "Stealth Mode", "Toggle stealth.", ADMIN_CATEGORY log_admin("[key_name(usr)] has turned stealth mode OFF") message_admins("[key_name_admin(usr)] has turned stealth mode OFF") -#undef STEALTH_MODE_TRAIT - ADMIN_VERB(drop_bomb, R_FUN, "Drop Bomb", "Cause an explosion of varying strength at your location", ADMIN_CATEGORY_FUN) var/list/choices = list("Small Bomb (1, 2, 3, 3)", "Medium Bomb (2, 3, 4, 4)", "Big Bomb (3, 5, 7, 5)", "Maxcap", "Custom Bomb") var/choice = tgui_input_list(user, "What size explosion would you like to produce? NOTE: You can do all this rapidly and in an IC manner (using cruise missiles!) with the Config/Launch Supplypod verb. WARNING: These ignore the maxcap", "Drop Bomb", choices) @@ -803,11 +865,18 @@ ADMIN_VERB(give_ai_speech, R_FUN, "Give Random AI Speech", ADMIN_VERB_NO_DESCRIP return our_controller.planning_subtrees = list(GLOB.ai_subtrees[/datum/ai_planning_subtree/random_speech/blackboard]) + our_controller.planning_subtrees +ADMIN_VERB(open_event_logger, R_DEBUG, "Open Event Logger", "Open the event logger interface.", ADMIN_CATEGORY_DEBUG) + GLOB.event_logger.ui_interact(user.mob) + ADMIN_VERB(new_blackmarket_item, R_BUILD, "Create Black Market Item", "Add an item to the black market for purchase.", ADMIN_CATEGORY_EVENTS, object as text) + if(!object) + to_chat(user, span_boldwarning("Failed! Provide a full or partial typepath!")) + return //first: have admins select a typepath for the item they want to offer. var/obj/chosen = pick_closest_path(object, make_types_fancy(subtypesof(/obj))) // second: poll admins for the name, description, price, and quantity. - + if(isnull(chosen)) + return var/name = tgui_input_text(user, "Name of the item to sell?", "Item listing name", "Arcane Object", max_length = MAX_NAME_LEN) if(isnull(name)) return @@ -842,5 +911,9 @@ ADMIN_VERB(new_blackmarket_item, R_BUILD, "Create Black Market Item", "Add an it SSmarket.initialize_admin_item(admin_item) log_admin("[key_name(user)] created a new black market item: [name] ([chosen]) for [price] credits, of quantity [quantity].") + message_admins("[key_name(user)] created a new black market item: [name] ([chosen]) for [price] credits, of quantity [quantity].") BLACKBOX_LOG_ADMIN_VERB("Create Black Market Item") + + +#undef STEALTH_MODE_TRAIT diff --git a/code/modules/admin/event_logger.dm b/code/modules/admin/event_logger.dm new file mode 100644 index 00000000000..cd943db8d30 --- /dev/null +++ b/code/modules/admin/event_logger.dm @@ -0,0 +1,551 @@ +/// Global event logger datum, accessible anywhere for debug logging. +GLOBAL_DATUM_INIT(event_logger, /datum/event_logger, new()) + +/// Enables event logging for a datum. If display_on is supplied then it will report the events as if theyre happening on that datum +/datum/proc/enable_evlogging(datum/display_on = null) + if(display_on) + GLOB.event_logger.display_map[REF(src)] = REF(display_on) + if(datum_flags & DF_EVLOGGING) + return + datum_flags |= DF_EVLOGGING + SEND_SIGNAL(src, COMSIG_EVLOGGING_ENABLED) + +/// Disables event logging for a datum. If display_on was supplied during enable_evlogging, it will also remove the display mapping. +/datum/proc/disable_evlogging() + GLOB.event_logger.display_map -= REF(src) + if(!(datum_flags & DF_EVLOGGING)) + return + datum_flags &= ~DF_EVLOGGING + SEND_SIGNAL(src, COMSIG_EVLOGGING_DISABLED) + + +///Datum that holds info for a single track of events in the logger. Each track represents a datum that is being tracked. This track is shown in the timeline and when selected shows information on the track. +/datum/event_logger_track + /// Display name for this track row. + var/name + /// String ref key used to identify this track. + var/ref + /// List of event assoc lists: id, tick, category, kind, info, + kind-specific fields. + var/list/events = list() + /// Assoc list of string (Title) -> string (Info) displayed in the info panel when this track is selected. + var/list/info = list() + +/datum/event_logger_track/New(track_ref, track_name, list/info_data = list()) + ref = track_ref + name = track_name + info = info_data + +/datum/event_logger_track/Destroy() + events = null + info = null + return ..() + +///Datum for the event logger. One of these is made, and everyone shares it. So be nice. This keeps tracks of everything related to the logger +/datum/event_logger + /// Whether the logger is actively recording. + var/running = FALSE + /// world.time at which logging first started (null until first start). + var/time_start = null + /// Assoc list: category name -> enabled (TRUE/FALSE). + var/list/categories = list() + /// Assoc list: category name -> hex color, assigned when a category is first seen. + var/list/category_colors = list() + + /// List of colors we use for categories. We loop around once we run out + var/list/category_palette = list( + "#4fc3f7", "#81c784", "#ffb74d", "#e57373", "#ba68c8", + "#4dd0e1", "#fff176", "#f06292", "#a1887f", "#90a4ae", + ) + /// Assoc list: ref string -> /datum/event_logger_track + var/list/tracks = list() + /// Assoc list: string event id -> event assoc list, for quick look-up when selecting events + var/list/events_by_id = list() + /// Incrementing id assigned to each logged event. + var/next_event_id = 0 + /// Ref string of the currently selected track (for the info panel). + var/selected_ref = null + /// Assoc list: mob -> list of /image, for overlay cleanup. + var/list/user_overlays = list() + /// The mob currently waiting to click a target for pick-target mode, or null. + var/mob/awaiting_pick_user = null + /// Assoc list: REF(source datum) -> REF(display datum). Events from the source appear under the display datum's track. + var/list/display_map = list() + +/datum/event_logger/Destroy() + _clear_all_overlays() + QDEL_LIST_ASSOC_VAL(tracks) + tracks = null + categories = null + user_overlays = null + display_map = null + return ..() + +/datum/event_logger/proc/start() + if(running) + return + running = TRUE + if(isnull(time_start)) + time_start = world.time + +/datum/event_logger/proc/stop() + running = FALSE + +/// Enter pick-target mode: the next atom the user clicks gets DF_EVLOGGING set. +/datum/event_logger/proc/toggle_pick_target(mob/user) + if(awaiting_pick_user) + _end_pick_target() + else + awaiting_pick_user = user + RegisterSignal(user, COMSIG_MOB_CLICKON, PROC_REF(on_pick_target_click)) + +/// Signal handler: fired when the user clicks something while in pick-target mode. +/datum/event_logger/proc/on_pick_target_click(mob/source, atom/clicked, list/modifiers) + SIGNAL_HANDLER + clicked.enable_evlogging() + _end_pick_target() + return NONE + +/// Ends pick-target mode, unregistering the click signal and clearing the awaiting_pick_user var. +/datum/event_logger/proc/_end_pick_target() + if(isnull(awaiting_pick_user)) + return + UnregisterSignal(awaiting_pick_user, COMSIG_MOB_CLICKON) + awaiting_pick_user = null + +/// Ensures a track exists for ref_string. Safe to call multiple times. +/datum/event_logger/proc/add_track(ref_string, track_name, list/info_data) + if(tracks[ref_string]) + return + tracks[ref_string] = new /datum/event_logger_track(ref_string, track_name, info_data) + +/// Internal: Sets the event up, making a track if necesary. Also turns the instance into a REF() at this point +/datum/event_logger/proc/_add_event(datum/source, list/event_data) + if(!running) + return + // Resolve display routing: if source has a display_on target, log under that datum's track instead + var/datum/display_target + var/display_ref = display_map[REF(source)] + if(display_ref) + display_target = locate(display_ref) + if(!display_target) // display_on was deleted, remove the stale entry. Yeah this is a bit lame, but I felt like registering QDEL might be more of a hassle if we're using REF() anyway. Feel free to @ me over it + display_map -= REF(source) + + var/datum/track_datum = display_target || source + var/ref_string = REF(track_datum) + if(!tracks[ref_string]) + var/track_name + if(isatom(track_datum)) + var/atom/resolved_atom = track_datum + track_name = "[ref_string] [resolved_atom] [track_datum.type]" + else + track_name = "[ref_string] [track_datum.type]" + add_track(ref_string, track_name, null) + var/datum/event_logger_track/track = tracks[ref_string] + event_data["id"] = ++next_event_id + event_data["tick"] = world.time + var/category = event_data["category"] + if(!isnull(category) && isnull(categories[category])) + categories[category] = TRUE + + var/selected_index = (length(category_colors) + 1) % (length(category_palette) + 1) + + category_colors[category] = category_palette[selected_index] + track.events += list(event_data) + events_by_id["[event_data["id"]]"] = event_data + SEND_SIGNAL(source, COMSIG_EVLOG_EVENT_ADDED, track, event_data) + if(display_target) + SEND_SIGNAL(display_target, COMSIG_EVLOG_EVENT_ADDED, track, event_data) + +/// Log a plain text event. Has no world-visuals, just puts text into the menu +/datum/event_logger/proc/log_event_text(datum/source, category, info_string) + _add_event(source, list( + "log_type" = EVLOG_TYPE_TEXT, + "category" = category, + "info" = info_string, + )) + +/// Log a location event (highlights a single tile). I should remove this one as turfs does the same thing essentially +/datum/event_logger/proc/log_event_location(datum/source, category, info_string, turf/T) + _add_event(source, list( + "log_type" = EVLOG_TYPE_LOCATION, + "category" = category, + "info" = info_string, + "x" = T.x, + "y" = T.y, + "z" = T.z, + )) + +/// Log a turfs event (highlights a set of tiles). +/datum/event_logger/proc/log_event_turfs(datum/source, category, info_string, list/turfs) + var/list/coords = list() + for(var/turf/T as anything in turfs) + coords += list(list("x" = T.x, "y" = T.y, "z" = T.z)) + _add_event(source, list( + "log_type" = EVLOG_TYPE_TURFS, + "category" = category, + "info" = info_string, + "coords" = coords, + )) + +/// Log a line event (draws a line between 2 turfs). +/datum/event_logger/proc/log_event_lines(datum/source, category, info_string, turf/A, turf/B) + _add_event(source, list( + "log_type" = EVLOG_TYPE_LINES, + "category" = category, + "info" = info_string, + "x1" = A.x, + "y1" = A.y, + "z1" = A.z, + "x2" = B.x, + "y2" = B.y, + "z2" = B.z, + )) + +/// Log a path event (renders directional arrows + start/end markers for a list of turfs in order from start to finish). +/datum/event_logger/proc/log_event_path(datum/source, category, info_string, list/turfs) + var/list/coords = list() + for(var/turf/T as anything in turfs) + coords += list(list("x" = T.x, "y" = T.y, "z" = T.z)) + _add_event(source, list( + "log_type" = EVLOG_TYPE_PATH, + "category" = category, + "info" = info_string, + "coords" = coords, + )) + +/// Log a maptext event (renders a floating text label at the turf when selected). text_string is the string to display at the turf. +/datum/event_logger/proc/log_event_maptext(datum/source, category, info_string, turf/T, text_string) + _add_event(source, list( + "log_type" = EVLOG_TYPE_MAPTEXT, + "category" = category, + "info" = info_string, + "x" = T.x, + "y" = T.y, + "z" = T.z, + "text" = text_string, + )) + +/// Remove all overlays for a specific user. +/datum/event_logger/proc/_clear_user_overlays(mob/user) + if(!user_overlays[user]) + return + if(user.client) + user.client.images -= user_overlays[user] + user_overlays -= user + +/// Remove all overlays for all users. +/datum/event_logger/proc/_clear_all_overlays() + for(var/mob/user as anything in user_overlays) + _clear_user_overlays(user) + +/// Push world-space highlight overlays to the user's client for the given events. +/datum/event_logger/proc/_apply_event_overlays(mob/user, list/events_to_show) + _clear_user_overlays(user) + if(!user.client || !length(events_to_show)) + return + + var/list/images = list() + + for(var/list/evt as anything in events_to_show) + var/color = get_category_color(evt["category"]) + var/log_type = evt["log_type"] + + if(log_type == EVLOG_TYPE_LOCATION) + var/turf/found_turf = locate(evt["x"], evt["y"], evt["z"]) + if(found_turf) + images += _make_tile_image(found_turf, "box_overlay", color, 0.3) + + else if(log_type == EVLOG_TYPE_TURFS) + var/list/coords = evt["coords"] + for(var/list/coord as anything in coords) + var/turf/found_turf = locate(coord["x"], coord["y"], coord["z"]) + if(found_turf) + images += _make_tile_image(found_turf, "box_overlay", color, 0.3) + + else if(log_type == EVLOG_TYPE_LINES) + var/turf/turf_A = locate(evt["x1"], evt["y1"], evt["z1"]) + var/turf/turf_B = locate(evt["x2"], evt["y2"], evt["z2"]) + if(turf_A && turf_B && turf_A != turf_B) + images += _make_line_images(turf_A, turf_B, color) + + //Use SSPathfinder to render the full path + else if(log_type == EVLOG_TYPE_PATH) + var/list/path_turfs = list() + var/list/coords = evt["coords"] + for(var/list/coord as anything in coords) + var/turf/found_turf = locate(coord["x"], coord["y"], coord["z"]) + if(found_turf) + path_turfs += found_turf + images += SSpathfinder.render_path_images_full(path_turfs) + + //Draw maptext on a turf which lets us show important events in-world + else if(log_type == EVLOG_TYPE_MAPTEXT) + var/turf/found_turf = locate(evt["x"], evt["y"], evt["z"]) + if(found_turf) + var/image/img = image('icons/turf/debug.dmi', found_turf, "circle", PATH_DEBUG_LAYER) + SET_PLANE_EXPLICIT(img, BALLOON_CHAT_PLANE, found_turf) + img.color = color + img.maptext = MAPTEXT(evt["text"]) + img.maptext_width = 200 + img.maptext_height = 64 + img.maptext_x = 0 + img.maptext_y = 32 + images += img + + if(length(images)) + user_overlays[user] = images + user.client.images += images + +///Draw a line of images similar to beams but client-side. I couldn't find anything like this yet so here we are. Maybe making this a global is a good idea. +/datum/event_logger/proc/_make_line_images(turf/turf_A, turf/turf_B, color) + var/list/images = list() + var/beam_icon = 'icons/turf/debug.dmi' + var/beam_icon_state = "beam" + + var/origin_px = turf_A.pixel_x + turf_A.pixel_w + var/origin_py = turf_A.pixel_y + turf_A.pixel_z + var/target_px = turf_B.pixel_x + turf_B.pixel_w + var/target_py = turf_B.pixel_y + turf_B.pixel_z + + var/Angle = get_angle_raw(turf_A.x, turf_A.y, origin_px, origin_py, turf_B.x, turf_B.y, target_px, target_py) + var/matrix/rot_matrix = matrix() + rot_matrix.Turn(Angle) + + var/DX = (ICON_SIZE_X * turf_B.x + target_px) - (ICON_SIZE_X * turf_A.x + origin_px) + var/DY = (ICON_SIZE_Y * turf_B.y + target_py) - (ICON_SIZE_Y * turf_A.y + origin_py) + var/line_length = round(sqrt(DX ** 2 + DY ** 2)) + + for(var/N in 0 to line_length - 1 step 32) + var/Pixel_x + var/Pixel_y + if(DX == 0) + Pixel_x = 0 + else + Pixel_x = round(sin(Angle) + ICON_SIZE_X * sin(Angle) * (N + 16) / 32) + if(DY == 0) + Pixel_y = 0 + else + Pixel_y = round(cos(Angle) + ICON_SIZE_Y * cos(Angle) * (N + 16) / 32) + + var/final_x = turf_A.x + var/final_y = turf_A.y + if(abs(Pixel_x) > ICON_SIZE_X) + final_x += Pixel_x > 0 ? round(Pixel_x / ICON_SIZE_X) : ceil(Pixel_x / ICON_SIZE_X) + Pixel_x %= ICON_SIZE_X + if(abs(Pixel_y) > ICON_SIZE_Y) + final_y += Pixel_y > 0 ? round(Pixel_y / ICON_SIZE_Y) : ceil(Pixel_y / ICON_SIZE_Y) + Pixel_y %= ICON_SIZE_Y + + var/turf/seg_turf = locate(final_x, final_y, turf_A.z) + if(!seg_turf) + continue + + var/image/img = image(beam_icon, seg_turf, beam_icon_state, PATH_DEBUG_LAYER) + SET_PLANE_EXPLICIT(img, BALLOON_CHAT_PLANE, seg_turf) + if(N + 32 > line_length) + // Terminal segment: crop the icon to avoid overshooting the target + var/icon/clipped = new(beam_icon, beam_icon_state) + clipped.DrawBox(null, 1, (line_length - N), 32, 32) + img.icon = clipped + img.color = color + img.transform = rot_matrix + img.pixel_x = origin_px + Pixel_x + img.pixel_y = origin_py + Pixel_y + images += img + + return images + + +/// Creates a single coloured tile overlay image. +/datum/event_logger/proc/_make_tile_image(turf/selected_turf, icon_state, color, alpha_fraction) + var/image/img = image('icons/turf/debug.dmi', selected_turf, icon_state, PATH_DEBUG_LAYER) + SET_PLANE_EXPLICIT(img, BALLOON_CHAT_PLANE, selected_turf) + img.color = color + img.alpha = round(alpha_fraction * 255) + return img + +/// Returns the hex color string for a category, or white if unknown. +/datum/event_logger/proc/get_category_color(category) + return category_colors[category] || "#ffffff" + +/// Clears all tracks, categories and overlays. +/datum/event_logger/proc/clear() + _clear_all_overlays() + QDEL_LIST_ASSOC_VAL(tracks) + tracks = list() + events_by_id = list() + categories = list() + category_colors = list() + next_event_id = 0 + selected_ref = null + time_start = null + running = FALSE + +///Tgui stuff below!! + + +/datum/event_logger/ui_assets(mob/user) + return list( + get_asset_datum(/datum/asset/simple/chat_dark), + ) + +/datum/event_logger/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "EventLogger", "Event Logger") + ui.open() + +/datum/event_logger/ui_close(mob/user) + . = ..() + _clear_user_overlays(user) + if(awaiting_pick_user == user) + _end_pick_target() + +/datum/event_logger/ui_state(mob/user) + return ADMIN_STATE(R_DEBUG) + +/datum/event_logger/ui_data(mob/user) + var/list/data = list() + + data["running"] = running + data["time_start"] = time_start + data["time_current"] = world.time + data["selected_ref"] = selected_ref + data["awaiting_pick"] = !isnull(awaiting_pick_user) + + // Categories + var/list/cats = list() //meow + for(var/cat, enabled in categories) + cats += list(list("name" = cat, "enabled" = enabled)) + data["categories"] = cats + + // Tracks + var/list/track_list = list() + for(var/ref, track_val in tracks) + var/datum/event_logger_track/track = track_val + + // Converts track info to a list for tgui + var/list/info_pairs = list() + for(var/title, entry in track.info) + info_pairs += list(list("title" = title, "entry" = entry)) + + track_list += list(list( + "name" = track.name, + "ref" = track.ref, + "events" = track.events, + "info" = info_pairs, + )) + data["tracks"] = track_list + + return data + +/datum/event_logger/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + if(.) + return + + var/mob/user = ui.user + + switch(action) + if("toggle_running") //Start or stop the logger + if(running) + stop() + else + start() + return TRUE + + if("toggle_category") //Enable categories + var/cat = params["name"] + if(!isnull(categories[cat])) + categories[cat] = !categories[cat] + return TRUE + + if("select_track") //Select a track on the timeline + selected_ref = params["ref"] + return TRUE + + if("select_events") ///We selected events on the timeline, clear old overlays, add new ones. + var/list/ids = params["ids"] + if(!islist(ids) || !length(ids)) + _clear_user_overlays(user) + return TRUE + + var/list/matched = list() + for(var/id in ids) + var/list/evt = events_by_id["[id]"] + if(evt) + matched += list(evt) + + _apply_event_overlays(user, matched) + return TRUE + + if("clear") + clear() + return TRUE + + if("start_pick_target") + toggle_pick_target(user) + return TRUE + + if("disable_evlogging") + var/track_ref = params["ref"] + var/datum/target = locate(track_ref) + if(!target) + return FALSE + if(tgui_alert(user, "Stop tracking [target]?", "Confirm", list("Stop Tracking", "Cancel")) != "Stop Tracking") + return FALSE + target.disable_evlogging() + return TRUE + + if("remove_track") // Removes a track and all its events from the logger entirely, and stops tracking the datum + var/track_ref = params["ref"] + var/datum/event_logger_track/track = tracks[track_ref] + if(!track) + return FALSE + // Remove all events from events_by_id + for(var/list/evt as anything in track.events) + events_by_id -= "[evt["id"]]" + // Disable evlogging on the datum if it still exists + var/datum/target = locate(track_ref) + if(target) + target.disable_evlogging() + // Clear overlays and deselect if this was the selected track + _clear_user_overlays(user) + if(selected_ref == track_ref) + selected_ref = null + qdel(track) + tracks -= track_ref + return TRUE + + if("teleport_to_event") + var/target_id = params["id"] + var/list/found_evt = events_by_id["[target_id]"] + if(!found_evt) + return FALSE + var/dest_x + var/dest_y + var/dest_z + switch(found_evt["log_type"]) + if(EVLOG_TYPE_LOCATION, EVLOG_TYPE_MAPTEXT) + dest_x = found_evt["x"] + dest_y = found_evt["y"] + dest_z = found_evt["z"] + if(EVLOG_TYPE_TURFS, EVLOG_TYPE_PATH) + var/list/coords = found_evt["coords"] + if(!length(coords)) + return FALSE + var/list/first = coords[1] + dest_x = first["x"] + dest_y = first["y"] + dest_z = first["z"] + if(EVLOG_TYPE_LINES) + dest_x = found_evt["x1"] + dest_y = found_evt["y1"] + dest_z = found_evt["z1"] + else + return FALSE + var/turf/dest = locate(dest_x, dest_y, dest_z) + if(!dest) + return FALSE + user.forceMove(dest) + return TRUE diff --git a/code/modules/admin/greyscale_modify_menu.dm b/code/modules/admin/greyscale_modify_menu.dm index 0aef316b250..f309d79a6b6 100644 --- a/code/modules/admin/greyscale_modify_menu.dm +++ b/code/modules/admin/greyscale_modify_menu.dm @@ -348,7 +348,7 @@ This is highly likely to cause massive amounts of lag as every object in the gam return while(initial(current.greyscale_config) == initial(parent.greyscale_config)) current = parent - parent = type2parent(current) + parent = current::parent_type config_owner_type = current /// Used for spray painting items in the gags_recolorable component diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm index 18b96318f06..3b78e552740 100644 --- a/code/modules/admin/holder2.dm +++ b/code/modules/admin/holder2.dm @@ -36,6 +36,7 @@ GLOBAL_PROTECT(href_token) var/datum/particle_editor/particle_test var/datum/colorblind_tester/color_test var/datum/plane_master_debug/plane_debug + var/datum/appearance_debugger/appearance_debug var/obj/machinery/computer/libraryconsole/admin_only_do_not_map_in_you_fucker/library_manager var/datum/pathfind_debug/path_debug var/datum/spawn_menu/spawn_menu @@ -98,6 +99,7 @@ GLOBAL_PROTECT(href_token) GLOB.admin_datums[target] = src deadmined = FALSE plane_debug = new(src) + appearance_debug = new(src) if (GLOB.directory[target]) associate(GLOB.directory[target]) //find the client for a ckey if they are connected and associate them with us @@ -109,6 +111,7 @@ GLOBAL_PROTECT(href_token) GLOB.deadmins[target] = src GLOB.admin_datums -= target QDEL_NULL(plane_debug) + QDEL_NULL(appearance_debug) QDEL_NULL(path_debug) deadmined = TRUE @@ -119,6 +122,7 @@ GLOBAL_PROTECT(href_token) add_verb(client, /client/proc/readmin) client.disable_combo_hud() client.update_special_keybinds() + client.set_stat_panel() /datum/admins/proc/associate(client/client) if(IsAdminAdvancedProcCall()) @@ -159,6 +163,7 @@ GLOBAL_PROTECT(href_token) owner.init_verbs() //re-initialize the verb list owner.update_special_keybinds() GLOB.admins |= client + client.set_stat_panel() try_give_profiling() diff --git a/code/modules/admin/smites/hitsplat.dm b/code/modules/admin/smites/hitsplat.dm new file mode 100644 index 00000000000..dd4fcacb18a --- /dev/null +++ b/code/modules/admin/smites/hitsplat.dm @@ -0,0 +1,20 @@ +/datum/smite/hitsplat + name = "Hitsplat" + +/datum/smite/hitsplat/effect(client/user, mob/living/target) + . = ..() + target.AddComponent(/datum/component/hitsplat, /obj/effect/overlay/vis/hitsplat/lore_accurate) + + +// Dragon dagger spec spam. +/datum/smite/hitsplat/stackout + name = "Stackout (Hitsplat)" + +/datum/smite/hitsplat/stackout/effect(client/user, mob/living/target) + . = ..() + for(var/attack in 1 to 4) + playsound(target, SFX_SWING_HIT, 50, TRUE) + target.apply_damage(rand(0, 50)) + target.apply_damage(rand(0, 50)) + // dragon dagger has a 4 tick attack + sleep(2.4 SECONDS) diff --git a/code/modules/admin/spawn_panel/spawn_handling.dm b/code/modules/admin/spawn_panel/spawn_handling.dm index 265dd6c38da..46ba9534f1f 100644 --- a/code/modules/admin/spawn_panel/spawn_handling.dm +++ b/code/modules/admin/spawn_panel/spawn_handling.dm @@ -96,8 +96,8 @@ pod = new() for(var/i in 1 to amount) - if(istype(atom_to_spawn, /turf)) - var/turf/original_turf = target + if(ispath(atom_to_spawn, /turf)) + var/turf/original_turf = get_turf(target) //Get_turf is required here, because if target is not a turf we are cooked chat. var/turf/created_turf = original_turf.ChangeTurf(atom_to_spawn.type) if(created_turf && atom_name) created_turf.name = atom_name diff --git a/code/modules/admin/spawn_panel/spawn_panel.dm b/code/modules/admin/spawn_panel/spawn_panel.dm index a5cc42a4391..cdde4d0b902 100644 --- a/code/modules/admin/spawn_panel/spawn_panel.dm +++ b/code/modules/admin/spawn_panel/spawn_panel.dm @@ -196,9 +196,9 @@ admin_client.mouse_pointer_icon = admin_client.mouse_override_icon admin_client.click_intercept = src - winset(admin_client, "mapwindow.map", "right-click=true") + winset(admin_client, SKIN_MAPWINDOW_MAP, "right-click=true") else - winset(admin_client, "mapwindow.map", "right-click=false") + winset(admin_client, SKIN_MAPWINDOW_MAP, "right-click=false") var/mob/holder_mob = admin_client.mob holder_mob?.update_mouse_pointer() diff --git a/code/modules/admin/sql_ban_system.dm b/code/modules/admin/sql_ban_system.dm index 61c7078c745..b8ceed13924 100644 --- a/code/modules/admin/sql_ban_system.dm +++ b/code/modules/admin/sql_ban_system.dm @@ -426,6 +426,7 @@ ROLE_MALF, ROLE_NINJA, ROLE_OPERATIVE, + ROLE_CLOWN_OPERATIVE, ROLE_OVERTHROW, ROLE_PARADOX_CLONE, ROLE_REV, diff --git a/code/modules/admin/verbs/admin_newscaster.dm b/code/modules/admin/verbs/admin_newscaster.dm index e300150659b..ec96d8babce 100644 --- a/code/modules/admin/verbs/admin_newscaster.dm +++ b/code/modules/admin/verbs/admin_newscaster.dm @@ -311,7 +311,7 @@ ADMIN_VERB(access_news_network, R_ADMIN, "Access Newscaster Network", "Allows yo var/datum/feed_comment/new_feed_comment = new /datum/feed_comment new_feed_comment.author = "Centcom Official" new_feed_comment.body = comment_text - new_feed_comment.time_stamp = station_time_timestamp() + new_feed_comment.time_stamp = round_timestamp() current_message.comments += new_feed_comment GLOB.news_network.last_action ++ usr.log_message("(as an admin) commented on message [current_message.return_body(-1)] -- [current_message.body]", LOG_COMMENT) diff --git a/code/modules/admin/verbs/admingame.dm b/code/modules/admin/verbs/admingame.dm index 18829cca129..afbecb5946b 100644 --- a/code/modules/admin/verbs/admingame.dm +++ b/code/modules/admin/verbs/admingame.dm @@ -315,7 +315,7 @@ ADMIN_VERB(respawn_character, R_ADMIN, "Respawn Character", "Respawn a player th if(record_found)//If they have a record we can determine a few things. new_character.real_name = record_found.name - new_character.gender = LOWER_TEXT(record_found.gender) + new_character.gender = record_found.gender new_character.age = record_found.age var/datum/dna/found_dna = record_found.locked_dna new_character.hardset_dna(found_dna.unique_identity, found_dna.mutation_index, null, record_found.name, record_found.blood_type, new record_found.species_type, found_dna.features) @@ -514,6 +514,7 @@ ADMIN_VERB(lag_switch_panel, R_ADMIN, "Show Lag Switches", "Display the controls dat += "
Measures below can be bypassed with a special trait
" dat += "Slowmode say verb (informs world): [SSlag_switch.measures[SLOWMODE_SAY] ? "On" : "Off"]
" dat += "Disable runechat: [SSlag_switch.measures[DISABLE_RUNECHAT] ? "On" : "Off"] - trait applies to speaker
" + dat += "Disable dead runechat: [SSlag_switch.measures[DISABLE_DEAD_RUNECHAT] ? "On" : "Off"] - trait applies to speaker
" dat += "Disable examine icons: [SSlag_switch.measures[DISABLE_USR_ICON2HTML] ? "On" : "Off"] - trait applies to examiner
" dat += "Disable parallax: [SSlag_switch.measures[DISABLE_PARALLAX] ? "On" : "Off"] - trait applies to character
" dat += "Disable footsteps: [SSlag_switch.measures[DISABLE_FOOTSTEPS] ? "On" : "Off"] - trait applies to character
" diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 066d3c6bf00..45574518486 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -291,7 +291,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) "PLAYERS" = player_count, "ROUND STATE" = round_state, "ROUND ID" = GLOB.round_id, - "ROUND TIME" = ROUND_TIME(), + "ROUND TIME" = round_timestamp(), "MESSAGE" = message, "ADMINS" = admin_text, ) @@ -377,9 +377,9 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) heard_by_no_admins = FALSE send2adminchat(initiator_ckey, "Ticket #[id]: Answered by [key_name(usr)]") - ticket_interactions += "[time_stamp()]: [formatted_message]" + ticket_interactions += "[server_timestamp()]: [formatted_message]" if (!isnull(player_message)) - player_interactions += "[time_stamp()]: [player_message]" + player_interactions += "[server_timestamp()]: [player_message]" //Removes the ahelp verb and returns it after 2 minutes /datum/admin_help/proc/TimeoutVerb() @@ -610,9 +610,9 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) dat += "[FOURSPACES][TicketHref("Refresh", ref_src)][FOURSPACES][TicketHref("Re-Title", ref_src, "retitle")]" if(state != AHELP_ACTIVE) dat += "[FOURSPACES][TicketHref("Reopen", ref_src, "reopen")]" - dat += "
Opened at: [gameTimestamp(wtime = opened_at)] (Approx [DisplayTimeText(world.time - opened_at)] ago)" + dat += "
Opened at: [round_timestamp(wtime = opened_at)] (Approx [DisplayTimeText(world.time - opened_at)] ago)" if(closed_at) - dat += "
Closed at: [gameTimestamp(wtime = closed_at)] (Approx [DisplayTimeText(world.time - closed_at)] ago)" + dat += "
Closed at: [round_timestamp(wtime = closed_at)] (Approx [DisplayTimeText(world.time - closed_at)] ago)" dat += "
" if(initiator) dat += "Actions: [FullMonty(ref_src)]
" @@ -725,9 +725,9 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) else dat += "UNKNOWN" dat += "\n[FOURSPACES]Refresh" - dat += "
Opened at: [gameTimestamp("hh:mm:ss", opened_at)] (Approx [DisplayTimeText(world.time - opened_at)] ago)" + dat += "
Opened at: [round_timestamp("hh:mm:ss", opened_at)] (Approx [DisplayTimeText(world.time - opened_at)] ago)" if(closed_at) - dat += "
Closed at: [gameTimestamp("hh:mm:ss", closed_at)] (Approx [DisplayTimeText(world.time - closed_at)] ago)" + dat += "
Closed at: [round_timestamp("hh:mm:ss", closed_at)] (Approx [DisplayTimeText(world.time - closed_at)] ago)" dat += "
" dat += "
Log:
" for (var/interaction in player_interactions) diff --git a/code/modules/admin/verbs/appearance_debugger/appearance_debugger.dm b/code/modules/admin/verbs/appearance_debugger/appearance_debugger.dm new file mode 100644 index 00000000000..32c29a9e540 --- /dev/null +++ b/code/modules/admin/verbs/appearance_debugger/appearance_debugger.dm @@ -0,0 +1,243 @@ +/// Allows developers to see a breakdown of an atom or a specific target and edit some of the values +/datum/appearance_debugger + var/datum/admins/owner + /// Currently debugged atom or mutable appearance, hence /datum + var/datum/debug_target + /// A list of copies of the currently debugged appearance and its children for access from the UI + var/list/mutable_appearance/appearance_copies + /// Assoc list of ref -> appearance as to prevent refreshing of dynamic appearances + var/list/mutable_appearance/appearance_cache + /// Mapview used to display the hovered over appearance + var/atom/movable/screen/map_view/proxy_view_hover + /// Mapview used to display the selected appearance + var/atom/movable/screen/map_view/proxy_view_selected + /// Assoc list of ref -> list of atoms to be displayed in said ref atom's vis_contents + var/list/atom/movable/fake_vis + /// Should we display a popup that the appearance in-game has updated? + var/update_warning = FALSE + +/datum/appearance_debugger/New(datum/admins/owner) + src.owner = owner + proxy_view_hover = new() + proxy_view_hover.generate_view("appearance_debugger_[REF(owner)]_proxy_hover") + proxy_view_selected = new() + proxy_view_selected.generate_view("appearance_debugger_[REF(owner)]_proxy_selected") + +/datum/appearance_debugger/Destroy() + if (owner) + owner.appearance_debug = null + owner = null + if (fake_vis) + for (var/ref_id in fake_vis) + var/list/all_fakes = fake_vis[ref_id] + QDEL_LIST(all_fakes) + fake_vis.Cut() + QDEL_NULL(proxy_view_hover) + QDEL_NULL(proxy_view_selected) + return ..() + +/datum/appearance_debugger/proc/get_appearance_data(atom/appearance_owner) + var/mutable_appearance/target = appearance_owner + if (isatom(appearance_owner)) + target = appearance_cache["[REF(appearance_owner)]"] || new /mutable_appearance(appearance_owner.appearance) + appearance_cache["[REF(appearance_owner)]"] = target + if (!fake_vis["[REF(appearance_owner)]"] && (ismovable(appearance_owner) || isturf(appearance_owner))) + var/atom/movable/as_movable = appearance_owner + var/list/false_vis_contents = list() + fake_vis["[REF(appearance_owner)]"] = false_vis_contents + for (var/atom/something in (isturf(as_movable) ? (as_movable.vis_contents + as_movable.contents) : as_movable.vis_contents)) + var/atom/movable/mimic = new() + mimic.appearance = new /mutable_appearance(something.appearance) + false_vis_contents += mimic + + var/list/data = list( + "type" = isatom(appearance_owner) ? "atom" : (isimage(appearance_owner) ? "image" : "appearance"), + "alpha" = target.alpha, + "flags" = target.appearance_flags, + "blend_mode" = target.blend_mode, + "color" = target.color, + "dir" = target.dir, + "icon" = length("[target.icon]") ? "[target.icon]" : null, + "icon_state" = target.icon_state, + "invisibility" = target.invisibility, + "layer" = target.layer, + "name" = target.name, + "maptext" = target.maptext, + "maptext_width" = target.maptext_width, + "maptext_height" = target.maptext_height, + "maptext_x" = target.maptext_x, + "maptext_y" = target.maptext_y, + "mouse_opacity" = target.mouse_opacity, + "pixel_x" = target.pixel_x, + "pixel_y" = target.pixel_y, + "pixel_w" = target.pixel_w, + "pixel_z" = target.pixel_z, + "plane" = target.plane, + "plane_true" = PLANE_TO_TRUE(target.plane), + "render_source" = target.render_source, + "render_target" = target.render_target, + "screen_loc" = target.screen_loc, + ) + + if (!(target in appearance_copies)) + appearance_copies += target + data["id"] = length(appearance_copies) + else + data["id"] = appearance_copies.Find(target) + + var/list/filter_data = list() + for (var/list/our_filter as anything in target.filter_data) + filter_data += list(our_filter) + data["filters"] = filter_data + + var/list/underlay_data = list() + for (var/mutable_appearance/underlay as anything in target.underlays) + underlay_data += list(get_appearance_data(underlay)) + data["underlays"] = underlay_data + + var/list/overlay_data = list() + for (var/mutable_appearance/overlay as anything in target.overlays) + overlay_data += list(get_appearance_data(overlay)) + data["overlays"] = overlay_data + + // Display previews if it is either an instance icon or a file and we have icon_state set + if ((isicon(target.icon) && !isfile(target.icon)) || (target.icon && target.icon_state)) + var/icon/used_icon = icon(target.icon, target.icon_state, (isimage(target) && target.dir) ? target.dir : SOUTH, frame = 1) + if (istext(target.color)) + used_icon.Blend(target.color, ICON_MULTIPLY) + data["embed_icon"] = icon2base64(used_icon) + + data["transform"] = list(target.transform.a, target.transform.b, target.transform.c, target.transform.d, target.transform.e, target.transform.f) + // Turfs aren't movables but they still can have vis_flags/contents so lets just count them as such + if (ismovable(appearance_owner) || isturf(appearance_owner)) + var/atom/movable/as_movable = appearance_owner + data["vis_flags"] = as_movable.vis_flags + // Maybe should be cached but I'm too lazy and don't think this'll matter enough + var/list/vis_data = list() + // Turfs also inherit their contents as vis_contents + for (var/atom/vis_thing as anything in isturf(as_movable) ? (as_movable.vis_contents + as_movable.contents) : as_movable.vis_contents) + vis_data += list(get_appearance_data(vis_thing)) + data["vis_contents"] = vis_data + + // Handle all dynamically modified layers + if (target.layer > FLOOR_EMISSIVE_START_LAYER && target.layer < FLOOR_EMISSIVE_END_LAYER) + data["layer_text_override"] = "FLOOR_EMISSIVE_LAYER (+[target.layer - FLOOR_EMISSIVE_START_LAYER])" + else if (target.layer > GAS_PIPE_HIDDEN_LAYER && target.layer < GAS_PIPE_HIDDEN_LAYER + 0.006) + data["layer_text_override"] = "GAS_PIPE_HIDDEN_LAYER (+[target.layer - GAS_PIPE_HIDDEN_LAYER])" + else if (target.layer > GAS_PIPE_VISIBLE_LAYER && target.layer < GAS_PIPE_VISIBLE_LAYER + 0.006) + data["layer_text_override"] = "GAS_PIPE_VISIBLE_LAYER (+[target.layer - GAS_PIPE_VISIBLE_LAYER])" + else if (target.layer > PLUMBING_PIPE_VISIBILE_LAYER && target.layer < PLUMBING_PIPE_VISIBILE_LAYER + (FIFTH_DUCT_LAYER * 2 / 3333)) + data["layer_text_override"] = "PLUMBING_PIPE_VISIBILE_LAYER (+[target.layer - PLUMBING_PIPE_VISIBILE_LAYER])" + + return data + +/datum/appearance_debugger/ui_data(mob/user) + return list( + "updateWarning" = update_warning, + ) + +/datum/appearance_debugger/ui_static_data(mob/user) + return list( + "mainAppearance" = get_appearance_data(debug_target), + "planeToText" = GLOB.admin_readable_planes, + "layerToText" = GLOB.admin_readable_layers, + "flagsToText" = get_valid_bitflags("appearance_flags"), + "visToText" = get_valid_bitflags("vis_flags"), + "blendToText" = GLOB.blend_names, + "mapRefHover" = proxy_view_hover.assigned_map, + "mapRefSelected" = proxy_view_selected.assigned_map, + ) + +/datum/appearance_debugger/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + if(.) + return + switch(action) + if("swapMapViewHover") + var/appearance_id = text2num(params["id"]) + proxy_view_hover.appearance = appearance_copies[appearance_id] + + for (var/atom/movable/something as anything in proxy_view_hover.vis_contents) + proxy_view_hover.vis_contents -= something + for (var/ref_id in appearance_cache) + if (appearance_copies[appearance_id] != appearance_cache[ref_id]) + continue + if (fake_vis[ref_id]) + proxy_view_hover.vis_contents |= fake_vis[ref_id] + + // Needs screenloc to be set since we're setting the appearance and carrying over target's screenloc + proxy_view_hover.set_position(1, 1) + + if("swapMapViewSelected") + var/appearance_id = text2num(params["id"]) + proxy_view_selected.appearance = appearance_copies[appearance_id] + + for (var/atom/movable/something as anything in proxy_view_selected.vis_contents) + proxy_view_selected.vis_contents -= something + for (var/ref_id in appearance_cache) + if (appearance_copies[appearance_id] != appearance_cache[ref_id]) + continue + if (fake_vis[ref_id]) + proxy_view_selected.vis_contents |= fake_vis[ref_id] + + proxy_view_selected.set_position(1, 1) + + if("refreshAppearance") + update_warning = FALSE + appearance_copies = list() + appearance_cache = list() + for (var/ref_id in fake_vis) + var/list/all_fakes = fake_vis[ref_id] + QDEL_LIST(all_fakes) + fake_vis = list() + update_static_data_for_all_viewers() + + if("vvAppearance") + if (!check_rights(R_VAREDIT)) + return + var/appearance_id = text2num(params["id"]) + usr.client.debug_variables(appearance_copies[appearance_id]) + +/datum/appearance_debugger/ui_assets(mob/user) + return list(get_asset_datum(/datum/asset/simple/plane_background)) + +/datum/appearance_debugger/ui_state(mob/user) + return ADMIN_STATE(R_DEBUG) + +/datum/appearance_debugger/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "AppearanceDebug") + ui.open() + proxy_view_hover.display_to(user, ui.window) + proxy_view_selected.display_to(user, ui.window) + +/datum/appearance_debugger/ui_close(mob/user) + . = ..() + // Reset appearances when the UI is closed + proxy_view_hover.appearance = new /mutable_appearance() + proxy_view_selected.appearance = new /mutable_appearance() + proxy_view_hover.vis_contents.Cut() + proxy_view_selected.vis_contents.Cut() + if (isatom(debug_target)) + UnregisterSignal(debug_target, COMSIG_ATOM_UPDATE_APPEARANCE) + +/datum/appearance_debugger/proc/set_target(mutable_appearance/new_target) + if (isatom(debug_target)) + UnregisterSignal(debug_target, COMSIG_ATOM_UPDATE_APPEARANCE) + update_warning = FALSE + // Can be an atom! + debug_target = new_target + if (isatom(debug_target)) + RegisterSignal(debug_target, COMSIG_ATOM_UPDATE_APPEARANCE, PROC_REF(warn_update)) + appearance_copies = list() + appearance_cache = list() + for (var/ref_id in fake_vis) + var/list/all_fakes = fake_vis[ref_id] + QDEL_LIST(all_fakes) + fake_vis = list() + update_static_data_for_all_viewers() + +/datum/appearance_debugger/proc/warn_update() + SIGNAL_HANDLER + update_warning = TRUE diff --git a/code/modules/admin/verbs/path_debugger.dm b/code/modules/admin/verbs/path_debugger.dm index bd6b6620828..98bed7a0f34 100644 --- a/code/modules/admin/verbs/path_debugger.dm +++ b/code/modules/admin/verbs/path_debugger.dm @@ -103,22 +103,10 @@ GLOBAL_DATUM_INIT(pathfind_dude, /obj/pathfind_guy, new()) return /datum/action/innate/path_debug/proc/render_path(list/turf/draw_list) - if(!length(draw_list)) - return list() - - var/list/image/turf_images = list() - // Render everything but the first and last - for(var/i in 1 to (length(draw_list) - 1)) - var/turf/problem_child = draw_list[i] - var/turf/next = draw_list[i + 1] - turf_images += render_turf(problem_child, get_dir(problem_child, next)) - - return turf_images + return SSpathfinder.render_path_images(draw_list) /datum/action/innate/path_debug/proc/render_turf(turf/draw, direction) - var/image/arrow = image('icons/turf/debug.dmi', draw, "arrow", PATH_ARROW_DEBUG_LAYER, direction) - SET_PLANE_EXPLICIT(arrow, BALLOON_CHAT_PLANE, draw) - return arrow + return SSpathfinder.render_path_arrow(draw, direction) /datum/action/innate/path_debug/jps name = "JPS Test" diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index 4277cae7d81..aefd988aa74 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -1,51 +1,50 @@ -/mob/verb/pray(msg as text) - set category = "IC" - set name = "Pray" +/mob/verb/pray(message as text) + set name = VERB_PRAY if(GLOB.say_disabled) //This is here to try to identify lag problems - to_chat(usr, span_danger("Speech is currently admin-disabled."), confidential = TRUE) + to_chat(src, span_danger("Speech is currently admin-disabled."), confidential = TRUE) return - msg = copytext_char(sanitize(msg), 1, MAX_MESSAGE_LEN) - if(!msg) + message = copytext_char(sanitize(message), 1, MAX_MESSAGE_LEN) + if(!message) return - log_prayer("[src.key]/([src.name]): [msg]") - if(usr.client) - if(usr.client.prefs.muted & MUTE_PRAY) - to_chat(usr, span_danger("You cannot pray (muted)."), confidential = TRUE) + log_prayer("[src.key]/([src.name]): [message]") + if(src.client) + if(src.client.prefs.muted & MUTE_PRAY) + to_chat(src, span_danger("You cannot pray (muted)."), confidential = TRUE) return - if(src.client.handle_spam_prevention(msg,MUTE_PRAY)) + if(src.client.handle_spam_prevention(message, MUTE_PRAY)) return var/mutable_appearance/cross = mutable_appearance('icons/obj/storage/book.dmi', "bible") var/font_color = "purple" var/prayer_type = "PRAYER" var/deity - if(usr.job == JOB_CHAPLAIN) + if(src.job == JOB_CHAPLAIN) cross.icon_state = "kingyellow" font_color = "blue" prayer_type = "CHAPLAIN PRAYER" if(GLOB.deity) deity = GLOB.deity - else if(IS_CULTIST(usr)) + else if(IS_CULTIST(src)) cross.icon_state = "tome" font_color = "red" prayer_type = "CULTIST PRAYER" deity = "Nar'Sie" - else if(isliving(usr)) - var/mob/living/L = usr + else if(isliving(src)) + var/mob/living/L = src if(HAS_TRAIT(L, TRAIT_SPIRITUAL)) cross.icon_state = "holylight" font_color = "blue" prayer_type = "SPIRITUAL PRAYER" - var/msg_tmp = msg - GLOB.requests.pray(usr.client, msg, usr.job == JOB_CHAPLAIN) - msg = span_adminnotice("[icon2html(cross, GLOB.admins)][prayer_type][deity ? " (to [deity])" : ""]: [ADMIN_FULLMONTY(src)] [ADMIN_SC(src)]: [span_linkify(msg)]") + var/msg_tmp = message + GLOB.requests.pray(src.client, message, src.job == JOB_CHAPLAIN) + message = span_adminnotice("[icon2html(cross, GLOB.admins)][prayer_type][deity ? " (to [deity])" : ""]: [ADMIN_FULLMONTY(src)] [ADMIN_SC(src)]: [span_linkify(message)]") for(var/client/C in GLOB.admins) if(get_chat_toggles(C) & CHAT_PRAYER) - to_chat(C, msg, type = MESSAGE_TYPE_PRAYER, confidential = TRUE) - to_chat(usr, span_info("You pray to the gods: \"[msg_tmp]\""), confidential = TRUE) + to_chat(C, message, type = MESSAGE_TYPE_PRAYER, confidential = TRUE) + to_chat(src, span_info("You pray to the gods: \"[msg_tmp]\""), confidential = TRUE) BLACKBOX_LOG_ADMIN_VERB("Prayer") diff --git a/code/modules/admin/verbs/secrets.dm b/code/modules/admin/verbs/secrets.dm index c2a3f1f864d..84ccaf2935b 100644 --- a/code/modules/admin/verbs/secrets.dm +++ b/code/modules/admin/verbs/secrets.dm @@ -163,21 +163,6 @@ ADMIN_VERB(secrets, R_NONE, "Secrets", "Abuse harder than you ever have before w log_admin("[key_name(holder)] reset the station name.") message_admins(span_adminnotice("[key_name_admin(holder)] reset the station name.")) priority_announce("[command_name()] has renamed the station to \"[new_name]\".") - if("night_shift_set") - var/val = tgui_alert(holder, "What do you want to set night shift to? This will override the automatic system until set to automatic again.", "Night Shift", list("On", "Off", "Automatic")) - switch(val) - if("Automatic") - if(CONFIG_GET(flag/enable_night_shifts)) - SSnightshift.can_fire = TRUE - SSnightshift.fire() - else - SSnightshift.update_nightshift(active = FALSE, announce = TRUE, forced = TRUE) - if("On") - SSnightshift.can_fire = FALSE - SSnightshift.update_nightshift(active = TRUE, announce = TRUE, forced = TRUE) - if("Off") - SSnightshift.can_fire = FALSE - SSnightshift.update_nightshift(active = FALSE, announce = TRUE, forced = TRUE) if("moveferry") SSblackbox.record_feedback("nested tally", "admin_secrets_fun_used", 1, list("Send CentCom Ferry")) if(!SSshuttle.toggleShuttle("ferry","ferry_home","ferry_away")) @@ -703,6 +688,27 @@ ADMIN_VERB(secrets, R_NONE, "Secrets", "Abuse harder than you ever have before w return return + if("meteormode") + if(!is_funmin) + return + if(GLOB.meteor_mode) + QDEL_NULL(GLOB.meteor_mode) + message_admins("[key_name_admin(holder)] disabled meteor mode.") + return TRUE + + GLOB.meteor_mode = new() + var/start_when = tgui_input_number(usr, "Meteors will start in (this many seconds):", "Meteor Mode: Start", (5 MINUTES) / 10, (24 HOURS) / 10, 0) + var/ramp_speed = tgui_input_number(usr, "Meteors will worsen every (this many seconds):", "Meteor Mode: Intensity", (5 MINUTES) / 10, (24 HOURS) / 10, (30 SECONDS) / 10) + if(!is_funmin) // deadminnied? + QDEL_NULL(GLOB.meteor_mode) + return TRUE + GLOB.meteor_mode.meteordelay = world.time + (start_when * 10) + GLOB.meteor_mode.rampupdelta = ramp_speed / 60 + GLOB.meteor_mode.start_meteor() + message_admins("[key_name_admin(holder)] enabled meteor mode. \ + Meteors will start [start_when ? "in [DisplayTimeText(start_when * 10)]" : "immediately"], and will worsen every [DisplayTimeText(ramp_speed * 10)].") + return TRUE + if("fix_gravity") if(!is_funmin) return diff --git a/code/modules/admin/verbs/sprite_auditor.dm b/code/modules/admin/verbs/sprite_auditor.dm index 64022618c28..e1ffc660706 100644 --- a/code/modules/admin/verbs/sprite_auditor.dm +++ b/code/modules/admin/verbs/sprite_auditor.dm @@ -11,7 +11,7 @@ GLOBAL_DATUM_INIT(sprite_auditor, /datum/sprite_auditor, new) "name" = author.real_name, "ckey" = author.ckey, "appearance" = icon_appearance, - "timestamp" = gameTimestamp(), + "timestamp" = round_timestamp(), ))) SStgui.update_uis(src) diff --git a/code/modules/admin/view_variables/debug_variable_appearance.dm b/code/modules/admin/view_variables/debug_variable_appearance.dm index d92efcb7b2a..9f801066998 100644 --- a/code/modules/admin/view_variables/debug_variable_appearance.dm +++ b/code/modules/admin/view_variables/debug_variable_appearance.dm @@ -64,6 +64,10 @@ var/value = vars[var_name] return "
[station_name()] Supply Requisition
" requisition_text += "" requisition_text += "Order #[id]
" - requisition_text+= "Time of Order: [station_time_timestamp()]
" + requisition_text += "Time of Order: [UNDERLINED_HTML_TEXT("[server_timestamp(ic_time = TRUE)]", "Shift Time: [round_timestamp()]")]
" requisition_text += "Item: [pack.name]
" requisition_text += "Access Restrictions: [SSid_access.get_access_desc(pack.access)]
" requisition_text += "Requested by: [orderer]
" @@ -119,7 +119,7 @@ requisition_text += "Rank: [orderer_rank]
" requisition_text += "Comment: [reason]
" - requisition_paper.add_raw_text(requisition_text) + requisition_paper.add_raw_text(requisition_text, advanced_html = TRUE) requisition_paper.update_appearance() return requisition_paper diff --git a/code/modules/cargo/orderconsole.dm b/code/modules/cargo/orderconsole.dm index c940e1c5da5..345bca00d24 100644 --- a/code/modules/cargo/orderconsole.dm +++ b/code/modules/cargo/orderconsole.dm @@ -173,9 +173,8 @@ /** * returns a list of supply packs for a certain group * * group - the group of packs to return - * * express - if this is an express console */ -/obj/machinery/computer/cargo/proc/get_packs_data(group, express = FALSE) +/obj/machinery/computer/cargo/proc/get_packs_data(group) var/list/packs = list() for(var/pack_id in SSshuttle.supply_packs) var/datum/supply_pack/pack = SSshuttle.supply_packs[pack_id] @@ -185,11 +184,9 @@ if(pack.order_flags & ORDER_INVISIBLE) continue - // Express console packs check - if(express && (pack.order_flags & (ORDER_EMAG_ONLY | ORDER_SPECIAL))) + if((pack.order_flags & ORDER_EMAG_ONLY) && !(obj_flags & EMAGGED)) continue - - if(!express && (((pack.order_flags & ORDER_EMAG_ONLY) && !(obj_flags & EMAGGED)) || ((pack.order_flags & ORDER_SPECIAL) && !(pack.order_flags & ORDER_SPECIAL_ENABLED)) || (pack.order_flags & ORDER_POD_ONLY))) + if((pack.order_flags & ORDER_SPECIAL) && !(pack.order_flags & ORDER_SPECIAL_ENABLED)) continue // BUBBER EDIT START - Interdyne-only items check @@ -200,6 +197,9 @@ if((pack.order_flags & ORDER_CONTRABAND) && !contraband) continue + if(!is_express && (pack.order_flags & ORDER_POD_ONLY)) + continue + var/obj/item/first_item = length(pack.contains) > 0 ? pack.contains[1] : null packs += list(list( "name" = pack.name, @@ -409,10 +409,10 @@ //create the paper from the SSshuttle.shopping_list if(length(SSshuttle.shopping_list)) var/obj/item/paper/requisition/requisition_paper = new(get_turf(src)) - requisition_paper.name = "requisition form - [station_time_timestamp()]" + requisition_paper.name = "requisition form - [server_timestamp(ic_time = TRUE)] (PT: [round_timestamp()])" var/requisition_text = "
[station_name()] Supply Requisition
" requisition_text += "" - requisition_text += "Time of Order: [station_time_timestamp()]
" + requisition_text += "Time of Order: [UNDERLINED_HTML_TEXT("[server_timestamp(ic_time = TRUE)]", "Shift Time: [round_timestamp()]")]
" for(var/datum/supply_order/order as anything in SSshuttle.shopping_list) requisition_text += "[order.pack.name]" requisition_text += "- Order ID: [order.id]" @@ -427,7 +427,7 @@ if(reason) requisition_text += "- Reason Given: [reason]" requisition_text += "" - requisition_paper.add_raw_text(requisition_text) + requisition_paper.add_raw_text(requisition_text, advanced_html = TRUE) requisition_paper.color = "#9ef5ff" requisition_paper.update_appearance() diff --git a/code/modules/cargo/packs/science.dm b/code/modules/cargo/packs/science.dm index 870645ab7d7..c556a7878ef 100644 --- a/code/modules/cargo/packs/science.dm +++ b/code/modules/cargo/packs/science.dm @@ -121,3 +121,15 @@ contains = list(/obj/item/mod/core/standard = 3) crate_name = "\improper MOD core crate" crate_type = /obj/structure/closet/crate/nakamura + +/datum/supply_pack/science/gizmo + name = "Gizmo research crate" + desc = "Three weird science gizmo thinga-majiggers? We don't know what they do." + cost = CARGO_CRATE_VALUE * 5 + access = ACCESS_SCIENCE + access_view = ACCESS_SCIENCE + contains = list( + /obj/machinery/gizmo = 1, + /obj/effect/spawner/random/gizmo = 2, + ) + crate_name = "\improper Gizmo research crate" diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm index 989ff3efa1e..a49169b9084 100644 --- a/code/modules/client/client_defines.dm +++ b/code/modules/client/client_defines.dm @@ -256,5 +256,7 @@ /// The DPI scale of the client. 1 is equivalent to 100% window scaling, 2 will be 200% window scaling var/window_scaling + var/datum/tgui_window/stat_panel + /// OOC colour of the clients messages. var/ooc_colour = null diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 978bff094bc..26651b74fce 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -571,8 +571,6 @@ GLOBAL_LIST_INIT(unrecommended_builds, list( to_chat(src, span_info("You have unread updates in the changelog.")) if(CONFIG_GET(flag/aggressive_changelog)) changelog() - else - winset(src, "infobuttons.changelog", "font-style=bold") if(ckey in GLOB.clientmessages) for(var/message in GLOB.clientmessages[ckey]) @@ -592,19 +590,16 @@ GLOBAL_LIST_INIT(unrecommended_builds, list( if(!tooltips) tooltips = new /datum/tooltip(src) - if (!interviewee) - initialize_menus() - loot_panel = new(src) view_size = new(src) - set_fullscreen(logging_in = TRUE) view_size.resetFormat() view_size.setZoomMode() view_size.apply() Master.UpdateTickRate() SEND_GLOBAL_SIGNAL(COMSIG_GLOB_CLIENT_CONNECT, src) fully_created = TRUE + set_fullscreen() ////////////// //DISCONNECT// @@ -1159,29 +1154,6 @@ GLOBAL_LIST_INIT(unrecommended_builds, list( return to_chat(src, span_userdanger("Statpanel failed to load, click here to reload the panel ")) -/** - * Initializes dropdown menus on client - */ -/client/proc/initialize_menus() - var/list/topmenus = GLOB.menulist[/datum/verbs/menu] - for (var/thing in topmenus) - var/datum/verbs/menu/topmenu = thing - var/topmenuname = "[topmenu]" - if (topmenuname == "[topmenu.type]") - var/list/tree = splittext(topmenuname, "/") - topmenuname = tree[tree.len] - winset(src, "[topmenu.type]", "parent=menu;name=[url_encode(topmenuname)]") - var/list/entries = topmenu.Generate_list(src) - for (var/child in entries) - winset(src, "[child]", "[entries[child]]") - if (!ispath(child, /datum/verbs/menu)) - var/procpath/verbpath = child - if (verbpath.name[1] != "@") - new child(src) - - // Place Help back at the end. - winset(src, "help-menu", "index=1000") - /client/proc/open_filter_editor(atom/in_atom) if(holder) holder.filterrific = new /datum/filter_editor(in_atom) @@ -1195,13 +1167,13 @@ GLOBAL_LIST_INIT(unrecommended_builds, list( /client/proc/set_right_click_menu_mode(shift_only) if(shift_only) - winset(src, "mapwindow.map", "right-click=true") - winset(src, "ShiftUp", "is-disabled=false") - winset(src, "Shift", "is-disabled=false") + winset(src, SKIN_MAPWINDOW_MAP, "right-click=true") + winset(src, SKIN_DEFAULT_SHIFTUP, "is-disabled=false") + winset(src, SKIN_DEFAULT_SHIFT, "is-disabled=false") else - winset(src, "mapwindow.map", "right-click=false") - winset(src, "default.Shift", "is-disabled=true") - winset(src, "default.ShiftUp", "is-disabled=true") + winset(src, SKIN_MAPWINDOW_MAP, "right-click=false") + winset(src, SKIN_DEFAULT_SHIFT, "is-disabled=true") + winset(src, SKIN_DEFAULT_SHIFTUP, "is-disabled=true") /client/proc/update_ambience_pref(value) if(value) @@ -1270,15 +1242,8 @@ GLOBAL_LIST_INIT(unrecommended_builds, list( prefs.write_preference(GLOB.preference_entries[/datum/preference/toggle/fullscreen_mode], !is_on) set_fullscreen() -/client/proc/set_fullscreen(logging_in = FALSE) - var/fullscreen = prefs?.read_preference(/datum/preference/toggle/fullscreen_mode) - //no need to set every login to not fullscreen, they already aren't. - //we also dont need to call attempt_auto_fit_viewport, Login does that for us. - if(logging_in) - if(fullscreen) - winset(src, "mainwindow", "menu=;is-fullscreen=[fullscreen ? "true" : "false"]") - return - winset(src, "mainwindow", "menu=;is-fullscreen=[fullscreen ? "true" : "false"]") +/client/proc/set_fullscreen() + winset(src, SKIN_MAINWINDOW, "is-fullscreen=[prefs?.read_preference(/datum/preference/toggle/fullscreen_mode) ? "true" : "false"]") attempt_auto_fit_viewport() /// Clears the client's screen, aside from ones that opt out diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 69587cda807..fec578eed1d 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -576,7 +576,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) return TRUE /datum/preferences/proc/GetQuirkBalance() - var/bal = CONFIG_GET(number/default_quirk_points) + var/bal = SSquirks.default_quirk_points for(var/V in all_quirks) var/datum/quirk/T = SSquirks.quirks[V] bal -= initial(T.value) @@ -606,7 +606,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(LAZYLEN(quirks_removed)) LAZYADD(feedback, "The following quirks are incompatible with your species:") LAZYADD(feedback, quirks_removed) - if(!CONFIG_GET(flag/disable_quirk_points) && GetQuirkBalance() < 0) + if(SSquirks.points_enabled && GetQuirkBalance() < 0) LAZYADD(feedback, "Your quirks have been reset.") all_quirks = list() if(LAZYLEN(feedback)) diff --git a/code/modules/client/preferences/body_type.dm b/code/modules/client/preferences/body_type.dm index 18f4d1c2094..33c8f736fd8 100644 --- a/code/modules/client/preferences/body_type.dm +++ b/code/modules/client/preferences/body_type.dm @@ -10,11 +10,6 @@ /datum/preference/choiced/body_type/init_possible_values() return list(USE_GENDER, MALE, FEMALE) -/datum/preference/choiced/body_type/is_valid(value, datum/preferences/preferences) - . = ..() - if(. && value == USE_GENDER) - return gender_has_physique(preferences.read_preference(/datum/preference/choiced/gender)) - /datum/preference/choiced/body_type/create_informed_default_value(datum/preferences/preferences) return gender_has_physique(preferences.read_preference(/datum/preference/choiced/gender)) ? USE_GENDER : FEMALE diff --git a/code/modules/client/preferences/gender.dm b/code/modules/client/preferences/gender.dm index c5bfd19d317..bf1107843c2 100644 --- a/code/modules/client/preferences/gender.dm +++ b/code/modules/client/preferences/gender.dm @@ -18,12 +18,3 @@ // The only reason I'm limiting this to male or female // is that hairstyle randomization handles enbies poorly return pick(MALE, FEMALE) - -/datum/preference/choiced/gender/post_write(value, datum/preferences/preferences) - ..() - if (gender_has_physique(value)) - return - - var/current_physique = preferences.read_preference(/datum/preference/choiced/body_type) - if(current_physique != MALE && current_physique != FEMALE) - preferences.update_preference(GLOB.preference_entries[/datum/preference/choiced/body_type], FEMALE) diff --git a/code/modules/client/preferences/middleware/quirks.dm b/code/modules/client/preferences/middleware/quirks.dm index 5476c56effe..834a462cfbe 100644 --- a/code/modules/client/preferences/middleware/quirks.dm +++ b/code/modules/client/preferences/middleware/quirks.dm @@ -19,7 +19,7 @@ if(!LAZYLEN(incompatible_quirks)) return var/list/message = list("The following quirks are incompatible with your selected species and will be removed: [incompatible_quirks.Join(", ")].") - if(CONFIG_GET(flag/disable_quirk_points)) + if(!SSquirks.points_enabled) message += "Would you like to continue?" else message += "If you do not have enough points to cover the removed quirks, your quirks will be reset. Would you like to continue?" @@ -48,7 +48,7 @@ var/list/data = list() data["selected_quirks"] = get_selected_quirks() - data["default_quirk_balance"] = CONFIG_GET(number/default_quirk_points) + data["default_quirk_balance"] = SSquirks.default_quirk_points data["species_disallowed_quirks"] = get_species_compatibility() return data @@ -68,7 +68,7 @@ var/list/quirks = SSquirks.get_quirks() - var/max_positive_quirks = CONFIG_GET(number/max_positive_quirks) + var/max_positive_quirks = SSquirks.max_positive_quirks var/positive_quirks_disabled = max_positive_quirks == 0 for (var/quirk_name in quirks) var/datum/quirk/quirk = quirks[quirk_name] @@ -91,7 +91,7 @@ "max_positive_quirks" = max_positive_quirks, "quirk_info" = quirk_info, "quirk_blacklist" = GLOB.quirk_string_blacklist, - "points_enabled" = !CONFIG_GET(flag/disable_quirk_points), + "points_enabled" = SSquirks.points_enabled, ) /datum/preference_middleware/quirks/on_new_character(mob/user) diff --git a/code/modules/client/preferences/names.dm b/code/modules/client/preferences/names.dm index f7c77f10fd2..e253bd5b660 100644 --- a/code/modules/client/preferences/names.dm +++ b/code/modules/client/preferences/names.dm @@ -174,7 +174,7 @@ return FALSE // If one of the roles is ticked in the antag prefs menu, this option will show. - var/static/list/ops_roles = list(ROLE_OPERATIVE, ROLE_LONE_OPERATIVE, ROLE_OPERATIVE_MIDROUND, ROLE_CLOWN_OPERATIVE) + var/static/list/ops_roles = list(ROLE_OPERATIVE, ROLE_LONE_OPERATIVE, ROLE_OPERATIVE_MIDROUND, ROLE_CLOWN_OPERATIVE, ROLE_CLOWN_OPERATIVE_MIDROUND) if(length(ops_roles & preferences.be_special)) return TRUE diff --git a/code/modules/client/preferences/operative_species.dm b/code/modules/client/preferences/operative_species.dm index 5bee923c415..e67ffff7568 100644 --- a/code/modules/client/preferences/operative_species.dm +++ b/code/modules/client/preferences/operative_species.dm @@ -14,7 +14,7 @@ return FALSE // If one of the roles is ticked in the antag prefs menu, this option will show. - var/static/list/ops_roles = list(ROLE_OPERATIVE, ROLE_LONE_OPERATIVE, ROLE_OPERATIVE_MIDROUND, ROLE_CLOWN_OPERATIVE) + var/static/list/ops_roles = list(ROLE_OPERATIVE, ROLE_LONE_OPERATIVE, ROLE_OPERATIVE_MIDROUND, ROLE_CLOWN_OPERATIVE, ROLE_CLOWN_OPERATIVE_MIDROUND) if(length(ops_roles & preferences.be_special)) return TRUE diff --git a/code/modules/client/preferences/statpanel.dm b/code/modules/client/preferences/statpanel.dm index 4c9e3c51b26..3924e0743fe 100644 --- a/code/modules/client/preferences/statpanel.dm +++ b/code/modules/client/preferences/statpanel.dm @@ -9,3 +9,8 @@ return FALSE return is_admin(preferences.parent) + +/datum/preference/toggle/statpanel + savefile_key = "statpanel_open" + savefile_identifier = PREFERENCE_PLAYER + default_value = TRUE diff --git a/code/modules/client/preferences/status_bar.dm b/code/modules/client/preferences/status_bar.dm index 1f1724ff49e..853280cd7fc 100644 --- a/code/modules/client/preferences/status_bar.dm +++ b/code/modules/client/preferences/status_bar.dm @@ -7,4 +7,4 @@ /datum/preference/toggle/status_bar/apply_to_client(client/client, value) if(isnull(client) || istype(client, /datum/client_interface)) //no winset on mock clients. return - winset(client, "mapwindow.status_bar", "is-visible=[value]") + winset(client, SKIN_MAPWINDOW_STATUS_BAR, "is-visible=[value]") diff --git a/code/modules/client/preferences/time.dm b/code/modules/client/preferences/time.dm new file mode 100644 index 00000000000..698618571ec --- /dev/null +++ b/code/modules/client/preferences/time.dm @@ -0,0 +1,5 @@ +/datum/preference/toggle/twelve_hour + category = PREFERENCE_CATEGORY_GAME_PREFERENCES + savefile_key = "twelve_hour" + savefile_identifier = PREFERENCE_PLAYER + default_value = FALSE diff --git a/code/modules/client/preferences_menu.dm b/code/modules/client/preferences_menu.dm index 887816a0a0a..30c658d4541 100644 --- a/code/modules/client/preferences_menu.dm +++ b/code/modules/client/preferences_menu.dm @@ -1,26 +1,22 @@ -/datum/verbs/menu/Preferences/verb/open_character_preferences() +/client/verb/open_character_preferences() set category = "OOC" set name = "Open Character Preferences" set desc = "Open Character Preferences" - var/datum/preferences/preferences = usr?.client?.prefs - if (!preferences) + if(!prefs) return + prefs.current_window = PREFERENCE_TAB_CHARACTER_PREFERENCES + prefs.update_static_data(usr) + prefs.ui_interact(usr) - preferences.current_window = PREFERENCE_TAB_CHARACTER_PREFERENCES - preferences.update_static_data(usr) - preferences.ui_interact(usr) - -/datum/verbs/menu/Preferences/verb/open_game_preferences() +/client/verb/open_game_preferences() set category = "OOC" set name = "Open Game Preferences" set desc = "Open Game Preferences" - var/datum/preferences/preferences = usr?.client?.prefs - if (!preferences) + if(!prefs) return - - preferences.current_window = PREFERENCE_TAB_GAME_PREFERENCES - preferences.update_static_data(usr) - preferences.ui_interact(usr) + prefs.current_window = PREFERENCE_TAB_GAME_PREFERENCES + prefs.update_static_data(usr) + prefs.ui_interact(usr) diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm index cd2e598c7cc..e250d29268c 100644 --- a/code/modules/client/verbs/ooc.dm +++ b/code/modules/client/verbs/ooc.dm @@ -3,8 +3,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") ///talking in OOC uses this /client/verb/ooc(msg as text) - set name = "OOC" //Gave this shit a shorter name so you only have to time out "ooc" rather than "ooc message" to use it --NeoFite - set category = "OOC" + set name = VERB_OOC if(GLOB.say_disabled) //This is here to try to identify lag problems to_chat(usr, span_danger("Speech is currently admin-disabled.")) @@ -138,7 +137,6 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") else GLOB.dooc_allowed = !GLOB.dooc_allowed - /client/proc/set_ooc() set name = "Set Player OOC Color" set desc = "Modifies player OOC Color" @@ -357,16 +355,16 @@ ADMIN_VERB(reset_ooc_color, R_FUN, "Reset Player OOC Color", "Returns player OOC var/aspect_ratio = view_size[1] / view_size[2] // Calculate desired pixel width using window size and aspect ratio - var/list/sizes = params2list(winget(src, "mainwindow.split;mapwindow", "size")) + var/list/sizes = params2list(winget(src, "[SKIN_MAINWINDOW_SPLIT];[SKIN_MAPWINDOW]", "size")) // Client closed the window? Some other error? This is unexpected behaviour, let's // CRASH with some info. - if(!sizes["mapwindow.size"]) + if(!sizes["[SKIN_MAPWINDOW].size"]) CRASH("sizes does not contain mapwindow.size key. This means a winget failed to return what we wanted. --- sizes var: [sizes] --- sizes length: [length(sizes)]") - var/list/map_size = splittext(sizes["mapwindow.size"], "x") + var/list/map_size = splittext(sizes["[SKIN_MAPWINDOW].size"], "x") - var/split_size = splittext(sizes["mainwindow.split.size"], "x") + var/split_size = splittext(sizes["[SKIN_MAINWINDOW_SPLIT].size"], "x") var/split_width = text2num(split_size[1]) // Window is minimized, we can't get proper data so return to avoid division by 0 @@ -400,12 +398,12 @@ ADMIN_VERB(reset_ooc_color, R_FUN, "Reset Player OOC Color", "Returns player OOC // Calculate and apply a best estimate // +4 pixels are for the width of the splitter's handle var/pct = 100 * (desired_width + 4) / split_width - winset(src, "mainwindow.split", "splitter=[pct]") + winset(src, SKIN_MAINWINDOW_SPLIT, "splitter=[pct]") // Apply an ever-lowering offset until we finish or fail var/delta for(var/safety in 1 to 10) - var/after_size = winget(src, "mapwindow", "size") + var/after_size = winget(src, SKIN_MAPWINDOW, "size") map_size = splittext(after_size, "x") var/got_width = text2num(map_size[1]) @@ -420,7 +418,7 @@ ADMIN_VERB(reset_ooc_color, R_FUN, "Reset Player OOC Color", "Returns player OOC delta = -delta/2 pct += delta - winset(src, "mainwindow.split", "splitter=[pct]") + winset(src, SKIN_MAINWINDOW_SPLIT, "splitter=[pct]") /// Attempt to automatically fit the viewport, assuming the user wants it /client/proc/attempt_auto_fit_viewport() diff --git a/code/modules/client/verbs/ping.dm b/code/modules/client/verbs/ping.dm deleted file mode 100644 index 03603cea895..00000000000 --- a/code/modules/client/verbs/ping.dm +++ /dev/null @@ -1,22 +0,0 @@ -/client/verb/update_ping(time as num) - set instant = TRUE - set name = ".update_ping" - var/ping = pingfromtime(time) - lastping = ping - if (!avgping) - avgping = ping - else - avgping = MC_AVERAGE_SLOW(avgping, ping) - -/client/proc/pingfromtime(time) - return ((world.time+world.tick_lag*TICK_USAGE_REAL/100)-time)*100 - -/client/verb/display_ping(time as num) - set instant = TRUE - set name = ".display_ping" - to_chat(src, span_notice("Round trip ping took [round(pingfromtime(time),1)]ms")) - -/client/verb/ping() - set name = "Ping" - set category = "OOC" - winset(src, null, "command=.display_ping+[world.time+world.tick_lag*TICK_USAGE_REAL/100]") diff --git a/code/modules/client/verbs/stat_panel.dm b/code/modules/client/verbs/stat_panel.dm new file mode 100644 index 00000000000..b350c4ee887 --- /dev/null +++ b/code/modules/client/verbs/stat_panel.dm @@ -0,0 +1,21 @@ +/client/verb/toggle_stat_panel() + set name = "Toggle Stat Panel" + set hidden = TRUE + + //Flip it + prefs.write_preference(GLOB.preference_entries[/datum/preference/toggle/statpanel], !prefs.read_preference(/datum/preference/toggle/statpanel)) + set_stat_panel() + +///Sets the stat panel's visibility to the player, depending on whether they need it/have it enabled or not. +/client/proc/set_stat_panel() + if(prefs.read_preference(/datum/preference/toggle/statpanel) || needs_stat_panel()) + winset(src, SKIN_INFOWINDOW_CHILD, "left=statwindow") + else + winset(src, SKIN_INFOWINDOW_CHILD, "left=null") + +///Returns TRUE if the player has something that necessitates the stat panel. +/client/proc/needs_stat_panel() + if(holder || interviewee) + return TRUE + . = mob.get_status_tab_items() + return length(.) >= 2 diff --git a/code/modules/client/verbs/typing.dm b/code/modules/client/verbs/typing.dm index 035a35d2e55..52cd57a828c 100644 --- a/code/modules/client/verbs/typing.dm +++ b/code/modules/client/verbs/typing.dm @@ -9,7 +9,7 @@ /client/proc/handle_commandbar_typing(href_list) if (!typing_indicators) //check pref return - if (length(href_list["verb"]) < 1 || !(LOWER_TEXT(href_list["verb"]) in IC_VERBS) || text2num(href_list["argument_length"]) < 1) + if (length(href_list["verb"]) < 1 || !(LOWER_TEXT(href_list["verb"]) in IC_VERBS) || text2num(href_list["argument_length"]) < 2) if (commandbar_typing) commandbar_typing = FALSE stop_typing() diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 91df732e454..fe5c87fe898 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -572,7 +572,7 @@ BLIND // can't see anything if(!iscarbon(user)) return TRUE var/mob/living/carbon/carbon_user = user - if(up) + if(visor_flags_inv) carbon_user.refresh_obscured() if(visor_vars_to_toggle & VISOR_TINT) carbon_user.update_tint() diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm index bbff852053d..365ba867f56 100644 --- a/code/modules/clothing/glasses/_glasses.dm +++ b/code/modules/clothing/glasses/_glasses.dm @@ -491,7 +491,7 @@ inhand_icon_state = "welding-g" actions_types = list(/datum/action/item_action/toggle) flash_protect = FLASH_PROTECTION_WELDER - flags_cover = GLASSESCOVERSEYES + visor_flags_cover = GLASSESCOVERSEYES custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*2.5) tint = 2 visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT diff --git a/code/modules/clothing/head/hat.dm b/code/modules/clothing/head/hat.dm index 3f63ef69a4f..ee2d95ef0e3 100644 --- a/code/modules/clothing/head/hat.dm +++ b/code/modules/clothing/head/hat.dm @@ -405,3 +405,9 @@ worn_icon_state = "paper" dog_fashion = /datum/dog_fashion/head custom_materials = list(/datum/material/paper = HALF_SHEET_MATERIAL_AMOUNT / 2) + +/obj/item/clothing/head/costume/paper_hat/savior + name = "ancient paper hat" + desc = "An ancient hat made of paper. \"Savior of the Universe\" is spelled out on the rim in orange marker. " + icon_state = "paper_savior" + worn_icon_state = "paper_savior" diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index f83b70bfa2f..1687bc22132 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -124,6 +124,12 @@ icon_state = "capcap" dog_fashion = null +/obj/item/clothing/head/hats/caphat/bicorne + name = "captain's bicorne" + desc = "Why be king when you can be Emperor?" + icon_state = "capbicorne" + dog_fashion = null + /obj/item/clothing/head/caphat/beret name = "captain's beret" desc = "For the Captains known for their sense of fashion." @@ -187,7 +193,6 @@ /// Cooldown for retrieving precious candy corn with rmb COOLDOWN_DECLARE(candy_cooldown) - /datum/armor/fedora_det_hat melee = 25 bullet = 5 @@ -239,6 +244,12 @@ /obj/item/clothing/head/fedora/det_hat/minor flask_path = /obj/item/reagent_containers/cup/glass/flask/det/minor +/obj/item/clothing/head/fedora/det_hat/noir + name = "detective's noir fedora" + desc = "There's only one man who can recklessly discharge a firearm into a crowded street while trying to stop a criminal, \ + and he's likely wearing this hat." + icon_state = /obj/item/clothing/head/fedora::icon_state + ///Detectives Fedora, but like Inspector Gadget. Not a subtype to not inherit candy corn stuff /obj/item/clothing/head/fedora/inspector_hat name = "inspector's fedora" diff --git a/code/modules/clothing/masks/gas_filter.dm b/code/modules/clothing/masks/gas_filter.dm index 1399a1a07d4..98abaf220dd 100644 --- a/code/modules/clothing/masks/gas_filter.dm +++ b/code/modules/clothing/masks/gas_filter.dm @@ -70,26 +70,26 @@ for(var/gas_id in breath.gases) if(gas_id in high_filtering_gases) if(breath.gases[gas_id][MOLES] > HIGH_FILTERING_MOLES) - breath.gases[gas_id][MOLES] = max(breath.gases[gas_id][MOLES] - filter_strength_high * filter_efficiency * HIGH_FILTERING_RATIO, 0) + breath.set_gas(gas_id, max(breath.gases[gas_id][MOLES] - filter_strength_high * filter_efficiency * HIGH_FILTERING_RATIO, 0)) danger_points += 1 continue - breath.gases[gas_id][MOLES] = max(breath.gases[gas_id][MOLES] - filter_strength_high * filter_efficiency * LOW_FILTERING_RATIO, 0) + breath.set_gas(gas_id, max(breath.gases[gas_id][MOLES] - filter_strength_high * filter_efficiency * LOW_FILTERING_RATIO, 0)) danger_points += 0.2 continue if(gas_id in mid_filtering_gases) if(breath.gases[gas_id][MOLES] > MID_FILTERING_MOLES) - breath.gases[gas_id][MOLES] = max(breath.gases[gas_id][MOLES] - filter_strength_mid * filter_efficiency * HIGH_FILTERING_RATIO, 0) + breath.set_gas(gas_id, max(breath.gases[gas_id][MOLES] - filter_strength_mid * filter_efficiency * HIGH_FILTERING_RATIO, 0)) danger_points += 1.25 continue - breath.gases[gas_id][MOLES] = max(breath.gases[gas_id][MOLES] - filter_strength_mid * filter_efficiency * LOW_FILTERING_RATIO, 0) + breath.set_gas(gas_id, max(breath.gases[gas_id][MOLES] - filter_strength_mid * filter_efficiency * LOW_FILTERING_RATIO, 0)) danger_points += 0.25 continue if(gas_id in low_filtering_gases) if(breath.gases[gas_id][MOLES] > LOW_FILTERING_MOLES) - breath.gases[gas_id][MOLES] = max(breath.gases[gas_id][MOLES] - filter_strength_low * filter_efficiency * HIGH_FILTERING_RATIO, 0) + breath.set_gas(gas_id, max(breath.gases[gas_id][MOLES] - filter_strength_low * filter_efficiency * HIGH_FILTERING_RATIO, 0)) danger_points += 1.5 continue - breath.gases[gas_id][MOLES] = max(breath.gases[gas_id][MOLES] - filter_strength_low * filter_efficiency * LOW_FILTERING_RATIO, 0) + breath.set_gas(gas_id, max(breath.gases[gas_id][MOLES] - filter_strength_low * filter_efficiency * LOW_FILTERING_RATIO, 0)) danger_points += 0.5 continue diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index f3b01676c0e..c9217ee5dd8 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -287,6 +287,16 @@ GLOBAL_LIST_INIT(clown_mask_options, list( /obj/item/clothing/mask/gas/syndicate/plasmaman starting_filter_type = /obj/item/gas_filter/plasmaman +/obj/item/clothing/mask/gas/syndicate/cybersun + name = "\improper Cybersun mask" + desc = "It's really more about making a statement than protecting you from environmental hazards." + icon_state = "cybersun" + flags_cover = MASKCOVERSMOUTH + flags_inv = HIDEFACE|HIDEFACIALHAIR|HIDESNOUT + visor_flags_inv = HIDEFACE|HIDEFACIALHAIR|HIDESNOUT + visor_flags_cover = MASKCOVERSMOUTH + alternate_worn_layer = BENEATH_HAIR_LAYER + /obj/item/clothing/mask/gas/clown_hat name = "clown wig and mask" desc = "A true prankster's facial attire. A clown is incomplete without his wig and mask." diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm index 94a4bfb9673..5ed9edd61a0 100644 --- a/code/modules/clothing/neck/_neck.dm +++ b/code/modules/clothing/neck/_neck.dm @@ -520,6 +520,10 @@ return name = "[initial(name)] - [tagname]" +/obj/item/clothing/neck/petcollar/wearable/cyber + desc = "You wear the tie, or you wear this. Your choice." + icon_state = "petcollar_cyber" + ////////////// //DOPE BLING// ////////////// diff --git a/code/modules/clothing/spacesuits/_spacesuits.dm b/code/modules/clothing/spacesuits/_spacesuits.dm index 24cdeac580f..6ad579e8b93 100644 --- a/code/modules/clothing/spacesuits/_spacesuits.dm +++ b/code/modules/clothing/spacesuits/_spacesuits.dm @@ -22,16 +22,27 @@ strip_delay = 5 SECONDS equip_delay_other = 5 SECONDS flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF + visor_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL | HEADINTERNALS + visor_flags_inv = HIDEMASK | HIDEEYES | HIDEFACE | HIDESNOUT + visor_flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF + visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT resistance_flags = NONE dog_fashion = null sound_vary = TRUE equip_sound = 'sound/items/handling/helmet/helmet_equip1.ogg' pickup_sound = 'sound/items/handling/helmet/helmet_pickup1.ogg' drop_sound = 'sound/items/handling/helmet/helmet_drop1.ogg' + visor_toggle_up_sound = SFX_VISOR_UP + visor_toggle_down_sound = SFX_VISOR_DOWN + actions_types = list(/datum/action/item_action/adjust_visor) + toggle_message = "You pull your helmet's visor down." + alt_toggle_message = "You pull your helmet's visor up." ///How much this helmet affects fishing difficulty var/fishing_modifier = 3 ///Icon state applied when we get spraypainted/peppersprayed. If null, does not add the dirt component var/visor_dirt = "helm_dirt" + /// Whether the helmet has a visor you can flip up + var/has_visor = FALSE /obj/item/clothing/head/helmet/space/Initialize(mapload) . = ..() @@ -44,6 +55,23 @@ /obj/item/clothing/head/helmet/space/proc/add_stabilizer(loose_hat = TRUE) AddComponent(/datum/component/hat_stabilizer, loose_hat = loose_hat) +/obj/item/clothing/head/helmet/space/attack_self(mob/living/user) + . = ..() + if(. || !has_visor) + return + + return adjust_visor(user) + +/obj/item/clothing/head/helmet/space/click_alt(mob/user) + if(!has_visor) + return NONE + + return adjust_visor(user) ? CLICK_ACTION_SUCCESS : CLICK_ACTION_BLOCKING + +/obj/item/clothing/head/helmet/space/update_icon_state() + . = ..() + icon_state = "[initial(icon_state)][up ? "-novisor" : ""]" + /datum/armor/helmet_space bio = 100 fire = 80 diff --git a/code/modules/clothing/spacesuits/pirate.dm b/code/modules/clothing/spacesuits/pirate.dm index 1a0dcca025d..de7b3680403 100644 --- a/code/modules/clothing/spacesuits/pirate.dm +++ b/code/modules/clothing/spacesuits/pirate.dm @@ -7,7 +7,8 @@ strip_delay = 4 SECONDS equip_delay_other = 2 SECONDS fishing_modifier = -2 - visor_dirt = null + visor_dirt = "space_dirt" + has_visor = TRUE /datum/armor/space_pirate melee = 30 diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm index b94861539e6..b96d5144402 100644 --- a/code/modules/clothing/spacesuits/plasmamen.dm +++ b/code/modules/clothing/spacesuits/plasmamen.dm @@ -75,7 +75,7 @@ desc = "A special containment helmet that allows plasma-based lifeforms to exist safely in an oxygenated environment. It is space-worthy, and may be worn in tandem with other EVA gear." icon = 'icons/obj/clothing/head/plasmaman_hats.dmi' worn_icon = 'icons/mob/clothing/head/plasmaman_head.dmi' - clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL | SNUG_FIT | STACKABLE_HELMET_EXEMPT | PLASMAMAN_PREVENT_IGNITION | HEADINTERNALS + clothing_flags = parent_type::clothing_flags | PLASMAMAN_PREVENT_IGNITION icon_state = "plasmaman-helm" inhand_icon_state = "plasmaman-helm" strip_delay = 8 SECONDS @@ -90,10 +90,9 @@ light_on = FALSE fishing_modifier = 0 actions_types = list(/datum/action/item_action/toggle_helmet_light, /datum/action/item_action/toggle_welding_screen) - visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT - flags_cover = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF - visor_flags_inv = HIDEEYES|HIDEFACE + visor_flags = NONE + visor_flags_inv = HIDEEYES|HIDEFACE|HIDESNOUT + visor_flags_cover = NONE visor_dirt = null var/helmet_on = FALSE var/smile = FALSE @@ -141,7 +140,6 @@ to_chat(user, span_notice("Your helmet's torch can't pass through your welding visor!")) set_light_on(FALSE) helmet_on = FALSE - playsound(src, up ? SFX_VISOR_UP : SFX_VISOR_DOWN, 50, TRUE) update_appearance() /obj/item/clothing/head/helmet/space/plasmaman/update_icon_state() diff --git a/code/modules/clothing/spacesuits/softsuit.dm b/code/modules/clothing/spacesuits/softsuit.dm index 72841de62df..d6cb7bf0c89 100644 --- a/code/modules/clothing/spacesuits/softsuit.dm +++ b/code/modules/clothing/spacesuits/softsuit.dm @@ -1,25 +1,25 @@ //NASA Voidsuit /obj/item/clothing/head/helmet/space/nasavoid - name = "NASA Void Helmet" + name = "\improper NASA void helmet" desc = "An old, NASA CentCom branch designed, dark red space suit helmet." icon_state = "void" inhand_icon_state = "void_helmet" /obj/item/clothing/suit/space/nasavoid - name = "NASA Voidsuit" + name = "\improper NASA voidsuit" icon_state = "void" inhand_icon_state = "void_suit" desc = "An old, NASA CentCom branch designed, dark red space suit." allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/multitool) /obj/item/clothing/head/helmet/space/nasavoid/old - name = "Engineering Void Helmet" + name = "\improper engineering void helmet" desc = "A CentCom engineering dark red space suit helmet. While old and dusty, it still gets the job done." icon_state = "void" visor_dirt = "void_dirt" /obj/item/clothing/suit/space/nasavoid/old - name = "Engineering Voidsuit" + name = "\improper engineering voidsuit" icon_state = "void" inhand_icon_state = "void_suit" desc = "A CentCom engineering dark red space suit. Age has degraded the suit making it difficult to move around in." @@ -28,20 +28,21 @@ //EVA suit /obj/item/clothing/suit/space/eva - name = "EVA suit" + name = "\improper EVA suit" icon_state = "space" inhand_icon_state = "s_suit" desc = "A lightweight space suit with the basic ability to protect the wearer from the vacuum of space during emergencies." armor_type = /datum/armor/space_eva /obj/item/clothing/head/helmet/space/eva - name = "EVA helmet" + name = "\improper EVA helmet" icon_state = "space" inhand_icon_state = "space_helmet" desc = "A lightweight space helmet with the basic ability to protect the wearer from the vacuum of space during emergencies." flash_protect = FLASH_PROTECTION_NONE armor_type = /datum/armor/space_eva visor_dirt = "space_dirt" + has_visor = TRUE /datum/armor/space_eva bio = 100 diff --git a/code/modules/clothing/spacesuits/specialops.dm b/code/modules/clothing/spacesuits/specialops.dm index d0f06f89a67..570db863b79 100644 --- a/code/modules/clothing/spacesuits/specialops.dm +++ b/code/modules/clothing/spacesuits/specialops.dm @@ -1,5 +1,5 @@ /obj/item/clothing/head/helmet/space/beret - name = "CentCom officer's beret" + name = "\improper CentCom officer's beret" desc = "An armored beret commonly used by special operations officers. Uses advanced force field technology to protect the head from space." icon = 'icons/map_icons/clothing/head/_head.dmi' icon_state = "/obj/item/clothing/head/helmet/space/beret" @@ -9,7 +9,8 @@ inhand_icon_state = null greyscale_colors = "#397F3F#FFCE5B" clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL | SNUG_FIT - flags_inv = 0 + flags_inv = /obj/item/clothing/head/beret::flags_inv + flags_cover = /obj/item/clothing/head/beret::flags_cover armor_type = /datum/armor/space_beret strip_delay = 13 SECONDS max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT @@ -30,7 +31,7 @@ wound = 15 /obj/item/clothing/suit/space/officer - name = "CentCom officer's coat" + name = "\improper CentCom officer's coat" desc = "An armored, space-proof coat used in special operations." icon_state = "centcom_coat" icon = 'icons/obj/clothing/suits/jacket.dmi' diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm index fb5bc428a5c..e145e7f3d79 100644 --- a/code/modules/clothing/spacesuits/syndi.dm +++ b/code/modules/clothing/spacesuits/syndi.dm @@ -186,7 +186,8 @@ GLOBAL_LIST_INIT(syndicate_space_suits_to_helmets,list( w_class = WEIGHT_CLASS_SMALL icon_state = "syndicate-contract-helm" inhand_icon_state = "contractor_helmet" - visor_dirt = null + visor_dirt = "void_dirt" + has_visor = TRUE /obj/item/clothing/suit/space/syndicate/contract name = "contractor space suit" diff --git a/code/modules/clothing/suits/reactive_armour.dm b/code/modules/clothing/suits/reactive_armour.dm index 2f524915820..a38ffbadce8 100644 --- a/code/modules/clothing/suits/reactive_armour.dm +++ b/code/modules/clothing/suits/reactive_armour.dm @@ -534,7 +534,7 @@ shock_turf_windup(owner.loc) /obj/item/clothing/suit/armor/reactive/weather/proc/shock_turf_windup(turf/target) - new /obj/effect/temp_visual/telegraphing/thunderbolt(target) + new /obj/effect/temp_visual/telegraphing/circle(target) addtimer(CALLBACK(src, PROC_REF(shock_turf), target), 1 SECONDS) /obj/item/clothing/suit/armor/reactive/weather/proc/shock_turf(turf/target) diff --git a/code/modules/clothing/under/jobs/command.dm b/code/modules/clothing/under/jobs/command.dm index b90e2007e6b..e0b753a4388 100644 --- a/code/modules/clothing/under/jobs/command.dm +++ b/code/modules/clothing/under/jobs/command.dm @@ -28,3 +28,8 @@ icon_state = "captain_parade" inhand_icon_state = null can_adjust = FALSE + +/obj/item/clothing/under/rank/captain/royal + name = "captain's royal uniform" + desc = "A captain's royal uniform. Fit for commanding your Officers in the midst of a nuclear incursion." + icon_state = "caproyal" diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm index 5d2f301484a..c195718dc3a 100644 --- a/code/modules/clothing/under/syndicate.dm +++ b/code/modules/clothing/under/syndicate.dm @@ -114,6 +114,15 @@ can_adjust = FALSE supports_variations_flags = NONE +/obj/item/clothing/under/syndicate/cybersun + name = "\improper Cybersun businesswear" + desc = "This black and orange businesswear appears to be made of some kind of protective lightweight material. \ + Perfect for hostile takeovers and budget meetings." + icon_state = "cybersun_suit" + inhand_icon_state = "bl_suit" + can_adjust = FALSE + supports_variations_flags = NONE + /obj/item/clothing/under/syndicate/floortilecamo name = "floortile camouflage fatigues" desc = "The newest floortile camouflage fatigues used for hallway warfare. \ diff --git a/code/modules/deathmatch/deathmatch_loadouts.dm b/code/modules/deathmatch/deathmatch_loadouts.dm index 7b282ca6160..06f0e6f7f6d 100644 --- a/code/modules/deathmatch/deathmatch_loadouts.dm +++ b/code/modules/deathmatch/deathmatch_loadouts.dm @@ -1127,3 +1127,107 @@ shoes = /obj/item/clothing/shoes/bronze l_pocket = /obj/item/reagent_containers/cup/beaker/synthflesh/named // they used to turn their dmg into tox with a spell. close enough r_pocket = /obj/item/reagent_containers/cup/beaker/synthflesh/named + +//syndicate spaceman + +/datum/outfit/deathmatch_loadout/syndicate_spaceman + name = "DM: Syndicate Spaceman" + display_name = "Syndicate Spaceman" + desc = "A syndicate operative suited up for some space reconnaissance." + + uniform = /obj/item/clothing/under/syndicate + belt = /obj/item/storage/belt/holster + r_pocket = /obj/item/tank/internals/emergency_oxygen/double + l_pocket = /obj/item/knife/combat/survival + internals_slot = ITEM_SLOT_RPOCKET + shoes = /obj/item/clothing/shoes/combat + gloves = /obj/item/clothing/gloves/combat + back = /obj/item/tank/jetpack/harness + id = /obj/item/card/id/advanced/black/syndicate_command/crew_id + +/datum/outfit/deathmatch_loadout/syndicate_spaceman/pre_equip(mob/living/carbon/human/user, visualsOnly = FALSE) + if(user.jumpsuit_style == PREF_SKIRT) + uniform = /obj/item/clothing/under/syndicate/skirt + // pick a random syndicate spess suit + suit = pick(GLOB.syndicate_space_suits_to_helmets) + head = GLOB.syndicate_space_suits_to_helmets[suit] + +/datum/outfit/deathmatch_loadout/syndicate_spaceman/post_equip(mob/living/carbon/human/syndicate_spaceman, visuals_only) + . = ..() + var/obj/item/card/id/id_card = syndicate_spaceman.get_item_by_slot(ITEM_SLOT_ID) + var/obj/item/storage/belt/belt = syndicate_spaceman.get_item_by_slot(ITEM_SLOT_BELT) + if(belt) + new /obj/item/gun/ballistic/automatic/pistol/m1911(belt) + if(id_card) + SSid_access.apply_trim_to_card(id_card, /datum/id_trim/syndicom/crew) + id_card.registered_name = syndicate_spaceman.real_name + id_card.update_label() + id_card.update_appearance() + +//cargo spaceman + +/datum/outfit/deathmatch_loadout/cargo_spaceman + name = "DM: Spaceman" + display_name = "Spaceman" + desc = "A spaceman from spacestation 13 equipped for space." + + uniform = /obj/item/clothing/under/rank/cargo/tech + belt = /obj/item/storage/belt/utility/full + suit = /obj/item/clothing/suit/space + head = /obj/item/clothing/head/helmet/space + internals_slot = ITEM_SLOT_SUITSTORE + r_pocket = /obj/item/ammo_casing/strilka310 + suit_store = /obj/item/tank/internals/oxygen/yellow + shoes = /obj/item/clothing/shoes/sneakers + gloves = /obj/item/clothing/gloves/fingerless + back = /obj/item/gun/ballistic/rifle/boltaction + id = /obj/item/card/id/advanced + +/datum/outfit/deathmatch_loadout/cargo_spaceman/pre_equip(mob/living/carbon/human/cargo_spaceman, visualsOnly = FALSE) + if(cargo_spaceman.jumpsuit_style == PREF_SKIRT) + uniform = /obj/item/clothing/under/rank/cargo/tech/skirt + +/datum/outfit/deathmatch_loadout/cargo_spaceman/post_equip(mob/living/carbon/human/cargo_spaceman, visuals_only) + . = ..() + var/obj/item/card/id/id_card = cargo_spaceman.get_item_by_slot(ITEM_SLOT_ID) + if(id_card) + SSid_access.apply_trim_to_card(id_card, /datum/id_trim/job/cargo_technician) + id_card.registered_name = cargo_spaceman.real_name + id_card.update_label() + id_card.update_appearance() + +//spacetider + +/datum/outfit/deathmatch_loadout/spacetider + name = "DM: Assistant (Spaceworthy)" + display_name = "Assistant (Spaceworthy)" + desc = "A spacetiding assistant." + + uniform = /obj/item/clothing/under/color/grey + mask = /obj/item/clothing/mask/breath + belt = /obj/item/gun/energy/disabler/smoothbore + suit = /obj/item/clothing/suit/utility/fire/firefighter + head = /obj/item/clothing/head/utility/hardhat/red + r_pocket = /obj/item/reagent_containers/cup/glass/coffee + l_pocket = /obj/item/knife + internals_slot = ITEM_SLOT_SUITSTORE + suit_store = /obj/item/tank/internals/oxygen/red + shoes = /obj/item/clothing/shoes/sneakers + gloves = /obj/item/clothing/gloves/color/grey/protects_cold + back = /obj/item/gun/energy/laser/musket + id = /obj/item/card/id/advanced + +/datum/outfit/deathmatch_loadout/spacetider/pre_equip(mob/living/carbon/human/spacetider, visualsOnly = FALSE) + if(spacetider.jumpsuit_style == PREF_SKIRT) + uniform = /obj/item/clothing/under/color/jumpskirt/grey + +/datum/outfit/deathmatch_loadout/spacetider/post_equip(mob/living/carbon/human/spacetider, visuals_only) + . = ..() + spacetider.reagents.add_reagent(/datum/reagent/consumable/coffee, 30) //pre prime the coffee + var/obj/item/card/id/id_card = spacetider.get_item_by_slot(ITEM_SLOT_ID) + if(!id_card) + return + SSid_access.apply_trim_to_card(id_card, /datum/id_trim/job/assistant) + id_card.registered_name = spacetider.real_name + id_card.update_label() + id_card.update_appearance() diff --git a/code/modules/deathmatch/deathmatch_maps.dm b/code/modules/deathmatch/deathmatch_maps.dm index f2822cf331a..ff0372c6c63 100644 --- a/code/modules/deathmatch/deathmatch_maps.dm +++ b/code/modules/deathmatch/deathmatch_maps.dm @@ -246,3 +246,12 @@ /datum/turf_reservation/indestructible_plating turf_type = /turf/open/indestructible/plating //a little hacky but i guess it has to be done + +/datum/lazy_template/deathmatch/deep_space + name = "Deep Space" + desc = "A deep-space cargo shipping station has fallen under attack by a Syndicate boarding party." + max_players = 8 + automatic_gameend_time = 15 MINUTES //its a pretty big map + allowed_loadouts = list(/datum/outfit/deathmatch_loadout/cargo_spaceman, /datum/outfit/deathmatch_loadout/syndicate_spaceman, /datum/outfit/deathmatch_loadout/spacetider) + map_name = "deep_space" + key = "deep_space" diff --git a/code/modules/detectivework/scanner.dm b/code/modules/detectivework/scanner.dm index a7cebef7bf2..bb1285c11a5 100644 --- a/code/modules/detectivework/scanner.dm +++ b/code/modules/detectivework/scanner.dm @@ -117,7 +117,7 @@ // Start gathering log_entry.scan_target = scanned_atom.name - log_entry.scan_time = station_time_timestamp() + log_entry.scan_time = round_timestamp() var/list/atom_fibers = GET_ATOM_FIBRES(scanned_atom) if(length(atom_fibers)) diff --git a/code/modules/economy/account.dm b/code/modules/economy/account.dm index 80a97caa1d6..6b34477b4e3 100644 --- a/code/modules/economy/account.dm +++ b/code/modules/economy/account.dm @@ -25,8 +25,8 @@ var/account_id ///Amount of money that's been crabbed, if you lose enough from one series of CRAB-17's, you get a negative moodlet. var/money_crabbed - ///Is there a CRAB 17 on the station draining funds? Prevents manual fund transfer. pink levels are rising - var/being_dumped = FALSE + ///Lazylist of CRAB 17s on the station draining funds. Prevents manual fund transfer. pink levels are rising + var/list/being_dumped ///Reference to the current civilian bounty that the account is working on. var/datum/bounty/civilian_bounty ///If player is currently picking a civilian bounty to do, these options are held here to prevent soft-resetting through the UI. @@ -117,15 +117,15 @@ /** * Sets the bank_account to behave as though a CRAB-17 event is happening. */ -/datum/bank_account/proc/dumpeet() - being_dumped = TRUE +/datum/bank_account/proc/dumpeet(obj/structure/checkoutmachine/dump_machine) + LAZYADD(being_dumped, dump_machine) money_crabbed = 0 /** * Stops the dumping of the bank account. */ -/datum/bank_account/proc/stop_dump() - being_dumped = FALSE +/datum/bank_account/proc/stop_dump(obj/structure/checkoutmachine/dump_machine) + LAZYREMOVE(being_dumped, dump_machine) if(money_crabbed < NO_MY_MONEY) return for(var/obj/card as anything in bank_cards) diff --git a/code/modules/emote_panel/emote_panel.dm b/code/modules/emote_panel/emote_panel.dm index d064161c232..c39631fbe3c 100644 --- a/code/modules/emote_panel/emote_panel.dm +++ b/code/modules/emote_panel/emote_panel.dm @@ -53,12 +53,3 @@ /datum/emote_panel/ui_state(mob/user) return GLOB.always_state - -/mob/living/verb/emote_panel() - set name = "Emote Panel" - set category = "IC" - - var/static/datum/emote_panel/emote_panel - if(isnull(emote_panel)) - emote_panel = new - emote_panel.ui_interact(src) diff --git a/code/modules/error_handler/error_handler.dm b/code/modules/error_handler/error_handler.dm index 7620c7e2cb0..127bc413f09 100644 --- a/code/modules/error_handler/error_handler.dm +++ b/code/modules/error_handler/error_handler.dm @@ -110,7 +110,7 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0) var/skipcount = abs(error_cooldown[erroruid]) - 1 error_cooldown[erroruid] = 0 if(skipcount > 0) - SEND_TEXT(world.log, "\[[time_stamp()]] Skipped [skipcount] runtimes in [E.file],[E.line].") + SEND_TEXT(world.log, "\[[server_timestamp()]] Skipped [skipcount] runtimes in [E.file],[E.line].") GLOB.error_cache.log_error(E, skip_count = skipcount) error_last_seen[erroruid] = world.time @@ -158,7 +158,7 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0) if(GLOB.error_cache) GLOB.error_cache.log_error(E, desclines) - var/main_line = "\[[time_stamp()]] Runtime in [E.file],[E.line]: [E]" + var/main_line = "\[[server_timestamp()]] Runtime in [E.file],[E.line]: [E]" SEND_TEXT(world.log, main_line) for(var/line in desclines) SEND_TEXT(world.log, line) diff --git a/code/modules/error_handler/error_viewer.dm b/code/modules/error_handler/error_viewer.dm index c1c337aaf79..b87bc51e0b0 100644 --- a/code/modules/error_handler/error_viewer.dm +++ b/code/modules/error_handler/error_viewer.dm @@ -131,10 +131,10 @@ GLOBAL_DATUM(error_cache, /datum/error_viewer/error_cache) /datum/error_viewer/error_source/New(exception/e) if (!istype(e)) - name = "\[[time_stamp()]] Uncaught exceptions" + name = "\[[server_timestamp()]] Uncaught exceptions" return - name = "\[[time_stamp()]] Runtime in [e.file], line [e.line]: [html_encode(e.name)]" + name = "\[[server_timestamp()]] Runtime in [e.file], line [e.line]: [html_encode(e.name)]" /datum/error_viewer/error_source/show_to(user, datum/error_viewer/back_to, linear) if (!istype(back_to)) @@ -156,15 +156,15 @@ GLOBAL_DATUM(error_cache, /datum/error_viewer/error_cache) /datum/error_viewer/error_entry/New(exception/e, list/desclines, skip_count) if (!istype(e)) - name = "\[[time_stamp()]] Uncaught exception: [html_encode(e.name)]" + name = "\[[server_timestamp()]] Uncaught exception: [html_encode(e.name)]" return if(skip_count) - name = "\[[time_stamp()]] Skipped [skip_count] runtimes in [e.file],[e.line]." + name = "\[[server_timestamp()]] Skipped [skip_count] runtimes in [e.file],[e.line]." is_skip_count = TRUE return - name = "\[[time_stamp()]] Runtime in [e.file], line [e.line]: [html_encode(e.name)]" + name = "\[[server_timestamp()]] Runtime in [e.file], line [e.line]: [html_encode(e.name)]" exc = e if (istype(desclines)) for (var/line in desclines) diff --git a/code/modules/escape_menu/admin_page.dm b/code/modules/escape_menu/admin_page.dm new file mode 100644 index 00000000000..3eeacf70e93 --- /dev/null +++ b/code/modules/escape_menu/admin_page.dm @@ -0,0 +1,83 @@ +/datum/escape_menu/proc/show_admin_page() + page_holder.give_screen_object( + new /atom/movable/screen/escape_menu/lobby_button/small( + null, + /* hud_owner = */ null, + "Back", + /* tooltip_text = */ null, + /* button_screen_loc = */ "TOP:-30,LEFT:30", + CALLBACK(src, PROC_REF(open_home_page)), + /* button_overlay = */ "back", + ) + ) + + page_holder.give_screen_object( + new /atom/movable/screen/escape_menu/text/clickable/admin_help( + null, + /* hud_owner = */ null, + /* escape_menu = */ src, + /* button_text = */ "Create Admin Ticket", + /* offset = */ list(-136, 28), + /* font_size = */ 24, + /* on_click_callback = */ CALLBACK(src, PROC_REF(create_ticket)), + ) + ) + + page_holder.give_screen_object( + new /atom/movable/screen/escape_menu/text/clickable/admin_ticket_notification( + null, + /* hud_owner = */ null, + /* escape_menu = */ src, + /* button_text = */ "View Latest Ticket", + /* offset = */ list(-171, 28), + /* font_size = */ 24, + /* on_click_callback = */ CALLBACK(src, PROC_REF(view_latest_ticket)), + ) + ) + page_holder.give_screen_object( + new /atom/movable/screen/escape_menu/text/clickable( + null, + /* hud_owner = */ null, + /* escape_menu = */ src, + /* button_text = */ "Pray", + /* offset = */ list(-206, 30), + /* font_size = */ 24, + /* on_click_callback = */ CALLBACK(src, PROC_REF(pray)), + ) + ) + + if(CONFIG_GET(flag/see_own_notes)) + page_holder.give_screen_object( + new /atom/movable/screen/escape_menu/text/clickable( + null, + /* hud_owner = */ null, + /* escape_menu = */ src, + /* button_text = */ "See Notes", + /* offset = */ list(-241, 30), + /* font_size = */ 24, + /* on_click_callback = */ CALLBACK(src, PROC_REF(see_notes)), + ) + ) + +/datum/escape_menu/proc/create_ticket() + if(!(/client/verb/adminhelp in client?.verbs)) + return + client?.adminhelp() + qdel(src) + +///Opens your latest admin ticket. +/datum/escape_menu/proc/view_latest_ticket() + client?.view_latest_ticket() + +///Manually calls the user's pray() hotkey (which is where prefs is taken into account). +/datum/escape_menu/proc/pray() + var/datum/keybinding/client/communication/pray/pray_verb = GLOB.keybindings_by_name[/datum/keybinding/client/communication/pray::name] + pray_verb.down(client) + qdel(src) + +/datum/escape_menu/proc/see_notes() + if(!CONFIG_GET(flag/see_own_notes)) + to_chat(client.mob, span_notice("Seeing notes has been disabled on this server.")) + return + browse_messages(null, client.ckey, null, TRUE) + qdel(src) diff --git a/code/modules/escape_menu/details.dm b/code/modules/escape_menu/details.dm index 00267ecba5d..69a6cc8f4d8 100644 --- a/code/modules/escape_menu/details.dm +++ b/code/modules/escape_menu/details.dm @@ -1,42 +1,16 @@ -// This doesn't instantiate right away, since we rely on other GLOBs -GLOBAL_DATUM(escape_menu_details, /atom/movable/screen/escape_menu/details) - -/// Provides a singleton for the escape menu details screen. -/proc/give_escape_menu_details() - if (isnull(GLOB.escape_menu_details)) - GLOB.escape_menu_details = new - - return GLOB.escape_menu_details - /atom/movable/screen/escape_menu/details - screen_loc = "EAST:-180,NORTH:-34" + screen_loc = "EAST:-175,NORTH:-40" maptext_height = 100 maptext_width = 200 -/atom/movable/screen/escape_menu/details/Initialize(mapload, datum/hud/hud_owner) - . = ..() - - update_text() - START_PROCESSING(SSescape_menu, src) - -/atom/movable/screen/escape_menu/details/Destroy() - if (GLOB.escape_menu_details == src) - stack_trace("Something tried to delete the escape menu details screen") - return QDEL_HINT_LETMELIVE - - STOP_PROCESSING(SSescape_menu, src) - return ..() - -/atom/movable/screen/escape_menu/details/process(seconds_per_tick) - update_text() - -/atom/movable/screen/escape_menu/details/proc/update_text() +/atom/movable/screen/escape_menu/details/proc/update_text(client/client_owner) var/new_maptext = {" Round ID: [GLOB.round_id || "Unset"]
- Round Time: [ROUND_TIME()]
+ Server Time (NST): [server_timestamp(format = "hh:mm:ss", ic_time = TRUE, twelve_hour_clock = client_owner.prefs.read_preference(/datum/preference/toggle/twelve_hour))]
+ Shift Time (PT): [(SSticker.round_start_time == 0) ? "Pre-Game" : round_timestamp()]
Map: [SSmapping.current_map.return_map_name(webmap_included = TRUE) || "Loading..."]
- Time Dilation: [round(SStime_track.time_dilation_current,1)]%
+ Time Dilation: [round(SStime_track.time_dilation_current, 1)]%
"} diff --git a/code/modules/escape_menu/escape_menu.dm b/code/modules/escape_menu/escape_menu.dm index 0042a6f7332..8e86d78d647 100644 --- a/code/modules/escape_menu/escape_menu.dm +++ b/code/modules/escape_menu/escape_menu.dm @@ -16,6 +16,7 @@ GLOBAL_LIST_EMPTY(escape_menus) new /datum/escape_menu(src) #define PAGE_HOME "PAGE_HOME" +#define PAGE_ADMIN "ADMIN_PAGE" #define PAGE_LEAVE_BODY "PAGE_LEAVE_BODY" #define PAGE_QUIT_GAME "PAGE_QUIT_GAME" @@ -24,6 +25,8 @@ GLOBAL_LIST_EMPTY(escape_menus) var/client/client /// A weakref to the hud this escape menu currently applies to var/datum/weakref/our_hud_ref + /// The details at the top right that persists through all screens, showing round info. + var/atom/movable/screen/escape_menu/details/detail_screen VAR_PRIVATE ckey @@ -49,6 +52,8 @@ GLOBAL_LIST_EMPTY(escape_menus) base_holder = new(client) if(isnull(dim_screen)) dim_screen = new() + detail_screen = new() + detail_screen.update_text(client) populate_base_ui() page_holder = new(client) @@ -64,7 +69,10 @@ GLOBAL_LIST_EMPTY(escape_menus) if (!isnull(ckey)) GLOB.escape_menus[ckey] = src + START_PROCESSING(SSescape_menu, src) + /datum/escape_menu/Destroy(force) + STOP_PROCESSING(SSescape_menu, src) QDEL_NULL(base_holder) QDEL_NULL(page_holder) resource_panels = null // list contents were already qdeled in QDEL_NULL(page_holder), so we can safely null this @@ -82,6 +90,9 @@ GLOBAL_LIST_EMPTY(escape_menus) return ..() +/datum/escape_menu/process(seconds_per_tick) + detail_screen.update_text(client) + /datum/escape_menu/proc/on_client_qdel() SIGNAL_HANDLER PRIVATE_PROC(TRUE) @@ -116,6 +127,8 @@ GLOBAL_LIST_EMPTY(escape_menus) switch (menu_page) if (PAGE_HOME) show_home_page() + if (PAGE_ADMIN) + show_admin_page() if (PAGE_LEAVE_BODY) show_leave_body_page() if(PAGE_QUIT_GAME) @@ -127,7 +140,7 @@ GLOBAL_LIST_EMPTY(escape_menus) PRIVATE_PROC(TRUE) base_holder.give_protected_screen_object(dim_screen) - base_holder.give_protected_screen_object(give_escape_menu_details()) + base_holder.give_screen_object(detail_screen) /datum/escape_menu/proc/open_home_page() PRIVATE_PROC(TRUE) @@ -135,6 +148,12 @@ GLOBAL_LIST_EMPTY(escape_menus) menu_page = PAGE_HOME show_page() +/datum/escape_menu/proc/open_admin_page() + PRIVATE_PROC(TRUE) + + menu_page = PAGE_ADMIN + show_page() + /datum/escape_menu/proc/open_leave_body() PRIVATE_PROC(TRUE) @@ -152,5 +171,6 @@ GLOBAL_LIST_EMPTY(escape_menus) clear_with_screen = FALSE #undef PAGE_HOME +#undef PAGE_ADMIN #undef PAGE_LEAVE_BODY #undef PAGE_QUIT_GAME diff --git a/code/modules/escape_menu/home_page.dm b/code/modules/escape_menu/home_page.dm index 641be0d3a34..aead9cc8d51 100644 --- a/code/modules/escape_menu/home_page.dm +++ b/code/modules/escape_menu/home_page.dm @@ -37,12 +37,14 @@ ) page_holder.give_screen_object( - new /atom/movable/screen/escape_menu/text/clickable/admin_help( + new /atom/movable/screen/escape_menu/text/clickable/admin_ticket_notification( null, /* hud_owner = */ null, /* escape_menu = */ src, /* button_text = */ "Admin Help", /* offset = */ list(-241, 30), + /* font_size = */ 24, + /* on_click_callback = */ CALLBACK(src, PROC_REF(open_admin_page)), ) ) diff --git a/code/modules/escape_menu/screen_objects/admin_text.dm b/code/modules/escape_menu/screen_objects/admin_text.dm index 2a7260785b3..abedf2cba3f 100644 --- a/code/modules/escape_menu/screen_objects/admin_text.dm +++ b/code/modules/escape_menu/screen_objects/admin_text.dm @@ -1,12 +1,12 @@ -/atom/movable/screen/escape_menu/text/clickable/admin_help +///Text that gets highlighted when you have an admin ticket notification. +/atom/movable/screen/escape_menu/text/clickable/admin_ticket_notification VAR_PRIVATE current_blink = FALSE is_blinking = FALSE last_blink_time = 0 - blink_interval = 0.4 SECONDS -/atom/movable/screen/escape_menu/text/clickable/admin_help/Initialize( +/atom/movable/screen/escape_menu/text/clickable/admin_ticket_notification/Initialize( mapload, datum/hud/hud_owner, datum/escape_menu/escape_menu, @@ -18,7 +18,6 @@ . = ..() RegisterSignal(escape_menu.client, COMSIG_ADMIN_HELP_RECEIVED, PROC_REF(on_admin_help_received)) - RegisterSignals(escape_menu.client, list(COMSIG_CLIENT_VERB_ADDED, COMSIG_CLIENT_VERB_REMOVED), PROC_REF(on_client_verb_changed)) var/datum/admin_help/current_ticket = escape_menu.client?.current_ticket if (!isnull(current_ticket)) @@ -26,48 +25,12 @@ if (!current_ticket?.player_replied) begin_processing() -/atom/movable/screen/escape_menu/text/clickable/admin_help/Click(location, control, params) - if (!enabled()) - return - - QDEL_IN(escape_menu, 0) - - var/client/client = escape_menu.client - - if (has_open_adminhelp()) - client?.view_latest_ticket() - else - client?.adminhelp() - -/atom/movable/screen/escape_menu/text/clickable/admin_help/proc/has_open_adminhelp() - var/client/client = escape_menu.client - - var/datum/admin_help/current_ticket = client?.current_ticket - - // This is null with a closed ticket. - // This is okay since the View Latest Ticket panel already tells you if your ticket is closed, intentionally. - if (isnull(current_ticket)) - return FALSE - - // If we sent a ticket, but nobody has responded, send another one instead. - // Not worth opening a menu when there's nothing to read, you're only going to want to send. - if (length(current_ticket.admins_involved - client?.ckey) == 0) - return FALSE - - return TRUE - -/atom/movable/screen/escape_menu/text/clickable/admin_help/proc/on_admin_help_received() +/atom/movable/screen/escape_menu/text/clickable/admin_ticket_notification/proc/on_admin_help_received() SIGNAL_HANDLER begin_processing() -/atom/movable/screen/escape_menu/text/clickable/admin_help/proc/on_client_verb_changed(client/source, list/verbs_changed) - SIGNAL_HANDLER - - if (/client/verb/adminhelp in verbs_changed) - update_text() - -/atom/movable/screen/escape_menu/text/clickable/admin_help/proc/begin_processing() +/atom/movable/screen/escape_menu/text/clickable/admin_ticket_notification/proc/begin_processing() if (is_blinking) return @@ -76,7 +39,7 @@ START_PROCESSING(SSescape_menu, src) update_text() -/atom/movable/screen/escape_menu/text/clickable/admin_help/proc/end_processing() +/atom/movable/screen/escape_menu/text/clickable/admin_ticket_notification/proc/end_processing() if (!is_blinking) return @@ -85,26 +48,17 @@ STOP_PROCESSING(SSescape_menu, src) update_text() -/atom/movable/screen/escape_menu/text/clickable/admin_help/proc/connect_ticket(datum/admin_help/admin_help) +/atom/movable/screen/escape_menu/text/clickable/admin_ticket_notification/proc/connect_ticket(datum/admin_help/admin_help) ASSERT(istype(admin_help)) RegisterSignal(admin_help, COMSIG_ADMIN_HELP_REPLIED, PROC_REF(on_admin_help_replied)) -/atom/movable/screen/escape_menu/text/clickable/admin_help/proc/on_admin_help_replied() +/atom/movable/screen/escape_menu/text/clickable/admin_ticket_notification/proc/on_admin_help_replied() SIGNAL_HANDLER end_processing() -/atom/movable/screen/escape_menu/text/clickable/admin_help/enabled() - if (!..()) - return FALSE - - if (!has_open_adminhelp()) - return /client/verb/adminhelp in escape_menu.client?.verbs - - return TRUE - -/atom/movable/screen/escape_menu/text/clickable/admin_help/process(seconds_per_tick) +/atom/movable/screen/escape_menu/text/clickable/admin_ticket_notification/process(seconds_per_tick) if (world.time - last_blink_time < blink_interval) return @@ -112,19 +66,42 @@ last_blink_time = world.time update_text() -/atom/movable/screen/escape_menu/text/clickable/admin_help/text_color() +/atom/movable/screen/escape_menu/text/clickable/admin_ticket_notification/text_color() if (!enabled()) return ..() return current_blink ? "red" : ..() -/atom/movable/screen/escape_menu/text/clickable/admin_help/MouseEntered(location, control, params) +/atom/movable/screen/escape_menu/text/clickable/admin_ticket_notification/MouseEntered(location, control, params) . = ..() if (is_blinking) openToolTip(usr, src, params, content = "An admin is trying to talk to you!") -/atom/movable/screen/escape_menu/text/clickable/admin_help/MouseExited(location, control, params) +/atom/movable/screen/escape_menu/text/clickable/admin_ticket_notification/MouseExited(location, control, params) . = ..() closeToolTip(usr) + +///The button used for adminhelping, this is used to grey it out when you're on cooldown. +/atom/movable/screen/escape_menu/text/clickable/admin_help/Initialize( + mapload, + datum/hud/hud_owner, + datum/escape_menu/escape_menu, + button_text, + list/offset, + font_size = 24, + on_click_callback, +) + . = ..() + + RegisterSignals(escape_menu.client, list(COMSIG_CLIENT_VERB_ADDED, COMSIG_CLIENT_VERB_REMOVED), PROC_REF(on_client_verb_changed)) + +/atom/movable/screen/escape_menu/text/clickable/admin_help/proc/on_client_verb_changed(client/source, list/verbs_changed) + SIGNAL_HANDLER + + if (/client/verb/adminhelp in verbs_changed) + update_text() + +/atom/movable/screen/escape_menu/text/clickable/admin_help/enabled() + return (/client/verb/adminhelp in escape_menu.client?.verbs) diff --git a/code/modules/escape_menu/screen_objects/text.dm b/code/modules/escape_menu/screen_objects/text.dm index fe08bd021dc..529bd034c86 100644 --- a/code/modules/escape_menu/screen_objects/text.dm +++ b/code/modules/escape_menu/screen_objects/text.dm @@ -23,7 +23,7 @@ //this decides how far out you can 'click' on this, so it's important to keep it short. //yes even here, maptext can still embed links without using clickable subtype. - src.maptext_width = round((max(length(button_text), 20) * (font_size / 2.25)), 1) + src.maptext_width = max(round(length(button_text) * font_size * 0.75), font_size * 4) src.maptext_height = (maptext_height * (font_size / 5)) src.maptext_height *= length(splittext(button_text, "\n")) diff --git a/code/modules/events/ghost_role/sentience.dm b/code/modules/events/ghost_role/sentience.dm index 4fc837169d2..5d4668f640c 100644 --- a/code/modules/events/ghost_role/sentience.dm +++ b/code/modules/events/ghost_role/sentience.dm @@ -17,7 +17,7 @@ GLOBAL_LIST_INIT(high_priority_sentience, typecacheof(list( /mob/living/basic/sloth, /mob/living/basic/snake, /mob/living/basic/spider/giant/sgt_araneus, - /mob/living/simple_animal/bot/secbot/beepsky, + /mob/living/basic/bot/secbot/beepsky, /mob/living/basic/bear/snow/misha, /mob/living/basic/mining/lobstrosity/juvenile, ))) diff --git a/code/modules/events/grid_check.dm b/code/modules/events/grid_check.dm index 8fd3b86f14b..d68cdb72f14 100644 --- a/code/modules/events/grid_check.dm +++ b/code/modules/events/grid_check.dm @@ -27,4 +27,4 @@ COOLDOWN_START(controller, announcement_spam_protection, 30 SECONDS) /datum/round_event/grid_check/start() - power_fail(30, 120) + power_fail(60, 240) // 1 to 4 minutes diff --git a/code/modules/events/heart_attack.dm b/code/modules/events/heart_attack.dm index 6b826267726..4d82f558175 100644 --- a/code/modules/events/heart_attack.dm +++ b/code/modules/events/heart_attack.dm @@ -68,7 +68,10 @@ */ /datum/round_event/heart_attack/proc/attack_heart() var/mob/living/carbon/human/winner = pick_weight(victims) - if(winner.has_status_effect(/datum/status_effect/exercised)) //Stuff that should "block" a heart attack rather than just deny eligibility for one goes here. + // Our fitness level can potentially block a heart attack outright. + var/fitness_protection_probability = winner.mind?.get_skill_modifier(/datum/skill/athletics, SKILL_RANDS_MODIFIER) + + if(prob(fitness_protection_probability * 2)) //Stuff that should "block" a heart attack rather than just deny eligibility for one goes here. winner.visible_message(span_warning("[winner] grunts and clutches their chest for a moment, catching [winner.p_their()] breath."), span_medal("Your chest lurches in pain for a brief moment, which quickly fades. \ You feel like you've just avoided a serious health disaster."), span_hear("You hear someone's breathing sharpen for a moment, followed by a sigh of relief."), 4) winner.playsound_local(get_turf(winner), 'sound/effects/health/slowbeat.ogg', 40, 0, channel = CHANNEL_HEARTBEAT, use_reverb = FALSE) diff --git a/code/modules/events/immovable_rod/immovable_rod.dm b/code/modules/events/immovable_rod/immovable_rod.dm index e2404bbc090..9306fa7939a 100644 --- a/code/modules/events/immovable_rod/immovable_rod.dm +++ b/code/modules/events/immovable_rod/immovable_rod.dm @@ -245,6 +245,7 @@ span_boldwarning("[strongman] suplexes [src] into the ground!"), span_warning("As you suplex [src] into the ground, your body ripples with power!") ) + sound_to_playing_players('sound/items/handling/lead_pipe/lead_pipe_drop.ogg') new /obj/structure/festivus/anchored(drop_location()) new /obj/effect/anomaly/flux(drop_location()) diff --git a/code/modules/events/nightshift.dm b/code/modules/events/nightshift.dm new file mode 100644 index 00000000000..785ad8e04ac --- /dev/null +++ b/code/modules/events/nightshift.dm @@ -0,0 +1,78 @@ +/datum/round_event_control/nightshift + name = "Night Shift" + typepath = /datum/round_event/nightshift + weight = 2 + max_occurrences = 1 + earliest_start = 30 SECONDS + category = EVENT_CATEGORY_FRIENDLY + description = "Sets the station's lights to Night Shift mode for the next 20 minutes." + +/datum/round_event_control/nightshift/New() + . = ..() + if(!CONFIG_GET(flag/enable_night_shifts)) + max_occurrences = 0 + +/datum/round_event/nightshift + announce_when = 1 + start_when = 1 + end_when = 700 //~22 Minutes + fakeable = FALSE + + ///Whether the nightshift is on or not, synced to the alert level (which decides whether we're active) + ///TRUE means they are disabled by red alert. + var/nightshift_disabled = FALSE + ///APCs to update through ticks to account for lag. + var/list/currentrun + +/datum/round_event/nightshift/announce(fake) + update_nightshift(active = TRUE, announce = TRUE) + +/datum/round_event/nightshift/tick() + var/emergency = (SSsecurity_level.get_current_level_as_number() >= SEC_LEVEL_RED) + if(nightshift_disabled != emergency) + nightshift_disabled = emergency + if(emergency) + update_nightshift(active = FALSE, resume = TRUE) + else + update_nightshift(active = TRUE, resume = TRUE) + + update_machines() + +/datum/round_event/nightshift/end() + update_nightshift(active = FALSE, announce = TRUE) + +///Called several times, to start & stop nightlights including during red alert/de-red alerting. +/datum/round_event/nightshift/proc/update_nightshift(active, resume = FALSE, announce = FALSE) + currentrun = SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/power/apc) + + if(announce) + if(active) + send_announcement("Good evening, crew. To reduce power consumption and stimulate the circadian rhythms of some species, all of the lights aboard the station have been dimmed for the night.") + else + send_announcement("Good morning, crew. As it is now day time, all of the lights aboard the station have been restored to their former brightness.") + + if(resume) + if(active) + send_announcement("Restoring night lighting configuration to normal operation.") + else + send_announcement("Disabling night lighting: Station is in a state of emergency.") + + update_machines() + +///Called on process that will slowly update all APCs to be nightlight +/datum/round_event/nightshift/proc/update_machines() + for(var/obj/machinery/power/apc/APC as anything in currentrun) + currentrun -= APC + if (APC.area && (APC.area.type in GLOB.the_station_areas)) + APC.set_nightshift(!nightshift_disabled) + if(TICK_CHECK) + return + +///Custom messages sent throughout the event that we'll do here, instead of using the `announce` proc that's only at the start. +/datum/round_event/nightshift/proc/send_announcement(message) + priority_announce( + text = message, + sound = 'sound/announcer/notice/notice2.ogg', + sender_override = "Automated Lighting System Announcement", + color_override = "grey", + ) diff --git a/code/modules/events/radiation_storm.dm b/code/modules/events/radiation_storm.dm index 5b2b6b71ea1..fdc37f29715 100644 --- a/code/modules/events/radiation_storm.dm +++ b/code/modules/events/radiation_storm.dm @@ -7,8 +7,13 @@ min_wizard_trigger_potency = 3 max_wizard_trigger_potency = 7 -/datum/round_event/radiation_storm +/datum/round_event_control/radiation_storm/New() + . = ..() + if(max_occurrences > 0 && weight > 0 && check_holidays(CHERNOBYL_ANNIVERSARY)) + weight *= 2 + max_occurrences += 2 +/datum/round_event/radiation_storm /datum/round_event/radiation_storm/setup() start_when = 3 diff --git a/code/modules/events/space_vines/vine_mutations.dm b/code/modules/events/space_vines/vine_mutations.dm index ab6a3a2d394..542e8f092c9 100644 --- a/code/modules/events/space_vines/vine_mutations.dm +++ b/code/modules/events/space_vines/vine_mutations.dm @@ -268,6 +268,7 @@ /datum/spacevine_mutation/transparency/on_birth(obj/structure/spacevine/holder) holder.light_state = PASS_LIGHT holder.alpha = 125 + holder.unblock_sunlight() /datum/spacevine_mutation/gas_eater abstract_type = /datum/spacevine_mutation/gas_eater @@ -287,7 +288,7 @@ if(!gas_mix.gases[gas_type]) return - gas_mix.gases[gas_type][MOLES] = max(gas_mix.gases[gas_type][MOLES] - GAS_MUTATION_REMOVAL_MULTIPLIER * holder.growth_stage, 0) + gas_mix.set_gas(gas_type, max(gas_mix.gases[gas_type][MOLES] - GAS_MUTATION_REMOVAL_MULTIPLIER * holder.growth_stage, 0)) gas_mix.garbage_collect() /datum/spacevine_mutation/gas_eater/oxy_eater diff --git a/code/modules/events/space_vines/vine_structure.dm b/code/modules/events/space_vines/vine_structure.dm index da56c5359b8..f44e0da923f 100644 --- a/code/modules/events/space_vines/vine_structure.dm +++ b/code/modules/events/space_vines/vine_structure.dm @@ -38,6 +38,7 @@ AddElement(/datum/element/connect_loc, loc_connections) AddElement(/datum/element/atmos_sensitive, mapload) AddComponent(/datum/component/storm_hating) + block_sunlight() /obj/structure/spacevine/examine(mob/user) . = ..() @@ -215,3 +216,9 @@ . = ..() if(isvineimmune(mover)) return TRUE + +/obj/structure/spacevine/proc/block_sunlight() + AddElement(/datum/element/give_turf_traits, string_list(list(TRAIT_TURF_SUN_BLOCKED))) + +/obj/structure/spacevine/proc/unblock_sunlight() + RemoveElement(/datum/element/give_turf_traits, string_list(list(TRAIT_TURF_SUN_BLOCKED))) diff --git a/code/modules/fishing/fish/_fish.dm b/code/modules/fishing/fish/_fish.dm index f62b5573b3b..1ee2e416631 100644 --- a/code/modules/fishing/fish/_fish.dm +++ b/code/modules/fishing/fish/_fish.dm @@ -271,7 +271,11 @@ GLOBAL_LIST_INIT(fish_compatible_fluid_types, list( user.set_combat_mode(TRUE) ADD_TRAIT(user, TRAIT_COMBAT_MODE_LOCK, REF(src)) slapperoni(user, iteration = 1) - return MANUAL_SUICIDE + REMOVE_TRAIT(user, TRAIT_COMBAT_MODE_LOCK, REF(src)) + if (user.stat == DEAD) + return MANUAL_SUICIDE + user.visible_message(span_suicide("[user] slaps [user.p_them()]self with [src], but fails to go through with it!")) + return SHAME /obj/item/fish/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK, damage_type = BRUTE) if(attack_type == OVERWHELMING_ATTACK) diff --git a/code/modules/fishing/fish/fish_traits.dm b/code/modules/fishing/fish/fish_traits.dm index 342bfc981fd..ae97235cfe5 100644 --- a/code/modules/fishing/fish/fish_traits.dm +++ b/code/modules/fishing/fish/fish_traits.dm @@ -340,8 +340,8 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits()) return var/datum/gas_mixture/stench = new - ADD_GAS(/datum/gas/miasma, stench.gases) - stench.gases[/datum/gas/miasma][MOLES] = MIASMA_CORPSE_MOLES * 2 * seconds_per_tick + + stench.set_gas(/datum/gas/miasma, MIASMA_CORPSE_MOLES * 2 * seconds_per_tick) stench.temperature = mob.bodytemperature our_turf.assume_air(stench) diff --git a/code/modules/fishing/fishing_rod.dm b/code/modules/fishing/fishing_rod.dm index 8f21acb8829..ce2abbc6b99 100644 --- a/code/modules/fishing/fishing_rod.dm +++ b/code/modules/fishing/fishing_rod.dm @@ -92,11 +92,12 @@ set_slot(new line(src), ROD_SLOT_LINE) update_appearance() - - //Bane effect that make it extra-effective against mobs with water adaptation (read: fish infusion) - AddElement(/datum/element/bane, target_type = /mob/living, damage_multiplier = 1.25) - RegisterSignal(src, COMSIG_OBJECT_PRE_BANING, PROC_REF(attempt_bane)) - RegisterSignal(src, COMSIG_OBJECT_ON_BANING, PROC_REF(bane_effects)) + AddComponent(/datum/component/bane, \ + damage_multiplier = 2.25, \ + should_bane_callback = CALLBACK(src, PROC_REF(should_bane_fish_infusions)), \ + on_bane_callback = CALLBACK(src, PROC_REF(on_bane_fish_infusions)), \ + label_text = "fishpeople", \ + ) /obj/item/fishing_rod/add_context(atom/source, list/context, obj/item/held_item, mob/user) if(src == held_item) @@ -260,18 +261,13 @@ material_chance += user.mind?.get_skill_level(/datum/skill/fishing) * 1.5 return material_chance -///Fishing rodss should only bane fish DNA-infused spessman -/obj/item/fishing_rod/proc/attempt_bane(datum/source, mob/living/fish) - SIGNAL_HANDLER - if(!force || !HAS_TRAIT(fish, TRAIT_WATER_ADAPTATION)) - return COMPONENT_CANCEL_BANING +/obj/item/fishing_rod/proc/should_bane_fish_infusions(mob/living/target) + return force > 0 && HAS_TRAIT(target, TRAIT_WATER_ADAPTATION) -///Fishing rods should hard-counter fish DNA-infused spessman -/obj/item/fishing_rod/proc/bane_effects(datum/source, mob/living/fish) - SIGNAL_HANDLER - fish.adjust_staggered_up_to(STAGGERED_SLOWDOWN_LENGTH, 4 SECONDS) - fish.adjust_confusion_up_to(1.5 SECONDS, 3 SECONDS) - fish.adjust_wet_stacks(-4) +/obj/item/fishing_rod/proc/on_bane_fish_infusions(mob/living/target, mob/living/attacker) + target.adjust_staggered_up_to(STAGGERED_SLOWDOWN_LENGTH, 4 SECONDS) + target.adjust_confusion_up_to(1.5 SECONDS, 3 SECONDS) + target.adjust_wet_stacks(-4) /obj/item/fishing_rod/interact(mob/user) if(currently_hooked) diff --git a/code/modules/fishing/sources/subtypes/surgery.dm b/code/modules/fishing/sources/subtypes/surgery.dm index 2192d2ed5c8..de1fc0092e8 100644 --- a/code/modules/fishing/sources/subtypes/surgery.dm +++ b/code/modules/fishing/sources/subtypes/surgery.dm @@ -10,6 +10,7 @@ fishing_difficulty = -10 //The range for waiting is also a bit narrower, so it cannot take as few as 3 seconds or as many as 25 to snatch an organ. wait_time_range = list(6 SECONDS, 12 SECONDS) + fish_source_flags = FISH_SOURCE_FLAG_EXPLOSIVE_NONE /datum/fish_source/surgery/spawn_reward(reward_path, atom/spawn_location, atom/fishing_spot, obj/item/fishing_rod/used_rod) if(reward_path != FISHING_RANDOM_ORGAN) diff --git a/code/modules/flufftext/dreaming.dm b/code/modules/flufftext/dreaming.dm index 9ebb8cd41ad..73520a1625c 100644 --- a/code/modules/flufftext/dreaming.dm +++ b/code/modules/flufftext/dreaming.dm @@ -21,20 +21,17 @@ /mob/living/carbon/proc/dream() set waitfor = FALSE - var/datum/dream/chosen_dream - var/can_heretic_dream = ((IS_HERETIC(src) || HAS_TRAIT(src, TRAIT_HERETICAL_DREAMS)) && !mob_mood.get_mood_event("mansus_dream_fatigue")) + var/list/dream_pool = list() - if (can_heretic_dream && GLOB.reality_smash_track.smashes.len) - /// If someone attempts to have a heretical dream and there is an avaliable influence, one is picked randomly for a dream - chosen_dream = new /datum/dream/heretic(pick(GLOB.reality_smash_track.smashes)) - else if (can_heretic_dream && !IS_HERETIC(src) && !GLOB.reality_smash_track.smashes.len) - /// If a non-heretic attempts to have a heretic dream, but there aren't any influences due to there not being any real heretics, they are instead given a fake dream based on a random location. - chosen_dream = new /datum/dream/heretic(get_safe_random_station_turf_equal_weight()) - else - chosen_dream = pick_weight(GLOB.dreams) + SEND_SIGNAL(src, COMSIG_PRE_DREAMING, dream_pool) + if(!length(dream_pool)) + dream_pool = GLOB.dreams + + var/datum/dream/chosen_dream = pick_weight(dream_pool) ADD_TRAIT(src, TRAIT_DREAMING, DREAMING_SOURCE) + SEND_SIGNAL(src, COMSIG_START_DREAMING, chosen_dream) dream_sequence(chosen_dream.GenerateDream(src), chosen_dream) /** @@ -52,6 +49,7 @@ if(stat != UNCONSCIOUS || HAS_TRAIT(src, TRAIT_CRITICAL_CONDITION)) REMOVE_TRAIT(src, TRAIT_DREAMING, DREAMING_SOURCE) current_dream.OnDreamEnd(src) + SEND_SIGNAL(src, COMSIG_END_DREAMING, current_dream) return var/next_message = dream_fragments[1] dream_fragments.Cut(1,2) @@ -70,6 +68,7 @@ else REMOVE_TRAIT(src, TRAIT_DREAMING, DREAMING_SOURCE) current_dream.OnDreamEnd(src) + SEND_SIGNAL(src, COMSIG_END_DREAMING, current_dream) //------------------------- // DREAM DATUMS @@ -111,12 +110,9 @@ GLOBAL_LIST_INIT(dreams, populate_dream_list()) weight = 1000 /datum/dream/random/GenerateDream(mob/living/carbon/dreamer) - var/list/custom_dream_nouns = list() + var/list/custom_dream_nouns = get_dream_nouns(dreamer) || list() var/fragment = "" - for(var/obj/item/bedsheet/sheet in dreamer.loc) - custom_dream_nouns += sheet.dream_messages - . = list() . += "you see" @@ -159,6 +155,12 @@ GLOBAL_LIST_INIT(dreams, populate_dream_list()) fragment = "\a [replacetext(fragment, "%A% ", "")]" . += fragment +/datum/dream/random/proc/get_dream_nouns(mob/living/carbon/dreamer) + var/list/custom_dream_nouns = list() + for(var/obj/item/bedsheet/sheet in dreamer.loc) + custom_dream_nouns += sheet.dream_messages + return custom_dream_nouns + /// Dream plays a random sound at you, chosen from all sounds in the folder /datum/dream/hear_something weight = 500 @@ -193,76 +195,4 @@ GLOBAL_LIST_INIT(dreams, populate_dream_list()) /datum/dream/hear_something/proc/StopSound(mob/living/carbon/dreamer) SEND_SOUND(dreamer, sound(channel=reserved_sound_channel)) -/// Heretics can see dreams about random machinery from the perspective of a random unused influence -/datum/dream/heretic - sleep_until_finished = TRUE - /// The location of the influence (or lack thereof in the case of a fake dream) we will be dreaming about - var/atom/dream_center - /// The distance to the objects visible from the influence during the dream - var/dream_view_range = 5 - var/list/what_you_can_see = list( - /obj/item, - /obj/structure, - /obj/machinery, - ) - var/static/list/what_you_cant_see = typecacheof(list( - // Underfloor stuff and default wallmounts - /obj/item/radio/intercom, - /obj/structure/cable, - /obj/structure/disposalpipe/segment, - /obj/machinery/atmospherics/pipe/smart/manifold4w, - /obj/machinery/atmospherics/components/unary/vent_scrubber, - /obj/machinery/atmospherics/components/unary/vent_pump, - /obj/machinery/duct, - /obj/machinery/navbeacon, - /obj/machinery/power/terminal, - /obj/machinery/power/apc, - /obj/machinery/light_switch, - /obj/machinery/light, - /obj/machinery/camera, - /obj/machinery/door/firedoor, - /obj/machinery/firealarm, - /obj/machinery/airalarm, - /obj/structure/window/fulltile, - /obj/structure/window/reinforced/fulltile, - )) - /// Cached list of allowed typecaches for each type in what_you_can_see - var/static/list/allowed_typecaches_by_root_type = null - -/datum/dream/heretic/New(atom/dream_center) - src.dream_center = dream_center - -/datum/dream/heretic/GenerateDream(mob/living/carbon/dreamer) - . = list() - . += "You wander through the forest of Mansus" - . += "There is a " + pick("pond", "well", "lake", "puddle", "stream", "spring", "brook", "marsh") - - dreamer.add_mood_event("mansus_dream_fatigue", /datum/mood_event/mansus_dream_fatigue) - - if(isnull(allowed_typecaches_by_root_type)) - allowed_typecaches_by_root_type = list() - for(var/type in what_you_can_see) - allowed_typecaches_by_root_type[type] = typecacheof(type) - what_you_cant_see - - var/list/all_objects = oview(dream_view_range, dream_center) - var/something_found = FALSE - for(var/object_type in allowed_typecaches_by_root_type) - var/list/filtered_objects = typecache_filter_list(all_objects, allowed_typecaches_by_root_type[object_type]) - if(filtered_objects.len) - if (!something_found) - . += "Its waters reflect" - something_found = TRUE - var/obj/found_object = pick(filtered_objects) - . += initial(found_object.name) - if(!something_found) - . += pick("It's pitch black", "The reflections are vague", "You stroll aimlessly") - else - . += "The images fade in the ripples" - . += "You feel exhausted" - -/datum/mood_event/mansus_dream_fatigue - description = "I must recover before I can dream of Mansus again." - mood_change = -2 - timeout = 5 MINUTES - #undef DREAMING_SOURCE diff --git a/code/modules/food_and_drinks/machinery/smartfridge.dm b/code/modules/food_and_drinks/machinery/smartfridge.dm index a8b4235a920..ee06061f745 100644 --- a/code/modules/food_and_drinks/machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/machinery/smartfridge.dm @@ -506,7 +506,7 @@ use_energy(active_power_usage) /obj/machinery/smartfridge/drying/accept_check(obj/item/O) - return HAS_TRAIT(O, TRAIT_DRYABLE) + return HAS_TRAIT(O, TRAIT_DRYABLE) && !HAS_TRAIT(O, TRAIT_DRIED) /** * Toggles drying on or off diff --git a/code/modules/food_and_drinks/recipes/drinks/drinks_alcoholic.dm b/code/modules/food_and_drinks/recipes/drinks/drinks_alcoholic.dm index 77e184e3d88..0b800fc6a87 100644 --- a/code/modules/food_and_drinks/recipes/drinks/drinks_alcoholic.dm +++ b/code/modules/food_and_drinks/recipes/drinks/drinks_alcoholic.dm @@ -741,8 +741,8 @@ required_reagents = list(/datum/reagent/consumable/orangejuice = 4, /datum/reagent/consumable/ethanol/aperitivo = 1) /datum/chemical_reaction/drink/improved_whiskey - results=list(/datum/reagent/consumable/ethanol/improved_whiskey = 12) - required_reagents = list(/datum/reagent/consumable/ethanol/sazerac = 10, /datum/reagent/consumable/ethanol/maraschino = 2) + results=list(/datum/reagent/consumable/ethanol/improved_whiskey = 7) + required_reagents = list(/datum/reagent/consumable/ethanol/sazerac = 6, /datum/reagent/consumable/ethanol/maraschino = 1) /datum/chemical_reaction/drink/jungle_bird results=list(/datum/reagent/consumable/ethanol/jungle_bird = 9) @@ -774,8 +774,8 @@ required_reagents = list(/datum/reagent/consumable/ethanol/martini = 3, /datum/reagent/consumable/ethanol/herbal_liqueur = 1) /datum/chemical_reaction/drink/pousse_cafe - results=list(/datum/reagent/consumable/ethanol/pousse_cafe = 50) // if you managed to make this properly, the least it can do is fit into a glass neatly - required_reagents = list(/datum/reagent/consumable/ethanol/navy_rum = 12, /datum/reagent/consumable/ethanol/whiskey = 11, /datum/reagent/consumable/ethanol/fernet = 10, /datum/reagent/consumable/ethanol/herbal_liqueur = 9, /datum/reagent/consumable/ethanol/kahlua = 8, /datum/reagent/consumable/grenadine = 7) // Since I have no way to simulate layering a cocktail, I will instead make it have absolutely godawful ratios to emulate the fiddling nessecary for something like this. + results=list(/datum/reagent/consumable/ethanol/pousse_cafe = 10) + required_reagents = list(/datum/reagent/consumable/ethanol/herbal_liqueur = 1, /datum/reagent/consumable/ethanol/bitters = 1, /datum/reagent/consumable/ethanol/branca_menta = 1, /datum/reagent/consumable/ethanol/irish_cream = 1, /datum/reagent/consumable/ethanol/yuyake = 1, /datum/reagent/consumable/ethanol/aperitivo = 1, /datum/reagent/consumable/ethanol/amaretto = 1, /datum/reagent/consumable/ethanol/curacao = 1, /datum/reagent/consumable/ethanol/maraschino = 1, /datum/reagent/consumable/toechtauese_syrup = 1) // In case someone wants to implement some sort of actual layering mechanic, these are listed from left to right by their specific gravity more or less /datum/chemical_reaction/drink/spritz results=list(/datum/reagent/consumable/ethanol/spritz = 6) diff --git a/code/modules/food_and_drinks/recipes/food_mixtures.dm b/code/modules/food_and_drinks/recipes/food_mixtures.dm index 15368d2c543..31458a4a129 100644 --- a/code/modules/food_and_drinks/recipes/food_mixtures.dm +++ b/code/modules/food_and_drinks/recipes/food_mixtures.dm @@ -121,8 +121,7 @@ /datum/chemical_reaction/food/chocolatepudding/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume) . = ..() - var/station_time = station_time() - if(!ISINRANGE(station_time, 3 HOURS + 45 MINUTES, 4 HOURS + 15 MINUTES)) + if(!ISINRANGE(world.timeofday, 3 HOURS + 45 MINUTES, 4 HOURS + 15 MINUTES)) return var/lastkey = holder.my_atom?.fingerprintslast if(!lastkey) diff --git a/code/modules/food_and_drinks/recipes/soup_mixtures.dm b/code/modules/food_and_drinks/recipes/soup_mixtures.dm index eef072eb192..ab9a2175a89 100644 --- a/code/modules/food_and_drinks/recipes/soup_mixtures.dm +++ b/code/modules/food_and_drinks/recipes/soup_mixtures.dm @@ -66,7 +66,7 @@ //number of ingredients who's requested amounts has been satisfied var/completed_ingredients = 0 for(var/obj/item/ingredient as anything in pot.added_ingredients) - var/ingredient_type = ingredient.type + var/datum/ingredient_type = ingredient.type do { var/ingredient_count = reqs_copy[ingredient_type] @@ -91,7 +91,7 @@ //means we have to look for subtypes else if(isnull(ingredient_count)) - ingredient_type = type2parent(ingredient_type) + ingredient_type = ingredient_type::parent_type //means we have no more remaining ingredients so bail, can happen if multiple ingredients of the same type/subtype are in the pot else diff --git a/code/modules/forensics/_forensics.dm b/code/modules/forensics/_forensics.dm index e03790e27b0..af37a9b5958 100644 --- a/code/modules/forensics/_forensics.dm +++ b/code/modules/forensics/_forensics.dm @@ -214,7 +214,7 @@ var/mob/living/carbon/human/human_suspect = suspect if(human_suspect.gloves) has_gloves = "(gloves)" - var/current_time = time_stamp() + var/current_time = round_timestamp() if(!LAZYACCESS(hiddenprints, suspect.key)) LAZYSET(hiddenprints, suspect.key, "First: \[[current_time]\] \"[suspect.real_name]\"[has_gloves]. Ckey: [suspect.ckey]") else diff --git a/code/modules/hallucination/bubblegum_attack.dm b/code/modules/hallucination/bubblegum_attack.dm index 64a4f0e2036..b1f735798e4 100644 --- a/code/modules/hallucination/bubblegum_attack.dm +++ b/code/modules/hallucination/bubblegum_attack.dm @@ -49,7 +49,7 @@ hallucinator.playsound_local(wall_source, 'sound/effects/meteorimpact.ogg', 150, TRUE) if(haunt_them) - to_chat(hallucinator, pick(hallucination_lines)) + to_chat(hallucinator, span_colossus(pick(hallucination_lines))) var/obj/effect/client_image_holder/hallucination/bubblegum/fake_bubbles = new(wall_source, hallucinator, src) addtimer(CALLBACK(src, PROC_REF(charge_loop), fake_bubbles, target_landing_turf), 1 SECONDS) diff --git a/code/modules/hallucination/mother.dm b/code/modules/hallucination/mother.dm index 77ed2cfb639..2d9a7ad6b59 100644 --- a/code/modules/hallucination/mother.dm +++ b/code/modules/hallucination/mother.dm @@ -81,11 +81,16 @@ /obj/effect/client_image_holder/hallucination/your_mother/Initialize(mapload, list/mobs_which_see_us, datum/hallucination/parent) var/mob/living/hallucinator = parent.hallucinator - if (ishuman(hallucinator)) + if (ishuman(hallucinator) && !isplasmaman(hallucinator)) //Plasmapeople don't have parents in a traditional sense, so their mother is different. var/mob/living/carbon/dna_haver = hallucinator image_icon = image(get_dynamic_human_appearance(/datum/outfit/yourmother, dna_haver.dna.species.type)) return ..() + if (isplasmaman(hallucinator)) + image_icon = 'icons/turf/floors.dmi' + image_state = "liquidplasma" + return ..() + if (istype(hallucinator, /mob/living/basic/pet/dog/corgi/ian)) image_icon = getFlatIcon(get_dynamic_human_appearance(/datum/outfit/job/hop)) name = "Head of Personnel" diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index 2f22d1afa97..78975a9c2d9 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -298,10 +298,6 @@ GLOBAL_LIST_INIT(holiday_mail, list()) . = ..() SSjob.set_overflow_role(/datum/job/clown) SSticker.set_lobby_music('sound/music/lobby_music/clown.ogg', override = TRUE) - for(var/i in GLOB.new_player_list) - var/mob/dead/new_player/P = i - if(P.client) - P.client.playtitlemusic() /datum/holiday/april_fools/get_holiday_colors(atom/thing_to_color) return "#[random_short_color()]" @@ -354,6 +350,21 @@ GLOBAL_LIST_INIT(holiday_mail, list()) /datum/holiday/anz/getStationPrefix() return pick("Australian","New Zealand","Poppy", "Southern Cross") +/datum/holiday/chernobyl + name = CHERNOBYL_ANNIVERSARY + begin_day = 26 + begin_month = APRIL + +/datum/holiday/chernobyl/getStationPrefix() + if(prob(3)) + return "Not Great, Not Terrible" + + return pick("Atomic", "Nuclear", "Radiation", "Plutonium", "Uranium", "Corium", "Zirconium", "Graphite", "Scram", "Explosion") + +/datum/holiday/chernobyl/greet() + return "On this day in 1986, the Chernobyl nuclear power plant melted down, causing one of the worst nuclear disasters in human history. \ + Today serves as a reminder to the lives lost and to the rigorous safety standards our engineers must adhere to when providing power to the station." + // MAY /datum/holiday/labor diff --git a/code/modules/holodeck/holo_effect.dm b/code/modules/holodeck/holo_effect.dm index 55535d4b570..7a035b94a6d 100644 --- a/code/modules/holodeck/holo_effect.dm +++ b/code/modules/holodeck/holo_effect.dm @@ -55,18 +55,42 @@ var/mob/our_mob = null /obj/effect/holodeck_effect/mobspawner/activate(obj/machinery/computer/holodeck/HC) + . = list() + if(islist(mobtype)) mobtype = pick(mobtype) our_mob = new mobtype(loc) our_mob.flags_1 |= HOLOGRAM_1 + . += our_mob + + for(var/atom/holo_atom as anything in our_mob.contents) + holo_atom.flags_1 |= HOLOGRAM_1 + . += holo_atom + + if(iscarbon(our_mob)) + var/mob/living/carbon/holo_carbon_mob = our_mob + for(var/obj/item/organ/holo_organ as anything in holo_carbon_mob.organs) + holo_organ.flags_1 |= HOLOGRAM_1 + . += holo_organ // these vars are not really standardized but all would theoretically create stuff on death our_mob.add_traits(list(TRAIT_PERMANENTLY_MORTAL, TRAIT_NO_BLOOD_OVERLAY, TRAIT_NOBLOOD, TRAIT_NOHUNGER, TRAIT_SPAWNED_MOB), INNATE_TRAIT) RegisterSignal(our_mob, COMSIG_QDELETING, PROC_REF(handle_mob_delete)) - return our_mob + + return . /obj/effect/holodeck_effect/mobspawner/deactivate(obj/machinery/computer/holodeck/HC) if(our_mob) + for(var/atom/holo_atom as anything in our_mob.contents) + if(holo_atom.flags_1 & HOLOGRAM_1) + HC.derez(holo_atom) + + if(iscarbon(our_mob)) + var/mob/living/carbon/holo_carbon_mob = our_mob + for(var/obj/item/organ/holo_organ as anything in holo_carbon_mob.organs) + if(holo_organ.flags_1 & HOLOGRAM_1) + HC.derez(holo_organ) + HC.derez(our_mob) qdel(src) @@ -100,13 +124,6 @@ /obj/effect/holodeck_effect/mobspawner/monkey mobtype = /mob/living/carbon/human/species/monkey -/obj/effect/holodeck_effect/mobspawner/monkey/activate(obj/machinery/computer/holodeck/computer) - var/mob/living/carbon/human/monkey = ..() - . = list() + monkey - - for(var/atom/atom as anything in monkey.contents + monkey.organs) - . += atom - /obj/effect/holodeck_effect/mobspawner/penguin mobtype = /mob/living/basic/pet/penguin/emperor/neuter diff --git a/code/modules/holodeck/holodeck_map_templates.dm b/code/modules/holodeck/holodeck_map_templates.dm index 3e79de6ea43..06cb3004ca1 100644 --- a/code/modules/holodeck/holodeck_map_templates.dm +++ b/code/modules/holodeck/holodeck_map_templates.dm @@ -157,3 +157,9 @@ template_id = "holodeck_refuelingstation" mappath = "_maps/templates/holodeck_refuelingstation.dmm" restricted = TRUE + +/datum/map_template/holodeck/prison + name = "Holodeck - Prison Block" + template_id = "holodeck_prison" + mappath = "_maps/templates/holodeck_prison.dmm" + restricted = TRUE diff --git a/code/modules/holodeck/turfs.dm b/code/modules/holodeck/turfs.dm index 7ef38b1a778..afc68ef468b 100644 --- a/code/modules/holodeck/turfs.dm +++ b/code/modules/holodeck/turfs.dm @@ -11,8 +11,9 @@ /turf/open/floor/holofloor/item_interaction(mob/living/user, obj/item/tool, list/modifiers) return ITEM_INTERACT_BLOCKING // Fuck you -/turf/open/floor/holofloor/crowbar_act(mob/living/user, obj/item/I) - return NONE // Fuck you +/turf/open/floor/holofloor/Initialize(mapload) + . = ..() + AddElement(/datum/element/tool_blocker, TOOL_CROWBAR, TOOL_ACT_PRIMARY) /turf/open/floor/holofloor/burn_tile() return //you can't burn a hologram! diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index 78538b3e8b9..6e2db6c05ba 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -214,14 +214,14 @@ return . /obj/machinery/biogenerator/crowbar_act(mob/living/user, obj/item/tool) - if(!default_deconstruction_crowbar(tool)) - return ITEM_INTERACT_BLOCKING + . = default_deconstruction_crowbar(user, tool) + if(!(. & ITEM_INTERACT_SUCCESS)) + return var/turf/drop_location = drop_location() if(biomass > 0) drop_location.visible_message(span_warning("Biomass spills from \the [src]'s biomass tank!")) playsound(drop_location, 'sound/effects/slosh.ogg', 25, vary = TRUE) new /obj/effect/decal/cleanable/greenglow(drop_location) - return ITEM_INTERACT_SUCCESS /obj/machinery/biogenerator/item_interaction(mob/living/user, obj/item/tool, list/modifiers) if(user.combat_mode) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index f5f58af7bbf..fd84b1a0fd3 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -82,6 +82,7 @@ reagents.clear_reagents() seed.prepare_result(src) transform *= TRANSFORM_USING_VARIABLE(seed.potency, 100) + 0.5 //Makes the resulting produce's sprite larger or smaller based on potency! + ADD_TRAIT(src, TRAIT_VALID_DNA_INFUSION, INNATE_TRAIT) /obj/item/food/grown/Destroy() if(isatom(seed)) diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm index 82c69a8ef09..0502a500ef2 100644 --- a/code/modules/hydroponics/growninedible.dm +++ b/code/modules/hydroponics/growninedible.dm @@ -43,6 +43,7 @@ seed.prepare_result(src) transform *= TRANSFORM_USING_VARIABLE(seed.potency, 100) + 0.5 add_juice() + ADD_TRAIT(src, TRAIT_VALID_DNA_INFUSION, INNATE_TRAIT) /obj/item/grown/Destroy() if(isatom(seed)) diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index 158a9f1708c..cea1a45d157 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -173,11 +173,8 @@ /obj/item/scythe/Initialize(mapload) . = ..() - AddComponent(/datum/component/butchering, \ - speed = 9 SECONDS, \ - effectiveness = 105, \ - ) - AddElement(/datum/element/bane, mob_biotypes = MOB_PLANT, damage_multiplier = 0.5, requires_combat_mode = FALSE) + AddComponent(/datum/component/butchering, speed = 9 SECONDS, effectiveness = 105) + AddComponent(/datum/component/bane, affected_biotypes = MOB_PLANT, damage_multiplier = 1.5) /obj/item/scythe/suicide_act(mob/living/user) user.visible_message(span_suicide("[user] is beheading [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!")) diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 97aecdfbf2c..4701c002673 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -795,6 +795,7 @@ set_pestlevel(0, update_icon = FALSE) // Pests die lastproduce = 0 SEND_SIGNAL(src, COMSIG_HYDROTRAY_PLANT_DEATH) + remove_shared_particles(/particles/pollen) //We shouldn't look like we're pollenating if we're dead. if(update_icon) update_appearance() @@ -1168,6 +1169,9 @@ if(myseed) to_chat(user, span_warning("[src] already has a plant growing in it!")) return + if(young_plant.seed_flags & NO_PLANTING) + to_chat(user, span_warning("[young_plant] cannot be planted in [src]!")) + return if(istype(young_plant, /obj/item/seeds/kudzu)) investigate_log("had Kudzu planted in it by [key_name(user)] at [AREACOORD(src)].", INVESTIGATE_BOTANY) if(!user.transferItemToLoc(young_plant, src)) diff --git a/code/modules/hydroponics/unique_plant_genes.dm b/code/modules/hydroponics/unique_plant_genes.dm index c2fcd8bef29..729a3d4a6e6 100644 --- a/code/modules/hydroponics/unique_plant_genes.dm +++ b/code/modules/hydroponics/unique_plant_genes.dm @@ -681,8 +681,8 @@ return var/datum/gas_mixture/stank = new - ADD_GAS(/datum/gas/miasma, stank.gases) - stank.gases[/datum/gas/miasma][MOLES] = (seed.yield + 6) * 3.5 * MIASMA_CORPSE_MOLES * seconds_per_tick // this process is only being called about 2/7 as much as corpses so this is 12-32 times a corpses + + stank.set_gas(/datum/gas/miasma, (seed.yield + 6) * 3.5 * MIASMA_CORPSE_MOLES * seconds_per_tick) // this process is only being called about 2/7 as much as corpses so this is 12-32 times a corpses stank.temperature = T20C // without this the room would eventually freeze and miasma mining would be easier tray_turf.assume_air(stank) diff --git a/code/modules/instruments/songs/editor.dm b/code/modules/instruments/songs/editor.dm index aef02858c03..93c84f5c74b 100644 --- a/code/modules/instruments/songs/editor.dm +++ b/code/modules/instruments/songs/editor.dm @@ -7,6 +7,11 @@ /datum/song/ui_host(mob/user) return parent +/datum/song/ui_state(mob/user) + if(ispAI(user)) + return GLOB.always_state + return ..() + /datum/song/ui_data(mob/user) var/list/data = ..() data["id"] = id diff --git a/code/modules/jobs/job_types/antagonists/nuclear_operative.dm b/code/modules/jobs/job_types/antagonists/nuclear_operative.dm index f2e38bf27d7..ac4b7be3435 100644 --- a/code/modules/jobs/job_types/antagonists/nuclear_operative.dm +++ b/code/modules/jobs/job_types/antagonists/nuclear_operative.dm @@ -2,26 +2,20 @@ title = ROLE_OPERATIVE /datum/job/nuclear_operative/get_roundstart_spawn_point() - return pick(GLOB.nukeop_start) + return pick(GLOB.nukeop_elevator_start) /datum/job/nuclear_operative/get_latejoin_spawn_point() - return pick(GLOB.nukeop_start) + return pick(GLOB.nukeop_base_start) /datum/job/nuclear_operative/leader -/datum/job/nuclear_operative/leader/get_roundstart_spawn_point() - return pick(GLOB.nukeop_leader_start) - /datum/job/nuclear_operative/leader/get_latejoin_spawn_point() - return pick(GLOB.nukeop_leader_start) + return pick(GLOB.nukeop_base_leader_start) /datum/job/nuclear_operative/clown_operative title = ROLE_CLOWN_OPERATIVE /datum/job/nuclear_operative/clown_operative/leader -/datum/job/nuclear_operative/clown_operative/leader/get_roundstart_spawn_point() - return pick(GLOB.nukeop_leader_start) - /datum/job/nuclear_operative/clown_operative/leader/get_latejoin_spawn_point() - return pick(GLOB.nukeop_leader_start) + return pick(GLOB.nukeop_base_leader_start) diff --git a/code/modules/jobs/job_types/assistant/gimmick_assistants.dm b/code/modules/jobs/job_types/assistant/gimmick_assistants.dm index e7caf881d3a..cd4746328f6 100644 --- a/code/modules/jobs/job_types/assistant/gimmick_assistants.dm +++ b/code/modules/jobs/job_types/assistant/gimmick_assistants.dm @@ -168,6 +168,7 @@ head = /obj/item/clothing/head/utility/hardhat uniform = /obj/item/clothing/under/color/yellow l_pocket = /obj/item/modular_computer/pda/assistant + pda_slot = ITEM_SLOT_LPOCKET outfit_weight = 6 diff --git a/code/modules/jobs/job_types/chaplain/chaplain_vorpal_scythe.dm b/code/modules/jobs/job_types/chaplain/chaplain_vorpal_scythe.dm index 91823a073c8..c06f8993b53 100644 --- a/code/modules/jobs/job_types/chaplain/chaplain_vorpal_scythe.dm +++ b/code/modules/jobs/job_types/chaplain/chaplain_vorpal_scythe.dm @@ -79,12 +79,8 @@ If the scythe isn't empowered when you sheath it, you take a heap of damage and /obj/item/vorpalscythe/Initialize(mapload) . = ..() AddElement(/datum/element/nullrod_core, chaplain_spawnable = FALSE, rune_remove_line = "TO DUST WITH YE!! AWAY!!") // The implant is the actual item the chappie can select - AddComponent( - /datum/component/butchering, \ - speed = 3 SECONDS, \ - effectiveness = 125, \ - ) - AddElement(/datum/element/bane, mob_biotypes = MOB_PLANT, damage_multiplier = 0.5, requires_combat_mode = FALSE) //also good at killing plants + AddComponent(/datum/component/bane, affected_biotypes = MOB_PLANT, damage_multiplier = 1.5) //also good at killing plants + AddComponent(/datum/component/butchering, speed = 3 SECONDS, effectiveness = 125) /obj/item/vorpalscythe/attack(mob/living/target, mob/living/user, list/modifiers, list/attack_modifiers) if(ismonkey(target) && !target.mind) //Don't empower from hitting monkeys. Hit a corgi or something, I don't know. diff --git a/code/modules/jobs/job_types/janitor.dm b/code/modules/jobs/job_types/janitor.dm index d7c52c8255b..52735aad579 100644 --- a/code/modules/jobs/job_types/janitor.dm +++ b/code/modules/jobs/job_types/janitor.dm @@ -39,7 +39,7 @@ uniform = /obj/item/clothing/under/rank/civilian/janitor belt = /obj/item/modular_computer/pda/janitor ears = /obj/item/radio/headset/headset_srv - skillchips = list(/obj/item/skillchip/job/janitor) + skillchips = list(/obj/item/skillchip/job/janitor, /obj/item/skillchip/disposals) backpack_contents = list(/obj/item/access_key) /datum/outfit/job/janitor/pre_equip(mob/living/carbon/human/human_equipper, visuals_only) diff --git a/code/modules/jobs/job_types/shaft_miner.dm b/code/modules/jobs/job_types/shaft_miner.dm index ed2916913a9..d8d87c2562b 100644 --- a/code/modules/jobs/job_types/shaft_miner.dm +++ b/code/modules/jobs/job_types/shaft_miner.dm @@ -97,6 +97,7 @@ l_pocket = /obj/item/modular_computer/pda/shaftminer r_pocket = /obj/item/extinguisher/mini belt = /obj/item/storage/belt/mining/healing + pda_slot = ITEM_SLOT_LPOCKET /datum/outfit/job/miner/equipped/combat/post_equip(mob/living/carbon/human/miner, visuals_only = FALSE) . = ..() diff --git a/code/modules/library/bibles.dm b/code/modules/library/bibles.dm index 07a83912f00..597c245a7c3 100644 --- a/code/modules/library/bibles.dm +++ b/code/modules/library/bibles.dm @@ -365,13 +365,13 @@ GLOBAL_LIST_INIT(bibleitemstates, list( /obj/item/book/bible/syndicate/Initialize(mapload) . = ..() AddComponent(/datum/component/anti_magic, MAGIC_RESISTANCE|MAGIC_RESISTANCE_HOLY) + AddComponent(/datum/component/bane, affected_biotypes = MOB_SPIRIT, added_damage = 25) AddComponent(/datum/component/effect_remover, \ success_feedback = "You disrupt the magic of %THEEFFECT with %THEWEAPON.", \ success_forcesay = "BEGONE FOUL MAGIKS!!", \ tip_text = "Clear rune", \ effects_we_clear = list(/obj/effect/rune, /obj/effect/heretic_rune, /obj/effect/cosmic_rune), \ ) - AddElement(/datum/element/bane, mob_biotypes = MOB_SPIRIT, damage_multiplier = 0, added_damage = 25, requires_combat_mode = FALSE) /obj/item/book/bible/syndicate/attack_self(mob/living/carbon/human/user, modifiers) if(!uses || !istype(user)) diff --git a/code/modules/library/book_info.dm b/code/modules/library/book_info.dm index 8663069644d..e9a4810818e 100644 --- a/code/modules/library/book_info.dm +++ b/code/modules/library/book_info.dm @@ -39,15 +39,19 @@ if(trusted) content = _content return - content = trim(html_encode(_content), MAX_PAPER_LENGTH) + content = trim(html_encode(trim(_content, MAX_PAPER_LENGTH)), MAX_BOOK_LENGTH) /datum/book_info/proc/set_content_using_paper(obj/item/paper/paper) // Just the paper's raw data. var/raw_content = "" for(var/datum/paper_input/text_input as anything in paper.raw_text_inputs) raw_content += text_input.to_raw_html() + raw_content += (text_input.raw_text[length(text_input.raw_text)] == "\n") ? "\n" : "\n\n" - content = trim(html_encode(raw_content), MAX_PAPER_LENGTH) + // Paper raw inputs should already be trimmed to maximum paper length, + // so we don't trim here again to avoid cutting into the expanded html. + // We still trim to a more lenient length to avoid abuse. + content = trim(html_encode(raw_content), MAX_BOOK_LENGTH) /datum/book_info/proc/get_content(default="N/A") return html_decode(content) || "N/A" diff --git a/code/modules/library/skill_learning/generic_skillchips/misc.dm b/code/modules/library/skill_learning/generic_skillchips/misc.dm index 288b164bc63..253d411ab87 100644 --- a/code/modules/library/skill_learning/generic_skillchips/misc.dm +++ b/code/modules/library/skill_learning/generic_skillchips/misc.dm @@ -154,3 +154,13 @@ /datum/action/cooldown/fishing_tip/Activate(atom/target_atom) . = ..() send_tip_of_the_round(owner, pick(GLOB.fishing_tips), source = "Ancient fishing wisdom") + +/obj/item/skillchip/disposals + name = "T4RG3T.bin skillchip" + desc = "Become a dauntless disposaler, target trash right where it belongs." + auto_traits = list(TRAIT_THROWINGARM) + skill_name = "Dauntless Disposaler" + skill_description = "You have an uncanny ability to perfectly land every toss into disposal units." + skill_icon = "trash-can" + activate_message = span_notice("You seem laser focused on the nearby disposal unit.") + deactivate_message = span_notice("The nearby disposal unit fades into the background of your vision.") diff --git a/code/modules/lighting/lighting_corner.dm b/code/modules/lighting/lighting_corner.dm index 4c35a8f2bb3..1323f45f1e6 100644 --- a/code/modules/lighting/lighting_corner.dm +++ b/code/modules/lighting/lighting_corner.dm @@ -141,7 +141,7 @@ return #endif - var/datum/lighting_object/lighting_object = master_NE?.lighting_object + var/atom/movable/lighting_object/lighting_object = master_NE?.lighting_object if (lighting_object && !lighting_object.needs_update) lighting_object.needs_update = TRUE SSlighting.objects_queue += lighting_object @@ -163,10 +163,6 @@ self_destruct_if_idle() - -/datum/lighting_corner/dummy/New() - return - /datum/lighting_corner/Destroy(force) if (!force) return QDEL_HINT_LETMELIVE diff --git a/code/modules/lighting/lighting_object.dm b/code/modules/lighting/lighting_object.dm index c5ce42e45ed..85bcd6c0c31 100644 --- a/code/modules/lighting/lighting_object.dm +++ b/code/modules/lighting/lighting_object.dm @@ -1,32 +1,50 @@ -/datum/lighting_object - ///the underlay we are currently applying to our turf to apply light - var/mutable_appearance/current_underlay - +/atom/movable/lighting_object + name = "" + anchored = TRUE + plane = LIGHTING_PLANE + icon = LIGHTING_ICON + icon_state = null + color = null //we manually set color in init instead + appearance_flags = RESET_COLOR | RESET_ALPHA | RESET_TRANSFORM + mouse_opacity = MOUSE_OPACITY_TRANSPARENT + invisibility = INVISIBILITY_LIGHTING + move_resist = INFINITY ///whether we are already in the SSlighting.objects_queue list var/needs_update = FALSE ///the turf that our light is applied to var/turf/affected_turf -// Global list of lighting underlays, indexed by z level -GLOBAL_LIST_EMPTY(default_lighting_underlays_by_z) - -/datum/lighting_object/New(turf/source) - if(!isturf(source)) - qdel(src, force=TRUE) - stack_trace("a lighting object was assigned to [source], a non turf! ") - return +/atom/movable/lighting_object/Initialize(mapload, turf/affected_turf) + if(!isnull(loc)) + if(isturf(loc)) + affected_turf = loc + moveToNullspace() + stack_trace("a lighting object was improperly initialized - they should have a null loc, with the affected turf being the second argument") + else + qdel(src, force = TRUE) + CRASH("a lighting object tried to be spawned for a non-turf!") + if(!isturf(affected_turf)) + qdel(src, force = TRUE) + CRASH("a lighting object was assigned to [affected_turf], a non turf!") . = ..() - current_underlay = new(GLOB.default_lighting_underlays_by_z[source.z]) + verbs.Cut() - affected_turf = source + src.affected_turf = affected_turf + layer = affected_turf.z * 0.01 + if(SSmapping.max_plane_offset) + // generates the offset lighting plane to use. NOTE: this assumes the turf lighting + // plane is ALWAYS offsettable which is technically dependent on a plane master var. + // checking for that is slower and this is hot enough that this is a worthwhile risk to take + plane = LIGHTING_PLANE - (PLANE_RANGE * GET_Z_PLANE_OFFSET(affected_turf.z)) if (affected_turf.lighting_object) qdel(affected_turf.lighting_object, force = TRUE) stack_trace("a lighting object was assigned to a turf that already had a lighting object!") affected_turf.lighting_object = src + affected_turf.vis_contents += src // Default to fullbright, so things can "see" if they use view() before we update affected_turf.luminosity = 1 @@ -38,18 +56,20 @@ GLOBAL_LIST_EMPTY(default_lighting_underlays_by_z) needs_update = TRUE SSlighting.objects_queue += src -/datum/lighting_object/Destroy(force) +/atom/movable/lighting_object/Destroy(force) if (!force) return QDEL_HINT_LETMELIVE SSlighting.objects_queue -= src if (isturf(affected_turf)) + affected_turf.vis_contents -= src affected_turf.lighting_object = null affected_turf.luminosity = 1 - affected_turf.underlays -= current_underlay affected_turf = null return ..() -/datum/lighting_object/proc/update() +/atom/movable/lighting_object/proc/update() + var/turf/affected_turf = src.affected_turf + // To the future coder who sees this and thinks // "Why didn't he just use a loop?" // Well my man, it's because the loop performed like shit. @@ -60,8 +80,6 @@ GLOBAL_LIST_EMPTY(default_lighting_underlays_by_z) var/static/datum/lighting_corner/dummy/dummy_lighting_corner = new - var/turf/affected_turf = src.affected_turf - #ifdef VISUALIZE_LIGHT_UPDATES affected_turf.add_atom_colour(COLOR_BLUE_LIGHT, ADMIN_COLOUR_PRIORITY) animate(affected_turf, 10, color = null) @@ -84,20 +102,12 @@ GLOBAL_LIST_EMPTY(default_lighting_underlays_by_z) var/set_luminosity = max > 1e-6 #endif - 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 - current_underlay.icon_state = "lighting_transparent" - current_underlay.color = null - else if(!set_luminosity) - current_underlay.icon_state = "lighting_dark" - current_underlay.color = null + if(!set_luminosity) + icon_state = "lighting_dark" + color = null else - current_underlay.icon_state = null - current_underlay.color = list( + icon_state = null + color = list( 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, @@ -105,7 +115,34 @@ GLOBAL_LIST_EMPTY(default_lighting_underlays_by_z) 00, 00, 00, 01 ) - // 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 - affected_turf.luminosity = set_luminosity + luminosity = set_luminosity + +// Variety of overrides so the overlays don't get affected by weird things. + +/atom/movable/lighting_object/ex_act(severity) + return FALSE + +/atom/movable/lighting_object/singularity_act() + return + +/atom/movable/lighting_object/singularity_pull() + return + +/atom/movable/lighting_object/blob_act() + return + +/atom/movable/lighting_object/on_changed_z_level(turf/old_turf, turf/new_turf, same_z_layer, notify_contents = TRUE) + SHOULD_CALL_PARENT(FALSE) + return + +/atom/movable/lighting_object/wash(clean_types) + SHOULD_CALL_PARENT(FALSE) // lighting objects are dirty, confirmed + return + +// Override here to prevent things accidentally moving around overlays. +/atom/movable/lighting_object/forceMove(atom/destination, no_tp = FALSE, harderforce = FALSE) + if(harderforce) + return ..() + +/atom/movable/lighting_object/ref_search_details() + return "[text_ref(src)] (turf: [affected_turf ? "[affected_turf.type] @ [AREACOORD(affected_turf)]" : "null"] needs_update: [needs_update ? "true" : "false"])" diff --git a/code/modules/lighting/lighting_turf.dm b/code/modules/lighting/lighting_turf.dm index 949d9b59b8f..f3feed46bcf 100644 --- a/code/modules/lighting/lighting_turf.dm +++ b/code/modules/lighting/lighting_turf.dm @@ -14,7 +14,7 @@ if (lighting_object) qdel(lighting_object, force=TRUE) //Shitty fix for lighting objects persisting after death - new /datum/lighting_object(src) + new /atom/movable/lighting_object(null, src) // Used to get a scaled lumcount. /turf/proc/get_lumcount(minlum = 0, maxlum = 1) diff --git a/code/modules/logging/log_holder.dm b/code/modules/logging/log_holder.dm index fa295c5e292..666390613ec 100644 --- a/code/modules/logging/log_holder.dm +++ b/code/modules/logging/log_holder.dm @@ -32,13 +32,10 @@ GLOBAL_REAL(logger, /datum/log_holder) GENERAL_PROTECT_DATUM(/datum/log_holder) -ADMIN_VERB(log_viewer_new, R_ADMIN|R_DEBUG, "View Round Logs", "View the rounds logs.", ADMIN_CATEGORY_MAIN) +ADMIN_VERB(log_viewer_new, R_ADMIN, "View Round Logs", "View the rounds logs.", ADMIN_CATEGORY_MAIN) logger.ui_interact(user.mob) /datum/log_holder/ui_interact(mob/user, datum/tgui/ui) - if(!check_rights_for(user.client, R_ADMIN)) - return - ui = SStgui.try_update_ui(user, src, ui) if(isnull(ui)) ui = new(user, src, "LogViewer") @@ -46,7 +43,7 @@ ADMIN_VERB(log_viewer_new, R_ADMIN|R_DEBUG, "View Round Logs", "View the rounds ui.open() /datum/log_holder/ui_state(mob/user) - return ADMIN_STATE(R_ADMIN | R_DEBUG) + return ADMIN_STATE(R_ADMIN) /datum/log_holder/ui_static_data(mob/user) var/list/data = list( diff --git a/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm b/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm index 0674ff97cb8..ffcd8c07a49 100644 --- a/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm +++ b/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm @@ -325,14 +325,6 @@ new /obj/effect/decal/cleanable/blood/gibs/old(src) new /obj/item/book/granter/crafting_recipe/boneyard_notes(src) -/obj/structure/closet/crate/grave/skeleton - resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF - affect_mood = TRUE - -/obj/structure/closet/crate/grave/skeleton/PopulateContents() - . = ..() - new /mob/living/carbon/human/species/skeleton(src) - //***Fluff items for lore/intrigue /obj/item/paper/crumpled/muddy/fluff/elephant_graveyard name = "posted warning" diff --git a/code/modules/mapfluff/ruins/objects_and_mobs/ash_walker_den.dm b/code/modules/mapfluff/ruins/objects_and_mobs/ash_walker_den.dm index ce57035a766..b18e740f8cb 100644 --- a/code/modules/mapfluff/ruins/objects_and_mobs/ash_walker_den.dm +++ b/code/modules/mapfluff/ruins/objects_and_mobs/ash_walker_den.dm @@ -123,4 +123,77 @@ resistance_flags = FIRE_PROOF | LAVA_PROOF max_integrity = 200 +/obj/effect/light_emitter/tendril + set_luminosity = 4 + set_cap = 2.5 + light_color = LIGHT_COLOR_LAVA + +/obj/effect/collapse + name = "collapsing necropolis tendril" + desc = "Get your loot and get clear!" + layer = TABLE_LAYER + icon = 'icons/mob/simple/lavaland/nest.dmi' + icon_state = "tendril" + anchored = TRUE + density = TRUE + /// weakref list of which mobs have gotten their loot from this effect. + var/list/collected = list() + /// a bit of light as to make less unfair deaths from the chasm + var/obj/effect/light_emitter/tendril/emitted_light + +/obj/effect/collapse/Initialize(mapload) + . = ..() + emitted_light = new(loc) + visible_message(span_bolddanger("The tendril writhes in fury as the earth around it begins to crack and break apart! Get back!")) + balloon_alert_to_viewers("interact to grab loot before collapse!", vision_distance = 7) + playsound(loc,'sound/effects/tendril_destroyed.ogg', 200, FALSE, 50, TRUE, TRUE) + addtimer(CALLBACK(src, PROC_REF(collapse)), 5 SECONDS) + +/obj/effect/collapse/examine(mob/user) + var/list/examine_messages = ..() + if(isliving(user)) + if(has_collected(user)) + examine_messages += span_boldnotice("You've grabbed what you can, now get out!") + else + examine_messages += span_boldnotice("You might have some time to grab some goodies with an open hand before it collapses!") + return examine_messages + +/obj/effect/collapse/attack_hand(mob/living/collector, list/modifiers) + . = ..() + if(has_collected(collector)) + to_chat(collector, span_danger("You've already gotten some loot, just get out of there with it!")) + return + visible_message(span_warning("Something falls free of the tendril!")) + var/obj/structure/closet/crate/necropolis/tendril/loot = new /obj/structure/closet/crate/necropolis/tendril(loc) + collector.start_pulling(loot) + collected += WEAKREF(collector) + +/obj/effect/collapse/Destroy() + collected.Cut() + QDEL_NULL(emitted_light) + return ..() + +///Helper proc that resolves weakrefs to determine if collector is in collected list, returning a boolean. +/obj/effect/collapse/proc/has_collected(mob/collector) + for(var/datum/weakref/weakref as anything in collected) + var/mob/living/resolved = weakref.resolve() + //it could have been collector, it could not have been, we don't care + if(!resolved) + continue + if(resolved == collector) + return TRUE + return FALSE + +/obj/effect/collapse/proc/collapse() + for(var/mob/viewer in range(7, src)) + shake_camera(viewer, 15, 1) + playsound(get_turf(src),'sound/effects/explosion/explosionfar.ogg', 200, TRUE) + visible_message(span_bolddanger("The tendril falls inward, the ground around it widening into a yawning chasm!")) + for(var/turf/ground in RANGE_TURFS(2, src)) + if(HAS_TRAIT(ground, TRAIT_NO_TERRAFORM)) + continue + if(!ground.density) + ground.TerraformTurf(/turf/open/chasm/lavaland, /turf/open/chasm/lavaland, flags = CHANGETURF_INHERIT_AIR) + qdel(src) + #undef ASH_WALKER_SPAWN_THRESHOLD diff --git a/code/modules/mapfluff/ruins/objects_and_mobs/museum.dm b/code/modules/mapfluff/ruins/objects_and_mobs/museum.dm index 2917c8b88e7..13963576232 100644 --- a/code/modules/mapfluff/ruins/objects_and_mobs/museum.dm +++ b/code/modules/mapfluff/ruins/objects_and_mobs/museum.dm @@ -161,11 +161,10 @@ /obj/machinery/vending/hotdog/museum all_products_free = TRUE -/obj/machinery/vending/hotdog/museum/screwdriver_act(mob/living/user, obj/item/attack_item) - return NONE - -/obj/machinery/vending/hotdog/museum/crowbar_act(mob/living/user, obj/item/attack_item) - return NONE +/obj/machinery/vending/hotdog/museum/Initialize(mapload) + . = ..() + AddElement(/datum/element/tool_blocker, TOOL_SCREWDRIVER, TOOL_ACT_PRIMARY) + AddElement(/datum/element/tool_blocker, TOOL_CROWBAR, TOOL_ACT_PRIMARY) #define CAFE_KEYCARD_TOILETS "museum_cafe_key_toilets" diff --git a/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm b/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm index 733cd8330bc..cb9bb33a92f 100644 --- a/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm +++ b/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm @@ -264,7 +264,7 @@ GLOBAL_DATUM(necropolis_gate, /obj/structure/necropolis_gate/legion_gate) var/static/list/give_turf_traits if(!give_turf_traits) - give_turf_traits = string_list(list(TRAIT_LAVA_STOPPED, TRAIT_CHASM_STOPPED, TRAIT_IMMERSE_STOPPED)) + give_turf_traits = string_list(list(TRAIT_TURF_IGNORE_SLOWDOWN, TRAIT_LAVA_STOPPED, TRAIT_CHASM_STOPPED, TRAIT_IMMERSE_STOPPED)) AddElement(/datum/element/give_turf_traits, give_turf_traits) /obj/structure/stone_tile/singularity_pull(atom/singularity, current_size) diff --git a/code/modules/mapfluff/ruins/shoe_factory.dm b/code/modules/mapfluff/ruins/shoe_factory.dm new file mode 100644 index 00000000000..db2f8b20d93 --- /dev/null +++ b/code/modules/mapfluff/ruins/shoe_factory.dm @@ -0,0 +1,116 @@ +/area/ruin/shoe_factory + name = "\improper Shoe Factory" + +/obj/effect/spawner/random/mining_loot/shoe_factory + name = "random shoe factory loot" + desc = "Spawns shoes from the loot list. Shoes have a randomized slowdown modifier." + icon = 'icons/obj/clothing/shoes.dmi' + icon_state = "sneakers" + loot = list() + loot_subtype_path = /obj/item/clothing/shoes + spawn_loot_count = 5 + spawn_scatter_radius = 2 + spawn_random_offset = TRUE + +/obj/effect/spawner/random/mining_loot/shoe_factory/make_item(spawn_loc, type_path_to_make) + var/obj/item/clothing/shoes/shoe = ..() + if(istype(shoe)) + // shoes will spawn anywhere from -0.5 speed modifer (fast) to +0.5 speed (slow) + // See https://tadeohepperle.com/dice-calculator-frontend/?d1=%2B5d3 to view dice chances for rolls (higher rolls == faster shoes) + var/dice_result = roll("5d3") + var/slowdown_modifier = (1 - (dice_result * 0.1)) + shoe.slowdown += slowdown_modifier + + return shoe + +/obj/item/paper/fluff/ruins/shoe_factory/osha_shutdown + name = "Official Spess OSHA Closure Notice" + desc = "A heavily stamped document with a bright red 'CONDEMNED' watermark." + default_raw_text = "SPESS OCCUPATIONAL SAFETY & HEALTH ADMINISTRATION
\ + ORDER OF IMMEDIATE CLOSURE
\ + Facility 44-S (Footwear Manufacturing Division) is hereby ordered to cease all operations indefinitely pending a Class-A kinetic anomaly investigation.
\ + Citations:
\ +
- \
+
- Violation 882.A: Extreme deviation in product density. Random inspections reveal that approximately 99% of 'Sprint-Mate' footwear units possess a localized gravitational anomaly. Users report immense physical exertion, equating standard walking to 'dragging an asteroid through wet cement.' \ +
- Violation 882.B: Lethal kinetic acceleration. The remaining 1% of the production line exhibits zero-friction bluespace properties. A OSHA inspector testing a pair was accelerated to 150 km/h into a reinforced plasma glass window, resulting in critical injuries and a localized hull breach. \ +
\ + All assets are frozen. Do not attempt to transport the remaining stock. If you must move a crate, DO NOT wear the contents." + + +/obj/item/paper/fluff/shoe_factory_osha + name = "Space OSHA Inspection Notice" + default_raw_text = {" +
+ Form 77-B: Mandatory Facility Closure Order
+
+ Facility: Cobbleton & Sons Shoe Manufacturing, Ltd.
+ Inspector: H. Bootsworth, Senior Field Auditor
+ Date of Inspection: ██/██/25██
+ Outcome: IMMEDIATE CLOSURE ORDERED
+
+ Summary of Violations:
+
+ Following a routine workplace safety audit, the following CRITICAL violations + were observed on the factory floor:
+
+ 1. Multiple pairs of finished footwear were found to exhibit anomalous and + hazardous properties inconsistent with standard shoe behavior. Products were + observed (REDACTED), emitting unlicensed energy signatures, and in one case + actively resisting removal from the test subject's feet.
+
+ 2. ZERO quality assurance records were found on-site. When asked about QA + procedures, the floor manager gestured vaguely at a clown and said + "he tries them on sometimes."
+
+ 3. The manufacturing line lacks any form of anomalous material handling + protocols despite the finished product clearly being outside baseline + safety parameters.
+
+ Closing Remarks:
+
+ I have been a Safety Auditor for 15 years across 3 sectors. I have shut down + plasma refineries. I have cited singularity engine rooms. I have written + violations for clown cars exceeding maximum occupancy by a factor of eleven.
+
+ I have never seen shoes do the things these shoes do.
+
+ This facility is to remain sealed until such time as a full anomalous item + review board can assess the product line. Any remaining inventory is + NOT to be removed from the premises.
+
+ (Addendum: if anyone from Corporate is reading this - no, you cannot + sell these. I don't care how much the profit margin is. Stop asking.)
+
+ This notice is the property of Space OSHA. Removal or defacement of this + notice is punishable under Nanotrasen Workplace Safety Code § 4.77.2 + "} + +/obj/item/paper/fluff/shoe_factory_closure + name = "NOTICE OF CLOSURE" + desc = "An official-looking document bearing the Space OSHA seal. Someone has drawn a tiny angry face on the corner." + default_raw_text = {"
+Facility: Unnamed Bootwear Manufactory, Sector (REDACTED)
+Inspecting Officer: Senior Agent Greaves, Division VII
+Status: PERMANENTLY CLOSED, pending owner's response (owner has not responded in 14 standard months).
+
+ +To whom it may concern,
+ +Following a routine compliance audit, this facility has been found in gross violation of no fewer than thirty-two distinct Space OSHA regulations. A full list is appended in Annex B. For the purposes of this summary notice, the most egregious are reproduced below:
+ +1. Complete absence of any functioning Quality Assurance pipeline. Upon questioning, the foreman claimed the previous QA officer "left in a hurry" through an unpatched hole in the ceiling. The hole has been independently verified. The QA officer has not.
+ +2. Production of footwear containing undeclared active components. This office has recovered several finished units displaying behavior wildly inconsistent with what a reasonable being would call "a shoe." The proprietor insists these are "premium features" for "the discerning adventurer." This office insists they are lawsuits.
+ +3. Failure to properly label hazardous stock. If you are reading this notice, and you are standing in the facility, and you are considering putting on a pair of the shoes on the floor: please do not. Or do. We are no longer liable either way.
+ +4. No fire exits. No fire extinguishers. Considerable amounts of flammable leather. We don't even know where to start.
+ +By the authority vested in this office, all operations are to cease immediately. Any remaining inventory is the property of the Crown and/or whoever gets here first.
+ +Stay safe out there.
+ +— Sr. Agent Greaves, Space OSHA
+"If it looks unsafe, it probably is. If it looks safe, it probably still is.""} diff --git a/code/modules/mapping/map_template.dm b/code/modules/mapping/map_template.dm index 0f6ff85eed9..a0a309849dc 100644 --- a/code/modules/mapping/map_template.dm +++ b/code/modules/mapping/map_template.dm @@ -90,14 +90,7 @@ return SSatoms.InitializeAtoms(areas + turfs + movables, returns_created_atoms ? created_atoms : null) - - for(var/turf/unlit as anything in turfs) - if(unlit.space_lit) - continue - var/area/loc_area = unlit.loc - if(!loc_area.static_lighting) - continue - unlit.lighting_build_overlay() + SSlighting.setup_static_lighting_if_needed(turfs) // NOTE, now that Initialize and LateInitialize run correctly, do we really // need these two below? diff --git a/code/modules/meteors/meteor_mode_controller.dm b/code/modules/meteors/meteor_mode_controller.dm index d19d5522bb7..ca22627233d 100644 --- a/code/modules/meteors/meteor_mode_controller.dm +++ b/code/modules/meteors/meteor_mode_controller.dm @@ -9,8 +9,6 @@ GLOBAL_DATUM(meteor_mode, /datum/meteor_mode_controller) var/rampupdelta = 5 /datum/meteor_mode_controller/proc/start_meteor() - if(datum_flags & DF_ISPROCESSING) - return START_PROCESSING(SSprocessing, src) /datum/meteor_mode_controller/process(seconds_per_tick) diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm index 82cdaffa714..ff4bf581cd8 100644 --- a/code/modules/mining/aux_base.dm +++ b/code/modules/mining/aux_base.dm @@ -147,7 +147,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/auxiliary_base, 32) return var/shuttle_error = SSshuttle.moveShuttle(shuttleId, params["shuttle_id"], 1) if(launch_warning) - say("Launch sequence activated! Prepare for drop!!", spans = list("danger")) + say("Launch sequence activated! Prepare for drop!!", spans = list(SPAN_DANGER)) playsound(loc, 'sound/machines/warning-buzzer.ogg', 70, FALSE) launch_warning = FALSE blind_drop_ready = FALSE diff --git a/code/modules/mining/boulder_processing/_boulder_processing.dm b/code/modules/mining/boulder_processing/_boulder_processing.dm index 86a8679d036..324c616ae84 100644 --- a/code/modules/mining/boulder_processing/_boulder_processing.dm +++ b/code/modules/mining/boulder_processing/_boulder_processing.dm @@ -22,6 +22,8 @@ var/points_held = 0 ///The action verb to display to players var/action = "processing" + /// What reagent should be produced when a boost chemical is replaced by the booster_reagent? + var/datum/reagent/waste_chemical = /datum/reagent/water /// Cooldown associated with the sound played for collecting mining points. COOLDOWN_DECLARE(sound_cooldown) @@ -75,14 +77,18 @@ /obj/machinery/bouldertech/examine(mob/user) . = ..() - . += span_notice("The machine reads that it has [span_bold("[points_held] mining points")] stored. Swipe an ID to claim them.") - . += span_notice("Click to remove a stored boulder.") + + . += span_suppradio("The machine reads that it has [EXAMINE_HINT("[points_held] mining points")] stored. Swipe an ID to claim them.") var/boulder_count = 0 for(var/obj/item/boulder/potential_boulder in contents) boulder_count += 1 - . += span_notice("Storage capacity = [boulder_count]/[boulders_held_max] boulders.") - . += span_notice("Can process up to [boulders_processing_count] boulders at a time.") + + if(boulder_count >= 1) + . += span_notice("[EXAMINE_HINT("Right Click")] to manually remove a stored boulder.
") + + . += span_info("Storage capacity = [boulder_count]/[boulders_held_max] boulders.") + . += span_info("This machine can process up to [EXAMINE_HINT("[boulders_processing_count] boulders")] at a time.") if(anchored) . += span_notice("It's [EXAMINE_HINT("anchored")] in place.") @@ -94,6 +100,16 @@ if(panel_open) . += span_notice("The whole machine can be [EXAMINE_HINT("pried")] apart.") +/obj/machinery/bouldertech/examine_more(mob/user) + . = ..() + + var/list/datum/reagents/booster_list = get_booster_reagents() + if(length(booster_list)) + . += span_notice("This machine's output is boosted by chemical intake:
") + for(var/datum/reagent/increment as anything in booster_list) + . += span_info("• [increment::name]: Provides [booster_list[increment] * 10]% Boost") + . += span_notice("
Upon being boosted successfully, \the [src] will produce [EXAMINE_HINT("[waste_chemical.name]")].") + /obj/machinery/bouldertech/update_icon_state() . = ..() var/suffix = "" @@ -102,7 +118,7 @@ icon_state ="[base_icon_state][suffix]" /obj/machinery/bouldertech/CanAllowThrough(atom/movable/mover, border_dir) - if(!anchored) + if(!anchored || !(dir == border_dir || dir == REVERSE_DIR(border_dir))) return FALSE if(istype(mover, /obj/item/stack/sheet)) return TRUE @@ -235,6 +251,12 @@ refining_efficiency = initial(refining_efficiency) //Reset refining efficiency to 100%. +///Returns a map of reagent -> boost amount to increase this machines efficiency +/obj/machinery/bouldertech/proc/get_booster_reagents() + RETURN_TYPE(/list/datum/reagents) + + return list() + /** * Checks if this machine can process this material * Arguments @@ -338,7 +360,8 @@ //if boulders are kept inside because there is no space to eject them, then they could be reprocessed, lets avoid that if(!chosen_boulder.processed_by) - check_for_boosts() + if(length(reagents.reagent_list)) + check_for_boosts() //Handles the mineral boosting, as well as creating waste. Must have reagents in the machine. //here we loop through the boulder's ores var/list/rejected_mats = list() @@ -347,7 +370,7 @@ if(!can_process_material(possible_mat)) rejected_mats[possible_mat] = quantity continue - points_held = round(points_held + (quantity * possible_mat.points_per_unit * MINING_POINT_MACHINE_MULTIPLIER)) // put point total here into machine + points_held += round(quantity * possible_mat.points_per_boulder_unit) // put point total here into machine if(isnull(silo_materials.silo) || !silo_materials.mat_container.insert_amount_mat(quantity, possible_mat)) new possible_mat.sheet_type(drop_location(), floor(quantity / SHEET_MATERIAL_AMOUNT)) @@ -358,9 +381,9 @@ if(!length(chosen_boulder.custom_materials)) playsound(loc, usage_sound, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) if(istype(chosen_boulder, /obj/item/boulder/artifact)) - points_held = round((points_held + MINER_POINT_MULTIPLIER) * MINING_POINT_MACHINE_MULTIPLIER) /// Artifacts give bonus points! + points_held = round((points_held + MINER_POINT_MULTIPLIER)) /// Artifacts give bonus points! chosen_boulder.break_apart() - return//We've processed all the materials in the boulder, so we can just destroy it in break_apart. + return //We've processed all the materials in the boulder, so we can just destroy it in break_apart. chosen_boulder.processed_by = src @@ -387,7 +410,7 @@ breakdown_boulder(potential_boulder) boulders_found = FALSE - //when the boulder is removed it plays sound and displays a balloon alert. don't overlap when that happens + //when the boulder is removed it plays sound and displays a balloon alert. Don't overlap when that happens if(boulders_found) playsound(loc, usage_sound, 29, FALSE, SHORT_RANGE_SOUND_EXTRARANGE) balloon_alert_to_viewers(action) diff --git a/code/modules/mining/boulder_processing/boulder.dm b/code/modules/mining/boulder_processing/boulder.dm index 08376a2efd3..a7ffa8f3a0b 100644 --- a/code/modules/mining/boulder_processing/boulder.dm +++ b/code/modules/mining/boulder_processing/boulder.dm @@ -34,7 +34,7 @@ register_context() AddComponent(/datum/component/two_handed, require_twohands = TRUE, force_unwielded = 0, force_wielded = 5) //Heavy as all hell, it's a boulder, dude. AddComponent(/datum/component/sisyphus_awarder) - AddElement(/datum/element/bane, mob_biotypes = MOB_SPECIAL, added_damage = 20, requires_combat_mode = FALSE) + AddComponent(/datum/component/bane, affected_biotypes = MOB_SPECIAL, added_damage = 20) /obj/item/boulder/Destroy(force) SSore_generation.available_boulders -= src @@ -110,6 +110,7 @@ return if(HAS_TRAIT(user, TRAIT_BOULDER_BREAKER)) manual_process(null, user, INATE_BOULDER_SPEED_MULTIPLIER) //A little hacky but it works around the speed of the blackboard task selection process for now. + return TRUE /obj/item/boulder/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) . = ..() diff --git a/code/modules/mining/boulder_processing/boulder_types.dm b/code/modules/mining/boulder_processing/boulder_types.dm index ec67648fe2a..1a6979f3885 100644 --- a/code/modules/mining/boulder_processing/boulder_types.dm +++ b/code/modules/mining/boulder_processing/boulder_types.dm @@ -1,3 +1,6 @@ +#define BONUS_MATS_MINIMUM 1 +#define BONUS_MATS_MAXIMUM 5 + ///Boulders with special artificats that can give higher mining points /obj/item/boulder/artifact name = "artifact boulder" @@ -7,10 +10,14 @@ var/artifact_type = /obj/item/relic/lavaland /// References to the relic inside the boulder, if any. var/obj/item/artifact_inside + /// Bonus materials to add to this boulder, in addition to existing materials created by the ore vent. + var/datum/material/bonus_mat /obj/item/boulder/artifact/Initialize(mapload) . = ..() artifact_inside = new artifact_type(src) /// This could be poggers for archaeology in the future. + if(bonus_mat) + add_bonus_mats() /obj/item/boulder/artifact/Destroy(force) QDEL_NULL(artifact_inside) @@ -27,7 +34,24 @@ /obj/item/boulder/artifact/update_icon_state() . = ..() - icon_state = "boulder_artifact" // Hardset to artifact sprites for consistency + icon_state = initial(icon_state) // Hardset to artifact sprites for consistency + +/// Adds a random amount of material to an artifact boulder, determined by BONUS_MAT defines and of the type bonus_mat defined on the boulder. +/obj/item/boulder/artifact/proc/add_bonus_mats() + var/list/bonus_mats = list() + if(custom_materials) + bonus_mats = custom_materials.Copy() + bonus_mats[bonus_mat] += rand(BONUS_MATS_MINIMUM, BONUS_MATS_MAXIMUM) * SHEET_MATERIAL_AMOUNT + set_custom_materials(bonus_mats) + + +/obj/item/boulder/artifact/bluespace + icon_state = "boulder_artifact_BS" + bonus_mat = /datum/material/bluespace + +/obj/item/boulder/artifact/diamond + icon_state = "boulder_artifact_diamond" + bonus_mat = /datum/material/diamond ///Boulders usually spawned in lavaland labour camp area /obj/item/boulder/gulag @@ -77,3 +101,6 @@ desc = "A bizarre, twisted boulder. Wait, wait no, it's just a rock." custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 1.1, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 1.1) durability = 1 + +#undef BONUS_MATS_MINIMUM +#undef BONUS_MATS_MAXIMUM diff --git a/code/modules/mining/boulder_processing/refinery.dm b/code/modules/mining/boulder_processing/refinery.dm index 861829219e2..f65669d3b40 100644 --- a/code/modules/mining/boulder_processing/refinery.dm +++ b/code/modules/mining/boulder_processing/refinery.dm @@ -5,12 +5,40 @@ */ /obj/machinery/bouldertech/refinery name = "boulder refinery" - desc = "BR for short. Accepts boulders and refines non-metallic ores into sheets using internal chemicals." + desc = "Accepts boulders and refines non-metallic ores into sheets using internal chemicals." icon_state = "stacker" base_icon_state = "stacker" circuit = /obj/item/circuitboard/machine/refinery usage_sound = 'sound/machines/mining/refinery.ogg' action = "crushing" + waste_chemical = /datum/reagent/toxin/acid/industrial_waste + pixel_y = 1 + +/obj/machinery/bouldertech/refinery/Initialize(mapload) + . = ..() + AddComponent(/datum/component/plumbing/boulder_reactions) + AddElement(/datum/element/simple_rotation) + update_appearance(UPDATE_OVERLAYS) + +/obj/machinery/bouldertech/refinery/update_icon_state() + . = ..() + set_light_on(anchored && is_operational && !panel_open) + +/obj/machinery/bouldertech/refinery/create_reagents(max_vol, flags) + QDEL_NULL(reagents) + reagents = new /datum/reagents/plumbing(max_vol, flags) + reagents.my_atom = src + +/obj/machinery/bouldertech/refinery/get_booster_reagents() + var/static/list/booster_reagents + if(!length(booster_reagents)) + booster_reagents = list( + /datum/reagent/toxin/acid = 1, + /datum/reagent/toxin/acid/fluacid = 2, + /datum/reagent/toxin/acid/nitracid = 3, + /datum/reagent/teslium = 5, + ) + return booster_reagents /obj/machinery/bouldertech/refinery/can_process_material(datum/material/possible_mat) var/static/list/processable_materials @@ -37,6 +65,43 @@ boulders_processing_count += servo.tier boulders_processing_count = ROUND_UP((boulders_processing_count / 8) * boulders_held_max) + var/new_volume = 0 + for(var/obj/item/reagent_containers/beaker in component_parts) + new_volume += beaker.volume + if(!reagents) + create_reagents(new_volume, OPENCONTAINER) + reagents.maximum_volume = new_volume + + +/obj/machinery/bouldertech/refinery/check_for_boosts() + . = ..() //resets to 1.00 efficiency in the parent + + var/highest_boost = 0 + var/datum/reagent/biggest_booster + var/list/datum/reagents/booster_list = get_booster_reagents() + for(var/datum/reagent/booster as anything in booster_list) + var/booster_volume = booster_list[booster] + if(!reagents.has_reagent(booster, booster_volume)) //check that we have the associated quantity of the chem in order to perform the boost. + continue + if(booster_list[booster] > highest_boost) + highest_boost = booster_volume + biggest_booster = booster + + if(!biggest_booster) + return + + reagents.remove_reagent(biggest_booster, highest_boost) //remove the associated amount from the reagents + refining_efficiency = 1 + (highest_boost / 10) //Results in a boost from 10-30% + reagents.add_reagent(waste_chemical, highest_boost) + +/obj/machinery/bouldertech/refinery/plunger_act(obj/item/plunger/attacking_plunger, mob/living/user, reinforced) + . = ..() + balloon_alert(user, "emptying...") + if(do_after(user, 2 SECONDS, src)) + reagents.expose(drop_location()) + reagents.clear_reagents() + + /** * Your other new favorite industrial waste magnet! * Accepts boulders and produces sheets of metallic materials. @@ -44,7 +109,7 @@ */ /obj/machinery/bouldertech/refinery/smelter name = "boulder smelter" - desc = "BS for short. Accept boulders and refines metallic ores into sheets." + desc = "Accept boulders and refines metallic ores into sheets." icon_state = "smelter" base_icon_state = "smelter" light_system = OVERLAY_LIGHT @@ -54,11 +119,24 @@ circuit = /obj/item/circuitboard/machine/smelter usage_sound = 'sound/machines/mining/smelter.ogg' action = "smelting" + pixel_x = -1 /obj/machinery/bouldertech/refinery/smelter/Initialize(mapload) . = ..() update_light_value() + +/obj/machinery/bouldertech/refinery/smelter/get_booster_reagents() + var/static/list/booster_reagents + if(!length(booster_reagents)) + booster_reagents = list( + /datum/reagent/fuel = 1, + /datum/reagent/thermite = 2, + /datum/reagent/gunpowder = 3, + /datum/reagent/liquid_dark_matter = 5, + ) + return booster_reagents + /obj/machinery/bouldertech/refinery/smelter/can_process_material(datum/material/possible_mat) var/static/list/processable_materials if(!length(processable_materials)) diff --git a/code/modules/mining/equipment/kinetic_crusher/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher/kinetic_crusher.dm index 55533341d89..9f72047fcde 100644 --- a/code/modules/mining/equipment/kinetic_crusher/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher/kinetic_crusher.dm @@ -218,7 +218,7 @@ var/backstabbed = FALSE var/def_check = target.getarmor(type = BOMB) // Backstab bonus - if(check_behind(user, target) || boosted_mark) + if(check_behind(user, target) && !HAS_TRAIT(target, TRAIT_BACKSTAB_IMMUNE) || boosted_mark) backstabbed = TRUE combined_damage += backstab_bonus playsound(user, backstab_sound, 100, TRUE) //Seriously who spelled it wrong @@ -336,6 +336,9 @@ fired_from = null return ..() +/obj/projectile/destabilizer/is_hostile_projectile() + return TRUE + /obj/projectile/destabilizer/proc/on_parry(mob/user) SIGNAL_HANDLER boosted = TRUE diff --git a/code/modules/mining/equipment/kinetic_crusher/trophies_fauna.dm b/code/modules/mining/equipment/kinetic_crusher/trophies_fauna.dm index 9b6b6561aff..dfa4cf8e502 100644 --- a/code/modules/mining/equipment/kinetic_crusher/trophies_fauna.dm +++ b/code/modules/mining/equipment/kinetic_crusher/trophies_fauna.dm @@ -144,7 +144,7 @@ // Bileworm /obj/item/crusher_trophy/bileworm_spewlet name = "bileworm spewlet" - icon = 'icons/mob/simple/lavaland/bileworm.dmi' + icon = 'icons/obj/mining_zones/artefacts.dmi' icon_state = "bileworm_spewlet" desc = "A baby bileworm. Suitable as a trophy for a kinetic crusher." denied_type = /obj/item/crusher_trophy/bileworm_spewlet @@ -179,7 +179,7 @@ /obj/item/crusher_trophy/bileworm_spewlet/on_projectile_hit_mineral(turf/closed/mineral, mob/living/user) for(var/turf/closed/mineral/mineral_turf in RANGE_TURFS(1, mineral) - mineral) - mineral_turf.gets_drilled(user, 1) + mineral_turf.drill_aoe(user, 0.2) //yes this is a /mob_cooldown subtype being added to an item. I can't recommend you do what I'm doing /datum/action/cooldown/mob_cooldown/projectile_attack/dir_shots/spewlet diff --git a/code/modules/mining/equipment/mineral_scanner.dm b/code/modules/mining/equipment/mineral_scanner.dm index 8d763fd2f67..93b0a26a3df 100644 --- a/code/modules/mining/equipment/mineral_scanner.dm +++ b/code/modules/mining/equipment/mineral_scanner.dm @@ -27,10 +27,10 @@ /obj/item/mining_scanner/admin /obj/item/mining_scanner/admin/attack_self(mob/user) - for(var/turf/closed/mineral/mineral_turf in world) - if(mineral_turf.scan_state) - mineral_turf.icon = mineral_turf.scan_icon - mineral_turf.icon_state = mineral_turf.scan_state + for(var/turf/closed/mineral/rock in world) + if(rock.scan_state) + var/mutable_appearance/rock_overlay = mutable_appearance(rock.scan_icon, rock.scan_state, FLASH_LAYER, rock, ABOVE_LIGHTING_PLANE, appearance_flags = RESET_TRANSFORM) + rock.add_overlay(rock_overlay) qdel(src) /obj/item/t_scanner/adv_mining_scanner @@ -86,19 +86,8 @@ vent.add_mineral_overlays() for(var/turf/closed/mineral/mineral in RANGE_TURFS(range, start_turf)) - if(!mineral.scan_state) - continue - - var/obj/effect/temp_visual/mining_overlay/scan_overlay = locate(/obj/effect/temp_visual/mining_overlay) in mineral - if(!scan_overlay) - scan_overlay = new(mineral) - scan_overlay.icon = mineral.scan_icon - scan_overlay.icon_state = mineral.scan_state - continue - - deltimer(scan_overlay.timerid) - scan_overlay.timerid = QDEL_IN_STOPPABLE(scan_overlay, scan_overlay.duration) - animate(scan_overlay, alpha = 0, time = scan_overlay.duration, easing = scan_overlay.easing_style) + if(mineral.scan_state) + mineral.flash_scan() if(vents_nearby && scanner) if(undiscovered) @@ -111,7 +100,8 @@ /obj/effect/temp_visual/mining_overlay plane = HIGH_GAME_PLANE layer = FLASH_LAYER - icon = 'icons/effects/ore_visuals.dmi' + icon = 'icons/blanks/480x480.dmi' + icon_state = "nothing" appearance_flags = NONE // to avoid having TILE_BOUND in the flags, so that the 480x480 icon states let you see it no matter where you are duration = 3.5 SECONDS pixel_x = -224 diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm index 73ebdf10a71..d16be7e4b4c 100644 --- a/code/modules/mining/equipment/mining_tools.dm +++ b/code/modules/mining/equipment/mining_tools.dm @@ -185,7 +185,7 @@ /obj/item/shovel/serrated/Initialize(mapload) . = ..() - AddElement(/datum/element/bane, mob_biotypes = MOB_ORGANIC, damage_multiplier = 1) //You may be horridly cursed now, but at least you kill the living a whole lot more easily! + AddComponent(/datum/component/bane, affected_biotypes = MOB_ORGANIC, damage_multiplier = 2) //You may be horridly cursed now, but at least you kill the living a whole lot more easily! /obj/item/shovel/serrated/examine(mob/user) . = ..() diff --git a/code/modules/mining/equipment/monster_organs/rush_gland.dm b/code/modules/mining/equipment/monster_organs/rush_gland.dm index 894a9dbe0db..f22bf029a8c 100644 --- a/code/modules/mining/equipment/monster_organs/rush_gland.dm +++ b/code/modules/mining/equipment/monster_organs/rush_gland.dm @@ -24,6 +24,7 @@ /obj/item/organ/monster_core/rush_gland/on_mob_insert(mob/living/carbon/organ_owner) . = ..() RegisterSignal(organ_owner, COMSIG_GOLIATH_TENTACLED_GRABBED, PROC_REF(trigger_organ_action_on_sig)) + RegisterSignal(organ_owner, COMSIG_TENDRIL_TENTACLED_GRABBED, PROC_REF(trigger_organ_action_on_sig)) /obj/item/organ/monster_core/rush_gland/on_mob_remove(mob/living/carbon/organ_owner, special, movement_flags) . = ..() @@ -34,7 +35,9 @@ /obj/item/organ/monster_core/rush_gland/proc/trigger_organ_action_on_sig(datum/source) SIGNAL_HANDLER + INVOKE_ASYNC(src, PROC_REF(trigger_organ_action)) + return COMPONENT_GOLIATH_CANCEL_TENTACLE_GRAB /** * Status effect: Makes you run faster and ignore damage speed penalties for a short duration. diff --git a/code/modules/mining/equipment/resonator.dm b/code/modules/mining/equipment/resonator.dm index 8c5ffb873a7..dcd980e71cd 100644 --- a/code/modules/mining/equipment/resonator.dm +++ b/code/modules/mining/equipment/resonator.dm @@ -131,8 +131,9 @@ SEND_SIGNAL(creator, COMSIG_LIVING_RESONATOR_BURST, creator, attacked_living) to_chat(attacked_living, span_userdanger("[src] ruptured with you in it!")) attacked_living.apply_damage(resonance_damage, BRUTE) - attacked_living.add_movespeed_modifier(/datum/movespeed_modifier/resonance) - addtimer(CALLBACK(attacked_living, TYPE_PROC_REF(/mob, remove_movespeed_modifier), /datum/movespeed_modifier/resonance), 10 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE) + if(!QDELETED(attacked_living)) + attacked_living.add_movespeed_modifier(/datum/movespeed_modifier/resonance) + addtimer(CALLBACK(attacked_living, TYPE_PROC_REF(/mob, remove_movespeed_modifier), /datum/movespeed_modifier/resonance), 10 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE) for(var/obj/effect/temp_visual/resonance/field in orange(1, src)) if(field.rupturing) continue diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm index 7ba37130ebc..1f31fbb6053 100644 --- a/code/modules/mining/equipment/survival_pod.dm +++ b/code/modules/mining/equipment/survival_pod.dm @@ -267,20 +267,12 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/door/window/survival_pod/left, 0) max_n_of_items = 10 pixel_y = -4 -/obj/machinery/smartfridge/survival_pod/welder_act(mob/living/user, obj/item/tool) - return NONE - -/obj/machinery/smartfridge/survival_pod/wrench_act(mob/living/user, obj/item/tool) - return NONE - -/obj/machinery/smartfridge/survival_pod/screwdriver_act(mob/living/user, obj/item/tool) - return NONE - -/obj/machinery/smartfridge/survival_pod/crowbar_act(mob/living/user, obj/item/tool) - return NONE - /obj/machinery/smartfridge/survival_pod/Initialize(mapload) AddElement(/datum/element/update_icon_blocker) + AddElement(/datum/element/tool_blocker, TOOL_WELDER, TOOL_ACT_PRIMARY) + AddElement(/datum/element/tool_blocker, TOOL_SCREWDRIVER, TOOL_ACT_PRIMARY) + AddElement(/datum/element/tool_blocker, TOOL_WRENCH, TOOL_ACT_PRIMARY) + AddElement(/datum/element/tool_blocker, TOOL_CROWBAR, TOOL_ACT_PRIMARY) return ..() /obj/machinery/smartfridge/survival_pod/preloaded/Initialize(mapload) diff --git a/code/modules/mining/fulton.dm b/code/modules/mining/fulton.dm index 8738752af33..e75e36e55fa 100644 --- a/code/modules/mining/fulton.dm +++ b/code/modules/mining/fulton.dm @@ -96,6 +96,10 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons) if(!do_after(user, 5 SECONDS, target = thing)) return ITEM_INTERACT_BLOCKING + if(QDELETED(beacon)) + balloon_alert(user, "beacon lost!") + return ITEM_INTERACT_BLOCKING + balloon_alert_to_viewers("extracting!") if(loc == user && ishuman(user)) var/mob/living/carbon/human/human_user = user @@ -125,6 +129,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons) return ITEM_INTERACT_SUCCESS /obj/item/extraction_pack/proc/create_balloon(atom/movable/thing, mob/living/user, obj/effect/extraction_holder/holder_obj, mutable_appearance/balloon2) + var/turf/beacon_turf = get_turf(beacon_ref.resolve()) var/mutable_appearance/balloon = mutable_appearance('icons/effects/fulton_balloon.dmi', "fulton_balloon", layer = VEHICLE_LAYER, appearance_flags = RESET_COLOR | RESET_ALPHA | RESET_TRANSFORM | KEEP_APART) balloon.pixel_z = 10 holder_obj.cut_overlay(balloon2) @@ -151,7 +156,6 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons) sleep(3 SECONDS) var/turf/flooring_near_beacon = list() - var/turf/beacon_turf = get_turf(beacon_ref.resolve()) for(var/turf/floor as anything in RANGE_TURFS(1, beacon_turf)) if(!floor.is_blocked_turf()) flooring_near_beacon += floor diff --git a/code/modules/mining/laborcamp/laborstacker.dm b/code/modules/mining/laborcamp/laborstacker.dm index 2478b84b7f7..170baf58a3d 100644 --- a/code/modules/mining/laborcamp/laborstacker.dm +++ b/code/modules/mining/laborcamp/laborstacker.dm @@ -29,7 +29,8 @@ /obj/machinery/mineral/labor_claim_console/proc/register_shuttle_signal() SIGNAL_HANDLER var/obj/docking_port/mobile/laborshuttle = SSshuttle.getShuttle("laborcamp") - RegisterSignal(laborshuttle, COMSIG_SHUTTLE_SHOULD_MOVE, PROC_REF(on_laborshuttle_can_move)) + if(laborshuttle) + RegisterSignal(laborshuttle, COMSIG_SHUTTLE_SHOULD_MOVE, PROC_REF(on_laborshuttle_can_move)) UnregisterSignal(SSshuttle, COMSIG_SUBSYSTEM_POST_INITIALIZE) /obj/machinery/mineral/labor_claim_console/Destroy() @@ -77,6 +78,11 @@ data["can_go_home"] = can_go_home return data +/obj/machinery/mineral/labor_claim_console/ui_static_data(mob/user) + var/list/data = list() + data["shuttle_exists"] = !isnull(SSshuttle.getShuttle("laborcamp")) + return data + /obj/machinery/mineral/labor_claim_console/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) @@ -103,6 +109,12 @@ COOLDOWN_START(src, say_cooldown, 2 SECONDS) if("move_shuttle") + if(isnull(SSshuttle.getShuttle("laborcamp"))) + if(COOLDOWN_FINISHED(src, say_cooldown)) + say("Shuttle not found.") + COOLDOWN_START(src, say_cooldown, 2 SECONDS) + return + var/list/labor_shuttle_mobs = find_labor_shuttle_mobs() if(length(labor_shuttle_mobs) > 1 || labor_shuttle_mobs[1] != user_mob) if(COOLDOWN_FINISHED(src, say_cooldown)) @@ -171,6 +183,7 @@ /**********************Prisoner Collection Unit**************************/ /obj/machinery/mineral/stacking_machine/laborstacker + name = "labor camp collection unit" force_connect = TRUE damage_deflection = 21 //otherwise prisoners will destroy it ///Idle points sitting in the machine left to be claimed. diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm index 778b2be395d..87279ec4c8d 100644 --- a/code/modules/mining/lavaland/ash_flora.dm +++ b/code/modules/mining/lavaland/ash_flora.dm @@ -40,7 +40,7 @@ icon_state = base_icon_state /obj/structure/flora/ash/tall_shroom //exists only so that the spawning check doesn't allow these spawning near other things - regrowth_time_low = 4200 + regrowth_time_low = 7 MINUTES /obj/structure/flora/ash/leaf_shroom name = "leafy mushrooms" @@ -54,8 +54,8 @@ harvest_message_med = "You pluck a number of leaves, leaving a few unsuitable ones." harvest_message_high = "You pluck quite a lot of suitable leaves." harvest_time = 20 - regrowth_time_low = 2400 - regrowth_time_high = 6000 + regrowth_time_low = 4 MINUTES + regrowth_time_high = 10 MINUTES /obj/structure/flora/ash/leaf_shroom/get_potential_products() return list(/obj/item/food/grown/ash_flora/mushroom_leaf = 1) @@ -72,8 +72,8 @@ harvest_message_med = "You slice off a few conks from the larger mushrooms." harvest_message_high = "You slice off a number of caps and conks from these mushrooms." harvest_time = 50 - regrowth_time_low = 3000 - regrowth_time_high = 5400 + regrowth_time_low = 5 MINUTES + regrowth_time_high = 9 MINUTES /obj/structure/flora/ash/cap_shroom/get_potential_products() return list(/obj/item/food/grown/ash_flora/mushroom_cap = 1) @@ -92,8 +92,8 @@ harvest_message_med = "You pick and decapitate several mushrooms for their stems." harvest_message_high = "You acquire a number of stems from these mushrooms." harvest_time = 40 - regrowth_time_low = 3000 - regrowth_time_high = 6000 + regrowth_time_low = 5 MINUTES + regrowth_time_high = 10 MINUTES /obj/structure/flora/ash/stem_shroom/get_potential_products() return list(/obj/item/food/grown/ash_flora/mushroom_stem = 1) @@ -110,8 +110,8 @@ harvest_message_med = "You pick several cactus fruit." //shouldn't show up, because you can't get more than two harvest_message_high = "You pick a pair of cactus fruit." harvest_time = 10 - regrowth_time_low = 4800 - regrowth_time_high = 7200 + regrowth_time_low = 8 MINUTES + regrowth_time_high = 12 MINUTES can_uproot = FALSE //Don't want 50 in one tile to decimate whoever dare step on the mass of cacti /obj/structure/flora/ash/cacti/Initialize(mapload) @@ -133,8 +133,8 @@ harvest_message_med = "You grab a good haul of mushrooms." harvest_message_high = "You hit the mushroom motherlode and make off with a bunch of tasty mushrooms." harvest_time = 25 - regrowth_time_low = 3000 - regrowth_time_high = 5400 + regrowth_time_low = 5 MINUTES + regrowth_time_high = 9 MINUTES number_of_variants = 2 harvest_message_true_thresholds = FALSE @@ -155,8 +155,8 @@ harvest_message_low = "You pluck a single, suitable flower." harvest_message_med = "You pluck a number of flowers, leaving a few unsuitable ones." harvest_message_high = "You pluck quite a lot of suitable flowers." - regrowth_time_low = 2500 - regrowth_time_high = 4000 + regrowth_time_low = 4 MINUTES + regrowth_time_high = 7 MINUTES number_of_variants = 2 /obj/structure/flora/ash/fireblossom/get_potential_products() @@ -174,6 +174,50 @@ update_light() return ..() +/obj/structure/flora/ash/glowgrowth + name = "glowgrowth colony" + desc = "A colony of bioluminescent fungi growing on a hot air vent, feeding off mineral particulate blowing through it." + icon_state = "glowgrowth1" + base_icon_state = "glowgrowth" + density = TRUE // Large rock formations with plants ontop + light_range = 1.7 + light_power = 1.2 + light_color = "#67b6a5" + harvested_name = "hot air vent" + harvested_desc = "A ridged porous rock formation exuming hot air from the depths of the planet." + harvest_amount_high = 4 + harvest_verb = "scrape" + harvest_message_low = "You scrape off a thin layer of glowing fungi." + harvest_message_med = "You pick a sizeable patch of glowing fungi." + harvest_message_high = "You grab a large fistful of glowing fungi." + regrowth_time_low = 8 MINUTES + regrowth_time_high = 16 MINUTES + number_of_variants = 3 + +/obj/structure/flora/ash/glowgrowth/Initialize(mapload) + . = ..() + update_appearance() + +/obj/structure/flora/ash/glowgrowth/get_potential_products() + return list(/obj/item/food/grown/ash_flora/glowgrowth = 1) + +/obj/structure/flora/ash/glowgrowth/after_harvest() + set_light_on(FALSE) + update_light() + update_appearance() + return ..() + +/obj/structure/flora/ash/glowgrowth/regrow() + set_light_on(TRUE) + update_light() + update_appearance() + return ..() + +/obj/structure/flora/ash/glowgrowth/update_overlays() + . = ..() + if (!harvested) + . += emissive_appearance(icon, "[icon_state]e", src, alpha = 120) + ///Snow flora to exist on icebox. /obj/structure/flora/ash/chilly name = "springy grassy fruit" @@ -283,6 +327,13 @@ // Fire flowers make fireproof raptors AddElement(/datum/element/raptor_food, color_chances = string_list(list(/datum/raptor_color/blue = 5))) +/obj/item/food/grown/ash_flora/glowgrowth + name = "glowgrowth sheet" + desc = "A thick sheet of glowing fungi." + icon_state = "glowgrowth" + seed = /obj/item/seeds/lavaland/glowgrowth // Cannot be grown in hydroponics as it feeds off mineral air + wine_power = 50 + // SEEDS /obj/item/seeds/lavaland @@ -410,6 +461,17 @@ growing_icon = 'icons/obj/service/hydroponics/growing_flowers.dmi' reagents_add = list(/datum/reagent/consumable/tinlux = 0.04, /datum/reagent/consumable/nutriment = 0.03, /datum/reagent/carbon = 0.05) +/obj/item/seeds/lavaland/glowgrowth + name = "glowgrowth mycelium pack" + desc = "This mycelium grows into glowgrowth fungi." + plantname = "Glowgrowth Fungi" + icon_state = "mycelium-glowgrowth" + species = "glowgrowth" + product = /obj/item/food/grown/ash_flora/glowgrowth + genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/fire_resistance, /datum/plant_gene/trait/glow/blue) // Fungal metab doesn't do anything (cause it can't be planted) but it shows up in analyzers + reagents_add = list(/datum/reagent/luminescent_fluid/cyan = 0.06, /datum/reagent/consumable/nutriment = 0.01, /datum/reagent/silicon = 0.03) + seed_flags = parent_type::seed_flags | NO_PLANTING + //CRAFTING /datum/crafting_recipe/mushroom_bowl @@ -423,12 +485,9 @@ name = "mushroom bowl" desc = "A bowl made out of mushrooms. Not food, though it might have contained some at some point." icon = 'icons/obj/mining_zones/ash_flora.dmi' + base_icon_state = "mushroom_bowl" icon_state = "mushroom_bowl" fill_icon_state = "fullbowl" fill_icon = 'icons/obj/mining_zones/ash_flora.dmi' custom_materials = null -/obj/item/reagent_containers/cup/bowl/mushroom_bowl/update_icon_state() - if(!reagents.total_volume) - icon_state = "mushroom_bowl" - return ..() diff --git a/code/modules/mining/lavaland/mining_loot/megafauna/colossus.dm b/code/modules/mining/lavaland/mining_loot/megafauna/colossus.dm index a5c24eabb95..f130cd891e5 100644 --- a/code/modules/mining/lavaland/mining_loot/megafauna/colossus.dm +++ b/code/modules/mining/lavaland/mining_loot/megafauna/colossus.dm @@ -383,7 +383,6 @@ possessor.mind.transfer_to(holder_animal) var/datum/action/exit_possession/escape = new(holder_animal) escape.Grant(holder_animal) - remove_verb(holder_animal, /mob/living/verb/pulled) /obj/structure/closet/stasis/dump_contents(kill = TRUE) for(var/mob/living/possessor in src) diff --git a/code/modules/mining/lavaland/mining_loot/megafauna/hierophant.dm b/code/modules/mining/lavaland/mining_loot/megafauna/hierophant.dm index 520502aaf30..38f51568544 100644 --- a/code/modules/mining/lavaland/mining_loot/megafauna/hierophant.dm +++ b/code/modules/mining/lavaland/mining_loot/megafauna/hierophant.dm @@ -2,9 +2,9 @@ /obj/item/hierophant_club name = "hierophant club" - desc = "The strange technology of this large club allows various nigh-magical teleportation feats. It used to beat you, but now you can set the beat." - icon_state = "hierophant_club_ready_beacon" - inhand_icon_state = "hierophant_club_ready_beacon" + desc = "The shriveled remains of the Hierophant hold some remnant of its power. It used it to beat you, but now you can set the beat." + icon_state = "hierophant_club" + inhand_icon_state = "hierophant_club" icon_angle = -135 icon = 'icons/obj/mining_zones/artefacts.dmi' lefthand_file = 'icons/mob/inhands/64x64_lefthand.dmi' @@ -33,6 +33,9 @@ . = ..() AddElement(/datum/element/update_icon_updates_onmob) blink = new(src) + update_appearance(UPDATE_OVERLAYS) + + RegisterSignals(blink, list(COMSIG_DASH_ACTION_CHARGED, COMSIG_DASH_ACTION_DASHED), PROC_REF(on_action_updated)) /obj/item/hierophant_club/Destroy(force) QDEL_NULL(blink) @@ -91,9 +94,23 @@ return ITEM_INTERACT_SUCCESS return NONE -/obj/item/hierophant_club/update_icon_state() - icon_state = inhand_icon_state = "hierophant_club[blink?.current_charges > 0 ? "_ready" : ""][!QDELETED(beacon) ? "" : "_beacon"]" - return ..() +/// When dash action is used or recharges, update icon state +/obj/item/hierophant_club/proc/on_action_updated() + SIGNAL_HANDLER + update_appearance(UPDATE_OVERLAYS) + +/obj/item/hierophant_club/update_overlays() + . = ..() + if (QDELETED(beacon)) + . += "hierophant_beacon" + if (blink?.current_charges) + . += "hierophant_ready" + +/obj/item/hierophant_club/worn_overlays(mutable_appearance/standing, isinhands, icon_file) + . = ..() + if (blink?.current_charges) + . += "hierophant_ready" + /obj/item/hierophant_club/ui_action_click(mob/user, action) if (teleporting) @@ -212,7 +229,7 @@ user.update_mob_action_buttons() user.visible_message(span_hierophant_warning("[user] places a strange machine beneath [user.p_their()] feet!"), span_hierophant("You detach the hierophant beacon, allowing you to teleport yourself and any allies to it at any time!")) to_chat(user, span_hierophant("You can remove the beacon to place it again by striking it with the club.")) - update_appearance(UPDATE_ICON_STATE) + update_appearance(UPDATE_OVERLAYS) /obj/item/hierophant_club/proc/beacon_destroyed(datum/source) SIGNAL_HANDLER @@ -222,7 +239,7 @@ else visible_message(span_hierophant("With a loud snap, a new beacon appears at [src]'s pommel.")) playsound(src, 'sound/effects/magic/blind.ogg', 50, TRUE, -4) - update_appearance(UPDATE_ICON_STATE) + update_appearance(UPDATE_OVERLAYS) #define HIEROPHANT_BLINK_RANGE 5 #define HIEROPHANT_BLINK_COOLDOWN (15 SECONDS) @@ -240,14 +257,10 @@ /datum/action/innate/dash/hierophant/teleport(mob/user, atom/target) var/dist = get_dist(user, target) if(dist > HIEROPHANT_BLINK_RANGE) - user.balloon_alert(user, "destination out of range!") + user.balloon_alert(user, "too far!") return FALSE - . = ..() - - var/obj/item/hierophant_club/club = target - if(!istype(club)) - club.update_appearance(UPDATE_ICON_STATE) + return ..() /datum/action/innate/dash/hierophant/charge() . = ..() diff --git a/code/modules/mining/lavaland/mining_loot/megafauna/legion.dm b/code/modules/mining/lavaland/mining_loot/megafauna/legion.dm index cb8fa553271..4ec0dbfe49e 100644 --- a/code/modules/mining/lavaland/mining_loot/megafauna/legion.dm +++ b/code/modules/mining/lavaland/mining_loot/megafauna/legion.dm @@ -95,7 +95,7 @@ playsound(src, 'sound/effects/magic/lightningshock.ogg', 10, TRUE, extrarange = SILENCED_SOUND_EXTRARANGE, falloff_distance = 0) targeted_turfs += target_turf balloon_alert(user, "you aim at [target_turf]...") - new /obj/effect/temp_visual/telegraphing/thunderbolt(target_turf) + new /obj/effect/temp_visual/telegraphing/circle(target_turf) addtimer(CALLBACK(src, PROC_REF(throw_thunderbolt), target_turf, power_boosted), 1.5 SECONDS) thunder_charges-- addtimer(CALLBACK(src, PROC_REF(recharge)), thunder_charge_time) diff --git a/code/modules/mining/machine_silo.dm b/code/modules/mining/machine_silo.dm index d35002d32f5..deb61dca16b 100644 --- a/code/modules/mining/machine_silo.dm +++ b/code/modules/mining/machine_silo.dm @@ -564,7 +564,7 @@ var/alist/user_data /datum/ore_silo_log/New(obj/machinery/M, _action, _amount, _noun, list/mats=list(), alist/user_data) - timestamp = station_time_timestamp() + timestamp = round_timestamp() machine_name = M.name area_name = get_area_name(M, TRUE) action = _action diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 3b8d40d66d6..8f965844558 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -10,16 +10,29 @@ full_w_class = WEIGHT_CLASS_BULKY singular_name = "ore chunk" material_flags = MATERIAL_EFFECTS - var/points = 0 //How many points this ore gets you from the ore redemption machine - var/refined_type = null //What this ore defaults to being refined into - var/mine_experience = 5 //How much experience do you get for mining this ore? novariants = TRUE // Ore stacks handle their icon updates themselves to keep the illusion that there's more going - var/list/stack_overlays - var/scan_state = "" //Used by mineral turfs for their scan overlay. - var/spreadChance = 0 //Also used by mineral turfs for spreading veins drop_sound = SFX_STONE_DROP pickup_sound = SFX_STONE_PICKUP sound_vary = TRUE + /// How many points this ore gets you from the ore redemption machine + var/points = 0 + /// What this ore defaults to being refined into + var/refined_type = null + /// How much experience do you get for mining this ore? + var/mine_experience = 5 + var/list/stack_overlays + /// Used by mineral turfs for their scan overlay. + var/scan_state = "" + /// Chance that we'll spawn as a vein rather than a sole tile + var/spread_chance = 0 + /// Type of ore vein we spawn, cluster/scatter/plain/branching + var/vein_type = ORE_VEIN_CLUSTER + /// Optimal distance from open turfs for us to spawn, 1 is next to an open tile + var/vein_distance = 1 + /// Minimum distance that a vein can span, radius for cluster/scatter, maximum length for plain/branching + var/min_vein_size = 1 + /// Minimum distance that a vein can span, radius for cluster/scatter, maximum length for plain/branching + var/max_vein_size = 2 /obj/item/stack/ore/update_overlays() . = ..() @@ -52,29 +65,29 @@ return isnull(refined_type) ? null : src /obj/item/stack/ore/welder_act(mob/living/user, obj/item/I) - ..() + . = ..() if(!refined_type) return TRUE - if(I.use_tool(src, user, 0, volume=50)) - new refined_type(drop_location()) - use(1) + if(!I.use_tool(src, user, 0, volume = 50)) + return TRUE + var/sheets_made = values_sum(mats_per_unit) / SHEET_MATERIAL_AMOUNT + new refined_type(drop_location(), max(1, floor(sheets_made))) + use(max(1, ceil(1 / sheets_made))) return TRUE /obj/item/stack/ore/fire_act(exposed_temperature, exposed_volume) . = ..() if(isnull(refined_type)) return - else - var/probability = (rand(0,100))/100 - var/burn_value = probability*amount - var/amountrefined = round(burn_value, 1) - if(amountrefined < 1) - qdel(src) - else - new refined_type(drop_location(),amountrefined) - qdel(src) + + var/probability = rand(0, 100) / 100 + var/burn_value = probability * amount + var/amount_refined = floor(burn_value * values_sum(mats_per_unit) / SHEET_MATERIAL_AMOUNT) + if(amount_refined > 1) + new refined_type(drop_location(), amount_refined) + qdel(src) /obj/item/stack/ore/uranium name = "uranium ore" @@ -82,24 +95,30 @@ singular_name = "uranium ore chunk" points = 30 material_flags = NONE - mats_per_unit = list(/datum/material/uranium=SHEET_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/uranium = SHEET_MATERIAL_AMOUNT) refined_type = /obj/item/stack/sheet/mineral/uranium mine_experience = 6 scan_state = "rock_uranium" - spreadChance = 5 + spread_chance = 35 merge_type = /obj/item/stack/ore/uranium + vein_type = ORE_VEIN_PLAIN + vein_distance = 3 + min_vein_size = 1 + max_vein_size = 3 /obj/item/stack/ore/iron name = "iron ore" icon_state = "iron" singular_name = "iron ore chunk" points = 1 - mats_per_unit = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT) refined_type = /obj/item/stack/sheet/iron mine_experience = 1 scan_state = "rock_iron" - spreadChance = 20 + spread_chance = 65 merge_type = /obj/item/stack/ore/iron + min_vein_size = 1 + max_vein_size = 3 /obj/item/stack/ore/glass name = "sand pile" @@ -142,7 +161,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ C.visible_message(span_danger("[C]'s eye protection blocks the sand!"), span_warning("Your eye protection blocks the sand!")) return C.adjust_eye_blur(12 SECONDS) - C.adjust_stamina_loss(15)//the pain from your eyes burning does stamina damage + C.adjust_stamina_loss(15) //the pain from your eyes burning does stamina damage C.adjust_confusion(5 SECONDS) to_chat(C, span_userdanger("\The [src] gets into your eyes! The pain, it burns!")) qdel(src) @@ -151,7 +170,6 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ if(severity) qdel(src) return TRUE - return FALSE /obj/item/stack/ore/glass/thirty @@ -164,17 +182,27 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ mine_experience = 0 merge_type = /obj/item/stack/ore/glass/basalt +/obj/item/stack/ore/glass/siderite + name = "siderite dust" + icon_state = "siderite_sand" + singular_name = "siderite dust pile" + mine_experience = 0 + merge_type = /obj/item/stack/ore/glass/siderite + /obj/item/stack/ore/plasma name = "plasma ore" icon_state = "plasma" singular_name = "plasma ore chunk" points = 15 - mats_per_unit = list(/datum/material/plasma=SHEET_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/plasma = SHEET_MATERIAL_AMOUNT) refined_type = /obj/item/stack/sheet/mineral/plasma mine_experience = 5 scan_state = "rock_plasma" - spreadChance = 8 + spread_chance = 45 merge_type = /obj/item/stack/ore/plasma + vein_type = ORE_VEIN_PLAIN + min_vein_size = 2 + max_vein_size = 4 /obj/item/stack/ore/plasma/welder_act(mob/living/user, obj/item/I) to_chat(user, span_warning("You can't hit a high enough temperature to smelt [src] properly!")) @@ -186,11 +214,14 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ singular_name = "silver ore chunk" points = 16 mine_experience = 3 - mats_per_unit = list(/datum/material/silver=SHEET_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/silver = SHEET_MATERIAL_AMOUNT) refined_type = /obj/item/stack/sheet/mineral/silver scan_state = "rock_silver" - spreadChance = 5 + spread_chance = 35 merge_type = /obj/item/stack/ore/silver + vein_type = ORE_VEIN_BRANCH + min_vein_size = 0 + max_vein_size = 2 /obj/item/stack/ore/gold name = "gold ore" @@ -198,22 +229,31 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ singular_name = "gold ore chunk" points = 18 mine_experience = 5 - mats_per_unit = list(/datum/material/gold=SHEET_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/gold = SHEET_MATERIAL_AMOUNT) refined_type = /obj/item/stack/sheet/mineral/gold scan_state = "rock_gold" - spreadChance = 5 + spread_chance = 35 merge_type = /obj/item/stack/ore/gold + vein_type = ORE_VEIN_BRANCH + vein_distance = 2 + min_vein_size = 0 + max_vein_size = 2 /obj/item/stack/ore/diamond name = "diamond ore" icon_state = "diamond" singular_name = "diamond ore chunk" points = 50 - mats_per_unit = list(/datum/material/diamond=SHEET_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/diamond = SHEET_MATERIAL_AMOUNT) refined_type = /obj/item/stack/sheet/mineral/diamond mine_experience = 10 scan_state = "rock_diamond" merge_type = /obj/item/stack/ore/diamond + vein_type = ORE_VEIN_SCATTER + spread_chance = 20 + vein_distance = 4 + min_vein_size = 1 + max_vein_size = 2 /obj/item/stack/ore/diamond/Initialize(mapload) . = ..() @@ -227,23 +267,30 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ icon_state = "bananium" singular_name = "bananium ore chunk" points = 60 - mats_per_unit = list(/datum/material/bananium=SHEET_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/bananium = SHEET_MATERIAL_AMOUNT) refined_type = /obj/item/stack/sheet/mineral/bananium mine_experience = 15 scan_state = "rock_bananium" merge_type = /obj/item/stack/ore/bananium + vein_type = ORE_VEIN_PLAIN + spread_chance = 20 + vein_distance = 4 + min_vein_size = 1 + max_vein_size = 2 /obj/item/stack/ore/titanium name = "titanium ore" icon_state = "titanium" singular_name = "titanium ore chunk" points = 50 - mats_per_unit = list(/datum/material/titanium=SHEET_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/titanium = SHEET_MATERIAL_AMOUNT) refined_type = /obj/item/stack/sheet/mineral/titanium mine_experience = 3 scan_state = "rock_titanium" - spreadChance = 5 + spread_chance = 35 merge_type = /obj/item/stack/ore/titanium + min_vein_size = 1 + max_vein_size = 2 /obj/item/stack/ore/slag name = "slag" diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index 361f111539d..868926e0320 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -382,13 +382,11 @@ */ /mob/dead/new_player/proc/register_for_interview() // First we detain them by removing all the verbs they have on client - for (var/v in client.verbs) - var/procpath/verb_path = v + for (var/procpath/verb_path as anything in client.verbs) remove_verb(client, verb_path) // Then remove those on their mob as well - for (var/v in verbs) - var/procpath/verb_path = v + for (var/procpath/verb_path as anything in verbs) remove_verb(src, verb_path) // Then we create the interview form and show it to the client diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 55ba216172a..eda2bc9a86e 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -221,18 +221,16 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER) if(ghost_accs == GHOST_ACCS_FULL && (icon_state in GLOB.ghost_forms_with_accessories_list)) //check if this form supports accessories and if the client wants to show them if(facial_hairstyle) var/datum/sprite_accessory/S = SSaccessories.facial_hairstyles_list[facial_hairstyle] - if(S) - facial_hair_overlay = mutable_appearance(S.icon, "[S.icon_state]", -HAIR_LAYER) - if(facial_hair_color) - facial_hair_overlay.color = facial_hair_color + if(S && S.icon_state != SPRITE_ACCESSORY_NONE) + facial_hair_overlay = mutable_appearance(S.icon, S.icon_state, -HAIR_LAYER) + facial_hair_overlay.color = facial_hair_color facial_hair_overlay.alpha = 200 add_overlay(facial_hair_overlay) if(hairstyle) var/datum/sprite_accessory/hair/S = SSaccessories.hairstyles_list[hairstyle] - if(S) - hair_overlay = mutable_appearance(S.icon, "[S.icon_state]", -HAIR_LAYER) - if(hair_color) - hair_overlay.color = hair_color + if(S && S.icon_state != SPRITE_ACCESSORY_NONE) + hair_overlay = mutable_appearance(S.icon, S.icon_state, -HAIR_LAYER) + hair_overlay.color = hair_color hair_overlay.alpha = 200 hair_overlay.pixel_z = S.y_offset add_overlay(hair_overlay) @@ -256,18 +254,22 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER) lum = max(read_color[3], 80) return rgb(read_color[1], sat, lum, space = COLORSPACE_HSL) -/* -Transfer_mind is there to check if mob is being deleted/not going to have a body. -Works together with spawning an observer, noted above. -*/ - -/mob/proc/ghostize(can_reenter_corpse = TRUE, admin_ghost = FALSE) +/** + * # Ghostize + * + * Creates a /mob/dead/observer and moves the player's key into it (among other handling for player->observer) + * Ignores things like adminghosts and corpselocked (ethereal) players. + * Args: + * can_reenter_corse: Whether the new Ghost will be able to click "Re-enter body", TRUE by default. + * forced: Whether we are forcing this player to be ghosted, ignoring things like corpselocking, FALSE by default. + */ +/mob/proc/ghostize(can_reenter_corpse = TRUE, forced = FALSE) if(!key) return if(IS_FAKE_KEY(key)) // Skip aghosts. return - if(HAS_TRAIT(src, TRAIT_CORPSELOCKED) && !admin_ghost) + if(HAS_TRAIT(src, TRAIT_CORPSELOCKED) && !forced) if(can_reenter_corpse) //If you can re-enter the corpse you can't leave when corpselocked return if(ishuman(usr)) //following code only applies to those capable of having an ethereal heart, ie humans @@ -295,7 +297,7 @@ Works together with spawning an observer, noted above. SEND_SIGNAL(src, COMSIG_MOB_GHOSTIZED) return ghost -/mob/living/ghostize(can_reenter_corpse = TRUE) +/mob/living/ghostize(can_reenter_corpse = TRUE, forced = FALSE) . = ..() if(. && can_reenter_corpse) var/mob/dead/observer/ghost = . @@ -387,8 +389,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return client.view_size.resetToDefault()//Let's reset so people can't become allseeing gods SStgui.on_transfer(src, mind.current) // Transfer NanoUIs. - if(mind.current.stat == DEAD && SSlag_switch.measures[DISABLE_DEAD_KEYLOOP]) - to_chat(src, span_warning("To leave your body again use the Ghost verb.")) + if(mind.current.stat == DEAD && SSlag_switch.measures[DISABLE_DEAD_KEYLOOP] && !client.holder) + to_chat(src, span_warning("To leave your body again use the 'Ghost verb' (in the command bar).")) mind.current.PossessByPlayer(key) mind.current.client.init_verbs() return TRUE diff --git a/code/modules/mob/dead/observer/observer_movement.dm b/code/modules/mob/dead/observer/observer_movement.dm index 6972d3b265f..cfe505fb0f7 100644 --- a/code/modules/mob/dead/observer/observer_movement.dm +++ b/code/modules/mob/dead/observer/observer_movement.dm @@ -1,14 +1,8 @@ /mob/dead/observer/down() - set name = "Move Down" - set category = "IC" - if(zMove(DOWN, z_move_flags = ZMOVE_FEEDBACK)) to_chat(src, span_notice("You move down.")) /mob/dead/observer/up() - set name = "Move Upwards" - set category = "IC" - if(zMove(UP, z_move_flags = ZMOVE_FEEDBACK)) to_chat(src, span_notice("You move upwards.")) diff --git a/code/modules/mob/eye/eye.dm b/code/modules/mob/eye/eye.dm index fb3c2a4fab7..2b79ab2a19c 100644 --- a/code/modules/mob/eye/eye.dm +++ b/code/modules/mob/eye/eye.dm @@ -27,16 +27,10 @@ return FALSE /mob/eye/up() - set name = "Move Upwards" - set category = "IC" - if(zMove(UP, z_move_flags = ZMOVE_FEEDBACK)) to_chat(src, span_notice("You move upwards.")) /mob/eye/down() - set name = "Move Down" - set category = "IC" - if(zMove(DOWN, z_move_flags = ZMOVE_FEEDBACK)) to_chat(src, span_notice("You move down.")) diff --git a/code/modules/mob/living/basic/alien/maid.dm b/code/modules/mob/living/basic/alien/maid.dm index cf6499884e9..7132f2ef4b0 100644 --- a/code/modules/mob/living/basic/alien/maid.dm +++ b/code/modules/mob/living/basic/alien/maid.dm @@ -19,15 +19,15 @@ ///Handles the maid attacking other players, cancelling the attack to clean up instead. /mob/living/basic/alien/maid/early_melee_attack(atom/target, list/modifiers, ignore_cooldown) . = ..() - if(!.) - return FALSE + if(.) + return target.wash(CLEAN_SCRUB) if(istype(target, /obj/effect/decal/cleanable)) visible_message(span_notice("[src] cleans up \the [target].")) else visible_message(span_notice("[src] polishes \the [target].")) - return FALSE + return BASIC_MOB_END_ATTACK_CHAIN_COOLDOWN /** * Barmaid special type diff --git a/code/modules/mob/living/basic/basic.dm b/code/modules/mob/living/basic/basic.dm index 0392cfcc6bc..99735029110 100644 --- a/code/modules/mob/living/basic/basic.dm +++ b/code/modules/mob/living/basic/basic.dm @@ -232,21 +232,22 @@ . += span_deadsay("Upon closer examination, [p_they()] appear[p_s()] to be [HAS_MIND_TRAIT(user, TRAIT_NAIVE) ? "asleep" : "dead"].") /mob/living/basic/proc/melee_attack(atom/target, list/modifiers, ignore_cooldown = FALSE) - if(!early_melee_attack(target, modifiers, ignore_cooldown)) + var/early_melee_result = early_melee_attack(target, modifiers, ignore_cooldown) + if(early_melee_result) //Truthy value means we want to end the chain + if(!ignore_cooldown && early_melee_result == BASIC_MOB_END_ATTACK_CHAIN_COOLDOWN) + changeNext_move(melee_attack_cooldown) return FALSE var/result = target.attack_basic_mob(src, modifiers) SEND_SIGNAL(src, COMSIG_HOSTILE_POST_ATTACKINGTARGET, target, result) - if(!ignore_cooldown) - changeNext_move(melee_attack_cooldown) // Set it again because objects like to fuck with it in attack_basic_mob + if(result && !ignore_cooldown) //Only set cooldown if the attack achieved something, which is the case when the value is true-ey. This could definitely be done better but is probably easier once living/simple is gone and we no longer use attack_animal. + changeNext_move(melee_attack_cooldown) return result /mob/living/basic/proc/early_melee_attack(atom/target, list/modifiers, ignore_cooldown = FALSE) face_atom(target) - if(!ignore_cooldown) - changeNext_move(melee_attack_cooldown) // Set cooldown early in case it is cancelled if(SEND_SIGNAL(src, COMSIG_HOSTILE_PRE_ATTACKINGTARGET, target, Adjacent(target), modifiers) & COMPONENT_HOSTILE_NO_ATTACK) - return FALSE //but more importantly return before attack_animal called - return TRUE + return BASIC_MOB_END_ATTACK_CHAIN //but more importantly return before attack_animal called + return BASIC_MOB_CONTINUE_ATTACK_CHAIN /mob/living/basic/resolve_unarmed_attack(atom/attack_target, list/modifiers) melee_attack(attack_target, modifiers) @@ -307,17 +308,6 @@ if (.) update_held_items() -/mob/living/basic/update_held_items() - . = ..() - if(isnull(client) || isnull(hud_used) || hud_used.hud_version == HUD_STYLE_NOHUD) - return - var/turf/our_turf = get_turf(src) - for(var/obj/item/held in held_items) - var/index = get_held_index_of_item(held) - SET_PLANE(held, ABOVE_HUD_PLANE, our_turf) - held.screen_loc = ui_hand_position(index) - client.screen |= held - /mob/living/basic/get_body_temp_heat_damage_limit() return maximum_survivable_temperature diff --git a/code/modules/mob/living/basic/blob_minions/blob_mob.dm b/code/modules/mob/living/basic/blob_minions/blob_mob.dm index 8d24dccd7df..ef7184d09ac 100644 --- a/code/modules/mob/living/basic/blob_minions/blob_mob.dm +++ b/code/modules/mob/living/basic/blob_minions/blob_mob.dm @@ -21,6 +21,7 @@ initial_language_holder = /datum/language_holder/empty can_buckle_to = FALSE damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 1, STAMINA = 0, OXY = 1) + pull_force = 0 /// Size of cloud produced from a dying spore var/death_cloud_size = BLOBMOB_CLOUD_NONE var/loot = /obj/item/food/spore_sack diff --git a/code/modules/mob/living/basic/boss/boss.dm b/code/modules/mob/living/basic/boss/boss.dm index 4ffd7961de3..8f4a4924800 100644 --- a/code/modules/mob/living/basic/boss/boss.dm +++ b/code/modules/mob/living/basic/boss/boss.dm @@ -77,10 +77,11 @@ /mob/living/basic/boss/early_melee_attack(mob/living/target, list/modifiers, ignore_cooldown) . = ..() - if(!. || !istype(target)) + if(. || !istype(target)) return if(should_devour(target)) devour(target) + return BASIC_MOB_END_ATTACK_CHAIN_COOLDOWN /// Determines if this mob is worth devouring /mob/living/basic/boss/proc/should_devour(mob/living/victim) diff --git a/code/modules/mob/living/basic/bots/bot_ai.dm b/code/modules/mob/living/basic/bots/bot_ai.dm index 6f726c9586c..a5f8202e66e 100644 --- a/code/modules/mob/living/basic/bots/bot_ai.dm +++ b/code/modules/mob/living/basic/bots/bot_ai.dm @@ -63,6 +63,8 @@ source.clear_path_hud(remove_hud = FALSE) /datum/ai_controller/basic_controller/bot/proc/add_to_blacklist(atom/target, duration) + if(QDELETED(target)) + return var/final_duration = duration || blackboard[BB_UNREACHABLE_LIST_COOLDOWN] set_blackboard_key_assoc_lazylist(BB_TEMPORARY_IGNORE_LIST, target, TRUE) addtimer(CALLBACK(src, PROC_REF(remove_from_blacklist), target), final_duration) @@ -107,11 +109,15 @@ ///set the target if we can reach them /datum/ai_controller/basic_controller/bot/proc/set_if_can_reach(key, target, duration, distance = 10, bypass_add_to_blacklist = FALSE) if(can_reach_target(target, distance)) + EVLOG_MAPTEXT(src, EVLOG_CATEGORY_AI_TARGETING, "[pawn] has selected [target] as a target for blackboard key [key]!", get_turf(target), "Target: [target]") + EVLOG_LINES(src, EVLOG_CATEGORY_AI_TARGETING, "Line to target", get_turf(pawn), get_turf(target)) set_blackboard_key(key, target) return TRUE if(bypass_add_to_blacklist) return FALSE var/final_duration = duration || blackboard[BB_UNREACHABLE_LIST_COOLDOWN] + EVLOG_MAPTEXT(src, EVLOG_CATEGORY_AI_TARGETING, "[pawn] has added [target] to its targetting blacklist!", get_turf(target), "Target: [target]") + EVLOG_LINES(src, EVLOG_CATEGORY_AI_TARGETING, "Line to target", get_turf(pawn), get_turf(target)) add_to_blacklist(target, final_duration) return FALSE diff --git a/code/modules/mob/living/basic/bots/ed209/ed209.dm b/code/modules/mob/living/basic/bots/ed209/ed209.dm new file mode 100644 index 00000000000..83373e25a82 --- /dev/null +++ b/code/modules/mob/living/basic/bots/ed209/ed209.dm @@ -0,0 +1,176 @@ +/mob/living/basic/bot/secbot/ed209 + name = "\improper ED-209 Security Robot" + desc = "A security robot. He looks less than thrilled." + icon_state = "ed209" + base_icon_state = "ed209" + light_color = "#f84e4e" + density = TRUE + health = 100 + maxHealth = 100 + obj_damage = 60 + environment_smash = ENVIRONMENT_SMASH_WALLS //Walls can't stop THE LAW + mob_size = MOB_SIZE_LARGE + ai_controller = /datum/ai_controller/basic_controller/bot/ed209 + bot_type = ADVANCED_SEC_BOT + hackables = "combat inhibitors" + + custom_materials = list( + /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2.8, + /datum/material/glass = SMALL_MATERIAL_AMOUNT * 2.1, + ) + + ///sound of the projectiles we shoot + var/projectile_sound = 'sound/items/weapons/laser.ogg' + ///what projectiles we shoot + var/projectile_type = /obj/projectile/beam/disabler + ///what projectiles we shoot when emagged + var/emagged_projectile_type = /obj/projectile/beam + ///sound of emagged projectile + var/emagged_projectile_sound = 'sound/items/weapons/laser.ogg' + ///special hats that change our personality :mistake: + var/static/list/sherrif_hats = typecacheof(list( + /obj/item/clothing/head/cowboy, + )) + var/datum/action/cooldown/mob_cooldown/ed209_charge/bot_charge + ///our riding component + var/ride_component = /datum/component/riding/creature/ed_bot + ///have we become a sheriff + var/sheriffized = FALSE + ///timer till we yell out our war cry again + COOLDOWN_DECLARE(shoot_cry) + + +/mob/living/basic/bot/secbot/ed209/Initialize(mapload) + . = ..() + set_weapon() + bot_charge = new(src) + var/static/list/hat_offset = list(2, 0) + AddElement(/datum/element/hat_wearer,\ + offsets = hat_offset,\ + ) + + AddComponent(/datum/component/defaceable, \ + icon = 'icons/mob/silicon/aibot_faces.dmi', \ + icon_states = list("ed209" = FALSE, "ed209_highlight" = TRUE), \ + drawing_of = "a face", \ + ) + AddComponent(/datum/component/stun_n_cuff,\ + stun_sound = 'sound/items/weapons/egloves.ogg',\ + handcuff_type = /obj/item/restraints/handcuffs/cable/zipties,\ + ) + AddElement(/datum/element/ridable, ride_component) + RegisterSignal(src, COMSIG_BASICMOB_POST_ATTACK_RANGED, PROC_REF(post_ranged_attack)) + +/mob/living/basic/bot/secbot/ed209/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) + . = ..() + sheriffized = (is_type_in_typecache(arrived, sherrif_hats)) //yeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeehawwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww + +/mob/living/basic/bot/secbot/ed209/proc/post_ranged_attack() + SIGNAL_HANDLER + if(!sheriffized || !COOLDOWN_FINISHED(src, shoot_cry)) + return + COOLDOWN_START(src, shoot_cry, 30 SECONDS) + INVOKE_ASYNC(src, TYPE_PROC_REF(/atom/movable, say), "YIPPIE-KI-YAY!") + +/mob/living/basic/bot/secbot/ed209/Exited(atom/movable/gone, direction) + . = ..() + sheriffized = (is_type_in_typecache(gone, sherrif_hats)) + +/mob/living/basic/bot/secbot/ed209/examine(mob/user) + . = ..() + if(sheriffized) + . += span_notice("Fastest hand in the west.") + +/mob/living/basic/bot/secbot/ed209/bot_reset(bypass_ai_reset = FALSE) + . = ..() + if(bot_access_flags & BOT_COVER_EMAGGED && isnull(bot_charge.owner)) + bot_charge.Grant(src) + if(!(bot_access_flags & BOT_COVER_EMAGGED) && !isnull(bot_charge.owner)) + bot_charge.Remove(src) + set_weapon() + +/mob/living/basic/bot/secbot/ed209/emag_act(mob/user, obj/item/card/emag/emag_card) + . = ..() + icon_state = "ed209[bot_mode_flags & BOT_MODE_ON]" + set_weapon() + balloon_alert(user, "safeties disabled") + audible_message(span_bolddanger("[src] buzzes menacingly!")) + return TRUE + +/mob/living/basic/bot/secbot/ed209/proc/set_weapon() + qdel(GetComponent(/datum/component/ranged_attacks)) + var/projectile = (bot_access_flags & BOT_COVER_EMAGGED) ? emagged_projectile_type : projectile_type + var/final_projectile_sound = (bot_access_flags & BOT_COVER_EMAGGED) ? emagged_projectile_sound : projectile_sound + AddComponent(\ + /datum/component/ranged_attacks,\ + projectile_type = projectile,\ + projectile_sound = final_projectile_sound,\ + ) + +/mob/living/basic/bot/secbot/ed209/ui_data(mob/user) + var/list/data = ..() + if(!(bot_access_flags & BOT_COVER_LOCKED) || HAS_SILICON_ACCESS(user)) + data["custom_controls"]["handcuff"] = security_mode_flags & SECBOT_HANDCUFF_TARGET + data["custom_controls"]["check_ids"] = security_mode_flags & SECBOT_CHECK_IDS + data["custom_controls"]["check_records"] = security_mode_flags & SECBOT_CHECK_RECORDS + return data + +/mob/living/basic/bot/secbot/ed209/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + var/mob/user = ui.user + if(. || !isliving(user) || (bot_access_flags & BOT_COVER_LOCKED) && !HAS_SILICON_ACCESS(user)) + return + switch(action) + if("handcuff") + security_mode_flags ^= SECBOT_HANDCUFF_TARGET + if("check_ids") + security_mode_flags ^= SECBOT_CHECK_IDS + if("check_records") + security_mode_flags ^= SECBOT_CHECK_RECORDS + +/mob/living/basic/bot/secbot/ed209/retrieve_secbot_drops(atom/drop_location) + var/obj/item/bot_assembly/ed209/ed_assembly = new(drop_location) + ed_assembly.build_step = ASSEMBLY_FIRST_STEP + ed_assembly.add_overlay("hs_hole") + ed_assembly.created_name = name + new /obj/item/assembly/prox_sensor(drop_location) + var/obj/item/gun/energy/disabler/disabler_gun = new(drop_location) + disabler_gun.cell.charge = 0 + disabler_gun.update_appearance() + if(prob(50)) + new /obj/item/bodypart/leg/left/robot(drop_location) + if(prob(25)) + new /obj/item/bodypart/leg/right/robot(drop_location) + if(prob(75)) + return + if(prob(50)) // either helmet or vest + new /obj/item/clothing/head/helmet(drop_location) + else + new /obj/item/clothing/suit/armor/vest(drop_location) + +/mob/living/basic/bot/secbot/ed209/Destroy() + . = ..() + QDEL_NULL(bot_charge) + +/mob/living/basic/bot/secbot/ed209/nukie + name = "\improper ED-209(+1) Syndicate Robot" + desc = "Wait this one's red? This cannot be good... right??" + icon_state = "red209" + light_color = "#5c0909" + faction = list(ROLE_SYNDICATE) + health = 250 + maxHealth = 250 + obj_damage = 60 + req_one_access = list(ACCESS_SYNDICATE) + bot_mode_flags = parent_type::bot_mode_flags & ~BOT_MODE_REMOTE_ENABLED + radio_key = /obj/item/encryptionkey/syndicate + additional_access = /datum/id_trim/syndicom/crew + radio_channel = RADIO_CHANNEL_SYNDICATE + ai_controller = /datum/ai_controller/basic_controller/bot/ed209/syndicate + bot_type = ADVANCED_SEC_BOT + hackables = "combat inhibitors" + projectile_sound = 'sound/items/weapons/gun/l6/shot.ogg' + projectile_type = /obj/projectile/bullet/a7mm + emagged_projectile_sound = 'sound/items/weapons/minebot_rocket.ogg' + emagged_projectile_type = /obj/projectile/bullet/rocket/weak //lord have mercy + ride_component = /datum/component/riding/creature/ed_bot/nukie //ride at ur own risk. especially if its emagged. warranty void diff --git a/code/modules/mob/living/basic/bots/ed209/ed209_ability.dm b/code/modules/mob/living/basic/bots/ed209/ed209_ability.dm new file mode 100644 index 00000000000..57d3143e133 --- /dev/null +++ b/code/modules/mob/living/basic/bots/ed209/ed209_ability.dm @@ -0,0 +1,40 @@ +/datum/action/cooldown/mob_cooldown/ed209_charge + name = "Bot Tackle" + desc = "Not even God's mightiest Quarterback can withstand this." + cooldown_time = 10 SECONDS + background_icon_state = "bg_revenant" + overlay_icon_state = "bg_revenant_border" + shared_cooldown = NONE + ///duration of telegraph + var/telegraph_duration = 1.25 SECONDS + ///damage we apply on tackle + var/tackle_damage = 25 + +/datum/action/cooldown/mob_cooldown/ed209_charge/Activate(atom/target) + var/turf/target_turf = get_turf(target) + if(isclosedturf(target_turf) || isspaceturf(target_turf)) + owner.balloon_alert(owner, "base not suitable!") + return FALSE + addtimer(CALLBACK(src, PROC_REF(commence_launch), target), telegraph_duration) + owner.Shake(duration = telegraph_duration) + StartCooldown() + return TRUE + +/datum/action/cooldown/mob_cooldown/ed209_charge/proc/commence_launch(atom/target) + var/turf/target_turf = get_turf(target) + owner.throw_at(target = target_turf, range = 7, speed = 1, spin = FALSE, callback = CALLBACK(src, PROC_REF(on_tackle), target_turf)) + new /obj/effect/temp_visual/mook_dust(owner.loc) + +/datum/action/cooldown/mob_cooldown/ed209_charge/proc/on_tackle(turf/target, original_pixel_y) + playsound(get_turf(owner), 'sound/effects/meteorimpact.ogg', 100, TRUE) + new /obj/effect/temp_visual/mook_dust(owner.loc) + for(var/mob/living/victim in oview(1, owner)) + if(victim in owner.buckled_mobs) + continue + victim.apply_damage(tackle_damage) + if(QDELETED(victim)) + continue + var/throw_dir = victim.loc == owner.loc ? get_dir(owner, victim) : pick(GLOB.alldirs) + var/throwtarget = get_edge_target_turf(victim, throw_dir) + victim.throw_at(target = throwtarget, range = 3, speed = 1) + victim.visible_message(span_warning("[victim] eats steel!")) diff --git a/code/modules/mob/living/basic/bots/ed209/ed209_ai.dm b/code/modules/mob/living/basic/bots/ed209/ed209_ai.dm new file mode 100644 index 00000000000..d699a153bb2 --- /dev/null +++ b/code/modules/mob/living/basic/bots/ed209/ed209_ai.dm @@ -0,0 +1,65 @@ +#define DEFAULT_LINES "default_lines" +#define SPECIAL_LINES "special_lines" + +/datum/ai_controller/basic_controller/bot/ed209 + blackboard = list( + BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic/secbot, + BB_UNREACHABLE_LIST_COOLDOWN = 1 MINUTES, + BB_ALWAYS_IGNORE_FACTION = TRUE, + ) + planning_subtrees = list( + /datum/ai_planning_subtree/escape_captivity/pacifist, + /datum/ai_planning_subtree/respond_to_summon, + /datum/ai_planning_subtree/simple_find_target, + /datum/ai_planning_subtree/ranged_skirmish, + /datum/ai_planning_subtree/arrest_target/ed209, + /datum/ai_planning_subtree/find_patrol_beacon, + ) + reset_keys = list( + BB_BEACON_TARGET, + BB_PREVIOUS_BEACON_TARGET, + BB_BOT_SUMMON_TARGET, + ) + + +/datum/ai_controller/basic_controller/bot/ed209/TryPossessPawn(atom/new_pawn) + . = ..() + if(. & AI_CONTROLLER_INCOMPATIBLE) + return + RegisterSignal(new_pawn, COMSIG_AI_BLACKBOARD_KEY_SET(BB_BASIC_MOB_CURRENT_TARGET), PROC_REF(on_target_set)) + + +/datum/ai_controller/basic_controller/bot/ed209/proc/on_target_set() + SIGNAL_HANDLER + var/datum/action/cooldown/bot_announcement/announcement = blackboard[BB_ANNOUNCE_ABILITY] + var/static/list/lines_to_pick = list( + DEFAULT_LINES = list( + "Scumbag alert!", + "Threat detected!" + ), + SPECIAL_LINES = list( + "Why y'all causin trouble in my town?", + "Fill your hands, you son of a bitch.", + "Aint nobody causin trouble in MY jurisdiction." + ) + + ) + var/mob/living/basic/bot/secbot/ed209/my_bot = pawn + var/list/final_list = my_bot.sheriffized ? lines_to_pick[SPECIAL_LINES] : lines_to_pick[DEFAULT_LINES] + INVOKE_ASYNC(announcement, TYPE_PROC_REF(/datum/action/cooldown/bot_announcement, announce), pick(final_list)) + +/datum/ai_planning_subtree/arrest_target/ed209 + arrest_behavior = /datum/ai_behavior/basic_melee_attack/interact_once/bot/ed209 + + +/datum/ai_behavior/basic_melee_attack/interact_once/bot/ed209 + action_cooldown = 0.5 SECONDS + +/datum/ai_behavior/basic_melee_attack/interact_once/bot/ed209/perform(seconds_per_tick, datum/ai_controller/controller, target_key, targeting_strategy_key, hiding_location_key) + . = ..() + if(!(. & AI_BEHAVIOR_DELAY)) + return AI_BEHAVIOR_DELAY //this kinda sucks but we have to do this cause we need to shoot while moving to stun + + +#undef DEFAULT_LINES +#undef SPECIAL_LINES diff --git a/code/modules/mob/living/basic/bots/ed209/ed209_nukie_ai.dm b/code/modules/mob/living/basic/bots/ed209/ed209_nukie_ai.dm new file mode 100644 index 00000000000..24bf9a20367 --- /dev/null +++ b/code/modules/mob/living/basic/bots/ed209/ed209_nukie_ai.dm @@ -0,0 +1,16 @@ +/datum/ai_controller/basic_controller/bot/ed209/syndicate + blackboard = list( + BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic, + BB_UNREACHABLE_LIST_COOLDOWN = 1 MINUTES, + ) + planning_subtrees = list( + /datum/ai_planning_subtree/escape_captivity/pacifist, + /datum/ai_planning_subtree/simple_find_target, + /datum/ai_planning_subtree/basic_ranged_attack_subtree, + /datum/ai_planning_subtree/find_patrol_beacon, + ) + reset_keys = list( + BB_BEACON_TARGET, + BB_PREVIOUS_BEACON_TARGET, + BB_BOT_SUMMON_TARGET, + ) diff --git a/code/modules/mob/living/basic/bots/ed209/ed209_nukie_spawner.dm b/code/modules/mob/living/basic/bots/ed209/ed209_nukie_spawner.dm new file mode 100644 index 00000000000..95c5b18ea24 --- /dev/null +++ b/code/modules/mob/living/basic/bots/ed209/ed209_nukie_spawner.dm @@ -0,0 +1,19 @@ +/obj/item/antag_spawner/nuke_ops/ed209_nukie + name = "Syndicate ED209 Robot" + desc = "A single-use beacon designed to quickly launch reinforcement operatives into the field." + + +/obj/item/antag_spawner/nuke_ops/ed209_nukie/attack_self(mob/user) + if(!(check_usability(user))) + return + + to_chat(user, span_notice("You activate [src] and wait for confirmation.")) + drop_bot() + do_sparks(4, TRUE, src) + qdel(src) + +/obj/item/antag_spawner/nuke_ops/ed209_nukie/proc/drop_bot() + var/mob/living/basic/bot/secbot/ed209/nukie/nuclear_bot = new() + var/obj/structure/closet/supplypod/pod = setup_pod() + nuclear_bot.forceMove(pod) + new /obj/effect/pod_landingzone(spawn_location ? spawn_location : get_turf(src), pod) diff --git a/code/modules/mob/living/basic/bots/honkbots/honkbot.dm b/code/modules/mob/living/basic/bots/honkbots/honkbot.dm index eb57581ae16..5daa8e5b25b 100644 --- a/code/modules/mob/living/basic/bots/honkbots/honkbot.dm +++ b/code/modules/mob/living/basic/bots/honkbots/honkbot.dm @@ -1,4 +1,4 @@ -/mob/living/basic/bot/honkbot +/mob/living/basic/bot/secbot/honkbot name = "\improper Honkbot" desc = "A little robot. It looks happy with its bike horn." icon_state = "honkbot" @@ -16,15 +16,17 @@ data_hud_type = TRAIT_SECURITY_HUD_ID_ONLY additional_access = /datum/id_trim/job/clown possessed_message = "You are a honkbot! Make sure the crew are having a great time!" + security_mode_flags = parent_type::security_mode_flags | HONKBOT_MODE_SLIP ///our voicelines var/static/list/honkbot_sounds = list( HONKBOT_VOICED_HONK_HAPPY = 'sound/items/bikehorn.ogg', HONKBOT_VOICED_HONK_SAD = 'sound/misc/sadtrombone.ogg', ) - ///Honkbot's flags - var/honkbot_flags = HONKBOT_CHECK_RECORDS | HONKBOT_HANDCUFF_TARGET | HONKBOT_MODE_SLIP + stun_sound = 'sound/items/airhorn/AirHorn.ogg' + baton_type = /obj/item/bikehorn/airhorn + cuff_type = /obj/item/restraints/handcuffs/cable/zipties/fake -/mob/living/basic/bot/honkbot/Initialize(mapload) +/mob/living/basic/bot/secbot/honkbot/Initialize(mapload) . = ..() var/static/list/clown_friends = typecacheof(list( /mob/living/carbon/human, @@ -48,33 +50,34 @@ on_slip_callback = CALLBACK(src, PROC_REF(post_slip)),\ can_slip_callback = CALLBACK(src, PROC_REF(pre_slip)),\ ) - AddComponent(/datum/component/stun_n_cuff,\ - stun_sound = 'sound/items/airhorn/AirHorn.ogg',\ - post_stun_callback = CALLBACK(src, PROC_REF(post_stun)),\ - post_arrest_callback = CALLBACK(src, PROC_REF(post_arrest)),\ - handcuff_type = /obj/item/restraints/handcuffs/cable/zipties/fake,\ - ) -/mob/living/basic/bot/honkbot/generate_speak_list() +/mob/living/basic/bot/secbot/honkbot/generate_speak_list() return honkbot_sounds -/mob/living/basic/bot/honkbot/proc/pre_slip() +/mob/living/basic/bot/secbot/honkbot/proc/pre_slip() return (prob(70) && ai_controller?.blackboard_key_exists(BB_BASIC_MOB_CURRENT_TARGET)) -/mob/living/basic/bot/honkbot/proc/post_slip() +/mob/living/basic/bot/secbot/honkbot/proc/post_slip() INVOKE_ASYNC(src, TYPE_PROC_REF(/mob/living/basic/bot, speak), HONKBOT_VOICED_HONK_SAD) set_attacking_state() -/mob/living/basic/bot/honkbot/proc/set_attacking_state() +/mob/living/basic/bot/secbot/honkbot/proc/set_attacking_state() icon_state = "[base_icon_state]-c" addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance)), 0.2 SECONDS) -/mob/living/basic/bot/honkbot/proc/post_arrest(mob/living/carbon/current_target) +/mob/living/basic/bot/secbot/honkbot/post_arrest(mob/living/carbon/current_target) playsound(src, (bot_access_flags & BOT_COVER_EMAGGED ? SFX_HONKBOT_E : 'sound/items/bikehorn.ogg'), 50, FALSE) icon_state = bot_access_flags & BOT_COVER_EMAGGED ? "[base_icon_state]-e" : "[base_icon_state]-c" addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance)), 3 SECONDS, TIMER_OVERRIDE|TIMER_UNIQUE) -/mob/living/basic/bot/honkbot/proc/post_stun(mob/living/carbon/current_target) + audible_message(span_danger("[src] gives out an evil laugh!")) + playsound(src, 'sound/mobs/non-humanoids/honkbot/honkbot_evil_laugh.ogg', 75, TRUE, -1) // evil laughter + +/mob/living/basic/bot/secbot/honkbot/retrieve_emag_message() + audible_message(span_danger("[src] gives out an evil laugh!")) + playsound(src, 'sound/mobs/non-humanoids/honkbot/honkbot_evil_laugh.ogg', 75, TRUE, -1) // evil laughter + +/mob/living/basic/bot/secbot/honkbot/post_stun(mob/living/carbon/current_target) if(!istype(current_target)) return @@ -86,26 +89,36 @@ sound_damage(deafen = 10 SECONDS) -/mob/living/basic/bot/honkbot/ui_data(mob/user) +/mob/living/basic/bot/secbot/honkbot/ui_data(mob/user) var/list/data = ..() if(!(bot_access_flags & BOT_COVER_LOCKED) || HAS_SILICON_ACCESS(user)) - data["custom_controls"]["slip_people"] = honkbot_flags & HONKBOT_MODE_SLIP - data["custom_controls"]["fake_cuff"] = honkbot_flags & HONKBOT_HANDCUFF_TARGET - data["custom_controls"]["check_ids"] = honkbot_flags & HONKBOT_CHECK_IDS - data["custom_controls"]["check_records"] = honkbot_flags & HONKBOT_CHECK_RECORDS + data["custom_controls"]["slip_people"] = security_mode_flags & HONKBOT_MODE_SLIP + data["custom_controls"]["fake_cuff"] = security_mode_flags & SECBOT_HANDCUFF_TARGET + data["custom_controls"]["check_ids"] = security_mode_flags & SECBOT_CHECK_IDS + data["custom_controls"]["check_records"] = security_mode_flags & SECBOT_CHECK_RECORDS return data -/mob/living/basic/bot/honkbot/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +/mob/living/basic/bot/secbot/honkbot/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() var/mob/user = ui.user if(. || !isliving(user) || (bot_access_flags & BOT_COVER_LOCKED) && !HAS_SILICON_ACCESS(user)) return switch(action) if("slip_people") - honkbot_flags ^= HONKBOT_MODE_SLIP + security_mode_flags ^= HONKBOT_MODE_SLIP if("fake_cuff") - honkbot_flags ^= HONKBOT_HANDCUFF_TARGET + security_mode_flags ^= SECBOT_HANDCUFF_TARGET if("check_ids") - honkbot_flags ^= HONKBOT_CHECK_IDS + security_mode_flags ^= SECBOT_CHECK_IDS if("check_records") - honkbot_flags ^= HONKBOT_CHECK_RECORDS + security_mode_flags ^= SECBOT_CHECK_RECORDS + +/mob/living/basic/bot/secbot/honkbot/retrieve_secbot_drops(atom/drop_location) + var/obj/item/bot_assembly/honkbot/honkbot_assembly = new(drop_location) + honkbot_assembly.build_step = ASSEMBLY_FIRST_STEP + honkbot_assembly.created_name = name + new /obj/item/assembly/prox_sensor(drop_location) + drop_part(baton_type, drop_location) + +/mob/living/basic/bot/secbot/honkbot/nopatrol + bot_mode_flags = parent_type::bot_mode_flags & ~BOT_MODE_AUTOPATROL diff --git a/code/modules/mob/living/basic/bots/honkbots/honkbot_ai.dm b/code/modules/mob/living/basic/bots/honkbots/honkbot_ai.dm index 620a6fc6d97..3a4d022087d 100644 --- a/code/modules/mob/living/basic/bots/honkbots/honkbot_ai.dm +++ b/code/modules/mob/living/basic/bots/honkbots/honkbot_ai.dm @@ -1,6 +1,6 @@ /datum/ai_controller/basic_controller/bot/honkbot blackboard = list( - BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic, + BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic/secbot, BB_UNREACHABLE_LIST_COOLDOWN = 1 MINUTES, BB_ALWAYS_IGNORE_FACTION = TRUE, ) @@ -8,8 +8,8 @@ /datum/ai_planning_subtree/escape_captivity/pacifist, /datum/ai_planning_subtree/respond_to_summon, /datum/ai_planning_subtree/use_mob_ability/random_honk, - /datum/ai_planning_subtree/find_wanted_targets, - /datum/ai_planning_subtree/troll_target, + /datum/ai_planning_subtree/simple_find_target, + /datum/ai_planning_subtree/arrest_target, /datum/ai_planning_subtree/slip_victims, /datum/ai_planning_subtree/play_with_clowns, /datum/ai_planning_subtree/find_patrol_beacon, @@ -43,60 +43,6 @@ add_to_blacklist(slip_target) clear_blackboard_key(BB_SLIP_TARGET) -/datum/ai_planning_subtree/find_wanted_targets - -/datum/ai_planning_subtree/find_wanted_targets/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) - var/static/list/can_arrest = typecacheof(list(/mob/living/carbon/human)) - if(!controller.blackboard_key_exists(BB_BASIC_MOB_CURRENT_TARGET)) - controller.queue_behavior(/datum/ai_behavior/bot_search/wanted_targets, BB_BASIC_MOB_CURRENT_TARGET, can_arrest) - -/datum/ai_behavior/bot_search/wanted_targets - -/datum/ai_behavior/bot_search/wanted_targets/valid_target(datum/ai_controller/basic_controller/bot/controller, mob/living/my_target) - if(!ishuman(my_target)) - return FALSE - var/mob/living/carbon/human/human_target = my_target - if(human_target.handcuffed || human_target.stat != CONSCIOUS) - return FALSE - if(locate(human_target) in controller.blackboard[BB_BASIC_MOB_RETALIATE_LIST]) - return TRUE - var/mob/living/basic/bot/honkbot/my_bot = controller.pawn - var/honkbot_flags = my_bot.honkbot_flags - var/assess_flags = NONE - if(human_target.IsParalyzed() && !(honkbot_flags & HONKBOT_HANDCUFF_TARGET)) - return FALSE - if(my_bot.bot_access_flags & BOT_COVER_EMAGGED) - assess_flags |= JUDGE_EMAGGED - if(honkbot_flags & HONKBOT_CHECK_IDS) - assess_flags |= JUDGE_IDCHECK - if(honkbot_flags & HONKBOT_CHECK_RECORDS) - assess_flags |= JUDGE_RECORDCHECK - return (human_target.assess_threat(assess_flags) > 0) - -/datum/ai_planning_subtree/troll_target - -/datum/ai_planning_subtree/troll_target/SelectBehaviors(datum/ai_controller/basic_controller/bot/controller, seconds_per_tick) - var/mob/living/carbon/my_target = controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET] - if(QDELETED(my_target) || !istype(my_target) || my_target.handcuffed) - controller.clear_blackboard_key(BB_BASIC_MOB_CURRENT_TARGET) - return - - var/mob/living/basic/bot/honkbot/my_bot = controller.pawn - if(my_target.IsParalyzed() && !(my_bot.honkbot_flags & HONKBOT_HANDCUFF_TARGET)) - controller.clear_blackboard_key(BB_BASIC_MOB_CURRENT_TARGET) - return - - controller.queue_behavior(/datum/ai_behavior/basic_melee_attack/interact_once/honkbot, BB_BASIC_MOB_CURRENT_TARGET, BB_TARGETING_STRATEGY) - return SUBTREE_RETURN_FINISH_PLANNING - -/datum/ai_behavior/basic_melee_attack/interact_once/honkbot - -/datum/ai_behavior/basic_melee_attack/interact_once/honkbot/finish_action(datum/ai_controller/controller, succeeded, target_key, targeting_strategy_key, hiding_location_key) - var/mob/living/carbon/human/human_target = controller.blackboard[target_key] - if(!isnull(human_target)) - controller.remove_from_blackboard_lazylist_key(BB_BASIC_MOB_RETALIATE_LIST, human_target) - return ..() - /datum/ai_planning_subtree/play_with_clowns/SelectBehaviors(datum/ai_controller/basic_controller/bot/controller, seconds_per_tick) var/mob/living/clown_target = controller.blackboard[BB_CLOWN_FRIEND] if(QDELETED(clown_target)) diff --git a/code/modules/mob/living/basic/bots/secbot/secbot.dm b/code/modules/mob/living/basic/bots/secbot/secbot.dm new file mode 100644 index 00000000000..df71f848a94 --- /dev/null +++ b/code/modules/mob/living/basic/bots/secbot/secbot.dm @@ -0,0 +1,263 @@ +/mob/living/basic/bot/secbot + name = "\improper Securitron" + desc = "A little security robot. He looks less than thrilled." + icon = 'icons/mob/silicon/aibots.dmi' + icon_state = "secbot" + base_icon_state = "secbot" + light_color = "#f56275" + light_power = 0.8 + gender = MALE + density = FALSE + anchored = FALSE + health = 25 + maxHealth = 25 + damage_coeff = list(BRUTE = 0.5, BURN = 0.7, TOX = 0, STAMINA = 0, OXY = 0) + pass_flags = PASSMOB | PASSFLAPS + combat_mode = TRUE + can_buckle_to = FALSE + + req_one_access = list(ACCESS_SECURITY) + radio_key = /obj/item/encryptionkey/secbot //AI Priv + Security + radio_channel = RADIO_CHANNEL_SECURITY //Security channel + bot_type = SEC_BOT + bot_mode_flags = ~BOT_MODE_CAN_BE_SAPIENT + data_hud_type = TRAIT_SECURITY_HUD + hackables = "target identification systems" + path_image_color = COLOR_RED + possessed_message = "You are a securitron! Guard the station to the best of your ability!" + additional_access = /datum/id_trim/job/detective + + custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 1.2, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 3.2) + ai_controller = /datum/ai_controller/basic_controller/bot/secbot + ///Whether this secbot is considered 'commissioned' and given the trait on Initialize. + var/commissioned = FALSE + ///The type of baton this Secbot will use + var/baton_type = /obj/item/melee/baton/security + ///The weapon (from baton_type) that will be used to make arrests. + var/obj/item/weapon + ///The threat level of the BOT, will arrest anyone at threatlevel 4 or above + var/threatlevel = 0 + + ///Flags SecBOTs use on what to check on targets when arresting, and whether they should announce it to security/handcuff their target + /// Look at the security_mode_flags bitfield for more information on what's togglable here. + var/security_mode_flags = SECBOT_DECLARE_ARRESTS | SECBOT_CHECK_RECORDS | SECBOT_HANDCUFF_TARGET + + /// On arrest, charges the violator this much. + /// If they don't have that much in their account, they will get beaten instead + var/price_arrest = 0 + /// Charged each time the violator is stunned on detain + var/price_detain = 0 + ///The department the secbot will deposit collected money into + var/payment_department = ACCOUNT_SEC + ///what sound we play when stunning + var/stun_sound = 'sound/items/weapons/egloves.ogg' + ///The type of cuffs we use on criminals after making arrests + var/cuff_type = /obj/item/restraints/handcuffs/cable/zipties/used + +/mob/living/basic/bot/secbot/Initialize(mapload) + . = ..() + weapon = new baton_type(src) + update_appearance(UPDATE_ICON) + if(commissioned) + ADD_TRAIT(src, TRAIT_COMMISSIONED, INNATE_TRAIT) + + var/static/list/loc_connections = list( + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), + ) + + AddElement(/datum/element/connect_loc, loc_connections) + AddComponent(/datum/component/security_vision, judgement_criteria = NONE, update_judgement_criteria = CALLBACK(src, PROC_REF(judgement_criteria))) + add_arrest_component() + +/mob/living/basic/bot/secbot/Destroy() + QDEL_NULL(weapon) + return ..() + +/mob/living/basic/bot/secbot/update_icon_state() + if(mode == BOT_HUNT) + icon_state = "[base_icon_state]-c" + return ..() + +/mob/living/basic/bot/secbot/turn_off() + ..() + update_bot_mode(new_mode = BOT_IDLE) + +/mob/living/basic/bot/secbot/on_saboteur(datum/source, disrupt_duration) + . = ..() + if(!(security_mode_flags & SECBOT_SABOTEUR_AFFECTED)) + security_mode_flags |= SECBOT_SABOTEUR_AFFECTED + addtimer(CALLBACK(src, PROC_REF(remove_saboteur_effect)), disrupt_duration) + return TRUE + +/mob/living/basic/bot/secbot/proc/remove_saboteur_effect() + security_mode_flags &= ~SECBOT_SABOTEUR_AFFECTED + +/mob/living/basic/bot/secbot/electrocute_act(shock_damage, source, siemens_coeff = 1, flags = NONE)//shocks only make him angry + if(speed >= initial(speed) + 3) + return + speed += 3 + addtimer(VARSET_CALLBACK(src, speed, speed - 3), 6 SECONDS) + playsound(src, 'sound/machines/defib/defib_zap.ogg', 50) + visible_message(span_warning("[src] shakes and speeds up!")) + +/mob/living/basic/bot/secbot/Exited(atom/movable/gone, direction) + . = ..() + if(gone == weapon) + weapon = null + update_appearance() + +// Variables sent to TGUI +/mob/living/basic/bot/secbot/ui_data(mob/user) + var/list/data = ..() + if(!(bot_access_flags & BOT_COVER_LOCKED) || HAS_SILICON_ACCESS(user)) + data["custom_controls"]["check_id"] = security_mode_flags & SECBOT_CHECK_IDS + data["custom_controls"]["check_weapons"] = security_mode_flags & SECBOT_CHECK_WEAPONS + data["custom_controls"]["check_warrants"] = security_mode_flags & SECBOT_CHECK_RECORDS + data["custom_controls"]["handcuff_targets"] = security_mode_flags & SECBOT_HANDCUFF_TARGET + data["custom_controls"]["arrest_alert"] = security_mode_flags & SECBOT_DECLARE_ARRESTS + return data + +// Actions received from TGUI +/mob/living/basic/bot/secbot/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + var/mob/user = ui.user + if(. || (bot_access_flags & BOT_COVER_LOCKED && !HAS_SILICON_ACCESS(user))) + return + + switch(action) + if("check_id") + security_mode_flags ^= SECBOT_CHECK_IDS + return TRUE + if("check_weapons") + security_mode_flags ^= SECBOT_CHECK_WEAPONS + return TRUE + if("check_warrants") + security_mode_flags ^= SECBOT_CHECK_RECORDS + return TRUE + if("handcuff_targets") + security_mode_flags ^= SECBOT_HANDCUFF_TARGET + return TRUE + if("arrest_alert") + security_mode_flags ^= SECBOT_DECLARE_ARRESTS + return TRUE + + +/mob/living/basic/bot/secbot/attack_hand(mob/living/carbon/human/user, list/modifiers) + + // Turns an oversight into a feature. Beepsky will now announce when pacifists taunt him over sec comms. + if(HAS_TRAIT(user, TRAIT_PACIFISM)) + user.visible_message(span_notice("[user] taunts [src], daring [p_them()] to give chase!"), \ + span_notice("You taunt [src], daring [p_them()] to chase you!"), span_hear("You hear someone shout a daring taunt!"), DEFAULT_MESSAGE_RANGE, user) + speak("Taunted by pacifist scumbag [RUNECHAT_BOLD("[user]")] in [get_area(src)].", radio_channel) + + // Interrupt the attack chain. We've already handled this scenario for pacifists. + return + + return ..() + +/mob/living/basic/bot/secbot/proc/retrieve_emag_message() + audible_message(span_danger("[src] buzzes oddly!")) + +/mob/living/basic/bot/secbot/emag_act(mob/user, obj/item/card/emag/emag_card) + . = ..() + if(!(bot_access_flags & BOT_COVER_EMAGGED)) + return + if(user) + balloon_alert(user, "target assessment circuits shorted") + + retrieve_emag_message() + security_mode_flags &= ~SECBOT_DECLARE_ARRESTS + update_appearance() + return TRUE + +/mob/living/basic/bot/secbot/proc/post_arrest(mob/living/carbon/current_target) + playsound(src, SFX_LAW, 50, FALSE) + +/mob/living/basic/bot/secbot/proc/post_stun(mob/living/carbon/current_target, harm = FALSE) + flick("[base_icon_state]-c", src) + var/threat = 5 || ai_controller.blackboard[BB_CURRENT_CRIMINAL_ASSESSMENT] + if(security_mode_flags & SECBOT_DECLARE_ARRESTS) + var/area/location = get_area(src) + speak("[security_mode_flags & SECBOT_HANDCUFF_TARGET ? "Arresting" : "Detaining"] level [threat] scumbag [RUNECHAT_BOLD("[current_target]")] in [location].", radio_channel) + payment_check(current_target) + update_bot_mode(new_mode = BOT_PREP_ARREST) + +/mob/living/basic/bot/secbot/explode() + var/atom/drop_location = drop_location() + retrieve_secbot_drops(drop_location) + new /obj/effect/decal/cleanable/blood/oil(loc) + return ..() + +/mob/living/basic/bot/secbot/proc/retrieve_secbot_drops(atom/drop_location) + var/obj/item/bot_assembly/secbot/secbot_assembly = new(drop_location) + secbot_assembly.build_step = ASSEMBLY_FIRST_STEP + secbot_assembly.add_overlay("hs_hole") + secbot_assembly.created_name = name + new /obj/item/assembly/prox_sensor(drop_location) + drop_part(weapon, drop_location) + +/mob/living/basic/bot/secbot/proc/on_entered(datum/source, atom/movable/to_be_tripped) + SIGNAL_HANDLER + var/mob/living/possible_target = ai_controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET] + if(!has_gravity() || !ismob(to_be_tripped) || !possible_target) + return + var/mob/living/carbon/tripped_mob = to_be_tripped + if(istype(tripped_mob) && !in_range(src, possible_target)) + knockOver(tripped_mob) + +/// Returns true if the current target is unable to pay to be detained/arrested +/mob/living/basic/bot/secbot/proc/payment_check(mob/living/carbon/human/human_target) + var/fair_market_price = (security_mode_flags & SECBOT_HANDCUFF_TARGET) ? price_arrest : price_detain + if(fair_market_price <= 0) + return FALSE + if(!ishuman(human_target)) + return FALSE + var/obj/item/card/id/target_id = human_target.get_idcard() + if(!target_id) + say("Unable to pay fine: No ID card found.") + return TRUE + var/datum/bank_account/insurance = target_id.registered_account + if(!insurance) + say("Unable to pay fine: No bank account found.") + return TRUE + if(!insurance.adjust_money(-fair_market_price, "Securitron fine")) + say("Unable to pay fine: Not enough funds in account.") + return TRUE + + SSeconomy.get_dep_account(payment_department)?.adjust_money(fair_market_price) + say("Fine paid: Thank you for your compliance. Your account been charged [fair_market_price] [MONEY_NAME].") + return FALSE + +/mob/living/basic/bot/secbot/generate_speak_list() + var/static/list/secbot_lines = list( + BEEPSKY_VOICED_CRIMINAL_DETECTED = 'sound/mobs/non-humanoids/beepsky/criminal.ogg', + BEEPSKY_VOICED_FREEZE = 'sound/mobs/non-humanoids/beepsky/freeze.ogg', + BEEPSKY_VOICED_JUSTICE = 'sound/mobs/non-humanoids/beepsky/justice.ogg', + BEEPSKY_VOICED_YOUR_MOVE = 'sound/mobs/non-humanoids/beepsky/creep.ogg', + BEEPSKY_VOICED_I_AM_THE_LAW = 'sound/mobs/non-humanoids/beepsky/iamthelaw.ogg', + BEEPSKY_VOICED_SECURE_DAY = 'sound/mobs/non-humanoids/beepsky/secureday.ogg', + ) + return secbot_lines + + +/mob/living/basic/bot/secbot/proc/judgement_criteria() + var/final = FALSE + if(bot_access_flags & BOT_COVER_EMAGGED) + final |= JUDGE_EMAGGED + if(security_mode_flags & SECBOT_CHECK_IDS) + final |= JUDGE_IDCHECK + if(security_mode_flags & SECBOT_CHECK_RECORDS) + final |= JUDGE_RECORDCHECK + if(security_mode_flags & SECBOT_CHECK_WEAPONS) + final |= JUDGE_WEAPONCHECK + if(security_mode_flags & SECBOT_SABOTEUR_AFFECTED) + final |= JUDGE_CHILLOUT + return final + +/mob/living/basic/bot/secbot/proc/add_arrest_component() + AddComponent(/datum/component/stun_n_cuff,\ + stun_sound = stun_sound,\ + post_stun_callback = CALLBACK(src, PROC_REF(post_stun)),\ + post_arrest_callback = CALLBACK(src, PROC_REF(post_arrest)),\ + handcuff_type = cuff_type,\ + ) diff --git a/code/modules/mob/living/basic/bots/secbot/secbot_abilities.dm b/code/modules/mob/living/basic/bots/secbot/secbot_abilities.dm new file mode 100644 index 00000000000..23340fe22a0 --- /dev/null +++ b/code/modules/mob/living/basic/bots/secbot/secbot_abilities.dm @@ -0,0 +1,12 @@ +/datum/action/cooldown/mob_cooldown/bot/sword + name = "Energy Sword" + desc = "Turn your sword off/on!" + button_icon = 'icons/obj/weapons/transforming_energy.dmi' + button_icon_state = "e_sword_on" + cooldown_time = 0 SECONDS + click_to_activate = FALSE + +/datum/action/cooldown/mob_cooldown/bot/sword/Activate(mob/living/firer, atom/target) + var/obj/item/melee/energy/sword/saber/my_sword = locate() in owner + INVOKE_ASYNC(my_sword, TYPE_PROC_REF(/obj/item, attack_self), owner) + return TRUE diff --git a/code/modules/mob/living/basic/bots/secbot/secbot_ai.dm b/code/modules/mob/living/basic/bots/secbot/secbot_ai.dm new file mode 100644 index 00000000000..6aadd73fd21 --- /dev/null +++ b/code/modules/mob/living/basic/bots/secbot/secbot_ai.dm @@ -0,0 +1,91 @@ +/datum/ai_controller/basic_controller/bot/secbot + blackboard = list( + BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic/secbot, + BB_UNREACHABLE_LIST_COOLDOWN = 1 MINUTES, + BB_ALWAYS_IGNORE_FACTION = TRUE, + ) + planning_subtrees = list( + /datum/ai_planning_subtree/escape_captivity/pacifist, + /datum/ai_planning_subtree/respond_to_summon, + /datum/ai_planning_subtree/simple_find_target, + /datum/ai_planning_subtree/arrest_target, + /datum/ai_planning_subtree/find_patrol_beacon, + ) + reset_keys = list( + BB_BEACON_TARGET, + BB_PREVIOUS_BEACON_TARGET, + BB_BOT_SUMMON_TARGET, + ) + +/datum/targeting_strategy/basic/secbot/can_attack(mob/living/living_mob, atom/the_target, vision_range) + var/datum/ai_controller/basic_controller/bot/my_controller = living_mob.ai_controller + if(isnull(my_controller)) + return FALSE + if(!ishuman(the_target) || LAZYACCESS(my_controller.blackboard[BB_TEMPORARY_IGNORE_LIST], the_target)) + return FALSE + var/mob/living/carbon/human/human_target = the_target + if(human_target.handcuffed || human_target.stat != CONSCIOUS) + return FALSE + if(locate(human_target) in my_controller.blackboard[BB_BASIC_MOB_RETALIATE_LIST]) + return TRUE + var/mob/living/basic/bot/secbot/my_bot = living_mob + if(human_target.IsParalyzed() && !(my_bot.security_mode_flags & SECBOT_HANDCUFF_TARGET)) + return FALSE + var/assess_flags = my_bot.judgement_criteria() + var/assessed_threat = human_target.assess_threat(assess_flags) + if(assessed_threat > THREAT_ASSESS_DANGEROUS) + my_controller.set_blackboard_key(BB_CURRENT_CRIMINAL_ASSESSMENT, assessed_threat) + return (assessed_threat > THREAT_ASSESS_DANGEROUS) + + +/datum/ai_controller/basic_controller/bot/secbot/TryPossessPawn(atom/new_pawn) + . = ..() + if(. & AI_CONTROLLER_INCOMPATIBLE) + return + RegisterSignal(new_pawn, COMSIG_AI_BLACKBOARD_KEY_SET(BB_BASIC_MOB_CURRENT_TARGET), PROC_REF(on_target_set)) + RegisterSignal(new_pawn, COMSIG_AI_BLACKBOARD_KEY_CLEARED(BB_BASIC_MOB_CURRENT_TARGET), PROC_REF(on_clear_target)) + +/datum/ai_controller/basic_controller/bot/secbot/proc/on_target_set() + SIGNAL_HANDLER + var/datum/action/cooldown/bot_announcement/announcement = blackboard[BB_ANNOUNCE_ABILITY] + var/threat_level = 5 || blackboard[BB_CURRENT_CRIMINAL_ASSESSMENT] + INVOKE_ASYNC(announcement, TYPE_PROC_REF(/datum/action/cooldown/bot_announcement, announce), "Level [threat_level] infraction alert!") + playsound(pawn, pick( + 'sound/mobs/non-humanoids/beepsky/criminal.ogg', + 'sound/mobs/non-humanoids/beepsky/justice.ogg', + 'sound/mobs/non-humanoids/beepsky/freeze.ogg', + ), 50, FALSE) + var/mob/living/basic/bot/secbot/my_bot = pawn + my_bot.update_bot_mode(new_mode = BOT_HUNT) + +/datum/ai_controller/basic_controller/bot/secbot/proc/on_clear_target() + SIGNAL_HANDLER + clear_blackboard_key(BB_CURRENT_CRIMINAL_ASSESSMENT) + +/datum/ai_planning_subtree/arrest_target + ///what behavior do we use when arresting? + var/datum/ai_behavior/arrest_behavior = /datum/ai_behavior/basic_melee_attack/interact_once/bot + +/datum/ai_planning_subtree/arrest_target/SelectBehaviors(datum/ai_controller/basic_controller/bot/controller, seconds_per_tick) + var/mob/living/carbon/my_target = controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET] + if(QDELETED(my_target) || !istype(my_target) || my_target.handcuffed) + controller.clear_blackboard_key(BB_BASIC_MOB_CURRENT_TARGET) + return + + var/mob/living/basic/bot/secbot/my_bot = controller.pawn + var/bot_flags = my_bot.security_mode_flags + if(my_target.IsParalyzed() && !(bot_flags & SECBOT_HANDCUFF_TARGET)) + controller.clear_blackboard_key(BB_BASIC_MOB_CURRENT_TARGET) + return + + controller.queue_behavior(arrest_behavior, BB_BASIC_MOB_CURRENT_TARGET, BB_TARGETING_STRATEGY) + return SUBTREE_RETURN_FINISH_PLANNING + +/datum/ai_behavior/basic_melee_attack/interact_once/bot + movement_behavior = /datum/ai_movement/basic_avoidance + +/datum/ai_behavior/basic_melee_attack/interact_once/bot/finish_action(datum/ai_controller/controller, succeeded, target_key, targeting_strategy_key, hiding_location_key) + var/mob/living/carbon/human/human_target = controller.blackboard[target_key] + if(!isnull(human_target) && human_target.handcuffed) + controller.remove_from_blackboard_lazylist_key(BB_BASIC_MOB_RETALIATE_LIST, human_target) + return ..() diff --git a/code/modules/mob/living/basic/bots/secbot/secbot_subtypes.dm b/code/modules/mob/living/basic/bots/secbot/secbot_subtypes.dm new file mode 100644 index 00000000000..c34dca95156 --- /dev/null +++ b/code/modules/mob/living/basic/bots/secbot/secbot_subtypes.dm @@ -0,0 +1,65 @@ +/mob/living/basic/bot/secbot/beepsky + name = "Commander Beep O'sky" + desc = "It's Commander Beep O'sky! Officially the superior officer of all bots on station, Beepsky remains as humble and dedicated to the law as the day he was first fabricated." + bot_mode_flags = BOT_MODE_ON | BOT_MODE_AUTOPATROL | BOT_MODE_REMOTE_ENABLED + commissioned = TRUE + + +/mob/living/basic/bot/secbot/beepsky/officer + name = "Officer Beepsky" + desc = "It's Officer Beepsky! Powered by a potato and a shot of whiskey, and with a sturdier reinforced chassis, too." + health = 45 + +/mob/living/basic/bot/secbot/beepsky/officer/Initialize(mapload) + . = ..() + // Beepsky hates people scanning them + RegisterSignal(src, COMSIG_MOVABLE_SPY_STEALING, PROC_REF(on_spy_scan)) + +/mob/living/basic/bot/secbot/beepsky/officer/proc/on_spy_scan(datum/source, mob/user) + SIGNAL_HANDLER + + ai_controller?.insert_blackboard_key_lazylist(BB_BASIC_MOB_RETALIATE_LIST, user) + +/mob/living/basic/bot/secbot/beepsky/ofitser + name = "Prison Ofitser" + desc = "Powered by the tears and sweat of laborers." + bot_mode_flags = ~(BOT_MODE_CAN_BE_SAPIENT|BOT_MODE_AUTOPATROL) + +/mob/living/basic/bot/secbot/beepsky/armsky + name = "Sergeant-At-Armsky" + desc = "It's Sergeant-At-Armsky! He's a disgruntled assistant to the warden that would probably shoot you if he had hands." + health = 45 + bot_mode_flags = ~(BOT_MODE_CAN_BE_SAPIENT|BOT_MODE_AUTOPATROL) + security_mode_flags = SECBOT_DECLARE_ARRESTS | SECBOT_CHECK_IDS | SECBOT_CHECK_RECORDS | SECBOT_CHECK_WEAPONS + +/mob/living/basic/bot/secbot/beepsky/jr + name = "Officer Pipsqueak" + desc = "It's Commander Beep O'sky's smaller, just-as aggressive cousin, Pipsqueak." + commissioned = FALSE + +/mob/living/basic/bot/secbot/beepsky/jr/Initialize(mapload) + . = ..() + update_transform(0.8) + +/mob/living/basic/bot/secbot/pingsky + name = "Officer Pingsky" + desc = "It's Officer Pingsky! Delegated to satellite guard duty for harbouring anti-human sentiment." + light_color = "#62baf5" + radio_channel = RADIO_CHANNEL_AI_PRIVATE + bot_mode_flags = ~(BOT_MODE_CAN_BE_SAPIENT|BOT_MODE_AUTOPATROL) + security_mode_flags = SECBOT_DECLARE_ARRESTS | SECBOT_CHECK_IDS | SECBOT_CHECK_RECORDS + +/mob/living/basic/bot/secbot/genesky + name = "Officer Genesky" + desc = "A beefy variant of the standard securitron model." + health = 50 + faction = list(FACTION_NANOTRASEN_PRIVATE) + bot_mode_flags = BOT_MODE_ON + bot_access_flags = BOT_COVER_LOCKED | BOT_COVER_EMAGGED + +/mob/living/basic/bot/secbot/beepsky/explode() + var/atom/current_location = drop_location() + new /obj/item/stock_parts/power_store/cell/potato(current_location) + var/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass/drinking_oil = new(current_location) + drinking_oil.reagents.add_reagent(/datum/reagent/consumable/ethanol/whiskey, 15) + return ..() diff --git a/code/modules/mob/living/basic/bots/secbot/super_beepsky.dm b/code/modules/mob/living/basic/bots/secbot/super_beepsky.dm new file mode 100644 index 00000000000..1f82db49c7a --- /dev/null +++ b/code/modules/mob/living/basic/bots/secbot/super_beepsky.dm @@ -0,0 +1,99 @@ +/mob/living/basic/bot/secbot/grievous //This bot is powerful. If you managed to get 4 eswords somehow, you deserve this horror. Emag him for best results. + name = "General Beepsky" + desc = "Is that a secbot with four eswords in its arms...?" + icon = 'icons/mob/silicon/aibots.dmi' + icon_state = "grievous" + base_icon_state = "grievous" + health = 150 + maxHealth = 150 + ai_controller = /datum/ai_controller/basic_controller/bot/secbot/super_beepsky + baton_type = /obj/item/melee/energy/sword/saber + speed = 4 //he's a fast fucker + ///chance we block bullets + var/block_chance = 50 + ///is our sword currently active? + var/sword_active = FALSE + +/mob/living/basic/bot/secbot/grievous/Initialize(mapload) + . = ..() + RegisterSignal(weapon, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_weapon_transform)) + var/static/list/abilities = list( + /datum/action/cooldown/mob_cooldown/bot/sword = null, + ) + grant_actions_by_list(abilities) + INVOKE_ASYNC(weapon, TYPE_PROC_REF(/obj/item, attack_self), src) + RegisterSignal(src, COMSIG_ATOM_PRE_BULLET_ACT, PROC_REF(block_bullets)) + + +/mob/living/basic/bot/secbot/grievous/check_block(atom/hit_by, damage, attack_text = "the attack", attack_type = MELEE_ATTACK, armour_penetration = 0, damage_type = BRUTE) + . = ..() + if(. & FAILED_BLOCK) + return . + + return (sword_active && prob(block_chance) ? SUCCESSFUL_BLOCK : FAILED_BLOCK) + +/mob/living/basic/bot/secbot/grievous/proc/on_weapon_transform(obj/item/source, mob/user, active) + SIGNAL_HANDLER + if(active) + visible_message(span_warning("[src] ignites his energy swords!")) + sword_active = active + update_icon_state() + +/mob/living/basic/bot/secbot/grievous/add_arrest_component() //i dont think we'll be arresting people... + return + +/mob/living/basic/bot/secbot/grievous/proc/block_bullets(datum/source, obj/projectile/hitting_projectile) + SIGNAL_HANDLER + + if(stat != CONSCIOUS ) + return NONE + + if(!sword_active || !prob(block_chance)) + return NONE + + visible_message(span_warning("[source] deflects [hitting_projectile] with its energy swords!")) + playsound(source, 'sound/items/weapons/blade1.ogg', 50, TRUE) + return COMPONENT_BULLET_BLOCKED + +/mob/living/basic/bot/secbot/grievous/on_entered(datum/source, atom/movable/movable_target) + . = ..() + if(!ismob(movable_target) || !ai_controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET] == movable_target) + return + visible_message(span_warning("[src] flails his swords and cuts [movable_target]!")) + playsound(src, 'sound/mobs/non-humanoids/beepsky/beepskyspinsabre.ogg' , 100, TRUE, -1) + INVOKE_ASYNC(src, TYPE_PROC_REF(/mob, ClickOn), movable_target) + + +/mob/living/basic/bot/secbot/grievous/update_icon_state() + . = ..() + + icon_state = "[base_icon_state][ sword_active ? "-c" : ""]" + +/mob/living/basic/bot/secbot/grievous/Destroy() + QDEL_NULL(weapon) + return ..() + +/mob/living/basic/bot/secbot/grievous/early_melee_attack(atom/target, list/modifiers, ignore_cooldown) + . = ..() + if(.) + return + INVOKE_ASYNC(weapon, TYPE_PROC_REF(/obj/item, melee_attack_chain), src, target) + playsound(src, 'sound/items/weapons/blade1.ogg', 50, TRUE, -1) + return BASIC_MOB_END_ATTACK_CHAIN_COOLDOWN + +/mob/living/basic/bot/secbot/grievous/explode() + var/atom/drop_location = drop_location() + //Parent is dropping the weapon, so let's drop 3 more to make up for it. + for(var/i in 0 to 3) + drop_part(baton_type, drop_location) + + return ..() + + +/mob/living/basic/bot/secbot/grievous/toy //A toy version of general beepsky! + name = "Genewul Bweepskee" + desc = "An adorable looking secbot with four toy swords taped to its arms" + health = 50 + maxHealth = 50 + block_chance = 0 + baton_type = /obj/item/toy/sword diff --git a/code/modules/mob/living/basic/bots/secbot/super_beepsky_ai.dm b/code/modules/mob/living/basic/bots/secbot/super_beepsky_ai.dm new file mode 100644 index 00000000000..effd9a98cab --- /dev/null +++ b/code/modules/mob/living/basic/bots/secbot/super_beepsky_ai.dm @@ -0,0 +1,16 @@ +/datum/ai_controller/basic_controller/bot/secbot/super_beepsky + + planning_subtrees = list( + /datum/ai_planning_subtree/escape_captivity/pacifist, + /datum/ai_planning_subtree/respond_to_summon, + /datum/ai_planning_subtree/simple_find_target, + /datum/ai_planning_subtree/basic_melee_attack_subtree, + /datum/ai_planning_subtree/find_patrol_beacon, + ) + +/datum/ai_controller/basic_controller/bot/secbot/super_beepsky/on_target_set() + . = ..() + var/mob/living/basic/bot/secbot/grievous/super_beeps = pawn + if(!super_beeps.sword_active) + INVOKE_ASYNC(super_beeps.weapon, TYPE_PROC_REF(/obj/item, attack_self), super_beeps) + super_beeps.visible_message("[super_beeps] points at [blackboard[BB_BASIC_MOB_CURRENT_TARGET]]!") diff --git a/code/modules/mob/living/basic/clown/clown.dm b/code/modules/mob/living/basic/clown/clown.dm index ce3dab5ccf8..8a8fce3c1e7 100644 --- a/code/modules/mob/living/basic/clown/clown.dm +++ b/code/modules/mob/living/basic/clown/clown.dm @@ -57,7 +57,7 @@ if (!istype(attacker)) return for (var/mob/living/basic/clown/harbringer in oview(src, 7)) - harbringer.ai_controller.insert_blackboard_key_lazylist(BB_BASIC_MOB_RETALIATE_LIST, attacker) + harbringer.ai_controller.set_blackboard_key_assoc_lazylist(BB_BASIC_MOB_RETALIATE_LIST, attacker, world.time) /mob/living/basic/clown/melee_attack(atom/target, list/modifiers, ignore_cooldown = FALSE) if(!istype(target, /obj/item/food/grown/banana/bunch)) diff --git a/code/modules/mob/living/basic/drone/inventory.dm b/code/modules/mob/living/basic/drone/inventory.dm index acacdb0e265..8253fafb98a 100644 --- a/code/modules/mob/living/basic/drone/inventory.dm +++ b/code/modules/mob/living/basic/drone/inventory.dm @@ -58,7 +58,7 @@ if(equipping.pulledby) equipping.pulledby.stop_pulling() - equipping.screen_loc = null // will get moved if inventory is visible + hud_used?.update_inventory_slot(slot) equipping.forceMove(src) //This has to come before has_equipped is called. SET_PLANE_EXPLICIT(equipping, ABOVE_HUD_PLANE, src) diff --git a/code/modules/mob/living/basic/drone/visuals_icons.dm b/code/modules/mob/living/basic/drone/visuals_icons.dm index 59952d8d249..3714c27deca 100644 --- a/code/modules/mob/living/basic/drone/visuals_icons.dm +++ b/code/modules/mob/living/basic/drone/visuals_icons.dm @@ -22,18 +22,13 @@ update_inv_internal_storage() /mob/living/basic/drone/proc/update_inv_internal_storage() - if(internal_storage && client && hud_used?.hud_shown) - internal_storage.screen_loc = ui_drone_storage - client.screen += internal_storage - + hud_used?.update_inventory_slot(ITEM_SLOT_DEX_STORAGE) /mob/living/basic/drone/update_worn_head() remove_overlay(DRONE_HEAD_LAYER) + hud_used?.update_inventory_slot(ITEM_SLOT_HEAD) if(head) - if(client && hud_used?.hud_shown) - head.screen_loc = ui_drone_head - client.screen += head var/used_head_icon = 'icons/mob/clothing/head/utility.dmi' if(istype(head, /obj/item/clothing/mask)) used_head_icon = 'icons/mob/clothing/mask.dmi' diff --git a/code/modules/mob/living/basic/farm_animals/bee/_bee.dm b/code/modules/mob/living/basic/farm_animals/bee/_bee.dm index a90b4e0dd4f..66cd498ccd6 100644 --- a/code/modules/mob/living/basic/farm_animals/bee/_bee.dm +++ b/code/modules/mob/living/basic/farm_animals/bee/_bee.dm @@ -111,18 +111,18 @@ /mob/living/basic/bee/early_melee_attack(atom/target, list/modifiers) . = ..() - if(!.) - return FALSE + if(.) + return if(istype(target, /obj/machinery/hydroponics)) var/obj/machinery/hydroponics/hydro = target pollinate(hydro) - return FALSE + return BASIC_MOB_END_ATTACK_CHAIN_COOLDOWN if(istype(target, /obj/structure/beebox)) var/obj/structure/beebox/hive = target handle_habitation(hive) - return FALSE + return BASIC_MOB_END_ATTACK_CHAIN_COOLDOWN /mob/living/basic/bee/proc/handle_habitation(obj/structure/beebox/hive) if(hive == beehome) //if its our home, we enter or exit it diff --git a/code/modules/mob/living/basic/farm_animals/pony.dm b/code/modules/mob/living/basic/farm_animals/pony.dm index a44d042809c..3e9ad63ad39 100644 --- a/code/modules/mob/living/basic/farm_animals/pony.dm +++ b/code/modules/mob/living/basic/farm_animals/pony.dm @@ -119,6 +119,10 @@ whinny_angrily() +/mob/living/basic/pony/get_shove_flags(mob/living/shover, obj/item/weapon) + . = ..() + . |= SHOVE_CAN_STAGGER + /datum/ai_controller/basic_controller/pony blackboard = list( BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic, diff --git a/code/modules/mob/living/basic/guardian/guardian_creator.dm b/code/modules/mob/living/basic/guardian/guardian_creator.dm index ff83c69a75e..b95b424af9e 100644 --- a/code/modules/mob/living/basic/guardian/guardian_creator.dm +++ b/code/modules/mob/living/basic/guardian/guardian_creator.dm @@ -25,6 +25,10 @@ GLOBAL_LIST_INIT(guardian_radial_images, setup_guardian_radial()) var/use_message = span_holoparasite("You shuffle the deck...") /// Message sent when it's already used. var/used_message = span_holoparasite("All the cards seem to be blank now.") + /// Examine description if the creator is unused + var/unused_description = span_holoparasite("You feel beckoned to draw one...") + /// Examine description if the creator is used. + var/used_description = span_holoparasite("They seem rather uninteresting.") /// Failure message if no ghost picks the holopara. var/failure_message = span_boldholoparasite("..And draw a card! It's... blank? Maybe you should try again later.") /// Failure message if we don't allow lings. @@ -113,6 +117,13 @@ GLOBAL_LIST_INIT(guardian_radial_images, setup_guardian_radial()) to_chat(user, failure_message) used = FALSE +/obj/item/guardian_creator/examine(mob/user) + . = ..() + if(used) + . += span_holoparasite(used_description) + else + . += span_holoparasite(unused_description) + /obj/item/guardian_creator/proc/on_reimbursed(datum/source) SIGNAL_HANDLER was_refunded = TRUE @@ -185,6 +196,8 @@ GLOBAL_LIST_INIT(guardian_radial_images, setup_guardian_radial()) allow_changeling = FALSE use_message = span_holoparasite("You start to power on the injector...") used_message = span_holoparasite("The injector has already been used.") + unused_description = span_holoparasite("Its vial is filled with a violent storm of color.") + used_description = span_holoparasite("Nothing seems to be loaded in the injector.") failure_message = span_boldholoparasite("...ERROR. BOOT SEQUENCE ABORTED. AI FAILED TO INTIALIZE. PLEASE CONTACT SUPPORT OR TRY AGAIN LATER.") ling_failure = span_boldholoparasite("The holoparasites recoil in horror. They want nothing to do with a creature like you.") success_message = span_holoparasite("%GUARDIAN is now online!") @@ -198,6 +211,8 @@ GLOBAL_LIST_INIT(guardian_radial_images, setup_guardian_radial()) theme = GUARDIAN_THEME_CARP use_message = span_holoparasite("You put the fishsticks in your mouth...") used_message = span_holoparasite("Someone's already taken a bite out of these fishsticks! Ew.") + unused_description = span_holoparasite("They look hot and ready to eat!") + used_description = span_holoparasite("They look soggy and old...") failure_message = span_boldholoparasite("You couldn't catch any carp spirits from the seas of Lake Carp. Maybe there are none, maybe you fucked up.") ling_failure = span_boldholoparasite("Carp'sie seems to not have taken you as the chosen one. Maybe it's because of your horrifying origin.") success_message = span_holoparasite("%GUARDIAN has been caught!") @@ -212,6 +227,8 @@ GLOBAL_LIST_INIT(guardian_radial_images, setup_guardian_radial()) theme = GUARDIAN_THEME_MINER use_message = span_holoparasite("You pierce your skin with the shard...") used_message = span_holoparasite("This shard seems to have lost all its power...") + unused_description = span_holoparasite("It glows with an otherwordly power...") + used_description = span_holoparasite("It looks dull, with dried blood on the tip.") failure_message = span_boldholoparasite("The shard hasn't reacted at all. Maybe try again later...") ling_failure = span_boldholoparasite("The power of the shard seems to not react with your horrifying, mutated body.") success_message = span_holoparasite("%GUARDIAN has appeared!") diff --git a/code/modules/mob/living/basic/guardian/guardian_types/dextrous.dm b/code/modules/mob/living/basic/guardian/guardian_types/dextrous.dm index fc4ec678837..b3d37a28e9e 100644 --- a/code/modules/mob/living/basic/guardian/guardian_types/dextrous.dm +++ b/code/modules/mob/living/basic/guardian/guardian_types/dextrous.dm @@ -92,7 +92,7 @@ if(equipping.pulledby) equipping.pulledby.stop_pulling() - equipping.screen_loc = null // will get moved if inventory is visible + hud_used?.update_inventory_slot(slot) equipping.forceMove(src) SET_PLANE_EXPLICIT(equipping, ABOVE_HUD_PLANE, src) @@ -106,10 +106,7 @@ return ITEM_SLOT_DEX_STORAGE /mob/living/basic/guardian/dextrous/proc/update_inv_internal_storage() - if(isnull(internal_storage) || isnull(client) || !hud_used?.hud_shown) - return - internal_storage.screen_loc = ui_back - client.screen += internal_storage + hud_used?.update_inventory_slot(ITEM_SLOT_DEX_STORAGE) /mob/living/basic/guardian/dextrous/regenerate_icons() update_inv_internal_storage() diff --git a/code/modules/mob/living/basic/guardian/guardian_types/gaseous.dm b/code/modules/mob/living/basic/guardian/guardian_types/gaseous.dm index a70bd01f43b..7db7107e109 100644 --- a/code/modules/mob/living/basic/guardian/guardian_types/gaseous.dm +++ b/code/modules/mob/living/basic/guardian/guardian_types/gaseous.dm @@ -33,20 +33,15 @@ . = ..() if (QDELETED(src)) return - RegisterSignal(summoner, COMSIG_LIVING_IGNITED, PROC_REF(on_summoner_ignited)) + ADD_TRAIT(summoner, TRAIT_NOFIRE, REF(src)) RegisterSignal(summoner, COMSIG_LIVING_LIFE, PROC_REF(on_summoner_life)) /mob/living/basic/guardian/gaseous/cut_summoner(different_person) if (!isnull(summoner)) - UnregisterSignal(summoner, list(COMSIG_LIVING_IGNITED, COMSIG_LIVING_LIFE)) + REMOVE_TRAIT(summoner, TRAIT_NOFIRE, REF(src)) + UnregisterSignal(summoner, COMSIG_LIVING_LIFE) return ..() -/// Prevent our summoner from being on fire -/mob/living/basic/guardian/gaseous/proc/on_summoner_ignited(mob/living/source) - SIGNAL_HANDLER - source.extinguish_mob() - source.set_fire_stacks(0, remove_wet_stacks = FALSE) - /// Maintain our summoner at a stable body temperature /mob/living/basic/guardian/gaseous/proc/on_summoner_life(mob/living/source, seconds_per_tick) SIGNAL_HANDLER diff --git a/code/modules/mob/living/basic/guardian/guardian_types/support.dm b/code/modules/mob/living/basic/guardian/guardian_types/support.dm index 5ddc07e809b..503dc93b778 100644 --- a/code/modules/mob/living/basic/guardian/guardian_types/support.dm +++ b/code/modules/mob/living/basic/guardian/guardian_types/support.dm @@ -112,6 +112,8 @@ /// Validate whether we can teleport this object /datum/action/cooldown/mob_cooldown/guardian_bluespace_beacon/proc/can_teleport(mob/living/source, atom/movable/target) + if(!istype(target)) // Turfs + return FALSE if (isnull(beacon)) source.balloon_alert(source, "no beacon!") return FALSE @@ -126,7 +128,7 @@ if (target.anchored) target.balloon_alert(source, "it won't budge!") return FALSE - if(beacon.z != target.z) + if((beacon.z != target.z) && !(target.z in SSmapping.get_connected_levels(beacon.z))) target.balloon_alert(source, "too far from beacon!") return FALSE return TRUE diff --git a/code/modules/mob/living/basic/icemoon/ice_whelp/ice_whelp.dm b/code/modules/mob/living/basic/icemoon/ice_whelp/ice_whelp.dm index 1000c919b11..7d4c74747a3 100644 --- a/code/modules/mob/living/basic/icemoon/ice_whelp/ice_whelp.dm +++ b/code/modules/mob/living/basic/icemoon/ice_whelp/ice_whelp.dm @@ -51,22 +51,22 @@ /mob/living/basic/mining/ice_whelp/early_melee_attack(atom/target, list/modifiers, ignore_cooldown) . = ..() - if(!.) - return FALSE + if(.) + return if(istype(target, /obj/structure/flora/rock/icy)) create_sculpture(target) - return FALSE + return BASIC_MOB_END_ATTACK_CHAIN_COOLDOWN if(!istype(target, type)) - return TRUE + return BASIC_MOB_CONTINUE_ATTACK_CHAIN var/mob/living/victim = target if(victim.stat != DEAD) - return TRUE + return BASIC_MOB_CONTINUE_ATTACK_CHAIN cannibalize_victim(victim) - return FALSE + return BASIC_MOB_END_ATTACK_CHAIN_COOLDOWN /// Carve a stone into a beautiful self-portrait /mob/living/basic/mining/ice_whelp/proc/create_sculpture(atom/target) diff --git a/code/modules/mob/living/basic/illusion/illusion.dm b/code/modules/mob/living/basic/illusion/illusion.dm index 0a1a5fa3195..97a61e653f0 100644 --- a/code/modules/mob/living/basic/illusion/illusion.dm +++ b/code/modules/mob/living/basic/illusion/illusion.dm @@ -72,12 +72,16 @@ appearance = original.appearance setDir(original.dir) - maxHealth = hp - updatehealth() // re-cap health to new value + if (isnull(hp)) + maxHealth = hp + updatehealth() // re-cap health to new value - melee_damage_lower = damage - melee_damage_upper = damage - multiply_chance = replicate + if (isnull(damage)) + melee_damage_lower = damage + melee_damage_upper = damage + + if (isnull(replicate)) + multiply_chance = replicate remove_faction(FACTION_NEUTRAL) transform = initial(transform) diff --git a/code/modules/mob/living/basic/jungle/seedling/seedling.dm b/code/modules/mob/living/basic/jungle/seedling/seedling.dm index 129e7d7b2f3..49acc32e5ee 100644 --- a/code/modules/mob/living/basic/jungle/seedling/seedling.dm +++ b/code/modules/mob/living/basic/jungle/seedling/seedling.dm @@ -85,19 +85,19 @@ /mob/living/basic/seedling/early_melee_attack(atom/target, list/modifiers, ignore_cooldown) . = ..() - if(!.) - return FALSE + if(.) + return if(istype(target, /obj/machinery/hydroponics)) treat_hydro_tray(target) - return FALSE + return BASIC_MOB_END_ATTACK_CHAIN_COOLDOWN if(isnull(held_can)) - return TRUE + return BASIC_MOB_CONTINUE_ATTACK_CHAIN if(istype(target, /obj/structure/sink) || istype(target, /obj/structure/reagent_dispensers)) held_can.melee_attack_chain(src, target) - return FALSE + return BASIC_MOB_END_ATTACK_CHAIN_COOLDOWN ///seedlings can water trays, remove weeds, or remove dead plants diff --git a/code/modules/mob/living/basic/lavaland/bileworm/_bileworm.dm b/code/modules/mob/living/basic/lavaland/bileworm/_bileworm.dm index 0ed4359bf23..19d1fd20c6a 100644 --- a/code/modules/mob/living/basic/lavaland/bileworm/_bileworm.dm +++ b/code/modules/mob/living/basic/lavaland/bileworm/_bileworm.dm @@ -6,8 +6,8 @@ icon_living = "bileworm" icon_dead = "bileworm_dead" mob_biotypes = MOB_ORGANIC|MOB_BUG|MOB_MINING - maxHealth = 100 - health = 100 + maxHealth = 110 + health = 110 verb_say = "spittles" verb_ask = "spittles questioningly" verb_exclaim = "splutters and gurgles" @@ -30,10 +30,16 @@ ai_controller = /datum/ai_controller/basic_controller/bileworm - ///which action this mob will be given, subtypes have different attacks - var/attack_action_path = /datum/action/cooldown/mob_cooldown/projectile_attack/dir_shots/bileworm - ///which, if at all, mob this evolves into at the 30 min mark + /// Which action this mob will be given, subtypes have different attacks + var/attack_action_path = /datum/action/cooldown/mob_cooldown/bileworm_spew + /// Which, if at all, mob this evolves into at the 30 min mark var/evolve_path = /mob/living/basic/mining/bileworm/vileworm + /// Emissive icon_state + var/emissive_state = "bileworm_e" + /// Icon file used for the jumping animation + var/icon_jump = 'icons/mob/simple/lavaland/bileworm_jump.dmi' + /// Are we currently in the middle of a jump? + var/jumping = FALSE /mob/living/basic/mining/bileworm/Initialize(mapload) . = ..() @@ -42,11 +48,7 @@ if(ispath(evolve_path)) AddComponent(/datum/component/evolutionary_leap, 30 MINUTES, evolve_path) AddElement(/datum/element/content_barfer) - - //setup mob abilities - - //well, one of them has to start on infinite cooldown - var/datum/action/cooldown/mob_cooldown/projectile_attack/dir_shots/bileworm/spew_bile = new(src) + var/datum/action/cooldown/mob_cooldown/spew_bile = new attack_action_path(src) spew_bile.Grant(src) spew_bile.StartCooldownSelf(INFINITY) ai_controller?.set_blackboard_key(BB_BILEWORM_SPEW_BILE, spew_bile) @@ -61,5 +63,10 @@ /mob/living/basic/mining/bileworm/update_overlays() . = ..() - if (stat != DEAD) - . += emissive_appearance(icon, "[icon_living]_e", src) + if (stat != DEAD && !jumping) + . += emissive_appearance(icon, emissive_state, src) + +/mob/living/basic/mining/bileworm/on_attacked(datum/source, atom/attacker, attack_flags) + . = ..() + if (!(attack_flags & (ATTACKER_STAMINA_ATTACK | ATTACKER_SHOVING))) + ai_controller?.set_blackboard_key(BB_BILEWORM_SCARED, TRUE) diff --git a/code/modules/mob/living/basic/lavaland/bileworm/bileworm_actions.dm b/code/modules/mob/living/basic/lavaland/bileworm/bileworm_actions.dm index bd480cc6972..d3a45a89a76 100644 --- a/code/modules/mob/living/basic/lavaland/bileworm/bileworm_actions.dm +++ b/code/modules/mob/living/basic/lavaland/bileworm/bileworm_actions.dm @@ -2,21 +2,70 @@ name = "Resurface" desc = "Burrow underground, and then move to a new location near your target. Must spew bile to refresh." shared_cooldown = MOB_SHARED_COOLDOWN_1 | MOB_SHARED_COOLDOWN_2 + /// Damage tracker var for bileworms + var/jump_damaged = FALSE + /// How long does the jump take to perform? + var/jump_length = 1 SECONDS + /// How long do we get stunned for if we fail a jump? + var/jump_stun = 2.4 SECONDS + +/datum/action/cooldown/mob_cooldown/resurface/Grant(mob/granted_to) + . = ..() + owner?.AddElement(/datum/element/relay_attackers) /datum/action/cooldown/mob_cooldown/resurface/Activate(atom/target_atom) StartCooldownSelf(INFINITY) + StartCooldownOthers(INFINITY) burrow(owner, target_atom) //spew now off cooldown shortly StartCooldownOthers(1.5 SECONDS) -/datum/action/cooldown/mob_cooldown/resurface/proc/burrow(mob/living/burrower, atom/target) +/// Amount of frames in the jump animation +#define BILEWORM_JUMP_FRAMES 14 + +/datum/action/cooldown/mob_cooldown/resurface/proc/burrow(mob/living/burrower, atom/target, force = FALSE) var/turf/unburrow_turf = get_unburrow_turf(burrower, target) - if(!unburrow_turf) // means all the turfs nearby are station turfs or something, not lavaland + if (!unburrow_turf) // means all the turfs nearby are station turfs or something, not lavaland to_chat(burrower, span_warning("Couldn't burrow anywhere near the target!")) if(burrower.ai_controller?.ai_status == AI_STATUS_ON) //this is a valid reason to give up on a target burrower.ai_controller.clear_blackboard_key(BB_BASIC_MOB_CURRENT_TARGET) return + + if (istype(burrower, /mob/living/basic/mining/bileworm) && !force) + var/mob/living/basic/mining/bileworm/worm = burrower + new /obj/effect/temp_visual/mook_dust(get_turf(worm)) + var/old_icon_state = worm.icon_state + worm.icon_state = null + // Get rid of the base emissive + worm.jumping = TRUE + worm.update_appearance(UPDATE_OVERLAYS) + var/atom/movable/visual = worm.flick_overlay_view(mutable_appearance(worm.icon_jump, "[worm.icon_living]_jump_1"), jump_length) + visual.vis_flags |= VIS_INHERIT_ID // So you can attack it + var/atom/movable/emissive_visual = worm.flick_overlay_view(emissive_appearance(worm.icon_jump, "[worm.emissive_state]_jump_1", worm), jump_length) + // We have to manually animate these to get around BYOND icon_state animations happening in world time and not per-object + for (var/i in 2 to BILEWORM_JUMP_FRAMES) + animate(visual, time = jump_length / BILEWORM_JUMP_FRAMES, icon_state = "[worm.icon_living]_jump_[i]", flags = ANIMATION_CONTINUE) + animate(emissive_visual, time = jump_length / BILEWORM_JUMP_FRAMES, icon_state = "[worm.emissive_state]_jump_[i]", flags = ANIMATION_CONTINUE) + jump_damaged = FALSE + RegisterSignal(worm, COMSIG_ATOM_WAS_ATTACKED, PROC_REF(on_attacked)) + // Not in an if check direclty to reduce duplicate code + var/jump_result = do_after(worm, jump_length, worm, hidden = TRUE, extra_checks = CALLBACK(src, PROC_REF(damage_check))) + UnregisterSignal(worm, COMSIG_ATOM_WAS_ATTACKED) + if (worm.icon_state == null) + worm.icon_state = old_icon_state + worm.jumping = FALSE + worm.update_appearance(UPDATE_OVERLAYS) + if (!jump_result && jump_stun) + if (!QDELETED(visual)) + QDEL_NULL(visual) + QDEL_NULL(emissive_visual) + worm.flick_overlay_view(mutable_appearance('icons/effects/effects.dmi', "dazed"), jump_stun) + worm.Stun(jump_stun) + addtimer(CALLBACK(src, PROC_REF(burrow_again), burrower, target), jump_stun) + return + + burrower.ai_controller?.set_blackboard_key(BB_BILEWORM_SCARED, FALSE) playsound(burrower, 'sound/effects/break_stone.ogg', 50, TRUE) new /obj/effect/temp_visual/mook_dust(get_turf(burrower)) ADD_TRAIT(burrower, TRAIT_GODMODE, REF(src)) @@ -29,59 +78,189 @@ REMOVE_TRAIT(burrower, TRAIT_GODMODE, REF(src)) burrower.RemoveInvisibility(type) +#undef BILEWORM_JUMP_FRAMES + +/datum/action/cooldown/mob_cooldown/resurface/proc/burrow_again(mob/living/burrower, atom/target) + if (!QDELETED(burrower) && !burrower.stat) + // Burrow immediatelly after being stunned out of the first jump to avoid chainstuns + burrow(burrower, target, force = TRUE) + +/datum/action/cooldown/mob_cooldown/resurface/proc/on_attacked(datum/source, atom/attacker, attack_flags) + SIGNAL_HANDLER + if (!(attack_flags & (ATTACKER_STAMINA_ATTACK | ATTACKER_SHOVING)) && jump_stun) + jump_damaged = TRUE + +/datum/action/cooldown/mob_cooldown/resurface/proc/damage_check() + return !jump_damaged + /datum/action/cooldown/mob_cooldown/resurface/proc/get_unburrow_turf(mob/living/burrower, atom/target) - //we want the worm to try guaranteeing a hit on a living target if it thinks it can - var/cardinal_only = FALSE - - if(isliving(target)) - var/mob/living/living_target = target - if(living_target.stat >= UNCONSCIOUS) - cardinal_only = TRUE - - var/list/potential_turfs = shuffle(oview(5, target))//get in view, shuffle - var/list/fallback_turfs = list() - for(var/turf/open/misc/chosen_one in potential_turfs)//first turf that counts as ground - if(cardinal_only && !(get_dir(chosen_one, target) in GLOB.cardinals)) - fallback_turfs.Add(chosen_one) - continue + var/list/potential_turfs = shuffle(oview(5, target)) // get in view, shuffle + for(var/turf/open/misc/chosen_one in potential_turfs) // first turf that counts as ground return chosen_one - //even if a worm can't execute someone in crit, it should not fail if it has SOMETHING to move to. - if(fallback_turfs.len) - return pick(fallback_turfs) -/datum/action/cooldown/mob_cooldown/projectile_attack/dir_shots/bileworm +/datum/action/cooldown/mob_cooldown/bileworm_spew name = "Spew Bile" - desc = "Spews bile everywhere. Must resurface after use to refresh." - projectile_type = /obj/projectile/bileworm_acid - projectile_sound = 'sound/mobs/non-humanoids/bileworm/bileworm_spit.ogg' + desc = "Spew a barrage of bile globs." shared_cooldown = MOB_SHARED_COOLDOWN_1 | MOB_SHARED_COOLDOWN_2 + cooldown_time = 3 SECONDS + /// Sound played when firing a projectile + var/projectile_sound = 'sound/mobs/non-humanoids/bileworm/bileworm_spit.ogg' + /// How many additional projectiles to shoot around the target? + var/additional_shots = 4 + /// Delay between each shot + var/shot_delay = 0.15 SECONDS + /// Effect to spawn + var/obj/effect/bileworm_acid/acid_type = /obj/effect/bileworm_acid -/datum/action/cooldown/mob_cooldown/projectile_attack/dir_shots/bileworm/Activate(atom/target_atom) +/datum/action/cooldown/mob_cooldown/bileworm_spew/Activate(atom/target_atom) StartCooldownSelf(INFINITY) attack_sequence(owner, target_atom) - //resurface now off cooldown shortly - StartCooldownOthers(2.5 SECONDS) + StartCooldownSelf() + // Resurface now off cooldown shortly + StartCooldownOthers(2 SECONDS) // Enough time for a mark + detonation combo, or 3 shots with a PKA -/datum/action/cooldown/mob_cooldown/projectile_attack/dir_shots/bileworm/attack_sequence(mob/living/firer, atom/target) - fire_in_directions(firer, target, GLOB.cardinals) - SLEEP_CHECK_DEATH(0.5 SECONDS, firer) - fire_in_directions(firer, target, GLOB.diagonals) +/datum/action/cooldown/mob_cooldown/bileworm_spew/proc/attack_sequence(mob/living/firer, atom/target) + new acid_type(firer, target) + playsound(firer, projectile_sound, 70) + var/list/all_dirs = GLOB.alldirs.Copy() + var/turf/hit_turf = get_turf(target) + // One guaranteed to hit target's turf, the rest hit randomly around them + for (var/i in 1 to additional_shots) + if (!length(all_dirs)) + return -/obj/projectile/bileworm_acid + SLEEP_CHECK_DEATH(shot_delay, firer) + if (hit_turf != target.loc) + all_dirs = list(NONE) + GLOB.alldirs // Refresh potential target turfs if they've moved + + var/turf/target_turf = null + // NODE drones get a much more focused barrage sent at them + if (istype(target, /mob/living/basic/node_drone) && prob(30)) + target_turf = get_turf(target) + else + var/target_dir = pick_n_take(all_dirs) + target_turf = target_dir ? get_step(target, target_dir) : get_turf(target) + + if (target_turf == firer.loc) // Don't hit ourselves + var/target_dir = pick_n_take(all_dirs) + target_turf = target_dir ? get_step(target, target_dir) : get_turf(target) + + new acid_type(firer, target_turf) + if (i % 2 == 0) + playsound(firer, projectile_sound, 70) + +/obj/effect/bileworm_acid name = "acidic bile" - icon_state = "neurotoxin" - hitsound = 'sound/items/weapons/sear.ogg' - damage = 20 - speed = 0.5 - range = 20 - jitter = 3 SECONDS - stutter = 3 SECONDS - damage_type = BURN - pass_flags = PASSTABLE + icon = 'icons/obj/weapons/guns/projectiles.dmi' + icon_state = "bile_glob" + layer = ABOVE_ALL_MOB_LAYER + mouse_opacity = MOUSE_OPACITY_TRANSPARENT + /// Damage dealt to all mobs in the impact turf + var/damage = 20 + /// Tiles travelled per second at maximum range + var/speed = 5 + /// Maximum range for our speed calculations + var/max_range = 10 + /// Warning sign on the turf we're about to hit + var/obj/effect/bileworm_target/target_sign = null -/obj/projectile/bileworm_acid/Initialize(mapload) +/obj/effect/bileworm_acid/Initialize(mapload, atom/new_target) . = ..() - AddComponent(/datum/component/parriable_projectile) + update_appearance(UPDATE_OVERLAYS) + if (new_target) + fire_at(get_turf(new_target)) + +/obj/effect/bileworm_acid/Destroy(force) + QDEL_NULL(target_sign) + return ..() + +/obj/effect/bileworm_acid/update_overlays() + . = ..() + . += emissive_appearance(icon, icon_state, src, alpha = 20, effect_type = EMISSIVE_BLOOM) + +/obj/effect/bileworm_acid/proc/fire_at(turf/target) + if (!istype(target)) + target = get_turf(target) + var/turf/start = get_turf(src) + forceMove(target) // Immediately move to the target turf so we can guarantee they can see us + pixel_x = (start.x - target.x) * ICON_SIZE_X + pixel_y = (start.y - target.y) * ICON_SIZE_Y + // Because BYOND's get_dist is taxicab distance + var/travel_dist = sqrt((start.x - target.x) ** 2 + (start.y - target.y) ** 2) + // Slightly scale the speed with distance for fairer gameplay + if (travel_dist < max_range) + speed *= 0.5 + travel_dist / max_range * 0.5 + var/travel_time = travel_dist / speed * 1 SECONDS + animate(src, pixel_x = 0, time = travel_time, flags = ANIMATION_PARALLEL, easing = SINE_EASING | EASE_OUT) // Not a perfect arc but looks better + animate(src, pixel_y = 160, time = travel_time / 2, flags = ANIMATION_PARALLEL, easing = QUAD_EASING | EASE_OUT) + animate(pixel_y = 0, time = travel_time / 2, easing = QUAD_EASING | EASE_IN) + animate(src, transform = matrix().Turn(start.x > target.x ? -91 : 91), time = travel_time / 2, flags = ANIMATION_PARALLEL, easing = SINE_EASING | EASE_IN) + animate(transform = matrix().Turn(start.x > target.x ? -180 : 180), time = travel_time / 2, easing = SINE_EASING | EASE_OUT) + target_sign = new(target) + addtimer(CALLBACK(src, PROC_REF(impact), target), travel_time) + +/obj/effect/bileworm_acid/proc/impact(turf/target) + var/obj/effect/abstract/particle_holder/impact_particles = new(target, /particles/bile) + QDEL_IN(impact_particles, /particles/bile::lifespan) + + var/hit_something = FALSE + for (var/mob/living/victim in target) + if(HAS_TRAIT(target, TRAIT_UNHITTABLE_BY_PROJECTILES)) + if(!HAS_TRAIT(target, TRAIT_BLOCKING_PROJECTILES) && isliving(target)) + var/mob/living/living_target = target + living_target.block_projectile_effects() + continue + + // Doesn't make much sense to use melee for mobs, but its a mining mob so eeeeeh + // Can't use acid either as its mostly for atom armor only + var/blocked = victim.run_armor_check(null, MELEE, armour_penetration = 40, silent = TRUE) + if (blocked >= 100) + continue + + hit_something = TRUE + victim.apply_damage(damage, BURN, null, blocked, wound_bonus = CANT_WOUND) + to_chat(victim, span_userdanger("You're hit by [src]!")) + + for (var/obj/thing in target) + if (!thing.uses_integrity || !thing.density) + continue + hit_something = TRUE + thing.take_damage(damage, BURN, ACID, sound_effect = FALSE) + + if (hit_something) + playsound(target, 'sound/items/weapons/sear.ogg', 50, -1) + + qdel(src) + +/obj/effect/bileworm_target + icon = 'icons/mob/telegraphing/telegraph.dmi' + icon_state = "projectile_circle" + layer = BELOW_MOB_LAYER + plane = GAME_PLANE + +/obj/effect/bileworm_target/Initialize(mapload) + . = ..() + update_appearance(UPDATE_OVERLAYS) + +/obj/effect/bileworm_target/update_overlays() + . = ..() + . += emissive_appearance(icon, icon_state, src, alpha = 90, effect_type = EMISSIVE_BLOOM) + +/particles/bile + icon = 'icons/effects/particles/goop.dmi' + icon_state = list("goop_1" = 6, "goop_2" = 2, "goop_3" = 1) + width = 100 + height = 100 + count = 10 + spawning = 10 + color = "#00ea2b80" //to get 96 alpha + lifespan = 1.5 SECONDS + fade = 1 SECONDS + grow = -0.025 + gravity = list(0, 0.15) + position = generator(GEN_SPHERE, 0, 8, NORMAL_RAND) + spin = generator(GEN_NUM, -15, 15, NORMAL_RAND) + velocity = generator(GEN_BOX, list(-2, 2), list(2, 4), NORMAL_RAND) /datum/action/cooldown/mob_cooldown/devour name = "Devour" diff --git a/code/modules/mob/living/basic/lavaland/bileworm/bileworm_ai.dm b/code/modules/mob/living/basic/lavaland/bileworm/bileworm_ai.dm index e18af7ed2ce..cd2450018cf 100644 --- a/code/modules/mob/living/basic/lavaland/bileworm/bileworm_ai.dm +++ b/code/modules/mob/living/basic/lavaland/bileworm/bileworm_ai.dm @@ -1,10 +1,13 @@ /datum/ai_controller/basic_controller/bileworm blackboard = list( BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic/bileworm, + BB_TARGET_PRIORITY_STRATEGY = /datum/target_priority_strategy/mining, + BB_BILEWORM_FLEE_DISTANCE = 3, ) planning_subtrees = list( /datum/ai_planning_subtree/escape_captivity, + /datum/ai_planning_subtree/call_reinforcements/mining, /datum/ai_planning_subtree/simple_find_target, /datum/ai_planning_subtree/bileworm_attack, /datum/ai_planning_subtree/bileworm_execute, @@ -20,16 +23,12 @@ return var/datum/action/cooldown/mob_cooldown/resurface = controller.blackboard[BB_BILEWORM_RESURFACE] + var/datum/action/cooldown/mob_cooldown/bile = controller.blackboard[BB_BILEWORM_SPEW_BILE] - //because one ability is always INFINITY cooldown, this actually works to check which ability should be used - //sometimes it will try to spew bile on infinity cooldown, but that's okay because as soon as resurface is ready it will attempt that - - if(resurface?.IsAvailable()) + if(resurface?.IsAvailable() && (controller.blackboard[BB_BILEWORM_SCARED] || get_dist(controller.pawn, controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET]) <= controller.blackboard[BB_BILEWORM_FLEE_DISTANCE])) controller.queue_behavior(/datum/ai_behavior/targeted_mob_ability/and_plan_execute, BB_BILEWORM_RESURFACE, BB_BASIC_MOB_CURRENT_TARGET) return SUBTREE_RETURN_FINISH_PLANNING - var/datum/action/cooldown/mob_cooldown/bile = controller.blackboard[BB_BILEWORM_SPEW_BILE] - if(bile?.IsAvailable()) controller.queue_behavior(/datum/ai_behavior/targeted_mob_ability/and_plan_execute, BB_BILEWORM_SPEW_BILE, BB_BASIC_MOB_CURRENT_TARGET) return SUBTREE_RETURN_FINISH_PLANNING //focus on the fight diff --git a/code/modules/mob/living/basic/lavaland/bileworm/bileworm_instrument.dm b/code/modules/mob/living/basic/lavaland/bileworm/bileworm_instrument.dm index 508728ffa73..74d20946737 100644 --- a/code/modules/mob/living/basic/lavaland/bileworm/bileworm_instrument.dm +++ b/code/modules/mob/living/basic/lavaland/bileworm/bileworm_instrument.dm @@ -2,7 +2,7 @@ name = "bilehorn" desc = "Bits of bileworm anatomy rearranged to produce wonderful music, not bile. Keeps the name though, because for an instrument, it is quite vile." force = 5 - icon = 'icons/mob/simple/lavaland/bileworm.dmi' + icon = 'icons/obj/mining_zones/artefacts.dmi' icon_state = "bilehorn" allowed_instrument_ids = "bilehorn" inhand_icon_state = null diff --git a/code/modules/mob/living/basic/lavaland/bileworm/bileworm_loot.dm b/code/modules/mob/living/basic/lavaland/bileworm/bileworm_loot.dm index 55f960e736a..a8bedef666b 100644 --- a/code/modules/mob/living/basic/lavaland/bileworm/bileworm_loot.dm +++ b/code/modules/mob/living/basic/lavaland/bileworm/bileworm_loot.dm @@ -5,7 +5,7 @@ name = "bileworm skin" desc = "The slushy, squishy and slightly shiny skin of a postmortem bileworm." singular_name = "bileworm skin piece" - icon = 'icons/mob/simple/lavaland/bileworm.dmi' + icon = 'icons/obj/stack_objects.dmi' icon_state = "sheet-bileworm" inhand_icon_state = null merge_type = /obj/item/stack/sheet/animalhide/bileworm diff --git a/code/modules/mob/living/basic/lavaland/bileworm/bileworm_vileworm.dm b/code/modules/mob/living/basic/lavaland/bileworm/bileworm_vileworm.dm index d03ff00f85a..73918285b41 100644 --- a/code/modules/mob/living/basic/lavaland/bileworm/bileworm_vileworm.dm +++ b/code/modules/mob/living/basic/lavaland/bileworm/bileworm_vileworm.dm @@ -4,34 +4,20 @@ icon_state = "vileworm" icon_living = "vileworm" icon_dead = "vileworm_dead" - maxHealth = 150 - health = 150 + maxHealth = 175 + health = 175 - attack_action_path = /datum/action/cooldown/mob_cooldown/projectile_attack/dir_shots/bileworm/vileworm + attack_action_path = /datum/action/cooldown/mob_cooldown/bileworm_spew/corrupt evolve_path = null -/datum/action/cooldown/mob_cooldown/projectile_attack/dir_shots/bileworm/vileworm +/datum/action/cooldown/mob_cooldown/bileworm_spew/corrupt name = "Spew Corrupted Bile" - desc = "Spews corrupted bile everywhere. Must resurface after use to refresh." - projectile_type = /obj/projectile/bileworm_acid/vile + desc = "Spew a barrage of corrupted bile globs." + cooldown_time = 2.5 SECONDS + acid_type = /obj/effect/bileworm_acid/corrupt + additional_shots = 6 + shot_delay = 0.1 SECONDS -/datum/action/cooldown/mob_cooldown/projectile_attack/dir_shots/bileworm/vileworm/Activate(atom/target_atom) - StartCooldownSelf(INFINITY) - attack_sequence(owner, target_atom) - //faster than unevolved - StartCooldownOthers(1.5 SECONDS) - -/datum/action/cooldown/mob_cooldown/projectile_attack/dir_shots/bileworm/vileworm/attack_sequence(mob/living/firer, atom/target) - fire_in_directions(firer, target, GLOB.cardinals) - SLEEP_CHECK_DEATH(0.25 SECONDS, firer) - fire_in_directions(firer, target, GLOB.diagonals) - SLEEP_CHECK_DEATH(0.25 SECONDS, firer) - fire_in_directions(firer, target, GLOB.cardinals) - // surprise! - if(prob(25)) - SLEEP_CHECK_DEATH(0.25 SECONDS, firer) - fire_in_directions(firer, target, GLOB.diagonals) - -/obj/projectile/bileworm_acid/vile - name = "corrupted bile" - icon_state = "vileworm" +/obj/effect/bileworm_acid/corrupt + icon_state = "corrupt_bile_glob" + damage = 27 diff --git a/code/modules/mob/living/basic/lavaland/brimdemon/brimbeam.dm b/code/modules/mob/living/basic/lavaland/brimdemon/brimbeam.dm index e558939f8e3..41a1a0f228a 100644 --- a/code/modules/mob/living/basic/lavaland/brimdemon/brimbeam.dm +++ b/code/modules/mob/living/basic/lavaland/brimdemon/brimbeam.dm @@ -15,9 +15,16 @@ var/beam_duration = 2 SECONDS /// How long do we wind up before firing? var/charge_duration = 1 SECONDS + /// Have we been hit and have to abort the blast? + var/abort_blast = FALSE /// A list of all the beam parts. var/list/beam_parts = list() +/datum/action/cooldown/mob_cooldown/brimbeam/Grant(mob/granted_to) + . = ..() + if(owner) + owner.AddElement(/datum/element/relay_attackers) + /datum/action/cooldown/mob_cooldown/brimbeam/Destroy() extinguish_laser() return ..() @@ -25,6 +32,7 @@ /datum/action/cooldown/mob_cooldown/brimbeam/Activate(atom/target) StartCooldown(360 SECONDS) + abort_blast = FALSE owner.face_atom(target) owner.move_resist = MOVE_FORCE_VERY_STRONG owner.balloon_alert_to_viewers("charging...") @@ -32,17 +40,20 @@ var/mutable_appearance/direction_emissive = emissive_appearance('icons/mob/simple/lavaland/lavaland_monsters.dmi', "brimdemon_telegraph_dir", owner, alpha = 150, effect_type = EMISSIVE_NO_BLOOM) owner.add_overlay(direction_overlay) owner.add_overlay(direction_emissive) + RegisterSignal(owner, COMSIG_ATOM_WAS_ATTACKED, PROC_REF(on_owner_attacked)) - var/fully_charged = do_after(owner, delay = charge_duration, target = owner) + var/fully_charged = do_after(owner, delay = charge_duration, target = owner, extra_checks = CALLBACK(src, PROC_REF(beam_charge_check))) owner.cut_overlay(direction_overlay) owner.cut_overlay(direction_emissive) if (!fully_charged) + UnregisterSignal(owner, COMSIG_ATOM_WAS_ATTACKED) StartCooldown() return TRUE if (!fire_laser()) var/static/list/fail_emotes = list("coughs.", "wheezes.", "belches out a puff of black smoke.") owner.manual_emote(pick(fail_emotes)) + UnregisterSignal(owner, COMSIG_ATOM_WAS_ATTACKED) StartCooldown() return TRUE @@ -51,11 +62,20 @@ demon.icon_state = demon.firing_icon_state demon.update_appearance(UPDATE_OVERLAYS) - do_after(owner, delay = beam_duration, target = owner, hidden = TRUE) + do_after(owner, delay = beam_duration, target = owner, hidden = TRUE, extra_checks = CALLBACK(src, PROC_REF(beam_charge_check))) + UnregisterSignal(owner, COMSIG_ATOM_WAS_ATTACKED) extinguish_laser() StartCooldown() return TRUE +/datum/action/cooldown/mob_cooldown/brimbeam/proc/on_owner_attacked(datum/source, atom/attacker, attack_flags, direction) + SIGNAL_HANDLER + if (!(attack_flags & ATTACK_RANGED) && !(direction & owner.dir)) + abort_blast = TRUE + +/datum/action/cooldown/mob_cooldown/brimbeam/proc/beam_charge_check() + return !abort_blast + /// Create a laser in the direction we are facing /datum/action/cooldown/mob_cooldown/brimbeam/proc/fire_laser() owner.visible_message(span_danger("[owner] fires a brimbeam!")) @@ -67,7 +87,7 @@ if(affected_turf.opacity) break var/blocked = FALSE - for(var/obj/potential_block in affected_turf.contents) + for(var/obj/potential_block in affected_turf) if(potential_block.opacity) blocked = TRUE break @@ -77,8 +97,8 @@ new_brimbeam.dir = owner.dir beam_parts += new_brimbeam new_brimbeam.assign_creator(owner) - for(var/mob/living/hit_mob in affected_turf.contents) - hit_mob.apply_damage(damage = 25, damagetype = BURN) + for(var/mob/living/hit_mob in affected_turf) + hit_mob.apply_damage(25, BURN, blocked = hit_mob.run_armor_check(null, LASER, silent = TRUE), wound_bonus = CANT_WOUND) to_chat(hit_mob, span_userdanger("You're blasted by [owner]'s brimbeam!")) RegisterSignal(new_brimbeam, COMSIG_QDELETING, PROC_REF(extinguish_laser)) // In case idk a singularity eats it or something if(!length(beam_parts)) @@ -126,16 +146,10 @@ return ..() /obj/effect/brimbeam/process() - var/atom/ignore = creator?.resolve() + var/ignore = creator?.resolve() for(var/mob/living/hit_mob in get_turf(src)) - if(hit_mob == ignore) - continue - damage(hit_mob) - -/// Hurt the passed mob -/obj/effect/brimbeam/proc/damage(mob/living/hit_mob) - hit_mob.apply_damage(damage = 5, damagetype = BURN) - to_chat(hit_mob, span_danger("You're damaged by [src]!")) + if(hit_mob != ignore) + hit_mob.apply_damage(7, BURN, blocked = hit_mob.run_armor_check(null, LASER, silent = TRUE), wound_bonus = CANT_WOUND) /// Ignore damage dealt to this mob /obj/effect/brimbeam/proc/assign_creator(mob/living/maker) diff --git a/code/modules/mob/living/basic/lavaland/brimdemon/brimdemon_ai.dm b/code/modules/mob/living/basic/lavaland/brimdemon/brimdemon_ai.dm index eb6f6f671ed..b60d7ab4a90 100644 --- a/code/modules/mob/living/basic/lavaland/brimdemon/brimdemon_ai.dm +++ b/code/modules/mob/living/basic/lavaland/brimdemon/brimdemon_ai.dm @@ -4,6 +4,7 @@ /datum/ai_controller/basic_controller/brimdemon blackboard = list( BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic, + BB_TARGET_PRIORITY_STRATEGY = /datum/target_priority_strategy/mining/low_node_priority, BB_TARGET_MINIMUM_STAT = HARD_CRIT, ) @@ -11,6 +12,7 @@ idle_behavior = /datum/idle_behavior/idle_random_walk/no_target planning_subtrees = list( /datum/ai_planning_subtree/escape_captivity, + /datum/ai_planning_subtree/call_reinforcements/mining, /datum/ai_planning_subtree/simple_find_target, /datum/ai_planning_subtree/basic_melee_attack_subtree/opportunistic, /datum/ai_planning_subtree/move_to_cardinal/brimdemon, diff --git a/code/modules/mob/living/basic/lavaland/goldgrub/goldgrub.dm b/code/modules/mob/living/basic/lavaland/goldgrub/goldgrub.dm index b20f29364bd..b43f2149893 100644 --- a/code/modules/mob/living/basic/lavaland/goldgrub/goldgrub.dm +++ b/code/modules/mob/living/basic/lavaland/goldgrub/goldgrub.dm @@ -13,8 +13,8 @@ mob_biotypes = MOB_ORGANIC|MOB_BUG|MOB_MINING friendly_verb_continuous = "harmlessly rolls into" friendly_verb_simple = "harmlessly roll into" - maxHealth = 45 - health = 45 + maxHealth = 175 + health = 175 melee_damage_lower = 0 melee_damage_upper = 0 attack_verb_continuous = "barrels into" @@ -49,16 +49,26 @@ else can_lay_eggs = FALSE - var/list/food_types = string_list(list(/obj/item/stack/ore)) + // Rarer ores heal us a bit depending on the rarity + var/static/list/food_types = list( + /obj/item/stack/ore = 0, + /obj/item/stack/ore/gold = 5, + /obj/item/stack/ore/uranium = 5, + /obj/item/stack/ore/diamond = 15, + /obj/item/stack/ore/bluespace_crystal = 20, + /obj/item/stack/ore/bananium = 30, + ) + var/static/list/innate_actions = list( /datum/action/cooldown/mob_cooldown/spit_ore = BB_SPIT_ABILITY, /datum/action/cooldown/mob_cooldown/burrow = BB_BURROW_ABILITY, ) + grant_actions_by_list(innate_actions) AddElement(/datum/element/ore_collecting) AddElement(/datum/element/basic_eating, food_types = food_types, add_to_contents = TRUE) - AddElement(/datum/element/wall_tearer, allow_reinforced = FALSE) + AddComponent(/datum/component/proficient_miner, 0.05, TRUE) // Speedy boi AddComponent(/datum/component/ai_listen_to_weather) AddComponent(\ /datum/component/appearance_on_aggro,\ @@ -81,10 +91,10 @@ SIGNAL_HANDLER if(stat != CONSCIOUS) - return COMPONENT_BULLET_PIERCED + return NONE - /// High penetration bullets should still go through. No goldgrub can save you from the colossus' death bolts. - if(prob(hitting_projectile.armour_penetration)) + /// Reflects PKA/PKC shots and plasma cutter beams, unless they have high armor penetration + if(prob(hitting_projectile.armour_penetration) || (hitting_projectile.armor_flag != BOMB && hitting_projectile.armor_flag != ENERGY)) return NONE visible_message(span_danger("[hitting_projectile] is repelled by [source]'s girth!")) diff --git a/code/modules/mob/living/basic/lavaland/goldgrub/goldgrub_abilities.dm b/code/modules/mob/living/basic/lavaland/goldgrub/goldgrub_abilities.dm index fe8c8096e2c..f1fcd44ddd4 100644 --- a/code/modules/mob/living/basic/lavaland/goldgrub/goldgrub_abilities.dm +++ b/code/modules/mob/living/basic/lavaland/goldgrub/goldgrub_abilities.dm @@ -44,9 +44,9 @@ /datum/action/cooldown/mob_cooldown/burrow/Activate() var/obj/effect/dummy/phased_mob/grub_burrow/holder = null var/turf/current_loc = get_turf(owner) + var/mob/living/grub = owner - if(!do_after(owner, 3 SECONDS, target = current_loc)) - owner.balloon_alert(owner, "need to stay still!") + if(!do_after(owner, 2.5 SECONDS, target = current_loc, extra_checks = CALLBACK(src, PROC_REF(health_check), grub.health))) return if(get_turf(owner) != current_loc) @@ -72,6 +72,10 @@ StartCooldown() return TRUE +/datum/action/cooldown/mob_cooldown/burrow/proc/health_check(health) + var/mob/living/grub = owner + return grub.health >= health + /obj/effect/dummy/phased_mob/grub_burrow /obj/effect/dummy/phased_mob/grub_burrow/phased_check(mob/living/user, direction) diff --git a/code/modules/mob/living/basic/lavaland/goliath/goliath.dm b/code/modules/mob/living/basic/lavaland/goliath/goliath.dm index 6aef2570060..7b982ddf5be 100644 --- a/code/modules/mob/living/basic/lavaland/goliath/goliath.dm +++ b/code/modules/mob/living/basic/lavaland/goliath/goliath.dm @@ -9,7 +9,7 @@ pixel_x = -12 base_pixel_x = -12 gender = MALE // Female ones are the bipedal elites - speed = 30 + speed = 12 basic_mob_flags = IMMUNE_TO_FISTS maxHealth = 300 health = 300 @@ -197,7 +197,7 @@ This one is clearly ancient, and its tentacles constantly churn the earth around it." maxHealth = 400 health = 400 - crusher_drop_chance = 30 // Wow a whole 5% more likely, how generous + crusher_drop_chance = 100 /// Don't re-check nearby turfs for this long COOLDOWN_DECLARE(retarget_turfs_cooldown) /// List of places we might spawn a tentacle, if we're alive @@ -214,7 +214,7 @@ tentacle_target_turfs -= target_turf continue if (prob(10)) - new /obj/effect/goliath_tentacle(target_turf) + new /obj/effect/goliath_tentacle(target_turf, src) /mob/living/basic/mining/goliath/ancient/immortal/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change) . = ..() @@ -224,7 +224,7 @@ /// Store nearby turfs in our list so we can pop them out later /mob/living/basic/mining/goliath/ancient/immortal/proc/cache_nearby_turfs() - COOLDOWN_START(src, retarget_turfs_cooldown, 10 SECONDS) + COOLDOWN_START(src, retarget_turfs_cooldown, 5 SECONDS) LAZYCLEARLIST(tentacle_target_turfs) for(var/turf/open/floor in orange(4, loc)) LAZYADD(tentacle_target_turfs, floor) diff --git a/code/modules/mob/living/basic/lavaland/goliath/goliath_actions.dm b/code/modules/mob/living/basic/lavaland/goliath/goliath_actions.dm index 31eecc03629..d1336aa9094 100644 --- a/code/modules/mob/living/basic/lavaland/goliath/goliath_actions.dm +++ b/code/modules/mob/living/basic/lavaland/goliath/goliath_actions.dm @@ -20,12 +20,12 @@ return ..() /datum/action/cooldown/mob_cooldown/goliath_tentacles/Activate(atom/target) - new /obj/effect/goliath_tentacle(target) - var/list/directions = GLOB.cardinals.Copy() - for(var/i in 1 to 3) - var/spawndir = pick_n_take(directions) + new /obj/effect/goliath_tentacle(target, owner) + for(var/spawndir in GLOB.cardinals) var/turf/adjacent_target = get_step(target, spawndir) - if(adjacent_target) + if(isgroundlessturf(adjacent_target) && !islava(adjacent_target)) + continue + if(isopenturf(adjacent_target) || ismineralturf(adjacent_target)) new /obj/effect/goliath_tentacle(adjacent_target) if (isliving(target)) @@ -51,7 +51,7 @@ for (var/dir in directions) var/turf/adjacent_target = get_step(target, dir) if(adjacent_target) - new /obj/effect/goliath_tentacle(adjacent_target) + new /obj/effect/goliath_tentacle/drag(adjacent_target, owner) owner.visible_message(span_warning("[owner] unleashes tentacles from the ground around it!")) StartCooldown() return TRUE @@ -70,7 +70,7 @@ shared_cooldown = NONE /datum/action/cooldown/mob_cooldown/tentacle_grasp/Activate(atom/target) - new /obj/effect/temp_visual/effect_trail/burrowed_tentacle(owner.loc, target) + new /obj/effect/temp_visual/effect_trail/burrowed_tentacle(owner.loc, target, owner) if (isliving(target)) owner.visible_message(span_warning("[owner] reaches for [target] with its tentacles!")) StartCooldown() @@ -83,4 +83,20 @@ move_speed = 2 homing = FALSE spawn_interval = 0.1 SECONDS - spawned_effect = /obj/effect/goliath_tentacle + spawned_effect = /obj/effect/goliath_tentacle/drag + /// Mob who fired us + var/mob/living/owner = null + +/obj/effect/temp_visual/effect_trail/burrowed_tentacle/Initialize(mapload, atom/target, mob/living/owner) + . = ..() + src.owner = owner + +/obj/effect/temp_visual/effect_trail/burrowed_tentacle/Destroy() + . = ..() + owner = null + +/obj/effect/temp_visual/effect_trail/burrowed_tentacle/add_spawner() + AddComponent(/datum/component/spawner, spawn_types = list(spawned_effect), max_spawned = max_spawned, spawn_time = spawn_interval, spawn_callback = CALLBACK(src, PROC_REF(on_tentacle_spawned))) + +/obj/effect/temp_visual/effect_trail/burrowed_tentacle/proc/on_tentacle_spawned(obj/effect/goliath_tentacle/tentacle) + tentacle.set_owner(owner) diff --git a/code/modules/mob/living/basic/lavaland/goliath/goliath_ai.dm b/code/modules/mob/living/basic/lavaland/goliath/goliath_ai.dm index 63842f05ef5..60dfd7a15d0 100644 --- a/code/modules/mob/living/basic/lavaland/goliath/goliath_ai.dm +++ b/code/modules/mob/living/basic/lavaland/goliath/goliath_ai.dm @@ -4,6 +4,7 @@ /datum/ai_controller/basic_controller/goliath blackboard = list( BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic, + BB_TARGET_PRIORITY_STRATEGY = /datum/target_priority_strategy/mining, BB_TARGET_MINIMUM_STAT = HARD_CRIT, ) @@ -11,6 +12,7 @@ idle_behavior = /datum/idle_behavior/idle_random_walk planning_subtrees = list( /datum/ai_planning_subtree/escape_captivity, + /datum/ai_planning_subtree/call_reinforcements/mining, /datum/ai_planning_subtree/target_retaliate/check_faction, /datum/ai_planning_subtree/simple_find_target, /datum/ai_planning_subtree/find_food, @@ -34,7 +36,7 @@ return ..() var/mob/living/target = controller.blackboard[target_key] // Interrupt attack chain to use tentacles, unless the target is already tentacled - if (ismecha(target) || (isliving(target) && !target.has_status_effect(/datum/status_effect/incapacitating/stun/goliath_tentacled))) + if (ismecha(target) || (isliving(target) && !target.get_item_by_slot(ITEM_SLOT_LEGCUFFED))) var/datum/action/cooldown/using_action = controller.blackboard[BB_GOLIATH_TENTACLES] if (using_action?.IsAvailable()) return AI_BEHAVIOR_INSTANT | AI_BEHAVIOR_FAILED @@ -46,7 +48,7 @@ /datum/ai_planning_subtree/targeted_mob_ability/goliath_tentacles/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) var/mob/living/target = controller.blackboard[target_key] - if (!(isliving(target) || ismecha(target)) || (isliving(target) && target.has_status_effect(/datum/status_effect/incapacitating/stun/goliath_tentacled))) + if (!(isliving(target) || ismecha(target)) || (isliving(target) && target.get_item_by_slot(ITEM_SLOT_LEGCUFFED))) return // Target can be an item or already grabbed, we don't want to tentacle those var/time_on_target = controller.blackboard[BB_BASIC_MOB_HAS_TARGET_TIME] || 0 if (time_on_target < MIN_TIME_TO_TENTACLE) diff --git a/code/modules/mob/living/basic/lavaland/goliath/tentacle.dm b/code/modules/mob/living/basic/lavaland/goliath/tentacle.dm index cc9546474ec..b5af54e4da0 100644 --- a/code/modules/mob/living/basic/lavaland/goliath/tentacle.dm +++ b/code/modules/mob/living/basic/lavaland/goliath/tentacle.dm @@ -13,9 +13,13 @@ /// Lower bound of damage to inflict var/min_damage = 10 /// Upper bound of damage to inflict - var/max_damage = 15 + var/max_damage = 15 + /// Type of legcuff we spawn + var/trap_type = /obj/item/restraints/legcuffs/goliath_tentacle + /// Mob who fired the tentacle + var/mob/living/owner = null -/obj/effect/goliath_tentacle/Initialize(mapload) +/obj/effect/goliath_tentacle/Initialize(mapload, mob/living/goliath) . = ..() if (ismineralturf(loc)) var/turf/closed/mineral/floor = loc @@ -28,11 +32,24 @@ deltimer(action_timer) action_timer = addtimer(CALLBACK(src, PROC_REF(animate_grab)), 0.7 SECONDS, TIMER_STOPPABLE) update_appearance(UPDATE_OVERLAYS) + set_owner(goliath) /obj/effect/goliath_tentacle/Destroy() deltimer(action_timer) return ..() +/obj/effect/goliath_tentacle/proc/set_owner(mob/living/goliath) + if (owner) + UnregisterSignal(owner, COMSIG_QDELETING) + owner = goliath + if (owner) + RegisterSignal(owner, COMSIG_QDELETING, PROC_REF(on_owner_del)) + +/obj/effect/goliath_tentacle/proc/on_owner_del(datum/source) + SIGNAL_HANDLER + owner = null + retract() + /// Change to next icon state and set up grapple /obj/effect/goliath_tentacle/proc/animate_grab() icon_state = "goliath_tentacle_wiggle" @@ -42,20 +59,31 @@ /// Grab everyone we share space with. If it's nobody, go home. /obj/effect/goliath_tentacle/proc/grab() + var/trapped_mobs = FALSE for (var/mob/living/victim in loc) - if (victim.stat == DEAD || HAS_TRAIT(victim, TRAIT_TENTACLE_IMMUNE)) + if (victim.stat == DEAD || owner && victim.faction_check_atom(owner)) + continue + if (HAS_TRAIT(victim, TRAIT_TENTACLE_IMMUNE) || SEND_SIGNAL(victim, COMSIG_GOLIATH_TENTACLED_GRABBED) & COMPONENT_GOLIATH_CANCEL_TENTACLE_GRAB) + continue + var/obj/item/restraints/legcuffs/goliath_tentacle/trap = new trap_type(loc, victim, src) + if (QDELETED(trap)) continue balloon_alert(victim, "grabbed") visible_message(span_danger("[src] grabs hold of [victim]!")) - victim.adjust_brute_loss(rand(min_damage, max_damage)) - if (victim.apply_status_effect(/datum/status_effect/incapacitating/stun/goliath_tentacled, grapple_time, src)) - buckle_mob(victim, TRUE) - SEND_SIGNAL(victim, COMSIG_GOLIATH_TENTACLED_GRABBED) + victim.apply_damage(rand(min_damage, max_damage), BRUTE, pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG), wound_bonus = CANT_WOUND) + trapped_mobs = TRUE + for (var/obj/vehicle/sealed/mecha/mech in loc) mech.take_damage(rand(min_damage, max_damage), damage_type = BRUTE, damage_flag = MELEE, sound_effect = TRUE) - if (!has_buckled_mobs()) + + // Already retracting + if (icon_state == "goliath_tentacle_retract") + return + + if (!trapped_mobs) retract() return + deltimer(action_timer) action_timer = addtimer(CALLBACK(src, PROC_REF(retract)), grapple_time, TIMER_STOPPABLE) @@ -64,7 +92,6 @@ if (icon_state == "goliath_tentacle_retract") return // Already retracting SEND_SIGNAL(src, COMSIG_GOLIATH_TENTACLE_RETRACTING) - unbuckle_all_mobs(force = TRUE) icon_state = "goliath_tentacle_retract" update_appearance(UPDATE_OVERLAYS) deltimer(action_timer) @@ -77,54 +104,136 @@ /obj/effect/goliath_tentacle/attack_hand(mob/living/user, list/modifiers) . = ..() - if (. || !has_buckled_mobs()) - return - retract() - return TRUE + if(!.) + retract() + return TRUE -/// Goliath tentacle stun with special removal conditions -/datum/status_effect/incapacitating/stun/goliath_tentacled - id = "goliath_tentacled" - duration = 10 SECONDS - /// The tentacle that is tenderly holding us close +/// An alternative variant which drags the mob in towards the goliath +/obj/effect/goliath_tentacle/drag + trap_type = /obj/item/restraints/legcuffs/goliath_tentacle/drag + +/obj/item/restraints/legcuffs/goliath_tentacle + name = "tentacle mass" + desc = "A writhing tentacle constricting one of your limbs." + icon_state = "goliath_tentacle" + slowdown = 4 + breakouttime = 6 SECONDS + resistance_flags = LAVA_PROOF | FIRE_PROOF + obj_flags = CONDUCTS_ELECTRICITY | CAN_BE_HIT + item_flags = DROPDEL + legcuff_state = "goliath_tentacle" + uses_integrity = TRUE + max_integrity = 75 // 3 PKC swings, 5 bayonet swings + /// Tentacle we're attached to var/obj/effect/goliath_tentacle/tentacle + /// Leash component linking the victim to the turf + var/datum/component/leash/leash + /// Beam between the victim and the tentacle tile + var/datum/beam/beam_effect -/datum/status_effect/incapacitating/stun/goliath_tentacled/on_creation(mob/living/new_owner, set_duration, obj/effect/goliath_tentacle/tentacle) +/obj/item/restraints/legcuffs/goliath_tentacle/Initialize(mapload, mob/living/target, obj/effect/goliath_tentacle/tentacle) . = ..() - if (!.) - return + ADD_TRAIT(src, TRAIT_IGNORE_DEMOLITION, INNATE_TRAIT) src.tentacle = tentacle + if (!target?.equip_to_slot_if_possible(src, ITEM_SLOT_LEGCUFFED, disable_warning = TRUE, bypass_equip_delay_self = TRUE)) + return INITIALIZE_HINT_QDEL -/datum/status_effect/incapacitating/stun/goliath_tentacled/on_apply() +/obj/item/restraints/legcuffs/goliath_tentacle/Destroy(force) . = ..() - RegisterSignal(owner, COMSIG_CARBON_PRE_MISC_HELP, PROC_REF(on_helped)) - RegisterSignals(owner, list(SIGNAL_ADDTRAIT(TRAIT_TENTACLE_IMMUNE), COMSIG_BRIMDUST_EXPLOSION), PROC_REF(release)) - RegisterSignals(tentacle, list(COMSIG_QDELETING, COMSIG_GOLIATH_TENTACLE_RETRACTING), PROC_REF(on_tentacle_left)) + if (tentacle) + tentacle.retract() + tentacle = null + if (leash) + UnregisterSignal(leash, COMSIG_QDELETING) + QDEL_NULL(leash) + QDEL_NULL(beam_effect) -/datum/status_effect/incapacitating/stun/goliath_tentacled/on_remove() +/obj/item/restraints/legcuffs/goliath_tentacle/equipped(mob/living/user, slot, initial) . = ..() - UnregisterSignal(owner, list(COMSIG_CARBON_PRE_MISC_HELP, SIGNAL_ADDTRAIT(TRAIT_TENTACLE_IMMUNE), COMSIG_BRIMDUST_EXPLOSION)) - if (isnull(tentacle)) + if (slot != ITEM_SLOT_LEGCUFFED || leash) return - UnregisterSignal(tentacle, list(COMSIG_QDELETING, COMSIG_GOLIATH_TENTACLE_RETRACTING)) + leash_target(user) + +/obj/item/restraints/legcuffs/goliath_tentacle/proc/release(datum/source) + SIGNAL_HANDLER + qdel(src) + +/obj/item/restraints/legcuffs/goliath_tentacle/proc/on_tentacle_left(datum/source) + SIGNAL_HANDLER + if (tentacle) + UnregisterSignal(tentacle, list(COMSIG_QDELETING, COMSIG_GOLIATH_TENTACLE_RETRACTING)) + tentacle = null + release() + +/obj/item/restraints/legcuffs/goliath_tentacle/proc/leash_target(mob/living/user) + leash = user.AddComponent(/datum/component/leash, owner = get_turf(user), distance = 1, silent = TRUE) + beam_effect = user.Beam(get_turf(user), "goliath_tentacle", beam_type = /obj/effect/ebeam/goliath, emissive = FALSE) + RegisterSignal(beam_effect.visuals, COMSIG_CLICK, PROC_REF(on_beam_click)) + RegisterSignals(user, list(SIGNAL_ADDTRAIT(TRAIT_TENTACLE_IMMUNE), COMSIG_BRIMDUST_EXPLOSION), PROC_REF(release)) + RegisterSignals(tentacle, list(COMSIG_QDELETING, COMSIG_GOLIATH_TENTACLE_RETRACTING), PROC_REF(on_tentacle_left)) + RegisterSignal(leash, COMSIG_QDELETING, PROC_REF(release)) + +/obj/item/restraints/legcuffs/goliath_tentacle/proc/on_beam_click(atom/source, atom/location, control, params, mob/user) + SIGNAL_HANDLER + INVOKE_ASYNC(src, PROC_REF(process_beam_click), source, location, params, user) + +/obj/item/restraints/legcuffs/goliath_tentacle/proc/process_beam_click(atom/source, atom/location, params, mob/user) + if(world.time <= user.next_move) + return + + var/obj/item/held_thing = user.get_active_held_item() + if (!istype(held_thing)) + return + + var/turf/nearest_turf = null + for (var/turf/line_turf in get_line(get_turf(src), get_turf(beam_effect.target))) + if (line_turf.IsReachableBy(user)) + nearest_turf = line_turf + break + + if (isnull(nearest_turf)) + return + + if (!user.can_perform_action(nearest_turf)) + nearest_turf.balloon_alert(user, "cannot reach!") + return + + held_thing.melee_attack_chain(user, src, params2list(params)) + user.changeNext_move(held_thing.attack_speed) + playsound(user, held_thing.hitsound || 'sound/effects/blob/attackblob.ogg', held_thing.get_clamped_volume(), TRUE, extrarange = held_thing.stealthy_audio ? SILENCED_SOUND_EXTRARANGE : -1, falloff_distance = 0) + +/obj/item/restraints/legcuffs/goliath_tentacle/play_attack_sound(damage_amount, damage_type, damage_flag) + return + +/obj/item/restraints/legcuffs/goliath_tentacle/drag + +/obj/item/restraints/legcuffs/goliath_tentacle/drag/Initialize(mapload, mob/living/target, obj/effect/goliath_tentacle/tentacle) + . = ..() + QDEL_IN(src, 15 SECONDS) + if (. != INITIALIZE_HINT_QDEL) + START_PROCESSING(SSprocessing, src) + +/obj/item/restraints/legcuffs/goliath_tentacle/drag/Destroy(force) + . = ..() + STOP_PROCESSING(SSprocessing, src) + +/obj/item/restraints/legcuffs/goliath_tentacle/drag/process(seconds_per_tick) + if (leash.distance <= 1) + return PROCESS_KILL + leash.set_distance(leash.distance - 1) + +/obj/item/restraints/legcuffs/goliath_tentacle/drag/leash_target(mob/living/user) + if (!tentacle?.owner) + return ..() + leash = user.AddComponent(/datum/component/leash, owner = tentacle.owner, distance = get_dist(user, tentacle.owner), silent = TRUE) + beam_effect = user.Beam(tentacle.owner, "goliath_tentacle", beam_type = /obj/effect/ebeam/goliath, emissive = FALSE) + RegisterSignal(beam_effect.visuals, COMSIG_CLICK, PROC_REF(on_beam_click)) + RegisterSignals(user, list(SIGNAL_ADDTRAIT(TRAIT_TENTACLE_IMMUNE), COMSIG_BRIMDUST_EXPLOSION), PROC_REF(release)) + RegisterSignals(tentacle.owner, COMSIG_QDELETING, PROC_REF(on_tentacle_left)) + RegisterSignal(leash, COMSIG_QDELETING, PROC_REF(release)) tentacle.retract() tentacle = null -/// Some kind soul has rescued us -/datum/status_effect/incapacitating/stun/goliath_tentacled/proc/on_helped(mob/source, mob/helping) - SIGNAL_HANDLER - release() - source.visible_message(span_notice("[helping] rips [source] from the tentacle's grasp!")) - return COMPONENT_BLOCK_MISC_HELP - -/// Something happened to make the tentacle let go -/datum/status_effect/incapacitating/stun/goliath_tentacled/proc/release() - SIGNAL_HANDLER - owner.remove_status_effect(/datum/status_effect/incapacitating/stun/goliath_tentacled) - -/// Something happened to our associated tentacle -/datum/status_effect/incapacitating/stun/goliath_tentacled/proc/on_tentacle_left() - SIGNAL_HANDLER - UnregisterSignal(tentacle, list(COMSIG_QDELETING, COMSIG_GOLIATH_TENTACLE_RETRACTING)) // No endless loops for us please - tentacle = null - release() +/obj/effect/ebeam/goliath + name = "goliath tentacle" + mouse_opacity = MOUSE_OPACITY_ICON diff --git a/code/modules/mob/living/basic/lavaland/gutlunchers/gutlunchers.dm b/code/modules/mob/living/basic/lavaland/gutlunchers/gutlunchers.dm index 87df7e847b5..9489a119c5c 100644 --- a/code/modules/mob/living/basic/lavaland/gutlunchers/gutlunchers.dm +++ b/code/modules/mob/living/basic/lavaland/gutlunchers/gutlunchers.dm @@ -46,16 +46,16 @@ /mob/living/basic/mining/gutlunch/early_melee_attack(atom/target, list/modifiers, ignore_cooldown) . = ..() - if(!.) + if(.) return if(!istype(target, /obj/structure/ore_container/food_trough/gutlunch_trough)) - return TRUE + return BASIC_MOB_CONTINUE_ATTACK_CHAIN var/obj/ore_food = locate(/obj/item/stack/ore) in target if(isnull(ore_food)) balloon_alert(src, "no food!") else UnarmedAttack(ore_food, TRUE, modifiers) - return FALSE + return BASIC_MOB_END_ATTACK_CHAIN_COOLDOWN /mob/living/basic/mining/gutlunch/proc/after_birth(mob/living/basic/mining/gutlunch/grub/baby, mob/living/partner) var/our_color = LAZYACCESS(atom_colours, FIXED_COLOUR_PRIORITY) || COLOR_GRAY diff --git a/code/modules/mob/living/basic/lavaland/legion/legion.dm b/code/modules/mob/living/basic/lavaland/legion/legion.dm index 26c90918672..f738e35bf8c 100644 --- a/code/modules/mob/living/basic/lavaland/legion/legion.dm +++ b/code/modules/mob/living/basic/lavaland/legion/legion.dm @@ -75,7 +75,7 @@ /mob/living/basic/mining/legion/update_overlays() . = ..() if (stat != DEAD && has_emissive) // Shouldn't really happen but just in case - . += emissive_appearance(icon, "[icon_living]_e", src, effect_type = EMISSIVE_NO_BLOOM) + . += emissive_appearance(icon, "[icon_living]_e", src, effect_type = EMISSIVE_BLOOM) /// Put a corpse in this guy /mob/living/basic/mining/legion/proc/consume(mob/living/carbon/human/consumed) diff --git a/code/modules/mob/living/basic/lavaland/legion/legion_ai.dm b/code/modules/mob/living/basic/lavaland/legion/legion_ai.dm index 96cde9e5ac5..8d5082d4c08 100644 --- a/code/modules/mob/living/basic/lavaland/legion/legion_ai.dm +++ b/code/modules/mob/living/basic/lavaland/legion/legion_ai.dm @@ -2,25 +2,29 @@ /datum/ai_controller/basic_controller/legion blackboard = list( BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic/legion, + BB_TARGET_PRIORITY_STRATEGY = /datum/target_priority_strategy/mining, BB_TARGET_MINIMUM_STAT = HARD_CRIT, BB_AGGRO_RANGE = 5, // Unobservant - BB_BASIC_MOB_FLEE_DISTANCE = 6, + BB_RANGED_SKIRMISH_MIN_DISTANCE = 4, + BB_RANGED_SKIRMISH_MAX_DISTANCE = 6, ) ai_movement = /datum/ai_movement/basic_avoidance idle_behavior = /datum/idle_behavior/idle_random_walk planning_subtrees = list( /datum/ai_planning_subtree/escape_captivity, + /datum/ai_planning_subtree/call_reinforcements/mining, /datum/ai_planning_subtree/random_speech/legion, /datum/ai_planning_subtree/simple_find_target, + /datum/ai_planning_subtree/maintain_distance, /datum/ai_planning_subtree/targeted_mob_ability, - /datum/ai_planning_subtree/flee_target/legion, ) /// Chase and attack whatever we are targeting, if it's friendly we will heal them /datum/ai_controller/basic_controller/legion_brood blackboard = list( BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic/legion, + BB_TARGET_PRIORITY_STRATEGY = /datum/target_priority_strategy/mining/low_node_priority, BB_TARGET_MINIMUM_STAT = HARD_CRIT, ) diff --git a/code/modules/mob/living/basic/lavaland/legion/legion_brood.dm b/code/modules/mob/living/basic/lavaland/legion/legion_brood.dm index 1fc6a7d02be..dd2bbe18de2 100644 --- a/code/modules/mob/living/basic/lavaland/legion/legion_brood.dm +++ b/code/modules/mob/living/basic/lavaland/legion/legion_brood.dm @@ -103,8 +103,17 @@ else add_ally(creator) created_by = WEAKREF(creator) - ai_controller?.set_blackboard_key(BB_LEGION_BROOD_CREATOR, creator) RegisterSignal(creator, COMSIG_QDELETING, PROC_REF(creator_destroyed)) + if (!ai_controller) + return + + ai_controller.set_blackboard_key(BB_LEGION_BROOD_CREATOR, creator) + if (!creator.ai_controller) + return + + // Inherit our creator's target and reinforcement requests + ai_controller.set_blackboard_key(BB_BASIC_MOB_CURRENT_TARGET, creator.ai_controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET]) + ai_controller.set_blackboard_key(BB_MINING_MOB_REINFORCEMENTS_REQUESTS, creator.ai_controller.blackboard[BB_MINING_MOB_REINFORCEMENTS_REQUESTS]) /// Reference handling /mob/living/basic/mining/legion_brood/proc/creator_destroyed() diff --git a/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity_ai.dm b/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity_ai.dm index c634f1238d1..bd9b2addff6 100644 --- a/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity_ai.dm +++ b/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity_ai.dm @@ -8,12 +8,13 @@ /datum/ai_controller/basic_controller/lobstrosity blackboard = list( BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic, + BB_TARGET_PRIORITY_STRATEGY = /datum/target_priority_strategy/mining, BB_PET_TARGETING_STRATEGY = /datum/targeting_strategy/basic/not_friends, BB_TARGET_MINIMUM_STAT = HARD_CRIT, BB_LOBSTROSITY_EXPLOIT_TRAITS = list(TRAIT_INCAPACITATED, TRAIT_FLOORED, TRAIT_IMMOBILIZED, TRAIT_KNOCKEDOUT), BB_LOBSTROSITY_FINGER_LUST = 0, BB_LOBSTROSITY_NAIVE_HUNTER = FALSE, - BB_BASIC_MOB_FLEE_DISTANCE = 8, + BB_BASIC_MOB_FLEE_DISTANCE = 6, BB_EAT_FOOD_COOLDOWN = 3 MINUTES, BB_ONLY_FISH_WHILE_HUNGRY = TRUE, BB_TARGET_PRIORITY_TRAIT = TRAIT_SCARY_FISHERMAN, @@ -24,6 +25,7 @@ idle_behavior = /datum/idle_behavior/idle_random_walk planning_subtrees = list( /datum/ai_planning_subtree/escape_captivity, + /datum/ai_planning_subtree/call_reinforcements/mining, /datum/ai_planning_subtree/random_speech/insect, /datum/ai_planning_subtree/hoard_fingers, /datum/ai_planning_subtree/pet_planning, diff --git a/code/modules/mob/living/basic/lavaland/mining.dm b/code/modules/mob/living/basic/lavaland/mining.dm index 59247792800..b2ba4139559 100644 --- a/code/modules/mob/living/basic/lavaland/mining.dm +++ b/code/modules/mob/living/basic/lavaland/mining.dm @@ -40,7 +40,7 @@ drop_mod = crusher_drop_chance,\ drop_immediately = basic_mob_flags & DEL_ON_DEATH,\ ) - RegisterSignal(src, COMSIG_ATOM_WAS_ATTACKED, PROC_REF(check_ashwalker_peace_violation)) + RegisterSignal(src, COMSIG_ATOM_WAS_ATTACKED, PROC_REF(on_attacked)) // We add this to ensure that mobs will actually receive the above signal, as some will lack AI // handling for retaliation and attack special cases AddElement(/datum/element/relay_attackers) @@ -55,9 +55,9 @@ throw_blocked_message = throw_blocked_message,\ ) -/mob/living/basic/mining/proc/check_ashwalker_peace_violation(datum/source, mob/living/carbon/human/possible_ashwalker) +/mob/living/basic/mining/proc/on_attacked(datum/source, atom/attacker, attack_flags) SIGNAL_HANDLER - if(!isashwalker(possible_ashwalker) || !has_faction(FACTION_ASHWALKER)) + if(!isashwalker(attacker) || !has_faction(FACTION_ASHWALKER)) return remove_faction(FACTION_ASHWALKER) diff --git a/code/modules/mob/living/basic/lavaland/mook/mook.dm b/code/modules/mob/living/basic/lavaland/mook/mook.dm index a9cd028f4b6..966c1bfba18 100644 --- a/code/modules/mob/living/basic/lavaland/mook/mook.dm +++ b/code/modules/mob/living/basic/lavaland/mook/mook.dm @@ -97,26 +97,26 @@ /mob/living/basic/mining/mook/early_melee_attack(atom/target, list/modifiers, ignore_cooldown) . = ..() - if(!.) - return FALSE + if(.) + return return attack_sequence(target) /mob/living/basic/mining/mook/proc/attack_sequence(atom/target) if(istype(target, /obj/item/stack/ore) && isnull(held_ore)) var/obj/item/ore_target = target ore_target.forceMove(src) - return FALSE + return BASIC_MOB_END_ATTACK_CHAIN_COOLDOWN if(istype(target, /obj/structure/ore_container/material_stand)) if(held_ore) held_ore.forceMove(target) - return FALSE + return BASIC_MOB_END_ATTACK_CHAIN_COOLDOWN if(istype(target, /obj/structure/bonfire)) var/obj/structure/bonfire/fire_target = target if(!fire_target.burning) fire_target.start_burning() - return FALSE + return BASIC_MOB_END_ATTACK_CHAIN_COOLDOWN /mob/living/basic/mining/mook/proc/change_combatant_state(state) attack_state = state @@ -187,7 +187,7 @@ if(istype(intruder, /mob/living/basic/mining/mook)) return for(var/mob/living/basic/mining/mook/villager in oview(src, 9)) - villager.ai_controller?.insert_blackboard_key_lazylist(BB_BASIC_MOB_RETALIATE_LIST, intruder) + villager.ai_controller?.set_blackboard_key_assoc(BB_BASIC_MOB_RETALIATE_LIST, intruder, world.time) /mob/living/basic/mining/mook/worker diff --git a/code/modules/mob/living/basic/lavaland/raptor/_raptor.dm b/code/modules/mob/living/basic/lavaland/raptor/_raptor.dm index fdcb0707cd8..610682fd7a3 100644 --- a/code/modules/mob/living/basic/lavaland/raptor/_raptor.dm +++ b/code/modules/mob/living/basic/lavaland/raptor/_raptor.dm @@ -71,7 +71,7 @@ GLOBAL_LIST_EMPTY(raptor_population) /obj/item/food/meat/slab/xeno = -15, /obj/item/food/meat/steak = 50, /obj/item/food/grown/ash_flora = 10, - /obj/item/fish = 15, + /obj/item/fish = 25, /obj/item/organ = 25, ) /// Inheritance datum we store our genetic data in @@ -92,7 +92,7 @@ GLOBAL_LIST_EMPTY(raptor_population) else change_growth_stage(growth_stage, RAPTOR_ADULT) - add_traits(list(TRAIT_ASHSTORM_IMMUNE, TRAIT_SNOWSTORM_IMMUNE, TRAIT_MINING_AOE_IMMUNE), INNATE_TRAIT) + add_traits(list(TRAIT_ASHSTORM_IMMUNE, TRAIT_SNOWSTORM_IMMUNE, TRAIT_MINING_AOE_IMMUNE, TRAIT_NO_SLIP_ICE, TRAIT_NO_SLIP_SLIDE), INNATE_TRAIT) AddElement(\ /datum/element/crusher_loot,\ trophy_type = /obj/item/crusher_trophy/raptor_feather,\ @@ -169,16 +169,16 @@ GLOBAL_LIST_EMPTY(raptor_population) /mob/living/basic/raptor/early_melee_attack(atom/target, list/modifiers, ignore_cooldown) . = ..() - if(!.) - return FALSE + if(.) + return if(!istype(target, /obj/structure/ore_container/food_trough/raptor_trough)) - return TRUE + return BASIC_MOB_CONTINUE_ATTACK_CHAIN var/obj/ore_food = locate(/obj/item/stack/ore) in target if(isnull(ore_food)) balloon_alert(src, "no food!") else UnarmedAttack(ore_food, TRUE, modifiers) - return FALSE + return BASIC_MOB_END_ATTACK_CHAIN_COOLDOWN /mob/living/basic/raptor/melee_attack(mob/living/target, list/modifiers, ignore_cooldown) if (!combat_mode && istype(target, /mob/living/basic/raptor)) diff --git a/code/modules/mob/living/basic/lavaland/raptor/raptor_color.dm b/code/modules/mob/living/basic/lavaland/raptor/raptor_color.dm index b366a44b7b6..1be8dcb6ad9 100644 --- a/code/modules/mob/living/basic/lavaland/raptor/raptor_color.dm +++ b/code/modules/mob/living/basic/lavaland/raptor/raptor_color.dm @@ -96,6 +96,10 @@ GLOBAL_LIST_INIT(raptor_colors, init_raptor_colors()) // Doesn't care for your excuses for friendly fire ai_controller = /datum/ai_controller/basic_controller/raptor/aggressive +/datum/raptor_color/red/setup_raptor(mob/living/basic/raptor/raptor) + . = ..() + ADD_TRAIT(raptor, TRAIT_MINING_AGGRO, INNATE_TRAIT) + /datum/raptor_color/purple color = "purple" description = "A small, nimble breed, these raptors have been bred as travel companions rather than mounts, capable of storing the owner's possessions and helping them escape from danger unscathed." @@ -440,7 +444,7 @@ GLOBAL_LIST_INIT(raptor_colors, init_raptor_colors()) /datum/raptor_color/black/setup_raptor(mob/living/basic/raptor/raptor) . = ..() - raptor.add_traits(list(TRAIT_LAVA_IMMUNE, TRAIT_NOFIRE_SPREAD), INNATE_TRAIT) + raptor.add_traits(list(TRAIT_LAVA_IMMUNE, TRAIT_NOFIRE_SPREAD, TRAIT_MINING_AGGRO), INNATE_TRAIT) /datum/raptor_color/black/setup_adult(mob/living/basic/raptor/raptor) . = ..() diff --git a/code/modules/mob/living/basic/lavaland/tendril/tendril.dm b/code/modules/mob/living/basic/lavaland/tendril/tendril.dm new file mode 100644 index 00000000000..b31e8a982a7 --- /dev/null +++ b/code/modules/mob/living/basic/lavaland/tendril/tendril.dm @@ -0,0 +1,155 @@ +#define HEARTBEAT_NORMAL (1.8 SECONDS) +#define HEARTBEAT_FAST (1 SECONDS) +#define HEARTBEAT_FRANTIC (0.4 SECONDS) + +GLOBAL_LIST_INIT(tendrils, list()) + +/mob/living/basic/mining/tendril + name = "necropolis tendril" + desc = "A vile tendril of corruption, originating deep underground." + icon = 'icons/mob/simple/lavaland/tendril.dmi' + icon_state = "tendril" + icon_living = "tendril" + pixel_w = -8 + base_pixel_w = -8 + status_flags = NONE + mob_biotypes = MOB_ORGANIC | MOB_SKELETAL | MOB_MINING + basic_mob_flags = DEL_ON_DEATH | IMMUNE_TO_FISTS + mob_size = MOB_SIZE_HUGE + maxHealth = 1200 + health = 1200 + + friendly_verb_continuous = "flails at" + friendly_verb_simple = "flail at" + speak_emote = list("resonates") + obj_damage = 100 + melee_damage_lower = 20 + melee_damage_upper = 20 + sharpness = SHARP_POINTY + wound_bonus = CANT_WOUND + attack_sound = 'sound/items/weapons/pierce.ogg' + attack_verb_continuous = "pierces through" + attack_verb_simple = "pierce through" + throw_blocked_message = "does nothing to the thick shell of" + move_resist = INFINITY + + light_range = 3 + light_power = 2 + light_color = LIGHT_COLOR_LAVA + + ai_controller = /datum/ai_controller/basic_controller/tendril + + /// Looping heartbeat sound + var/datum/looping_sound/heartbeat/soundloop + /// Melee attack ability to used in retaliation to melee strikes and whenever it manages to grab someone + var/datum/action/cooldown/mob_cooldown/projectile_attack/tendril_melee/tendril_melee + +/mob/living/basic/mining/tendril/Initialize(mapload) + . = ..() + GLOB.tendrils += src + AddElement(/datum/element/ai_retaliate) + AddElement(/datum/element/death_drops, /obj/structure/closet/crate/necropolis/tendril) + AddComponent(/datum/component/ai_target_timer) + AddComponent(/datum/component/gps, "Eerie Signal") + AddComponent(/datum/component/basic_mob_attack_telegraph, display_telegraph_overlay = FALSE, telegraph_duration = 0.4 SECONDS) + AddComponent(/datum/component/regenerator, regeneration_delay = 30 SECONDS, brute_per_second = 20) + add_traits(list(TRAIT_BACKSTAB_IMMUNE, TRAIT_IMMOBILIZED), INNATE_TRAIT) + + var/static/list/abilities = list( + /datum/action/cooldown/mob_cooldown/projectile_attack/tendril_lash = BB_TENDRIL_LASH, + /datum/action/cooldown/mob_cooldown/tendril_chaser = BB_TENDRIL_CHASER, + /datum/action/cooldown/mob_cooldown/tendril_cross_spikes = BB_TENDRIL_SPIKES, + ) + grant_actions_by_list(abilities) + + tendril_melee = new(src) + tendril_melee.Grant(src) + AddComponent(/datum/component/revenge_ability, tendril_melee, targeting = GET_TARGETING_STRATEGY(ai_controller.blackboard[BB_TARGETING_STRATEGY]), max_range = 2, target_self = TRUE) + + soundloop = new(src, start_immediately = FALSE) + soundloop.mid_length = HEARTBEAT_NORMAL + soundloop.pressure_affected = FALSE + soundloop.start() + update_appearance(UPDATE_OVERLAYS) + + var/turf/our_turf = get_turf(src) + for (var/turf/rock in range(4, src)) + var/dist = sqrt((rock.x - our_turf.x) ** 2 + (rock.y - our_turf.y) ** 2) + if (dist > 4.5) + continue + + if (ismineralturf(rock)) + rock.ScrapeAway(null, CHANGETURF_IGNORE_AIR) + + if (istype(rock, /turf/open/misc/asteroid) && prob(100 / sqrt(max(1, dist)))) + rock.ChangeTurf(/turf/open/indestructible/necropolis, null, CHANGETURF_IGNORE_AIR) + +/mob/living/basic/mining/tendril/Destroy() + GLOB.tendrils -= src + QDEL_NULL(soundloop) + + if(!SSachievements.achievements_enabled || (flags_1 & ADMIN_SPAWNED_1)) + return ..() + + for(var/mob/living/killer in view(7, src)) + if(killer.stat || !killer.client) + continue + killer.client.give_award(/datum/award/score/tendril_score, killer) + if (!length(GLOB.tendrils)) + killer.client.give_award(/datum/award/achievement/boss/tendril_exterminator, killer) + + return ..() + +/mob/living/basic/mining/tendril/update_overlays() + . = ..() + . += emissive_appearance(icon, "[icon_state]_e", src, effect_type = EMISSIVE_NO_BLOOM) + . += emissive_appearance(icon, "[icon_state]_e_bloom", src, effect_type = EMISSIVE_BLOOM) + +/mob/living/basic/mining/tendril/Life(seconds_per_tick) + . = ..() + update_heartbeat() // Just a single math op unless we need updating so its fine to put it here + +/mob/living/basic/mining/tendril/updatehealth() + . = ..() + update_heartbeat() + +/mob/living/basic/mining/tendril/proc/update_heartbeat() + if (!soundloop) + return + + var/beat_rate = HEARTBEAT_NORMAL + if (ai_controller?.blackboard[BB_BASIC_MOB_CURRENT_TARGET]) + beat_rate = round(HEARTBEAT_FRANTIC + health / maxHealth * (HEARTBEAT_FAST - HEARTBEAT_FRANTIC), 0.05 SECONDS) + + if (beat_rate != soundloop.mid_length) + soundloop.set_mid_length(beat_rate) + +/mob/living/basic/mining/tendril/do_attack_animation(atom/attacked_atom, visual_effect_icon, obj/item/used_item, no_effect, fov_effect = TRUE, item_animation_override = null) + if(!no_effect && (visual_effect_icon || used_item)) + do_item_attack_animation(attacked_atom, visual_effect_icon, used_item, animation_type = item_animation_override) + + // Stabby visuals + var/obj/effect/temp_visual/spike_stab/stab = new(get_turf(src)) + var/target_dir = get_dir(src, attacked_atom) + stab.transform = matrix().Turn(dir2angle(target_dir) + rand(-7, 7)) + if (target_dir & NORTH) + stab.pixel_z = 24 + else if (target_dir & SOUTH) + stab.pixel_z = -24 + if (target_dir & EAST) + stab.pixel_w = 24 + else if (target_dir & WEST) + stab.pixel_w = -24 + +/obj/effect/temp_visual/spike_stab + icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi' + icon_state = "spike_small" + duration = 0.4 SECONDS + +/mob/living/basic/mining/tendril/proc/snatch_react() + if (tendril_melee.IsAvailable()) + tendril_melee.Activate(warning = FALSE) + +#undef HEARTBEAT_NORMAL +#undef HEARTBEAT_FAST +#undef HEARTBEAT_FRANTIC diff --git a/code/modules/mob/living/basic/lavaland/tendril/tendril_actions.dm b/code/modules/mob/living/basic/lavaland/tendril/tendril_actions.dm new file mode 100644 index 00000000000..ba4bb3b219d --- /dev/null +++ b/code/modules/mob/living/basic/lavaland/tendril/tendril_actions.dm @@ -0,0 +1,358 @@ +/// Fires out two cross patterns of damaging tentacles which reel in anything they hit, then causes a followup attack +/datum/action/cooldown/mob_cooldown/projectile_attack/tendril_lash + name = "Tentacle Lash" + desc = "Lash out with your tentacles in 8 directions, reeling in whatever you hit and unleashing a deadly followup attack afterwards." + button_icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi' + button_icon_state = "goliath_tentacle_wiggle" + background_icon_state = "bg_demon" + overlay_icon_state = "bg_demon_border" + click_to_activate = FALSE + cooldown_time = 8 SECONDS + melee_cooldown_time = 0 + shared_cooldown = NONE + projectile_type = /obj/projectile/tentacle_lash + +/datum/action/cooldown/mob_cooldown/projectile_attack/tendril_lash/Activate(atom/target) + disable_cooldown_actions() + + for (var/swipe_dir in GLOB.cardinals) + var/turf/open/line_turf = get_step(owner, swipe_dir) + for (var/i in 1 to projectile_type::range) + if (!istype(line_turf) || line_turf.is_blocked_turf(exclude_mobs = TRUE)) + break + var/obj/effect/temp_visual/telegraphing/line/telegraph = new(line_turf) + telegraph.dir = swipe_dir + line_turf = get_step(line_turf, swipe_dir) + + SLEEP_CHECK_DEATH(0.8 SECONDS, owner) + + for (var/swipe_dir in GLOB.cardinals) + shoot_projectile(get_turf(owner), get_step(owner, swipe_dir), dir2angle(swipe_dir), owner) + + SLEEP_CHECK_DEATH(1.6 SECONDS, owner) + + for (var/swipe_dir in GLOB.diagonals) + var/turf/open/line_turf = get_step(owner, swipe_dir) + for (var/i in 1 to projectile_type::range) + if (!istype(line_turf) || line_turf.is_blocked_turf(exclude_mobs = TRUE)) + break + var/obj/effect/temp_visual/telegraphing/line/telegraph = new(line_turf) + telegraph.dir = swipe_dir + line_turf = get_step(line_turf, swipe_dir) + + SLEEP_CHECK_DEATH(0.8 SECONDS, owner) + + for (var/swipe_dir in GLOB.diagonals) + shoot_projectile(get_turf(owner), get_step(owner, swipe_dir), dir2angle(swipe_dir), owner) + + SLEEP_CHECK_DEATH(1.2 SECONDS, owner) + StartCooldown() + SLEEP_CHECK_DEATH(0.6 SECONDS, owner) + enable_cooldown_actions() + return TRUE + +/obj/projectile/tentacle_lash + name = "tentacle spike" + icon_state = "tentacle_spike" + pass_flags = PASSTABLE + damage = 5 // +10 from the grab + armor_flag = MELEE + range = 7 + hit_prone_targets = TRUE + hitsound = 'sound/effects/wounds/pierce1.ogg' + sharpness = SHARP_POINTY + /// Beam connecting us and the firer + var/datum/beam/tentacle_beam = null + /// Does this projectile persist and reel in targets? + var/reel_in = TRUE + /// How long does the projectile persist? + var/duration = 1.2 SECONDS + /// Damage dealt to targets who get snatched from entering the beam or being hit directly + var/snatch_damage = 10 + +/obj/projectile/tentacle_lash/stab + damage = 15 + range = 2 + duration = 0.2 SECONDS // Just for visual flair + reel_in = FALSE + +/obj/projectile/tentacle_lash/fire(fire_angle, atom/direct_target) + . = ..() + if (!firer) + return + tentacle_beam = Beam(firer, "goliath_tentacle", beam_type = (reel_in ? /obj/effect/ebeam/reacting : /obj/effect/ebeam), emissive = FALSE) + if (reel_in) + RegisterSignal(tentacle_beam, COMSIG_BEAM_ENTERED, PROC_REF(on_beam_entered)) + +/obj/projectile/tentacle_lash/Destroy() + QDEL_NULL(tentacle_beam) + return ..() + +// Don't range out, stop and persist until we're done +/obj/projectile/tentacle_lash/on_range() + STOP_PROCESSING(SSprojectiles, src) + // Reset to tile center + pixel_x = 0 + pixel_y = 0 + QDEL_IN(src, duration) + +/obj/projectile/tentacle_lash/prehit_pierce(atom/target) + // Ye 'ole colossus cheese + if (astype(target, /mob/living)?.stat == DEAD) + return PROJECTILE_PIERCE_PHASE + return ..() + +/obj/projectile/tentacle_lash/on_hit(atom/target, blocked, pierce_hit) + . = ..() + if (!reel_in || !isliving(target) || blocked >= 100 || pierce_hit || . != BULLET_ACT_HIT) + return + snatch_target(target) + +/obj/projectile/tentacle_lash/proc/on_beam_entered(datum/beam/source, obj/effect/ebeam/hit, atom/movable/entered) + SIGNAL_HANDLER + + if (!reel_in || entered == firer || !isliving(entered)) + return + + var/mob/living/victim = entered + if ((!firer || !firer.faction_check_atom(victim)) && victim.stat != DEAD) + INVOKE_ASYNC(src, PROC_REF(snatch_target), entered) + +/obj/projectile/tentacle_lash/proc/snatch_target(mob/living/victim) + if (HAS_TRAIT(victim, TRAIT_TENTACLE_IMMUNE) || SEND_SIGNAL(victim, COMSIG_TENDRIL_TENTACLED_GRABBED) & COMPONENT_TENDRIL_CANCEL_TENTACLE_GRAB) + return + + to_chat(victim, span_userdanger("You're snatched by [firer]'s tentacles!")) + victim.apply_damage(snatch_damage, BRUTE, BODY_ZONE_CHEST, wound_bonus = CANT_WOUND) + if (QDELETED(victim)) + qdel(src) + return + var/snatch_callback = null + if (istype(firer, /mob/living/basic/mining/tendril)) + var/mob/living/basic/mining/tendril/tendril = firer + snatch_callback = CALLBACK(tendril, TYPE_PROC_REF(/mob/living/basic/mining/tendril, snatch_react)) + victim.throw_at(firer, initial(range), 1, firer, FALSE, gentle = TRUE, callback = snatch_callback) + playsound(victim, hitsound, 50, -3, pressure_affected = FALSE) + qdel(src) + +/// An ability which makes spikes come out of the ground towards your target +/datum/action/cooldown/mob_cooldown/tendril_chaser + name = "Impaling Spikes" + desc = "Send a spiked subterranean tendril chasing after your target." + button_icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi' + button_icon_state = "spikes_stabbing" + background_icon_state = "bg_demon" + overlay_icon_state = "bg_demon_border" + cooldown_time = 8 SECONDS + click_to_activate = TRUE + shared_cooldown = NONE + /// Lazy list of references to spike trails + var/list/active_chasers + /// Health percentage threshold at which we send out wide charsers after the main target + var/wide_chaser_threshold = 0.7 + +/datum/action/cooldown/mob_cooldown/tendril_chaser/Grant(mob/granted_to) + . = ..() + RegisterSignal(granted_to, COMSIG_MOB_ABILITY_STARTED, PROC_REF(on_ability_started)) + RegisterSignal(granted_to, COMSIG_MOB_ABILITY_FINISHED, PROC_REF(on_ability_finished)) + +// Clean up after ourselves +/datum/action/cooldown/mob_cooldown/tendril_chaser/Remove(mob/removed_from) + UnregisterSignal(removed_from, list(COMSIG_MOB_ABILITY_STARTED, COMSIG_MOB_ABILITY_FINISHED)) + QDEL_LIST(active_chasers) + return ..() + +/datum/action/cooldown/mob_cooldown/tendril_chaser/proc/on_ability_started(mob/living/owner, datum/action/cooldown/activated) + SIGNAL_HANDLER + + // Delete all of our chasers when our owner triggers cross spikes as to not cause guaranteed damage + if (istype(activated, /datum/action/cooldown/mob_cooldown/tendril_cross_spikes)) + QDEL_LIST(active_chasers) + +/datum/action/cooldown/mob_cooldown/tendril_chaser/proc/on_ability_finished(mob/living/owner, datum/action/cooldown/activated) + SIGNAL_HANDLER + + if (istype(activated, /datum/action/cooldown/mob_cooldown/tendril_cross_spikes)) + ResetCooldown() + +/datum/action/cooldown/mob_cooldown/tendril_chaser/Activate(atom/target) + . = ..() + var/primary_type = /obj/effect/temp_visual/effect_trail/tendril_chaser + if (isliving(owner)) + var/mob/living/as_living = owner + if (as_living.health / as_living.maxHealth <= wide_chaser_threshold) + primary_type = /obj/effect/temp_visual/effect_trail/tendril_chaser/wide_area + + var/obj/effect/temp_visual/effect_trail/tendril_chaser/chaser = new primary_type(get_turf(owner), target) + LAZYADD(active_chasers, WEAKREF(chaser)) + RegisterSignal(chaser, COMSIG_QDELETING, PROC_REF(on_chaser_destroyed)) + playsound(owner, 'sound/effects/magic/demon_attack1.ogg', vol = 100, vary = TRUE, pressure_affected = FALSE) + +/// Remove a spike trail from our list of active trails +/datum/action/cooldown/mob_cooldown/tendril_chaser/proc/on_chaser_destroyed(atom/chaser) + SIGNAL_HANDLER + LAZYREMOVE(active_chasers, WEAKREF(chaser)) + +/obj/effect/temp_visual/effect_trail/tendril_chaser + duration = 10 SECONDS + move_speed = 4 + spawned_effect = /obj/effect/temp_visual/emerging_ground_spike/tendril + /// Do we spawn spikes around ourselves as well or only on our own turf? + var/area_spawn = FALSE + +/obj/effect/temp_visual/effect_trail/tendril_chaser/wide_area + area_spawn = TRUE + +/obj/effect/temp_visual/effect_trail/tendril_chaser/add_spawner() + return + +/obj/effect/temp_visual/effect_trail/tendril_chaser/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change) + . = ..() + if (!area_spawn) + var/turf/spawn_turf = get_turf(src) + if (!(locate(/obj/effect/temp_visual/emerging_ground_spike/tendril) in spawn_turf) && isopenturf(spawn_turf)) + new spawned_effect(spawn_turf) + return + + for (var/spawn_dir in GLOB.cardinals) + if (spawn_dir & REVERSE_DIR(movement_dir)) + continue + var/turf/spawn_loc = get_step(src, spawn_dir) + if (!(locate(/obj/effect/temp_visual/emerging_ground_spike/tendril) in spawn_loc) && isopenturf(spawn_loc)) + new spawned_effect(spawn_loc) + +/obj/effect/temp_visual/emerging_ground_spike/tendril + icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi' + icon_state = "spikes_stabbing" + duration = 0.7 SECONDS + position_variance = 3 + impale_damage = 10 + damage_blacklist_typecache = list( + /mob/living/basic/mining/tendril, + ) + impale_wound_bonus = CANT_WOUND + // Have we hit someone yet? + var/hit_loser = FALSE + +/obj/effect/temp_visual/emerging_ground_spike/tendril/single + icon_state = "spike" + duration = 1 SECONDS + harm_delay = 0.25 SECONDS + position_variance = 5 + +/obj/effect/temp_visual/emerging_ground_spike/tendril/impale() + . = ..() + hit_loser |= . + RegisterSignal(loc, COMSIG_ATOM_ENTERED, PROC_REF(on_entered)) + +/obj/effect/temp_visual/emerging_ground_spike/tendril/proc/on_entered(atom/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs) + SIGNAL_HANDLER + + if (!isliving(arrived)) + return + + if (harm_mob(arrived) && !hit_loser) + playsound(src, 'sound/items/weapons/slice.ogg', vol = 50, vary = TRUE, pressure_affected = FALSE) + hit_loser = TRUE + +/datum/action/cooldown/mob_cooldown/tendril_cross_spikes + name = "Cross Spikes" + desc = "Create a wave of spikes around yourself, impaling anyone caught in it." + button_icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi' + button_icon_state = "spike" + background_icon_state = "bg_demon" + overlay_icon_state = "bg_demon_border" + click_to_activate = FALSE + cooldown_time = 10 SECONDS + melee_cooldown_time = 0 + shared_cooldown = NONE + /// Health threshold at which we reduce the amount of empty spots on the ground + var/health_threshold = 0.3 + +/datum/action/cooldown/mob_cooldown/tendril_cross_spikes/Activate(atom/target) + disable_cooldown_actions() + spawn_spikes() + SLEEP_CHECK_DEATH(0.4 SECONDS, owner) + spawn_spikes(inverse = TRUE) + StartCooldown() + enable_cooldown_actions() + return TRUE + +/datum/action/cooldown/mob_cooldown/tendril_cross_spikes/proc/spawn_spikes(inverse = FALSE) + var/list/turf/spike_turfs = list() + var/turf/owner_turf = get_turf(owner) + + var/reduced_spawns = FALSE + if (isliving(owner)) + var/mob/living/as_living = owner + if (as_living.health / as_living.maxHealth <= health_threshold) + reduced_spawns = TRUE + + for (var/turf/open/target_turf in oview(7, owner_turf)) + if (sqrt((target_turf.x - owner_turf.x) ** 2 + (target_turf.y - owner_turf.y) ** 2) > 9.5) // big circle is a lie + continue + + if (reduced_spawns) + if (abs(target_turf.x - owner_turf.x) % 2 == abs(target_turf.y - owner_turf.y + inverse) % 2) + new /obj/effect/temp_visual/telegraphing/circle/short(target_turf) + spike_turfs += target_turf + continue + + var/row_diff = inverse ? abs(target_turf.x - owner_turf.x) : abs(target_turf.y - owner_turf.y) + var/column_diff = inverse ? abs(target_turf.y - owner_turf.y) : abs(target_turf.x - owner_turf.x) + var/row = floor((row_diff + 1) / 3) + if (row % 2 == 0) + if (row_diff - row * 3 == 0) + if (column_diff % 4 == 2) + continue + else + if (column_diff % 4 != 0) + continue + else + if (row_diff - row * 3 == 0) + if (column_diff % 4 == 0) + continue + else + if (column_diff % 4 != 2) + continue + + new /obj/effect/temp_visual/telegraphing/circle/short(target_turf) + spike_turfs += target_turf + + SLEEP_CHECK_DEATH(1 SECONDS, owner) + + for (var/turf/open/to_spawn in spike_turfs) + new /obj/effect/temp_visual/emerging_ground_spike/tendril/single(to_spawn) + + SLEEP_CHECK_DEATH(0.8 SECONDS, owner) + +/datum/action/cooldown/mob_cooldown/projectile_attack/tendril_melee + name = "Tentacle Stab" + desc = "Stab nearby hostiles with long tentacles." + button_icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi' + button_icon_state = "goliath_tentacle_wiggle" + background_icon_state = "bg_demon" + overlay_icon_state = "bg_demon_border" + click_to_activate = FALSE + cooldown_time = 4 SECONDS + melee_cooldown_time = 0 + shared_cooldown = NONE + projectile_type = /obj/projectile/tentacle_lash/stab + +/datum/action/cooldown/mob_cooldown/projectile_attack/tendril_melee/Activate(atom/target_atom, warning = TRUE) + if (warning) + for (var/stab_dir in GLOB.alldirs) + var/turf/open/stab_turf = get_step(owner, stab_dir) + if (!istype(stab_turf)) + continue + var/obj/effect/temp_visual/telegraphing/line/short/telegraph = new(stab_turf) + telegraph.dir = stab_dir + + SLEEP_CHECK_DEATH(0.5 SECONDS, owner) + + for (var/stab_dir in GLOB.alldirs) + shoot_projectile(get_turf(owner), get_step(owner, stab_dir), firer = owner) + + SLEEP_CHECK_DEATH(0.5 SECONDS, owner) + StartCooldown() + return TRUE diff --git a/code/modules/mob/living/basic/lavaland/tendril/tendril_ai.dm b/code/modules/mob/living/basic/lavaland/tendril/tendril_ai.dm new file mode 100644 index 00000000000..77da7086dfa --- /dev/null +++ b/code/modules/mob/living/basic/lavaland/tendril/tendril_ai.dm @@ -0,0 +1,35 @@ +/datum/ai_controller/basic_controller/tendril + blackboard = list( + BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic, + BB_TARGET_MINIMUM_STAT = HARD_CRIT, + ) + + planning_subtrees = list( + /datum/ai_planning_subtree/call_reinforcements/mining, + /datum/ai_planning_subtree/target_retaliate/check_faction, + /datum/ai_planning_subtree/simple_find_target, + /datum/ai_planning_subtree/targeted_mob_ability/tendril_chaser, + /datum/ai_planning_subtree/use_mob_ability/tendril_spikes, + /datum/ai_planning_subtree/use_mob_ability/tendril_lash, + ) + +/datum/ai_planning_subtree/targeted_mob_ability/tendril_chaser + ability_key = BB_TENDRIL_CHASER + operational_datums = list(/datum/component/ai_target_timer) + finish_planning = FALSE + +/datum/ai_planning_subtree/use_mob_ability/tendril_lash + ability_key = BB_TENDRIL_LASH + +/datum/ai_planning_subtree/use_mob_ability/tendril_lash/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) + if (!controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET]) + return FALSE + return ..() + +/datum/ai_planning_subtree/use_mob_ability/tendril_spikes + ability_key = BB_TENDRIL_SPIKES + +/datum/ai_planning_subtree/use_mob_ability/tendril_spikes/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) + if (!controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET]) + return FALSE + return ..() diff --git a/code/modules/mob/living/basic/lavaland/watcher/watcher_ai.dm b/code/modules/mob/living/basic/lavaland/watcher/watcher_ai.dm index d31f76eaee6..cd45eb9c6ec 100644 --- a/code/modules/mob/living/basic/lavaland/watcher/watcher_ai.dm +++ b/code/modules/mob/living/basic/lavaland/watcher/watcher_ai.dm @@ -1,12 +1,16 @@ /datum/ai_controller/basic_controller/watcher blackboard = list( BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic, + BB_TARGET_PRIORITY_STRATEGY = /datum/target_priority_strategy/mining, + BB_RANGED_SKIRMISH_MIN_DISTANCE = 3, + BB_RANGED_SKIRMISH_MAX_DISTANCE = 5, ) ai_movement = /datum/ai_movement/basic_avoidance idle_behavior = /datum/idle_behavior/idle_random_walk planning_subtrees = list( /datum/ai_planning_subtree/escape_captivity, + /datum/ai_planning_subtree/call_reinforcements/mining, /datum/ai_planning_subtree/target_retaliate/check_faction, /datum/ai_planning_subtree/simple_find_target, /datum/ai_planning_subtree/maintain_distance, diff --git a/code/modules/mob/living/basic/minebots/minebot.dm b/code/modules/mob/living/basic/minebots/minebot.dm index 0409095f8a8..525f1450141 100644 --- a/code/modules/mob/living/basic/minebots/minebot.dm +++ b/code/modules/mob/living/basic/minebots/minebot.dm @@ -255,13 +255,13 @@ /mob/living/basic/mining_drone/early_melee_attack(atom/target, list/modifiers, ignore_cooldown) . = ..() - if(!.) - return FALSE + if(.) + return if(!istype(target, /mob/living/basic/node_drone)) - return TRUE + return BASIC_MOB_CONTINUE_ATTACK_CHAIN repair_node_drone(target) - return FALSE + return BASIC_MOB_END_ATTACK_CHAIN_COOLDOWN /mob/living/basic/mining_drone/proc/repair_node_drone(mob/living/my_target) do_sparks(5, FALSE, source = my_target) diff --git a/code/modules/mob/living/basic/pets/cat/cat.dm b/code/modules/mob/living/basic/pets/cat/cat.dm index 88e7b9a5adf..060adddd0fa 100644 --- a/code/modules/mob/living/basic/pets/cat/cat.dm +++ b/code/modules/mob/living/basic/pets/cat/cat.dm @@ -103,21 +103,21 @@ /mob/living/basic/pet/cat/early_melee_attack(atom/target, list/modifiers, ignore_cooldown) . = ..() - if(!.) - return FALSE + if(.) + return if(istype(target, /obj/machinery/oven/range) && can_interact_with_stove) target.attack_hand(src) - return FALSE + return BASIC_MOB_END_ATTACK_CHAIN_COOLDOWN if(!can_hold_item) - return TRUE + return BASIC_MOB_CONTINUE_ATTACK_CHAIN if(!is_type_in_list(target, huntable_items) || held_food) - return TRUE + return BASIC_MOB_CONTINUE_ATTACK_CHAIN var/atom/movable/movable_target = target movable_target.forceMove(src) - return FALSE + return BASIC_MOB_END_ATTACK_CHAIN_COOLDOWN /mob/living/basic/pet/cat/Exited(atom/movable/gone, direction) . = ..() diff --git a/code/modules/mob/living/basic/pets/dog/_dog.dm b/code/modules/mob/living/basic/pets/dog/_dog.dm index 0db8b036eee..21f07026140 100644 --- a/code/modules/mob/living/basic/pets/dog/_dog.dm +++ b/code/modules/mob/living/basic/pets/dog/_dog.dm @@ -35,6 +35,8 @@ attack_sound = 'sound/items/weapons/bite.ogg' attack_vis_effect = ATTACK_EFFECT_BITE melee_attack_cooldown = 0.8 SECONDS + melee_damage_lower = 5 + melee_damage_upper = 10 /// Instructions you can give to dogs var/static/list/pet_commands = list( /datum/pet_command/idle, diff --git a/code/modules/mob/living/basic/pets/orbie/orbie.dm b/code/modules/mob/living/basic/pets/orbie/orbie.dm index 40a93f4b882..fbbdfd89d22 100644 --- a/code/modules/mob/living/basic/pets/orbie/orbie.dm +++ b/code/modules/mob/living/basic/pets/orbie/orbie.dm @@ -63,14 +63,14 @@ /mob/living/basic/orbie/early_melee_attack(atom/target, list/modifiers, ignore_cooldown) . = ..() - if(!.) - return FALSE + if(.) + return if(src == target || happy_state || !istype(target)) - return TRUE + return BASIC_MOB_CONTINUE_ATTACK_CHAIN toggle_happy_state() addtimer(CALLBACK(src, PROC_REF(toggle_happy_state)), 30 SECONDS) - return FALSE + return BASIC_MOB_END_ATTACK_CHAIN_COOLDOWN /mob/living/basic/orbie/proc/on_lights(datum/source) SIGNAL_HANDLER diff --git a/code/modules/mob/living/basic/pets/parrot/_parrot.dm b/code/modules/mob/living/basic/pets/parrot/_parrot.dm index 8e338d7bf60..d40a6af9b3d 100644 --- a/code/modules/mob/living/basic/pets/parrot/_parrot.dm +++ b/code/modules/mob/living/basic/pets/parrot/_parrot.dm @@ -282,14 +282,14 @@ GLOBAL_LIST_INIT(strippable_parrot_items, create_strippable_list(list( /// This is pretty much meant for players, AI will use the task-specific procs instead. /mob/living/basic/parrot/early_melee_attack(atom/target, list/modifiers, ignore_cooldown) . = ..() - if(!.) - return FALSE + if(.) + return if(isitem(target) && steal_from_ground(target)) - return FALSE + return BASIC_MOB_END_ATTACK_CHAIN_COOLDOWN if(iscarbon(target) && steal_from_mob(target)) - return FALSE + return BASIC_MOB_END_ATTACK_CHAIN_COOLDOWN /// Picks up an item from the ground and puts it in our claws. Returns TRUE if we picked it up, FALSE otherwise. /mob/living/basic/parrot/proc/steal_from_ground(obj/item/target) diff --git a/code/modules/mob/living/basic/pets/parrot/poly.dm b/code/modules/mob/living/basic/pets/parrot/poly.dm index 88885ad8861..cef0a445acd 100644 --- a/code/modules/mob/living/basic/pets/parrot/poly.dm +++ b/code/modules/mob/living/basic/pets/parrot/poly.dm @@ -7,7 +7,7 @@ /// Poly has only just survived a round, and is doing a consecutive one. #define POLY_CONSECUTIVE_ROUND "consecutive_round" /// haunt filter we apply to who we possess -#define POLY_POSSESS_FILTER +#define POLY_POSSESS_FILTER "poly_possess_filter" /// haunt filter color we apply to who we possess #define POLY_POSSESS_GLOW "#522059" diff --git a/code/modules/mob/living/basic/pets/pet.dm b/code/modules/mob/living/basic/pets/pet.dm index ae32718b658..d2f3ce28348 100644 --- a/code/modules/mob/living/basic/pets/pet.dm +++ b/code/modules/mob/living/basic/pets/pet.dm @@ -5,5 +5,7 @@ mob_biotypes = MOB_ORGANIC|MOB_BEAST default_blood_volume = BLOOD_VOLUME_NORMAL basic_mob_flags = SENDS_DEATH_MOODLETS + melee_damage_lower = 5 + melee_damage_upper = 5 /// if the mob is protected from being renamed by collars. var/unique_pet = FALSE diff --git a/code/modules/mob/living/basic/ruin_defender/mimic/mimic.dm b/code/modules/mob/living/basic/ruin_defender/mimic/mimic.dm index 854c74d30ec..c19af055529 100644 --- a/code/modules/mob/living/basic/ruin_defender/mimic/mimic.dm +++ b/code/modules/mob/living/basic/ruin_defender/mimic/mimic.dm @@ -138,7 +138,7 @@ GLOBAL_LIST_INIT(animatable_blacklist, typecacheof(list( /mob/living/basic/mimic/crate/early_melee_attack(atom/target, list/modifiers, ignore_cooldown) if(target == src) toggle_open() - return FALSE + return BASIC_MOB_END_ATTACK_CHAIN_COOLDOWN return ..() /mob/living/basic/mimic/crate/CanAllowThrough(atom/movable/mover, border_dir) @@ -411,10 +411,13 @@ GLOBAL_LIST_INIT(animatable_blacklist, typecacheof(list( return TRUE /mob/living/basic/mimic/copy/ranged/CopyObject(obj/item/gun/original, mob/living/creator, destroy_original = 0) - if(..()) - obj_damage = 0 - melee_damage_upper = original.force - melee_damage_lower = original.force - max(0, (original.force / 2)) + . = ..() + if(!.) + return + obj_damage = 0 + melee_damage_upper = original.force + melee_damage_lower = original.force - max(0, (original.force / 2)) + RegisterSignal(original, COMSIG_GUN_REPLENISHED_CHARGE, PROC_REF(on_regained_charge)) /mob/living/basic/mimic/copy/ranged/CopyObjectVisuals(obj/original) name = original.name @@ -424,4 +427,9 @@ GLOBAL_LIST_INIT(animatable_blacklist, typecacheof(list( /mob/living/basic/mimic/copy/ranged/can_use_guns(obj/item/gun) return TRUE +/// If our gun ran out of ammo but then regenerated it then we should go back to shooting +/mob/living/basic/mimic/copy/ranged/proc/on_regained_charge() + SIGNAL_HANDLER + ai_controller?.set_blackboard_key(BB_GUNMIMIC_GUN_EMPTY, FALSE) + #undef CANT_INSERT_FULL diff --git a/code/modules/mob/living/basic/ruin_defender/mimic/mimic_ai.dm b/code/modules/mob/living/basic/ruin_defender/mimic/mimic_ai.dm index e1b664e852a..9e3475b7a6a 100644 --- a/code/modules/mob/living/basic/ruin_defender/mimic/mimic_ai.dm +++ b/code/modules/mob/living/basic/ruin_defender/mimic/mimic_ai.dm @@ -87,3 +87,30 @@ return controller.queue_behavior(/datum/ai_behavior/basic_ranged_attack/avoid_friendly_fire, BB_BASIC_MOB_CURRENT_TARGET, BB_TARGETING_STRATEGY, BB_BASIC_MOB_CURRENT_TARGET_HIDING_LOCATION) return SUBTREE_RETURN_FINISH_PLANNING //we are going into battle...no distractions. + +/// Special subtree for living wands/staffs of animation which will focus on animating more things +/datum/ai_controller/basic_controller/mimic_copy/gun/animator + blackboard = list( + BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic, + BB_HUNT_TARGETING_STRATEGY = /datum/targeting_strategy/anything, + BB_GUNMIMIC_GUN_EMPTY = FALSE, + ) + planning_subtrees = list( + /datum/ai_planning_subtree/shoot_animatable_objects, + /datum/ai_planning_subtree/simple_find_target, + /datum/ai_planning_subtree/random_speech/when_has_target/mimic/gun, + /datum/ai_planning_subtree/basic_melee_attack_subtree, + ) + +/// Try to find objects and then shoot them +/datum/ai_planning_subtree/shoot_animatable_objects + +/datum/ai_planning_subtree/shoot_animatable_objects/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) + if(controller.blackboard[BB_GUNMIMIC_GUN_EMPTY]) + return // No charge in our gun + if(!controller.blackboard_key_exists(BB_CURRENT_HUNTING_TARGET)) + controller.queue_behavior(/datum/ai_behavior/find_and_set/animatable, BB_CURRENT_HUNTING_TARGET) + return + controller.queue_behavior(/datum/ai_behavior/ranged_skirmish, BB_CURRENT_HUNTING_TARGET, BB_HUNT_TARGETING_STRATEGY, null, 9, 0) + controller.queue_behavior(/datum/ai_behavior/clear_key, BB_CURRENT_HUNTING_TARGET) + return SUBTREE_RETURN_FINISH_PLANNING diff --git a/code/modules/mob/living/basic/space_fauna/carp/carp.dm b/code/modules/mob/living/basic/space_fauna/carp/carp.dm index 6f1ff9e864f..d114b6d42a1 100644 --- a/code/modules/mob/living/basic/space_fauna/carp/carp.dm +++ b/code/modules/mob/living/basic/space_fauna/carp/carp.dm @@ -320,4 +320,4 @@ /// If someone slaps one of the school, scatter /mob/living/basic/carp/passive/proc/on_attacked(mob/living/attacker) for(var/mob/living/basic/carp/passive/schoolmate in oview(src, 9)) - schoolmate.ai_controller?.insert_blackboard_key_lazylist(BB_BASIC_MOB_RETALIATE_LIST, attacker) + schoolmate.ai_controller?.set_blackboard_key_assoc_lazylist(BB_BASIC_MOB_RETALIATE_LIST, attacker, world.time) diff --git a/code/modules/mob/living/basic/space_fauna/carp/magicarp.dm b/code/modules/mob/living/basic/space_fauna/carp/magicarp.dm index 1eccb697b59..9e2224de1fc 100644 --- a/code/modules/mob/living/basic/space_fauna/carp/magicarp.dm +++ b/code/modules/mob/living/basic/space_fauna/carp/magicarp.dm @@ -2,38 +2,47 @@ GLOBAL_LIST_INIT(magicarp_spell_types, list( /obj/projectile/magic/animate = "dancing", /obj/projectile/magic/arcane_barrage = "arcane", + /obj/projectile/magic/babel = "babbling", /obj/projectile/magic/change = "transforming", /obj/projectile/magic/death = "grim", /obj/projectile/magic/door = "unbarred", /obj/projectile/magic/fireball = "blazing", + /obj/projectile/magic/freeze = "frigid", + /obj/projectile/magic/levitate = "weightless", /obj/projectile/magic/resurrection = "vital", /obj/projectile/magic/spellblade = "vorpal", + /obj/projectile/magic/swap = "quantum", /obj/projectile/magic/teleport = "warping", - /obj/projectile/magic/babel = "babbling", )) /// A reduced list of spells for magicarp spawned in xenobiology, less disruptive GLOBAL_LIST_INIT(xenobiology_magicarp_spell_types, list( /obj/projectile/magic/animate = "dancing", - /obj/projectile/magic/teleport = "warping", + /obj/projectile/magic/arcane_barrage = "arcane", /obj/projectile/magic/door = "unbarred", /obj/projectile/magic/fireball = "blazing", + /obj/projectile/magic/freeze = "frigid", + /obj/projectile/magic/levitate = "weightless", /obj/projectile/magic/spellblade = "vorpal", - /obj/projectile/magic/arcane_barrage = "arcane", + /obj/projectile/magic/swap = "quantum", + /obj/projectile/magic/teleport = "warping", )) /// Associative list of magicarp spells to colours, expand this list if you expand the other lists GLOBAL_LIST_INIT(magicarp_spell_colours, list( /obj/projectile/magic/animate = COLOR_CARP_RUSTY, /obj/projectile/magic/arcane_barrage = COLOR_CARP_PURPLE, + /obj/projectile/magic/babel = COLOR_CARP_BROWN, /obj/projectile/magic/change = COLOR_CARP_PINK, /obj/projectile/magic/death = COLOR_CARP_DARK_BLUE, /obj/projectile/magic/door = COLOR_CARP_GREEN, /obj/projectile/magic/fireball = COLOR_CARP_RED, + /obj/projectile/magic/freeze = COLOR_CARP_TURQUOISE, + /obj/projectile/magic/levitate = COLOR_CARP_DARK_PURPLE, /obj/projectile/magic/resurrection = COLOR_CARP_PALE_GREEN, /obj/projectile/magic/spellblade = COLOR_CARP_SILVER, + /obj/projectile/magic/swap = COLOR_CARP_LIGHT_BLUE, /obj/projectile/magic/teleport = COLOR_CARP_GRAPE, - /obj/projectile/magic/babel = COLOR_CARP_BROWN, )) /** diff --git a/code/modules/mob/living/basic/space_fauna/changeling/flesh_spider.dm b/code/modules/mob/living/basic/space_fauna/changeling/flesh_spider.dm index c6116cd041a..fa3015c011b 100644 --- a/code/modules/mob/living/basic/space_fauna/changeling/flesh_spider.dm +++ b/code/modules/mob/living/basic/space_fauna/changeling/flesh_spider.dm @@ -19,7 +19,7 @@ damage_coeff = list(BRUTE = 1, BURN = 1.25, TOX = 4, STAMINA = 1, OXY = 1) basic_mob_flags = FLAMMABLE_MOB status_flags = NONE - speed = -0.1 + speed = 0.2 maxHealth = 90 health = 90 melee_damage_lower = 15 @@ -61,7 +61,7 @@ ) AddComponent(\ /datum/component/regenerator,\ - regeneration_delay = 4 SECONDS,\ + regeneration_delay = 3 SECONDS,\ brute_per_second = maxHealth / 6,\ outline_colour = COLOR_PINK,\ ) diff --git a/code/modules/mob/living/basic/space_fauna/eyeball/_eyeball.dm b/code/modules/mob/living/basic/space_fauna/eyeball/_eyeball.dm index 26bb5548e80..7b2846d4272 100644 --- a/code/modules/mob/living/basic/space_fauna/eyeball/_eyeball.dm +++ b/code/modules/mob/living/basic/space_fauna/eyeball/_eyeball.dm @@ -96,16 +96,16 @@ /mob/living/basic/eyeball/early_melee_attack(atom/target, list/modifiers, ignore_cooldown) . = ..() - if(!.) - return FALSE + if(.) + return if(!ishuman(target)) - return TRUE + return BASIC_MOB_CONTINUE_ATTACK_CHAIN var/mob/living/carbon/human_target = target var/obj/item/organ/eyes/eyes = human_target.get_organ_slot(ORGAN_SLOT_EYES) if(isnull(eyes) || eyes.damage < 10) - return TRUE + return BASIC_MOB_CONTINUE_ATTACK_CHAIN heal_eye_damage(human_target, eyes) - return FALSE + return BASIC_MOB_END_ATTACK_CHAIN_COOLDOWN /mob/living/basic/eyeball/proc/heal_eye_damage(mob/living/target, obj/item/organ/eyes/eyes) if(!COOLDOWN_FINISHED(src, eye_healing)) diff --git a/code/modules/mob/living/basic/space_fauna/garden_gnome.dm b/code/modules/mob/living/basic/space_fauna/garden_gnome.dm index d2ab4e691b5..f6926b2ea51 100644 --- a/code/modules/mob/living/basic/space_fauna/garden_gnome.dm +++ b/code/modules/mob/living/basic/space_fauna/garden_gnome.dm @@ -121,7 +121,7 @@ if (!istype(attacker)) return for (var/mob/living/basic/garden_gnome/potential_gnome in oview(src, 7)) - potential_gnome.ai_controller.insert_blackboard_key_lazylist(BB_BASIC_MOB_RETALIATE_LIST, attacker) + potential_gnome.ai_controller.set_blackboard_key_assoc_lazylist(BB_BASIC_MOB_RETALIATE_LIST, attacker, world.time) /datum/ai_controller/basic_controller/garden_gnome blackboard = list( diff --git a/code/modules/mob/living/basic/space_fauna/hivebot/_hivebot.dm b/code/modules/mob/living/basic/space_fauna/hivebot/_hivebot.dm index 925b5eb271e..7b5edab617a 100644 --- a/code/modules/mob/living/basic/space_fauna/hivebot/_hivebot.dm +++ b/code/modules/mob/living/basic/space_fauna/hivebot/_hivebot.dm @@ -99,16 +99,16 @@ /mob/living/basic/hivebot/mechanic/early_melee_attack(atom/target, list/modifiers, ignore_cooldown) . = ..() - if(!.) - return FALSE + if(.) + return if(ismachinery(target)) repair_machine(target) - return FALSE + return BASIC_MOB_END_ATTACK_CHAIN_COOLDOWN if(istype(target, /mob/living/basic/hivebot)) repair_hivebot(target) - return FALSE + return BASIC_MOB_END_ATTACK_CHAIN_COOLDOWN /mob/living/basic/hivebot/mechanic/proc/repair_machine(obj/machinery/fixable) if(fixable.get_integrity() >= fixable.max_integrity) diff --git a/code/modules/mob/living/basic/space_fauna/lightgeist.dm b/code/modules/mob/living/basic/space_fauna/lightgeist.dm index 36ae135619c..50d59efbf2a 100644 --- a/code/modules/mob/living/basic/space_fauna/lightgeist.dm +++ b/code/modules/mob/living/basic/space_fauna/lightgeist.dm @@ -41,18 +41,14 @@ minimum_survivable_temperature = 0 maximum_survivable_temperature = 1500 obj_damage = 0 + pull_force = 0 environment_smash = ENVIRONMENT_SMASH_NONE ai_controller = /datum/ai_controller/basic_controller/lightgeist /mob/living/basic/lightgeist/Initialize(mapload) . = ..() - ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) - ADD_TRAIT(src, TRAIT_MEDICAL_HUD, INNATE_TRAIT) - - remove_verb(src, /mob/living/verb/pulled) - remove_verb(src, /mob/verb/me_verb) - + add_traits(list(TRAIT_VENTCRAWLER_ALWAYS, TRAIT_MEDICAL_HUD, TRAIT_EMOTEMUTE), INNATE_TRAIT) AddElement(/datum/element/simple_flying) AddComponent(\ /datum/component/healing_touch,\ diff --git a/code/modules/mob/living/basic/space_fauna/meteor_heart/chasing_spikes.dm b/code/modules/mob/living/basic/space_fauna/meteor_heart/chasing_spikes.dm index b50b089b0ff..60288e9c5e7 100644 --- a/code/modules/mob/living/basic/space_fauna/meteor_heart/chasing_spikes.dm +++ b/code/modules/mob/living/basic/space_fauna/meteor_heart/chasing_spikes.dm @@ -45,6 +45,8 @@ var/position_variance = 8 /// Damage to deal on impale var/impale_damage = 15 + /// Wound bonus on impale + var/impale_wound_bonus = 0 /// Typecache of types of mobs not to damage var/list/damage_blacklist_typecache = list( /mob/living/basic/meteor_heart, @@ -67,14 +69,22 @@ /obj/effect/temp_visual/emerging_ground_spike/proc/impale() if (!isturf(loc)) return + var/hit_someone = FALSE for(var/mob/living/victim in loc) - if (is_type_in_typecache(victim, damage_blacklist_typecache)) - continue - hit_someone = TRUE - var/target_zone = victim.resting ? BODY_ZONE_CHEST : pick_weight(standing_damage_zones) - victim.apply_damage(impale_damage, damagetype = BRUTE, def_zone = target_zone, sharpness = SHARP_POINTY) + if (harm_mob(victim)) + hit_someone = TRUE + if (hit_someone) playsound(src, 'sound/items/weapons/slice.ogg', vol = 50, vary = TRUE, pressure_affected = FALSE) else playsound(src, 'sound/misc/splort.ogg', vol = 25, vary = TRUE, pressure_affected = FALSE) + return hit_someone + +/obj/effect/temp_visual/emerging_ground_spike/proc/harm_mob(mob/living/victim) + if (is_type_in_typecache(victim, damage_blacklist_typecache)) + return FALSE + + var/target_zone = victim.resting ? BODY_ZONE_CHEST : pick_weight(standing_damage_zones) + victim.apply_damage(impale_damage, damagetype = BRUTE, def_zone = target_zone, wound_bonus = impale_wound_bonus, sharpness = SHARP_POINTY) + return TRUE diff --git a/code/modules/mob/living/basic/space_fauna/morph.dm b/code/modules/mob/living/basic/space_fauna/morph.dm index 3190f3313e9..a76704e40fe 100644 --- a/code/modules/mob/living/basic/space_fauna/morph.dm +++ b/code/modules/mob/living/basic/space_fauna/morph.dm @@ -149,29 +149,29 @@ /// Handles the logic for attacking anything. /mob/living/basic/morph/early_melee_attack(atom/target, list/modifiers, ignore_cooldown) . = ..() - if(!.) - return FALSE + if(.) + return if(HAS_TRAIT(src, TRAIT_DISGUISED) && (melee_damage_disguised <= 0)) balloon_alert(src, "can't attack while disguised!") - return FALSE + return BASIC_MOB_END_ATTACK_CHAIN_COOLDOWN if(isliving(target)) //Eat Corpses to regen health var/mob/living/living_target = target if(living_target.stat != DEAD) - return TRUE + return BASIC_MOB_CONTINUE_ATTACK_CHAIN eat(eatable = living_target, delay = 3 SECONDS, update_health = -50) - return FALSE + return BASIC_MOB_END_ATTACK_CHAIN_COOLDOWN if(!isitem(target)) //Eat items just to be annoying - return TRUE + return BASIC_MOB_CONTINUE_ATTACK_CHAIN var/obj/item/item_target = target if(item_target.anchored) - return TRUE + return BASIC_MOB_CONTINUE_ATTACK_CHAIN eat(eatable = item_target, delay = 2 SECONDS) - return FALSE + return BASIC_MOB_END_ATTACK_CHAIN_COOLDOWN /// Eat stuff. Delicious. Return TRUE if we ate something, FALSE otherwise. /// Required: `eatable` is the thing (item or mob) that we are going to eat. diff --git a/code/modules/mob/living/basic/space_fauna/regal_rat/regal_rat.dm b/code/modules/mob/living/basic/space_fauna/regal_rat/regal_rat.dm index 42e6e831dd5..f0e370c668e 100644 --- a/code/modules/mob/living/basic/space_fauna/regal_rat/regal_rat.dm +++ b/code/modules/mob/living/basic/space_fauna/regal_rat/regal_rat.dm @@ -171,22 +171,22 @@ /// Checks if we are able to attack this object, as well as send out the signal to see if we get any special regal rat interactions. /mob/living/basic/regal_rat/early_melee_attack(atom/target, list/modifiers, ignore_cooldown) . = ..() - if(!.) - return FALSE + if(.) + return if(DOING_INTERACTION(src, REGALRAT_INTERACTION) || !allowed_to_attack(target)) - return FALSE + return BASIC_MOB_END_ATTACK_CHAIN if(SEND_SIGNAL(target, COMSIG_RAT_INTERACT, src) & COMPONENT_RAT_INTERACTED) - return FALSE + return BASIC_MOB_END_ATTACK_CHAIN_COOLDOWN if(isnull(mind) || combat_mode) - return TRUE + return BASIC_MOB_CONTINUE_ATTACK_CHAIN if(poison_target(target)) - return FALSE + return BASIC_MOB_END_ATTACK_CHAIN_COOLDOWN - return TRUE + return BASIC_MOB_CONTINUE_ATTACK_CHAIN /// Checks if we are allowed to attack this mob. Will return TRUE if we are potentially allowed to attack, but if we end up in a case where we should NOT attack, return FALSE. /mob/living/basic/regal_rat/proc/allowed_to_attack(atom/the_target) diff --git a/code/modules/mob/living/basic/space_fauna/revenant/_revenant.dm b/code/modules/mob/living/basic/space_fauna/revenant/_revenant.dm index e8dac3f3f64..75c723aa358 100644 --- a/code/modules/mob/living/basic/space_fauna/revenant/_revenant.dm +++ b/code/modules/mob/living/basic/space_fauna/revenant/_revenant.dm @@ -62,6 +62,8 @@ var/draining = FALSE /// Have we already given this revenant abilities? var/generated_objectives_and_spells = FALSE + /// ckey of the player who controlled this mob when it was killed + var/old_ckey = "" /// Lazylist of drained mobs to ensure that we don't steal a soul from someone twice var/list/drained_mobs = null @@ -348,10 +350,7 @@ visible_message(span_danger("[src]'s body breaks apart into a fine pile of blue dust.")) - var/obj/item/ectoplasm/revenant/goop = new(get_turf(src)) // the ectoplasm will handle moving us out of dormancy - goop.old_ckey = client.ckey - goop.revenant = src - forceMove(goop) + new /obj/item/ectoplasm/revenant(get_turf(src), src) // the ectoplasm will handle moving us out of dormancy /mob/living/basic/revenant/proc/on_move(datum/source, atom/entering_loc) SIGNAL_HANDLER @@ -524,4 +523,30 @@ if(!HAS_TRAIT(src, TRAIT_REVENANT_REVEALED) && !istype(reflecting_in, /obj/structure/mirror/magic)) apply_wibbly_filters(reflection) +/mob/living/basic/revenant/proc/get_new_user() + message_admins("A poll for the reforming revenant was created.") + var/mob/chosen_one = SSpolling.poll_ghosts_for_target("Do you want to be [span_notice(name)] (reforming)?", check_jobban = ROLE_REVENANT, role = ROLE_REVENANT, poll_time = 5 SECONDS, checked_target = src, alert_pic = src, role_name_text = "reforming revenant", chat_text_border_icon = src) + if(!chosen_one) + message_admins("No candidates were found for the new revenant.") + visible_message(span_revenwarning("A blue dust appears from thin air and settles down.")) + new /obj/item/ectoplasm/revenant(get_turf(src)) // inert + qdel(src) + return + + PossessByPlayer(chosen_one.key) + message_admins("[chosen_one.key] has been made into the reformed revenant via poll.") + qdel(chosen_one) + +/mob/living/basic/revenant/proc/reform(cause) + if(QDELETED(src)) + return FALSE + + death_reset() + if(isnull(client)) + INVOKE_ASYNC(src, PROC_REF(get_new_user)) + return TRUE + + message_admins("[client.ckey] has been remade into a revenant.") + log_message("was remade as a revenant.", LOG_GAME) + return TRUE #undef REVENANT_STUNNED_TRAIT diff --git a/code/modules/mob/living/basic/space_fauna/revenant/revenant_abilities.dm b/code/modules/mob/living/basic/space_fauna/revenant/revenant_abilities.dm index f4d3ecb5b59..10da02bcdc5 100644 --- a/code/modules/mob/living/basic/space_fauna/revenant/revenant_abilities.dm +++ b/code/modules/mob/living/basic/space_fauna/revenant/revenant_abilities.dm @@ -1,7 +1,7 @@ #define REVENANT_DEFILE_MIN_DAMAGE 30 #define REVENANT_DEFILE_MAX_DAMAGE 50 -//Transmit: the revemant's only direct way to communicate. Sends a single message silently to a single mob +//Transmit: the revenant's only direct way to communicate. Sends a single message silently to a single mob /datum/action/cooldown/spell/list_target/telepathy/revenant name = "Revenant Transmit" background_icon_state = "bg_revenant" @@ -12,6 +12,14 @@ antimagic_flags = MAGIC_RESISTANCE_HOLY|MAGIC_RESISTANCE_MIND +/datum/action/cooldown/spell/list_target/telepathy/revenant/get_list_targets(atom/center, target_radius = 7) + if(!istype(center, /mob/living/basic/revenant)) + return ..() + var/mob/living/basic/revenant/revenant = center + if(!revenant.dormant) + return ..() + return ..(get_turf(revenant), 2) + /datum/action/cooldown/spell/aoe/revenant background_icon_state = "bg_revenant" overlay_icon_state = "bg_revenant_border" diff --git a/code/modules/mob/living/basic/space_fauna/revenant/revenant_items.dm b/code/modules/mob/living/basic/space_fauna/revenant/revenant_items.dm index f691521b076..b9007a7f722 100644 --- a/code/modules/mob/living/basic/space_fauna/revenant/revenant_items.dm +++ b/code/modules/mob/living/basic/space_fauna/revenant/revenant_items.dm @@ -5,31 +5,36 @@ icon = 'icons/effects/effects.dmi' icon_state = "revenantEctoplasm" w_class = WEIGHT_CLASS_SMALL - /// Are we currently reforming? - var/reforming = TRUE - /// Are we inert (aka distorted such that we can't reform)? + // Can the revenant reform? var/inert = FALSE - /// The key of the revenant that we started the reform as - var/old_ckey - /// The revenant we're currently storing - var/mob/living/basic/revenant/revenant -/obj/item/ectoplasm/revenant/Initialize(mapload) +/obj/item/ectoplasm/revenant/Initialize(mapload, revenant) . = ..() - addtimer(CALLBACK(src, PROC_REF(try_reform)), 1 MINUTES) + inert = !revenant + if(revenant) + AddComponent(/datum/component/revenant_prison, revenant = revenant) + addtimer(CALLBACK(src, PROC_REF(reform)), 1 MINUTES) /obj/item/ectoplasm/revenant/Destroy() - if(!QDELETED(revenant)) - qdel(revenant) return ..() +/obj/item/ectoplasm/revenant/proc/check_for_mirrors(turf/location, radius) + PRIVATE_PROC(TRUE) + for(var/obj/structure/mirror/mirror in view(radius, location)) + if(mirror.cursable && !mirror.GetComponent(/datum/component/revenant_prison)) + return mirror + return null + /obj/item/ectoplasm/revenant/attack_self(mob/user) - if(!reforming || inert) + if(inert) return ..() user.visible_message( span_notice("[user] scatters [src] in all directions."), - span_notice("You scatter [src] across the area. The particles slowly fade away."), + span_notice("You scatter [src] across the area."), ) + var/obj/structure/mirror/nearby_mirror = check_for_mirrors(drop_location(), 5) + if(nearby_mirror) + transfer_to_mirror(nearby_mirror) user.dropItemToGround(src) qdel(src) @@ -37,14 +42,25 @@ . = ..() if(inert) return - visible_message(span_notice("[src] breaks into particles upon impact, which fade away to nothingness.")) + var/obj/structure/mirror/nearby_mirror = check_for_mirrors(get_turf(hit_atom), 3) + if(!nearby_mirror) + visible_message(span_notice("[src] breaks into particles upon impact, which fade away to nothingness.")) + else + transfer_to_mirror(nearby_mirror) qdel(src) +/obj/item/ectoplasm/revenant/proc/transfer_to_mirror(obj/structure/mirror/nearby_mirror) + PRIVATE_PROC(TRUE) + nearby_mirror.TakeComponent(GetComponent(/datum/component/revenant_prison)) + nearby_mirror.visible_message(span_revenwarning("A dismal moan echoes as particles of [src] fall onto [nearby_mirror]!")) + log_game("A revenant was trapped inside [nearby_mirror]") + message_admins("A revenant was trapped inside [nearby_mirror] [ADMIN_JMP(nearby_mirror)]") + /obj/item/ectoplasm/revenant/examine(mob/user) . = ..() if(inert) . += span_revennotice("It seems inert.") - else if(reforming) + else . += span_revenwarning("It is shifting and distorted. It would be wise to destroy this.") /obj/item/ectoplasm/revenant/suicide_act(mob/living/user) @@ -52,45 +68,13 @@ qdel(src) return OXYLOSS -/obj/item/ectoplasm/revenant/proc/try_reform() - if(reforming) - reforming = FALSE - reform() - else - inert = TRUE - visible_message(span_warning("[src] settles down and seems lifeless.")) - /// Actually moves the revenant out of ourself /obj/item/ectoplasm/revenant/proc/reform() - if(QDELETED(src) || QDELETED(revenant) || inert) + if(QDELETED(src) || inert) + return + if(!GetComponent(/datum/component/revenant_prison)) return - message_admins("Revenant ectoplasm was left undestroyed for 1 minute and is reforming into a new revenant.") - forceMove(drop_location()) //In case it's in a backpack or someone's hand - - var/user_name = old_ckey - if(isnull(revenant.client)) - var/mob/potential_user = get_new_user() - revenant.PossessByPlayer(potential_user.key) - user_name = potential_user.ckey - qdel(potential_user) - - message_admins("[user_name] has been [old_ckey == user_name ? "re":""]made into a revenant by reforming ectoplasm.") - revenant.log_message("was [old_ckey == user_name ? "re":""]made as a revenant by reforming ectoplasm.", LOG_GAME) + SEND_SIGNAL(src, COMSIG_REVENANT_RELEASE, cause = "ectoplasm reforming") visible_message(span_revenboldnotice("[src] suddenly rises into the air before fading away.")) - - revenant.death_reset() - revenant = null qdel(src) - -/// Handles giving the revenant a new client to control it -/obj/item/ectoplasm/revenant/proc/get_new_user() - message_admins("The new revenant's old client either could not be found or is in a new, living mob - grabbing a random candidate instead...") - var/mob/chosen_one = SSpolling.poll_ghosts_for_target("Do you want to be [span_notice(revenant.name)] (reforming)?", check_jobban = ROLE_REVENANT, role = ROLE_REVENANT, poll_time = 5 SECONDS, checked_target = revenant, alert_pic = revenant, role_name_text = "reforming revenant", chat_text_border_icon = revenant) - if(isnull(chosen_one)) - message_admins("No candidates were found for the new revenant.") - inert = TRUE - visible_message(span_revenwarning("[src] settles down and seems lifeless.")) - qdel(revenant) - return null - return chosen_one diff --git a/code/modules/mob/living/basic/space_fauna/spider/giant_spider/giant_spiders.dm b/code/modules/mob/living/basic/space_fauna/spider/giant_spider/giant_spiders.dm index d2fbdaf44ff..10db1405eea 100644 --- a/code/modules/mob/living/basic/space_fauna/spider/giant_spider/giant_spiders.dm +++ b/code/modules/mob/living/basic/space_fauna/spider/giant_spider/giant_spiders.dm @@ -565,7 +565,6 @@ unsuitable_cold_damage = 1 unsuitable_heat_damage = 1 menu_description = "Stronger assassin spider variant with an unmatched speed, high amount of health and very deadly poison, but deals very low amount of damage. It also has ability to ventcrawl." - apply_spider_antag = FALSE innate_actions = list( /datum/action/cooldown/mob_cooldown/lay_web/sticky_web, /datum/action/cooldown/mob_cooldown/lay_web/web_spikes, @@ -591,7 +590,6 @@ melee_damage_lower = 15 melee_damage_upper = 20 ai_controller = /datum/ai_controller/basic_controller/giant_spider/retaliate - apply_spider_antag = FALSE /mob/living/basic/spider/giant/sgt_araneus/Initialize(mapload) . = ..() diff --git a/code/modules/mob/living/basic/space_fauna/spider/spider.dm b/code/modules/mob/living/basic/space_fauna/spider/spider.dm index 1399e5e1b0a..ce246e1e0e3 100644 --- a/code/modules/mob/living/basic/space_fauna/spider/spider.dm +++ b/code/modules/mob/living/basic/space_fauna/spider/spider.dm @@ -51,8 +51,6 @@ var/directive = "" /// Short description of what this mob is capable of, for radial menu uses var/menu_description = "Tanky and strong for the defense of the nest and other spiders." - /// If true then you shouldn't be told that you're a spider antagonist as soon as you are placed into this mob - var/apply_spider_antag = TRUE /// Commands you can give this spider once it is tamed var/static/list/tamed_commands = list( /datum/pet_command/idle, @@ -221,7 +219,6 @@ response_harm_continuous = "splats" response_harm_simple = "splat" ai_controller = /datum/ai_controller/basic_controller/giant_spider/pest - apply_spider_antag = FALSE ///list of pet commands we follow var/static/list/pet_commands = list( /datum/pet_command/idle, diff --git a/code/modules/mob/living/basic/space_fauna/supermatter_spider.dm b/code/modules/mob/living/basic/space_fauna/supermatter_spider.dm index 02f11dc9426..44d7585faff 100644 --- a/code/modules/mob/living/basic/space_fauna/supermatter_spider.dm +++ b/code/modules/mob/living/basic/space_fauna/supermatter_spider.dm @@ -49,8 +49,8 @@ /// Proc that we call on attacking something to dust 'em. /mob/living/basic/supermatter_spider/early_melee_attack(atom/target, list/modifiers, ignore_cooldown) . = ..() - if(!.) - return FALSE + if(.) + return if(isliving(target)) var/mob/living/victim = target @@ -59,14 +59,14 @@ victim.dust() if(single_use) death() - return FALSE + return BASIC_MOB_END_ATTACK_CHAIN_COOLDOWN if(!isturf(target)) dust_feedback(target) qdel(target) if(single_use) death() - return FALSE + return BASIC_MOB_END_ATTACK_CHAIN_COOLDOWN /// Simple proc that plays the supermatter dusting sound and sends a visible message. /mob/living/basic/supermatter_spider/proc/dust_feedback(atom/target) diff --git a/code/modules/mob/living/basic/tree.dm b/code/modules/mob/living/basic/tree.dm index bae229fddd8..5d370cf7cfb 100644 --- a/code/modules/mob/living/basic/tree.dm +++ b/code/modules/mob/living/basic/tree.dm @@ -68,11 +68,11 @@ var/turf/open/our_turf = src.loc if(!our_turf.air || !our_turf.air.gases[/datum/gas/carbon_dioxide]) return - - var/co2 = our_turf.air.gases[/datum/gas/carbon_dioxide][MOLES] + var/datum/gas_mixture/our_air = our_turf.air + var/co2 = our_air.gases[/datum/gas/carbon_dioxide][MOLES] if(co2 > 0 && SPT_PROB(13, seconds_per_tick)) var/amt = min(co2, 9) - our_turf.air.gases[/datum/gas/carbon_dioxide][MOLES] -= amt + our_air.adjust_gas(/datum/gas/carbon_dioxide, -amt) our_turf.atmos_spawn_air("[GAS_O2]=[amt]") /mob/living/basic/tree/melee_attack(atom/target, list/modifiers, ignore_cooldown = FALSE) diff --git a/code/modules/mob/living/basic/trooper/nanotrasen.dm b/code/modules/mob/living/basic/trooper/nanotrasen.dm index 80f0f348624..8798467969b 100644 --- a/code/modules/mob/living/basic/trooper/nanotrasen.dm +++ b/code/modules/mob/living/basic/trooper/nanotrasen.dm @@ -98,4 +98,4 @@ if (!istype(attacker)) return for (var/mob/living/basic/trooper/nanotrasen/potential_trooper in oview(src, 7)) - potential_trooper.ai_controller.insert_blackboard_key_lazylist(BB_BASIC_MOB_RETALIATE_LIST, attacker) + potential_trooper.ai_controller.set_blackboard_key_assoc_lazylist(BB_BASIC_MOB_RETALIATE_LIST, attacker, world.time) diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm index c00d90dd056..ce2de93ca43 100644 --- a/code/modules/mob/living/blood.dm +++ b/code/modules/mob/living/blood.dm @@ -91,7 +91,6 @@ /// Updates effects that rely on blood volume or status, like blood HUDs. /mob/living/proc/update_blood_effects() - living_flags &= ~BLOOD_UPDATE_QUEUED blood_hud_set_status() /// Updates effects that rely on whether the mob can have blood. @@ -161,16 +160,16 @@ if((sigreturn & HANDLE_BLOOD_HANDLED) || !CAN_HAVE_BLOOD(src)) return + var/heart_blood_multiplier = get_heart_blood_regeneration_multiplier() //Blood regeneration if there is some space - if(!(sigreturn & HANDLE_BLOOD_NO_NUTRITION_DRAIN) && get_blood_volume() < BLOOD_VOLUME_NORMAL && !HAS_TRAIT(src, TRAIT_NOHUNGER)) + if(heart_blood_multiplier && !(sigreturn & HANDLE_BLOOD_NO_NUTRITION_DRAIN) && get_blood_volume() < BLOOD_VOLUME_NORMAL && !HAS_TRAIT(src, TRAIT_NOHUNGER)) var/nutrition_ratio = round(nutrition / NUTRITION_LEVEL_WELL_FED, 0.2) if(satiety > 80) nutrition_ratio *= 1.25 - var/blood_to_restore = BLOOD_REGEN_FACTOR * physiology.blood_regen_mod * nutrition_ratio * seconds_per_tick + var/blood_to_restore = BLOOD_REGEN_FACTOR * physiology.blood_regen_mod * heart_blood_multiplier * nutrition_ratio * seconds_per_tick var/blood_restored = adjust_blood_volume(blood_to_restore, maximum = BLOOD_VOLUME_NORMAL) - if (blood_restored > 0) adjust_nutrition(-nutrition_ratio * HUNGER_FACTOR * seconds_per_tick * (blood_restored / blood_to_restore)) @@ -192,7 +191,7 @@ var/modified_blood_volume = get_blood_volume(apply_modifiers = TRUE) // Some effects are halved mid-combat. - var/determined_mod = has_status_effect(/datum/status_effect/determined) ? 0.5 : 0 + var/determined_mod = has_status_effect(/datum/status_effect/determined) ? 0.5 : 1 var/word = pick("dizzy","woozy","faint") switch(modified_blood_volume) diff --git a/code/modules/mob/living/blood_types.dm b/code/modules/mob/living/blood_types.dm index dc6b7abd961..8e9e20f4b97 100644 --- a/code/modules/mob/living/blood_types.dm +++ b/code/modules/mob/living/blood_types.dm @@ -359,7 +359,7 @@ dna_string = "Plant DNA" color = /datum/reagent/water::color reagent_type = /datum/reagent/water - restoration_chem = null + restoration_chem = /datum/reagent/plantnutriment/eznutriment blood_flags = BLOOD_ADD_DNA | BLOOD_TRANSFER_VIRAL_DATA // Prevents awkward grey wounds on the mob while keeping bleed overlays looking like water leaking from a balloon diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm index 1910b7f6bad..eb10703000a 100644 --- a/code/modules/mob/living/brain/brain_item.dm +++ b/code/modules/mob/living/brain/brain_item.dm @@ -130,9 +130,8 @@ if((!QDELETED(src) || !QDELETED(owner)) && !(movement_flags & NO_ID_TRANSFER)) transfer_identity(organ_owner) if(!special) - if(!(organ_owner.living_flags & STOP_OVERLAY_UPDATE_BODY_PARTS)) - organ_owner.update_body_parts() organ_owner.clear_mood_event("brain_damage") + organ_owner.med_hud_set_status() /obj/item/organ/brain/update_icon_state() icon_state = "[initial(icon_state)][smooth_brain ? "-smooth" : ""]" @@ -242,8 +241,6 @@ . += span_notice("It is a bit on the smaller side...") if(brain_size > 1) . += span_notice("It is bigger than average...") - if(GetComponent(/datum/component/ghostrole_on_revive)) - . += span_notice("Its soul might yet come back...") /// Needed so subtypes can override examine text while still calling parent /obj/item/organ/brain/proc/brain_damage_examine() @@ -349,9 +346,21 @@ owner.investigate_log("has been killed by brain damage.", INVESTIGATE_DEATHS) owner.death() +/obj/item/organ/brain/on_bodypart_insert(obj/item/bodypart/limb) + . = ..() + if(ishuman(limb.owner)) + limb.owner.update_hair() + else + limb.update_icon_dropped() + /obj/item/organ/brain/on_bodypart_remove(obj/item/bodypart/limb, movement_flags) . = ..() - update_brain_color(animate = FALSE) // once it's out in the world we need to make sure it's the right color + if(ishuman(limb.owner)) + limb.owner.update_hair() + else + limb.update_icon_dropped() + // once it's out in the world we need to make sure it's the right color + update_brain_color(animate = FALSE) /obj/item/organ/brain/apply_organ_damage(damage_amount, maximum = maxHealth, required_organ_flag = NONE) . = ..() diff --git a/code/modules/mob/living/carbon/alien/adult/adult_update_icons.dm b/code/modules/mob/living/carbon/alien/adult/adult_update_icons.dm index c4531313769..e85dc79f20c 100644 --- a/code/modules/mob/living/carbon/alien/adult/adult_update_icons.dm +++ b/code/modules/mob/living/carbon/alien/adult/adult_update_icons.dm @@ -77,7 +77,6 @@ . = ..() remove_overlay(HANDS_LAYER) var/list/hands = list() - var/obj/item/l_hand = get_item_for_held_index(1) if(l_hand) var/itm_state = l_hand.inhand_icon_state diff --git a/code/modules/mob/living/carbon/alien/adult/queen.dm b/code/modules/mob/living/carbon/alien/adult/queen.dm index b388bba684d..339ae0ac6ed 100644 --- a/code/modules/mob/living/carbon/alien/adult/queen.dm +++ b/code/modules/mob/living/carbon/alien/adult/queen.dm @@ -83,7 +83,7 @@ /datum/action/cooldown/alien/promote, ) grant_actions_by_list(innate_actions) - + add_movespeed_mod_immunities(type, /datum/movespeed_modifier/tail_dragger) return ..() /mob/living/carbon/alien/adult/royal/queen/set_name() diff --git a/code/modules/mob/living/carbon/alien/organs.dm b/code/modules/mob/living/carbon/alien/organs.dm index ebbacdf2c02..92b6b6c0baf 100644 --- a/code/modules/mob/living/carbon/alien/organs.dm +++ b/code/modules/mob/living/carbon/alien/organs.dm @@ -85,7 +85,6 @@ /obj/item/organ/alien/plasmavessel/on_mob_insert(mob/living/carbon/organ_owner) . = ..() - RegisterSignal(organ_owner, COMSIG_MOB_GET_STATUS_TAB_ITEMS, PROC_REF(get_status_tab_item)) RegisterSignal(organ_owner, COMSIG_MOB_HUD_CREATED, PROC_REF(on_hud_created)) if (organ_owner.hud_used) on_hud_created() @@ -93,13 +92,8 @@ /obj/item/organ/alien/plasmavessel/on_mob_remove(mob/living/carbon/organ_owner) . = ..() UnregisterSignal(organ_owner, COMSIG_MOB_GET_STATUS_TAB_ITEMS) - UnregisterSignal(organ_owner, COMSIG_MOB_HUD_CREATED) organ_owner.hud_used?.remove_screen_object(HUD_ALIEN_PLASMA_DISPLAY) -/obj/item/organ/alien/plasmavessel/proc/get_status_tab_item(mob/living/carbon/source, list/items) - SIGNAL_HANDLER - items += "Plasma Stored: [stored_plasma]/[max_plasma]" - /obj/item/organ/alien/plasmavessel/proc/update_plasma_display() owner.hud_used?.screen_objects[HUD_ALIEN_PLASMA_DISPLAY]?.maptext = MAPTEXT( \ "
[round(owner.getPlasma())]
" \
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 9ecd4c31da4..9affc03edb9 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -195,14 +195,15 @@
* @param {number} breakouttime - The time it takes to break the cuffs. Use SECONDS/MINUTES defines
* @param {number} cuff_break - Speed multiplier, 0 is default, see _DEFINES\combat.dm
*/
-/mob/living/carbon/proc/cuff_resist(obj/item/cuffs, breakouttime = 1 MINUTES, cuff_break = 0)
+/mob/living/carbon/proc/cuff_resist(obj/item/cuffs, breakouttime = null, cuff_break = 0)
if((cuff_break != INSTANT_CUFFBREAK) && (SEND_SIGNAL(src, COMSIG_MOB_REMOVING_CUFFS, cuffs) & COMSIG_MOB_BLOCK_CUFF_REMOVAL))
return //The blocking object should sent a fluff-appropriate to_chat about cuff removal being blocked
if(cuffs.item_flags & BEING_REMOVED)
to_chat(src, span_warning("You're already attempting to remove [cuffs]!"))
return
cuffs.item_flags |= BEING_REMOVED
- breakouttime = cuffs.breakouttime
+ if (isnull(breakouttime))
+ breakouttime = cuffs.breakouttime
if(!cuff_break)
visible_message(span_warning("[src] attempts to remove [cuffs]!"))
to_chat(src, span_notice("You attempt to remove [cuffs]... (This will take around [DisplayTimeText(breakouttime)] and you need to stand still.)"))
@@ -719,7 +720,6 @@
clear_mood_event("handcuffed")
update_mob_action_buttons() //some of our action buttons might be unusable when we're handcuffed.
update_worn_handcuffs()
- update_hud_handcuffed()
/mob/living/carbon/revive(full_heal_flags = NONE, excess_healing = 0, force_grab_ghost = FALSE)
if(excess_healing)
@@ -957,6 +957,7 @@
var/obj/item/bodypart/stump = new old_bodypart.stump_typepath()
stump.bodyshape = old_bodypart.bodyshape
stump.bodytype = old_bodypart.bodytype
+ stump.add_biostate(old_bodypart.biological_state & ~BIO_JOINTED)
if(!stump.try_attach_limb(src, special = TRUE))
// the only way this can happen is if the stump is rejected via signal
// not much we can do about that besides hope they know what they're doing
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index a9625c82c19..1c368914e07 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -696,6 +696,9 @@
if (HAS_TRAIT(src, TRAIT_GENELESS))
return FALSE
+ if(flags_1 & HOLOGRAM_1)
+ return FALSE
+
if (run_armor_check(attack_flag = BIO, silent = TRUE) >= 100)
to_chat(src, span_warning("Your armor shields you from [scramble_source]!"))
return FALSE
@@ -706,7 +709,7 @@
var/changed_something = FALSE
var/obj/item/organ/new_organ = pick(GLOB.bioscrambler_valid_organs)
var/obj/item/organ/replaced = get_organ_slot(initial(new_organ.slot))
- if (!replaced || !IS_ROBOTIC_ORGAN(replaced))
+ if (!replaced || ORGAN_CAN_BE_BIOSCRAMBLED(replaced))
changed_something = TRUE
new_organ = new new_organ()
new_organ.replace_into(src)
@@ -715,7 +718,7 @@
if (!HAS_TRAIT(src, TRAIT_NODISMEMBER))
var/obj/item/bodypart/new_part = pick(GLOB.bioscrambler_valid_parts)
var/obj/item/bodypart/picked_user_part = get_bodypart(initial(new_part.body_zone))
- if (picked_user_part && BODYTYPE_CAN_BE_BIOSCRAMBLED(picked_user_part.bodytype))
+ if (picked_user_part && BODYPART_CAN_BE_BIOSCRAMBLED(picked_user_part))
changed_something = TRUE
new_part = new new_part()
new_part.replace_limb(src)
@@ -733,7 +736,7 @@
/mob/living/carbon/proc/init_bioscrambler_lists()
var/list/body_parts = typesof(/obj/item/bodypart/chest) + typesof(/obj/item/bodypart/head) + subtypesof(/obj/item/bodypart/arm) + subtypesof(/obj/item/bodypart/leg)
for(var/obj/item/bodypart/part as anything in body_parts)
- if(!is_type_in_typecache(part, GLOB.bioscrambler_parts_blacklist) && BODYTYPE_CAN_BE_BIOSCRAMBLED(initial(part.bodytype)))
+ if(!is_type_in_typecache(part, GLOB.bioscrambler_parts_blacklist) && BODYPART_CAN_BE_BIOSCRAMBLED(part))
continue
body_parts -= part
GLOB.bioscrambler_valid_parts = body_parts
diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm
index bdfea9edb5f..2150a21702f 100644
--- a/code/modules/mob/living/carbon/carbon_defines.dm
+++ b/code/modules/mob/living/carbon/carbon_defines.dm
@@ -133,3 +133,6 @@
var/covered_slots = NONE
var/next_smell = 0 //SKYRAT EDIT ADDITION /// Cooldown for the next smell
+
+ /// Lazylist of all hair masks applied to this mob's hairstyles
+ var/list/hair_masks
diff --git a/code/modules/mob/living/carbon/carbon_update_icons.dm b/code/modules/mob/living/carbon/carbon_update_icons.dm
index 83833dadf41..a037c366cff 100644
--- a/code/modules/mob/living/carbon/carbon_update_icons.dm
+++ b/code/modules/mob/living/carbon/carbon_update_icons.dm
@@ -336,33 +336,23 @@
/*
/mob/living/carbon/update_worn_mask()
remove_overlay(FACEMASK_LAYER)
+ hud_used?.update_inventory_slot(ITEM_SLOT_MASK)
if(!get_bodypart(BODY_ZONE_HEAD)) //Decapitated
return
- if(client && hud_used?.inv_slots[TOBITSHIFT(ITEM_SLOT_MASK) + 1])
- var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_MASK) + 1]
- inv.update_appearance()
-
- if(wear_mask)
- if(!(obscured_slots & HIDEMASK))
- overlays_standing[FACEMASK_LAYER] = wear_mask.build_worn_icon(default_layer = FACEMASK_LAYER, default_icon_file = 'icons/mob/clothing/mask.dmi')
- update_hud_wear_mask(wear_mask)
+ if(wear_mask && !(obscured_slots & HIDEMASK))
+ overlays_standing[FACEMASK_LAYER] = wear_mask.build_worn_icon(default_layer = FACEMASK_LAYER, default_icon_file = 'icons/mob/clothing/mask.dmi')
+ overlays_standing[FACEMASK_LAYER] = wear_mask.build_worn_icon(default_layer = FACEMASK_LAYER, default_icon_file = 'icons/mob/clothing/mask.dmi')
apply_overlay(FACEMASK_LAYER)
/mob/living/carbon/update_worn_neck()
remove_overlay(NECK_LAYER)
+ hud_used?.update_inventory_slot(ITEM_SLOT_NECK)
- if(client && hud_used?.inv_slots[TOBITSHIFT(ITEM_SLOT_NECK) + 1])
- var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_NECK) + 1]
- inv.update_appearance()
-
- if(wear_neck)
- if(!(obscured_slots & HIDENECK))
- overlays_standing[NECK_LAYER] = wear_neck.build_worn_icon(default_layer = NECK_LAYER, default_icon_file = 'icons/mob/clothing/neck.dmi')
- update_hud_neck(wear_neck)
-
+ if(wear_neck && !(obscured_slots & HIDENECK))
+ overlays_standing[NECK_LAYER] = wear_neck.build_worn_icon(default_layer = NECK_LAYER, default_icon_file = 'icons/mob/clothing/neck.dmi')
apply_overlay(NECK_LAYER)
*/
//SKYRAT EDIT REMOVAL END
@@ -371,14 +361,10 @@
/*
/mob/living/carbon/update_worn_back()
remove_overlay(BACK_LAYER)
-
- if(client && hud_used?.inv_slots[TOBITSHIFT(ITEM_SLOT_BACK) + 1])
- var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_BACK) + 1]
- inv.update_appearance()
+ hud_used?.update_inventory_slot(ITEM_SLOT_BACK)
if(back)
- overlays_standing[BACK_LAYER] = back.build_worn_icon(default_layer = BACK_LAYER, default_icon_file = 'icons/mob/clothing/back.dmi')
- update_hud_back(back)
+ overlays_standing[BACK_LAYER] = back.build_worn_icon(default_layer = BACK_LAYER, default_icon_file = 'icons/mob/clothing/back.dmi', bodyshape = bodyshape)
apply_overlay(BACK_LAYER)
*/
@@ -387,28 +373,26 @@
/mob/living/carbon/update_worn_legcuffs()
remove_overlay(LEGCUFF_LAYER)
clear_alert("legcuffed")
- if(legcuffed)
- overlays_standing[LEGCUFF_LAYER] = mutable_appearance('icons/mob/simple/mob.dmi', "legcuff1", -LEGCUFF_LAYER)
- apply_overlay(LEGCUFF_LAYER)
- throw_alert("legcuffed", /atom/movable/screen/alert/restrained/legcuffed, new_master = src.legcuffed)
+ if(!legcuffed)
+ return
+ if(astype(legcuffed, /obj/item/restraints/legcuffs)?.legcuff_state)
+ var/obj/item/restraints/legcuffs/cuffs = legcuffed
+ overlays_standing[LEGCUFF_LAYER] = mutable_appearance('icons/mob/simple/mob.dmi', cuffs.legcuff_state, -LEGCUFF_LAYER)
+ apply_overlay(LEGCUFF_LAYER)
+ throw_alert("legcuffed", /atom/movable/screen/alert/restrained/legcuffed, new_master = src.legcuffed)
//SKYRAT EDIT REMOVAL BEGIN - CUSTOMIZATION (moved to modular)
/*
/mob/living/carbon/update_worn_head()
remove_overlay(HEAD_LAYER)
+ hud_used?.update_inventory_slot(ITEM_SLOT_HEAD)
if(!get_bodypart(BODY_ZONE_HEAD)) //Decapitated
return
- if(client && hud_used?.inv_slots[TOBITSHIFT(ITEM_SLOT_HEAD) + 1])
- var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_HEAD) + 1]
- inv.update_appearance()
-
- if(head)
- if(!(obscured_slots & HIDEHEADGEAR))
- overlays_standing[HEAD_LAYER] = head.build_worn_icon(default_layer = HEAD_LAYER, default_icon_file = 'icons/mob/clothing/head/default.dmi')
- update_hud_head(head)
+ if(head && !(obscured_slots & HIDEHEADGEAR))
+ overlays_standing[HEAD_LAYER] = head.build_worn_icon(default_layer = HEAD_LAYER, default_icon_file = 'icons/mob/clothing/head/default.dmi')
apply_overlay(HEAD_LAYER)
*/
@@ -417,7 +401,8 @@
/mob/living/carbon/update_worn_handcuffs()
remove_overlay(HANDCUFF_LAYER)
- if(handcuffed && !(handcuffed.item_flags & ABSTRACT)) //SKYRAT EDIT - ADDED !(handcuffed.item_flags & ABSTRACT)
+ hud_used?.update_inventory_slot(ITEM_SLOT_HANDS)
+ if(handcuffed)
var/mutable_appearance/handcuff_overlay = mutable_appearance('icons/mob/simple/mob.dmi', "handcuff1", -HANDCUFF_LAYER)
if(handcuffed.blocks_emissive != EMISSIVE_BLOCK_NONE)
handcuff_overlay.overlays += emissive_blocker(handcuff_overlay.icon, handcuff_overlay.icon_state, src, alpha = handcuff_overlay.alpha)
@@ -425,33 +410,8 @@
overlays_standing[HANDCUFF_LAYER] = handcuff_overlay
apply_overlay(HANDCUFF_LAYER)
-
//mob HUD updates for items in our inventory
-//update whether handcuffs appears on our hud.
-/mob/living/carbon/proc/update_hud_handcuffed()
- if(!hud_used)
- return
-
- for(var/atom/movable/screen/inventory/hand/hand in hud_used.hand_slots)
- hand.update_appearance()
-
-//update whether our head item appears on our hud.
-/mob/living/carbon/proc/update_hud_head(obj/item/I)
- return
-
-//update whether our mask item appears on our hud.
-/mob/living/carbon/proc/update_hud_wear_mask(obj/item/I)
- return
-
-//update whether our neck item appears on our hud.
-/mob/living/carbon/proc/update_hud_neck(obj/item/I)
- return
-
-//update whether our back item appears on our hud.
-/mob/living/carbon/proc/update_hud_back(obj/item/I)
- return
-
/// Overlays for the worn overlay so you can overlay while you overlay
/// eg: ammo counters, primed grenade flashing, etc.
/// "icon_file" is used automatically for inhands etc. to make sure it gets the right inhand file
@@ -480,10 +440,13 @@
update_damage_overlays()
update_wound_overlays()
var/limb_count_update = 0
+ var/head_update = FALSE
var/list/new_limbs = list()
for(var/body_zone, limb_untyped in get_bodyparts_by_zones())
var/obj/item/bodypart/limb = limb_untyped
if(isnull(limb) || IS_STUMP(limb))
+ if(body_zone == BODY_ZONE_HEAD)
+ head_update = TRUE
if(icon_render_keys[body_zone])
icon_render_keys -= body_zone
limb_count_update += 1
@@ -499,6 +462,8 @@
new_limbs += limb_icon_cache[new_key]
else
+ if(body_zone == BODY_ZONE_HEAD)
+ head_update = TRUE
limb_icon_cache[new_key] ||= limb.get_limb_icon(dropped = FALSE)
new_limbs += limb_icon_cache[new_key]
icon_render_keys[limb.body_zone] = new_key
@@ -514,6 +479,10 @@
overlays_standing[BODYPARTS_LAYER] = new_limbs
apply_overlay(BODYPARTS_LAYER)
+ // for legacy support, head changes triggers an eye/hair update
+ if(head_update)
+ update_eyes()
+ update_hair()
/mob/living/carbon/proc/update_face_offset()
return
@@ -552,13 +521,19 @@
for(var/datum/bodypart_overlay/overlay as anything in bodypart_overlays)
if(!overlay.can_draw_on_bodypart(src, owner, is_husked))
continue
- . += overlay.generate_icon_cache()
+ . += overlay.generate_icon_cache(src)
if(ishuman(owner))
var/mob/living/carbon/human/human_owner = owner
. += "[human_owner.mob_height]"
SEND_SIGNAL(src, COMSIG_BODYPART_GENERATE_ICON_KEY, .)
return .
+/obj/item/bodypart/head/generate_icon_key()
+ . = ..()
+ if(lip_style)
+ . += lip_color
+ . += lip_style
+
///Generates a cache key specifically for husks
/obj/item/bodypart/proc/generate_husk_key()
RETURN_TYPE(/list)
@@ -575,50 +550,12 @@
for(var/datum/bodypart_overlay/overlay as anything in bodypart_overlays)
if(!overlay.can_draw_on_bodypart(src, owner, TRUE))
continue
- . += overlay.generate_icon_cache()
+ . += overlay.generate_icon_cache(src)
if(ishuman(owner))
var/mob/living/carbon/human/human_owner = owner
. += "[human_owner.mob_height]"
return .
-/obj/item/bodypart/head/generate_icon_key()
- . = ..()
- if(lip_style)
- . += "-[lip_style]"
- . += "-[lip_color]"
-
- if(facial_hair_hidden)
- . += "-FACIAL_HAIR_HIDDEN"
- else
- . += "-[facial_hairstyle]"
- . += "-[override_hair_color || fixed_hair_color || facial_hair_color]"
- . += "-[facial_hair_alpha]"
- var/facial_hair_gradient_style = get_hair_gradient_style(GRADIENT_FACIAL_HAIR_KEY)
- if(facial_hair_gradient_style)
- . += "-[facial_hair_gradient_style]"
- . += "-[get_hair_gradient_color(GRADIENT_FACIAL_HAIR_KEY)]"
-
- if(show_eyeless)
- . += "-SHOW_EYELESS"
- if(show_debrained)
- . += "-SHOW_DEBRAINED"
- return .
-
- if(hair_hidden)
- . += "-HAIR_HIDDEN"
- else
- . += "-[hairstyle]"
- . += "-[override_hair_color || fixed_hair_color || hair_color]"
- . += "-[hair_alpha]"
- var/hair_gradient_style = get_hair_gradient_style(GRADIENT_HAIR_KEY)
- if(hair_gradient_style)
- . += "-[hair_gradient_style]"
- . += "-[get_hair_gradient_color(GRADIENT_HAIR_KEY)]"
- if(LAZYLEN(hair_masks))
- . += "-[jointext(hair_masks, "-")]"
-
- return .
-
GLOBAL_LIST_EMPTY(masked_leg_icons_cache)
/**
diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm
index a9e7df05ed1..76fd95fb330 100644
--- a/code/modules/mob/living/carbon/examine.dm
+++ b/code/modules/mob/living/carbon/examine.dm
@@ -369,7 +369,7 @@
//This checks to see if the body is revivable
var/obj/item/organ/brain = get_organ_by_type(/obj/item/organ/brain)
if((brain && HAS_TRAIT(brain, TRAIT_GHOSTROLE_ON_REVIVE)) || HAS_TRAIT(src, TRAIT_GHOSTROLE_ON_REVIVE))
- return span_deadsay("[t_He] [t_is] limp and unresponsive; but [t_his] soul might yet come back...")
+ return span_deadsay("[t_He] [t_is] limp and unresponsive; there are no signs of life, but another soul may take [t_his] place...")
var/client_like = client || HAS_TRAIT(src, TRAIT_MIND_TEMPORARILY_GONE)
var/valid_ghost = ghost?.can_reenter_corpse && ghost?.client
var/valid_soul = brain || !HAS_TRAIT(src, TRAIT_FAKE_SOULLESS)
diff --git a/code/modules/mob/living/carbon/human/_species.dm b/code/modules/mob/living/carbon/human/_species.dm
index b87c1df02a9..d255df4eae8 100644
--- a/code/modules/mob/living/carbon/human/_species.dm
+++ b/code/modules/mob/living/carbon/human/_species.dm
@@ -563,11 +563,6 @@ GLOBAL_LIST_EMPTY(features_by_species)
return new_features
-/datum/species/proc/spec_life(mob/living/carbon/human/H, seconds_per_tick)
- SHOULD_CALL_PARENT(TRUE)
- if(HAS_TRAIT(H, TRAIT_NOBREATH) && (H.health < H.crit_threshold) && !HAS_TRAIT(H, TRAIT_NOCRITDAMAGE))
- H.adjust_brute_loss(0.5 * seconds_per_tick)
-
/datum/species/proc/can_equip(obj/item/I, slot, disable_warning, mob/living/carbon/human/H, bypass_equip_delay_self = FALSE, ignore_equipped = FALSE, indirect_action = FALSE)
if(no_equip_flags & slot && !(I.is_mod_shell_component() && (modsuit_slot_exceptions & slot))) // SKYRAT EDIT ADDITION - ORIGINAL: if(no_equip_flags & slot)
if(!I.species_exception || !is_type_in_list(src, I.species_exception))
@@ -616,6 +611,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
return FALSE
/* SKYRAT EDIT REMOVAL
if((H.bodyshape & BODYSHAPE_DIGITIGRADE) && !(I.item_flags & IGNORE_DIGITIGRADE))
+ if((H.bodytype & BODYTYPE_DIGITIGRADE) && !(I.item_flags & IGNORE_DIGITIGRADE))
if(!(I.supports_variations_flags & DIGITIGRADE_VARIATIONS))
if(!disable_warning)
to_chat(H, span_warning("The footwear around here isn't compatible with your feet!"))
diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index 9242a157bef..6b543bca434 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/code/modules/mob/living/carbon/human/death.dm
@@ -40,6 +40,8 @@ GLOBAL_LIST_EMPTY(dead_players_during_shift)
Reagents:[reagents_readout()]", INVESTIGATE_DEATHS) to_chat(src, span_warning("You have died. Barring complete bodyloss, you can in most cases be revived by other players. \ If you do not wish to be brought back, use the \"Do Not Resuscitate\" button at the bottom of your screen.")) + if(SSlag_switch.measures[DISABLE_DEAD_KEYLOOP] && !client?.holder) + to_chat(src, span_warning("Ghost movement is currently disabled by admins. To leave your body use the Ghost verb.")) /mob/living/carbon/human/proc/reagents_readout() var/readout = "[get_bloodtype()?.get_blood_name() || "Blood"]stream:" diff --git a/code/modules/mob/living/carbon/human/dummy.dm b/code/modules/mob/living/carbon/human/dummy.dm index c183c08a95f..190c8f8f0f4 100644 --- a/code/modules/mob/living/carbon/human/dummy.dm +++ b/code/modules/mob/living/carbon/human/dummy.dm @@ -76,8 +76,12 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy) item.item_flags |= IN_INVENTORY if(!item.visual_equipped(src, slot, initial)) return FALSE - + if(!(slot & item.slot_flags)) // Things below only update if slotted in (ie: not held) + return TRUE add_item_coverage(item) + if(item.hair_mask) + LAZYADD(hair_masks, item.hair_mask) + update_hair() return TRUE /mob/living/carbon/human/dummy/proc/wipe_state() diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 4ef0dd1ffe1..6045b5c160c 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -751,7 +751,7 @@ if(heal_flags & HEAL_NEGATIVE_MUTATIONS) for(var/datum/mutation/existing_mutation in dna.mutations) if(existing_mutation.quality != POSITIVE && existing_mutation.remove_on_aheal) - dna.remove_mutation(existing_mutation, list(MUTATION_SOURCE_ACTIVATED, MUTATION_SOURCE_MUTATOR, MUTATION_SOURCE_TIMED_INJECTOR)) + dna.remove_mutation(existing_mutation, GLOB.standard_mutation_sources) if(heal_flags & HEAL_TEMP) set_coretemperature(get_body_temp_normal(apply_change = FALSE)) @@ -1067,12 +1067,12 @@ /mob/living/carbon/human/proc/add_eye_color_left(color, color_priority, update_body = TRUE) LAZYSET(eye_color_left_overrides, "[color_priority]", color) if (update_body) - update_body() + update_eyes() /mob/living/carbon/human/proc/add_eye_color_right(color, color_priority, update_body = TRUE) LAZYSET(eye_color_right_overrides, "[color_priority]", color) if (update_body) - update_body() + update_eyes() /mob/living/carbon/human/proc/add_eye_color(color, color_priority, update_body = TRUE) add_eye_color_left(color, color_priority, update_body = FALSE) @@ -1082,9 +1082,12 @@ LAZYREMOVE(eye_color_left_overrides, "[color_priority]") LAZYREMOVE(eye_color_right_overrides, "[color_priority]") if (update_body) - update_body() + update_eyes() -/mob/living/carbon/human/proc/get_right_eye_color() +/mob/living/carbon/proc/get_right_eye_color() + return + +/mob/living/carbon/human/get_right_eye_color() if (!LAZYLEN(eye_color_right_overrides)) return eye_color_right @@ -1097,7 +1100,10 @@ eye_color = eye_color_right_overrides[override_priority] return eye_color -/mob/living/carbon/human/proc/get_left_eye_color() +/mob/living/carbon/proc/get_left_eye_color() + return + +/mob/living/carbon/human/get_left_eye_color() if (!LAZYLEN(eye_color_left_overrides)) return eye_color_left @@ -1196,8 +1202,11 @@ /mob/living/carbon/human/species/lizard/silverscale race = /datum/species/lizard/silverscale +/mob/living/carbon/human/species/spirit + race = /datum/species/spirit + /mob/living/carbon/human/species/ghost - race = /datum/species/ghost + race = /datum/species/spirit/ghost /mob/living/carbon/human/species/ethereal race = /datum/species/ethereal diff --git a/code/modules/mob/living/carbon/human/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm index 00c460a4253..d7b3010611e 100644 --- a/code/modules/mob/living/carbon/human/human_update_icons.dm +++ b/code/modules/mob/living/carbon/human/human_update_icons.dm @@ -48,42 +48,37 @@ There are several things that need to be remembered: /* --------------------------------------- */ //For legacy support. /mob/living/carbon/human/regenerate_icons() - - if(!..()) - update_worn_undersuit() - update_worn_id() - update_worn_glasses() - update_worn_gloves() - update_worn_ears() - update_worn_shoes() - update_suit_storage() - update_worn_mask() - update_worn_head() - update_worn_belt() - update_worn_back() - update_worn_oversuit() - update_pockets() - update_worn_neck() - update_transform() - //mutations - update_mutations_overlay() - //damage overlays - update_damage_overlays() + . = ..() + update_worn_undersuit() + update_worn_id() + update_worn_glasses() + update_worn_gloves() + update_worn_ears() + update_worn_shoes() + update_suit_storage() + update_worn_mask() + update_worn_head() + update_worn_belt() + update_worn_back() + update_worn_oversuit() + update_pockets() + update_worn_neck() + update_transform() + update_mutations_overlay() + update_damage_overlays() + // These are done via parent call update_body(), keeping them here for clarity + // update_hair() + // update_eyes() /* --------------------------------------- */ //vvvvvv UPDATE_INV PROCS vvvvvv /mob/living/carbon/human/update_worn_undersuit() remove_overlay(UNIFORM_LAYER) - - if(client && hud_used) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_ICLOTHING) + 1] - inv.update_icon() + hud_used?.update_inventory_slot(ITEM_SLOT_ICLOTHING) if(istype(w_uniform, /obj/item/clothing/under)) var/obj/item/clothing/under/uniform = w_uniform - update_hud_uniform(uniform) - if(HAS_TRAIT(uniform, TRAIT_NO_WORN_ICON) || (obscured_slots & HIDEJUMPSUIT)) return @@ -138,10 +133,10 @@ There are several things that need to be remembered: default_layer = UNIFORM_LAYER, default_icon_file = icon_file, isinhands = FALSE, - female_uniform = woman ? female_sprite_flags : null, // SKYRAT EDIT CHANGE - Digi female gender shaping - ORIGINAL: female_uniform = woman ? uniform.female_sprite_flags : null, + female_uniform = woman ? female_sprite_flags : null, // BUBBER EDIT CHANGE - Digi female gender shaping - ORIGINAL: female_uniform = woman ? uniform.female_sprite_flags : null, override_state = target_overlay, override_file = handled_by_bodyshape ? icon_file : null, - mutant_styles = mutant_styles, // SKYRAT EDIT ADDITION - Taur-friendly uniforms! + mutant_styles = mutant_styles, // BUBBER EDIT ADDITION - Taur-friendly uniforms! ) var/obj/item/bodypart/chest/my_chest = get_bodypart(BODY_ZONE_CHEST) @@ -149,20 +144,15 @@ There are several things that need to be remembered: overlays_standing[UNIFORM_LAYER] = uniform_overlay apply_overlay(UNIFORM_LAYER) - check_body_shape(BODYSHAPE_DIGITIGRADE, ITEM_SLOT_ICLOTHING) /mob/living/carbon/human/update_worn_id() remove_overlay(ID_LAYER) - - if(client && hud_used) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_ID) + 1] - inv.update_icon() + hud_used?.update_inventory_slot(ITEM_SLOT_ID) var/mutable_appearance/id_overlay = overlays_standing[ID_LAYER] if(wear_id) var/obj/item/worn_item = wear_id - update_hud_id(worn_item) if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON)) return @@ -183,10 +173,7 @@ There are several things that need to be remembered: /mob/living/carbon/human/update_worn_gloves() remove_overlay(GLOVES_LAYER) - - if(client && hud_used && hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_GLOVES) + 1]) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_GLOVES) + 1] - inv.update_icon() + hud_used?.update_inventory_slot(ITEM_SLOT_GLOVES) //Bloody hands begin if(isnull(gloves)) @@ -208,8 +195,6 @@ There are several things that need to be remembered: // Bloody hands end var/obj/item/worn_item = gloves - update_hud_gloves(worn_item) - if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (obscured_slots & HIDEGLOVES)) return @@ -253,19 +238,14 @@ There are several things that need to be remembered: /mob/living/carbon/human/update_worn_glasses() remove_overlay(GLASSES_LAYER) + hud_used?.update_inventory_slot(ITEM_SLOT_EYES) var/obj/item/bodypart/head/my_head = get_bodypart(BODY_ZONE_HEAD) if(isnull(my_head)) //decapitated return - if(client && hud_used) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_EYES) + 1] - inv.update_icon() - if(glasses) var/obj/item/worn_item = glasses - update_hud_glasses(worn_item) - if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (obscured_slots & HIDEEYES)) return @@ -292,19 +272,14 @@ There are several things that need to be remembered: /mob/living/carbon/human/update_worn_ears() remove_overlay(EARS_LAYER) + hud_used?.update_inventory_slot(ITEM_SLOT_EARS) var/obj/item/bodypart/head/my_head = get_bodypart(BODY_ZONE_HEAD) if(isnull(my_head)) //decapitated return - if(client && hud_used) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_EARS) + 1] - inv.update_icon() - if(ears) var/obj/item/worn_item = ears - update_hud_ears(worn_item) - if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (obscured_slots & HIDEEARS)) return @@ -330,14 +305,10 @@ There are several things that need to be remembered: /mob/living/carbon/human/update_worn_neck() remove_overlay(NECK_LAYER) - - if(client && hud_used && hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_NECK) + 1]) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_NECK) + 1] - inv.update_icon() + hud_used?.update_inventory_slot(ITEM_SLOT_NECK) if(wear_neck) var/obj/item/worn_item = wear_neck - update_hud_neck(wear_neck) if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (obscured_slots & HIDENECK)) return @@ -372,17 +343,13 @@ There are several things that need to be remembered: /mob/living/carbon/human/update_worn_shoes() remove_overlay(SHOES_LAYER) + hud_used?.update_inventory_slot(ITEM_SLOT_FEET) if(num_legs < 2) return - if(client && hud_used) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_FEET) + 1] - inv.update_icon() - if(shoes) var/obj/item/worn_item = shoes - update_hud_shoes(worn_item) if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (obscured_slots & HIDESHOES)) return @@ -424,19 +391,13 @@ There are several things that need to be remembered: overlays_standing[SHOES_LAYER] = shoes_overlay apply_overlay(SHOES_LAYER) - check_body_shape(BODYSHAPE_DIGITIGRADE, ITEM_SLOT_FEET) /mob/living/carbon/human/update_suit_storage() remove_overlay(SUIT_STORE_LAYER) - - if(client && hud_used) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_SUITSTORE) + 1] - inv.update_icon() + hud_used?.update_inventory_slot(ITEM_SLOT_SUITSTORE) if(s_store) var/obj/item/worn_item = s_store - update_hud_s_store(worn_item) - if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (obscured_slots & HIDESUITSTORAGE)) return @@ -448,14 +409,10 @@ There are several things that need to be remembered: /mob/living/carbon/human/update_worn_head() remove_overlay(HEAD_LAYER) - if(client && hud_used && hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_HEAD) + 1]) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_HEAD) + 1] - inv.update_icon() + hud_used?.update_inventory_slot(ITEM_SLOT_HEAD) if(head) var/obj/item/worn_item = head - update_hud_head(worn_item) - if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (obscured_slots & HIDEHEADGEAR)) return @@ -485,19 +442,13 @@ There are several things that need to be remembered: overlays_standing[HEAD_LAYER] = head_overlay apply_overlay(HEAD_LAYER) - check_body_shape(BODYSHAPE_SNOUTED, ITEM_SLOT_HEAD) /mob/living/carbon/human/update_worn_belt() remove_overlay(BELT_LAYER) - - if(client && hud_used) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_BELT) + 1] - inv.update_icon() + hud_used?.update_inventory_slot(ITEM_SLOT_BELT) if(belt) var/obj/item/worn_item = belt - update_hud_belt(worn_item) - if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (obscured_slots & HIDEBELT)) return @@ -525,14 +476,10 @@ There are several things that need to be remembered: /mob/living/carbon/human/update_worn_oversuit() remove_overlay(SUIT_LAYER) - - if(client && hud_used) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_OCLOTHING) + 1] - inv.update_icon() + hud_used?.update_inventory_slot(ITEM_SLOT_OCLOTHING) if(wear_suit) var/obj/item/worn_item = wear_suit - update_hud_wear_suit(worn_item) if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON)) return @@ -571,44 +518,22 @@ There are several things that need to be remembered: overlays_standing[SUIT_LAYER] = suit_overlay apply_overlay(SUIT_LAYER) - check_body_shape(BODYSHAPE_DIGITIGRADE, ITEM_SLOT_OCLOTHING) /mob/living/carbon/human/update_pockets() - if(client && hud_used) - var/atom/movable/screen/inventory/inv - - inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_LPOCKET) + 1] - inv.update_icon() - inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_RPOCKET) + 1] - inv.update_icon() - - if(l_store) - l_store.screen_loc = ui_storage1 - if(hud_used.hud_shown) - client.screen += l_store - update_observer_view(l_store) - - if(r_store) - r_store.screen_loc = ui_storage2 - if(hud_used.hud_shown) - client.screen += r_store - update_observer_view(r_store) + if (hud_used) + hud_used.update_inventory_slot(ITEM_SLOT_LPOCKET) + hud_used.update_inventory_slot(ITEM_SLOT_RPOCKET) /mob/living/carbon/human/update_worn_mask() remove_overlay(FACEMASK_LAYER) + hud_used?.update_inventory_slot(ITEM_SLOT_MASK) var/obj/item/bodypart/head/my_head = get_bodypart(BODY_ZONE_HEAD) if(isnull(my_head)) //Decapitated return - if(client && hud_used && hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_MASK) + 1]) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_MASK) + 1] - inv.update_icon() - if(wear_mask) var/obj/item/worn_item = wear_mask - update_hud_wear_mask(worn_item) - if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (obscured_slots & HIDEMASK)) return @@ -637,19 +562,14 @@ There are several things that need to be remembered: overlays_standing[FACEMASK_LAYER] = mask_overlay apply_overlay(FACEMASK_LAYER) - check_body_shape(BODYSHAPE_SNOUTED, ITEM_SLOT_MASK) /mob/living/carbon/human/update_worn_back() remove_overlay(BACK_LAYER) - - if(client && hud_used && hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_BACK) + 1]) - var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_BACK) + 1] - inv.update_icon() + hud_used?.update_inventory_slot(ITEM_SLOT_BACK) if(back) var/obj/item/worn_item = back var/mutable_appearance/back_overlay - update_hud_back(worn_item) if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON)) return @@ -732,16 +652,17 @@ There are several things that need to be remembered: /obj/effect/abstract/held_tk_effect/left is_right = FALSE // BUBBER EDIT END + /mob/living/carbon/human/get_held_overlays() var/list/hands = list() - // BUBBER EDIT START + // BUBBER EDIT ADDITION START if(held_left) held_left.overlays.Cut() held_left.underlays.Cut() if(held_right) held_right.overlays.Cut() held_right.underlays.Cut() - // BUBBER EDIT END + // BUBBER EDIT ADDITION END for(var/obj/item/worn_item in held_items) var/held_index = get_held_index_of_item(worn_item) if(client && hud_used && hud_used.hud_version != HUD_STYLE_NOHUD) @@ -766,7 +687,12 @@ There are several things that need to be remembered: var/icon_file = IS_RIGHT_INDEX(held_index) ? worn_item.righthand_file : worn_item.lefthand_file hand_overlay = worn_item.build_worn_icon(default_layer = HANDS_LAYER, default_icon_file = icon_file, isinhands = TRUE) var/obj/item/bodypart/arm/held_in_hand = hand_bodyparts[held_index] - // BUBBER EDIT START + /* // BUBBER EDIT REMOVAL START - Moved down below psionic holding, after an else block + held_in_hand?.held_hand_offset?.apply_offset(hand_overlay) + + hands += hand_overlay + */ // BUBBER EDIT REMOVAL END + // BUBBER EDIT ADDITION START - Psionic holding if(HAS_TRAIT(src, TRAIT_FLOATING_HELD)) if(!held_left) held_left = new(src) @@ -827,7 +753,7 @@ There are several things that need to be remembered: else held_in_hand?.held_hand_offset?.apply_offset(hand_overlay) hands += hand_overlay - // BUBBER EDIT END + // BUBBER EDIT ADDITION END return hands /// Modifies a sprite slightly to conform to female body shapes @@ -945,90 +871,6 @@ There are several things that need to be remembered: out += overlays_standing[i] return out - -//human HUD updates for items in our inventory - -/mob/living/carbon/human/proc/update_hud_uniform(obj/item/worn_item) - worn_item.screen_loc = ui_iclothing - if((client && hud_used) && (hud_used.inventory_shown && hud_used.hud_shown)) - client.screen += worn_item - update_observer_view(worn_item,TRUE) - -/mob/living/carbon/human/proc/update_hud_id(obj/item/worn_item) - worn_item.screen_loc = ui_id - if((client && hud_used?.hud_shown)) - client.screen += worn_item - update_observer_view(worn_item) - -/mob/living/carbon/human/proc/update_hud_gloves(obj/item/worn_item) - worn_item.screen_loc = ui_gloves - if((client && hud_used) && (hud_used.inventory_shown && hud_used.hud_shown)) - client.screen += worn_item - update_observer_view(worn_item,TRUE) - -/mob/living/carbon/human/proc/update_hud_glasses(obj/item/worn_item) - worn_item.screen_loc = ui_glasses - if((client && hud_used) && (hud_used.inventory_shown && hud_used.hud_shown)) - client.screen += worn_item - update_observer_view(worn_item,TRUE) - -/mob/living/carbon/human/proc/update_hud_ears(obj/item/worn_item) - worn_item.screen_loc = ui_ears - if((client && hud_used) && (hud_used.inventory_shown && hud_used.hud_shown)) - client.screen += worn_item - update_observer_view(worn_item,TRUE) - -/mob/living/carbon/human/proc/update_hud_shoes(obj/item/worn_item) - worn_item.screen_loc = ui_shoes - if((client && hud_used) && (hud_used.inventory_shown && hud_used.hud_shown)) - client.screen += worn_item - update_observer_view(worn_item,TRUE) - -/mob/living/carbon/human/proc/update_hud_s_store(obj/item/worn_item) - worn_item.screen_loc = ui_sstore1 - if(client && hud_used?.hud_shown) - client.screen += worn_item - update_observer_view(worn_item,TRUE) - -/mob/living/carbon/human/proc/update_hud_wear_suit(obj/item/worn_item) - worn_item.screen_loc = ui_oclothing - if((client && hud_used) && (hud_used.inventory_shown && hud_used.hud_shown)) - client.screen += worn_item - update_observer_view(worn_item,TRUE) - -/mob/living/carbon/human/proc/update_hud_belt(obj/item/worn_item) - belt.screen_loc = ui_belt - if(client && hud_used?.hud_shown) - client.screen += worn_item - update_observer_view(worn_item,TRUE) - -/mob/living/carbon/human/update_hud_head(obj/item/worn_item) - worn_item.screen_loc = ui_head - if((client && hud_used) && (hud_used.inventory_shown && hud_used.hud_shown)) - client.screen += worn_item - update_observer_view(worn_item,TRUE) - -//update whether our mask item appears on our hud. -/mob/living/carbon/human/update_hud_wear_mask(obj/item/worn_item) - worn_item.screen_loc = ui_mask - if((client && hud_used) && (hud_used.inventory_shown && hud_used.hud_shown)) - client.screen += worn_item - update_observer_view(worn_item,TRUE) - -//update whether our neck item appears on our hud. -/mob/living/carbon/human/update_hud_neck(obj/item/worn_item) - worn_item.screen_loc = ui_neck - if((client && hud_used) && (hud_used.inventory_shown && hud_used.hud_shown)) - client.screen += worn_item - update_observer_view(worn_item,TRUE) - -//update whether our back item appears on our hud. -/mob/living/carbon/human/update_hud_back(obj/item/worn_item) - worn_item.screen_loc = ui_back - if(client && hud_used?.hud_shown) - client.screen += worn_item - update_observer_view(worn_item, inventory = TRUE) - /* Does everything in relation to building the /mutable_appearance used in the mob's overlays list covers: @@ -1100,7 +942,7 @@ mutant_styles: The mutant style - taur bodytype, STYLE_TESHARI, etc. // SKYRAT E type = female_uniform, greyscale_colors = greyscale_colors, ) - if(!isinhands && is_digi && (supports_variations_flags & CLOTHING_DIGITIGRADE_MASK)) + if(!isinhands && (BODYSHAPE_DIGITIGRADE) && (supports_variations_flags & CLOTHING_DIGITIGRADE_MASK)) building_icon = wear_digi_version( base_icon = building_icon || icon(file2use, t_state), item = src, @@ -1181,73 +1023,78 @@ mutant_styles: The mutant style - taur bodytype, STYLE_TESHARI, etc. // SKYRAT E else //No offsets or Unwritten number of hands return list("x" = 0, "y" = 0)//Handle held offsets -/mob/living/carbon/human/proc/update_observer_view(obj/item/worn_item, inventory) - if(observers?.len) - for(var/M in observers) - var/mob/dead/observe = M - if(observe.client && observe.client.eye == src) - if(observe.hud_used) - if(inventory && !observe.hud_used.inventory_shown) - continue - observe.client.screen += worn_item - else - observers -= observe - if(!observers.len) - observers = null - break - /mob/living/carbon/human/update_body(is_creating = FALSE) - update_eyes() - update_underwear() + remove_overlay(BODY_LAYER) + + var/list/body_overlays = list() + body_overlays += get_underwear_overlays() + + if(length(body_overlays)) + overlays_standing[BODY_LAYER] = body_overlays + apply_overlay(BODY_LAYER) + + // parent call will update the actual bodyparts return ..() -/mob/living/carbon/human/proc/update_underwear() // OVERRIDDEN IN MODULAR_ZUBBERS - remove_overlay(BODY_LAYER) +/// Returns a list of all underclothing overlays to be applied to the mob +/mob/living/carbon/human/proc/get_underwear_overlays() // OVERRIDDEN IN MODULAR_ZUBBERS + . = list() if(HAS_TRAIT(src, TRAIT_HUSK) || HAS_TRAIT(src, TRAIT_INVISIBLE_MAN) || HAS_TRAIT(src, TRAIT_NO_UNDERWEAR)) - return + return . + // Underwear, Undershirts & Socks - var/list/standing = list() - var/active_bodyshapes = get_active_bodyshapes() if(underwear) var/datum/sprite_accessory/clothing/underwear/undie_accessory = SSaccessories.underwear_list[underwear] - var/mutable_appearance/underwear_overlay = undie_accessory?.make_appearance(underwear_color, physique, active_bodyshapes) + var/mutable_appearance/underwear_overlay = undie_accessory?.make_appearance(underwear_color, physique, bodyshape) if(underwear_overlay) - standing += underwear_overlay + . += underwear_overlay if(undershirt) var/datum/sprite_accessory/clothing/undershirt/shirt_accessory = SSaccessories.undershirt_list[undershirt] - var/mutable_appearance/shirt_overlay = shirt_accessory?.make_appearance(null, physique, active_bodyshapes) + var/mutable_appearance/shirt_overlay = shirt_accessory?.make_appearance(null, physique, bodyshape) if(shirt_overlay) - standing += shirt_overlay + . += shirt_overlay if(socks && num_legs >= 2 && !(bodyshape & BODYSHAPE_DIGITIGRADE)) var/datum/sprite_accessory/clothing/socks/sock_accessory = SSaccessories.socks_list[socks] - var/mutable_appearance/socks_overlay = sock_accessory?.make_appearance(null, physique, active_bodyshapes) + var/mutable_appearance/socks_overlay = sock_accessory?.make_appearance(null, physique, bodyshape) if(socks_overlay) - standing += socks_overlay + . += socks_overlay - if(standing.len) - overlays_standing[BODY_LAYER] = standing + return . - apply_overlay(BODY_LAYER) +/// Updates eye sprites if relevant +/mob/living/proc/update_eyes(refresh = TRUE) + return -/mob/living/carbon/human/proc/update_eyes() +/mob/living/carbon/human/update_eyes(refresh = TRUE) remove_overlay(EYES_LAYER) - if(HAS_TRAIT(src, TRAIT_HUSK) || HAS_TRAIT(src, TRAIT_INVISIBLE_MAN)) + + var/obj/item/bodypart/head/noggin = get_bodypart(BODY_ZONE_HEAD) + if(isnull(noggin) || noggin.is_husked || noggin.is_invisible) return - // eyes (missing eye sprites get handled by the head itself, but sadly we have to do this stupid shit here, for now) - var/obj/item/organ/eyes/eye_organ = get_organ_slot(ORGAN_SLOT_EYES) - if (!eye_organ) - return + if(refresh) + var/obj/item/organ/eyes/eyes = locate() in noggin + eyes?.refresh(src, call_update = FALSE) - var/obj/item/bodypart/head/noggin = get_bodypart(deprecise_zone(eye_organ.zone)) // Futureproofing for HARS/weird species - if(istype(noggin) && !(noggin?.head_flags & HEAD_EYESPRITES)) - return + var/list/eye_overlays = noggin.get_eye_overlays() + if(length(eye_overlays)) + overlays_standing[EYES_LAYER] = eye_overlays + apply_overlay(EYES_LAYER) - eye_organ.refresh(call_update = FALSE) - overlays_standing[EYES_LAYER] = eye_organ.generate_body_overlay(src, noggin) - apply_overlay(EYES_LAYER) +/// Updates hair sprites if relevant +/mob/living/proc/update_hair() + return + +/mob/living/carbon/human/update_hair() + remove_overlay(HAIR_LAYER) + + var/obj/item/bodypart/head/head = get_bodypart(BODY_ZONE_HEAD) + var/list/head_overlays = head?.get_hair_overlays() + if(length(head_overlays)) + overlays_standing[HAIR_LAYER] = head_overlays + apply_overlay(HAIR_LAYER) /// Updates face (as of now, only eye) offsets /mob/living/carbon/human/update_face_offset() @@ -1268,8 +1115,8 @@ mutant_styles: The mutant style - taur bodytype, STYLE_TESHARI, etc. // SKYRAT E apply_overlay(EYES_LAYER) -// Only renders the head of the human -/mob/living/carbon/human/proc/update_body_parts_head_only(update_limb_data) +/// Makes all aspects of the mob invisibile but the head and its associated sprites +/mob/living/carbon/human/proc/render_only_head() if(!dna?.species) return @@ -1278,69 +1125,13 @@ mutant_styles: The mutant style - taur bodytype, STYLE_TESHARI, etc. // SKYRAT E if(!istype(my_head)) return - my_head.update_limb(is_creating = update_limb_data) - //BUBBER EDIT START - We need to account for different heights when using this proc - var/my_head_icon = my_head.get_limb_icon(dropped = FALSE, update_on = src) - - if(mob_height != HUMAN_HEIGHT_MEDIUM) - var/string_form_index = num2text(HEAD_LAYER) - var/offset_type = GLOB.layers_to_offset[string_form_index] - if(isnull(offset_type)) - if(islist(my_head_icon)) - for(var/image/applied_appearance in my_head_icon) - apply_height_filters(applied_appearance) - else if(isimage(my_head_icon)) - apply_height_filters(my_head_icon) - else - if(islist(my_head_icon)) - for(var/image/applied_appearance in my_head_icon) - apply_height_offsets(applied_appearance, offset_type) - else if(isimage(my_head_icon)) - apply_height_offsets(my_head_icon, offset_type) - - add_overlay(my_head_icon) - //add_overlay(my_head.get_limb_icon(dropped = FALSE, update_on = src)) - //BUBBER EDIT END + cut_overlays() + my_head.update_limb() + add_overlay(my_head.get_limb_icon()) update_worn_head() update_worn_mask() - -/** - * Used to perform regular updates to the limbs of humans with special bodyshapes - * - * * check_shapes: The bodyshapes to check for. - * Any limbs or organs which share this shape, will be updated. - * * ignore_slots: The slots to ignore when updating the limbs. - * This is useful for things like digitigrade legs, where we can skip some slots that we're already updating. - * - * return an integer, the number of limbs updated - */ -/mob/living/carbon/human/proc/check_body_shape(check_shapes = BODYSHAPE_DIGITIGRADE|BODYSHAPE_SNOUTED, ignore_slots = NONE) - . = 0 - if(!(bodyshape & check_shapes)) - // optimization - none of our limbs or organs have the desired shape - return . - - for(var/obj/item/bodypart/limb as anything in get_bodyparts()) - var/checked_bodyshape = limb.bodyshape - // accounts for stuff like snouts - for(var/obj/item/organ/organ in limb) - checked_bodyshape |= organ.external_bodyshapes - - // any limb needs to be updated, so stop here and do it - if(checked_bodyshape & check_shapes) - . = update_body_parts() - break - - if(!.) - return - // hardcoding this here until bodypart updating is more sane - // we need to update clothing items that may have been affected by bodyshape updates - if(check_shapes & BODYSHAPE_DIGITIGRADE) - for(var/obj/item/thing as anything in get_equipped_items(INCLUDE_PROSTHETICS|INCLUDE_ABSTRACT)) - if(thing.slot_flags & ignore_slots) - continue - if(thing.supports_variations_flags & DIGITIGRADE_VARIATIONS) - thing.update_slot_icon() + update_eyes() + update_hair() // Hooks into human apply overlay so that we can modify all overlays applied through standing overlays to our height system. // Some of our overlays will be passed through a displacement filter to make our mob look taller or shorter. @@ -1396,11 +1187,14 @@ mutant_styles: The mutant style - taur bodytype, STYLE_TESHARI, etc. // SKYRAT E var/static/icon/cut_legs_mask = icon('icons/effects/cut.dmi', "Cut2") var/static/icon/lenghten_torso_mask = icon('icons/effects/cut.dmi', "Cut3") var/static/icon/lenghten_legs_mask = icon('icons/effects/cut.dmi', "Cut4") + var/static/icon/lenghten_arms_mask = icon('icons/effects/cut.dmi', "Cut5") + appearance.remove_filter(list( "Cut_Torso", "Cut_Legs", "Lenghten_Legs", "Lenghten_Torso", + "Lenghten_Arms", "Gnome_Cut_Torso", "Gnome_Cut_Legs", "Monkey_Torso", @@ -1502,10 +1296,15 @@ mutant_styles: The mutant style - taur bodytype, STYLE_TESHARI, etc. // SKYRAT E "priority" = 1, "params" = displacement_map_filter(lenghten_torso_mask, x = 0, y = 0, size = 1), ), + list( + "name" = "Lenghten_Arms", + "priority" = 1, + "params" = displacement_map_filter(lenghten_arms_mask, x = 0, y = 0, size = 1), + ), list( "name" = "Lenghten_Legs", "priority" = 1, - "params" = displacement_map_filter(lenghten_legs_mask, x = 0, y = 0, size = 2), + "params" = displacement_map_filter(lenghten_legs_mask, x = 0, y = 0, size = 1), ), )) diff --git a/code/modules/mob/living/carbon/human/init_signals.dm b/code/modules/mob/living/carbon/human/init_signals.dm index 55ab5d6b6b8..9f864884723 100644 --- a/code/modules/mob/living/carbon/human/init_signals.dm +++ b/code/modules/mob/living/carbon/human/init_signals.dm @@ -12,8 +12,9 @@ RegisterSignal(src, COMSIG_COMPONENT_CLEAN_FACE_ACT, PROC_REF(clean_face)) - RegisterSignals(src, list(SIGNAL_ADDTRAIT(TRAIT_HUSK), SIGNAL_REMOVETRAIT(TRAIT_HUSK)), PROC_REF(refresh_obscured)) + RegisterSignals(src, list(SIGNAL_ADDTRAIT(TRAIT_HUSK), SIGNAL_REMOVETRAIT(TRAIT_HUSK)), PROC_REF(husk_trait_toggle)) RegisterSignals(src, list(SIGNAL_ADDTRAIT(TRAIT_INVISIBLE_MAN), SIGNAL_REMOVETRAIT(TRAIT_INVISIBLE_MAN)), PROC_REF(invisible_man_toggle)) + RegisterSignals(src, list(SIGNAL_ADDTRAIT(TRAIT_NO_UNDERWEAR), SIGNAL_REMOVETRAIT(TRAIT_NO_UNDERWEAR)), PROC_REF(no_underwear_toggle)) /// Gaining or losing [TRAIT_DWARF] updates our height and grants passtable /mob/living/carbon/human/proc/on_dwarf_trait(datum/source) @@ -67,8 +68,19 @@ ) playsound(src, SFX_RUSTLE, 50, TRUE, -5, frequency = 0.8) +/mob/living/carbon/human/proc/husk_trait_toggle(datum/source) + SIGNAL_HANDLER + refresh_obscured() + update_body() + /// When [TRAIT_INVISIBLE_MAN] is added or removed we need to update a few things /mob/living/carbon/human/proc/invisible_man_toggle(datum/source) SIGNAL_HANDLER refresh_obscured() update_visible_name() + update_body() + +/// When [TRAIT_NO_UNDERWEAR] is added or removed we need to update our body to hide or show underwear sprites +/mob/living/carbon/human/proc/no_underwear_toggle(datum/source) + SIGNAL_HANDLER + update_body() diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index e0c2a1a1a52..0d644b01e8e 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -299,18 +299,29 @@ var/obj/item/existing_tank = is_external ? external : internal if(tank == existing_tank) return toggle_close_internals(is_external) + // Use breathing tube regardless of mask. if(can_breathe_tube()) return toggle_open_internals(tank, is_external) + // Use mask in absence of tube. - if(isclothing(wear_mask) && ((wear_mask.visor_flags & MASKINTERNALS) || (wear_mask.clothing_flags & MASKINTERNALS))) - // Adjust dishevelled breathing mask back onto face unless it is exempt. - if ((wear_mask.up) && !(wear_mask.clothing_flags & INTERNALS_ADJUST_EXEMPT)) - wear_mask.adjust_visor(src) + if(can_breathe_mask()) return toggle_open_internals(tank, is_external) + // We have a valid mask but it's pulled down + else if(isclothing(wear_mask)) + var/obj/item/clothing/mask = wear_mask + if (mask.up && (mask.visor_flags & MASKINTERNALS) && !(mask.clothing_flags & INTERNALS_ADJUST_EXEMPT) && mask.adjust_visor(src)) + return toggle_open_internals(tank, is_external) + // Use helmet in absence of tube or valid mask. if(can_breathe_helmet()) return toggle_open_internals(tank, is_external) + // We have a valid helmet but its visor is up + else if(isclothing(head)) + var/obj/item/clothing/helmet = head + if (helmet.up && (helmet.visor_flags & HEADINTERNALS) && !(helmet.clothing_flags & INTERNALS_ADJUST_EXEMPT) && helmet.adjust_visor(src)) + return toggle_open_internals(tank, is_external) + // Notify user of missing valid breathing apparatus. if (wear_mask) // Invalid mask diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 4714ba39cb1..3c21ea44ed5 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -23,7 +23,6 @@ return . = ..() - if(QDELETED(src)) return FALSE @@ -45,8 +44,9 @@ handle_heart(seconds_per_tick) // Handles liver failure effects, if we lack a liver handle_liver(seconds_per_tick) - // For special species interactions - dna.species.spec_life(src, seconds_per_tick) + // Crit damage but specifically for people who don't get suffocate while in crit so they can actually die eventually + if(HAS_TRAIT(src, TRAIT_NOBREATH) && (health < crit_threshold) && !HAS_TRAIT(src, TRAIT_NOCRITDAMAGE)) + adjust_brute_loss(0.5 * seconds_per_tick) return stat != DEAD /mob/living/carbon/human/calculate_affecting_pressure(pressure) diff --git a/code/modules/mob/living/carbon/human/species_types/dullahan.dm b/code/modules/mob/living/carbon/human/species_types/dullahan.dm index fb751eefe2e..777e2ca64bd 100644 --- a/code/modules/mob/living/carbon/human/species_types/dullahan.dm +++ b/code/modules/mob/living/carbon/human/species_types/dullahan.dm @@ -60,7 +60,6 @@ eyes.eye_color_left = human.eye_color_left eyes.eye_color_right = human.eye_color_right eyes.bodypart_insert(head) - human.update_body() head.update_limb() head.update_icon_dropped() RegisterSignal(head, COMSIG_QDELETING, PROC_REF(on_head_destroyed)) diff --git a/code/modules/mob/living/carbon/human/species_types/ethereal.dm b/code/modules/mob/living/carbon/human/species_types/ethereal.dm index 9ae530779f9..b786432469e 100644 --- a/code/modules/mob/living/carbon/human/species_types/ethereal.dm +++ b/code/modules/mob/living/carbon/human/species_types/ethereal.dm @@ -112,16 +112,16 @@ currently_flickered = FALSE ethereal_light.set_light_on(TRUE) fixed_mut_color = current_color - ethereal.update_body() ethereal.set_facial_haircolor(current_color, override = TRUE, update = FALSE) - ethereal.set_haircolor(current_color, override = TRUE, update = TRUE) + ethereal.set_haircolor(current_color, override = TRUE, update = FALSE) + ethereal.update_body() else ethereal_light.set_light_on(FALSE) var/dead_color = rgb(128,128,128) fixed_mut_color = dead_color - ethereal.update_body() ethereal.set_facial_haircolor(dead_color, override = TRUE, update = FALSE) - ethereal.set_haircolor(dead_color, override = TRUE, update = TRUE) + ethereal.set_haircolor(dead_color, override = TRUE, update = FALSE) + ethereal.update_body() /datum/species/ethereal/proc/on_emp_act(mob/living/carbon/human/source, severity, protection) SIGNAL_HANDLER diff --git a/code/modules/mob/living/carbon/human/species_types/felinid.dm b/code/modules/mob/living/carbon/human/species_types/felinid.dm index c4c3a27f879..54af1a4852f 100644 --- a/code/modules/mob/living/carbon/human/species_types/felinid.dm +++ b/code/modules/mob/living/carbon/human/species_types/felinid.dm @@ -128,17 +128,15 @@ human_for_preview.set_hairstyle("Hime Cut", update = TRUE) - /* SKYRAT EDIT - Making the species menu icons work better - ORIGINAL: + /* // SKYRAT EDIT REMOVAL START - Making the species menu icons work better - ORIGINAL: var/obj/item/organ/ears/cat/cat_ears = human_for_preview.get_organ_by_type(/obj/item/organ/ears/cat) if (cat_ears) cat_ears.color = human_for_preview.hair_color - human_for_preview.update_body() - */ - human_for_preview.dna.mutant_bodyparts[FEATURE_TAIL_GENERIC] = list(MUTANT_INDEX_NAME = "Cat", MUTANT_INDEX_COLOR_LIST = list(human_for_preview.hair_color)) - human_for_preview.dna.mutant_bodyparts[FEATURE_EARS] = list(MUTANT_INDEX_NAME = "Cat", MUTANT_INDEX_COLOR_LIST = list(human_for_preview.hair_color)) + human_for_preview.update_hair() + */ // SKYRAT EDIT REMOVAL END + // SKYRAT EDIT ADDITION START regenerate_organs(human_for_preview, src, visual_only = TRUE) - human_for_preview.update_body(TRUE) - // BUBBER EDIT CHANGE END + // SKYRAT EDIT ADDITION END /datum/species/human/felinid/get_physical_attributes() return "Felinids are very similar to humans in almost all respects, with their biggest differences being the ability to lick their wounds, \ diff --git a/code/modules/mob/living/carbon/human/species_types/flypeople.dm b/code/modules/mob/living/carbon/human/species_types/flypeople.dm index eca9383698f..93d054d5344 100644 --- a/code/modules/mob/living/carbon/human/species_types/flypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/flypeople.dm @@ -26,20 +26,6 @@ BODY_ZONE_CHEST = /obj/item/bodypart/chest/fly, ) -/datum/species/fly/on_species_gain(mob/living/carbon/human/human_who_gained_species, datum/species/old_species, pref_load, regenerate_icons) - . = ..() - RegisterSignal(human_who_gained_species, COMSIG_ATOM_ATTACKBY, PROC_REF(on_attackby)) - -/datum/species/fly/on_species_loss(mob/living/carbon/human/C, datum/species/new_species, pref_load) - . = ..() - UnregisterSignal(C, COMSIG_ATOM_ATTACKBY) - -/datum/species/fly/proc/on_attackby(mob/living/source, obj/item/attacking_item, mob/living/attacker, list/modifiers, list/attack_modifiers) - SIGNAL_HANDLER - - if(istype(attacking_item, /obj/item/melee/flyswatter)) - MODIFY_ATTACK_FORCE_MULTIPLIER(attack_modifiers, 30) // Yes, a 30x damage modifier - /datum/species/fly/get_physical_attributes() return "These hideous creatures suffer from pesticide immensely, eat waste, and are incredibly vulnerable to bright lights. They do have wings though." diff --git a/code/modules/mob/living/carbon/human/species_types/ghost.dm b/code/modules/mob/living/carbon/human/species_types/ghost.dm index 0a53c7b41ba..d1da78e3870 100644 --- a/code/modules/mob/living/carbon/human/species_types/ghost.dm +++ b/code/modules/mob/living/carbon/human/species_types/ghost.dm @@ -1,23 +1,22 @@ ///Spirit mob that lacks legs but still roams the station as part of the unliving. -/datum/species/ghost - name = "Ghost" - id = SPECIES_GHOST +/datum/species/spirit + name = "Spirit" + id = SPECIES_SPIRIT inherent_traits = list( TRAIT_GENELESS, - TRAIT_MOVE_FLYING, TRAIT_NEVER_WOUNDED, TRAIT_NOBLOOD, TRAIT_NODISMEMBER, TRAIT_NO_DNA_COPY, - TRAIT_NO_FLOATING_ANIM, TRAIT_NO_PLASMA_TRANSFORM, TRAIT_NO_UNDERWEAR, - TRAIT_RESISTLOWPRESSURE, TRAIT_UNHUSKABLE, + TRAIT_NO_FLOATING_ANIM, + TRAIT_MOVE_FLYING, ) - inherent_biotypes = MOB_HUMANOID | MOB_SPIRIT | MOB_UNDEAD + inherent_biotypes = MOB_SPIRIT | MOB_UNDEAD no_equip_flags = ITEM_SLOT_FEET - changesource_flags = MIRROR_BADMIN | WABBAJACK | SLIME_EXTRACT | MIRROR_PRIDE | MIRROR_MAGIC + changesource_flags = MIRROR_BADMIN | MIRROR_PRIDE | MIRROR_MAGIC | WABBAJACK | SLIME_EXTRACT sexes = FALSE meat = /obj/item/ectoplasm @@ -33,45 +32,34 @@ bodypart_overrides = list( BODY_ZONE_HEAD = /obj/item/bodypart/head/ghost, - BODY_ZONE_CHEST = /obj/item/bodypart/chest/ghost, + BODY_ZONE_CHEST = /obj/item/bodypart/chest/ghost/spirit, BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left/ghost, BODY_ZONE_R_ARM = /obj/item/bodypart/arm/right/ghost, ) - ///Innate passthrough ability given to ghosts that allows them to phase but drops their stuff. - var/datum/action/innate/toggle_passthrough/passthrough_ability + ///Boolean on whether this species type is available at roundstart during halloween, used to deny subtypes. + var/halloween_exclusive = TRUE -/datum/species/ghost/check_roundstart_eligible() - if(check_holidays(HALLOWEEN)) +/datum/species/spirit/check_roundstart_eligible() + if(check_holidays(HALLOWEEN) && halloween_exclusive) return TRUE return ..() -/datum/species/ghost/on_species_gain(mob/living/carbon/human/new_ghost, datum/species/old_species, pref_load, regenerate_icons) - . = ..() - passthrough_ability = new(src) - passthrough_ability.Grant(new_ghost) +/datum/species/spirit/get_physical_attributes() + return "Spirits are the spiritual remains of long-passed entities. They lack legs, can fly, but still eat, breathe, hear and see." -/datum/species/ghost/on_species_loss(mob/living/carbon/human/former_ghost, datum/species/new_species, pref_load) - QDEL_NULL(passthrough_ability) - return ..() - -/datum/species/ghost/get_physical_attributes() - return "Ghosts are the spiritual remains of long-passed entities. They lack legs, can fly, and phase through walls, \ - but still eat, breathe, hear and see." - -/datum/species/ghost/get_species_description() +/datum/species/spirit/get_species_description() return "Spirits are spirits of long-dead creatures whom, for one reason or another, still roam around." -/datum/species/ghost/get_species_lore() +/datum/species/spirit/get_species_lore() return list( - "Ghosts are one of the spookiest creatures known in the galaxy. \ - While they still need their protein to sustain themselves, they are able to control their own bodies, \ - going through walls and getting rid of all their posessions at will. \ - Most knowledge known about them is kept secret by Nanotrasen's top Chaplains, who are keen \ - to keep it private.", + "Spirits are the non-physical remains that linger onto their mortal coil. \ + They still need their protein and organs to keep themselves \"alive\", \ + which leads to many of them still believing they are still part of the living, \ + whether or not they are is a very open-ended debate between philosophers.", ) -/datum/species/ghost/create_pref_unique_perks() +/datum/species/spirit/create_pref_unique_perks() var/list/to_add = list() to_add += list(list( @@ -81,14 +69,6 @@ SPECIES_PERK_DESC = "Ghosts lack legs and float, preventing you from falling into holes in the ground.", )) - to_add += list(list( - SPECIES_PERK_TYPE = SPECIES_NEUTRAL_PERK, - SPECIES_PERK_ICON = "ghost", - SPECIES_PERK_NAME = "Incorporeal", - SPECIES_PERK_DESC = "Ghost carry their tombstones with them and are directly tied to it. \ - dropping the tombstone will allow you to phase through solid matter, but leaves you vulnerable.", - )) - to_add += list(list( SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK, SPECIES_PERK_ICON = "shoe-prints", @@ -98,35 +78,102 @@ return to_add +/** + * Ghost subtype + * This is the type of ghost that can actually phase through walls, + * exclusive to magic mirrors & admins, as roundstart-ability to phase anywhere + * is not something that is generally fun to play against. + */ +/datum/species/spirit/ghost + name = "Ghost" + id = SPECIES_GHOST + inherent_traits = list( + TRAIT_GENELESS, + TRAIT_NEVER_WOUNDED, + TRAIT_NOBLOOD, + TRAIT_NODISMEMBER, + TRAIT_NO_DNA_COPY, + TRAIT_NO_PLASMA_TRANSFORM, + TRAIT_NO_UNDERWEAR, + TRAIT_UNHUSKABLE, + TRAIT_NO_FLOATING_ANIM, + TRAIT_MOVE_FLYING, + //ghost-unique + TRAIT_SEE_BLESSED_TILES, + ) + //they have a different chest. + bodypart_overrides = list( + BODY_ZONE_HEAD = /obj/item/bodypart/head/ghost, + BODY_ZONE_CHEST = /obj/item/bodypart/chest/ghost, + BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left/ghost, + BODY_ZONE_R_ARM = /obj/item/bodypart/arm/right/ghost, + ) + changesource_flags = MIRROR_BADMIN | WABBAJACK + halloween_exclusive = FALSE + + ///Innate passthrough ability given to ghosts that allows them to phase but drops their stuff. + var/datum/action/innate/toggle_passthrough/passthrough_ability + +/datum/species/spirit/ghost/get_physical_attributes() + return "Ghosts are the spiritual remains of long-passed entities. They lack legs, can fly, can choose at will to become incorporeal, \ + but still eat, breathe, hear and see." + +/datum/species/spirit/ghost/get_species_lore() + return list( + "Ghosts are one of the spookiest creatures known in the galaxy. \ + While they still need their protein to sustain themselves, they are able to control their own bodies, \ + going through walls and getting rid of all their posessions at will. \ + Most knowledge known about them is kept secret by Nanotrasen's top Chaplains, who are keen \ + to keep it private.", + ) + +/datum/species/spirit/ghost/on_species_gain(mob/living/carbon/human/new_ghost, datum/species/old_species, pref_load, regenerate_icons) + . = ..() + passthrough_ability = new(src) + passthrough_ability.Grant(new_ghost) + for(var/datum/atom_hud/alternate_appearance/basic/blessed_aware/blessed_hud in GLOB.active_alternate_appearances) + blessed_hud.check_hud(new_ghost) + +/datum/species/spirit/ghost/on_species_loss(mob/living/carbon/human/former_ghost, datum/species/new_species, pref_load) + . = ..() + QDEL_NULL(passthrough_ability) + //this has to be called after parent so inherent traits is cleared before we update our HUDs + for(var/datum/atom_hud/alternate_appearance/basic/blessed_aware/blessed_hud in GLOB.active_alternate_appearances) + blessed_hud.check_hud(former_ghost) + +/datum/species/spirit/ghost/create_pref_unique_perks() + var/list/to_add = ..() + + to_add += list(list( + SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, + SPECIES_PERK_ICON = "ghost", + SPECIES_PERK_NAME = "Incorporeal", + SPECIES_PERK_DESC = "Ghost are able to control their body to the extent where you can willingly make yourself able \ + to phase through anything, including your own equipment.", + )) + + return to_add + /** * Passthrough ability * * Ghost innate ability that allows them to enter ghost mode, - * which gives them the phasing ability, but makes them unable to use anything, - * and they will be tied to a tombstone that, if dug up, will kill them and turn them - * into a skeleton. + * which gives them the phasing ability, but makes them drop everything + * and completely unable to wear anything. */ /datum/action/innate/toggle_passthrough name = "Toggle passthrough" - desc = "Toggles phasing through everything, including your hands. You are tied to your tombstone while this is active. \ - At least you know how to keep your clothes on." + desc = "Toggles your ability to phase through everything, including your gear and any incompatible organs/limbs." button_icon = 'icons/hud/actions.dmi' button_icon_state = "ghost" - ///Grave that appears when we're passing through, which we are also tied to. - var/obj/structure/closet/crate/grave/skeleton/grave - /datum/action/innate/toggle_passthrough/Grant(mob/grant_to) . = ..() - grave = new() - //contents are initialized when the grave is robbed as that's when the crate is opened for the first time. - RegisterSignal(grave, COMSIG_CLOSET_CONTENTS_INITIALIZED, PROC_REF(on_grave_robbed)) - RegisterSignal(grave, COMSIG_CLOSET_POST_OPEN, PROC_REF(post_grave_robbed)) + RegisterSignal(grant_to, COMSIG_CARBON_POST_ATTACH_LIMB, PROC_REF(on_new_limb)) /datum/action/innate/toggle_passthrough/Remove(mob/remove_from) - if(!QDELING(remove_from)) - swap_mode(force_off = TRUE) - QDEL_NULL(grave) + swap_mode(force_off = TRUE) + UnregisterSignal(remove_from, COMSIG_CARBON_POST_ATTACH_LIMB) return ..() /datum/action/innate/toggle_passthrough/Activate() @@ -135,61 +182,75 @@ return swap_mode() +/datum/action/innate/toggle_passthrough/IsAvailable(feedback) + if(!isliving(owner)) + return FALSE + var/mob/living/living_owner = owner + if(living_owner.has_reagent(/datum/reagent/water/holywater)) + return FALSE + //technically you can trap a ghost by blessing them as theyre phasing, + //but they can still be dragged out. + if(locate(/obj/effect/blessing) in get_turf(owner)) + return FALSE + var/obj/item/bodypart/chest/their_chest = living_owner.get_bodypart(BODY_ZONE_CHEST) + if(!their_chest || !(their_chest.bodytype & BODYTYPE_GHOST)) + return FALSE + return ..() + +///Called when the owner of this action gets a new limb, if it isn't a ghost-limb +///the action will turn itself off, and you'll lose said limb if you try using this action again. +/datum/action/innate/toggle_passthrough/proc/on_new_limb(mob/source, obj/item/bodypart/new_part, special) + SIGNAL_HANDLER + if(!iscarbon(owner)) + return + if(!(new_part.bodytype & BODYTYPE_GHOST)) + swap_mode(force_off = TRUE) + ///Swaps the mode, allowing us to phase through stuff but drops everything. Optional 'force_off' arg to prevent being able to turn it on. /datum/action/innate/toggle_passthrough/proc/swap_mode(force_off) //we can only turn off, early return if we're trying to turn it on instead. if(force_off && HAS_TRAIT_FROM(owner, TRAIT_NO_FLOATING_ANIM, SPECIES_TRAIT)) return - if(HAS_TRAIT_FROM(owner, TRAIT_NO_FLOATING_ANIM, SPECIES_TRAIT)) - grave.forceMove(get_turf(owner)) - owner.AddComponent(/datum/component/leash, grave, distance = 7) - REMOVE_TRAIT(owner, TRAIT_NO_FLOATING_ANIM, SPECIES_TRAIT) - owner.add_traits(list( + var/mob/living/carbon/carbon_owner = owner + var/datum/species/carbon_species = carbon_owner.dna.species + + //drop any limbs & organs that can't phase, now that you're phasing. + for(var/obj/item/bodypart/bodypart as anything in carbon_owner.bodyparts) + if(!(bodypart.bodytype & BODYTYPE_GHOST)) + bodypart.drop_limb(special = FALSE, dismembered = FALSE, move_to_floor = TRUE) + for(var/obj/item/organ/organ as anything in carbon_owner.organs) + if(!(organ.organ_flags & ORGAN_GHOST)) + organ.Remove(owner, special = FALSE) + + if(HAS_TRAIT_FROM(carbon_owner, TRAIT_NO_FLOATING_ANIM, SPECIES_TRAIT)) + REMOVE_TRAIT(carbon_owner, TRAIT_NO_FLOATING_ANIM, SPECIES_TRAIT) + carbon_owner.add_traits(list( TRAIT_MOVE_PHASING, TRAIT_PIERCEIMMUNE, TRAIT_INVISIBLE_TO_CAMERA, TRAIT_HANDS_BLOCKED, //MOBILITY_USE | MOBILITY_PICKUP | MOBILITY_STORAGE TRAIT_PULL_BLOCKED, //MOBILITY_PULL TRAIT_UI_BLOCKED, //MOBILITY_UI - ), SPECIES_TRAIT) - RegisterSignal(owner, COMSIG_LIVING_DEATH, PROC_REF(on_owner_died)) + ), SPECIES_TRAIT) + carbon_species.update_no_equip_flags(carbon_owner, ALL) + RegisterSignal(carbon_owner, COMSIG_MOB_CLIENT_PRE_LIVING_MOVE, PROC_REF(attempt_move)) else - qdel(owner.GetComponent(/datum/component/leash)) - owner.forceMove(get_turf(grave)) - grave.moveToNullspace() - ADD_TRAIT(owner, TRAIT_NO_FLOATING_ANIM, SPECIES_TRAIT) - owner.remove_traits(list( + ADD_TRAIT(carbon_owner, TRAIT_NO_FLOATING_ANIM, SPECIES_TRAIT) + carbon_owner.remove_traits(list( TRAIT_MOVE_PHASING, TRAIT_PIERCEIMMUNE, TRAIT_INVISIBLE_TO_CAMERA, TRAIT_HANDS_BLOCKED, TRAIT_PULL_BLOCKED, TRAIT_UI_BLOCKED, - ), SPECIES_TRAIT) - UnregisterSignal(owner, COMSIG_LIVING_DEATH) + ), SPECIES_TRAIT) + carbon_species.update_no_equip_flags(carbon_owner, initial(carbon_species.no_equip_flags)) + UnregisterSignal(carbon_owner, COMSIG_MOB_CLIENT_PRE_LIVING_MOVE) -/datum/action/innate/toggle_passthrough/proc/on_owner_died(mob/living/owner) +///Called when attempting to move to a new tile while the action is active, returns to cancel moving. +/datum/action/innate/toggle_passthrough/proc/attempt_move(mob/source, new_loc, direct) SIGNAL_HANDLER - swap_mode(force_off = TRUE) - -///Called when the contents are made, which means the grave has been 'opened', therefore robbed. -/datum/action/innate/toggle_passthrough/proc/on_grave_robbed(obj/structure/closet/crate/grave/skeleton/source) - SIGNAL_HANDLER - var/mob/living/carbon/human/species/skeleton/skeletons_in_the_closet = locate() in source.contents - skeletons_in_the_closet.real_name = owner.real_name - skeletons_in_the_closet.name = owner.name - - if (owner.mind?.active) - owner.mind?.transfer_to(skeletons_in_the_closet, force_key_move = TRUE) - skeletons_in_the_closet.death(gibbed = TRUE) // This is a lie, but it stops the skeleton from deathgasping as if it only just died - - if (isliving(owner)) // You know just in case we give an observer the crazy ability to walk through walls - var/mob/living/living_owner = owner - living_owner.forceMove(source) - living_owner.unequip_everything() - -///Called AFTER the contents have been spit out, which means the owner is now in the skeleton. Let's clean up. -/datum/action/innate/toggle_passthrough/proc/post_grave_robbed(obj/structure/closet/crate/grave/skeleton/source) - SIGNAL_HANDLER - qdel(owner) + if(locate(/obj/effect/blessing) in new_loc) + to_chat(source, span_warning("Holy energies block your path!")) + return COMSIG_MOB_CLIENT_BLOCK_PRE_LIVING_MOVE diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index 493540162b5..23e3554d170 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -66,6 +66,7 @@ RegisterSignal(human_who_gained_species, COMSIG_CARBON_DEFIB_HEART_CHECK, PROC_REF(defib_check)) RegisterSignal(human_who_gained_species, COMSIG_ATOM_ITEM_INTERACTION, PROC_REF(rebuild_check)) RegisterSignal(human_who_gained_species, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(human_who_gained_species, COMSIG_LIVING_LIFE, PROC_REF(on_life)) // nutrition = health, so give people a head start human_who_gained_species.set_nutrition(NUTRITION_LEVEL_WELL_FED) @@ -81,14 +82,16 @@ COMSIG_CARBON_DEFIB_HEART_CHECK, COMSIG_ATOM_ITEM_INTERACTION, COMSIG_ATOM_EXAMINE, + COMSIG_LIVING_LIFE, )) human_who_lost_species.physiology.stamina_mod /= 0.6 human_who_lost_species.physiology.stun_mod /= 0.6 human_who_lost_species.physiology.knockdown_mod /= 1.2 -/datum/species/golem/spec_life(mob/living/carbon/human/source, seconds_per_tick) - . = ..() +/datum/species/golem/proc/on_life(mob/living/carbon/human/source, seconds_per_tick) + SIGNAL_HANDLER + if(source.nutrition <= 20) // this is "hard crit" for golems source.Unconscious(1.5 SECONDS * seconds_per_tick) diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index 5868244888f..03f69d035c6 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -223,7 +223,10 @@ // so if someone mindswapped into them, they'd still be shared. bodies = null C.set_blood_volume(C.get_blood_volume(), maximum = BLOOD_VOLUME_NORMAL) - UnregisterSignal(C, COMSIG_LIVING_DEATH) + UnregisterSignal(C, list( + COMSIG_LIVING_DEATH, + COMSIG_LIVING_LIFE, + )) ..() /datum/species/jelly/slime/on_species_gain(mob/living/carbon/C, datum/species/old_species, pref_load, regenerate_icons) @@ -240,6 +243,7 @@ bodies |= C RegisterSignal(C, COMSIG_LIVING_DEATH, PROC_REF(on_death_move_body)) + RegisterSignal(C, COMSIG_LIVING_LIFE, PROC_REF(on_life)) /datum/species/jelly/slime/proc/on_death_move_body(mob/living/carbon/human/source, gibbed) SIGNAL_HANDLER @@ -263,16 +267,16 @@ /datum/species/jelly/slime/copy_properties_from(datum/species/jelly/slime/old_species) bodies = old_species.bodies -/datum/species/jelly/slime/spec_life(mob/living/carbon/human/H, seconds_per_tick) - . = ..() - if(H.get_blood_volume() >= BLOOD_VOLUME_SLIME_SPLIT) +/datum/species/jelly/slime/proc/on_life(mob/living/carbon/human/source, seconds_per_tick) + SIGNAL_HANDLER + if(source.get_blood_volume() >= BLOOD_VOLUME_SLIME_SPLIT) if(SPT_PROB(2.5, seconds_per_tick)) - to_chat(H, span_notice("You feel very bloated!")) + to_chat(source, span_notice("You feel very bloated!")) - else if(H.nutrition >= NUTRITION_LEVEL_WELL_FED) - H.adjust_blood_volume(1.5 * seconds_per_tick) - if(H.get_blood_volume() <= BLOOD_VOLUME_LOSE_NUTRITION) - H.adjust_nutrition(-1.25 * seconds_per_tick) + else if(source.nutrition >= NUTRITION_LEVEL_WELL_FED) + source.adjust_blood_volume(1.5 * seconds_per_tick) + if(source.get_blood_volume() <= BLOOD_VOLUME_LOSE_NUTRITION) + source.adjust_nutrition(-1.25 * seconds_per_tick) /datum/action/innate/split_body name = "Split Body" diff --git a/code/modules/mob/living/carbon/human/species_types/mothmen.dm b/code/modules/mob/living/carbon/human/species_types/mothmen.dm index 40dc7be3325..2592d9c287c 100644 --- a/code/modules/mob/living/carbon/human/species_types/mothmen.dm +++ b/code/modules/mob/living/carbon/human/species_types/mothmen.dm @@ -27,20 +27,6 @@ BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/moth, ) -/datum/species/moth/on_species_gain(mob/living/carbon/human/human_who_gained_species, datum/species/old_species, pref_load, regenerate_icons) - . = ..() - RegisterSignal(human_who_gained_species, COMSIG_ATOM_ATTACKBY, PROC_REF(on_attackby)) - -/datum/species/moth/on_species_loss(mob/living/carbon/human/C, datum/species/new_species, pref_load) - . = ..() - UnregisterSignal(C, COMSIG_ATOM_ATTACKBY) - -/datum/species/moth/proc/on_attackby(mob/living/source, obj/item/attacking_item, mob/living/attacker, list/modifiers, list/attack_modifiers) - SIGNAL_HANDLER - - if(istype(attacking_item, /obj/item/melee/flyswatter)) - MODIFY_ATTACK_FORCE_MULTIPLIER(attack_modifiers, 10) // Yes, a 10x damage modifier - /datum/species/moth/randomize_features() var/list/features = ..() features[FEATURE_MOTH_MARKINGS] = pick(SSaccessories.feature_list[FEATURE_MOTH_MARKINGS]) diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm index 4b990a65949..2989fb95a7d 100644 --- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm +++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm @@ -67,9 +67,6 @@ /datum/outfit/syndicate/full/loneop = /datum/outfit/syndicate/full/plasmaman/loneop, ) - /// If the bones themselves are burning clothes won't help you much - var/internal_fire = FALSE - /datum/species/plasmaman/pre_equip_species_outfit(datum/job/job, mob/living/carbon/human/equipping, visuals_only = FALSE) if(job?.plasmaman_outfit) equipping.equipOutfit(job.plasmaman_outfit, visuals_only) diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm index 6013c6d2b92..fa31d7a89cf 100644 --- a/code/modules/mob/living/carbon/human/species_types/vampire.dm +++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm @@ -31,19 +31,23 @@ . = ..() to_chat(new_vampire, "[info_text]") new_vampire.skin_tone = "albino" - new_vampire.update_body(0) RegisterSignal(new_vampire, COMSIG_ATOM_ATTACKBY, PROC_REF(on_attackby)) RegisterSignal(new_vampire, COMSIG_MOB_HUD_CREATED, PROC_REF(on_hud_created)) + RegisterSignal(new_vampire, COMSIG_LIVING_LIFE, PROC_REF(on_life)) if(new_vampire.hud_used) on_hud_created(new_vampire) /datum/species/human/vampire/on_species_loss(mob/living/carbon/human/old_vampire, datum/species/new_species, pref_load) . = ..() - UnregisterSignal(old_vampire, COMSIG_ATOM_ATTACKBY) + UnregisterSignal(old_vampire, list( + COMSIG_ATOM_ATTACKBY, + COMSIG_MOB_HUD_CREATED, + COMSIG_LIVING_LIFE, + )) old_vampire.hud_used?.remove_screen_object(HUD_MOB_BLOOD_LEVEL) -/datum/species/human/vampire/spec_life(mob/living/carbon/human/vampire, seconds_per_tick) - . = ..() +/datum/species/human/vampire/proc/on_life(mob/living/carbon/human/vampire, seconds_per_tick) + SIGNAL_HANDLER if(istype(vampire.loc, /obj/structure/closet/crate/coffin)) var/need_mob_update = FALSE need_mob_update += vampire.heal_overall_damage(brute = 2 * seconds_per_tick, burn = 2 * seconds_per_tick, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC) @@ -156,7 +160,6 @@ icon_state = "tongue_vampire" actions_types = list(/datum/action/item_action/organ_action/vampire) organ_traits = list( - TRAIT_SPEAKS_CLEARLY, TRAIT_DRINKS_BLOOD, // future todo : tie nobreath and nohunger to a vampire organ set bonus TRAIT_NOBREATH, diff --git a/code/modules/mob/living/carbon/human/species_types/zombies.dm b/code/modules/mob/living/carbon/human/species_types/zombies.dm index 66164a06a93..c2726d5ab0d 100644 --- a/code/modules/mob/living/carbon/human/species_types/zombies.dm +++ b/code/modules/mob/living/carbon/human/species_types/zombies.dm @@ -47,15 +47,6 @@ BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/zombie ) - /// Spooky growls we sometimes play while alive - var/static/list/spooks = list( - 'sound/effects/hallucinations/growl1.ogg', - 'sound/effects/hallucinations/growl2.ogg', - 'sound/effects/hallucinations/growl3.ogg', - 'sound/effects/hallucinations/veryfar_noise.ogg', - 'sound/effects/hallucinations/wail.ogg', - ) - /// Zombies do not stabilize body temperature they are the walking dead and are cold blooded /datum/species/zombie/body_temperature_core(mob/living/carbon/human/humi, seconds_per_tick) return @@ -178,11 +169,6 @@ /datum/species/zombie/infectious/spec_stun(mob/living/carbon/human/H,amount) return min(2 SECONDS, amount) -/datum/species/zombie/infectious/spec_life(mob/living/carbon/carbon_mob, seconds_per_tick) - . = ..() - if(!HAS_TRAIT(carbon_mob, TRAIT_CRITICAL_CONDITION) && SPT_PROB(2, seconds_per_tick)) - playsound(carbon_mob, pick(spooks), 50, TRUE, 10) - // Weaker subtype - less healing, weaker attacks, etc /datum/species/zombie/infectious/mindless name = "Mindless Infectious Zombie" diff --git a/code/modules/mob/living/carbon/inventory.dm b/code/modules/mob/living/carbon/inventory.dm index 34c6e104e29..fcf292496f2 100644 --- a/code/modules/mob/living/carbon/inventory.dm +++ b/code/modules/mob/living/carbon/inventory.dm @@ -112,8 +112,7 @@ if(equipping.pulledby) equipping.pulledby.stop_pulling() - equipping.screen_loc = null - client?.screen -= equipping + hud_used?.update_inventory_slot(slot) for(var/mob/dead/observe as anything in observers) observe.client?.screen -= equipping @@ -172,7 +171,9 @@ if(!(slot & item.slot_flags)) // Things below only update if slotted in (ie: not held) return if(item.hair_mask) - update_body() + LAZYADD(hair_masks, item.hair_mask) + update_hair() + update_body() // this is solely for lizard frills add_item_coverage(item) /mob/living/carbon/has_unequipped(obj/item/item) @@ -182,7 +183,9 @@ hud_used?.update_locked_slots() if(item.hair_mask) - update_body() + LAZYREMOVE(hair_masks, item.hair_mask) + update_hair() + update_body() // this is solely for lizard frills remove_item_coverage(item) /mob/living/carbon/doUnEquip(obj/item/item_dropping, force, newloc, no_move, invdrop = TRUE, silent = FALSE) @@ -256,8 +259,17 @@ * * removed_slots - slots that were removed from obscured_slots */ /mob/living/carbon/proc/item_coverage_changed(added_slots, removed_slots) + SEND_SIGNAL(src, COMSIG_CARBON_ITEM_COVERAGE_CHANGED, added_slots, removed_slots) update_clothing(hidden_slots_to_inventory_slots(added_slots|removed_slots)) - if((added_slots|removed_slots) & (HIDEJUMPSUIT|HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT|HIDEMUTWINGS|HIDEANTENNAE)) + if((added_slots|removed_slots) & HIDESNOUT) + synchronize_bodyshapes() + if((added_slots|removed_slots) & (HIDEHAIR|HIDEFACIALHAIR)) + update_hair() + if((added_slots|removed_slots) & HIDEEYES) + update_eyes() + // HIDEJUMPSUIT is for digitigrade legs, HIDEEARS is for lizard frills, HIDEHAIR is for felinid ears and lizard horns, the others should be obvious + // future todo; we should collect a list of all bodypart overlays and what conceals/reveals them dynamically, rather than hardcoding this + if((added_slots|removed_slots) & (HIDEJUMPSUIT|HIDEEARS|HIDEHAIR|HIDESNOUT|HIDEMUTWINGS|HIDEANTENNAE)) update_body() /// Returns the helmet if an air tank compatible helmet is equipped. @@ -444,6 +456,8 @@ for(var/obj/item/worn_item in get_equipped_items(INCLUDE_ABSTRACT)) if(worn_item.slot_flags & exluded_equipment_slots) continue + if(worn_item.flags_cover & ALLOW_SURGERY_THROUGH) + continue covered_flags |= worn_item.body_parts_covered // NB: we have to convert covered_flags via cover_flags2body_zones here diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index e5d8589b310..3d5001424fe 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -13,6 +13,9 @@ if(HAS_TRAIT(src, TRAIT_STASIS)) . = ..() + if(QDELETED(src)) + return + reagents?.handle_stasis_chems(src, seconds_per_tick) else //Reagent processing needs to come before breathing, to prevent edge cases. @@ -31,9 +34,6 @@ GLOB.addictions[key].process_addiction(src, seconds_per_tick) handle_brain_damage(seconds_per_tick) - if(stat != DEAD) - handle_bodyparts(seconds_per_tick) - if(stat != DEAD) return TRUE @@ -523,10 +523,6 @@ return COMPONENT_NO_EXPOSE_REAGENTS -/mob/living/carbon/proc/handle_bodyparts(seconds_per_tick) - for(var/obj/item/bodypart/limb as anything in get_bodyparts(include_stumps = TRUE)) - . |= limb.on_life(seconds_per_tick) - /mob/living/carbon/proc/handle_organs(seconds_per_tick) if(stat == DEAD) if(reagents && (reagents.has_reagent(/datum/reagent/toxin/formaldehyde, 1) || reagents.has_reagent(/datum/reagent/cryostylane))) // No organ decay if the body contains formaldehyde. @@ -558,48 +554,20 @@ if(organ?.owner) // This exist mostly because reagent metabolization can cause organ reshuffling organ.on_life(seconds_per_tick) -/mob/living/carbon/handle_diseases(seconds_per_tick) - for(var/datum/disease/disease as anything in diseases) - if(QDELETED(disease)) //Got cured/deleted while the loop was still going. - continue - if(stat != DEAD || disease.process_dead) - disease.stage_act(seconds_per_tick) +/** + * Returns a multiplier representing how effectively this mob can regenerate blood + * + * A return value of 0 means the mob cannot regenerate blood at all. (missing heart or the heart has stopped or is failing) + * Mobs that do not require a heart always return 1, as their blood regeneration is unaffected by heart status. + */ +/mob/living/carbon/proc/get_heart_blood_regeneration_multiplier() + if(!needs_heart()) + return 1 + var/obj/item/organ/heart/heart = get_organ_slot(ORGAN_SLOT_HEART) + if(isnull(heart)) + return 0 -/mob/living/carbon/handle_mutations(time_since_irradiated, seconds_per_tick) - if(!LAZYLEN(dna?.temporary_mutations)) - return - - for(var/mut, mut_data in dna.temporary_mutations) - if(mut_data < world.time) - if(!LAZYLEN(dna.previous)) - continue - if(mut == UI_CHANGED) - if(dna.previous["UI"]) - dna.unique_identity = merge_text(dna.unique_identity,dna.previous["UI"]) - updateappearance(mutations_overlay_update=1) - dna.previous.Remove("UI") - LAZYREMOVE(dna.temporary_mutations, mut) - continue - if(mut == UF_CHANGED) - if(dna.previous["UF"]) - dna.unique_features = merge_text(dna.unique_features,dna.previous["UF"]) - updateappearance(mutcolor_update=1, mutations_overlay_update=1) - dna.previous.Remove("UF") - LAZYREMOVE(dna.temporary_mutations, mut) - continue - if(mut == UE_CHANGED) - if(dna.previous["name"]) - real_name = dna.previous["name"] - name = real_name - dna.previous.Remove("name") - if(dna.previous["UE"]) - dna.unique_enzymes = dna.previous["UE"] - dna.previous.Remove("UE") - if(dna.previous["blood_type"]) - set_blood_type(dna.previous["blood_type"]) - dna.previous.Remove("blood_type") - LAZYREMOVE(dna.temporary_mutations, mut) - continue + return heart.get_blood_regeneration_multiplier() /** * Handles calling metabolization for dead people. diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm index cac2c109e9f..0c0863f39d3 100644 --- a/code/modules/mob/living/death.dm +++ b/code/modules/mob/living/death.dm @@ -232,7 +232,7 @@ set_stat(DEAD) timeofdeath = world.time - station_timestamp_timeofdeath = station_time_timestamp() + station_timestamp_timeofdeath = round_timestamp() var/turf/death_turf = get_turf(src) var/area/death_area = get_area(src) // Display a death message if the mob is a player mob (has an active mind) diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index dc50f5ec56c..178679bfc91 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -13,7 +13,7 @@ set waitfor = FALSE SHOULD_NOT_SLEEP(TRUE) - var/signal_result = SEND_SIGNAL(src, COMSIG_LIVING_LIFE, seconds_per_tick) + var/signal_result = SEND_SIGNAL(src, COMSIG_LIVING_PRE_LIFE, seconds_per_tick) if(signal_result & COMPONENT_LIVING_CANCEL_LIFE_PROCESSING) // mmm less work return @@ -41,18 +41,15 @@ if(isnull(loc) || HAS_TRAIT(src, TRAIT_NO_TRANSFORM)) return + SEND_SIGNAL(src, COMSIG_LIVING_LIFE, seconds_per_tick) + if(QDELETED(src)) // signal handlers such as diseases could delete the mob + return + if(!HAS_TRAIT(src, TRAIT_STASIS)) if(stat != DEAD) - //Mutations and radiation - handle_mutations(seconds_per_tick) //Breathing, if applicable handle_breathing(seconds_per_tick) - handle_diseases(seconds_per_tick) // DEAD check is in the proc itself; we want it to spread even if the mob is dead, but to handle its disease-y properties only if you're not. - - if (QDELETED(src)) // Diseases can qdel the mob via transformations - return - // Handle temperature/pressure differences between body and environment var/datum/gas_mixture/environment = loc.return_air() if(environment) @@ -64,21 +61,15 @@ update_nutrition() living_flags &= ~QUEUE_NUTRITION_UPDATE - if (living_flags & BLOOD_UPDATE_QUEUED) + if(living_flags & BLOOD_UPDATE_QUEUED) update_blood_effects() + living_flags &= ~BLOOD_UPDATE_QUEUED if(stat != DEAD) return TRUE /mob/living/proc/handle_breathing(seconds_per_tick) SEND_SIGNAL(src, COMSIG_LIVING_HANDLE_BREATHING, seconds_per_tick) - return - -/mob/living/proc/handle_mutations(seconds_per_tick) - return - -/mob/living/proc/handle_diseases(seconds_per_tick) - return // Base mob environment handler for body temperature /mob/living/proc/handle_environment(datum/gas_mixture/environment, seconds_per_tick) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 0299bfb2eea..20bec83bfff 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -13,6 +13,8 @@ var/datum/atom_hud/data/diagnostic/diag_hud = GLOB.huds[DATA_HUD_DIAGNOSTIC] diag_hud.add_atom_to_hud(src) add_ally(src) + if(!pull_force) + remove_verb(src, /mob/living/verb/pulled) GLOB.mob_living_list += src SSpoints_of_interest.make_point_of_interest(src) update_fov() @@ -539,14 +541,11 @@ //mob verbs are a lot faster than object verbs //for more info on why this is not atom/pull, see examinate() in mob.dm -/mob/living/verb/pulled(atom/movable/AM as mob|obj in oview(1)) +/mob/living/verb/pulled(atom/movable/thing_pulled as mob|obj in oview(1)) set name = "Pull" - set category = "IC" - if(istype(AM) && Adjacent(AM)) - start_pulling(AM) - else if(!combat_mode) //Don;'t cancel pulls if misclicking in combat mode. - stop_pulling() + if(istype(thing_pulled) && Adjacent(thing_pulled)) + start_pulling(thing_pulled) /mob/living/stop_pulling() if(ismob(pulling)) @@ -555,11 +554,6 @@ update_pull_movespeed() update_pull_hud_icon() -/mob/living/verb/stop_pulling1() - set name = "Stop Pulling" - set category = "IC" - stop_pulling() - //same as above /mob/living/pointed(atom/A) if(INCAPACITATED_IGNORING(src, INCAPABLE_RESTRAINTS)) @@ -635,7 +629,7 @@ /mob/living/proc/mob_sleep() set name = "Sleep" - set category = "IC" + set hidden = TRUE if(IsSleeping()) to_chat(src, span_warning("You are already sleeping!")) @@ -690,9 +684,6 @@ return account /mob/living/proc/toggle_resting() - set name = "Rest" - set category = "IC" - set_resting(!resting, FALSE) @@ -1188,10 +1179,7 @@ return FALSE return TRUE -/mob/living/verb/resist() - set name = "Resist" - set category = "IC" - +/mob/living/proc/resist() DEFAULT_QUEUE_OR_CALL_VERB(VERB_CALLBACK(src, PROC_REF(execute_resist))) ///proc extender of [/mob/living/verb/resist] meant to make the process queable if the server is overloaded when the verb is called @@ -1528,7 +1516,7 @@ if(shown_stamina_loss >= stam_crit_threshold) stamina.icon_state = "stamina_crit" else if(shown_stamina_loss > 0 && maxHealth > 0) - stamina.icon_state = "stamina_[6 - ceil(shown_stamina_loss / (maxHealth * 0.2))]" + stamina.icon_state = "stamina_[ceil(shown_stamina_loss / (maxHealth * 0.2))]" else stamina.icon_state = "stamina_full" @@ -1613,7 +1601,7 @@ /mob/living/basic/bot/dedbot = 25, /mob/living/basic/bot/cleanbot = 25, /mob/living/basic/bot/firebot = 25, - /mob/living/basic/bot/honkbot = 25, + /mob/living/basic/bot/secbot/honkbot = 25, /mob/living/basic/bot/hygienebot = 25, /mob/living/basic/bot/vibebot = 25, /mob/living/basic/bot/medbot = 13, @@ -1665,6 +1653,7 @@ /mob/living/basic/bear/russian, /mob/living/basic/blob_minion/blobbernaut, /mob/living/basic/blob_minion/spore, + /mob/living/basic/blood_worm/hatchling/polymorph, /mob/living/basic/butterfly, /mob/living/basic/carp, /mob/living/basic/carp/mega, @@ -2178,6 +2167,13 @@ GLOBAL_LIST_EMPTY(fire_appearances) return FALSE update_transform(var_value/current_size) . = TRUE + if(NAMEOF(src, pull_force)) + if(var_value == 0) //no more pulling + remove_verb(src, /mob/living/verb/pulled) + else + add_verb(src, /mob/living/verb/pulled) + . = TRUE + if(!isnull(.)) datum_flags |= DF_VAR_EDITED @@ -2488,7 +2484,7 @@ GLOBAL_LIST_EMPTY(fire_appearances) return if(. <= UNCONSCIOUS || new_stat >= UNCONSCIOUS) - update_body() // to update eyes + update_eyes() switch(.) //Previous stat. if(CONSCIOUS) @@ -3019,10 +3015,7 @@ GLOBAL_LIST_EMPTY(fire_appearances) log_admin("[key_name(admin)] gave a guardian spirit controlled by [guardian_client] to [src].") BLACKBOX_LOG_ADMIN_VERB("Give Guardian Spirit") -/mob/living/verb/lookup() - set name = "Look Up" - set category = "IC" - +/mob/living/proc/lookup() if(looking_vertically) to_chat(src, "You set your head straight again.") end_look() @@ -3039,10 +3032,7 @@ GLOBAL_LIST_EMPTY(fire_appearances) to_chat(src, "You tilt your head upwards.") look_up() -/mob/living/verb/lookdown() - set name = "Look Down" - set category = "IC" - +/mob/living/proc/lookdown() if(looking_vertically) to_chat(src, "You set your head straight again.") end_look() diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index c4635ca4fda..c657807855f 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -595,7 +595,7 @@ shock_damage *= siemens_coeff if((flags & SHOCK_TESLA) && HAS_TRAIT(src, TRAIT_TESLA_SHOCKIMMUNE)) return FALSE - if(HAS_TRAIT(src, TRAIT_SHOCKIMMUNE)) + if(!(flags & SHOCK_IGNORE_IMMUNITY) && HAS_TRAIT(src, TRAIT_SHOCKIMMUNE)) return FALSE if(shock_damage < 1) return FALSE diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm index f6e01ba27be..7ab41448918 100644 --- a/code/modules/mob/living/living_defines.dm +++ b/code/modules/mob/living/living_defines.dm @@ -262,3 +262,7 @@ /// Lazy assoc list of currently applied fishing difficulty modifiers keyed to their source var/list/fishing_difficulty_mods_by_source + + /// When less than or equal to this distance (but not adjacent), this mob can hear parts of distant whispers, but not the entire message. + /// When greater than this distance, this mob cannot hear anything of a whisper. + var/eavesdrop_range = EAVESDROP_EXTRA_RANGE diff --git a/code/modules/mob/living/living_movement.dm b/code/modules/mob/living/living_movement.dm index 5bad5247f49..9a4fbfd83cf 100644 --- a/code/modules/mob/living/living_movement.dm +++ b/code/modules/mob/living/living_movement.dm @@ -46,7 +46,7 @@ return update_gravity(gravity_state) - + SEND_SIGNAL(src, COMSIG_LIVING_GRAVITY_CHANGED, gravity_state, old_grav_state) if(gravity_state > STANDARD_GRAVITY) gravity_animate() else if(old_grav_state > STANDARD_GRAVITY) diff --git a/code/modules/mob/living/living_say.dm b/code/modules/mob/living/living_say.dm index e89e08f0862..a051486c0c9 100644 --- a/code/modules/mob/living/living_say.dm +++ b/code/modules/mob/living/living_say.dm @@ -301,13 +301,13 @@ GLOBAL_LIST_INIT(message_modes_stat_limits, list( var/message = "" // if someone is whispering we make an extra type of message that is obfuscated for people out of range - // Less than or equal to 0 means normal hearing. More than 0 and less than or equal to EAVESDROP_EXTRA_RANGE means - // partial hearing. More than EAVESDROP_EXTRA_RANGE means no hearing. Exception for GOOD_HEARING trait + // Less than or equal to 0 means normal hearing. More than 0 and less than or equal to eavesdrop_range means + // partial hearing. More than eavesdrop_range means no hearing. Exception for GOOD_HEARING trait var/dist = get_dist(speaker, src) - message_range - if(dist > 0 && dist <= EAVESDROP_EXTRA_RANGE && !HAS_TRAIT(src, TRAIT_GOOD_HEARING)) + if(dist > 0 && dist <= eavesdrop_range && !HAS_TRAIT(src, TRAIT_GOOD_HEARING)) raw_message = stars(raw_message) var/speaker_name = span_name("[message_mods[MODE_SPEAKER_NAME_OVERRIDE] || speaker]") - if(message_range != INFINITY && dist > EAVESDROP_EXTRA_RANGE && !HAS_TRAIT(src, TRAIT_GOOD_HEARING)) + if(message_range != INFINITY && dist > eavesdrop_range && !HAS_TRAIT(src, TRAIT_GOOD_HEARING)) // Too far away and don't have good hearing, you can't hear anything if(is_blind() || HAS_TRAIT(speaker, TRAIT_INVISIBLE_MAN)) // Can't see them speak either return FALSE diff --git a/code/modules/mob/living/navigation.dm b/code/modules/mob/living/navigation.dm index dcaee5b0945..c63b4594b65 100644 --- a/code/modules/mob/living/navigation.dm +++ b/code/modules/mob/living/navigation.dm @@ -10,7 +10,7 @@ /mob/living/verb/navigate() set name = "Navigate" - set category = "IC" + set hidden = TRUE if(incapacitated) return diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 6b15e3e695e..756ef0dea36 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -97,6 +97,7 @@ RegisterSignal(ai_tracking_tool, COMSIG_TRACKABLE_GLIDE_CHANGED, PROC_REF(tracked_glidesize_changed)) add_traits(list(TRAIT_PULL_BLOCKED, TRAIT_AI_ACCESS, TRAIT_HANDS_BLOCKED, TRAIT_CAN_GET_AI_TRACKING_MESSAGE, TRAIT_LOUD_BINARY), INNATE_TRAIT) + AddElement(/datum/element/block_area_power_fail) //Heads up to other binary chat listeners that a new AI is online and listening to Binary. if(announce_init_to_others && !is_centcom_level(z)) //Skip new syndicate AIs and also new AIs on centcom Z @@ -1084,16 +1085,10 @@ end_multicam() /mob/living/silicon/ai/up() - set name = "Move Upwards" - set category = "IC" - if(eyeobj.zMove(UP, z_move_flags = ZMOVE_FEEDBACK)) to_chat(src, span_notice("You move upwards.")) /mob/living/silicon/ai/down() - set name = "Move Down" - set category = "IC" - if(eyeobj.zMove(DOWN, z_move_flags = ZMOVE_FEEDBACK)) to_chat(src, span_notice("You move down.")) diff --git a/code/modules/mob/living/silicon/ai/freelook/chunk.dm b/code/modules/mob/living/silicon/ai/freelook/chunk.dm index 04281f0b762..3068b3342c1 100644 --- a/code/modules/mob/living/silicon/ai/freelook/chunk.dm +++ b/code/modules/mob/living/silicon/ai/freelook/chunk.dm @@ -50,7 +50,9 @@ seenby -= eye var/client/client = eye.GetViewerClient() - if(client && eye.use_visibility && seenby.len == 0) + // Bandaid fix for AI multicamera. Static disappears on other cameras when focused camera is far away. + // seenby.len check fixes that, but prevents static removal for those, who exit camera console, when a chunk was observed by 2 or more eye mobs. + if(client && eye.use_visibility && (seenby.len == 0 || (isliving(client.mob) && !isAI(client.mob)))) // Bypass for non-AIs, to unsure static removal. client.images -= active_static_images /** diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm index 30790c176b5..e5e3e6f867d 100644 --- a/code/modules/mob/living/silicon/robot/inventory.dm +++ b/code/modules/mob/living/silicon/robot/inventory.dm @@ -73,23 +73,6 @@ deselect_module(module_num) playsound_local(src, SFX_RUSTLE, 40, TRUE) -/mob/living/silicon/robot/update_held_items() - . = ..() - if(isnull(client) || isnull(hud_used) || hud_used.hud_version == HUD_STYLE_NOHUD) - return - - var/turf/our_turf = get_turf(src) - for (var/held_index in 1 to length(held_items)) - var/obj/item/held = held_items[held_index] - if (!held) - continue - SET_PLANE(held, ABOVE_HUD_PLANE, our_turf) - var/atom/movable/screen/robot/module_slot/slot = hud_used.screen_objects[HUD_KEY_CYBORG_MODULE(held_index)] - if (!slot) //?? - continue - held.screen_loc = slot.screen_loc - client.screen |= held - /mob/living/silicon/robot/put_in_hand_check(obj/item/item_equipping) return (item_equipping in model.modules) @@ -143,7 +126,7 @@ audible_message(span_warning("[src] sounds an alarm! \"SYSTEM ERROR: Module [module_num] OFFLINE.\"")) to_chat(src, span_userdanger("SYSTEM ERROR: Module [module_num] OFFLINE.")) - var/atom/movable/screen/robot/module_slot/module = hud_used?.screen_objects[HUD_KEY_CYBORG_MODULE(module_num)] + var/atom/movable/screen/robot/module_slot/module = hud_used?.screen_objects[HUD_KEY_HAND_SLOT(module_num)] if(module) module.icon_state = "[module.base_icon_state] +b" return TRUE @@ -188,7 +171,7 @@ disabled_modules &= ~BORG_MODULE_THREE_DISABLED to_chat(src, span_notice("ERROR CLEARED: Module [module_num] back online.")) - var/atom/movable/screen/robot/module_slot/module = hud_used?.screen_objects[HUD_KEY_CYBORG_MODULE(module_num)] + var/atom/movable/screen/robot/module_slot/module = hud_used?.screen_objects[HUD_KEY_HAND_SLOT(module_num)] if(module) module.icon_state = module.base_icon_state return TRUE @@ -270,10 +253,11 @@ if(is_invalid_module_number(module_num) || !held_items[module_num]) //If the slot number is invalid, or there's nothing there, we have nothing to equip return FALSE - var/atom/movable/screen/robot/module_slot/module = hud_used?.screen_objects[HUD_KEY_CYBORG_MODULE(module_num)] + var/atom/movable/screen/robot/module_slot/module = hud_used?.screen_objects[HUD_KEY_HAND_SLOT(module_num)] if(module && module_active != held_items[module_num]) module.icon_state = "[module.base_icon_state] +a" module_active = held_items[module_num] + SEND_SIGNAL(module_active, COMSIG_SILICON_MODULE_ACTIVATION, TRUE) return TRUE /** @@ -282,9 +266,11 @@ * * module_num - the slot number being de-selected */ /mob/living/silicon/robot/proc/deselect_module(module_num) - var/atom/movable/screen/robot/module_slot/module = hud_used?.screen_objects[HUD_KEY_CYBORG_MODULE(module_num)] + var/atom/movable/screen/robot/module_slot/module = hud_used?.screen_objects[HUD_KEY_HAND_SLOT(module_num)] if(module) module.icon_state = module.base_icon_state + if(module_active) + SEND_SIGNAL(module_active, COMSIG_SILICON_MODULE_ACTIVATION, FALSE) module_active = null return TRUE diff --git a/code/modules/mob/living/silicon/robot/robot_model.dm b/code/modules/mob/living/silicon/robot/robot_model.dm index b39359c9bfe..261f862feb8 100644 --- a/code/modules/mob/living/silicon/robot/robot_model.dm +++ b/code/modules/mob/living/silicon/robot/robot_model.dm @@ -427,7 +427,6 @@ /obj/item/crowbar/cyborg/power, // Skyrat ADDITION - Combines Crowbar and Wirecutters into one /obj/item/multitool/cyborg, //Skyrat ADDITION - Adds multitool for easier access /obj/item/borg/cyborg_omnitool/engineering, - ///obj/item/borg/cyborg_omnitool/engineering, //Skyrat REMOVAL /obj/item/t_scanner, /obj/item/analyzer, /obj/item/holosign_creator/atmos, // Skyrat Edit - Adds Holofans to engineering borgos @@ -690,6 +689,9 @@ if(reagents.has_reagent(amount = 1, chemical_flags = REAGENT_CLEANS)) our_turf.wash(CLEAN_SCRUB) + var/datum/component/bloodysoles/bot/trackfilth = robot_owner.GetComponent(/datum/component/bloodysoles/bot) + if(trackfilth) + trackfilth.change_blood_amount(-trackfilth.total_bloodiness) reagents.expose(our_turf, TOUCH, min(1, 10 / reagents.total_volume)) // We use more water doing this then mopping @@ -1017,7 +1019,6 @@ /obj/item/pipe_dispenser, /obj/item/restraints/handcuffs/cable/zipties, /obj/item/extinguisher, - /obj/item/weldingtool/largetank/cyborg, /obj/item/analyzer, /obj/item/borg/cyborg_omnitool/engineering, /obj/item/borg/cyborg_omnitool/engineering, diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index d612d1cd336..3640d99a99a 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -489,7 +489,7 @@ create_modularInterface() var/mob/living/silicon/robot/robo = modularInterface.silicon_owner if(istype(robo)) - modularInterface.borglog += "[station_time_timestamp()] - [string]" + modularInterface.borglog += "[round_timestamp()] - [string]" var/datum/computer_file/program/robotact/program = modularInterface.get_robotact() if(program) var/datum/tgui/active_ui = SStgui.get_open_ui(src, program.computer) diff --git a/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm b/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm deleted file mode 100644 index ee7e53b7141..00000000000 --- a/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm +++ /dev/null @@ -1,146 +0,0 @@ -/mob/living/simple_animal/bot/secbot/grievous //This bot is powerful. If you managed to get 4 eswords somehow, you deserve this horror. Emag him for best results. - name = "General Beepsky" - desc = "Is that a secbot with four eswords in its arms...?" - icon = 'icons/mob/silicon/aibots.dmi' - icon_state = "grievous" - health = 150 - maxHealth = 150 - - baton_type = /obj/item/melee/energy/sword/saber - base_speed = 4 //he's a fast fucker - weapon_force = 30 - - var/block_chance = 50 - -/mob/living/simple_animal/bot/secbot/grievous/Initialize(mapload) - . = ..() - RegisterSignal(src, COMSIG_ATOM_PRE_BULLET_ACT, PROC_REF(block_bullets)) - -/mob/living/simple_animal/bot/secbot/grievous/toy //A toy version of general beepsky! - name = "Genewul Bweepskee" - desc = "An adorable looking secbot with four toy swords taped to its arms" - health = 50 - maxHealth = 50 - baton_type = /obj/item/toy/sword - weapon_force = 0 - -/mob/living/simple_animal/bot/secbot/grievous/proc/block_bullets(datum/source, obj/projectile/hitting_projectile) - SIGNAL_HANDLER - - if(stat != CONSCIOUS) - return NONE - - visible_message(span_warning("[source] deflects [hitting_projectile] with its energy swords!")) - playsound(source, 'sound/items/weapons/blade1.ogg', 50, TRUE) - return COMPONENT_BULLET_BLOCKED - -/mob/living/simple_animal/bot/secbot/grievous/on_entered(datum/source, atom/movable/AM) - . = ..() - if(ismob(AM) && AM == target) - visible_message(span_warning("[src] flails his swords and cuts [AM]!")) - playsound(src,'sound/mobs/non-humanoids/beepsky/beepskyspinsabre.ogg',100,TRUE,-1) - INVOKE_ASYNC(src, PROC_REF(stun_attack), AM) - -/mob/living/simple_animal/bot/secbot/grievous/Initialize(mapload) - . = ..() - INVOKE_ASYNC(weapon, TYPE_PROC_REF(/obj/item, attack_self), src) - -/mob/living/simple_animal/bot/secbot/grievous/Destroy() - QDEL_NULL(weapon) - return ..() - -/mob/living/simple_animal/bot/secbot/grievous/special_retaliate_after_attack(mob/user) - if(mode != BOT_HUNT) - return - if(prob(block_chance)) - visible_message(span_warning("[src] deflects [user]'s attack with his energy swords!")) - playsound(src, 'sound/items/weapons/blade1.ogg', 50, TRUE, -1) - return TRUE - -/mob/living/simple_animal/bot/secbot/grievous/stun_attack(mob/living/carbon/C) //Criminals don't deserve to live - weapon.attack(C, src) - playsound(src, 'sound/items/weapons/blade1.ogg', 50, TRUE, -1) - if(C.stat == DEAD) - addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/, update_appearance)), 0.2 SECONDS) - back_to_idle() - - -/mob/living/simple_animal/bot/secbot/grievous/handle_automated_action() - if(!(bot_mode_flags & BOT_MODE_ON)) - return - switch(mode) - if(BOT_IDLE) // idle - update_appearance() - GLOB.move_manager.stop_looping(src) - look_for_perp() // see if any criminals are in range - if(!mode && bot_mode_flags & BOT_MODE_AUTOPATROL) // still idle, and set to patrol - mode = BOT_START_PATROL // switch to patrol mode - if(BOT_HUNT) // hunting for perp - update_appearance() - playsound(src,'sound/mobs/non-humanoids/beepsky/beepskyspinsabre.ogg',100,TRUE,-1) - // general beepsky doesn't give up so easily, jedi scum - if(frustration >= 20) - GLOB.move_manager.stop_looping(src) - back_to_idle() - return - if(target) // make sure target exists - if(Adjacent(target) && isturf(target.loc)) // if right next to perp - target_lastloc = target.loc //stun_attack() can clear the target if they're dead, so this needs to be set first - stun_attack(target) - set_anchored(TRUE) - return - else // not next to perp - var/turf/olddist = get_dist(src, target) - GLOB.move_manager.move_to(src, target, 1, 4) - if((get_dist(src, target)) >= (olddist)) - frustration++ - else - frustration = 0 - else - back_to_idle() - - if(BOT_START_PATROL) - look_for_perp() - start_patrol() - - if(BOT_PATROL) - look_for_perp() - bot_patrol() - -/mob/living/simple_animal/bot/secbot/grievous/look_for_perp() - set_anchored(FALSE) - var/judgement_criteria = judgement_criteria() - for (var/mob/living/carbon/C in view(7,src)) //Let's find us a criminal - if((C.stat) || (C.handcuffed)) - continue - - if((C.name == oldtarget_name) && (world.time < last_found + 100)) - continue - - threatlevel = C.assess_threat(judgement_criteria) - - if (threatlevel < THREAT_ASSESS_DANGEROUS) - continue - target = C - oldtarget_name = C.name - speak("Level [threatlevel] infraction alert!") - playsound(src, pick( - 'sound/mobs/non-humanoids/beepsky/criminal.ogg', - 'sound/mobs/non-humanoids/beepsky/justice.ogg', - 'sound/mobs/non-humanoids/beepsky/freeze.ogg', - ), 50, FALSE) - playsound(src,'sound/items/weapons/saberon.ogg',50,TRUE,-1) - visible_message(span_warning("[src] ignites his energy swords!")) - icon_state = "grievous-c" - visible_message("[src] points at [C.name]!") - mode = BOT_HUNT - INVOKE_ASYNC(src, PROC_REF(handle_automated_action)) - break - -/mob/living/simple_animal/bot/secbot/grievous/explode() - var/atom/Tsec = drop_location() - //Parent is dropping the weapon, so let's drop 3 more to make up for it. - for(var/dropped_weapons = 0 to 3) - drop_part(weapon, Tsec) - - return ..() diff --git a/code/modules/mob/living/simple_animal/bot/construction.dm b/code/modules/mob/living/simple_animal/bot/construction.dm index ec18b3d51ec..97b0753fcde 100644 --- a/code/modules/mob/living/simple_animal/bot/construction.dm +++ b/code/modules/mob/living/simple_animal/bot/construction.dm @@ -198,8 +198,8 @@ to_chat(user, span_notice("You start attaching the gun to the frame...")) if(!tool.use_tool(src, user, 40, volume=100)) return ITEM_INTERACT_BLOCKING - var/mob/living/simple_animal/bot/secbot/ed209/B = new(drop_location()) - B.name = created_name + var/mob/living/basic/bot/secbot/ed209/new_bot = new(drop_location()) + new_bot.name = created_name to_chat(user, span_notice("You complete the ED-209.")) qdel(src) return ITEM_INTERACT_SUCCESS @@ -347,7 +347,7 @@ if(!can_finish_build(tool, user)) return ITEM_INTERACT_BLOCKING to_chat(user, span_notice("You add the [tool] to [src]! Honk!")) - var/mob/living/basic/bot/honkbot/new_honkbot = new(drop_location()) + var/mob/living/basic/bot/secbot/honkbot/new_honkbot = new(drop_location()) new_honkbot.name = created_name playsound(new_honkbot, 'sound/machines/ping.ogg', 50, TRUE, -1) qdel(tool) @@ -437,10 +437,10 @@ if(!can_finish_build(tool, user)) return ITEM_INTERACT_BLOCKING to_chat(user, span_notice("You complete the Securitron! Beep boop.")) - var/mob/living/simple_animal/bot/secbot/S = new(drop_loc) - S.name = created_name - S.baton_type = tool.type - S.robot_arm = robot_arm + var/mob/living/basic/bot/secbot/new_bot = new(drop_loc) + new_bot.name = created_name + new_bot.baton_type = tool.type + new_bot.robot_arm = robot_arm qdel(tool) qdel(src) return ITEM_INTERACT_SUCCESS @@ -482,9 +482,9 @@ return ITEM_INTERACT_BLOCKING to_chat(user, span_notice("You complete the Securitron!...Something seems a bit wrong with it..?")) - var/mob/living/simple_animal/bot/secbot/grievous/toy/S = new(drop_loc) - S.name = created_name - S.robot_arm = robot_arm + var/mob/living/basic/bot/secbot/grievous/toy/new_bot = new(drop_loc) + new_bot.name = created_name + new_bot.robot_arm = robot_arm qdel(tool) qdel(src) return ITEM_INTERACT_SUCCESS @@ -517,9 +517,9 @@ return ITEM_INTERACT_BLOCKING to_chat(user, span_notice("You complete the Securitron!...Something seems a bit wrong with it..?")) - var/mob/living/simple_animal/bot/secbot/grievous/S = new(drop_loc) - S.name = created_name - S.robot_arm = robot_arm + var/mob/living/basic/bot/secbot/grievous/new_bot = new(drop_loc) + new_bot.name = created_name + new_bot.robot_arm = robot_arm qdel(tool) qdel(src) return ITEM_INTERACT_SUCCESS diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm deleted file mode 100644 index 945d0c2eba9..00000000000 --- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm +++ /dev/null @@ -1,138 +0,0 @@ -/mob/living/simple_animal/bot/secbot/ed209 - name = "\improper ED-209 Security Robot" - desc = "A security robot. He looks less than thrilled." - icon_state = "ed209" - light_color = "#f84e4e" - density = TRUE - health = 100 - maxHealth = 100 - obj_damage = 60 - environment_smash = ENVIRONMENT_SMASH_WALLS //Walls can't stop THE LAW - mob_size = MOB_SIZE_LARGE - - bot_type = ADVANCED_SEC_BOT - hackables = "combat inhibitors" - - automated_announcements = list(ED209_VOICED_DOWN_WEAPONS = 'sound/mobs/non-humanoids/ed209/ed209_20sec.ogg') - - custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2.8, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 2.1) - - var/lastfired = 0 - var/shot_delay = 1.5 SECONDS - var/shoot_sound = 'sound/items/weapons/laser.ogg' - var/projectile = /obj/projectile/beam/disabler - var/fair_market_projectile = /obj/projectile/bullet/c38 // For shooting the worst scumbags of all: the poor - -/mob/living/simple_animal/bot/secbot/ed209/Initialize(mapload) - . = ..() - set_weapon() //giving it the right projectile and firing sound. - - AddComponent(/datum/component/defaceable, \ - icon = 'icons/mob/silicon/aibot_faces.dmi', \ - icon_states = list("ed209" = FALSE, "ed209_highlight" = TRUE), \ - drawing_of = "a face", \ - ) - -/mob/living/simple_animal/bot/secbot/ed209/bot_reset() - ..() - set_weapon() - -/mob/living/simple_animal/bot/secbot/ed209/emag_act(mob/user, obj/item/card/emag/emag_card) - . = ..() - icon_state = "ed209[get_bot_flag(bot_mode_flags, BOT_MODE_ON)]" - set_weapon() - balloon_alert(user, "safeties disabled") - audible_message(span_bolddanger("[src] buzzes menacingly!")) - return TRUE - -/mob/living/simple_animal/bot/secbot/ed209/handle_automated_action() - var/judgement_criteria = judgement_criteria() - var/list/targets = list() - for(var/mob/living/carbon/nearby_carbon in view(7, src)) //Let's find us a target - var/threatlevel = 0 - if(nearby_carbon.incapacitated) - continue - threatlevel = nearby_carbon.assess_threat(judgement_criteria) - if(threatlevel < THREAT_ASSESS_DANGEROUS) - continue - var/dst = get_dist(src, nearby_carbon) - if(dst <= 1 || dst > 7) - continue - targets += nearby_carbon - if(targets.len > 0) - var/mob/living/carbon/all_targets = pick(targets) - if(all_targets.stat != DEAD && !all_targets.handcuffed) //we don't shoot people who are dead, cuffed or lying down. - shoot_at(all_targets) - ..() - -/mob/living/simple_animal/bot/secbot/ed209/threat_react(threatlevel) - speak("Level [threatlevel] infraction alert!") - playsound(src, pick( - 'sound/mobs/non-humanoids/ed209/ed209_20sec.ogg', - 'sound/mobs/non-humanoids/ed209/edplaceholder.ogg', - ), 50, FALSE) - -/mob/living/simple_animal/bot/secbot/ed209/proc/set_weapon() //used to update the projectile type and firing sound - shoot_sound = 'sound/items/weapons/laser.ogg' - if(bot_cover_flags & BOT_COVER_EMAGGED) - projectile = /obj/projectile/beam - else - projectile = /obj/projectile/beam/disabler - -/mob/living/simple_animal/bot/secbot/ed209/proc/shoot_at(mob/target) - if(world.time <= lastfired + shot_delay) - return - lastfired = world.time - var/turf/T = loc - var/turf/U = get_turf(target) - if(!U) - return - if(!isturf(T)) - return - if(!projectile) - return - - var/obj/projectile/fired_bullet = new projectile(loc) - playsound(src, shoot_sound, 50, TRUE) - fired_bullet.aim_projectile(target, src) - fired_bullet.fire() - -/mob/living/simple_animal/bot/secbot/ed209/emp_act(severity) - if(severity == 2 && prob(70)) - severity = 1 - . = ..() - if(. & EMP_PROTECT_SELF) - return - if(severity <= 1) - return - new /obj/effect/temp_visual/emp(loc) - var/list/mob/living/carbon/targets = list() - for(var/mob/living/carbon/nearby_carbons in view(12,src)) - if(nearby_carbons.stat == DEAD) - continue - targets += nearby_carbons - if(!targets.len) - return - if(prob(50)) - var/mob/toshoot = pick(targets) - if(toshoot) - targets -= toshoot - if(prob(50) && !(bot_cover_flags & BOT_COVER_EMAGGED)) // Temporarily emags it - bot_cover_flags |= BOT_COVER_EMAGGED - set_weapon() - shoot_at(toshoot) - bot_cover_flags &= ~BOT_COVER_EMAGGED - set_weapon() - else - shoot_at(toshoot) - else if(prob(50)) - if(targets.len) - var/mob/to_arrest = pick(targets) - if(to_arrest) - target = to_arrest - mode = BOT_HUNT - -/mob/living/simple_animal/bot/secbot/ed209/RangedAttack(atom/A) - if(!(bot_mode_flags & BOT_MODE_ON)) - return - shoot_at(A) diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm deleted file mode 100644 index 67796f179e0..00000000000 --- a/code/modules/mob/living/simple_animal/bot/secbot.dm +++ /dev/null @@ -1,596 +0,0 @@ -/mob/living/simple_animal/bot/secbot - name = "\improper Securitron" - desc = "A little security robot. He looks less than thrilled." - icon = 'icons/mob/silicon/aibots.dmi' - icon_state = "secbot" - light_color = "#f56275" - light_power = 0.8 - gender = MALE - density = FALSE - anchored = FALSE - health = 25 - maxHealth = 25 - damage_coeff = list(BRUTE = 0.5, BURN = 0.7, TOX = 0, STAMINA = 0, OXY = 0) - pass_flags = PASSMOB | PASSFLAPS - combat_mode = TRUE - can_buckle_to = FALSE - - req_one_access = list(ACCESS_SECURITY) - radio_key = /obj/item/encryptionkey/secbot //AI Priv + Security - radio_channel = RADIO_CHANNEL_SECURITY //Security channel - bot_type = SEC_BOT - bot_mode_flags = ~BOT_MODE_CAN_BE_SAPIENT - data_hud_type = TRAIT_SECURITY_HUD - hackables = "target identification systems" - path_image_color = COLOR_RED - possessed_message = "You are a securitron! Guard the station to the best of your ability!" - - automated_announcements = list( - BEEPSKY_VOICED_CRIMINAL_DETECTED = 'sound/mobs/non-humanoids/beepsky/criminal.ogg', - BEEPSKY_VOICED_FREEZE = 'sound/mobs/non-humanoids/beepsky/freeze.ogg', - BEEPSKY_VOICED_JUSTICE = 'sound/mobs/non-humanoids/beepsky/justice.ogg', - BEEPSKY_VOICED_YOUR_MOVE = 'sound/mobs/non-humanoids/beepsky/creep.ogg', - BEEPSKY_VOICED_I_AM_THE_LAW = 'sound/mobs/non-humanoids/beepsky/iamthelaw.ogg', - BEEPSKY_VOICED_SECURE_DAY = 'sound/mobs/non-humanoids/beepsky/secureday.ogg', - ) - - custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 1.2, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 3.2) - - ///Whether this secbot is considered 'commissioned' and given the trait on Initialize. - var/commissioned = FALSE - ///The type of baton this Secbot will use - var/baton_type = /obj/item/melee/baton/security - ///The type of cuffs we use on criminals after making arrests - var/cuff_type = /obj/item/restraints/handcuffs/cable/zipties/used - ///The weapon (from baton_type) that will be used to make arrests. - var/obj/item/weapon - ///Their current target - var/mob/living/carbon/target - ///Name of their last target to prevent spamming - var/oldtarget_name - ///The threat level of the BOT, will arrest anyone at threatlevel 4 or above - var/threatlevel = 0 - ///The last location their target was seen at - var/target_lastloc - ///Time since last seeing their perpetrator - var/last_found - - ///Flags SecBOTs use on what to check on targets when arresting, and whether they should announce it to security/handcuff their target - var/security_mode_flags = SECBOT_DECLARE_ARRESTS | SECBOT_CHECK_RECORDS | SECBOT_HANDCUFF_TARGET -// Selections: SECBOT_DECLARE_ARRESTS | SECBOT_CHECK_IDS | SECBOT_CHECK_WEAPONS | SECBOT_CHECK_RECORDS | SECBOT_HANDCUFF_TARGET - - /// On arrest, charges the violator this much. - /// If they don't have that much in their account, they will get beaten instead - var/price_arrest = 0 - /// Charged each time the violator is stunned on detain - var/price_detain = 0 - ///Force of the harmbaton used on them - var/weapon_force = 20 - ///The department the secbot will deposit collected money into - var/payment_department = ACCOUNT_SEC - -/mob/living/simple_animal/bot/secbot/beepsky - name = "Commander Beep O'sky" - desc = "It's Commander Beep O'sky! Officially the superior officer of all bots on station, Beepsky remains as humble and dedicated to the law as the day he was first fabricated." - bot_mode_flags = BOT_MODE_ON | BOT_MODE_AUTOPATROL | BOT_MODE_REMOTE_ENABLED - commissioned = TRUE - - -/mob/living/simple_animal/bot/secbot/beepsky/officer - name = "Officer Beepsky" - desc = "It's Officer Beepsky! Powered by a potato and a shot of whiskey, and with a sturdier reinforced chassis, too." - health = 45 - -/mob/living/simple_animal/bot/secbot/beepsky/officer/Initialize(mapload) - . = ..() - // Beepsky hates people scanning them - RegisterSignal(src, COMSIG_MOVABLE_SPY_STEALING, PROC_REF(retaliate_async)) - -/mob/living/simple_animal/bot/secbot/beepsky/ofitser - name = "Prison Ofitser" - desc = "Powered by the tears and sweat of laborers." - bot_mode_flags = ~(BOT_MODE_CAN_BE_SAPIENT|BOT_MODE_AUTOPATROL) - -/mob/living/simple_animal/bot/secbot/beepsky/armsky - name = "Sergeant-At-Armsky" - desc = "It's Sergeant-At-Armsky! He's a disgruntled assistant to the warden that would probably shoot you if he had hands." - health = 45 - bot_mode_flags = ~(BOT_MODE_CAN_BE_SAPIENT|BOT_MODE_AUTOPATROL) - security_mode_flags = SECBOT_DECLARE_ARRESTS | SECBOT_CHECK_IDS | SECBOT_CHECK_RECORDS | SECBOT_CHECK_WEAPONS - -/mob/living/simple_animal/bot/secbot/beepsky/jr - name = "Officer Pipsqueak" - desc = "It's Commander Beep O'sky's smaller, just-as aggressive cousin, Pipsqueak." - commissioned = FALSE - -/mob/living/simple_animal/bot/secbot/beepsky/jr/Initialize(mapload) - . = ..() - update_transform(0.8) - -/mob/living/simple_animal/bot/secbot/pingsky - name = "Officer Pingsky" - desc = "It's Officer Pingsky! Delegated to satellite guard duty for harbouring anti-human sentiment." - light_color = "#62baf5" - radio_channel = RADIO_CHANNEL_AI_PRIVATE - bot_mode_flags = ~(BOT_MODE_CAN_BE_SAPIENT|BOT_MODE_AUTOPATROL) - security_mode_flags = SECBOT_DECLARE_ARRESTS | SECBOT_CHECK_IDS | SECBOT_CHECK_RECORDS - -/mob/living/simple_animal/bot/secbot/genesky - name = "Officer Genesky" - desc = "A beefy variant of the standard securitron model." - health = 50 - faction = list(FACTION_NANOTRASEN_PRIVATE) - bot_mode_flags = BOT_MODE_ON - bot_cover_flags = BOT_COVER_LOCKED | BOT_COVER_EMAGGED - -/mob/living/simple_animal/bot/secbot/beepsky/explode() - var/atom/Tsec = drop_location() - new /obj/item/stock_parts/power_store/cell/potato(Tsec) - var/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass/drinking_oil = new(Tsec) - drinking_oil.reagents.add_reagent(/datum/reagent/consumable/ethanol/whiskey, 15) - return ..() - -/mob/living/simple_animal/bot/secbot/Initialize(mapload) - . = ..() - weapon = new baton_type() - update_appearance(UPDATE_ICON) - if(commissioned) - ADD_TRAIT(src, TRAIT_COMMISSIONED, INNATE_TRAIT) - - // Doing this hurts my soul, but simplebot access reworks are for another day. - var/datum/id_trim/job/det_trim = SSid_access.trim_singletons_by_path[/datum/id_trim/job/detective] - access_card.add_access(det_trim.access + det_trim.wildcard_access) - prev_access = access_card.access.Copy() - - var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = PROC_REF(on_entered), - ) - AddElement(/datum/element/connect_loc, loc_connections) - AddComponent(/datum/component/security_vision, judgement_criteria = NONE, update_judgement_criteria = CALLBACK(src, PROC_REF(judgement_criteria))) - -/mob/living/simple_animal/bot/secbot/Destroy() - QDEL_NULL(weapon) - return ..() - -/mob/living/simple_animal/bot/secbot/update_icon_state() - if(mode == BOT_HUNT) - icon_state = "[initial(icon_state)]-c" - return - return ..() - -/mob/living/simple_animal/bot/secbot/turn_off() - ..() - mode = BOT_IDLE - -/mob/living/simple_animal/bot/secbot/bot_reset() - ..() - target = null - oldtarget_name = null - set_anchored(FALSE) - GLOB.move_manager.stop_looping(src) - last_found = world.time - -/mob/living/simple_animal/bot/secbot/on_saboteur(datum/source, disrupt_duration) - . = ..() - if(!(security_mode_flags & SECBOT_SABOTEUR_AFFECTED)) - security_mode_flags |= SECBOT_SABOTEUR_AFFECTED - addtimer(CALLBACK(src, PROC_REF(remove_saboteur_effect)), disrupt_duration) - return TRUE - -/mob/living/simple_animal/bot/secbot/proc/remove_saboteur_effect() - security_mode_flags &= ~SECBOT_SABOTEUR_AFFECTED - -/mob/living/simple_animal/bot/secbot/electrocute_act(shock_damage, source, siemens_coeff = 1, flags = NONE)//shocks only make him angry - if(base_speed < initial(base_speed) + 3) - base_speed += 3 - addtimer(VARSET_CALLBACK(src, base_speed, base_speed - 3), 6 SECONDS) - playsound(src, 'sound/machines/defib/defib_zap.ogg', 50) - visible_message(span_warning("[src] shakes and speeds up!")) - -/mob/living/simple_animal/bot/secbot/Exited(atom/movable/gone, direction) - . = ..() - if(gone == weapon) - weapon = null - update_appearance() - -// Variables sent to TGUI -/mob/living/simple_animal/bot/secbot/ui_data(mob/user) - var/list/data = ..() - if(!(bot_cover_flags & BOT_COVER_LOCKED) || HAS_SILICON_ACCESS(user)) - data["custom_controls"]["check_id"] = security_mode_flags & SECBOT_CHECK_IDS - data["custom_controls"]["check_weapons"] = security_mode_flags & SECBOT_CHECK_WEAPONS - data["custom_controls"]["check_warrants"] = security_mode_flags & SECBOT_CHECK_RECORDS - data["custom_controls"]["handcuff_targets"] = security_mode_flags & SECBOT_HANDCUFF_TARGET - data["custom_controls"]["arrest_alert"] = security_mode_flags & SECBOT_DECLARE_ARRESTS - return data - -// Actions received from TGUI -/mob/living/simple_animal/bot/secbot/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) - . = ..() - var/mob/user = ui.user - if(. || (bot_cover_flags & BOT_COVER_LOCKED && !HAS_SILICON_ACCESS(user))) - return - - switch(action) - if("check_id") - security_mode_flags ^= SECBOT_CHECK_IDS - if("check_weapons") - security_mode_flags ^= SECBOT_CHECK_WEAPONS - if("check_warrants") - security_mode_flags ^= SECBOT_CHECK_RECORDS - if("handcuff_targets") - security_mode_flags ^= SECBOT_HANDCUFF_TARGET - if("arrest_alert") - security_mode_flags ^= SECBOT_DECLARE_ARRESTS - -/mob/living/simple_animal/bot/secbot/proc/retaliate_async(datum/source, mob/user, ...) - SIGNAL_HANDLER - - INVOKE_ASYNC(src, PROC_REF(retaliate), user) - -/mob/living/simple_animal/bot/secbot/proc/retaliate(mob/living/carbon/human/attacking_human) - var/judgement_criteria = judgement_criteria() - threatlevel = attacking_human.assess_threat(judgement_criteria) - threatlevel += 6 - if(threatlevel >= THREAT_ASSESS_DANGEROUS) - target = attacking_human - mode = BOT_HUNT - if(threatlevel < 0 && prob(5)) - manual_emote("salutes.") - speak("Thank you sir.") - -/mob/living/simple_animal/bot/secbot/proc/judgement_criteria() - var/final = FALSE - if(bot_cover_flags & BOT_COVER_EMAGGED) - final |= JUDGE_EMAGGED - if(security_mode_flags & SECBOT_CHECK_IDS) - final |= JUDGE_IDCHECK - if(security_mode_flags & SECBOT_CHECK_RECORDS) - final |= JUDGE_RECORDCHECK - if(security_mode_flags & SECBOT_CHECK_WEAPONS) - final |= JUDGE_WEAPONCHECK - if(security_mode_flags & SECBOT_SABOTEUR_AFFECTED) - final |= JUDGE_CHILLOUT - return final - -/mob/living/simple_animal/bot/secbot/proc/special_retaliate_after_attack(mob/user) //allows special actions to take place after being attacked. - return - -/mob/living/simple_animal/bot/secbot/attack_hand(mob/living/carbon/human/user, list/modifiers) - if(user.combat_mode) - retaliate(user) - if(special_retaliate_after_attack(user)) - return - - // Turns an oversight into a feature. Beepsky will now announce when pacifists taunt him over sec comms. - if(HAS_TRAIT(user, TRAIT_PACIFISM)) - user.visible_message(span_notice("[user] taunts [src], daring [p_them()] to give chase!"), \ - span_notice("You taunt [src], daring [p_them()] to chase you!"), span_hear("You hear someone shout a daring taunt!"), DEFAULT_MESSAGE_RANGE, user) - speak("Taunted by pacifist scumbag [RUNECHAT_BOLD("[user]")] in [get_area(src)].", radio_channel) - - // Interrupt the attack chain. We've already handled this scenario for pacifists. - return - - return ..() - -/mob/living/simple_animal/bot/secbot/attackby(obj/item/attacking_item, mob/living/user, list/modifiers, list/attack_modifiers) - ..() - if(!(bot_mode_flags & BOT_MODE_ON)) // Bots won't remember if you hit them while they're off. - return - if(attacking_item.tool_behaviour == TOOL_WELDER && !user.combat_mode) // Any intent but harm will heal, so we shouldn't get angry. - return - if(attacking_item.tool_behaviour != TOOL_SCREWDRIVER && (attacking_item.force) && (!target) && (attacking_item.damtype != STAMINA)) // Added check for welding tool to fix #2432. Welding tool behavior is handled in superclass. - retaliate(user) - special_retaliate_after_attack(user) - -/mob/living/simple_animal/bot/secbot/emag_act(mob/user, obj/item/card/emag/emag_card) - . = ..() - if(!(bot_cover_flags & BOT_COVER_EMAGGED)) - return - if(user) - balloon_alert(user, "target assessment circuits shorted") - oldtarget_name = user.name - - if(bot_type == HONK_BOT) - audible_message(span_danger("[src] gives out an evil laugh!")) - playsound(src, 'sound/mobs/non-humanoids/honkbot/honkbot_evil_laugh.ogg', 75, TRUE, -1) // evil laughter - else - audible_message(span_danger("[src] buzzes oddly!")) - - security_mode_flags &= ~SECBOT_DECLARE_ARRESTS - update_appearance() - return TRUE - -/mob/living/simple_animal/bot/secbot/bullet_act(obj/projectile/proj) - . = ..() - if(. != BULLET_ACT_HIT) - return - - if(istype(proj, /obj/projectile/beam) || istype(proj, /obj/projectile/bullet)) - if((proj.damage_type == BURN) || (proj.damage_type == BRUTE)) - if(proj.is_hostile_projectile() && proj.damage < src.health && ishuman(proj.firer)) - retaliate(proj.firer) - -/mob/living/simple_animal/bot/secbot/UnarmedAttack(atom/attack_target, proximity_flag, list/modifiers) - if(!(bot_mode_flags & BOT_MODE_ON)) - return - if(!can_unarmed_attack()) - return - if(!iscarbon(attack_target)) - return ..() - var/mob/living/carbon/carbon_target = attack_target - if(!carbon_target.IsParalyzed() || !(security_mode_flags & SECBOT_HANDCUFF_TARGET)) - stun_attack(attack_target, payment_check()) - else if(carbon_target.canBeHandcuffed() && !carbon_target.handcuffed) - start_handcuffing(attack_target) - -/mob/living/simple_animal/bot/secbot/hitby(atom/movable/hitting_atom, skipcatch = FALSE, hitpush = TRUE, blocked = FALSE, datum/thrownthing/throwingdatum) - if(isitem(hitting_atom)) - var/obj/item/item_hitby = hitting_atom - var/mob/thrown_by = throwingdatum?.get_thrower() - if(item_hitby.throwforce < src.health && thrown_by && ishuman(thrown_by)) - var/mob/living/carbon/human/human_throwee = thrown_by - retaliate(human_throwee) - ..() - -/mob/living/simple_animal/bot/secbot/proc/start_handcuffing(mob/living/carbon/current_target) - mode = BOT_ARREST - playsound(src, 'sound/items/weapons/cablecuff.ogg', 30, TRUE, -2) - current_target.visible_message(span_danger("[src] is trying to put zipties on [current_target]!"),\ - span_userdanger("[src] is trying to put zipties on you!")) - addtimer(CALLBACK(src, PROC_REF(handcuff_target), current_target), 6 SECONDS) - -/mob/living/simple_animal/bot/secbot/proc/handcuff_target(mob/living/carbon/current_target) - if(!(bot_mode_flags & BOT_MODE_ON)) //if he's in a closet or not adjacent, we cancel cuffing. - return FALSE - if(!isturf(current_target.loc)) - return FALSE - if(!Adjacent(current_target)) - return FALSE - if(!current_target.handcuffed) - current_target.set_handcuffed(new cuff_type(current_target)) - playsound(src, SFX_LAW, 50, FALSE) - back_to_idle() - -/mob/living/simple_animal/bot/secbot/proc/stun_attack(mob/living/carbon/current_target, harm = FALSE) - var/judgement_criteria = judgement_criteria() - playsound(src, 'sound/items/weapons/egloves.ogg', 50, TRUE, -1) - icon_state = "[initial(icon_state)]-c" - addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance)), 0.2 SECONDS) - var/threat = 5 - - if(harm) - weapon.attack(current_target, src) - if(ishuman(current_target)) - current_target.set_stutter(10 SECONDS) - current_target.Paralyze(60) // SKYRAT EDIT CHANGE - original was current_target.Paralyze(100) - var/mob/living/carbon/human/human_target = current_target - threat = human_target.assess_threat(judgement_criteria) - else - current_target.Paralyze(60) // SKYRAT EDIT CHANGE - original was current_target.Paralyze(100) - current_target.set_stutter(10 SECONDS) - threat = current_target.assess_threat(judgement_criteria) - - log_combat(src, current_target, "stunned") - if(security_mode_flags & SECBOT_DECLARE_ARRESTS) - var/area/location = get_area(src) - speak("[security_mode_flags & SECBOT_HANDCUFF_TARGET ? "Arresting" : "Detaining"] level [threat] scumbag [RUNECHAT_BOLD("[current_target]")] in [location].", radio_channel) - current_target.visible_message(span_danger("[src] stuns [current_target]!"),\ - span_userdanger("[src] stuns you!")) - - target_lastloc = current_target.loc - mode = BOT_PREP_ARREST - -/mob/living/simple_animal/bot/secbot/handle_automated_action() - . = ..() - if(!.) - return - - switch(mode) - - if(BOT_IDLE) // idle - GLOB.move_manager.stop_looping(src) - look_for_perp() // see if any criminals are in range - if((mode == BOT_IDLE) && bot_mode_flags & BOT_MODE_AUTOPATROL) // didn't start hunting during look_for_perp, and set to patrol - mode = BOT_START_PATROL // switch to patrol mode - - if(BOT_HUNT) // hunting for perp - // if can't reach perp for long enough, go idle - if(frustration >= 8) - GLOB.move_manager.stop_looping(src) - back_to_idle() - return - - if(!target) // make sure target exists - back_to_idle() - return - if(Adjacent(target) && isturf(target.loc)) // if right next to perp - stun_attack(target, payment_check()) - set_anchored(TRUE) - return - - // not next to perp - var/turf/olddist = get_dist(src, target) - GLOB.move_manager.move_to(src, target, 1, 4) - if((get_dist(src, target)) >= (olddist)) - frustration++ - else - frustration = 0 - - if(BOT_PREP_ARREST) // preparing to arrest target - // see if he got away. If he's no no longer adjacent or inside a closet or about to get up, we hunt again. - if(!Adjacent(target) || !isturf(target.loc) || !HAS_TRAIT(target, TRAIT_FLOORED)) - back_to_hunt() - return - - if(!iscarbon(target) || !target.canBeHandcuffed()) - back_to_idle() - return - - if(security_mode_flags & SECBOT_HANDCUFF_TARGET) - if(!target.handcuffed) //he's not cuffed? Try to cuff him! - start_handcuffing(target) - else - back_to_idle() - return - - if(BOT_ARREST) - if(!target) - set_anchored(FALSE) - mode = BOT_IDLE - last_found = world.time - frustration = 0 - return - - if(target.handcuffed) // target is cuffed, mission accomplished - if(payment_check()) // try to fine them - give them a love tap if they fail - stun_attack(target, TRUE) - else // otherwise return to idle state - back_to_idle() - return - - if(!Adjacent(target) || !isturf(target.loc) || (target.loc != target_lastloc && !HAS_TRAIT(target, TRAIT_FLOORED))) //if he's changed loc and about to get up or not adjacent or got into a closet, we prep arrest again. - back_to_hunt() - return - else //Try arresting again if the target escapes. - mode = BOT_PREP_ARREST - set_anchored(FALSE) - - if(BOT_START_PATROL) - look_for_perp() - start_patrol() - - if(BOT_PATROL) - look_for_perp() - bot_patrol() - -/mob/living/simple_animal/bot/secbot/proc/back_to_idle() - set_anchored(FALSE) - mode = BOT_IDLE - target = null - last_found = world.time - frustration = 0 - INVOKE_ASYNC(src, PROC_REF(handle_automated_action)) - -/mob/living/simple_animal/bot/secbot/proc/back_to_hunt() - set_anchored(FALSE) - frustration = 0 - mode = BOT_HUNT - INVOKE_ASYNC(src, PROC_REF(handle_automated_action)) -// look for a criminal in view of the bot - -/mob/living/simple_animal/bot/secbot/proc/look_for_perp() - set_anchored(FALSE) - var/judgement_criteria = judgement_criteria() - for(var/mob/living/carbon/nearby_carbons in view(7, src)) //Let's find us a criminal - if((nearby_carbons.stat) || (nearby_carbons.handcuffed)) - continue - - if((nearby_carbons.name == oldtarget_name) && (world.time < last_found + 100)) - continue - - //BUBBERSTATION CHANGE START: BEEPSKY IS A DINOSAUR NOW. CAN'T SEE YOU IF YOU DON'T MOVE. - if(nearby_carbons.client) //We have a client. We're a player that uses move_delay. - if(nearby_carbons.client.move_delay + 4 SECONDS <= world.time) - continue - else if(nearby_carbons.next_move + 4 SECONDS <= world.time) //No client. We're a mob that uses next_move. - continue - //BUBBERSTATION CHANGE END: BEEPSKY IS A DINOSAUR NOW. CAN'T SEE YOU IF YOU DON'T MOVE. - - threatlevel = nearby_carbons.assess_threat(judgement_criteria) - - if(threatlevel < THREAT_ASSESS_DANGEROUS) - continue - - target = nearby_carbons - oldtarget_name = nearby_carbons.name - threat_react(threatlevel) - visible_message("[src] points at [nearby_carbons.name]!") - mode = BOT_HUNT - INVOKE_ASYNC(src, PROC_REF(handle_automated_action)) - break - -/// React to detecting criminal scum by making some kind of noise -/mob/living/simple_animal/bot/secbot/proc/threat_react(threatlevel) - speak("Level [threatlevel] infraction alert!") - playsound(src, pick( - 'sound/mobs/non-humanoids/beepsky/criminal.ogg', - 'sound/mobs/non-humanoids/beepsky/justice.ogg', - 'sound/mobs/non-humanoids/beepsky/freeze.ogg', - ), 50, FALSE) - -/mob/living/simple_animal/bot/secbot/explode() - var/atom/Tsec = drop_location() - switch(bot_type) - if(ADVANCED_SEC_BOT) - var/obj/item/bot_assembly/ed209/ed_assembly = new(Tsec) - ed_assembly.build_step = ASSEMBLY_FIRST_STEP - ed_assembly.add_overlay("hs_hole") - ed_assembly.created_name = name - new /obj/item/assembly/prox_sensor(Tsec) - var/obj/item/gun/energy/disabler/disabler_gun = new(Tsec) - disabler_gun.cell.charge = 0 - disabler_gun.update_appearance() - if(prob(50)) - new /obj/item/bodypart/leg/left/robot(Tsec) - if(prob(25)) - new /obj/item/bodypart/leg/right/robot(Tsec) - if(prob(25))//50% chance for a helmet OR vest - if(prob(50)) - new /obj/item/clothing/head/helmet(Tsec) - else - new /obj/item/clothing/suit/armor/vest(Tsec) - if(HONK_BOT) - var/obj/item/bot_assembly/honkbot/honkbot_assembly = new(Tsec) - honkbot_assembly.build_step = ASSEMBLY_FIRST_STEP - honkbot_assembly.created_name = name - new /obj/item/assembly/prox_sensor(Tsec) - drop_part(baton_type, Tsec) - else - var/obj/item/bot_assembly/secbot/secbot_assembly = new(Tsec) - secbot_assembly.build_step = ASSEMBLY_FIRST_STEP - secbot_assembly.add_overlay("hs_hole") - secbot_assembly.created_name = name - new /obj/item/assembly/prox_sensor(Tsec) - drop_part(baton_type, Tsec) - - new /obj/effect/decal/cleanable/blood/oil(loc) - return ..() - -/mob/living/simple_animal/bot/secbot/attack_alien(mob/living/carbon/alien/user, list/modifiers) - . = ..() - if(!isalien(target)) - target = user - mode = BOT_HUNT - -/mob/living/simple_animal/bot/secbot/proc/on_entered(datum/source, atom/movable/AM) - SIGNAL_HANDLER - if(has_gravity() && ismob(AM) && target) - var/mob/living/carbon/C = AM - if(!istype(C) || !C || in_range(src, target)) - return - knockOver(C) - -/// Returns true if the current target is unable to pay to be detained/arrested -/mob/living/simple_animal/bot/secbot/proc/payment_check() - var/fair_market_price = (security_mode_flags & SECBOT_HANDCUFF_TARGET) ? price_arrest : price_detain - if(fair_market_price <= 0) - return FALSE - if(!ishuman(target)) - return FALSE - var/mob/living/carbon/human/human_target = target - var/obj/item/card/id/target_id = human_target.get_idcard() - if(!target_id) - say("Unable to pay fine: No ID card found.") - return TRUE - var/datum/bank_account/insurance = target_id.registered_account - if(!insurance) - say("Unable to pay fine: No bank account found.") - return TRUE - if(!insurance.adjust_money(-fair_market_price, "Securitron fine")) - say("Unable to pay fine: Not enough funds in account.") - return TRUE - - SSeconomy.get_dep_account(payment_department)?.adjust_money(fair_market_price) - say("Fine paid: Thank you for your compliance. Your account been charged [fair_market_price] [MONEY_NAME].") - return FALSE diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm index d62fa709e77..fd4c4d58a96 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm @@ -230,19 +230,19 @@ min_damage = 30 max_damage = 35 -/obj/effect/goliath_tentacle/broodmother/patch/Initialize(mapload, new_spawner) +/obj/effect/goliath_tentacle/broodmother/patch/Initialize(mapload, mob/living/goliath) . = ..() INVOKE_ASYNC(src, PROC_REF(createpatch)) /obj/effect/goliath_tentacle/broodmother/patch/proc/createpatch() var/tentacle_locs = spiral_range_turfs(1, get_turf(src)) for(var/T in tentacle_locs) - new /obj/effect/goliath_tentacle/broodmother(T) + new /obj/effect/goliath_tentacle/broodmother(T, owner) var/list/directions = GLOB.cardinals.Copy() for(var/i in directions) var/turf/T = get_step(get_turf(src), i) T = get_step(T, i) - new /obj/effect/goliath_tentacle/broodmother(T) + new /obj/effect/goliath_tentacle/broodmother(T, owner) #undef CALL_CHILDREN #undef RAGE diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 46f5958cc17..f0531f0a1b8 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -475,17 +475,6 @@ . = ..() update_held_items() -/mob/living/simple_animal/update_held_items() - . = ..() - if(!client || !hud_used || hud_used.hud_version == HUD_STYLE_NOHUD) - return - var/turf/our_turf = get_turf(src) - for(var/obj/item/I in held_items) - var/index = get_held_index_of_item(I) - SET_PLANE(I, ABOVE_HUD_PLANE, our_turf) - I.screen_loc = ui_hand_position(index) - client.screen |= I - //ANIMAL RIDING /mob/living/simple_animal/user_buckle_mob(mob/living/M, mob/user, check_loc = TRUE) diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm index 359ac2c56f2..2c5f0af4451 100644 --- a/code/modules/mob/living/status_procs.dm +++ b/code/modules/mob/living/status_procs.dm @@ -513,20 +513,17 @@ REMOVE_TRAIT(src, TRAIT_HUSK, source) if(HAS_TRAIT(src, TRAIT_HUSK)) return FALSE - update_body() UnregisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_UNHUSKABLE)) return TRUE /mob/living/proc/become_husk(source) if(HAS_TRAIT(src, TRAIT_UNHUSKABLE)) - return + return FALSE var/was_husk = HAS_TRAIT(src, TRAIT_HUSK) ADD_TRAIT(src, TRAIT_HUSK, source) - if (was_husk) - return - update_body() - RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_UNHUSKABLE), PROC_REF(became_unhuskable)) - return TRUE //MODULAR ZUBBERS CHANGE: RETURN TRUE + if (!was_husk) + RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_UNHUSKABLE), PROC_REF(became_unhuskable)) + return TRUE /// Called when we become unhuskable while already husked /mob/living/proc/became_unhuskable() @@ -543,7 +540,7 @@ if(stat != DEAD) if(!silent) emote("deathgasp") - station_timestamp_timeofdeath = station_time_timestamp() + station_timestamp_timeofdeath = round_timestamp() if(!HAS_TRAIT(src, TRAIT_FAKEDEATH) && !silent) send_death_moodlets() diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm index 1f0069e203c..541734ff8e4 100644 --- a/code/modules/mob/login.dm +++ b/code/modules/mob/login.dm @@ -104,6 +104,7 @@ stop_sound_channel(CHANNEL_AMBIENCE) if(client) + client.view_size?.resetToDefault() // Resets the client.view in case it was changed. for(var/datum/action/A as anything in persistent_client.player_actions) @@ -121,6 +122,9 @@ ) auto_deadmin_on_login() + //Check if they should have a stat panel, after they deadmined. + client.set_stat_panel() + log_message("Client [key_name(src)] has taken ownership of mob [src]([src.type])", LOG_OWNERSHIP) log_mob_tag("TAG: [tag] NEW OWNER: [key_name(src)]") SEND_SIGNAL(src, COMSIG_MOB_CLIENT_LOGIN, client) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 8ec3f4d4e47..a173093a46f 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -815,11 +815,7 @@ * * Calls attack self on the item and updates the inventory hud for hands */ -/mob/verb/mode() - set name = "Activate Held Object" - set category = "IC" - set src = usr - +/mob/proc/mode() DEFAULT_QUEUE_OR_CALL_VERB(VERB_CALLBACK(src, PROC_REF(execute_mode))) ///proc version to finish /mob/verb/mode() execution. used in case the proc needs to be queued for the tick after its first called @@ -988,14 +984,8 @@ var/previous_index = active_hand_index active_hand_index = held_index - if(hud_used) - var/atom/movable/screen/inventory/hand/held_location - held_location = hud_used.hand_slots[previous_index] - if(!isnull(held_location)) - held_location.update_appearance() - held_location = hud_used.hand_slots[held_index] - if(!isnull(held_location)) - held_location.update_appearance() + hud_used?.update_inventory_slot(ITEM_SLOT_HANDS, previous_index) + hud_used?.update_inventory_slot(ITEM_SLOT_HANDS, held_index) return TRUE /mob/proc/activate_hand(selected_hand) @@ -1513,13 +1503,6 @@ //Do not do parent's actions, as we *usually* do this differently. fully_replace_character_name(real_name, new_name) -///Show the language menu for this mob -/mob/verb/open_language_menu_verb() - set name = "Open Language Menu" - set category = "IC" - - get_language_holder().open_language_menu(usr) - ///Adjust the nutrition of a mob /mob/proc/adjust_nutrition(change, forced = FALSE) //Honestly FUCK the oldcoders for putting nutrition on /mob someone else can move it up because holy hell I'd have to fix SO many typechecks if(HAS_TRAIT(src, TRAIT_NOHUNGER) && !forced) @@ -1643,21 +1626,6 @@ clear_important_client_contents() canon_client = null -///Shows a tgui window with memories -/mob/verb/memory() - set name = "Memories" - set category = "IC" - set desc = "View your character's memories." - if(!mind) - var/fail_message = "You have no mind!" - if(isobserver(src)) - fail_message += " You have to be in the current round at some point to have one." - to_chat(src, span_warning(fail_message)) - return - if(!mind.memory_panel) - mind.memory_panel = new(usr, mind) - mind.memory_panel.ui_interact(usr) - ///Shows a tgui window with memories /mob/proc/open_memory_panel() if(!mind) @@ -1710,12 +1678,6 @@ data["memories"] = memories return data -/mob/verb/view_skills() - set category = "IC" - set name = "View Skills" - - mind?.print_levels(src) - /mob/key_down(key, client/client, full_key) ..() SEND_SIGNAL(src, COMSIG_MOB_KEYDOWN, key, client, full_key) diff --git a/code/modules/mob/mob_lists.dm b/code/modules/mob/mob_lists.dm index 4e50a4d8595..f47f316c078 100644 --- a/code/modules/mob/mob_lists.dm +++ b/code/modules/mob/mob_lists.dm @@ -47,10 +47,6 @@ /mob/proc/add_to_player_list() SHOULD_CALL_PARENT(TRUE) GLOB.player_list |= src - if(client.holder) - GLOB.keyloop_list |= src - else if(stat != DEAD || !SSlag_switch?.measures[DISABLE_DEAD_KEYLOOP]) - GLOB.keyloop_list |= src if(stat == DEAD) add_to_current_dead_players() else @@ -70,12 +66,19 @@ ///Adds the cliented mob reference to either the list of dead player-mobs or to the list of observers, depending on how they joined the game. /mob/proc/add_to_current_dead_players() GLOB.dead_player_list |= src + if(!SSlag_switch.measures[DISABLE_DEAD_KEYLOOP] || client.holder) + GLOB.keyloop_list |= src + else + GLOB.keyloop_list -= src /mob/dead/observer/add_to_current_dead_players() + if(!SSlag_switch.measures[DISABLE_DEAD_KEYLOOP] || client?.holder) // observers can move + GLOB.keyloop_list |= src if(started_as_observer) GLOB.current_observers_list |= src return - return ..() + else + GLOB.dead_player_list |= src /mob/dead/new_player/add_to_current_dead_players() return @@ -94,6 +97,7 @@ ///Adds the cliented mob reference to the list of living player-mobs. If the mob is an antag, it adds it to the list of living antag player-mobs. /mob/proc/add_to_current_living_players() GLOB.alive_player_list |= src + GLOB.keyloop_list |= src if(is_antag(NONE)) add_to_current_living_antags() diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 75cc97cb5f4..8ecf22b4e76 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -27,7 +27,7 @@ * in the parent proc with istype checks right?): * * having incorporeal_move set (calls Process_Incorpmove() instead) * * being grabbed - * * being buckled (relaymove() is called to the buckled atom instead) + * * being buckled (relaymove() is called to the buckled atom instead) * * having your loc be some other mob (relaymove() is called on that mob instead) * * Not having MOBILITY_MOVE * * Failing Process_Spacemove() call @@ -551,10 +551,7 @@ SEND_SIGNAL(src, COMSIG_MOVE_INTENT_TOGGLED) ///Moves a mob upwards in z level -/mob/verb/up() - set name = "Move Upwards" - set category = "IC" - +/mob/proc/up() if(remote_control) return remote_control.relaymove(src, UP) @@ -578,10 +575,7 @@ to_chat(src, span_notice("You move upwards.")) ///Moves a mob down a z level -/mob/verb/down() - set name = "Move Down" - set category = "IC" - +/mob/proc/down() if(remote_control) return remote_control.relaymove(src, DOWN) diff --git a/code/modules/mob/mob_say.dm b/code/modules/mob/mob_say.dm index 4befd284cb9..cc37a85321b 100644 --- a/code/modules/mob/mob_say.dm +++ b/code/modules/mob/mob_say.dm @@ -2,9 +2,7 @@ ///what clients use to speak. when you type a message into the chat bar in say mode, this is the first thing that goes off serverside. /mob/verb/say_verb(message as text) - set name = "Say" - set category = "IC" - set instant = TRUE + set name = VERB_SAY if(GLOB.say_disabled) //This is here to try to identify lag problems to_chat(usr, span_danger("Speech is currently admin-disabled.")) @@ -17,9 +15,7 @@ ///Whisper verb /mob/verb/whisper_verb(message as text) - set name = "Whisper" - set category = "IC" - set instant = TRUE + set name = VERB_WHISPER if(GLOB.say_disabled) //This is here to try to identify lag problems to_chat(usr, span_danger("Speech is currently admin-disabled.")) @@ -40,9 +36,7 @@ ///The me emote verb /mob/verb/me_verb(message as text) - set name = "Me" - set category = "IC" - set desc = "Perform a custom emote. Leave blank to pick between an audible or a visible emote (Defaults to visible)." + set name = VERB_ME if(GLOB.say_disabled) //This is here to try to identify lag problems to_chat(usr, span_danger("Speech is currently admin-disabled.")) @@ -171,12 +165,7 @@ var/displayed_key = key if(client?.holder?.fakekey) displayed_key = null - deadchat_broadcast(rendered, source, follow_target = src, speaker_key = displayed_key) - for(var/mob/mobs_hearing as anything in GLOB.player_list) - if(SSticker.current_state != GAME_STATE_FINISHED && (mobs_hearing.see_invisible < invisibility || !isdead(mobs_hearing))) - continue - if(runechat_prefs_check(mobs_hearing)) - mobs_hearing.create_chat_message(src, /datum/language/common, message) + deadchat_broadcast(rendered, source, follow_target = src, speaker_key = displayed_key, original_message = message) ///Check if this message is an emote /mob/proc/check_emote(message, forced) diff --git a/code/modules/mob/mob_update_icons.dm b/code/modules/mob/mob_update_icons.dm index 210c041408c..11da749e89a 100644 --- a/code/modules/mob/mob_update_icons.dm +++ b/code/modules/mob/mob_update_icons.dm @@ -66,6 +66,7 @@ /mob/proc/update_held_items() SHOULD_CALL_PARENT(TRUE) SEND_SIGNAL(src, COMSIG_MOB_UPDATE_HELD_ITEMS) + hud_used?.update_inventory_slot(ITEM_SLOT_HANDS) ///Updates the mask overlay & HUD element. /mob/proc/update_worn_mask() @@ -95,9 +96,6 @@ /mob/proc/update_body() return -/mob/proc/update_hair() - return - ///Updates the glasses overlay & HUD element. /mob/proc/update_worn_glasses() return diff --git a/code/modules/mob/status_procs.dm b/code/modules/mob/status_procs.dm index fccd64ab705..1f190d6cdb4 100644 --- a/code/modules/mob/status_procs.dm +++ b/code/modules/mob/status_procs.dm @@ -39,5 +39,5 @@ if(new_sight == see_invisible) return var/old_invis = see_invisible - see_invisible = new_sight - SEND_SIGNAL(src, COMSIG_MOB_SEE_INVIS_CHANGE, see_invisible, old_invis) + if(!(SEND_SIGNAL(src, COMSIG_MOB_SEE_INVIS_CHANGE, new_sight, old_invis) & COMPONENT_BLOCK_INVIS_CHANGE)) + see_invisible = new_sight diff --git a/code/modules/mob_spawn/mob_spawn.dm b/code/modules/mob_spawn/mob_spawn.dm index 957c6324f45..e01b47c8569 100644 --- a/code/modules/mob_spawn/mob_spawn.dm +++ b/code/modules/mob_spawn/mob_spawn.dm @@ -230,7 +230,7 @@ /obj/effect/mob_spawn/ghost_role/proc/can_ghost_take(mob/dead/observer/user) if(is_banned_from(user.ckey, role_ban)) to_chat(user, span_warning("You are banned from this role!")) - return FALL_STOP_INTERCEPTING + return FALSE if(!(GLOB.ghost_role_flags & GHOSTROLE_SPAWNER) && !(flags_1 & ADMIN_SPAWNED_1)) to_chat(user, span_warning("An admin has temporarily disabled non-admin ghost roles!")) return FALSE diff --git a/code/modules/mod/mod_theme.dm b/code/modules/mod/mod_theme.dm index ec8e719f5d2..92c4fd390ab 100644 --- a/code/modules/mod/mod_theme.dm +++ b/code/modules/mod/mod_theme.dm @@ -1553,9 +1553,10 @@ inbuilt_modules = list(/obj/item/mod/module/anti_magic/wizard) hearing_protection = EAR_PROTECTION_NORMAL allowed_suit_storage = list( - /obj/item/teleportation_scroll, - /obj/item/highfrequencyblade/wizard, /obj/item/gun/magic, + /obj/item/highfrequencyblade/wizard, + /obj/item/storage/belt/wand_bandolier, + /obj/item/teleportation_scroll, ) variants = list( "enchanted" = list( diff --git a/code/modules/mod/modules/module_holding.dm b/code/modules/mod/modules/module_holding.dm index fc235663f1f..1d8c8642333 100644 --- a/code/modules/mod/modules/module_holding.dm +++ b/code/modules/mod/modules/module_holding.dm @@ -58,10 +58,12 @@ storage_type = /datum/storage/bag_of_holding create_storage(storage_type = /datum/storage/bag_of_holding) atom_storage.set_locked(STORAGE_FULLY_LOCKED) + item_flags |= BLUESPACE_INTERFERENCE /obj/item/mod/module/storage/holding/proc/on_core_removed() QDEL_NULL(atom_storage) storage_type = null + item_flags &= ~BLUESPACE_INTERFERENCE /obj/item/mod/module/storage/holding/proc/try_install(_source, obj/item/mod/control/suit, mob/user) SIGNAL_HANDLER @@ -92,6 +94,7 @@ /obj/item/mod/module/storage/holding/prebuilt prebuilt = TRUE + item_flags = BLUESPACE_INTERFERENCE /obj/item/mod/module/storage/holding/prebuilt/locked core_removable = FALSE diff --git a/code/modules/mod/modules/modules_antag.dm b/code/modules/mod/modules/modules_antag.dm index 44443c90fa2..f7d28ed1341 100644 --- a/code/modules/mod/modules/modules_antag.dm +++ b/code/modules/mod/modules/modules_antag.dm @@ -527,7 +527,7 @@ /obj/item/mod/module/stealth/wraith/proc/start_stealth() if(!COOLDOWN_FINISHED(src, recloak_timer)) // Prevents being able to bypass the cooldown by disabling and re-enabling the module - addtimer(CALLBACK(src, PROC_REF(start_stealth)), recloak_timer) + addtimer(CALLBACK(src, PROC_REF(start_stealth)), COOLDOWN_TIMELEFT(src, recloak_timer)) return RegisterSignals(mod.wearer, list(COMSIG_LIVING_MOB_BUMP, COMSIG_ATOM_BUMPED, COMSIG_MOB_FIRED_GUN), PROC_REF(unstealth)) RegisterSignal(mod.wearer, COMSIG_LIVING_UNARMED_ATTACK, PROC_REF(on_unarmed_attack)) diff --git a/code/modules/mod/modules/modules_general.dm b/code/modules/mod/modules/modules_general.dm index 5b830ea3578..63f417ad505 100644 --- a/code/modules/mod/modules/modules_general.dm +++ b/code/modules/mod/modules/modules_general.dm @@ -244,7 +244,7 @@ /obj/item/mod/module/status_readout/add_ui_data() . = ..() .["display_time"] = display_time - .["shift_time"] = station_time_timestamp() + .["shift_time"] = round_timestamp() .["shift_id"] = GLOB.round_id .["health"] = mod.wearer?.health || 0 .["health_max"] = mod.wearer?.getMaxHealth() || 0 diff --git a/code/modules/mod/modules/modules_supply.dm b/code/modules/mod/modules/modules_supply.dm index 0ebd99635ae..9fe1b8a137b 100644 --- a/code/modules/mod/modules/modules_supply.dm +++ b/code/modules/mod/modules/modules_supply.dm @@ -194,7 +194,7 @@ if (!istype(giberal_turf) || giberal_turf.stage != GIBTONITE_UNSTRUCK) last_bumpmine_tick = world.time var/turf/closed/mineral/rock = bumped_into - INVOKE_ASYNC(rock, TYPE_PROC_REF(/atom, attackby), src, bumper, null, null, exp_multiplier) + INVOKE_ASYNC(src, PROC_REF(mine_rock), rock, bumper) return if (!COOLDOWN_FINISHED(src, gibtonite_warning_cd)) @@ -204,12 +204,21 @@ playsound(bumper, 'sound/machines/scanner/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) to_chat(bumper, span_warning("[icon2html(src, bumper)] Unstable gibtonite ore deposit detected!")) +/obj/item/mod/module/drill/proc/mine_rock(turf/closed/mineral/rock, mob/living/carbon/human/bumper) + // Even faster if it has ore! + var/has_ore = !isnull(rock.mineral_type) + if (has_ore) + toolspeed /= 2 + rock.attackby(src, bumper, null, null, exp_multiplier) + if (has_ore) + toolspeed *= 2 + /obj/item/mod/module/drill/proc/on_module_activated(datum/source, obj/item/mod/module/module) SIGNAL_HANDLER if (!istype(module, /obj/item/mod/module/sphere_transform)) return - // In sphere mode we get instamine and halved power drain - toolspeed = 0 + // In sphere mode we get faster mining and halved power drain + toolspeed = 0.075 use_energy_cost *= 0.5 exp_multiplier *= 0.2 if (!active) @@ -222,7 +231,7 @@ return toolspeed = initial(toolspeed) use_energy_cost *= 2 - exp_multiplier /= 2 + exp_multiplier /= 0.2 ballin = FALSE if (!active) on_deactivation() @@ -568,7 +577,7 @@ /obj/item/mod/module/sphere_transform name = "MOD sphere transform module" desc = "A module able to move the suit's parts around, turning it and the user into a sphere. \ - The sphere can move quickly, even through lava, and launch mining bombs to decimate terrain." + The sphere can move quickly, even through lava, and launch mining micromissile to decimate terrain and fauna alike." icon_state = "sphere" module_type = MODULE_ACTIVE removable = FALSE @@ -678,12 +687,19 @@ . = ..() if(!.) return - var/obj/projectile/bullet/mining_bomb/bomb = new(mod.wearer.loc) - bomb.aim_projectile(target, mod.wearer) - bomb.firer = mod.wearer - playsound(src, 'sound/items/weapons/gun/general/grenade_launch.ogg', 75, TRUE) - INVOKE_ASYNC(bomb, TYPE_PROC_REF(/obj/projectile, fire)) drain_power(use_energy_cost) + INVOKE_ASYNC(src, PROC_REF(fire_missile), target) + for (var/i in 1 to 2) + addtimer(CALLBACK(src, PROC_REF(fire_missile), target), 0.2 SECONDS * i) + +/obj/item/mod/module/sphere_transform/proc/fire_missile(atom/target) + var/obj/projectile/bullet/mining_missile/missile = new(mod.wearer.loc) + missile.aim_projectile(target, mod.wearer) + missile.firer = mod.wearer + if (isliving(target)) + missile.set_homing_target(target) + playsound(src, 'sound/items/weapons/gun/general/rocket_launch.ogg', 30, TRUE) + missile.fire() /obj/item/mod/module/sphere_transform/on_active_process(seconds_per_tick) if(!mod.wearer.has_gravity()) @@ -694,76 +710,60 @@ if(mod.wearer.stat) deactivate() -/obj/projectile/bullet/mining_bomb - name = "mining bomb" - desc = "A bomb. Why are you examining this?" - icon_state = "mine_bomb" +/obj/projectile/bullet/mining_missile + name = "mining micromissile" + desc = "A missile. Why are you examining this?" + icon_state = "mine_missile" icon = 'icons/obj/clothing/modsuit/mod_modules.dmi' - damage = 0 + damage = 3 // 3 * 4 = 12, *3 = 36 damage between 3 missiles range = 6 + homing_turn_speed = 12 suppressed = SUPPRESSED_VERY armor_flag = BOMB light_system = OVERLAY_LIGHT light_range = 1 light_power = 1 - light_color = COLOR_LIGHT_ORANGE + light_color = LIGHT_COLOR_BABY_BLUE embed_type = null can_hit_turfs = TRUE - -/obj/projectile/bullet/mining_bomb/Initialize(mapload) - . = ..() - AddElement(/datum/element/projectile_drop, /obj/structure/mining_bomb) - RegisterSignal(src, COMSIG_PROJECTILE_ON_SPAWN_DROP, PROC_REF(handle_drop)) - -/obj/projectile/bullet/mining_bomb/proc/handle_drop(datum/source, obj/structure/mining_bomb/mining_bomb) - SIGNAL_HANDLER - addtimer(CALLBACK(mining_bomb, TYPE_PROC_REF(/obj/structure/mining_bomb, prime), firer), mining_bomb.prime_time) - -/obj/structure/mining_bomb - name = "mining bomb" - desc = "A bomb. Why are you examining this?" - icon_state = "mine_bomb" - icon = 'icons/obj/clothing/modsuit/mod_modules.dmi' - anchored = TRUE - resistance_flags = FIRE_PROOF|LAVA_PROOF - light_system = OVERLAY_LIGHT - light_range = 1 - light_power = 1 - light_color = COLOR_LIGHT_ORANGE - /// Time to prime the explosion - var/prime_time = 0.1 SECONDS - /// Time to explode from the priming - var/explosion_time = 0.9 SECONDS // Roughly this much until the blast part of the explosion animation - /// Damage done on explosion. - var/damage = 7 - /// Damage multiplier on hostile fauna. + /// Damage multiplier against lavaland fauna var/fauna_boost = 4 -/obj/structure/mining_bomb/proc/prime(atom/movable/firer) - var/mutable_appearance/explosion_image = mutable_appearance('icons/effects/96x96.dmi', "judicial_explosion", FLOAT_LAYER, src, ABOVE_GAME_PLANE) - explosion_image.pixel_w = -32 - explosion_image.pixel_z = -32 - var/turf/our_loc = get_turf(src) - our_loc.flick_overlay_view(explosion_image, 1.35 SECONDS) - addtimer(CALLBACK(src, PROC_REF(boom), firer), explosion_time) +/obj/projectile/bullet/mining_missile/on_hit(atom/target, blocked, pierce_hit) + playsound(get_turf(target), 'sound/items/weapons/sonic_jackhammer.ogg', 75, TRUE) + if (ismineralturf(target)) + . = ..() + spawn_particles(target) + var/turf/closed/mineral/rock = target + rock.gets_drilled(firer) + return BULLET_ACT_HIT -/obj/structure/mining_bomb/proc/boom(atom/movable/firer) - visible_message(span_danger("[src] explodes!")) - playsound(src, 'sound/effects/magic/magic_missile.ogg', 200, vary = TRUE) - for(var/turf/closed/mineral/rock in circle_range_turfs(src, 1)) - rock.gets_drilled() - for(var/mob/living/victim in range(1, src)) - if(HAS_TRAIT(victim, TRAIT_MINING_AOE_IMMUNE)) - continue - victim.apply_damage(damage * (ismining(victim) ? fauna_boost : 1), BRUTE, spread_damage = TRUE) - to_chat(victim, span_userdanger("You are hit by a mining bomb explosion!")) - if(!firer) - continue - if(ishostile(victim)) - var/mob/living/simple_animal/hostile/hostile_mob = victim - hostile_mob.GiveTarget(firer) - else if(isbasicmob(victim)) - victim.ai_controller.set_blackboard_key(BB_BASIC_MOB_CURRENT_TARGET, firer) - for(var/obj/object in range(1, src)) - object.take_damage(damage, BRUTE, BOMB) - qdel(src) + if (!isliving(target)) + . = ..() + spawn_particles(target) + return + + if (isliving(target)) + var/mob/living/victim = target + if (ismining(victim)) + damage *= fauna_boost + . = ..() + spawn_particles(target) + +/obj/projectile/bullet/mining_missile/proc/spawn_particles(atom/target) + var/obj/effect/abstract/particle_holder/impact_particles = new(get_turf(target), /particles/micromissile_impact) + impact_particles.particles.position = generator(GEN_BOX, list(impact_x - 2, impact_y - 2), list(impact_x + 2, impact_y + 2), NORMAL_RAND) + impact_particles.particles.velocity = generator(GEN_BOX, list(movement_vector.pixel_x * 0.5 * speed * ICON_SIZE_X - 2, movement_vector.pixel_y * 0.5 * speed * ICON_SIZE_Y - 2, ), list(movement_vector.pixel_x * 0.5 * speed * ICON_SIZE_X + 2, movement_vector.pixel_y * 0.5 * speed * ICON_SIZE_Y + 2), NORMAL_RAND) + QDEL_IN(impact_particles, /particles/micromissile_impact::lifespan) + +/particles/micromissile_impact + icon = 'icons/effects/particles/generic.dmi' + icon_state = "cross" + width = 100 + height = 100 + count = 10 + spawning = 10 + color = LIGHT_COLOR_BABY_BLUE + lifespan = 1 SECONDS + fade = 1 SECONDS + spin = generator(GEN_NUM, -20, 20) diff --git a/code/modules/mod/modules/modules_timeline.dm b/code/modules/mod/modules/modules_timeline.dm index a544e0963e0..0573d23e7b1 100644 --- a/code/modules/mod/modules/modules_timeline.dm +++ b/code/modules/mod/modules/modules_timeline.dm @@ -418,9 +418,8 @@ /obj/structure/chrono_field/return_air() //we always have nominal air and temperature var/datum/gas_mixture/fresh_air = new - fresh_air.add_gases(/datum/gas/oxygen, /datum/gas/nitrogen) - fresh_air.gases[/datum/gas/oxygen][MOLES] = MOLES_O2STANDARD - fresh_air.gases[/datum/gas/nitrogen][MOLES] = MOLES_N2STANDARD + fresh_air.set_gas(/datum/gas/oxygen, MOLES_O2STANDARD) + fresh_air.set_gas(/datum/gas/nitrogen, MOLES_N2STANDARD) fresh_air.temperature = T20C return fresh_air diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm index 400d50d3b0b..d50d05864a7 100644 --- a/code/modules/modular_computers/computers/item/computer.dm +++ b/code/modules/modular_computers/computers/item/computer.dm @@ -688,7 +688,7 @@ data["PC_programheaders"] = program_headers - data["PC_stationtime"] = station_time_timestamp() + data["PC_stationtime"] = round_timestamp() data["PC_stationdate"] = "[time2text(world.realtime, "DDD, Month DD", NO_TIMEZONE)], [CURRENT_STATION_YEAR]" data["PC_showexitprogram"] = !!active_program // Hides "Exit Program" button on mainscreen return data diff --git a/code/modules/modular_computers/computers/item/pda.dm b/code/modules/modular_computers/computers/item/pda.dm index 4f6ff07ec18..cf1424cd189 100644 --- a/code/modules/modular_computers/computers/item/pda.dm +++ b/code/modules/modular_computers/computers/item/pda.dm @@ -369,6 +369,7 @@ /obj/item/modular_computer/pda/silicon/Destroy() silicon_owner = null + robotact = null return ..() ///Silicons don't have the tools (or hands) to make circuits setups with their own PDAs. diff --git a/code/modules/modular_computers/file_system/data.dm b/code/modules/modular_computers/file_system/data.dm index 7721d50b763..661318f4baf 100644 --- a/code/modules/modular_computers/file_system/data.dm +++ b/code/modules/modular_computers/file_system/data.dm @@ -98,6 +98,10 @@ src.workspace = workspace src.source_photo_or_painting = source_photo_or_painting +/datum/computer_file/data/paint_project/Destroy(force) + source_photo_or_painting = null + return ..() + /datum/computer_file/data/paint_project/clone(rename) var/datum/computer_file/data/paint_project/temp = ..() temp.workspace = workspace.copy() diff --git a/code/modules/modular_computers/file_system/image_file.dm b/code/modules/modular_computers/file_system/image_file.dm index f029793701d..8dcfd942f22 100644 --- a/code/modules/modular_computers/file_system/image_file.dm +++ b/code/modules/modular_computers/file_system/image_file.dm @@ -27,6 +27,10 @@ src.image_name = image_name set_source(source_photo_or_painting) +/datum/computer_file/image/Destroy(force) + source_photo_or_painting = null + return ..() + /datum/computer_file/image/on_install(datum/computer_file/source, obj/item/modular_computer/computer_installing) . = ..() assign_path() diff --git a/code/modules/modular_computers/file_system/programs/budgetordering.dm b/code/modules/modular_computers/file_system/programs/budgetordering.dm index 9aa1424b53d..9064df7067c 100644 --- a/code/modules/modular_computers/file_system/programs/budgetordering.dm +++ b/code/modules/modular_computers/file_system/programs/budgetordering.dm @@ -64,7 +64,7 @@ var/datum/bank_account/buyer = SSeconomy.get_dep_account(cargo_account) var/obj/item/card/id/id_card = computer.stored_id?.GetID() - if(id_card?.registered_account) + if(id_card?.registered_account?.account_job?.paycheck_department) buyer = SSeconomy.get_dep_account(id_card?.registered_account.account_job.paycheck_department) if((ACCESS_BUDGET in id_card.access)) requestonly = FALSE diff --git a/code/modules/modular_computers/file_system/programs/chatroom/conversation.dm b/code/modules/modular_computers/file_system/programs/chatroom/conversation.dm index 969e56195ed..0e65dfedd2a 100644 --- a/code/modules/modular_computers/file_system/programs/chatroom/conversation.dm +++ b/code/modules/modular_computers/file_system/programs/chatroom/conversation.dm @@ -46,13 +46,13 @@ return ..() /datum/ntnet_conversation/proc/add_message(message, username) - message = "[station_time_timestamp(format = "hh:mm")] [username]: [message]" + message = "[round_timestamp(format = "hh:mm")] [username]: [message]" messages["[next_message_id]"] = message next_message_id++ trim_message_list() /datum/ntnet_conversation/proc/add_status_message(message) - message = "[station_time_timestamp(format = "hh:mm")] -!- [message]" + message = "[round_timestamp(format = "hh:mm")] -!- [message]" messages["[next_message_id]"] = message next_message_id++ trim_message_list() diff --git a/code/modules/modular_computers/file_system/programs/chatroom/ntnrc_client.dm b/code/modules/modular_computers/file_system/programs/chatroom/ntnrc_client.dm index f71d985197c..5ea1bb1f51b 100644 --- a/code/modules/modular_computers/file_system/programs/chatroom/ntnrc_client.dm +++ b/code/modules/modular_computers/file_system/programs/chatroom/ntnrc_client.dm @@ -126,8 +126,8 @@ if("PRG_savelog") if(!channel) return - var/logname = stripped_input(params["log_name"]) - if(!logname) + var/logname = trim(params["log_name"], MAX_MESSAGE_LEN) + if(!length(logname) || !filter_filename_pda(logname)) return var/datum/computer_file/data/text/logfile = new() // Now we will generate HTML-compliant file that can actually be viewed/printed. diff --git a/code/modules/modular_computers/file_system/programs/crewmanifest.dm b/code/modules/modular_computers/file_system/programs/crewmanifest.dm index d0dcf0ae873..eccb78a58ff 100644 --- a/code/modules/modular_computers/file_system/programs/crewmanifest.dm +++ b/code/modules/modular_computers/file_system/programs/crewmanifest.dm @@ -23,7 +23,7 @@
[GLOB.manifest ? GLOB.manifest.get_html(0) : ""] "} - if(!computer.print_text(contents, "crew manifest ([station_time_timestamp()])")) + if(!computer.print_text(contents, "crew manifest ([round_timestamp()])")) to_chat(usr, span_notice("Printer is out of paper.")) return else diff --git a/code/modules/modular_computers/file_system/programs/file_browser.dm b/code/modules/modular_computers/file_system/programs/file_browser.dm index d25a9894307..8c3dbfe213a 100644 --- a/code/modules/modular_computers/file_system/programs/file_browser.dm +++ b/code/modules/modular_computers/file_system/programs/file_browser.dm @@ -119,8 +119,8 @@ GLOBAL_LIST_INIT(print_types, init_print_types()) var/datum/computer_file/file = computer.find_file_by_name(params["name"]) if(!file) return - var/newname = reject_bad_name(params["new_name"], allow_numbers = TRUE, cap_after_symbols = FALSE, cap_at_start = FALSE) - if(!newname || newname != params["new_name"]) + var/newname = trim(params["new_name"], MAX_MESSAGE_LEN) + if(!length(newname) || !filter_filename_pda(newname)) playsound(computer, 'sound/machines/terminal/terminal_error.ogg', 25, FALSE) return file.filename = newname @@ -131,8 +131,8 @@ GLOBAL_LIST_INIT(print_types, init_print_types()) var/datum/computer_file/file = computer.find_file_by_name(params["name"], computer.inserted_disk) if(!file) return - var/newname = reject_bad_name(params["new_name"], allow_numbers = TRUE, cap_after_symbols = FALSE, cap_at_start = FALSE) - if(!newname || newname != params["new_name"]) + var/newname = trim(params["new_name"], MAX_MESSAGE_LEN) + if(!length(newname) || !filter_filename_pda(newname)) playsound(computer, 'sound/machines/terminal/terminal_error.ogg', 25, FALSE) return file.filename = newname diff --git a/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm b/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm index e559d42e858..b52011f5c8e 100644 --- a/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm +++ b/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm @@ -552,7 +552,7 @@ return FALSE // Log it in our logs - var/datum/pda_message/message_datum = new(message, TRUE, station_time_timestamp(PDA_MESSAGE_TIMESTAMP_FORMAT), photo_asset_key, everyone, subtle = subtle) // BUBBER EDIT CHANGE - SUBTLE MESSAGES - Original: var/datum/pda_message/message_datum = new(message, TRUE, station_time_timestamp(PDA_MESSAGE_TIMESTAMP_FORMAT), photo_asset_key, everyone) + var/datum/pda_message/message_datum = new(message, TRUE, round_timestamp(PDA_MESSAGE_TIMESTAMP_FORMAT), photo_asset_key, everyone, subtle = subtle) // BUBBER EDIT CHANGE - SUBTLE MESSAGES - Original: var/datum/pda_message/message_datum = new(message, TRUE, round_timestamp(PDA_MESSAGE_TIMESTAMP_FORMAT), photo_asset_key, everyone) for(var/datum/pda_chat/target_chat as anything in target_chats) target_chat.add_message(message_datum, show_in_recents = !everyone) target_chat.unread_messages = 0 @@ -705,7 +705,7 @@ // don't create a new chat for rigged messages, make it a one off notif if(!is_rigged) - var/datum/pda_message/message = new(signal.data["message"], FALSE, station_time_timestamp(PDA_MESSAGE_TIMESTAMP_FORMAT), signal.data["photo"], signal.data["everyone"], signal.data["subtle"]) // BUBBER EDIT CHANGE - SUBTLE MESSAGES - Original: var/datum/pda_message/message = new(signal.data["message"], FALSE, station_time_timestamp(PDA_MESSAGE_TIMESTAMP_FORMAT), signal.data["photo"], signal.data["everyone"]) + var/datum/pda_message/message = new(signal.data["message"], FALSE, round_timestamp(PDA_MESSAGE_TIMESTAMP_FORMAT), signal.data["photo"], signal.data["everyone"], signal.data["subtle"]) // BUBBER EDIT CHANGE - SUBTLE MESSAGES - Original: var/datum/pda_message/message = new(signal.data["message"], FALSE, round_timestamp(PDA_MESSAGE_TIMESTAMP_FORMAT), signal.data["photo"], signal.data["everyone"]) chat = find_chat_by_recipient(is_fake_user ? fake_name : sender_ref, is_fake_user) if(!istype(chat)) diff --git a/code/modules/modular_computers/file_system/programs/nanopaint.dm b/code/modules/modular_computers/file_system/programs/nanopaint.dm index 6e2d4bd49ab..4d499db7c24 100644 --- a/code/modules/modular_computers/file_system/programs/nanopaint.dm +++ b/code/modules/modular_computers/file_system/programs/nanopaint.dm @@ -175,11 +175,14 @@ GLOBAL_LIST_INIT(nanopaint_supported_filetypes, zebra_typecacheof(list(\ return dialog = null var/uid = params["uid"] - var/new_file_name = params["name"] + var/new_file_name = trim(params["name"], MAX_MESSAGE_LEN) var/saving_to_disk = params["onDisk"] var/datum/computer_file/new_file_type = text2path(params["typepath"]) var/extension = new_file_type::filetype var/datum/computer_file/existing_file + if(!length(new_file_name)) + dialog = list("type" = "error", "message" = "No name specified.") + return TRUE if(saving_to_disk) if(!computer.inserted_disk) dialog = list("type" = "error", "message" = "[new_file_name] - The disk has been removed.") @@ -208,6 +211,12 @@ GLOBAL_LIST_INIT(nanopaint_supported_filetypes, zebra_typecacheof(list(\ else INVOKE_ASYNC(src, PROC_REF(write_to_file), user, existing_file) return TRUE + if(is_ic_filtered_for_pdas(new_file_name) || is_soft_ic_filtered_for_pdas(new_file_name)) + dialog = list("type" = "error", "message" = "The entered file name violates company policy.") + return TRUE + if(!filter_illegal_filename_chars(new_file_name)) + dialog = list("type" = "error", "message" = "[new_file_name] - File names cannot include the following characters. \n \\ / : * ? \" < > |") + return TRUE INVOKE_ASYNC(src, PROC_REF(save_file), user, new_file_name, new_file_type, saving_to_disk && computer.inserted_disk) return TRUE @@ -283,7 +292,7 @@ GLOBAL_LIST_INIT(nanopaint_supported_filetypes, zebra_typecacheof(list(\ /datum/computer_file/program/nanopaint/proc/save_file(mob/user, name, file_type, obj/item/disk/computer/target_disk) var/datum/computer_file/file = new file_type() - file.filename = reject_bad_name(name, allow_numbers = TRUE, cap_after_symbols = FALSE, cap_at_start = FALSE) + file.filename = name var/file_stored if(target_disk) file_stored = target_disk.add_file(file) diff --git a/code/modules/modular_computers/file_system/programs/secureye.dm b/code/modules/modular_computers/file_system/programs/secureye.dm index c488e1d0ec6..640de44979c 100644 --- a/code/modules/modular_computers/file_system/programs/secureye.dm +++ b/code/modules/modular_computers/file_system/programs/secureye.dm @@ -174,7 +174,7 @@ CRASH("[src] was able to track [target] through /datum/trackable, but was not on a visible turf to cameras.") for(var/obj/machinery/camera/cameras as anything in target_camerachunk.cameras["[target.z]"]) // We need to find a particular camera that can see this turf - if(length(cameras.can_see() & list(target_turf))) + if(!(length(cameras.can_see() & list(target_turf)))) continue var/new_camera = WEAKREF(cameras) if(camera_ref == new_camera) diff --git a/code/modules/movespeed/modifiers/mobs.dm b/code/modules/movespeed/modifiers/mobs.dm index f3107b31af3..a4003d92987 100644 --- a/code/modules/movespeed/modifiers/mobs.dm +++ b/code/modules/movespeed/modifiers/mobs.dm @@ -163,7 +163,7 @@ variable = TRUE /datum/movespeed_modifier/goliath_mount - multiplicative_slowdown = -27.5 + multiplicative_slowdown = -9.5 /datum/movespeed_modifier/goldgrub_mount multiplicative_slowdown = -4.5 diff --git a/code/modules/paperwork/fax.dm b/code/modules/paperwork/fax.dm index 3626a5122b2..1d8c3fa4ba2 100644 --- a/code/modules/paperwork/fax.dm +++ b/code/modules/paperwork/fax.dm @@ -491,7 +491,7 @@ GLOBAL_VAR_INIT(fax_autoprinting, FALSE) var/list/history_data = list() history_data["history_type"] = history_type history_data["history_fax_name"] = history_fax_name - history_data["history_time"] = station_time_timestamp() + history_data["history_time"] = round_timestamp() fax_history += list(history_data) /// Clears the history of fax operations. diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 71e3c03cb8a..5b2459d3caf 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -233,9 +233,9 @@ if(is_signature) field_text = signature_name else if(is_date) - field_text = "[time2text(world.timeofday, "DD/MM", NO_TIMEZONE)]/[CURRENT_STATION_YEAR]" + field_text = "[server_timestamp("DD/MM/YYYY", ic_time = TRUE)]" else if(is_time) - field_text = time2text(world.timeofday, "hh:mm", NO_TIMEZONE) + field_text = round_timestamp() var/field_font = is_signature ? SIGNATURE_FONT : font @@ -850,10 +850,8 @@ /// Returns the raw contents of the input as html, with **ZERO SANITIZATION** /datum/paper_input/proc/to_raw_html() var/final = raw_text - if(font) - final = "[final]" - if(colour) - final = "[final]" + if(font || colour) + final = "
"), mobs_spotted, dead_spotted, names, get_icon, null, width * ICON_SIZE_X, height * ICON_SIZE_X, blueprints, can_see_ghosts = see_ghosts) + var/datum/picture/picture = new( + "picture", + desc.Join("
"), + mobs_spotted, + dead_spotted, + names, + get_icon, + null, + width * ICON_SIZE_X, + height * ICON_SIZE_Y, + blueprints, + can_see_ghosts = see_ghosts, + ) after_picture(user, picture) SEND_SIGNAL(src, COMSIG_CAMERA_IMAGE_CAPTURED, target, user, picture) blending = FALSE @@ -302,7 +324,9 @@ /obj/item/camera/proc/after_picture(mob/user, datum/picture/picture) PROTECTED_PROC(TRUE) - if(!silent) + if(silent) + user.playsound_local(get_turf(src), SFX_POLAROID, 35, TRUE) + else playsound(loc, SFX_POLAROID, 75, TRUE, -3) if(print_picture_on_snap) @@ -429,3 +453,12 @@ else playsound(src, 'sound/machines/click.ogg', 50, TRUE) return CLICK_ACTION_SUCCESS + +/obj/item/camera/item_ctrl_click(mob/user) + print_monochrome = !print_monochrome + user.balloon_alert(user, "printing [print_monochrome ? "monochrome" : "in color"]") + if(silent) // Don't out your silent cameras + user.playsound_local(get_turf(src), 'sound/machines/click.ogg', 50, TRUE) + else + playsound(src, 'sound/machines/click.ogg', 50, TRUE) + return CLICK_ACTION_SUCCESS diff --git a/code/modules/photography/camera/camera_image_capturing.dm b/code/modules/photography/camera/camera_image_capturing.dm index 7a4cc5857a0..c2e516b6cfc 100644 --- a/code/modules/photography/camera/camera_image_capturing.dm +++ b/code/modules/photography/camera/camera_image_capturing.dm @@ -41,7 +41,7 @@ atoms += new /obj/effect/appearance_clone(newT, T.loc) if(T.lighting_object) var/obj/effect/appearance_clone/lighting_overlay = new(newT) - lighting_overlay.appearance = T.lighting_object.current_underlay + lighting_overlay.appearance = T.lighting_object.appearance lighting_overlay.underlays += backdrop lighting_overlay.blend_mode = BLEND_MULTIPLY lighting += lighting_overlay @@ -61,7 +61,7 @@ atoms += T if(T.lighting_object) var/obj/effect/appearance_clone/lighting_overlay = new(T) - lighting_overlay.appearance = T.lighting_object.current_underlay + lighting_overlay.appearance = T.lighting_object.appearance lighting_overlay.underlays += backdrop lighting_overlay.blend_mode = BLEND_MULTIPLY lighting += lighting_overlay @@ -155,6 +155,9 @@ else QDEL_LIST(lighting) + if(print_monochrome) + res.GrayScale() + return res #undef PHYSICAL_POSITION diff --git a/code/modules/photography/camera/other.dm b/code/modules/photography/camera/other.dm index cb976a8cf31..8598302c840 100644 --- a/code/modules/photography/camera/other.dm +++ b/code/modules/photography/camera/other.dm @@ -27,11 +27,8 @@ /obj/item/camera/detective name = "detective's camera" desc = "A silent polaroid camera with extra capacity for crime investigations." + print_monochrome = TRUE flash_enabled = FALSE silent = TRUE pictures_max = 30 pictures_left = 30 - -/obj/item/camera/detective/after_picture(mob/user, datum/picture/picture) - . = ..() - user.playsound_local(get_turf(src), SFX_POLAROID, 35, TRUE) diff --git a/code/modules/photography/photos/photo.dm b/code/modules/photography/photos/photo.dm index a6009b63528..1d98d728b29 100644 --- a/code/modules/photography/photos/photo.dm +++ b/code/modules/photography/photos/photo.dm @@ -20,8 +20,8 @@ /obj/item/photo/get_save_vars() return ..() - NAMEOF(src, icon) -/obj/item/photo/Initialize(mapload, datum/picture/P, datum_name = TRUE, datum_desc = TRUE) - set_picture(P, datum_name, datum_desc, TRUE) +/obj/item/photo/Initialize(mapload, datum/picture/P, datum_name = TRUE, datum_desc = TRUE, override_name = TRUE) + set_picture(P, datum_name, datum_desc, override_name) //Photos are quite rarer than papers, so they're more likely to be added to the queue to make things even. if(!mapload && prob(MESSAGE_BOTTLE_CHANCE * 5) && picture?.id) LAZYADD(SSpersistence.queued_message_bottles, src) @@ -55,7 +55,7 @@ if(!seen) P.mobs_seen -= seen_ref continue - if(!isobserver(seen) && !isghostspecies(seen)) + if(!isobserver(seen) && !isspirit(seen)) continue set_custom_materials(list(/datum/material/hauntium =SHEET_MATERIAL_AMOUNT)) break @@ -111,7 +111,7 @@ + "" \ + "
" \
+ "[scribble ? "Written on the back:
[scribble]" : ""]"\ - + "