\ diff --git a/code/game/machinery/teleporter/beacon.dm b/code/game/machinery/teleporter/beacon.dm index 6ba4dae0678a0..562ee031a05ee 100644 --- a/code/game/machinery/teleporter/beacon.dm +++ b/code/game/machinery/teleporter/beacon.dm @@ -13,6 +13,7 @@ var/global/const/TELEBEACON_WIRE_SIGNALLER = 4 active_power_usage = 50 anchored = TRUE level = ATOM_LEVEL_UNDER_TILE + layer = ABOVE_EXPOSED_WIRE_LAYER obj_flags = OBJ_FLAG_ANCHORABLE machine_name = "teleporter beacon" diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm index 83d35d44d2afd..66072ad0ecb20 100644 --- a/code/game/objects/buckling.dm +++ b/code/game/objects/buckling.dm @@ -355,16 +355,16 @@ if(M) if(M != user) user.visible_message( - SPAN_WARNING("\The [user] unbuckles \the [M] from \the [src]."), - SPAN_DANGER("You unbuckle \the [M] from \the [src]"), + SPAN_NOTICE("\The [user] unbuckles \the [M] from \the [src]."), + SPAN_NOTICE("You unbuckle \the [M] from \the [src]"), SPAN_NOTICE("You hear metal clanking."), exclude_mobs = list(M) ) to_chat(M, SPAN_DANGER("\The [user] unbuckles you from \the [src].")) else user.visible_message(\ - SPAN_WARNING("\The [user] unbuckles themselves from \the [src]."), - SPAN_DANGER("You unbuckle yourself from \the [src]."), + SPAN_NOTICE("\The [user] unbuckles themselves from \the [src]."), + SPAN_NOTICE("You unbuckle yourself from \the [src]."), SPAN_NOTICE("You hear metal clanking.") ) add_fingerprint(user) diff --git a/code/game/objects/effects/gibs.dm b/code/game/objects/effects/gibs.dm index 63fe2c56657b1..76918d8a27df2 100644 --- a/code/game/objects/effects/gibs.dm +++ b/code/game/objects/effects/gibs.dm @@ -9,6 +9,7 @@ var/fleshcolor //Used for gibbed humans. var/bloodcolor //Used for gibbed humans. var/datum/dna/MobDNA + var/virusProb = 20 //the chance for viruses to spread on the gibs [SIERRA-ADD] VIRUSOLOGY /obj/gibspawner/New(location, datum/dna/_MobDNA, _fleshcolor, _bloodcolor) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index c08685765ebbd..4cabaa3a2cce4 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -165,6 +165,12 @@ return TRUE return FALSE + +/obj/item/update_icon() + ..() + update_twohanding() + + /obj/item/ex_act(severity) ..() if (get_max_health()) @@ -555,6 +561,9 @@ var/global/list/slot_flags_enumeration = list( var/parry_chance = get_parry_chance(user, attacker) if(parry_chance) if(default_parry_check(user, attacker, damage_source) && prob(parry_chance)) + //[SIERRA-ADD] + user.dodge_animation(attacker = attacker) + //[SIERRA-ADD user.visible_message(SPAN_DANGER("\The [user] parries [attack_text] with \the [src]!")) admin_attack_log(attacker, user, "Attempted to attack with \a [damage_source] but was parried", "Was targeted with \a [damage_source] but parried the attack", "attmpted to use \a [damage_source] to attack but was parried by") playsound(user.loc, 'sound/weapons/punchmiss.ogg', 50, 1) diff --git a/code/game/objects/items/devices/oxycandle.dm b/code/game/objects/items/devices/oxycandle.dm index cfcccb79f8c9a..66b519271d9e5 100644 --- a/code/game/objects/items/devices/oxycandle.dm +++ b/code/game/objects/items/devices/oxycandle.dm @@ -47,7 +47,6 @@ STOP_PROCESSING(SSprocessing, src) on = 2 update_icon() - update_held_icon() SetName("burnt oxygen candle") desc += "This tube has exhausted its chemicals." return @@ -79,7 +78,6 @@ icon_state = "oxycandle" item_state = icon_state set_light(0) - update_held_icon() /obj/item/device/oxycandle/Destroy() QDEL_NULL(air_contents) diff --git a/code/game/objects/items/devices/paint_sprayer.dm b/code/game/objects/items/devices/paint_sprayer.dm index 27d9c5047d94e..77455ef03a83b 100644 --- a/code/game/objects/items/devices/paint_sprayer.dm +++ b/code/game/objects/items/devices/paint_sprayer.dm @@ -83,7 +83,6 @@ /obj/item/device/paint_sprayer/on_update_icon() ClearOverlays() AddOverlays(overlay_image(icon, "paint_sprayer_color", paint_color)) - update_held_icon() /obj/item/device/paint_sprayer/get_mob_overlay(mob/user_mob, slot, bodypart) var/image/ret = ..() diff --git a/code/game/objects/items/devices/scanners/health.dm b/code/game/objects/items/devices/scanners/health.dm index 4a648dd9b0852..dfd7a898621a0 100644 --- a/code/game/objects/items/devices/scanners/health.dm +++ b/code/game/objects/items/devices/scanners/health.dm @@ -287,6 +287,14 @@ chemtraces += "[initial(R.name)] ([H.chem_doses[T]])" if(length(chemtraces)) . += SPAN_CLASS("scan_notice", "Metabolism products of [english_list(chemtraces)] found in subject's system.") +//SIERRA-ADD VIRUSOLOGY + if(LAZYLEN(H.virus2)) + for (var/ID in H.virus2) + if (ID in virusDB) + print_reagent_default_message = FALSE + var/datum/computer_file/data/virus_record/V = virusDB[ID] + . += "Warning: Pathogen [V.fields["name"]] detected in subject's blood. Known antigen : [V.fields["antigen"]]" +//SIERRA-ADD if(print_reagent_default_message) . += "No results." diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 86533483ba592..cb043f4d6a04f 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -114,21 +114,21 @@ /obj/item/stack/tile/mono name = "steel mono tile" singular_name = "steel mono tile" - icon_state = "tile" + icon_state = "tile_mono" matter = list(MATERIAL_STEEL = 450) obj_flags = OBJ_FLAG_CONDUCTIBLE /obj/item/stack/tile/mono/dark name = "dark mono tile" singular_name = "dark mono tile" - icon_state = "fr_tile" + icon_state = "fr_tile_mono" matter = list(MATERIAL_STEEL = 450) obj_flags = OBJ_FLAG_CONDUCTIBLE /obj/item/stack/tile/mono/white name = "white mono tile" singular_name = "white mono tile" - icon_state = "tile_white" + icon_state = "tile_white_mono" matter = list(MATERIAL_PLASTIC = 450) /obj/item/stack/tile/grid diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index be391bad2ef24..e3b15af5a9b7c 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -480,6 +480,14 @@ var/global/const/NO_EMAG_ACT = -50 access = GLOB.using_map.synth_access.Copy() ..() +/obj/item/card/id/synthetic/ai + name = "\improper AI ID" + desc = "All-access module for the AI." + +/obj/item/card/id/synthetic/ai/New() + ..() + access = get_all_station_access() + access_synth + /obj/item/card/id/centcom name = "\improper CentCom. ID" desc = "An ID straight from Cent. Com." diff --git a/code/game/objects/items/weapons/circuitboards/computer/shuttle.dm b/code/game/objects/items/weapons/circuitboards/computer/shuttle.dm index 23734ac651316..d2e97106b6c3d 100644 --- a/code/game/objects/items/weapons/circuitboards/computer/shuttle.dm +++ b/code/game/objects/items/weapons/circuitboards/computer/shuttle.dm @@ -2,24 +2,7 @@ name = "circuit board (basic shuttle console)" build_path = /obj/machinery/computer/shuttle_control origin_tech = list(TECH_DATA = 3) - var/shuttle_tag - -/obj/item/stock_parts/circuitboard/shuttle_console/construct(obj/machinery/computer/shuttle_control/M) - M.shuttle_tag = shuttle_tag - -/obj/item/stock_parts/circuitboard/shuttle_console/deconstruct(obj/machinery/computer/shuttle_control/M) - shuttle_tag = M.shuttle_tag - -/obj/item/stock_parts/circuitboard/shuttle_console/Initialize() - set_extension(src, /datum/extension/interactive/multitool/circuitboards/shuttle_console) - . = ..() - -/obj/item/stock_parts/circuitboard/shuttle_console/proc/is_valid_shuttle(datum/shuttle/shuttle) - return TRUE /obj/item/stock_parts/circuitboard/shuttle_console/explore name = "circuit board (long range shuttle console)" build_path = /obj/machinery/computer/shuttle_control/explore - -/obj/item/stock_parts/circuitboard/shuttle_console/explore/is_valid_shuttle(datum/shuttle/shuttle) - return istype(shuttle, /datum/shuttle/autodock/overmap) diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index f84331d8aca00..04f03a56ca630 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -245,7 +245,6 @@ else wielded = 0 SetName(initial(name)) - update_icon() ..() /obj/item/shockpaddles/on_update_icon() diff --git a/code/game/objects/items/weapons/material/twohanded.dm b/code/game/objects/items/weapons/material/twohanded.dm index 326934d106ffd..2963bd6353692 100644 --- a/code/game/objects/items/weapons/material/twohanded.dm +++ b/code/game/objects/items/weapons/material/twohanded.dm @@ -37,7 +37,6 @@ else wielded = 0 force = force_unwielded - update_icon() ..() /obj/item/material/twohanded/update_force() diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index ba3c29e0324b3..de687a2a088b4 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -346,3 +346,7 @@ origin_tech = list(TECH_MAGNET = 3) active_attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut") hitsound = 'sound/weapons/blade1.ogg' + + +/obj/item/melee/energy/machete/IsHatchet() + return TRUE diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index adb5714b28cfa..ad243fb5c701c 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -63,7 +63,6 @@ playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1) add_fingerprint(user) update_icon() - update_held_icon() /obj/item/melee/telebaton/on_update_icon() if(on) diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index 9aa8260cf6022..ba7396770759c 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -21,7 +21,7 @@ if (fragile) return kill_health() damage = max(damage, 10) - ..() + return ..() /obj/structure/proc/mob_breakout(mob/living/escapee) set waitfor = FALSE @@ -56,7 +56,7 @@ fluid_update() -/obj/structure/use_weapon(obj/item/weapon, mob/user, list/click_params) +/obj/structure/use_weapon(obj/item/weapon, mob/living/user, list/click_params) // Natural Weapon - Passthrough to generic attack if (istype(weapon, /obj/item/natural_weapon)) attack_generic(user, weapon.force, pick(weapon.attack_verb), damtype = weapon.damtype, dam_flags = weapon.damage_flags()) @@ -139,7 +139,7 @@ return istype(S, src) /obj/structure/proc/refresh_neighbors() - for(var/thing in RANGE_TURFS(src, 1)) + for(var/thing as anything in RANGE_TURFS(src, 1)) var/turf/T = thing T.update_icon() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/service.dm b/code/game/objects/structures/crates_lockers/closets/secure/service.dm index 7c5437a7401e8..526e9503b867f 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/service.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/service.dm @@ -8,6 +8,7 @@ /obj/item/clothing/under/rank/chaplain, /obj/item/clothing/shoes/black, /obj/item/clothing/suit/chaplain_hoodie, + /obj/item/clothing/head/chaplain_hood, /obj/item/storage/candle_box = 2, /obj/item/storage/candle_box/incense, /obj/item/deck/tarot, @@ -15,5 +16,6 @@ /obj/item/nullrod, /obj/item/storage/bible, /obj/item/storage/belt/general, - /obj/item/material/urn + /obj/item/material/urn, + /obj/item/glass_jar ) diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora/flora.dm similarity index 92% rename from code/game/objects/structures/flora.dm rename to code/game/objects/structures/flora/flora.dm index 237a941fb3277..96f219081ab63 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora/flora.dm @@ -1,39 +1,20 @@ -//trees -/obj/structure/flora/tree - name = "tree" - anchored = TRUE - density = TRUE - pixel_x = -16 +/obj/structure/flora + name = "flora" layer = ABOVE_HUMAN_LAYER -/obj/structure/flora/tree/pine - name = "pine tree" - icon = 'icons/obj/flora/pinetrees.dmi' - icon_state = "pine_1" - -/obj/structure/flora/tree/pine/New() - ..() - icon_state = "pine_[rand(1, 3)]" -/obj/structure/flora/tree/pine/xmas - name = "\improper Christmas tree" - desc = "O Christmas tree, O Christmas tree..." - icon = 'icons/obj/flora/pinetrees.dmi' - icon_state = "pine_c" +/obj/structure/flora/use_tool(obj/item/tool, mob/user, list/click_params) + if (isHatchet(tool)) + if (!density) + user.visible_message( + SPAN_NOTICE("[user] cuts away \the [src]."), + SPAN_NOTICE("You cut away \the [src].") + ) + qdel_self() + return TRUE + return ..() -/obj/structure/flora/tree/pine/xmas/New() - ..() - icon_state = "pine_c" - -/obj/structure/flora/tree/dead - icon = 'icons/obj/flora/deadtrees.dmi' - icon_state = "tree_1" - -/obj/structure/flora/tree/dead/New() - ..() - icon_state = "tree_[rand(1, 6)]" -//grass /obj/structure/flora/grass name = "grass" icon = 'icons/obj/flora/snowflora.dmi' diff --git a/code/game/objects/structures/flora/tree.dm b/code/game/objects/structures/flora/tree.dm new file mode 100644 index 0000000000000..bd5dc47e4482c --- /dev/null +++ b/code/game/objects/structures/flora/tree.dm @@ -0,0 +1,235 @@ +/obj/structure/flora/tree + name = "tree" + anchored = TRUE + density = TRUE + pixel_x = -16 + layer = ABOVE_HUMAN_LAYER + health_max = 200 + + /// How much to shake the tree by when struck + var/shake_animation_degrees = 4 + + /// If set, a material product from cutting the tree down + var/material/product = MATERIAL_WOOD + + /// If there is a product, the max amount that can be produced + var/product_max = 10 + + /// When true, the tree has already been cut down + var/is_stump + + /// A local override for damage that should reduce the product_max + var/const/DAMAGE_FLAG_PRODUCT = FLAG(23) + + +/obj/structure/flora/tree/Initialize() + . = ..() + product = SSmaterials.get_material_by_name(product) + if (!product) + log_debug({"Instance of [type] created with bad product "[initial(product)]""}) + return INITIALIZE_HINT_QDEL + health_min_damage = 5 + + +/obj/structure/flora/tree/use_tool(obj/item/tool, mob/living/user, list/click_params) + SHOULD_CALL_PARENT(FALSE) + if (istype(tool, /obj/item/shovel) && user.a_intent != I_HURT) + if (!is_stump) + to_chat(user, SPAN_WARNING("You can't dig up \the [src] without cutting it down first!")) + return + if (!do_after(user, 5 SECONDS, src, DO_PUBLIC_UNIQUE)) + return + user.visible_message( + SPAN_ITALIC("\The [user] digs up \a [src] with \a [tool]."), + SPAN_ITALIC("You dig up \the [src] with \the [tool].") + ) + qdel(src) + return TRUE + user.setClickCooldown(user.get_attack_speed(tool)) + user.do_attack_animation(src) + TryChop(tool, user) + return TRUE + + +/obj/structure/flora/tree/use_weapon(obj/item/weapon, mob/living/user, list/click_params) + SHOULD_CALL_PARENT(FALSE) + if (!is_stump) + TryChop(weapon, user) + return TRUE + var/other_message = "" + var/self_message = "" + if (istype(weapon, /obj/item/natural_weapon)) + var/datum/pronouns/pronouns = user.choose_from_pronouns() + other_message = " with [pronouns.his] [weapon]" + self_message = " with your [weapon]" + else + other_message = " with \a [weapon]" + self_message = " with \the [weapon]" + user.visible_message( + SPAN_ITALIC("\The [user] hits \a [src][other_message]."), + SPAN_ITALIC("You hit \the [src][self_message].") + SPAN_WARNING(" It does nothing!"), + SPAN_WARNING("You hear something impact on wood!") + ) + return TRUE + + +/obj/structure/flora/tree/on_death() + if (holographic || is_stump) + return + if (product && product_max > 0) + var/amount = rand(ceil(product_max / 2), product_max) + product.place_sheet(get_turf(src), amount) + visible_message(SPAN_WARNING("\The [src] is felled!")) + icon_state = "[initial(icon_state)]_stump" + name = "[name] stump" + is_stump = TRUE + density = FALSE + set_light(0) + + +/obj/structure/flora/tree/proc/TryChop(obj/item/item, mob/living/user) + var/damage + var/damage_flags + var/chop + var/other_message = "" + var/self_message = "" + damage = item.force + chop = item.sharp && item.edge && user.a_intent != I_HURT + if (isHatchet(item)) + damage *= 1.5 + if (istype(item, /obj/item/natural_weapon)) + var/datum/pronouns/pronouns = user.choose_from_pronouns() + other_message = " with [pronouns.his] [item]" + self_message = " with your [item]" + else + other_message = " with \a [item]" + self_message = " with \the [item]" + if (holographic) + other_message = SPAN_ITALIC("\The [user] swipes at \a [src][other_message].") + self_message = SPAN_ITALIC("You swipe at \the [src][self_message].") + damage = 0 + else if (chop) + other_message = SPAN_ITALIC("\The [user] chops \a [src][other_message].") + self_message = SPAN_ITALIC("You chop \the [src][self_message].") + else if (item.sharp || item.edge) + other_message = SPAN_ITALIC("\The [user] hacks at \a [src][other_message].") + self_message = SPAN_ITALIC("You hack at \the [src][self_message].") + damage *= 0.5 + damage_flags = DAMAGE_FLAG_PRODUCT + else + other_message = SPAN_ITALIC("\The [user] hits \a [src][other_message].") + self_message = SPAN_ITALIC("You hit \the [src][self_message].") + damage *= 0.25 + damage_flags = DAMAGE_FLAG_PRODUCT + damage = max(damage, 0) + if (damage) + if (chop) + playsound(src, 'sound/effects/woodcutting.ogg', 50, TRUE) + else if (item?.hitsound) + playsound(src, item.hitsound, 50, TRUE) + if (damage < health_min_damage) + self_message += SPAN_WARNING(" It does nothing!") + else + damage_health(damage, item.damtype, damage_flags) + shake_animation(shake_animation_degrees) + user.visible_message( + other_message, + self_message, + SPAN_WARNING("You hear something impact on wood!") + ) + + +/obj/structure/flora/tree/damage_health(damage, damage_type, damage_flags, severity, skip_can_damage_check) + if (holographic || is_stump) + return FALSE + if (product_max && HAS_FLAGS(damage_flags, DAMAGE_FLAG_PRODUCT)) + var/removed = initial(product_max) * damage / get_max_health() + product_max -= max(removed, 0) + return ..() + + +/obj/structure/flora/tree/ex_act(severity) + damage_health(get_max_health() / severity, DAMAGE_EXPLODE, DAMAGE_FLAG_PRODUCT) + + +/obj/structure/flora/tree/bullet_act(obj/item/projectile/projectile) + if (!projectile.get_structure_damage()) + return + var/amount = projectile.get_structure_damage() + damage_health(amount, projectile.damage_type, DAMAGE_FLAG_PRODUCT) + + +/obj/structure/flora/tree/pine + name = "pine tree" + icon = 'icons/obj/flora/pinetrees.dmi' + icon_state = "pine" + product = MATERIAL_WOOD + shake_animation_degrees = 3 + + +/obj/structure/flora/tree/pine/Initialize() + . = ..() + var/state = rand(2) + if (state) + icon_state = "[initial(icon_state)]_[state]" + + +/obj/structure/flora/tree/pine/xmas + name = "\improper Christmas tree" + desc = "O Christmas tree, O Christmas tree..." + icon = 'icons/obj/flora/pinetrees.dmi' + product = MATERIAL_PLASTIC + product_max = 8 + + +/obj/structure/flora/tree/pine/xmas/Initialize() + . = ..() + icon_state = "pine_c" + + +/obj/structure/flora/tree/festivus + name = "\improper Festivus pole" + desc = "Technically, one could air a grievance with a feat of strength." + icon_state = "festivus_pole" + health_max = 100 + product_max = 5 + + +/obj/structure/flora/tree/dead + icon = 'icons/obj/flora/deadtrees.dmi' + icon_state = "tree" + + +/obj/structure/flora/tree/dead/Initialize() + . = ..() + var/state = rand(5) + if (state) + icon_state = "[initial(icon_state)]_[state]" + + +/obj/structure/flora/tree/alien + name = "alien tree" + desc = "A large xenofloral specimen." + icon = 'icons/obj/flora/deadtrees.dmi' + icon_state = "tree_sif" + + +/obj/structure/flora/tree/alien/Initialize() + . = ..() + var/state = rand(5) + if (state) + icon_state = "[initial(icon_state)]_[state]" + queue_icon_update() + + +/obj/structure/flora/tree/alien/on_death() + ..() + update_icon() + + +/obj/structure/flora/tree/alien/on_update_icon() + ClearOverlays() + if (is_stump) + return + var/mutable_appearance/glow = emissive_appearance(icon, "[icon_state]_glow", src, 128) + AddOverlays(glow) diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index 0243362d4ed15..1800df4b5a931 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -12,6 +12,8 @@ var/material_alteration = MATERIAL_ALTERATION_ALL /// Bitflags. Bed/chair specific flags. var/bed_flags = EMPTY_BITFIELD + /// How many sheets should be given when dismantled, based on their stack_recipe datum + var/dismantle_return = 2 /obj/structure/bed/New(newloc, new_material = DEFAULT_FURNITURE_MATERIAL, new_padding_material) @@ -184,7 +186,7 @@ update_icon() /obj/structure/bed/proc/dismantle() - material.place_sheet(get_turf(src)) + material.place_sheet(get_turf(src), dismantle_return) if(padding_material) padding_material.place_sheet(get_turf(src)) diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index a685a5d082376..a6e62e0d104ae 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -9,6 +9,7 @@ obj_flags = OBJ_FLAG_ROTATABLE var/propelled = 0 // Check for fire-extinguisher-driven chairs buckle_movable = TRUE + dismantle_return = 1 /obj/structure/bed/chair/do_simple_ranged_interaction(mob/user) if(!buckled_mob && user) @@ -140,6 +141,7 @@ desc = "It's a chair. It looks comfy." icon_state = "comfychair_preview" base_icon = "comfychair" + dismantle_return = 3 /obj/structure/bed/chair/comfy/brown/New(newloc, newmaterial = DEFAULT_FURNITURE_MATERIAL) ..(newloc, newmaterial, MATERIAL_LEATHER_GENERIC) @@ -192,6 +194,7 @@ icon_state = "armchair_preview" base_icon = "armchair" buckle_movable = FALSE + dismantle_return = 4 /obj/structure/bed/chair/armchair/brown/New(newloc, newmaterial = DEFAULT_FURNITURE_MATERIAL) ..(newloc, newmaterial, MATERIAL_LEATHER_GENERIC) @@ -228,6 +231,7 @@ icon_state = "officechair_preview" base_icon = "officechair" anchored = FALSE + dismantle_return = 5 /obj/structure/bed/chair/office/Move() . = ..() @@ -277,6 +281,7 @@ desc = "It's an office chair. It looks comfy." icon_state = "comfyofficechair_preview" base_icon = "comfyofficechair" + dismantle_return = 7 /obj/structure/bed/chair/office/comfy/brown/New(newloc, newmaterial = DEFAULT_FURNITURE_MATERIAL) ..(newloc, newmaterial, MATERIAL_LEATHER_GENERIC) @@ -351,6 +356,7 @@ var/chair_material = MATERIAL_WOOD buckle_movable = FALSE bed_flags = BED_FLAG_CANNOT_BE_PADDED + dismantle_return = 3 /obj/structure/bed/chair/wood/New(newloc, _material) ..(newloc, _material? _material : chair_material) @@ -403,6 +409,7 @@ var/material/pew_material = MATERIAL_WOOD obj_flags = 0 buckle_movable = FALSE + dismantle_return = 4 /obj/structure/bed/chair/pew/left icon_state = "pew_left" diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm index 5b5008c73d8d7..59c6b03d157e1 100644 --- a/code/game/turfs/flooring/flooring.dm +++ b/code/game/turfs/flooring/flooring.dm @@ -36,8 +36,10 @@ //How we smooth with other flooring var/decal_layer = DECAL_LAYER var/floor_smooth = SMOOTH_ALL - var/list/flooring_whitelist = list() //Smooth with nothing except the contents of this list - var/list/flooring_blacklist = list() //Smooth with everything except the contents of this list + /// Smooth with nothing except the types in this list. Turned into a typecache for performance reasons. + var/list/flooring_whitelist = list() + /// Smooth with everything except the types in this list. Turned into a typecache for performance reasons. + var/list/flooring_blacklist = list() //How we smooth with walls var/wall_smooth = SMOOTH_ALL @@ -49,6 +51,12 @@ var/height = 0 +/singleton/flooring/Initialize() + . = ..() + flooring_whitelist = typecacheof(flooring_whitelist) + flooring_blacklist = typecacheof(flooring_blacklist) + + /singleton/flooring/proc/on_remove() return diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm index dd48510132432..d184e1373c660 100644 --- a/code/game/turfs/simulated.dm +++ b/code/game/turfs/simulated.dm @@ -8,7 +8,7 @@ var/list/resources var/thermite = 0 - initial_gas = list(GAS_OXYGEN = MOLES_O2STANDARD, GAS_NITROGEN = MOLES_N2STANDARD) + initial_gas = GAS_STANDARD_AIRMIX var/to_be_destroyed = 0 //Used for fire, if a melting temperature was reached, it will be destroyed var/max_fire_temperature_sustained = 0 //The max temperature of the fire which it was subjected to var/dirt = 0 @@ -143,6 +143,9 @@ B.blood_DNA = list() if(!B.blood_DNA[M.dna.unique_enzymes]) B.blood_DNA[M.dna.unique_enzymes] = M.dna.b_type +//SIERRA-ADD VIRUSOLOGY + B.virus2 = virus_copylist(M.virus2) +//SIERRA-ADD return 1 //we bloodied the floor blood_splatter(src,M.get_blood(M.vessel),1) return 1 //we bloodied the floor diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index 2ceff4b48261f..6c20c815fea00 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -51,7 +51,7 @@ /turf/simulated/floor/proc/set_flooring(singleton/flooring/newflooring) make_plating(defer_icon_update = 1) flooring = newflooring - update_icon(1) + queue_icon_update(SSatoms.initialized) // only update neighbors if we're setting flooring after SSatoms has finished levelupdate() //This proc will set floor_type to null and the update_icon() proc will then change the icon_state of the turf @@ -106,7 +106,7 @@ initial_gas = null /turf/simulated/floor/shuttle_ceiling/air - initial_gas = list(GAS_OXYGEN = MOLES_O2STANDARD, GAS_NITROGEN = MOLES_N2STANDARD) + initial_gas = GAS_STANDARD_AIRMIX /turf/simulated/floor/is_floor() return TRUE diff --git a/code/game/turfs/simulated/floor_icon.dm b/code/game/turfs/simulated/floor_icon.dm index 0c85476e2311e..cc1023cf598e5 100644 --- a/code/game/turfs/simulated/floor_icon.dm +++ b/code/game/turfs/simulated/floor_icon.dm @@ -93,7 +93,7 @@ var/global/list/flooring_cache = list() if(update_neighbors) for(var/turf/simulated/floor/F in orange(src, 1)) F.queue_ao(FALSE) - F.update_icon() + F.queue_icon_update() /turf/simulated/floor/proc/get_flooring_overlay(cache_key, icon_base, icon_dir = 0, external = FALSE) if(!flooring_cache[cache_key]) @@ -125,50 +125,42 @@ var/global/list/flooring_cache = list() flooring_cache[cache_key] = I return flooring_cache[cache_key] -/singleton/flooring/proc/test_link(turf/origin, turf/T) +/singleton/flooring/proc/test_link(turf/origin, turf/opponent) var/is_linked = FALSE - //is_wall is true for wall turfs and for floors containing a low wall - if(T.is_wall()) - if(wall_smooth == SMOOTH_ALL) - is_linked = TRUE - - //If is_hole is true, then it's space or openspace - else if(T.is_open()) - if(space_smooth == SMOOTH_ALL) - is_linked = TRUE - - - //If we get here then its a normal floor - else if (T.is_floor()) - var/turf/simulated/floor/t = T - - //Check for window frames. - if(wall_smooth == SMOOTH_ALL) - for(var/obj/structure/wall_frame/WF in T.contents) + if(istype(origin) && istype(opponent)) + //is_wall is true for wall turfs and for floors containing a low wall + if(opponent.is_wall()) + if(wall_smooth == SMOOTH_ALL) is_linked = TRUE - //If the floor is the same as us,then we're linked, - if (istype(src, t.flooring)) - is_linked = TRUE - else if (floor_smooth == SMOOTH_ALL) - is_linked = TRUE - - else if (floor_smooth != SMOOTH_NONE) + //If is_hole is true, then it's space or openspace + else if(opponent.is_open()) + if(space_smooth == SMOOTH_ALL) + is_linked = TRUE - //If we get here it must be using a whitelist or blacklist - if (floor_smooth == SMOOTH_WHITELIST) - for (var/v in flooring_whitelist) - if (istype(t.flooring, v)) - //Found a match on the list + //If we get here then its a normal floor + else if (istype(opponent, /turf/simulated/floor)) + var/turf/simulated/floor/floor_opponent = opponent + //If the floor is the same as us,then we're linked, + if (istype(src, floor_opponent.flooring)) + is_linked = TRUE + else if (floor_smooth == SMOOTH_ALL) + is_linked = TRUE + else if (floor_smooth != SMOOTH_NONE) + //If we get here it must be using a whitelist or blacklist + if (floor_smooth == SMOOTH_WHITELIST) + if (flooring_whitelist[floor_opponent.flooring.type]) + //Found a match on the typecache is_linked = TRUE - break - else if(floor_smooth == SMOOTH_BLACKLIST) - is_linked = TRUE //Default to true for the blacklist, then make it false if a match comes up - for (var/v in flooring_whitelist) - if (istype(t.flooring, v)) - //Found a match on the list + else if(floor_smooth == SMOOTH_BLACKLIST) + is_linked = TRUE //Default to true for the blacklist, then make it false if a match comes up + if (flooring_blacklist[floor_opponent.flooring.type]) + //Found a match on the typecache is_linked = FALSE - break + //Check for window frames. + if (!is_linked && wall_smooth == SMOOTH_ALL) + if(locate(/obj/structure/wall_frame) in opponent) + is_linked = TRUE return is_linked /singleton/flooring/proc/symmetric_test_link(turf/A, turf/B) diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index 9c73f4d0374ba..86c5f9f4e91dc 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -65,7 +65,7 @@ return //We only need starlight on turfs adjacent to dynamically lit turfs, for example space near bulkhead - for (var/turf/T in RANGE_TURFS(src, 1)) + for (var/turf/T as anything in RANGE_TURFS(src, 1)) if (!isloc(T.loc) || !TURF_IS_DYNAMICALLY_LIT_UNSAFE(T)) continue diff --git a/code/game/turfs/turf_ao.dm b/code/game/turfs/turf_ao.dm index 34482bacb8c88..00236709e00b6 100644 --- a/code/game/turfs/turf_ao.dm +++ b/code/game/turfs/turf_ao.dm @@ -10,7 +10,7 @@ /turf/var/ao_queued = AO_UPDATE_NONE /turf/proc/regenerate_ao() - for (var/thing in RANGE_TURFS(src, 1)) + for (var/thing as anything in RANGE_TURFS(src, 1)) var/turf/T = thing if (T.permit_ao) T.queue_ao(TRUE) diff --git a/code/game/turfs/turf_changing.dm b/code/game/turfs/turf_changing.dm index 897d5b50dcc71..02433b8096d75 100644 --- a/code/game/turfs/turf_changing.dm +++ b/code/game/turfs/turf_changing.dm @@ -120,7 +120,7 @@ W.rebuild_zbleed() // end of lighting stuff - for(var/turf/T in RANGE_TURFS(src, 1)) + for(var/turf/T as anything in RANGE_TURFS(src, 1)) T.update_icon() if(density != old_density) diff --git a/code/game/turfs/unsimulated.dm b/code/game/turfs/unsimulated.dm index d66c333e4caca..e780db8b11dc0 100644 --- a/code/game/turfs/unsimulated.dm +++ b/code/game/turfs/unsimulated.dm @@ -1,6 +1,6 @@ /turf/unsimulated name = "command" - initial_gas = list(GAS_OXYGEN = MOLES_O2STANDARD, GAS_NITROGEN = MOLES_N2STANDARD) + initial_gas = GAS_STANDARD_AIRMIX turf_flags = TURF_DISALLOW_BLOB // the new Diona Death Prevention Feature: gives an average amount of lumination diff --git a/code/modules/ZAS/Turf.dm b/code/modules/ZAS/Turf.dm index 94f98bc4ddf3e..c7cc9a7b91cc7 100644 --- a/code/modules/ZAS/Turf.dm +++ b/code/modules/ZAS/Turf.dm @@ -5,9 +5,9 @@ /turf/var/datum/gas_mixture/air /turf/simulated/proc/update_graphic(list/graphic_add = null, list/graphic_remove = null) - if(graphic_add && length(graphic_add)) + if(length(graphic_add)) vis_contents += graphic_add - if(graphic_remove && length(graphic_remove)) + if(length(graphic_remove)) vis_contents -= graphic_remove /turf/proc/update_air_properties() @@ -243,12 +243,21 @@ /turf/proc/assume_gas(gasid, moles, temp = 0) return 0 +var/global/list/STANDARD_AIRMIX = list( + GAS_OXYGEN = MOLES_O2STANDARD, + GAS_NITROGEN = MOLES_N2STANDARD +) + /turf/return_air() //Create gas mixture to hold data for passing var/datum/gas_mixture/GM = new if(initial_gas) - GM.gas = initial_gas.Copy() + if(initial_gas == GAS_STANDARD_AIRMIX) + GM.gas = global.STANDARD_AIRMIX.Copy() + else + GM.gas = initial_gas.Copy() + GM.temperature = temperature GM.update_values() @@ -291,7 +300,10 @@ air = new/datum/gas_mixture air.temperature = temperature if(initial_gas) - air.gas = initial_gas.Copy() + if(initial_gas == GAS_STANDARD_AIRMIX) + air.gas = global.STANDARD_AIRMIX.Copy() + else + air.gas = initial_gas.Copy() air.update_values() /turf/simulated/proc/c_copy_air() diff --git a/code/modules/ZAS/Zone.dm b/code/modules/ZAS/Zone.dm index bce130e273e0e..8dcb8d2b78f4f 100644 --- a/code/modules/ZAS/Zone.dm +++ b/code/modules/ZAS/Zone.dm @@ -58,33 +58,35 @@ Class Procs: air.group_multiplier = 1 air.volume = CELL_VOLUME -/zone/proc/add(turf/simulated/T) +/zone/proc/add(turf/simulated/turf_to_add) #ifdef ZASDBG ASSERT(!invalid) - ASSERT(istype(T)) - ASSERT(!SSair.has_valid_zone(T)) + ASSERT(istype(turf_to_add)) + ASSERT(!SSair.has_valid_zone(turf_to_add)) #endif - var/datum/gas_mixture/turf_air = T.return_air() + var/datum/gas_mixture/turf_air = turf_to_add.return_air() add_tile_air(turf_air) - T.zone = src - contents.Add(T) - if(T.hotspot) - fire_tiles.Add(T) + turf_to_add.zone = src + contents += turf_to_add + + if(turf_to_add.hotspot) + fire_tiles += turf_to_add SSair.active_fire_zones |= src - T.update_graphic(air.graphic) -/zone/proc/remove(turf/simulated/T) + turf_to_add.update_graphic(air.graphic) + +/zone/proc/remove(turf/simulated/turf_to_remove) #ifdef ZASDBG ASSERT(!invalid) - ASSERT(istype(T)) - ASSERT(T.zone == src) - soft_assert(T in contents, "Lists are weird broseph") + ASSERT(istype(turf_to_remove)) + ASSERT(turf_to_remove.zone == src) + soft_assert(turf_to_remove in contents, "Lists are weird broseph") #endif - contents.Remove(T) - fire_tiles.Remove(T) - T.zone = null - T.update_graphic(graphic_remove = air.graphic) + contents -= turf_to_remove + fire_tiles -= turf_to_remove + turf_to_remove.zone = null + turf_to_remove.update_graphic(graphic_remove = air.graphic) if(length(contents)) air.group_multiplier = length(contents) else @@ -98,45 +100,45 @@ Class Procs: ASSERT(!into.invalid) #endif c_invalidate() - for(var/turf/simulated/T in contents) - into.add(T) - T.update_graphic(graphic_remove = air.graphic) + for(var/turf/simulated/inner_turf in contents) + into.add(inner_turf) + inner_turf.update_graphic(graphic_remove = air.graphic) #ifdef ZASDBG - T.dbg(merged) - #endif + inner_turf.dbg(merged) CHECK_TICK + #endif //rebuild the old zone's edges so that they will be possessed by the new zone - for(var/connection_edge/E in edges) - if(E.contains_zone(into)) + for(var/connection_edge/edge in edges) + if(edge.contains_zone(into)) continue //don't need to rebuild this edge - for(var/turf/T in E.connecting_turfs) - SSair.mark_for_update(T) + + for(var/turf/connecting_turf in edge.connecting_turfs) + SSair.mark_for_update(connecting_turf) /zone/proc/c_invalidate() - invalid = 1 + invalid = TRUE SSair.remove_zone(src) #ifdef ZASDBG - for(var/turf/simulated/T in contents) - T.dbg(invalid_zone) + for(var/turf/simulated/inner_turf in contents) + inner_turf.dbg(invalid_zone) #endif /zone/proc/rebuild() if(invalid) return //Short circuit for explosions where rebuild is called many times over. c_invalidate() - for(var/turf/simulated/T in contents) - T.update_graphic(graphic_remove = air.graphic) //we need to remove the overlays so they're not doubled when the zone is rebuilt - //T.dbg(invalid_zone) - T.needs_air_update = 0 //Reset the marker so that it will be added to the list. - SSair.mark_for_update(T) + for(var/turf/simulated/inner_turf in contents) + inner_turf.update_graphic(graphic_remove = air.graphic) //we need to remove the overlays so they're not doubled when the zone is rebuilt + inner_turf.needs_air_update = FALSE //Reset the marker so that it will be added to the list. + SSair.mark_for_update(inner_turf) /zone/proc/add_tile_air(datum/gas_mixture/tile_air) //air.volume += CELL_VOLUME air.group_multiplier = 1 air.multiply(length(contents)) air.merge(tile_air) - air.divide(length(contents)+1) - air.group_multiplier = length(contents)+1 + air.divide(length(contents) + 1) + air.group_multiplier = length(contents) + 1 /zone/proc/tick() diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index f953c7baaa02e..f1cc03276b3e1 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -147,6 +147,7 @@ var/global/list/admin_verbs_spawn = list( /client/proc/spawn_chemdisp_cartridge, // [SIERRA-ADD] - CLIENT_VERBS - , /client/proc/respawn_as_self, + /client/proc/virus2_editor, // [/SIERRA-ADD] - CLIENT_VERBS , /datum/admins/proc/mass_debug_closet_icons ) @@ -214,7 +215,7 @@ var/global/list/admin_verbs_debug = list( /client/proc/reload_webhooks, /client/proc/toggle_planet_repopulating, /client/proc/spawn_exoplanet, - /client/proc/profiler_start + /client/proc/profiler_init_verb ) var/global/list/admin_verbs_paranoid_debug = list( diff --git a/code/modules/admin/secrets/investigation/computer_logs.dm b/code/modules/admin/secrets/investigation/computer_logs.dm new file mode 100644 index 0000000000000..a6aace9ac71db --- /dev/null +++ b/code/modules/admin/secrets/investigation/computer_logs.dm @@ -0,0 +1,35 @@ +/datum/admin_secret_item/investigation/computer_logs + name = "Computer Logs" + var/list/filters_per_client + +/datum/admin_secret_item/investigation/computer_logs/New() + ..() + filters_per_client = list() + +/datum/admin_secret_item/investigation/computer_logs/execute(mob/user) + . = ..() + if(!.) + return + var/dat = list() + dat += "Refresh" + dat += "
" + dat += "
| Time | User | Command | ||||
|---|---|---|---|---|---|---|
| [al.station_time] | " + + if(al.user) + dat += "[al.user.key_name(check_if_offline = FALSE)] PP | " + + dat += "[al.command]" + if(al.location) + dat += " JMP" + dat += " | ||||
[extra_desc]" + +/atom/proc/GetExtendedLoadoutDescription() + return + +/obj/item/storage/GetExtendedLoadoutDescription() + var/list/description_counts = new() + for(var/atom/A in src) + description_counts[strip_improper(A.name)+"
"+A.desc]++ + + var/list/item_descriptions = list("Contains:") + if (length(description_counts)) + for (var/description_count in description_counts) + item_descriptions.Add("[description_counts[description_count]]×[description_count]") + else + item_descriptions.Add("Nothing") + + return FONT_SMALL(jointext(item_descriptions,"
")) /* * Content adjustment @@ -203,6 +234,86 @@ /datum/gear_tweak/custom_setup/tweak_item(user, item) call(item, custom_setup_proc)(user) +/* +* Custom [Var] +*/ +/datum/gear_tweak/custom_var + var/var_to_tweak + /// The user input method to use if `valid_list_options` does not contain any items. + var/input_method = /datum/gear_tweak/custom_var/proc/InputText + var/content_text + var/input_title = CHARACTER_PREFERENCE_INPUT_TITLE + var/input_message + /// Used to sanitize when using the input_message and input_text methods. + var/max_input_length = MAX_MESSAGE_LEN + /// Used to sanitize when using the input_num method. Setting this var does not mandate setting max_input_value. + var/min_input_value + /// Used to sanitize when using the input_num method. Setting this var does not mandate setting min_input_value. + var/max_input_value + /// If this list contains items the user is limited to these choices. + var/list/valid_list_options + +/datum/gear_tweak/custom_var/New(list/valid_list_options) + src.valid_list_options = valid_list_options + ..() + +/datum/gear_tweak/custom_var/get_metadata(user, metadata, title) + var/final_title = title || input_title || CHARACTER_PREFERENCE_INPUT_TITLE + if(length(valid_list_options)) + return input(user, input_message + " Click cancel to use the default.", final_title, metadata) as null|anything in valid_list_options + var/default = html_decode(metadata) + return call(src, input_method)(user, input_message + " Leave blank to use the default.", final_title, default) + +/datum/gear_tweak/custom_var/tweak_item(user, obj/item/item, metadata) + if(!metadata) + return + if (length(valid_list_options) && !(metadata in valid_list_options)) + return + metadata = TweakMetadata(metadata) + SetVar(item, metadata) + +/// Override this var if a particular proc call is needed, for example /SetName() when setting the name-var +/datum/gear_tweak/custom_var/proc/SetVar(obj/item/item, metadata) + SHOULD_NOT_SLEEP(TRUE) + PROTECTED_PROC(TRUE) + item.vars[var_to_tweak] = metadata + +/datum/gear_tweak/custom_var/proc/TweakMetadata(metadata) + SHOULD_BE_PURE(TRUE) + SHOULD_NOT_SLEEP(TRUE) + PROTECTED_PROC(TRUE) + return metadata + +/datum/gear_tweak/custom_var/get_contents(metadata) + return "[content_text]: [metadata]" + +// Note, didn't make these available for general use mainly due to the number of arguments needed for both input and sanitize +// Nothing stops you from generalizing these if you really wanted to +/datum/gear_tweak/custom_var/proc/InputNum(mob/user, message, title, default) + SHOULD_NOT_OVERRIDE(TRUE) + PROTECTED_PROC(TRUE) + var/num = input(user, message, title, default) as null|num + if (isnum(min_input_value)) + num = max(min_input_value, num) + if (isnum(max_input_value)) + num = min(max_input_value, num) + return num + +/datum/gear_tweak/custom_var/proc/InputText(mob/user, message, title, default, max_length) + SHOULD_NOT_OVERRIDE(TRUE) + PROTECTED_PROC(TRUE) + return sanitize(input(user, message, title, default) as null|text, max_input_length || MAX_MESSAGE_LEN, extra = FALSE) + +/datum/gear_tweak/custom_var/proc/InputMessage(mob/user, message, title, default, max_length) + SHOULD_NOT_OVERRIDE(TRUE) + PROTECTED_PROC(TRUE) + return sanitize(input(user, message, title, default) as null|message, max_input_length || MAX_MESSAGE_LEN, extra = FALSE) + +/datum/gear_tweak/custom_var/proc/InputColor(mob/user, message, title, default, max_length) + SHOULD_NOT_OVERRIDE(TRUE) + PROTECTED_PROC(TRUE) + return input(user, message, title, default) as null|color + /* * Custom Name */ @@ -220,12 +331,16 @@ /datum/gear_tweak/custom_name/get_metadata(user, metadata, title) if(valid_custom_names) return input(user, "Choose an item name.", "Character Preference", metadata) as null|anything in valid_custom_names + metadata = html_decode(metadata) return sanitize(input(user, "Choose the item's name. Leave it blank to use the default name.", "Item Name", metadata) as text|null, MAX_LNAME_LEN, extra = FALSE) /datum/gear_tweak/custom_name/tweak_item(user, obj/item/I, metadata) if(!metadata) - return I.name - return I.name = metadata + return + var/lower = lowertext(metadata) + if (!text_starts_with(lower, "a ") && !text_starts_with(lower, "an ") && !text_starts_with(lower, "the ")) + metadata = "\improper[metadata]" + I.SetName(metadata) /* Custom Description @@ -244,13 +359,13 @@ Custom Description /datum/gear_tweak/custom_desc/get_metadata(user, metadata, title) if(valid_custom_desc) return input(user, "Choose an item description.", "Character Preference", metadata) as null|anything in valid_custom_desc + metadata = html_decode(metadata) return sanitize(input(user, "Choose the item's description. Leave it blank to use the default description.", "Item Description", metadata) as message|null, MAX_DESC_LEN, extra = FALSE) /datum/gear_tweak/custom_desc/tweak_item(user, obj/item/I, metadata) if(!metadata) - return I.desc - return I.desc = metadata - + return + I.desc = metadata /* * Tablet Stuff diff --git a/code/modules/client/preference_setup/loadout/lists/accessories.dm b/code/modules/client/preference_setup/loadout/lists/accessories.dm index e7eedc58dd36c..e5736bc2c89d6 100644 --- a/code/modules/client/preference_setup/loadout/lists/accessories.dm +++ b/code/modules/client/preference_setup/loadout/lists/accessories.dm @@ -65,7 +65,7 @@ description = "A medal or ribbon awarded to corporate personnel for significant accomplishments." path = /obj/item/storage/medalbox cost = 6 - flags = GEAR_HAS_NO_CUSTOMIZATION + flags = GEAR_HAS_NO_CUSTOMIZATION | GEAR_HAS_EXTENDED_DESCRIPTION /datum/gear/accessory/ntaward/New() @@ -171,32 +171,40 @@ /datum/gear/accessory/pronouns - display_name = "pronoun badge selection" - description = "A selection of badges used to indicate the preferred pronouns of the wearer." + display_name = "pronoun badge, customisable" + description = "A badge used to indicate the preferred pronouns of the wearer." path = /obj/item/clothing/accessory/pronouns -/datum/gear/accessory/pronouns/New() +/datum/gear/accessory/pride_pins + display_name = "pride pin selection, primary" + description = "A selection of pins used to signal membership or support of an identity or sexuality." + path = /obj/item/clothing/accessory/pride_pin + flags = GEAR_HAS_NO_CUSTOMIZATION + + +/datum/gear/accessory/pride_pins/New() ..() var/list/options = list() - options["they/them badge"] = /obj/item/clothing/accessory/pronouns/they - options["he/him badge"] = /obj/item/clothing/accessory/pronouns/hehim - options["she/her badge"] = /obj/item/clothing/accessory/pronouns/sheher - options["he/they badge"] = /obj/item/clothing/accessory/pronouns/hethey - options["she/they badge"] = /obj/item/clothing/accessory/pronouns/shethey - options["he/she badge"] = /obj/item/clothing/accessory/pronouns/heshe - options["ze/hir badge"] = /obj/item/clothing/accessory/pronouns/zehir - options["ask me badge"] = /obj/item/clothing/accessory/pronouns/ask + options["transgender pride pin"] = /obj/item/clothing/accessory/pride_pin/transgender + options["lesbian pride pin"] = /obj/item/clothing/accessory/pride_pin/lesbian + options["bisexual pride pin"] = /obj/item/clothing/accessory/pride_pin/bisexual + options["gay pride pin"] = /obj/item/clothing/accessory/pride_pin/gay + options["pansexual pride pin"] = /obj/item/clothing/accessory/pride_pin/pansexual + options["nonbinary pride pin"] = /obj/item/clothing/accessory/pride_pin/nonbinary + options["asexual pride pin"] = /obj/item/clothing/accessory/pride_pin/asexual + options["intersex pride pin"] = /obj/item/clothing/accessory/pride_pin/intersex + options["aromantic pride pin"] = /obj/item/clothing/accessory/pride_pin/aromantic gear_tweaks += new /datum/gear_tweak/path (options) -/datum/gear/accessory/pride_pins - display_name = "pride pin selection" +/datum/gear/accessory/pride_pins_secondary + display_name = "pride pin selection, secondary" description = "A selection of pins used to signal membership or support of an identity or sexuality." path = /obj/item/clothing/accessory/pride_pin -/datum/gear/accessory/pride_pins/New() +/datum/gear/accessory/pride_pins_secondary/New() ..() var/list/options = list() options["transgender pride pin"] = /obj/item/clothing/accessory/pride_pin/transgender @@ -216,3 +224,10 @@ description = "A piece of cloth tied around the neck. A favorite of Sailors and Partisans everywhere." path = /obj/item/clothing/accessory/neckerchief flags = GEAR_HAS_COLOR_SELECTION + + +/datum/gear/accessory/stole + display_name = "stole, colour select" + description = "A long, colourful liturgical vestment used by Christian clergy." + path = /obj/item/clothing/accessory/stole + flags = GEAR_HAS_COLOR_SELECTION diff --git a/code/modules/client/preference_setup/loadout/lists/suits.dm b/code/modules/client/preference_setup/loadout/lists/suits.dm index 0e1e8ae7fb7a3..1305a43714d10 100644 --- a/code/modules/client/preference_setup/loadout/lists/suits.dm +++ b/code/modules/client/preference_setup/loadout/lists/suits.dm @@ -5,33 +5,33 @@ /datum/gear/suit/poncho display_name = "poncho selection" - path = /obj/item/clothing/suit/poncho/colored + path = /obj/item/clothing/suit/poncho cost = 1 flags = GEAR_HAS_TYPE_SELECTION /datum/gear/suit/security_poncho display_name = "poncho, security" - path = /obj/item/clothing/suit/poncho/roles/security + path = /obj/item/clothing/suit/poncho/security /datum/gear/suit/medical_poncho display_name = "poncho, medical" - path = /obj/item/clothing/suit/poncho/roles/medical + path = /obj/item/clothing/suit/poncho/medical /datum/gear/suit/engineering_poncho display_name = "poncho, engineering" - path = /obj/item/clothing/suit/poncho/roles/engineering + path = /obj/item/clothing/suit/poncho/engineering /datum/gear/suit/science_poncho display_name = "poncho, science" - path = /obj/item/clothing/suit/poncho/roles/science + path = /obj/item/clothing/suit/poncho/science /datum/gear/suit/nanotrasen_poncho display_name = "poncho, NanoTrasen" - path = /obj/item/clothing/suit/poncho/roles/science/nanotrasen + path = /obj/item/clothing/suit/poncho/nanotrasen /datum/gear/suit/cargo_poncho display_name = "poncho, supply" - path = /obj/item/clothing/suit/poncho/roles/cargo + path = /obj/item/clothing/suit/poncho/cargo /datum/gear/suit/suit_jacket display_name = "standard suit jackets" diff --git a/code/modules/client/preference_setup/loadout/loadout.dm b/code/modules/client/preference_setup/loadout/loadout.dm index fa548d76584fe..54b0a1052749e 100644 --- a/code/modules/client/preference_setup/loadout/loadout.dm +++ b/code/modules/client/preference_setup/loadout/loadout.dm @@ -191,7 +191,7 @@ var/global/list/gear_datums = list() entry += "
" + wound_flavor_text[E.name] += SPAN_DANGER("[P.He] [P.has] [E.get_wounds_desc()] on [P.his] [E.parent.name].
") else if(!is_synth && BP_IS_ROBOTIC(E) && (E.parent && !BP_IS_ROBOTIC(E.parent) && !BP_IS_ASSISTED(E.parent))) - wound_flavor_text[E.name] = "[P.He] [P.has] a [E.name].\n" + wound_flavor_text[E.name] = SPAN_INFO("[P.He] [P.has] a [E.name].\n") var/wounddesc = E.get_wounds_desc() if(wounddesc != "nothing") - wound_flavor_text[E.name] += "[P.He] [P.has] [wounddesc] on [P.his] [E.name].
" + wound_flavor_text[E.name] += SPAN_DANGER("[P.He] [P.has] [wounddesc] on [P.his] [E.name].
") if(!hidden || distance <=1) if(E.dislocated > 0) - wound_flavor_text[E.name] += "[P.His] [E.joint] is dislocated!
" + wound_flavor_text[E.name] += SPAN_WARNING("[P.His] [E.joint] is dislocated!
") if(((E.status & ORGAN_BROKEN) && E.brute_dam > E.min_broken_damage) || (E.status & ORGAN_MUTATED)) - wound_flavor_text[E.name] += "[P.His] [E.name] is dented and swollen!
" + wound_flavor_text[E.name] += SPAN_DANGER("[P.His] [E.name] is dented and swollen!
") for(var/datum/wound/wound in E.wounds) var/list/embedlist = wound.embedded_objects @@ -271,14 +271,12 @@ else if(!parsedembed.Find("multiple [embedded.name]")) parsedembed.Remove(embedded.name) parsedembed.Add("multiple "+embedded.name) - wound_flavor_text["[E.name]"] += "The [wound.desc] on [P.his] [E.name] has \a [english_list(parsedembed, and_text = " and a ", comma_text = ", a ")] sticking out of it!
" + wound_flavor_text["[E.name]"] += SPAN_DANGER("The [wound.desc] on [P.his] [E.name] has \a [english_list(parsedembed, and_text = " and a ", comma_text = ", a ")] sticking out of it!
") for(var/hidden in hidden_bleeders) - wound_flavor_text[hidden] = "[P.He] [P.has] blood soaking through [hidden] around [P.his] [english_list(hidden_bleeders[hidden])]!
" + wound_flavor_text[hidden] = SPAN_DANGER("[P.He] [P.has] blood soaking through [hidden] around [P.his] [english_list(hidden_bleeders[hidden])]!
") - var/wound_msg = "" for(var/limb in wound_flavor_text) - wound_msg += wound_flavor_text[limb] - msg += SPAN_WARNING(wound_msg) + msg += wound_flavor_text[limb] for(var/obj/implant in get_visible_implants(0)) if(implant in shown_objects) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 9ff7c549fabc5..8d44287a24820 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -943,6 +943,11 @@ if(H.brainmob.mind) H.brainmob.mind.transfer_to(src) qdel(H) + //[SIERRA-ADD] VIRUSOLOGY + for (var/ID in virus2) + var/datum/disease2/disease/V = virus2[ID] + V.cure(src) + //[/SIERRA-ADD] losebreath = 0 diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 03317ede2e982..c9d7ee2f069fd 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -61,6 +61,11 @@ apply_effect(4, EFFECT_WEAKEN, armor_block) return +//[SIERRA-ADD] VIRUSOLOGY + if(istype(M,/mob/living/carbon)) + M.spread_disease_to(src, "Contact") +//[/SIERRA-ADD] VIRUSOLOGY + for (var/obj/item/grab/G in H) if (G.assailant == H && G.affecting == src) if(G.resolve_openhand_attack()) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 1c4da4029e33b..b5dbd48eb60b1 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -964,8 +964,16 @@ /mob/living/carbon/human/proc/handle_hud_list() + var/foundVirus = 0 //SIERRA-ADD if (GET_BIT(hud_updateflag, HEALTH_HUD) && hud_list[HEALTH_HUD]) var/image/holder = hud_list[HEALTH_HUD] +//SIERRA-ADD VIRUSOLOGY + for (var/ID in virus2) + if (ID in virusDB) + foundVirus = 1 + break + +//SIERRA-ADD if(stat == DEAD || status_flags & FAKEDEATH) holder.icon_state = "0" // X_X else if(is_asystole()) @@ -978,6 +986,10 @@ var/image/holder = hud_list[LIFE_HUD] if(stat == DEAD || status_flags & FAKEDEATH) holder.icon_state = "huddead" +//SIERRA-ADD VIRUSOLOGY + else if(foundVirus) + holder.icon_state = "hudill" +//SIERRA-ADD else holder.icon_state = "hudhealthy" hud_list[LIFE_HUD] = holder @@ -1001,6 +1013,10 @@ holder2.icon_state = "huddead" else if(has_brain_worms()) holder2.icon_state = "hudbrainworm" +//SIERRA-ADD VIRUSOLOGY + else if(foundVirus) + holder.icon_state = "hudill" +//SIERRA-ADD else holder2.icon_state = "hudhealthy" diff --git a/code/modules/mob/living/carbon/viruses.dm b/code/modules/mob/living/carbon/viruses.dm index 9f657c52aa5cf..ca6a3b1a0fb09 100644 --- a/code/modules/mob/living/carbon/viruses.dm +++ b/code/modules/mob/living/carbon/viruses.dm @@ -1,16 +1,69 @@ /mob/living/carbon var/immunity = 100 //current immune system strength +//[SIERRA-ADD] VIRUSOLOGY var/immunity_norm = 100 //it will regenerate to this value /mob/living/carbon/proc/handle_viruses() if(status_flags & GODMODE) return 0 //godmode + if(bodytemperature > 406) + for (var/ID in virus2) + var/datum/disease2/disease/V = virus2[ID] + V.cure(src) + if(life_tick % 3) //don't spam checks over all objects in view every tick. + for(var/obj/decal/cleanable/O in view(1,src)) + if(istype(O,/obj/decal/cleanable/blood)) + var/obj/decal/cleanable/blood/B = O + if(isnull(B.virus2)) + B.virus2 = list() + if(LAZYLEN(B.virus2)) + for (var/ID in B.virus2) + var/datum/disease2/disease/V = B.virus2[ID] + infect_virus2(src,V) + + else if(istype(O,/obj/decal/cleanable/mucus)) + var/obj/decal/cleanable/mucus/M = O + if(isnull(M.virus2)) + M.virus2 = list() + if(LAZYLEN(M.virus2)) + for (var/ID in M.virus2) + var/datum/disease2/disease/V = M.virus2[ID] + infect_virus2(src,V) + + if(LAZYLEN(virus2)) + for (var/ID in virus2) + var/datum/disease2/disease/V = virus2[ID] + if(isnull(V)) // Trying to figure out a runtime error that keeps repeating + CRASH("virus2 nulled before calling activate()") + else + V.process(src) + // activate may have deleted the virus + if(!V) continue + + // check if we're immune + var/list/common_antibodies = V.antigen & src.antibodies + if(LAZYLEN(common_antibodies)) + V.dead = 1 +//[/SIERRA-ADD] VIRUSOLOGY if(immunity > 0.2 * immunity_norm && immunity < immunity_norm) immunity = min(immunity + 0.25, immunity_norm) +//[SIERRA-ADD] VIRUSOLOGY + if(life_tick % 5 && immunity < 15 && chem_effects[CE_ANTIVIRAL] < VIRUS_COMMON && !LAZYLEN(virus2)) + var/infection_prob = 5 - immunity + var/turf/simulated/T = loc + if(istype(T)) + infection_prob += T.dirt + if(T.dirt >= 50) + if(prob(infection_prob)) + infect_mob_random_greater(src) + else + if(prob(infection_prob)) + infect_mob_random_lesser(src) +//[/SIERRA-ADD] VIRUSOLOGY /mob/living/carbon/proc/virus_immunity() var/antibiotic_boost = reagents.get_reagent_amount(/datum/reagent/spaceacillin) / (REAGENTS_OVERDOSE/2) return max(immunity/100 * (1+antibiotic_boost), antibiotic_boost) /mob/living/carbon/proc/immunity_weakness() - return max(2-virus_immunity(), 0) \ No newline at end of file + return max(2-virus_immunity(), 0) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index fa38f46b4221f..6a4095f65c5eb 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -114,6 +114,8 @@ var/global/list/ai_verbs_default = list( var/default_ai_icon = /singleton/ai_icon/blue var/static/list/custom_ai_icons_by_ckey_and_name + idcard = /obj/item/card/id/synthetic/ai + /mob/living/silicon/ai/proc/add_ai_verbs() src.verbs |= ai_verbs_default src.verbs -= /mob/living/verb/ghost diff --git a/code/modules/mob/living/simple_animal/hostile/vagrant.dm b/code/modules/mob/living/simple_animal/hostile/vagrant.dm index d0b94a707501d..42c2e35bd82f0 100644 --- a/code/modules/mob/living/simple_animal/hostile/vagrant.dm +++ b/code/modules/mob/living/simple_animal/hostile/vagrant.dm @@ -28,13 +28,22 @@ var/blood_per_tick = 3 var/health_per_tick = 0.8 pass_flags = PASS_FLAG_TABLE - + var/datum/disease2/disease/carried //[SIERRA-ADD] VIRUSOLOGY bleed_colour = "#aad9de" ai_holder = /datum/ai_holder/hostile/melee/vagrant /datum/ai_holder/hostile/melee/vagrant + +//[SIERRA-ADD] VIRUSOLOGY +/mob/living/simple_animal/hostile/vagrant/Initialize() + . = ..() + if(prob(25)) + carried = new/datum/disease2/disease() + carried.makerandom(rand(2, 4)) +//[/SIERRA-ADD] VIRUSOLOGY + /datum/ai_holder/hostile/melee/vagrant/engage_target() if(ishuman(target)) var/mob/living/carbon/human/H = target @@ -53,7 +62,10 @@ H.Stun(1) H.visible_message(SPAN_DANGER("\the [holder] latches onto \the [H], pulsating!")) V.forceMove(V.gripping.loc) - + //[SIERRA-ADD] VIRUSOLOGY + if(V.carried && length(V.gripping.virus2) == 0) + infect_virus2(V.gripping, V.carried, 1) + //[/SIERRA-ADD] VIRUSOLOGY /mob/living/simple_animal/hostile/vagrant/Process_Spacemove() return 1 diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 60932e7b78177..1b02c7ca507e6 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -610,7 +610,9 @@ else //Otherwise we're probably just holding their arm to lead them somewhere var/grabtype - if(H.has_organ(BP_L_ARM) || H.has_organ(BP_R_ARM)) //If they have at least one arm + if ((H.has_organ(BP_L_HAND) || H.has_organ(BP_R_HAND)) && (zone_sel.selecting == BP_L_HAND || zone_sel.selecting == BP_R_HAND)) + grabtype = "hand" + else if(H.has_organ(BP_L_ARM) || H.has_organ(BP_R_ARM)) //If they have at least one arm grabtype = "arm" else //If they have no arms grabtype = "shoulder" diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 7de3edeeac4e8..72ef605ecb7a7 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -360,27 +360,47 @@ to_chat(src, "You will now default to [default_run_intent] when moving quickly.") /client/verb/setmovingslowly() - set hidden = 1 - if(mob) + set hidden = TRUE + if (!mob) + return + if (mob.get_preference_value(/datum/client_preference/toggle_run) == GLOB.PREF_NO) mob.set_moving_slowly() + /mob/proc/set_moving_slowly() - if(!default_walk_intent) + if (!default_walk_intent) default_walk_intent = get_movement_datum_by_missing_flag(MOVE_INTENT_QUICK) - if(default_walk_intent && move_intent != default_walk_intent) + if (default_walk_intent && move_intent != default_walk_intent) set_move_intent(default_walk_intent) + /client/verb/setmovingquickly() - set hidden = 1 - if(mob) + set hidden = TRUE + if (!mob) + return + if (mob.get_preference_value(/datum/client_preference/toggle_run) == GLOB.PREF_NO) mob.set_moving_quickly() + else + mob.toggle_moving_quickly() + /mob/proc/set_moving_quickly() - if(!default_run_intent) + if (!default_run_intent) default_run_intent = get_movement_datum_by_flag(MOVE_INTENT_QUICK) - if(default_run_intent && move_intent != default_run_intent) + if (default_run_intent && move_intent != default_run_intent) set_move_intent(default_run_intent) + +/mob/proc/toggle_moving_quickly() + var/quick = get_movement_datum_by_flag(MOVE_INTENT_QUICK) + if (move_intent == quick) + var/slow = get_movement_datum_by_missing_flag(MOVE_INTENT_QUICK) + if (slow && move_intent != slow) + set_move_intent(slow) + else if (quick) + set_move_intent(quick) + + /mob/proc/can_sprint() return FALSE diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 13d64e4fe1d8c..ea18cf42b6ceb 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -229,6 +229,10 @@ /mob/new_player/proc/AttemptLateSpawn(datum/job/job, spawning_at) + if(GAME_STATE == RUNLEVEL_GAME) + if(job.late_joinable == FALSE) + to_chat(usr, SPAN_WARNING("Вы не можете зайти за эту роль во время раунда.")) + return 0 if(src != usr) return 0 if(GAME_STATE != RUNLEVEL_GAME) diff --git a/code/modules/mob/skills/skill.dm b/code/modules/mob/skills/skill.dm index 307407d401360..cf9b7a63ed44d 100644 --- a/code/modules/mob/skills/skill.dm +++ b/code/modules/mob/skills/skill.dm @@ -336,3 +336,13 @@ GLOBAL_LIST_EMPTY(skills) "Trained" = "You can accurately measure out reagents, grind powders, and perform chemical reactions. You may still lose some product on occasion, but are unlikely to endanger yourself or those around you.
- You can fully operate the chem dispenser.", "Experienced" = "You work as a chemist, or else you are a doctor with training in chemistry. If you are a research chemist, you can create most useful chemicals; if you are a pharmacist, you can make most medications. At this stage, you're working mostly by-the-book. You can weaponize your chemicals by making grenades, smoke bombs, and similar devices.
- You can examine held containers for scannable reagents.", "Master" = "You specialized in chemistry or pharmaceuticals; you are either a medical researcher or professional chemist. You can create custom mixes and make even the trickiest of medications easily. You understand how your pharmaceuticals interact with the bodies of your patients. You are probably the originator of at least one new chemical innovation.
- You can examine held containers for all reagents.") + +/singleton/hierarchy/skill/medical/chemistry/virology + ID = "virology" + name = "Virology" + desc = "Virology requires a specialist to have not only a deep knowledge of viruses, but also the ability to work with them, similar to how a chemist works with chemicals. This means not only understanding chemical reactions and their effects, but also knowing how these reactions will affect the human body. Thus, a virologist must have not only knowledge of virology, but also medical skills. An analogy can be drawn with a medical chemist, who must have experience working with chemicals and understand what effect they will have in order to use them safely in medicine." + levels = list( "Unskilled" = "You know that virologist work with viruses; you know that they can be very dangerous. You probably know basic defence against viruses..", + "Trained" = "You can engeener viruses. You have some training in safety and you won't infect yourself while work... probably. You can almost safely use the virologist equipment.") + prerequisites = list(SKILL_CHEMISTRY = SKILL_TRAINED) + default_max = SKILL_BASIC + difficulty = SKILL_AVERAGE diff --git a/code/modules/modular_computers/file_system/programs/generic/supply.dm b/code/modules/modular_computers/file_system/programs/generic/supply.dm index eb57b68aa22f3..34491246d9062 100644 --- a/code/modules/modular_computers/file_system/programs/generic/supply.dm +++ b/code/modules/modular_computers/file_system/programs/generic/supply.dm @@ -171,6 +171,7 @@ var/datum/supply_order/O = new /datum/supply_order() O.ordernum = SSsupply.ordernum + O.timestamp = stationtime2text() O.object = P O.orderedby = idname O.reason = reason @@ -230,9 +231,24 @@ return 1 + if(href_list["order_back_to_pending"]) + var/id = text2num(href_list["order_back_to_pending"]) + var/datum/supply_order/SO = find_order_by_id(id, SSsupply.shoppinglist) + if(SO) + SSsupply.requestlist += SO + SSsupply.shoppinglist -= SO + SSsupply.points += SO.object.cost + + else + to_chat(user, SPAN_WARNING("Could not find order number [id] to move back to pending.")) + + return 1 + if(href_list["deny_order"]) var/id = text2num(href_list["deny_order"]) var/datum/supply_order/SO = find_order_by_id(id, SSsupply.requestlist) + if(alert(user, "Are you sure?", "Deny Order", "Yes", "No") != "Yes") + return 1 if(SO) SSsupply.requestlist -= SO else @@ -243,6 +259,8 @@ if(href_list["cancel_order"]) var/id = text2num(href_list["cancel_order"]) var/datum/supply_order/SO = find_order_by_id(id, SSsupply.shoppinglist) + if(alert(user, "Are you sure?", "Cancel Order", "Yes", "No") != "Yes") + return 1 if(SO) SSsupply.shoppinglist -= SO SSsupply.points += SO.object.cost @@ -254,6 +272,8 @@ if(href_list["delete_order"]) var/id = text2num(href_list["delete_order"]) var/datum/supply_order/SO = find_order_by_id(id, SSsupply.donelist) + if(alert(user, "Are you sure?", "Delete Order", "Yes", "No") != "Yes") + return 1 if(SO) SSsupply.donelist -= SO else @@ -358,6 +378,7 @@ /datum/nano_module/supply/proc/order_to_nanoui(datum/supply_order/SO, list_id) return list(list( "id" = SO.ordernum, + "time" = SO.timestamp, "object" = SO.object.name, "orderer" = SO.orderedby, "cost" = SO.object.cost, @@ -378,6 +399,7 @@ var/t = "" t += "
[GLOB.using_map.station_name] Supply Requisition Reciept
" t += "INDEX: #[O.ordernum]
" + t += "TIME: [O.timestamp]
" t += "REQUESTED BY: [O.orderedby]
" t += "RANK: [O.orderedrank]
" t += "REASON: [O.reason]
" diff --git a/code/modules/modular_computers/terminal/terminal.dm b/code/modules/modular_computers/terminal/terminal.dm index b92a8813f7e2b..01b58a0ec0a2b 100644 --- a/code/modules/modular_computers/terminal/terminal.dm +++ b/code/modules/modular_computers/terminal/terminal.dm @@ -67,6 +67,8 @@ var/input = sanitize(href_list["input"]) history += "> [input]" var/output = parse(input, usr) + log_computer_command("[key_name(usr)]: [input]") + computer_log_repository.store_computer_log(usr, get_turf(computer.holder), input) if(QDELETED(src)) // Check for exit. return TOPIC_HANDLED history += output diff --git a/code/modules/organs/blood.dm b/code/modules/organs/blood.dm index daf8a3fd3e345..f928671171217 100644 --- a/code/modules/organs/blood.dm +++ b/code/modules/organs/blood.dm @@ -28,7 +28,12 @@ "blood_DNA" = dna.unique_enzymes, "blood_colour" = species.get_blood_colour(src), "blood_type" = dna.b_type, - "trace_chem" = null + "trace_chem" = null, +//SIERRA-ADD VIRUSOLOGY + "virus2" = list(), + "antibodies" = list() +//SIERRA-ADD + ) B.color = B.data["blood_colour"] @@ -208,6 +213,12 @@ data["trace_chem"] = temp_chem data["dose_chem"] = chem_doses.Copy() data["blood_colour"] = species.get_blood_colour(src) +//SIERRA-ADD VIRUSOLOGY + if (!data["virus2"]) + data["virus2"] = list() + data["virus2"] |= virus_copylist(virus2) + data["antibodies"] = antibodies +//SIERRA-ADD return data /proc/blood_splatter(target,datum/reagent/blood/source,large,spray_dir) @@ -264,6 +275,11 @@ B.blood_DNA[source.data["blood_DNA"]] = source.data["blood_type"] else B.blood_DNA[source.data["blood_DNA"]] = "O+" +//SIERRA-ADD VIRUSOLOGY + // Update virus information. + if(source.data["virus2"]) + B.virus2 = virus_copylist(source.data["virus2"]) +//SIERRA-ADD B.fluorescent = ATOM_FLOURESCENCE_NONE B.set_invisibility(0) diff --git a/code/modules/organs/internal/appendix.dm b/code/modules/organs/internal/appendix.dm index 38495e7c9a84d..a51b0c903340e 100644 --- a/code/modules/organs/internal/appendix.dm +++ b/code/modules/organs/internal/appendix.dm @@ -13,7 +13,12 @@ /obj/item/organ/internal/appendix/Process() ..() - if(inflamed && owner) +//[SIERRA-EDIT] + if(!owner) + return + owner.immunity = min(owner.immunity + 0.025, owner.immunity_norm) + if(inflamed) +//[SIERRA-EDIT] inflamed++ if(prob(5)) if(owner.can_feel_pain()) @@ -42,3 +47,19 @@ owner.adjustToxLoss(25) removed() qdel(src) + +//[SIERRA-ADD] +/obj/item/organ/internal/appendix/removed(mob/living/user, drop_organ=1, detach=1) + if(owner) + owner.immunity_norm -= 10 + ..() + +/obj/item/organ/internal/appendix/replaced(mob/living/carbon/human/target, obj/item/organ/external/affected) + ..() + if(owner) + owner.immunity_norm += 10 + +/obj/item/organ/internal/appendix/New(mob/living/carbon/holder) + ..() + if(owner) + owner.immunity_norm += 10 diff --git a/code/modules/organs/internal/species/ipc.dm b/code/modules/organs/internal/species/ipc.dm index 2b5bd2aa57ab1..be0478341ea42 100644 --- a/code/modules/organs/internal/species/ipc.dm +++ b/code/modules/organs/internal/species/ipc.dm @@ -79,6 +79,40 @@ return start_search(user) + +/obj/item/organ/internal/posibrain/use_tool(obj/item/item, mob/living/user, list/click_params) + if (istype(item, /obj/item/stack/nanopaste)) + if (!damage) + to_chat(user, SPAN_WARNING("\The [src] has no damage to repair.")) + return TRUE + + if (HAS_FLAGS(status, ORGAN_DEAD)) + to_chat(user, SPAN_WARNING("\The [src] is damaged beyond repair.")) + return TRUE + + if (!user.skill_check(SKILL_DEVICES, SKILL_EXPERIENCED)) + to_chat(user, SPAN_WARNING("You don't know how to fix \the [src].")) + return TRUE + + var/obj/item/stack/paste = item + + if (!paste.use(1)) + USE_FEEDBACK_STACK_NOT_ENOUGH(paste, 1, "to repair \the [src]") + return TRUE + + to_chat(user, SPAN_NOTICE("You begin to repair \the [src].")) + if (!do_after(user, 2 SECOND, src, DO_REPAIR_CONSTRUCT) || !user.use_sanity_check(src, item)) + return TRUE + + damage -= 10 + visible_message( + SPAN_NOTICE("\The [user] repairs some of \the [src]'s damage with \a [item]."), + SPAN_NOTICE("You repair some of \the [src]'s damage with \the [item].") + ) + return TRUE + . = ..() + + /obj/item/organ/internal/posibrain/proc/start_search(mob/user) if (!brainmob) return diff --git a/code/modules/overmap/exoplanets/_exoplanet.dm b/code/modules/overmap/exoplanets/_exoplanet.dm index e45f1bd1161d7..53fed779d90e3 100644 --- a/code/modules/overmap/exoplanets/_exoplanet.dm +++ b/code/modules/overmap/exoplanets/_exoplanet.dm @@ -134,10 +134,6 @@ GLOBAL_VAR(planet_repopulation_disabled) generate_features() for (var/datum/exoplanet_theme/T in themes) T.after_map_generation(src) - //[SIERRA-ADD] - ANOMALIES - if(can_spawn_anomalies) - generate_anomalies() - //[SIERRA-ADD] generate_landing(2) update_biome() generate_daycycle() diff --git a/code/modules/overmap/exoplanets/planet_types/chlorine.dm b/code/modules/overmap/exoplanets/planet_types/chlorine.dm index f43503fc86f80..b0386b61c91d5 100644 --- a/code/modules/overmap/exoplanets/planet_types/chlorine.dm +++ b/code/modules/overmap/exoplanets/planet_types/chlorine.dm @@ -18,7 +18,7 @@ /obj/overmap/visitable/sector/exoplanet/chlorine/get_atmosphere_color() var/air_color = ..() - return MixColors("#e5f2bd", air_color) + return MixColors(list("#e5f2bd", air_color)) /obj/overmap/visitable/sector/exoplanet/chlorine/generate_atmosphere() ..() diff --git a/code/modules/overmap/exoplanets/planet_types/shrouded.dm b/code/modules/overmap/exoplanets/planet_types/shrouded.dm index 56acd2cc86c8b..42f143bc826e1 100644 --- a/code/modules/overmap/exoplanets/planet_types/shrouded.dm +++ b/code/modules/overmap/exoplanets/planet_types/shrouded.dm @@ -26,7 +26,7 @@ /obj/overmap/visitable/sector/exoplanet/shrouded/get_atmosphere_color() var/air_color = ..() - return MixColors(COLOR_BLACK, air_color) + return MixColors(list(COLOR_BLACK, air_color)) /datum/random_map/noise/exoplanet/shrouded descriptor = "shrouded exoplanet" diff --git a/code/modules/overmap/exoplanets/planet_types/volcanic.dm b/code/modules/overmap/exoplanets/planet_types/volcanic.dm index 861cb3c473fcf..159c74b37748e 100644 --- a/code/modules/overmap/exoplanets/planet_types/volcanic.dm +++ b/code/modules/overmap/exoplanets/planet_types/volcanic.dm @@ -17,7 +17,7 @@ /obj/overmap/visitable/sector/exoplanet/volcanic/get_atmosphere_color() var/air_color = ..() - return MixColors(COLOR_GRAY20, air_color) + return MixColors(list(COLOR_GRAY20, air_color)) /obj/overmap/visitable/sector/exoplanet/volcanic/generate_atmosphere() ..() diff --git a/code/modules/overmap/exoplanets/random_map.dm b/code/modules/overmap/exoplanets/random_map.dm index 77b9f07f7db7a..75e5f44eeb9b2 100644 --- a/code/modules/overmap/exoplanets/random_map.dm +++ b/code/modules/overmap/exoplanets/random_map.dm @@ -93,7 +93,7 @@ /datum/random_map/noise/exoplanet/proc/spawn_flora(turf/T, big) if (big) new /obj/landmark/exoplanet_spawn/large_plant(T) - for(var/turf/neighbor in RANGE_TURFS(T, 1)) + for(var/turf/neighbor as anything in RANGE_TURFS(T, 1)) spawn_grass(neighbor) else new /obj/landmark/exoplanet_spawn/plant(T) diff --git a/code/modules/overmap/ships/computers/helm.dm b/code/modules/overmap/ships/computers/helm.dm index 211417b90dc1a..9e64788ef77c9 100644 --- a/code/modules/overmap/ships/computers/helm.dm +++ b/code/modules/overmap/ships/computers/helm.dm @@ -44,12 +44,14 @@ GLOBAL_LIST_EMPTY(overmap_helm_computers) /obj/machinery/computer/ship/helm/Process() ..() - if (current_operator) - if (!linked) + if (!linked) + if (current_operator) to_chat(current_operator, SPAN_DANGER("\The [src]'s controls lock up with an error flashing across the screen: Connection to vessel lost!")) set_operator(null, TRUE) - else if (!Adjacent(current_operator) || CanUseTopic(current_operator) != STATUS_INTERACTIVE || !viewing_overmap(current_operator)) - set_operator(null) + return + + if (current_operator && (!Adjacent(current_operator) || CanUseTopic(current_operator) != STATUS_INTERACTIVE || !viewing_overmap(current_operator))) + set_operator(null) if (autopilot && dx && dy) var/turf/T = locate(dx,dy,GLOB.using_map.overmap_z) diff --git a/code/modules/overmap/ships/computers/ship.dm b/code/modules/overmap/ships/computers/ship.dm index 26aa9af73b794..debe3596b5ea7 100644 --- a/code/modules/overmap/ships/computers/ship.dm +++ b/code/modules/overmap/ships/computers/ship.dm @@ -126,5 +126,5 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov for(var/weakref/W in viewers) var/M = W.resolve() if (M) - unlook(M) + invoke_async(PROC_REF(unlook), M) . = ..() diff --git a/code/modules/overmap/ships/computers/shuttle.dm b/code/modules/overmap/ships/computers/shuttle.dm index 8cccaa32de6f9..d71b2a2998bf9 100644 --- a/code/modules/overmap/ships/computers/shuttle.dm +++ b/code/modules/overmap/ships/computers/shuttle.dm @@ -6,6 +6,11 @@ machine_name = "long range shuttle console" machine_desc = "Used to control spacecraft that are designed to move between local sectors in open space." + +/obj/machinery/computer/shuttle_control/explore/is_valid_shuttle(datum/shuttle/shuttle) + return istype(shuttle, /datum/shuttle/autodock/overmap) + + /obj/machinery/computer/shuttle_control/explore/get_ui_data(datum/shuttle/autodock/overmap/shuttle) . = ..() if(istype(shuttle)) diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm index 83c740f7d7b66..a05936a1fc034 100644 --- a/code/modules/paperwork/folders.dm +++ b/code/modules/paperwork/folders.dm @@ -114,9 +114,16 @@ /obj/item/folder/envelope name = "envelope" - desc = "A thick envelope. You can't see what's inside." + desc = "A thick envelope." + icon_state = "envelope0" + var/sealed = FALSE + var/seal_stamp = "" + +/obj/item/folder/envelope/preset icon_state = "envelope_sealed" - var/sealed = 1 + sealed = TRUE + //seal_stamp = "\improper SCG Expeditionary Command rubber stamp" + seal_stamp = "\improper NanoTrasen Central Command rubber stamp" /obj/item/folder/envelope/on_update_icon() if(sealed) @@ -126,15 +133,18 @@ /obj/item/folder/envelope/examine(mob/user) . = ..() - to_chat(user, "The seal is [sealed ? "intact" : "broken"].") + if (sealed || seal_stamp) + to_chat(user, "It [sealed ? "is" : "was"] sealed with \the [seal_stamp]. The seal is [sealed ? "intact" : "broken"].") + else + to_chat(user, "It is not sealed.") /obj/item/folder/envelope/proc/sealcheck(user) var/ripperoni = alert("Are you sure you want to break the seal on \the [src]?", "Confirmation","Yes", "No") if(ripperoni == "Yes") visible_message("[user] breaks the seal on \the [src], and opens it.") - sealed = 0 + sealed = FALSE update_icon() - return 1 + return TRUE /obj/item/folder/envelope/attack_self(mob/user as mob) if(sealed) @@ -147,5 +157,12 @@ if(sealed) sealcheck(user) return TRUE + else if (istype(item, /obj/item/stamp) && !sealed) + seal_stamp = item.name + visible_message("[user] seals \the [src] with [item].") + sealed = TRUE + playsound(src, 'sound/effects/stamp.ogg', 50, 1) + update_icon() + return TRUE else return ..() diff --git a/code/modules/power/cable_structure.dm b/code/modules/power/cable_structure.dm index ad3a4327b9d07..a7da6f4e0f0c2 100644 --- a/code/modules/power/cable_structure.dm +++ b/code/modules/power/cable_structure.dm @@ -361,7 +361,7 @@ By design, d1 is the smallest direction and d2 is the highest ////////////////////////////////////////////// //if powernetless_only = 1, will only get connections without powernet -/obj/structure/cable/proc/get_connections(powernetless_only = 0) +/obj/structure/cable/proc/get_cable_connections(skip_assigned_powernets = FALSE) . = list() // this will be a list of all connected power objects var/turf/T @@ -389,17 +389,23 @@ By design, d1 is the smallest direction and d2 is the highest if(C.d1 == d1 || C.d2 == d1 || C.d1 == d2 || C.d2 == d2) // if either of C's d1 and d2 match either of ours . += C + // if asked, skip any cables with powernts + if(skip_assigned_powernets) + for(var/obj/structure/cable/C in .) + if(C.powernet) + . -= C + +/obj/structure/cable/proc/get_machine_connections(skip_assigned_powernets = FALSE) + . = list() // this will be a list of all connected power objects + if(d1 == 0) for(var/obj/machinery/power/P in loc) if(P.powernet == 0) continue // exclude APCs with powernet=0 - if(!powernetless_only || !P.powernet) + if(!skip_assigned_powernets || !P.powernet) . += P - // if the caller asked for powernetless cables only, dump the ones with powernets - if(powernetless_only) - for(var/obj/structure/cable/C in .) - if(C.powernet) - . -= C +/obj/structure/cable/proc/get_connections(skip_assigned_powernets = FALSE) + return get_cable_connections(skip_assigned_powernets) + get_machine_connections(skip_assigned_powernets) //should be called after placing a cable which extends another cable, creating a "smooth" cable that no longer terminates in the centre of a turf. //needed as this can, unlike other placements, disconnect cables diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 2ea8e97817235..cd3c8df4c1252 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -508,7 +508,7 @@ update_icon(FALSE) sleep(rand(5, 15)) on = (get_status() == LIGHT_OK) - update_icon(0) + queue_icon_update(0) flickering = FALSE // ai attack - make lights flicker, because why not diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm index 5627b7129e43e..7fd8c10eed3be 100644 --- a/code/modules/power/power.dm +++ b/code/modules/power/power.dm @@ -196,31 +196,25 @@ return . //remove the old powernet and replace it with a new one throughout the network. -/proc/propagate_network(obj/O, datum/powernet/PN) +/proc/propagate_network(obj/structure/cable/cable, datum/powernet/PN) //to_world_log("propagating new network") - var/list/worklist = list() + var/list/cables = list() var/list/found_machines = list() var/index = 1 - var/obj/P = null + var/obj/structure/cable/working_cable = null - worklist+=O //start propagating from the passed object - - while(index<=length(worklist)) //until we've exhausted all power objects - P = worklist[index] //get the next power object found + // add the first cable to the list + cables[cable] = TRUE // associative list for speedy deduplication + while(index <= length(cables)) //until we've exhausted all power objects + working_cable = cables[index] //get the next power object found index++ - if( istype(P,/obj/structure/cable)) - var/obj/structure/cable/C = P - if(C.powernet != PN) //add it to the powernet, if it isn't already there - PN.add_cable(C) - worklist |= C.get_connections() //get adjacents power objects, with or without a powernet - - else if(P.anchored && istype(P,/obj/machinery/power)) - var/obj/machinery/power/M = P - found_machines |= M //we wait until the powernet is fully propagates to connect the machines + for(var/new_cable in working_cable.get_cable_connections()) //get adjacent cables, with or without a powernet + cables[new_cable] = TRUE - else - continue + for(var/obj/structure/cable/cable_entry in cables) + PN.add_cable(cable_entry) + found_machines += cable_entry.get_machine_connections() //now that the powernet is set, connect found machines to it for(var/obj/machinery/power/PM in found_machines) diff --git a/code/modules/power/terminal.dm b/code/modules/power/terminal.dm index 9fa1367a7144a..addf4d81e3a95 100644 --- a/code/modules/power/terminal.dm +++ b/code/modules/power/terminal.dm @@ -9,7 +9,7 @@ icon_state = "term" desc = "It's an underfloor wiring terminal for power equipment." level = ATOM_LEVEL_UNDER_TILE - layer = EXPOSED_WIRE_TERMINAL_LAYER + layer = ABOVE_EXPOSED_WIRE_LAYER var/obj/item/stock_parts/power/terminal/master anchored = TRUE diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index f02aba7877412..fe797006d15e2 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -139,11 +139,6 @@ if(scope_zoom) verbs += /obj/item/gun/proc/scope -/obj/item/gun/update_twohanding() - if(one_hand_penalty) - update_icon() // In case item_state is set somewhere else. - ..() - /obj/item/gun/on_update_icon() var/mob/living/M = loc ClearOverlays() @@ -234,11 +229,8 @@ else Fire(target, user, pointblank = TRUE) return TRUE - // Point blank shooting if (user.a_intent == I_HURT && !user.isEquipped(target)) - if (safety()) // Pistol whip instead of unsafety+fire - return ..() Fire(target, user, pointblank = TRUE) return TRUE @@ -338,7 +330,7 @@ flick(fire_anim, src) if (user) - var/user_message = SPAN_WARNING("You fire \the [src][pointblank ? " point blank":""] at \the [target][reflex ? " by reflex" : ""]!") + var/user_message = SPAN_DANGER("You fire \the [src][pointblank ? " point blank":""] at \the [target][reflex ? " by reflex" : ""]!") if (silenced) to_chat(user, user_message) else diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index 5130aab4d790e..a2177b021e23a 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -94,7 +94,6 @@ icon_state = "[modifystate][ratio]" else icon_state = "[initial(icon_state)][ratio]" - update_held_icon() /obj/item/gun/energy/handle_post_fire(mob/user, atom/target, pointblank, reflex, obj/projectile) ..() diff --git a/code/modules/projectiles/guns/launcher/pneumatic.dm b/code/modules/projectiles/guns/launcher/pneumatic.dm index 23d913aec227a..f2b0f0cce4051 100644 --- a/code/modules/projectiles/guns/launcher/pneumatic.dm +++ b/code/modules/projectiles/guns/launcher/pneumatic.dm @@ -152,8 +152,6 @@ icon_state = "pneumatic" item_state = "pneumatic" - update_held_icon() - /obj/item/gun/launcher/pneumatic/small name = "small pneumatic cannon" desc = "It looks smaller than your garden variety cannon." diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index b5d833f685e1b..4fabeb561a7f0 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -60,7 +60,7 @@ var/space_knockback = 0 //whether or not it will knock things back in space var/hitscan = FALSE // whether the projectile should be hitscan - var/step_delay = 1 // the delay between iterations if not a hitscan projectile + var/step_delay = 0.65 // the delay between iterations if not a hitscan projectile // effect types to be used var/muzzle_type diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm index 54d14dab730b7..83f05e88d368b 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm @@ -7,6 +7,10 @@ "blood_colour" = COLOR_BLOOD_HUMAN, "trace_chem" = null, "dose_chem" = null, + //[SIERRA-ADD] VIRUSOLOGY + "virus2" = list(), + "antibodies" = list(), + //[/SIERRA-ADD] VIRUSOLOGY "has_oxy" = 1 ) name = "Blood" @@ -41,6 +45,15 @@ /datum/reagent/blood/get_data() // Just in case you have a reagent that handles data differently. var/t = data.Copy() +//SIERRA ADD VIRUSOLOGY + if(t["virus2"]) + var/list/v = t["virus2"] + t["virus2"] = v.Copy() + + if(t["antibodies"])//... and curing + var/list/v = t["antibodies"] + t["antibodies"] |= v.Copy() +//SIERRA ADD return t /datum/reagent/blood/touch_turf(turf/simulated/T) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index 53cee3af9f918..f874f0d22ed7c 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -299,6 +299,9 @@ if(boozed) M.add_chemical_effect(CE_ALCOHOL_TOXIC, 1) M.add_chemical_effect(CE_BREATHLOSS, 0.1 * boozed) //drinking and opiating makes breathing kinda hard + if(isfast(M)) + M.add_chemical_effect(CE_BREATHLOSS, 0.5) + M.add_chemical_effect(CE_SLOWDOWN, 2) //hyperzine reacts negatively with opiates /datum/reagent/tramadol/overdose(mob/living/carbon/M) ..() @@ -308,6 +311,10 @@ M.add_chemical_effect(CE_BREATHLOSS, 0.6) //Have trouble breathing, need more air if(isboozed(M)) M.add_chemical_effect(CE_BREATHLOSS, 0.2) //Don't drink and OD on opiates folks + if(isfast(M)) + M.add_chemical_effect(CE_NOPULSE, 1) + var/obj/item/organ/internal/heart = M.internal_organs_by_name[BP_HEART] //heart damage + arrest + heart.take_internal_damage(heart.max_damage * 0.045) /datum/reagent/tramadol/proc/isboozed(mob/living/carbon/M) . = 0 @@ -321,6 +328,16 @@ if(booze.strength < 40) //liquor stuff hits harder return 2 +/datum/reagent/tramadol/proc/isfast(mob/living/carbon/M) + . = FALSE + var/datum/reagents/ingested = M.get_ingested_reagents() + if(!ingested) + return FALSE + var/list/pool = M.reagents.reagent_list | ingested.reagent_list + for(var/datum/reagent/hyperzine/fast in pool) + if(M.chem_doses[fast.type]) + return TRUE + /datum/reagent/tramadol/oxycodone name = "Oxycodone" description = "An effective and very addictive painkiller. Don't mix with alcohol." @@ -488,7 +505,7 @@ /datum/reagent/hyperzine name = "Hyperzine" - description = "Hyperzine is a highly effective, long lasting, muscle stimulant." + description = "Hyperzine is a highly effective, long lasting, muscle stimulant. Do not mix with opiates!" taste_description = "acid" reagent_state = LIQUID color = "#ff3300" diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index fcb3c076a9c99..d818de5a1f863 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -501,7 +501,7 @@ filling_color = "#e0d7c5" center_of_mass = "x=17;y=16" nutriment_amt = 3 - nutriment_desc = list("raw" = 2, "mushroom" = 2) + nutriment_desc = list("fleshy mushroom" = 2) bitesize = 6 /obj/item/reagent_containers/food/snacks/hugemushroomslice/Initialize() .=..() @@ -514,7 +514,7 @@ filling_color = "#db0000" center_of_mass = "x=17;y=16" nutriment_amt = 3 - nutriment_desc = list("raw" = 2, "tomato" = 3) + nutriment_desc = list("fleshy tomato" = 3) bitesize = 6 /obj/item/reagent_containers/food/snacks/bearmeat diff --git a/code/modules/reagents/reagent_containers/ivbag.dm b/code/modules/reagents/reagent_containers/ivbag.dm index 4b705abd14d02..8ec51db5120b0 100644 --- a/code/modules/reagents/reagent_containers/ivbag.dm +++ b/code/modules/reagents/reagent_containers/ivbag.dm @@ -281,7 +281,11 @@ "blood_type" = blood_type, "trace_chem" = null, "blood_species" = blood_species, - "blood_colour" = species.blood_color + "blood_colour" = species.blood_color, +//SIERRA-ADD MODPACK VIRUSOLOGY + "virus2" = list(), + "antibodies" = list() +//SIERRA-ADD MODPACK VIRUSOLOGY )) AddLabel("[blood_species] [blood_type]") UpdateItemSize() diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index 429a0698d58db..c7158d2d0fc8a 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -220,10 +220,12 @@ update_icon() // find any switches with same id as this one, and set their positions to match us - for(var/obj/machinery/conveyor_switch/S in world) - if(S.id == src.id) - S.position = position - S.update_icon() + for(var/obj/machinery/conveyor_switch/other_switch as anything in SSmachines.get_machinery_of_type(/obj/machinery/conveyor_switch)) + if(other_switch.id != id) + continue + + other_switch.position = position + other_switch.update_icon() return TRUE /obj/machinery/conveyor_switch/proc/do_switch(mob/user) diff --git a/code/modules/shuttles/shuttle_console.dm b/code/modules/shuttles/shuttle_console.dm index 752bbd43336f3..427cc1be27630 100644 --- a/code/modules/shuttles/shuttle_console.dm +++ b/code/modules/shuttles/shuttle_console.dm @@ -7,12 +7,44 @@ machine_name = "basic shuttle console" machine_desc = "A simple control system for small spacecraft, allowing automated movement from one navigation point to another." - var/shuttle_tag // Used to coordinate data in shuttle controller. + /// Used to coordinate data in shuttle controller. Set by `sync_shuttle()`. + var/shuttle_tag var/hacked = 0 // Has been emagged, no access restrictions. var/ui_template = "shuttle_control_console.tmpl" + +/obj/machinery/computer/shuttle_control/Initialize(mapload) + . = ..() + if (!shuttle_tag) + sync_shuttle() + + +/obj/machinery/computer/shuttle_control/on_update_icon() + icon_screen = shuttle_tag ? initial(icon_screen) : "shuttle_error" + ..() + + +/// Sets `shuttle_tag` to a new value based on the computer's current area, or to `null` if the area is not a valid shuttle. +/obj/machinery/computer/shuttle_control/proc/sync_shuttle() + shuttle_tag = null + var/area/current_area = get_area(src) + for (var/shuttle_name in SSshuttle.shuttles) + var/datum/shuttle/shuttle = SSshuttle.shuttles[shuttle_name] + if (!(current_area in shuttle.shuttle_area)) + continue + if (!is_valid_shuttle(SSshuttle.shuttles[shuttle_name])) + break + shuttle_tag = shuttle_name + break + + +/// Determines whether the given shuttle datum is valid for this computer. +/obj/machinery/computer/shuttle_control/proc/is_valid_shuttle(datum/shuttle/shuttle) + return !istype(shuttle, /datum/shuttle/autodock/overmap) + + /obj/machinery/computer/shuttle_control/interface_interact(mob/user) ui_interact(user) return TRUE diff --git a/code/modules/species/species.dm b/code/modules/species/species.dm index 56ff8b9b31f1f..0a31337de38cd 100644 --- a/code/modules/species/species.dm +++ b/code/modules/species/species.dm @@ -431,8 +431,8 @@ The slots that you can use are found in items_clothing.dm and are the inventory post_organ_rejuvenate(O, H) H.sync_organ_dna() -/* ------------------------> code\modules\emotes\definitions\_species.dm -/datum/species/proc/hug(mob/living/carbon/human/H,mob/living/target) +/* ------------------------> code\modules\emotes\definitions\_species.dm (У нас всё в моде в mods\emote_panel\code\species.dm) +/datum/species/proc/hug(mob/living/carbon/human/H, mob/living/target) var/t_him = "them" switch(target.gender) @@ -441,8 +441,15 @@ The slots that you can use are found in items_clothing.dm and are the inventory if(FEMALE) t_him = "her" - H.visible_message(SPAN_NOTICE("[H] hugs [target] to make [t_him] feel better!"), \ - SPAN_NOTICE("You hug [target] to make [t_him] feel better!")) + // If aiming for the head, try a headpat + if (ishuman(target)) + var/target_zone = check_zone(H.zone_sel.selecting) + var/mob/living/carbon/human/h_target = target + if (target_zone == BP_HEAD && h_target.get_organ(target_zone)) + H.visible_message(SPAN_NOTICE("[H] pats [h_target]'s head to make [t_him] feel better!"), SPAN_NOTICE("You pat [h_target]'s head to make [t_him] feel better!")) + return + + H.visible_message(SPAN_NOTICE("[H] hugs [target] to make [t_him] feel better!"), SPAN_NOTICE("You hug [target] to make [t_him] feel better!")) if(H != target) H.update_personal_goal(/datum/goal/achievement/givehug, TRUE) diff --git a/code/modules/supermatter/supermatter.dm b/code/modules/supermatter/supermatter.dm index d00981509bf06..06e4f52302b73 100644 --- a/code/modules/supermatter/supermatter.dm +++ b/code/modules/supermatter/supermatter.dm @@ -581,7 +581,7 @@ return /obj/machinery/power/supermatter/ex_act(severity) - ..() + // not calling parent ex_act as it has a chance to qdel the supermatter switch(severity) if(EX_ACT_DEVASTATING) power *= 4 diff --git a/code/modules/xenoarcheaology/sampling.dm b/code/modules/xenoarcheaology/sampling.dm index 1c03574c19599..6f012352fdb22 100644 --- a/code/modules/xenoarcheaology/sampling.dm +++ b/code/modules/xenoarcheaology/sampling.dm @@ -70,14 +70,14 @@ artifact_distance = rand() artifact_id = container.artifact_find.artifact_id else - for (var/turf/simulated/mineral/T as anything in GLOB.xeno_artifact_turfs) + for (var/turf/simulated/mineral/T as anything in SSxenoarch.xeno_artifact_turfs) if(T.artifact_find) var/cur_dist = get_dist(container, T) * 2 if( (artifact_distance < 0 || cur_dist < artifact_distance)) artifact_distance = cur_dist + rand() * 2 - 1 artifact_id = T.artifact_find.artifact_id else - GLOB.xeno_artifact_turfs -= T + SSxenoarch.xeno_artifact_turfs -= T /obj/item/device/core_sampler name = "core sampler" diff --git a/code/modules/xenoarcheaology/tools/tools.dm b/code/modules/xenoarcheaology/tools/tools.dm index 8d2a4a1dedc79..e8e3a335728e8 100644 --- a/code/modules/xenoarcheaology/tools/tools.dm +++ b/code/modules/xenoarcheaology/tools/tools.dm @@ -57,7 +57,7 @@ var/nearestSimpleTargetDist = -1 var/turf/cur_turf = get_turf(src) - for (var/turf/simulated/mineral/T as anything in GLOB.xeno_artifact_turfs) + for (var/turf/simulated/mineral/T as anything in SSxenoarch.xeno_artifact_turfs) if(T.density && T.artifact_find) if(T.z == cur_turf.z) var/cur_dist = get_dist(cur_turf, T) * 2 @@ -65,16 +65,16 @@ nearestTargetDist = cur_dist + rand() * 2 - 1 nearestTargetId = T.artifact_find.artifact_id else - GLOB.xeno_artifact_turfs -= T + SSxenoarch.xeno_artifact_turfs -= T - for(var/turf/simulated/mineral/T as anything in GLOB.xeno_digsite_turfs) + for(var/turf/simulated/mineral/T as anything in SSxenoarch.xeno_artifact_turfs) if(T.density && T.finds && length(T.finds)) if(T.z == cur_turf.z) var/cur_dist = get_dist(cur_turf, T) * 2 if(nearestSimpleTargetDist < 0 || cur_dist < nearestSimpleTargetDist) nearestSimpleTargetDist = cur_dist + rand() * 2 - 1 else - GLOB.xeno_digsite_turfs -= T + SSxenoarch.xeno_digsite_turfs -= T if(nearestTargetDist >= 0) to_chat(user, SPAN_NOTICE("Exotic energy detected on wavelength '[nearestTargetId]' in a radius of [nearestTargetDist]m[nearestSimpleTargetDist > 0 ? "; small anomaly detected in a radius of [nearestSimpleTargetDist]m" : ""]")) diff --git a/code/modules/xgm/xgm_gas_data.dm b/code/modules/xgm/xgm_gas_data.dm index 85dd1adffd7db..dd08dd01e2e51 100644 --- a/code/modules/xgm/xgm_gas_data.dm +++ b/code/modules/xgm/xgm_gas_data.dm @@ -54,7 +54,7 @@ var/global/datum/xgm_gas_data/gas_data /hook/startup/proc/generateGasData() gas_data = new - for(var/p in (typesof(/singleton/xgm_gas) - /singleton/xgm_gas)) + for(var/p in (subtypesof(/singleton/xgm_gas))) var/singleton/xgm_gas/gas = new p //avoid initial() because of potential New() actions if(gas.id in gas_data.gases) diff --git a/code/modules/xgm/xgm_gas_mixture.dm b/code/modules/xgm/xgm_gas_mixture.dm index 62435d5cb39db..20d08ffb604e7 100644 --- a/code/modules/xgm/xgm_gas_mixture.dm +++ b/code/modules/xgm/xgm_gas_mixture.dm @@ -91,12 +91,12 @@ if(!giver) return - if(abs(temperature-giver.temperature)>MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) + if(abs(temperature-giver.temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) var/self_heat_capacity = heat_capacity() var/giver_heat_capacity = giver.heat_capacity() var/combined_heat_capacity = giver_heat_capacity + self_heat_capacity if(combined_heat_capacity != 0) - temperature = (giver.temperature*giver_heat_capacity + temperature*self_heat_capacity)/combined_heat_capacity + temperature = (giver.temperature * giver_heat_capacity + temperature*self_heat_capacity) / combined_heat_capacity if((group_multiplier != 1)||(giver.group_multiplier != 1)) for(var/g in giver.gas) @@ -346,60 +346,73 @@ //Rechecks the gas_mixture and adjusts the graphic list if needed. //Two lists can be passed by reference if you need know specifically which graphics were added and removed. /datum/gas_mixture/proc/check_tile_graphic(list/graphic_add = null, list/graphic_remove = null) - for(var/obj/gas_overlay/O in graphic) - if(istype(O, /obj/gas_overlay/heat)) + for(var/obj/gas_overlay/gas_overlay in graphic) + if(istype(gas_overlay, /obj/gas_overlay/heat)) continue - if(istype(O, /obj/gas_overlay/cold)) + + if(istype(gas_overlay, /obj/gas_overlay/cold)) continue - if(gas[O.gas_id] <= gas_data.overlay_limit[O.gas_id]) - LAZYADD(graphic_remove, O) - for(var/g in gas_data.overlay_limit) + + if(gas[gas_overlay.gas_id] <= gas_data.overlay_limit[gas_overlay.gas_id]) + LAZYADD(graphic_remove, gas_overlay) + + var/should_generate_temp_overlay = FALSE + for(var/gas_id in gas_data.overlay_limit) //Overlay isn't applied for this gas, check if it's valid and needs to be added. - if(gas[g] > gas_data.overlay_limit[g]) - var/tile_overlay = get_tile_overlay(g) + if(gas[gas_id] > gas_data.overlay_limit[gas_id]) + should_generate_temp_overlay = TRUE + var/tile_overlay = get_tile_overlay(gas_id) if(!(tile_overlay in graphic)) LAZYADD(graphic_add, tile_overlay) - . = 0 - - var/heat_overlay = get_tile_overlay(GAS_HEAT) - //If it's hot add something - if(temperature >= CARBON_LIFEFORM_FIRE_RESISTANCE) - if(!(heat_overlay in graphic)) - LAZYADD(graphic_add, heat_overlay) - else if (heat_overlay in graphic) - LAZYADD(graphic_remove, heat_overlay) - - var/cold_overlay = get_tile_overlay(GAS_COLD) - if(temperature <= FOGGING_TEMPERATURE && (return_pressure() >= (ONE_ATMOSPHERE / 4))) - if(!(cold_overlay in graphic)) - LAZYADD(graphic_add, cold_overlay) - else if (cold_overlay in graphic) - LAZYADD(graphic_remove, cold_overlay) + . = FALSE + + if(should_generate_temp_overlay) + var/heat_overlay = get_tile_overlay(GAS_HEAT) + //If it's hot add something + if(temperature >= CARBON_LIFEFORM_FIRE_RESISTANCE) + if(!(heat_overlay in graphic)) + LAZYADD(graphic_add, heat_overlay) + else if (heat_overlay in graphic) + LAZYADD(graphic_remove, heat_overlay) + + var/cold_overlay = get_tile_overlay(GAS_COLD) + if(temperature <= FOGGING_TEMPERATURE && (return_pressure() >= (ONE_ATMOSPHERE / 4))) + if(!(cold_overlay in graphic)) + LAZYADD(graphic_add, cold_overlay) + else if (cold_overlay in graphic) + LAZYADD(graphic_remove, cold_overlay) //Apply changes if(graphic_add && length(graphic_add)) graphic |= graphic_add - . = 1 + . = TRUE + if(graphic_remove && length(graphic_remove)) graphic -= graphic_remove - . = 1 - if(length(graphic)) - var/pressure_mod = clamp(return_pressure() / ONE_ATMOSPHERE, 0, 2) - for(var/obj/gas_overlay/O in graphic) - if(istype(O, /obj/gas_overlay/heat)) //Heat based - var/new_alpha = clamp(max(125, 255 * ((temperature - CARBON_LIFEFORM_FIRE_RESISTANCE) / CARBON_LIFEFORM_FIRE_RESISTANCE * 4)), 125, 255) - if(new_alpha != O.alpha) - O.update_alpha_animation(new_alpha) - continue - if(istype(O, /obj/gas_overlay/cold)) - var/new_alpha = clamp(max(125, 200 * (1 - ((temperature - MAX_FOG_TEMPERATURE) / (FOGGING_TEMPERATURE - MAX_FOG_TEMPERATURE)))), 125, 200) - if(new_alpha != O.alpha) - O.update_alpha_animation(new_alpha) - continue - var/concentration_mod = clamp(gas[O.gas_id] / total_moles, 0.1, 1) - var/new_alpha = min(230, round(pressure_mod * concentration_mod * 180, 5)) - if(new_alpha != O.alpha) - O.update_alpha_animation(new_alpha) + . = TRUE + + if(!length(graphic)) + return . + + var/pressure_mod = clamp(return_pressure() / ONE_ATMOSPHERE, 0, 2) + for(var/obj/gas_overlay/overlay in graphic) + if(istype(overlay, /obj/gas_overlay/heat)) //Heat based + var/new_alpha = clamp(max(125, 255 * ((temperature - CARBON_LIFEFORM_FIRE_RESISTANCE) / CARBON_LIFEFORM_FIRE_RESISTANCE * 4)), 125, 255) + if(new_alpha != overlay.alpha) + overlay.update_alpha_animation(new_alpha) + continue + + if(istype(overlay, /obj/gas_overlay/cold)) + var/new_alpha = clamp(max(125, 200 * (1 - ((temperature - MAX_FOG_TEMPERATURE) / (FOGGING_TEMPERATURE - MAX_FOG_TEMPERATURE)))), 125, 200) + if(new_alpha != overlay.alpha) + overlay.update_alpha_animation(new_alpha) + continue + + var/concentration_mod = clamp(gas[overlay.gas_id] / total_moles, 0.1, 1) + var/new_alpha = min(230, round(pressure_mod * concentration_mod * 180, 5)) + if(new_alpha != overlay.alpha) + overlay.update_alpha_animation(new_alpha) + /datum/gas_mixture/proc/get_tile_overlay(gas_id) if(!LAZYACCESS(tile_overlay_cache, gas_id)) diff --git a/code/stylesheet.dm b/code/stylesheet.dm index 7bef0d3eab603..0631d2852231c 100644 --- a/code/stylesheet.dm +++ b/code/stylesheet.dm @@ -85,16 +85,16 @@ h1.alert, h2.alert {color: #000080;} .italic {font-style: italic;} .bold {font-weight: bold;} -.danger {color: #ff0000; font-weight: bold;} -.bigdanger {color: #ff0000; font-weight: bold; font-size: 115%;} -.warning {color: #ff0000; font-style: italic;} -.bigwarning {color: #ff0000; font-style: italic; font-size: 115%;} +.danger {color: #dc3545; font-weight: bold;} +.bigdanger {color: #dc3545; font-weight: bold; font-size: 115%;} +.warning {color: #cc7606; font-weight: bold; font-style: italic;} +.bigwarning {color: #cc7606; font-weight: bold; font-style: italic; font-size: 115%;} .boldannounce {color: #ff0000; font-weight: bold;} .rose {color: #ff5050;} -.info {color: #0000cc;} +.info {color: #9b53c4; font-style: italic;} .debug {color: #ff00ff;} -.notice {color: #000099;} -.subtle {color: #000099; font-size: 75%; font-style: italic;} +.notice {color: #0d5ef3;} +.subtle {color: #919ca7; font-style: italic;} .alium {color: #00ff00;} .cult {color: #800080; font-weight: bold; font-style: italic;} .cultannounce {color: #800080; font-style: italic; font-size: 175%;} diff --git a/config/example/config.txt b/config/example/config.txt index b670f8379a40e..6d1edc4963eeb 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -76,6 +76,9 @@ LOG_ATTACK ## log admin warning messages ##LOG_ADMINWARN ## Also duplicates a bunch of other messages. +## log computer commands +# LOG_COMPUTER_COMMANDS + ## Log all timers on timer auto reset # LOG_TIMERS_ON_BUCKET_RESET diff --git a/html/changelog.html b/html/changelog.html index 2fe85c73d9a37..33b2e4c6cf3d7 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -28,6 +28,317 @@
Sierra SS13
-->
+
23.11 - 2024
+Обновления ВашНикнейм:
+
+
+
+ Аномалии на тайле облак больше не дают им раскрываться (Больше не выйдет спрятаться от всасывающей аномалии в пучинах облак)
+ Переписана работа всасывающей гравитационной аномалии
+ Мех больше не неуявзим для обак
+ Теперь везде в коде не Zjarka, а Zharka
+ Добавил дикий самопальный детектор Гюрза для ГКК
+ Облака излучают персиковый свет
+ Трава излучает приятные зеленоватый свет
+ Переписана работа облаков
+ Выдал на склад ГКК 1 гюрзу и 3 пачки болтиков. Спасибо местному инженеру.
+ Добавил иконки Гюрзы
+ 22.11 - 2024
+Обновления Lexanx:
+
+
+ Изменена форма снабжения 32
+ Добавил зарядник боргов на ГУП
+ Обновления Mucker:
+
+
+ Simple mobs will not longer endlessly attack doors when they lose their target.
+ Обновления PurplePineapple:
+
+
+ Clicking a victim with an item on disarm intent calls use_weapon(). Disarm intent/Dislocation combat for melee works again.
+ Обновления Spookerton:
+
+
+
+ Added a preference option for toggling run on shift.
+ 19.11 - 2024
+Обновления Baneuus:
+
+
+
+ Теперь введение крови в золотое ядро спаунит злого моба.
+ Теперь введение крови в лазурное ядро спаунит зелье возрождения слизня.
+ 16.11 - 2024
+Обновления Lexanx & Gfitkiit:
+
+
+
+ Дроппод для мерков
+ 14.11 - 2024
+Обновления Lexanx:
+
+
+ Неотстыковка некоторых подов
+ Невозможность синхронизировать консоли, после их пересборки
+ Проблема с Advanced Landing в лававой экзопланете
+ Возвращена Вирусология.
+ Добавлена подпрофессия Химика - Вирусолог
+ Возвращены Вирусы
+ Обновления LordNest:
+
+
+ Добавил отображение заблокированного хранилища скафандров
+ Обновления awkardlyconfusedneuralnetwork:
+
+
+
+ Добавил звуки для аирлоков
+ Increases large map loading speed
+ Добавил face direction по нажатию иконки интента движения с зажатым ctrl
+ 13.11 - 2024
+Обновления KandJX:
+
+
+
+ Добавил лестницу между бригом и мостиком.
+ Убрал шлюз в теха из комнаты капитана.
+ 12.11 - 2024
+Обновления Builder13:
+
+
+
+ Больше нельзя получить галлюцинации от суперматерии при активных мезонных очках
+ 11.11 - 2024
+Обновления BOT Eeshee:
+
+
+ Добавила перчатки, маски и изоли ЭК
+ Обновления Lexanx:
+
+
+ Баг взаимодействия синтетов
+ Некорректная зона меркшипа
+ Пофикшена кража тюрфов при взлете
+ Обновления Shegar:
+
+
+ Задник космоса не становится серым из-за летающих островов
+ Текст эндраунда мода аномалий не жирный
+ Обновления Teteshnik:
+
+
+
+ Переименовал спавнеры безбилетников
+ 10.11 - 2024
+Обновления Builder13:
+
+
+ Радио при событии пси сигнала больше не должно воздействовать через стены
+ Обновления Mucker:
+
+
+ You can now "hold" a humanoid mobs' hand when pulling them and targeting one of their hands.
+ Antag latespawn scaling no longer considers players that aren't alive or are offship when deciding maximum antags.
+ Обновления Shegar:
+
+
+ Трамплин теперь не всегда кидает на 5 тайтлов.
+ Генератору аномок теперь не мешает railings
+ Лава больше не может сжигать артефакты
+ БСД пролив теперь не спавнит аномки в космосе
+ БСД теперь удаляет аномки после окончания ивента (Должен по крайней мере)
+ Мех при таране цели тоже делает шаг, от чего меха теперь невозможно заблочить не мехом/адхерантом/гбсом
+ Добавил глыбы на планету лёд. Красиво!
+ Детектор не какает обработкой без нужды, теперь его нужно включать.(Контрол + ЛКМ)
+ Теперь аномалии при осмотре детектером обнаруживаются полностью, а не частично (От чего шансы обнаружения довольно таки упали)
+ Полность переписана система влияния артефактов на определённые события с персонажами, добавлены новые эффекты. Усилена важность и польза контейнеров артефактов из-за этого.
+ Добавлена анимация уворота при паррировании.
+ Переписана система процессинга артефактов на персонажа. Она должна при любых взаимодействиях понимать, кто текущий носитель и влиять на него.
+ Добавил СНЕГ на ледяную планету с эффектом на экране и звуком.
+ Добавлен Z скан уровня для детектора
+ Добавил скалолазанье на планету ЛЁД. Помогайте друг другу, используйте кирки, готовьтесь физически и преодолевайте горы.
+ Добавлен установщик маячков для более комфортного построения пути на планетах.
+ Всасывающая гравианомалия изменена сопротивляться им стало сложнее, так как и задумывал разработчик, но в то же время, вы можете помогать своим друзьям выбираться из неё. Файнд аут ин гейм!
+ Логика электр подтипа Тесла переписана, теперь вся планета не сможет одновременно бахать
+ Достаточно высокий уровень науки позволит определять тип аномалии
+ Спавн аномалий от больших артефактов выведен из ротации.
+ Спрайты для артефактов, погода
+ Выдал Деплоер на склад ЭК. Детектор, мешочек и деплоер на склад шахтёров.
+ Исправлено описание детектора аномалий
+ Погода Буран, может подлагивать клиент. Пишите чё каво.
+ Сильно увеличен размер планет. Спавнит так же, как и от админки.
+ Добавлена аномальная планета: Летающие острова.
+ Сильно увеличил расстояния насёра аномалиями при БСД проливе, увеличено количество аномок.
+ Ослаблено СТАН влияние электры на жертву
+ Добавлена возможность от атлетики сопротивляться влиянию электры
+ Нёрф энергощитов меха, генерация тепла при получении урона увеличена в 2 раза
+ Добавил трамплин в билдер админов.
+ Обновления Spookerton:
+
+
+ Corrected Masculinity.
+ Обновления The_Spanish_1nquisition:
+
+
+
+ Tornakov took a marker to his poster.
+ 09.11 - 2024
+Обновления Shegar:
+
+
+
+ Минификсик для гитхаба
+ 08.11 - 2024
+Обновления Lexanx:
+
+
+ Теперь челноки/шаттлы способные летать в космосе и совершать посадки,
+ Обновления RocheHendson:
+
+
+
+ Seedship теперь имеет должности для захода
+ Seedship командование теперь может поставить имя своему наследию
+ 07.11 - 2024
+Обновления Mucker:
+
+
+ Adjusted the spawn target for merc and raider to 3, and traitor to 1.
+ Обновления PsiOmegaDelta:
+
+
+ Select loadout items again display an extended description when selected for use.
+ Обновления Ryan180602:
+
+
+ Wristwatches show the date correctly.
+ Posibrains can be fixed outside chassis.
+ Removes the preset pronoun badge types, people can now customise them to their wish.
+ Adds another entry for the pride pins. Letting people take two now.
+ Throat-slit timer changed from 3.24 ~ 0.8! seconds to 3.75 ~ 2.25. On success, the user cannot act again for an extra second.
+ Обновления sdtwbaj:
+
+
+ Flora can be cut away with a hatchet.
+ Trees can be destroyed, and drop wood!
+ woodcutting.ogg from Polaris
+ tree stumps from Polaris
+ Обновления sick trigger:
+
+
+ Orders from supply now record what time the requst was made
+ Обновления sick-trigger:
+
+
+
+ Fixed being unable to spawn on landed colony ship.
+ 06.11 - 2024
+Обновления Baneuus:
+
+
+ Резоми хихикают как резоми, а не как люди.
+ Вернул звук вздоха резоми.
+ Повысил температуру, которая для резоми считается "комфортной" до 21.6 С*
+ Усилил найтвижн резоми.
+ Удалил мерков из спауна при режиме революции
+ Теперь sechud lenses резоми работают нормально
+ Обновления Builder13:
+
+
+ Откат трех секунд подсистемы машин
+ Обновления SierraKomodo:
+
+
+ Shuttle control consoles can no longer be synced to shuttles if not actually on the shuttle.
+ Regular non-overmap shuttle control consoles will no longer function on overmap shuttles, and vice-versa.
+ Shuttle control consoles now automatically sync to the shuttle they're built on when created, instead of needing to be set by multitooling the board before creation.
+ Shuttle control consoles that are not properly connected to a shuttle now have a new error screen sprite.
+ Обновления Teteshnik:
+
+
+ Добавил некоторым расам возможность стать безбилетником
+ Поменял название безбилетника на неизвестного сделано угоду айди
+ Обновления rootoo807:
+
+
+
+ Fixes broken sprites / adds missing sprites for armbands, insulated gloves, soft caps, blood masks on GAS. GAS can no longer wear overalls or wizard voidsuit [snakes don't have legs for pants :( ].
+ Adds missing sprite for flipped veteran's cap.
+ 05.11 - 2024
+Обновления awkardlyconfusedneuralnetwork:
+
+
+
+ Убрался за собой
+ 04.11 - 2024
+Обновления Builder13:
+
+
+ Добавлена кнопка add trait в создание персонажа. Сейчас там есть опции только для регенерации Унати.
+ Обновления NinjaPikachushka:
+
+
+ Худ-Кнопки мага перестали сбегать.
+ Обновления totalynotglist:
+
+
+ Экспериментальная оптимизация подсистемы Machines на 33.3%.
+ Обновления ВашНикнейм:
+
+
+
+ Экран меха обновляется при переключении Power, выключении от перегрева, при выбивании сенсора.
+ Если у меха выбита грудь, то раз в 20-40 секунд мех получает полный перегрев.
+ 03.11 - 2024
+Обновления Builder13:
+
+
+ Добавлена единственная возможность чинить переломы для Адхерантов - через минеральные ванны. Процедура может быть длительной.
+ Генокрад больше не утрачивает навыки от профессии при получении роли
+ Возвращены шансы на пси латентность при заходе в раунд
+ Пси сигнал возвращен в ротацию событий
+ Возвращена переменная stop_sight_update для мобов, чтобы исключить обновление зрения при ее включении
+ Обновления Gaaxer, awkardlyconfusedneuralnetwork:
+
+
+ Инит ксеноархиологии теперь быстрее
+ Обновления Gaxeer, awkardlyconfusedneuralnetwork:
+
+
+ Починил обновление оверлея газов
+ Починил то, что рычаг на конвейере проходит все объекты в мире
+ Обновления KOJIECO:
+
+
+ Добавил скрелльскую одежду для всех каст от Failu.
+ Обновления Lexanx:
+
+
+ Новые фуллскрин оверлеи повреждений ИПС и Адхерентов и ППТ
+ Предмет(Explosion Wather) для получения научных очков из взрывов снова работает
+ Джетпаки в ветке исследований РнД
+ Кинетический сборщик в производстве РнД
+ Платы мусоропереработчиков в ветке исследований РнД
+ Компот (water = 2, berry = 1, apple = 1, pear = 1)
+ Возвращены рецепты отвердевания золота и серебра.
+ Плата консоли трафика в ветке исследований РнД.
+ Обновления Neonvolt:
+
+
+ Исправлены дополнительные пропавшие спрайты Восхождения и недоработки связанные с их расами
+ Обновления Teteshnik:
+
+
+ Поставил возможность изменения/добавления хоткея для фейс дира.
+ Новый флаг для профессий позволяющий делать профессию только возможным раундстартом
+ Добавил безбилетников
+ Обновления awkardlyconfusedneuralnetwork:
+
+
+
Инпут теперь обрабатывается раньше других сабсистем, должно повысить плавность игры.
+ Ускорил инит, да.
+ 23.10 - 2024
Обновления Builder13:
@@ -216,78 +527,6 @@
-
-
Обновления Vipo24:
Кислота вновь очень больно обжигает, как было раньше
19.09 - 2024
-Обновления Teteshnik:
-
-
-
- Пофиксил лодаут ниндзи, так-же удалил костыль.
- Портировал букеты в билд
- 16.09 - 2024
-Обновления Builder13:
-
-
-
- Портировано отображение для скана контактов у сенсоров
- Портирована экстренная кнопка бедствия
- 15.09 - 2024
-Обновления ВашНикнейм:
-
-
-
- Выдал детекторы для ЭК
- 14.09 - 2024
-Обновления Builder13:
-
-
- Добавлена возможность вставки и вытаскивания предмета из интегральной платы без ее удаления из корпуса
- Добавлены интегральные платы list pick, image comparsion scanner, floor magnet.
- Сделаны дополнения для плат intelligence control circuit и examiner
- Обновления ВашНикнейм:
-
-
-
- Сбор артефактов в мехе запрещён
- Генерация артефактов и аномалий жёстко ограничена математикой.
- Сбор артефактов теперь работает так, как я и задумывал
- Добавил планетарную генерацию аномалий (по всей планете), зависящая от типа планеты
- URM (Universal Research Machine) - новое устройство на петрове для анализа артов(мелких).
- Добавлена ледяная планета
- Добавил спрайты маячков, детектора, URM
- Выдал ЭК коллекторы,маячки и новые детекторы. Колония, воксы, мусорщики - получили болтики.
- Изменил русский на английский в аномалиях там, где это неуместно
- Дал билдер аномалий в билдер с возможностью тонкой настройки
- 11.09 - 2024
-Обновления Teteshnik:
-
-
-
- Удалил трэйси
- Портирован халат робототехника с инфинити.
- 06.09 - 2024
-Обновления ВашНикнейм:
-
-
-
- Ремап карты ниндзи, он получил сауну, додзе, озерцо и пару комнат. В целом, перенос с инфинити.
- 04.09 - 2024
-Обновления Builder13:
-
-
- Wizard retains all the spells in the hud upon changing/getting body.
- It is now possible to spawn wizard packages (examples: scrying orb, mastercrafted armor).
- Fixes for some of the spells, so they are castable again.
- Обновления Gy1ta23:
-
-
-
- you can now select photographs in loadout with changeable descriptions
- 01.09 - 2024
-Обновления Shegar:
-
-
Возвращает map_upload
- Icons by Icons8